Also check for sha.h.
[tinc] / src / subnet.c
index 1a9a560..6ca3fee 100644 (file)
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: subnet.c,v 1.1.2.8 2000/10/29 00:02:20 guus Exp $
+    $Id: subnet.c,v 1.1.2.11 2000/11/04 22:57:33 guus Exp $
 */
 
-#include <syslog.h>
-#include <stdio.h>
-
 #include "config.h"
-#include <utils.h>
 
-#include <xalloc.h>
-#include "subnet.h"
-#include "net.h"
+#include <stdio.h>
+#include <syslog.h>
+
 #include "conf.h"
+#include "net.h"
+#include "subnet.h"
 #include "system.h"
 
+#include <utils.h>
+#include <xalloc.h>
+
 /* lists type of subnet */
 
 subnet_t *subnet_list[SUBNET_TYPES] = { NULL };
@@ -220,7 +221,7 @@ cp
         asprintf(&netstr, "%d,%lx/%lx", subnet->type, subnet->net.ipv4.address, subnet->net.ipv4.mask);
         break;
       case SUBNET_IPV6:
-        asprintf(&netstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
+        asprintf(&netstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", subnet->type,
                    subnet->net.ipv6.address.x[0],
                    subnet->net.ipv6.address.x[1],
                    subnet->net.ipv6.address.x[2],
@@ -300,7 +301,7 @@ cp
   for(subnet = subnet_list[SUBNET_IPV4]; subnet != NULL; subnet = subnet->global_next)
     {
       netstr = net2str(subnet);
-      syslog(LOG_DEBUG, "  %s owner %s", netstr, subnet->owner->name);
+      syslog(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
       free(netstr);
     }