Add stricter checks for netnames.

[tinc] / src / subnet.c

diff --git a/src/subnet.c b/src/subnet.c
index 7ff8f7a..090a62b 100644 (file)
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -40,9 +40,9 @@ splay_tree_t *subnet_tree;
 
 /* Subnet lookup cache */
 
-hash_t *ipv4_cache;
-hash_t *ipv6_cache;
-hash_t *mac_cache;
+static hash_t *ipv4_cache;
+static hash_t *ipv6_cache;
+static hash_t *mac_cache;
 
 void subnet_cache_flush(void) {
        hash_clear(ipv4_cache);
@@ -92,13 +92,15 @@ void subnet_add(node_t *n, subnet_t *subnet) {
        subnet->owner = n;
 
        splay_insert(subnet_tree, subnet);
-       splay_insert(n->subnet_tree, subnet);
+       if (n)
+               splay_insert(n->subnet_tree, subnet);
 
        subnet_cache_flush();
 }
 
 void subnet_del(node_t *n, subnet_t *subnet) {
-       splay_delete(n->subnet_tree, subnet);
+       if (n)
+               splay_delete(n->subnet_tree, subnet);
        splay_delete(subnet_tree, subnet);
 
        subnet_cache_flush();
@@ -126,7 +128,7 @@ subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
 
                if(!memcmp(address, &p->net.mac.address, sizeof *address)) {
                        r = p;
-                       if(p->owner->status.reachable)
+                       if(!p->owner || p->owner->status.reachable)
                                break;
                }
        }
@@ -155,7 +157,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
 
                if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) {
                        r = p;
-                       if(p->owner->status.reachable)
+                       if(!p->owner || p->owner->status.reachable)
                                break;
                }
        }
@@ -184,7 +186,7 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
 
                if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) {
                        r = p;
-                       if(p->owner->status.reachable)
+                       if(!p->owner || p->owner->status.reachable)
                                break;
                }
        }
@@ -205,21 +207,21 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
        // Prepare environment variables to be passed to the script
 
        char *envp[10] = {NULL};
-       xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-       xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-       xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-       xasprintf(&envp[3], "NODE=%s", owner->name);
+       int n = 0;
+       xasprintf(&envp[n++], "NETNAME=%s", netname ? : "");
+       xasprintf(&envp[n++], "DEVICE=%s", device ? : "");
+       xasprintf(&envp[n++], "INTERFACE=%s", iface ? : "");
+       xasprintf(&envp[n++], "NODE=%s", owner->name);
 
        if(owner != myself) {
                sockaddr2str(&owner->address, &address, &port);
-               // 4 and 5 are reserved for SUBNET and WEIGHT
-               xasprintf(&envp[6], "REMOTEADDRESS=%s", address);
-               xasprintf(&envp[7], "REMOTEPORT=%s", port);
+               xasprintf(&envp[n++], "REMOTEADDRESS=%s", address);
+               xasprintf(&envp[n++], "REMOTEPORT=%s", port);
                free(port);
                free(address);
        }
 
-       xasprintf(&envp[8], "NAME=%s", myself->name);
+       xasprintf(&envp[n++], "NAME=%s", myself->name);
 
        name = up ? "subnet-up" : "subnet-down";
 
@@ -236,12 +238,10 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
                                weight = empty;
 
                        // Prepare the SUBNET and WEIGHT variables
-                       if(envp[4])
-                               free(envp[4]);
-                       if(envp[5])
-                               free(envp[5]);
-                       xasprintf(&envp[4], "SUBNET=%s", netstr);
-                       xasprintf(&envp[5], "WEIGHT=%s", weight);
+                       free(envp[n]);
+                       free(envp[n + 1]);
+                       xasprintf(&envp[n], "SUBNET=%s", netstr);
+                       xasprintf(&envp[n + 1], "WEIGHT=%s", weight);
 
                        execute_script(name, envp);
                }
@@ -255,8 +255,8 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
                                weight = empty;
 
                        // Prepare the SUBNET and WEIGHT variables
-                       xasprintf(&envp[4], "SUBNET=%s", netstr);
-                       xasprintf(&envp[5], "WEIGHT=%s", weight);
+                       xasprintf(&envp[n], "SUBNET=%s", netstr);
+                       xasprintf(&envp[n + 1], "WEIGHT=%s", weight);
 
                        execute_script(name, envp);
                }
@@ -275,7 +275,7 @@ bool dump_subnets(connection_t *c) {
 
                send_request(c, "%d %d %s %s",
                                CONTROL, REQ_DUMP_SUBNETS,
-                               netstr, subnet->owner->name);
+                               netstr, subnet->owner ? subnet->owner->name : "(broadcast)");
        }
 
        return send_request(c, "%d %d", CONTROL, REQ_DUMP_SUBNETS);