Merge branch 'master' into 1.1

[meshlink] / src / subnet.c

diff --git a/src/subnet.c b/src/subnet.c
index 9547829fa74b7563478c9f04fe1828282ae81b37..057550ab0760455f1626aaedebb49aed970f9c9a 100644 (file)
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -22,7 +22,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "device.h"
 #include "logger.h"
 #include "net.h"
@@ -35,7 +35,7 @@
 
 /* lists type of subnet */
 
-avl_tree_t *subnet_tree;
+splay_tree_t *subnet_tree;
 
 /* Subnet lookup cache */
 
@@ -60,7 +60,7 @@ static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
 {
        int result;
 
-       result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
+       result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof a->net.mac.address);
 
        if(result)
                return result;
@@ -149,7 +149,7 @@ void init_subnets(void)
 {
        cp();
 
-       subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet);
+       subnet_tree = splay_alloc_tree((splay_compare_t) subnet_compare, (splay_action_t) free_subnet);
 
        subnet_cache_flush();
 }
@@ -158,21 +158,21 @@ void exit_subnets(void)
 {
        cp();
 
-       avl_delete_tree(subnet_tree);
+       splay_delete_tree(subnet_tree);
 }
 
-avl_tree_t *new_subnet_tree(void)
+splay_tree_t *new_subnet_tree(void)
 {
        cp();
 
-       return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
+       return splay_alloc_tree((splay_compare_t) subnet_compare, NULL);
 }
 
-void free_subnet_tree(avl_tree_t *subnet_tree)
+void free_subnet_tree(splay_tree_t *subnet_tree)
 {
        cp();
 
-       avl_delete_tree(subnet_tree);
+       splay_delete_tree(subnet_tree);
 }
 
 /* Allocating and freeing space for subnets */
@@ -199,8 +199,8 @@ void subnet_add(node_t *n, subnet_t *subnet)
 
        subnet->owner = n;
 
-       avl_insert(subnet_tree, subnet);
-       avl_insert(n->subnet_tree, subnet);
+       splay_insert(subnet_tree, subnet);
+       splay_insert(n->subnet_tree, subnet);
 
        subnet_cache_flush();
 }
@@ -209,8 +209,8 @@ void subnet_del(node_t *n, subnet_t *subnet)
 {
        cp();
 
-       avl_delete(n->subnet_tree, subnet);
-       avl_delete(subnet_tree, subnet);
+       splay_delete(n->subnet_tree, subnet);
+       splay_delete(subnet_tree, subnet);
 
        subnet_cache_flush();
 }
@@ -361,7 +361,7 @@ subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet)
 {
        cp();
 
-       return avl_search(owner->subnet_tree, subnet);
+       return splay_search(owner->subnet_tree, subnet);
 }
 
 subnet_t *lookup_subnet_mac(const mac_t *address)
@@ -374,7 +374,7 @@ subnet_t *lookup_subnet_mac(const mac_t *address)
        subnet.net.mac.address = *address;
        subnet.owner = NULL;
 
-       p = avl_search(subnet_tree, &subnet);
+       p = splay_search(subnet_tree, &subnet);
 
        return p;
 }
@@ -382,7 +382,7 @@ subnet_t *lookup_subnet_mac(const mac_t *address)
 subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
 {
        subnet_t *p, *r = NULL, subnet = {0};
-       avl_node_t *n;
+       splay_node_t *n;
        int i;
 
        cp();
@@ -429,7 +429,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
 subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
 {
        subnet_t *p, *r = NULL, subnet = {0};
-       avl_node_t *n;
+       splay_node_t *n;
        int i;
 
        cp();
@@ -474,26 +474,25 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
 }
 
 void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
-       avl_node_t *node;
+       splay_node_t *node;
        int i;
-       char *envp[8];
-       char netstr[MAXNETSTR + 7] = "SUBNET=";
+       char *envp[9] = {0};
+       char netstr[MAXNETSTR];
        char *name, *address, *port;
+       char empty[] = "";
+
+       // Prepare environment variables to be passed to the script
 
-       asprintf(&envp[0], "NETNAME=%s", netname ? : "");
-       asprintf(&envp[1], "DEVICE=%s", device ? : "");
-       asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-       asprintf(&envp[3], "NODE=%s", owner->name);
+       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);
 
        if(owner != myself) {
                sockaddr2str(&owner->address, &address, &port);
-               asprintf(&envp[4], "REMOTEADDRESS=%s", address);
-               asprintf(&envp[5], "REMOTEPORT=%s", port);
-               envp[6] = netstr;
-               envp[7] = NULL;
-       } else {
-               envp[4] = netstr;
-               envp[5] = NULL;
+               // 4 and 5 are reserved for SUBNET and WEIGHT
+               xasprintf(&envp[6], "REMOTEADDRESS=%s", address);
+               xasprintf(&envp[7], "REMOTEPORT=%s", port);
        }
 
        name = up ? "subnet-up" : "subnet-down";
@@ -501,40 +500,62 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
        if(!subnet) {
                for(node = owner->subnet_tree->head; node; node = node->next) {
                        subnet = node->data;
-                       if(!net2str(netstr + 7, sizeof netstr - 7, subnet))
+                       if(!net2str(netstr, sizeof netstr, subnet))
                                continue;
+                       // Strip the weight from the subnet, and put it in its own environment variable
+                       char *weight = strchr(netstr + 7, '#');
+                       if(weight)
+                               *weight++ = 0;
+                       else
+                               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);
+
                        execute_script(name, envp);
                }
        } else {
-               if(net2str(netstr + 7, sizeof netstr - 7, subnet))
+               if(net2str(netstr + 7, sizeof netstr - 7, subnet)) {
+                       // Strip the weight from the subnet, and put it in its own environment variable
+                       char *weight = strchr(netstr + 7, '#');
+                       if(weight)
+                               *weight++ = 0;
+                       else
+                               weight = empty;
+
+                       // Prepare the SUBNET and WEIGHT variables
+                       xasprintf(&envp[4], "SUBNET=%s", netstr);
+                       xasprintf(&envp[5], "WEIGHT=%s", weight);
+
                        execute_script(name, envp);
+               }
        }
 
-       for(i = 0; i < (owner != myself ? 6 : 4); i++)
+       for(i = 0; envp[i] && i < 9; i++)
                free(envp[i]);
-
-       if(owner != myself) {
-               free(address);
-               free(port);
-       }
 }
 
-void dump_subnets(void)
+int dump_subnets(struct evbuffer *out)
 {
        char netstr[MAXNETSTR];
        subnet_t *subnet;
-       avl_node_t *node;
+       splay_node_t *node;
 
        cp();
 
-       logger(LOG_DEBUG, _("Subnet list:"));
-
        for(node = subnet_tree->head; node; node = node->next) {
                subnet = node->data;
                if(!net2str(netstr, sizeof netstr, subnet))
                        continue;
-               logger(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
+               if(evbuffer_add_printf(out, _(" %s owner %s\n"),
+                                                          netstr, subnet->owner->name) == -1)
+                       return errno;
        }
 
-       logger(LOG_DEBUG, _("End of subnet list."));
+       return 0;
 }