Drop h and hh length modifiers from printf format strings.

[tinc] / src / subnet.c

diff --git a/src/subnet.c b/src/subnet.c
index 47f1436..6e8ad07 100644 (file)
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -1,6 +1,6 @@
 /*
     subnet.c -- handle subnet lookups and lists
-    Copyright (C) 2000-2010 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2014 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -268,6 +268,78 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
                return true;
        }
 
+       // IPv6 short form
+       if(strstr(subnetstr, "::")) {
+               const char *p;
+               char *q;
+               int colons = 0;
+
+               // Count number of colons
+               for(p = subnetstr; *p; p++)
+                       if(*p == ':')
+                               colons++;
+
+               if(colons > 7)
+                       return false;
+
+               // Scan numbers before the double colon
+               p = subnetstr;
+               for(i = 0; i < colons; i++) {
+                       if(*p == ':')
+                               break;
+                       x[i] = strtoul(p, &q, 0x10);
+                       if(!q || p == q || *q != ':')
+                               return false;
+                       p = ++q;
+               }
+
+               p++;
+               colons -= i;
+               if(!i) {
+                       p++;
+                       colons--;
+               }
+
+               if(!*p || *p == '/' || *p == '#')
+                       colons--;
+
+               // Fill in the blanks
+               for(; i < 8 - colons; i++)
+                       x[i] = 0;
+
+               // Scan the remaining numbers
+               for(; i < 8; i++) {
+                       x[i] = strtoul(p, &q, 0x10);
+                       if(!q || p == q)
+                               return false;
+                       if(i == 7) {
+                               p = q;
+                               break;
+                       }
+                       if(*q != ':')
+                               return false;
+                       p = ++q;
+               }
+
+               l = 128;
+               if(*p == '/')
+                       sscanf(p, "/%d#%d", &l, &weight);
+               else if(*p == '#')
+                       sscanf(p, "#%d", &weight);
+
+               if(l < 0 || l > 128)
+                       return false;
+
+               subnet->type = SUBNET_IPV6;
+               subnet->net.ipv6.prefixlength = l;
+               subnet->weight = weight;
+
+               for(i = 0; i < 8; i++)
+                       subnet->net.ipv6.address.x[i] = htons(x[i]);
+
+               return true;
+       }
+
        return false;
 }
 
@@ -279,7 +351,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
 
        switch (subnet->type) {
                case SUBNET_MAC:
-                       snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx#%d",
+                       snprintf(netstr, len, "%x:%x:%x:%x:%x:%x#%d",
                                         subnet->net.mac.address.x[0],
                                         subnet->net.mac.address.x[1],
                                         subnet->net.mac.address.x[2],
@@ -290,7 +362,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
                        break;
 
                case SUBNET_IPV4:
-                       snprintf(netstr, len, "%hu.%hu.%hu.%hu/%d#%d",
+                       snprintf(netstr, len, "%u.%u.%u.%u/%d#%d",
                                         subnet->net.ipv4.address.x[0],
                                         subnet->net.ipv4.address.x[1],
                                         subnet->net.ipv4.address.x[2],
@@ -300,7 +372,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
                        break;
 
                case SUBNET_IPV6:
-                       snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d#%d",
+                       snprintf(netstr, len, "%x:%x:%x:%x:%x:%x:%x:%x/%d#%d",
                                         ntohs(subnet->net.ipv6.address.x[0]),
                                         ntohs(subnet->net.ipv6.address.x[1]),
                                         ntohs(subnet->net.ipv6.address.x[2]),
@@ -451,7 +523,7 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
 void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
        avl_node_t *node;
        int i;
-       char *envp[9] = {NULL};
+       char *envp[10] = {NULL};
        char netstr[MAXNETSTR];
        char *name, *address, *port;
        char empty[] = "";
@@ -468,8 +540,12 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
                // 4 and 5 are reserved for SUBNET and WEIGHT
                xasprintf(&envp[6], "REMOTEADDRESS=%s", address);
                xasprintf(&envp[7], "REMOTEPORT=%s", port);
+               free(port);
+               free(address);
        }
 
+       xasprintf(&envp[8], "NAME=%s", myself->name);
+
        name = up ? "subnet-up" : "subnet-down";
 
        if(!subnet) {