Add stricter checks for netnames.
[tinc] / src / subnet.c
index 75fe31f..090a62b 100644 (file)
@@ -1,6 +1,6 @@
 /*
     subnet.c -- handle subnet lookups and lists
-    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
 #include "splay_tree.h"
+#include "control_common.h"
 #include "device.h"
+#include "hash.h"
 #include "logger.h"
+#include "names.h"
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
-#include "process.h"
+#include "script.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
@@ -39,502 +40,243 @@ splay_tree_t *subnet_tree;
 
 /* Subnet lookup cache */
 
-static ipv4_t cache_ipv4_address[2];
-static subnet_t *cache_ipv4_subnet[2];
-static bool cache_ipv4_valid[2];
-static int cache_ipv4_slot;
-
-static ipv6_t cache_ipv6_address[2];
-static subnet_t *cache_ipv6_subnet[2];
-static bool cache_ipv6_valid[2];
-static int cache_ipv6_slot;
-
-void subnet_cache_flush() {
-       cache_ipv4_valid[0] = cache_ipv4_valid[1] = false;
-       cache_ipv6_valid[0] = cache_ipv6_valid[1] = false;
-}
-
-/* Subnet comparison */
-
-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 a->net.mac.address);
-
-       if(result)
-               return result;
-       
-       result = a->weight - b->weight;
-
-       if(result || !a->owner || !b->owner)
-               return result;
-
-       return strcmp(a->owner->name, b->owner->name);
-}
-
-static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
-{
-       int result;
-
-       result = b->net.ipv4.prefixlength - a->net.ipv4.prefixlength;
-
-       if(result)
-               return result;
-
-       result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t));
-
-       if(result)
-               return result;
-       
-       result = a->weight - b->weight;
-
-       if(result || !a->owner || !b->owner)
-               return result;
-
-       return strcmp(a->owner->name, b->owner->name);
-}
-
-static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
-{
-       int result;
-
-       result = b->net.ipv6.prefixlength - a->net.ipv6.prefixlength;
-
-       if(result)
-               return result;
-       
-       result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
-
-       if(result)
-               return result;
-       
-       result = a->weight - b->weight;
-
-       if(result || !a->owner || !b->owner)
-               return result;
-
-       return strcmp(a->owner->name, b->owner->name);
-}
-
-int subnet_compare(const subnet_t *a, const subnet_t *b)
-{
-       int result;
-
-       result = a->type - b->type;
-
-       if(result)
-               return result;
-
-       switch (a->type) {
-       case SUBNET_MAC:
-               return subnet_compare_mac(a, b);
-       case SUBNET_IPV4:
-               return subnet_compare_ipv4(a, b);
-       case SUBNET_IPV6:
-               return subnet_compare_ipv6(a, b);
-       default:
-               logger(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"),
-                          a->type);
-               cp_trace();
-               exit(0);
-       }
+static hash_t *ipv4_cache;
+static hash_t *ipv6_cache;
+static hash_t *mac_cache;
 
-       return 0;
+void subnet_cache_flush(void) {
+       hash_clear(ipv4_cache);
+       hash_clear(ipv6_cache);
+       hash_clear(mac_cache);
 }
 
 /* Initialising trees */
 
-void init_subnets(void)
-{
-       cp();
-
+void init_subnets(void) {
        subnet_tree = splay_alloc_tree((splay_compare_t) subnet_compare, (splay_action_t) free_subnet);
 
-       subnet_cache_flush();
+       ipv4_cache = hash_alloc(0x100, sizeof(ipv4_t));
+       ipv6_cache = hash_alloc(0x100, sizeof(ipv6_t));
+       mac_cache = hash_alloc(0x100, sizeof(mac_t));
 }
 
-void exit_subnets(void)
-{
-       cp();
-
+void exit_subnets(void) {
        splay_delete_tree(subnet_tree);
-}
 
-splay_tree_t *new_subnet_tree(void)
-{
-       cp();
+       hash_free(ipv4_cache);
+       hash_free(ipv6_cache);
+       hash_free(mac_cache);
+}
 
+splay_tree_t *new_subnet_tree(void) {
        return splay_alloc_tree((splay_compare_t) subnet_compare, NULL);
 }
 
-void free_subnet_tree(splay_tree_t *subnet_tree)
-{
-       cp();
-
+void free_subnet_tree(splay_tree_t *subnet_tree) {
        splay_delete_tree(subnet_tree);
 }
 
 /* Allocating and freeing space for subnets */
 
-subnet_t *new_subnet(void)
-{
-       cp();
-
-       return xmalloc_and_zero(sizeof(subnet_t));
+subnet_t *new_subnet(void) {
+       return xzalloc(sizeof(subnet_t));
 }
 
-void free_subnet(subnet_t *subnet)
-{
-       cp();
-
+void free_subnet(subnet_t *subnet) {
        free(subnet);
 }
 
 /* Adding and removing subnets */
 
-void subnet_add(node_t *n, subnet_t *subnet)
-{
-       cp();
-
+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)
-{
-       cp();
-
-       splay_delete(n->subnet_tree, subnet);
+void subnet_del(node_t *n, subnet_t *subnet) {
+       if (n)
+               splay_delete(n->subnet_tree, subnet);
        splay_delete(subnet_tree, subnet);
 
        subnet_cache_flush();
 }
 
-/* Ascii representation of subnets */
-
-bool str2net(subnet_t *subnet, const char *subnetstr)
-{
-       int i, l;
-       uint16_t x[8];
-       int weight = 10;
-
-       cp();
-
-       if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d#%d",
-                         &x[0], &x[1], &x[2], &x[3], &l, &weight) >= 5) {
-               if(l < 0 || l > 32)
-                       return false;
-
-               subnet->type = SUBNET_IPV4;
-               subnet->net.ipv4.prefixlength = l;
-               subnet->weight = weight;
-
-               for(i = 0; i < 4; i++) {
-                       if(x[i] > 255)
-                               return false;
-                       subnet->net.ipv4.address.x[i] = x[i];
-               }
+/* Subnet lookup routines */
 
-               return true;
-       }
+subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
+       return splay_search(owner->subnet_tree, subnet);
+}
 
-       if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d#%d",
-                         &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7],
-                         &l, &weight) >= 9) {
-               if(l < 0 || l > 128)
-                       return false;
+subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
+       subnet_t *r = NULL;
 
-               subnet->type = SUBNET_IPV6;
-               subnet->net.ipv6.prefixlength = l;
-               subnet->weight = weight;
+       // Check if this address is cached
 
-               for(i = 0; i < 8; i++)
-                       subnet->net.ipv6.address.x[i] = htons(x[i]);
+       if((r = hash_search(mac_cache, address)))
+               return r;
 
-               return true;
-       }
+       // Search all subnets for a matching one
 
-       if(sscanf(subnetstr, "%hu.%hu.%hu.%hu#%d", &x[0], &x[1], &x[2], &x[3], &weight) >= 4) {
-               subnet->type = SUBNET_IPV4;
-               subnet->net.ipv4.prefixlength = 32;
-               subnet->weight = weight;
+       for splay_each(subnet_t, p, owner ? owner->subnet_tree : subnet_tree) {
+               if(!p || p->type != SUBNET_MAC)
+                       continue;
 
-               for(i = 0; i < 4; i++) {
-                       if(x[i] > 255)
-                               return false;
-                       subnet->net.ipv4.address.x[i] = x[i];
+               if(!memcmp(address, &p->net.mac.address, sizeof *address)) {
+                       r = p;
+                       if(!p->owner || p->owner->status.reachable)
+                               break;
                }
-
-               return true;
        }
 
-       if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx#%d",
-                         &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7], &weight) >= 8) {
-               subnet->type = SUBNET_IPV6;
-               subnet->net.ipv6.prefixlength = 128;
-               subnet->weight = weight;
-
-               for(i = 0; i < 8; i++)
-                       subnet->net.ipv6.address.x[i] = htons(x[i]);
-
-               return true;
-       }
-
-       if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx#%d",
-                         &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &weight) >= 6) {
-               subnet->type = SUBNET_MAC;
-               subnet->weight = weight;
-
-               for(i = 0; i < 6; i++)
-                       subnet->net.mac.address.x[i] = x[i];
-
-               return true;
-       }
-
-       return false;
-}
-
-bool net2str(char *netstr, int len, const subnet_t *subnet)
-{
-       cp();
-
-       if(!netstr || !subnet) {
-               logger(LOG_ERR, _("net2str() was called with netstr=%p, subnet=%p!\n"), netstr, subnet);
-               return false;
-       }
-
-       switch (subnet->type) {
-               case SUBNET_MAC:
-                       snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx#%d",
-                                        subnet->net.mac.address.x[0],
-                                        subnet->net.mac.address.x[1],
-                                        subnet->net.mac.address.x[2],
-                                        subnet->net.mac.address.x[3],
-                                        subnet->net.mac.address.x[4],
-                                        subnet->net.mac.address.x[5],
-                                        subnet->weight);
-                       break;
-
-               case SUBNET_IPV4:
-                       snprintf(netstr, len, "%hu.%hu.%hu.%hu/%d#%d",
-                                        subnet->net.ipv4.address.x[0],
-                                        subnet->net.ipv4.address.x[1],
-                                        subnet->net.ipv4.address.x[2],
-                                        subnet->net.ipv4.address.x[3],
-                                        subnet->net.ipv4.prefixlength,
-                                        subnet->weight);
-                       break;
-
-               case SUBNET_IPV6:
-                       snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d#%d",
-                                        ntohs(subnet->net.ipv6.address.x[0]),
-                                        ntohs(subnet->net.ipv6.address.x[1]),
-                                        ntohs(subnet->net.ipv6.address.x[2]),
-                                        ntohs(subnet->net.ipv6.address.x[3]),
-                                        ntohs(subnet->net.ipv6.address.x[4]),
-                                        ntohs(subnet->net.ipv6.address.x[5]),
-                                        ntohs(subnet->net.ipv6.address.x[6]),
-                                        ntohs(subnet->net.ipv6.address.x[7]),
-                                        subnet->net.ipv6.prefixlength,
-                                        subnet->weight);
-                       break;
-
-               default:
-                       logger(LOG_ERR,
-                                  _("net2str() was called with unknown subnet type %d, exiting!"),
-                                  subnet->type);
-                       cp_trace();
-                       exit(0);
-       }
-
-       return true;
-}
-
-/* Subnet lookup routines */
-
-subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet)
-{
-       cp();
-
-       return splay_search(owner->subnet_tree, subnet);
-}
-
-subnet_t *lookup_subnet_mac(const mac_t *address)
-{
-       subnet_t *p, subnet = {0};
-
-       cp();
-
-       subnet.type = SUBNET_MAC;
-       subnet.net.mac.address = *address;
-       subnet.owner = NULL;
+       // Cache the result
 
-       p = splay_search(subnet_tree, &subnet);
+       if(r)
+               hash_insert(mac_cache, address, r);
 
-       return p;
+       return r;
 }
 
-subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
-{
-       subnet_t *p, *r = NULL, subnet = {0};
-       splay_node_t *n;
-       int i;
-
-       cp();
+subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
+       subnet_t *r = NULL;
 
        // Check if this address is cached
 
-       for(i = 0; i < 2; i++) {
-               if(!cache_ipv4_valid[i])
-                       continue;
-               if(!memcmp(address, &cache_ipv4_address[i], sizeof *address))
-                       return cache_ipv4_subnet[i];
-       }
+       if((r = hash_search(ipv4_cache, address)))
+               return r;
 
        // Search all subnets for a matching one
 
-       subnet.type = SUBNET_IPV4;
-       subnet.net.ipv4.address = *address;
-       subnet.net.ipv4.prefixlength = 32;
-       subnet.owner = NULL;
-
-       for(n = subnet_tree->head; n; n = n->next) {
-               p = n->data;
-               
-               if(!p || p->type != subnet.type)
+       for splay_each(subnet_t, p, subnet_tree) {
+               if(!p || p->type != SUBNET_IPV4)
                        continue;
 
                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;
                }
        }
 
        // Cache the result
 
-       cache_ipv4_slot = !cache_ipv4_slot;
-       memcpy(&cache_ipv4_address[cache_ipv4_slot], address, sizeof *address);
-       cache_ipv4_subnet[cache_ipv4_slot] = r;
-       cache_ipv4_valid[cache_ipv4_slot] = true;
+       if(r)
+               hash_insert(ipv4_cache, address, r);
 
        return r;
 }
 
-subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
-{
-       subnet_t *p, *r = NULL, subnet = {0};
-       splay_node_t *n;
-       int i;
-
-       cp();
+subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
+       subnet_t *r = NULL;
 
        // Check if this address is cached
 
-       for(i = 0; i < 2; i++) {
-               if(!cache_ipv6_valid[i])
-                       continue;
-               if(!memcmp(address, &cache_ipv6_address[i], sizeof *address))
-                       return cache_ipv6_subnet[i];
-       }
+       if((r = hash_search(ipv6_cache, address)))
+               return r;
 
        // Search all subnets for a matching one
 
-       subnet.type = SUBNET_IPV6;
-       subnet.net.ipv6.address = *address;
-       subnet.net.ipv6.prefixlength = 128;
-       subnet.owner = NULL;
-
-       for(n = subnet_tree->head; n; n = n->next) {
-               p = n->data;
-               
-               if(!p || p->type != subnet.type)
+       for splay_each(subnet_t, p, subnet_tree) {
+               if(!p || p->type != SUBNET_IPV6)
                        continue;
 
                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;
                }
        }
 
        // Cache the result
 
-       cache_ipv6_slot = !cache_ipv6_slot;
-       memcpy(&cache_ipv6_address[cache_ipv6_slot], address, sizeof *address);
-       cache_ipv6_subnet[cache_ipv6_slot] = r;
-       cache_ipv6_valid[cache_ipv6_slot] = true;
+       if(r)
+               hash_insert(ipv6_cache, address, r);
 
        return r;
 }
 
 void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
-       splay_node_t *node;
-       int i;
-       char *envp[8];
-       char netstr[MAXNETSTR + 7] = "SUBNET=";
+       char netstr[MAXNETSTR];
        char *name, *address, *port;
+       char empty[] = "";
 
-       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);
+       // Prepare environment variables to be passed to the script
+
+       char *envp[10] = {NULL};
+       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);
-               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;
+               xasprintf(&envp[n++], "REMOTEADDRESS=%s", address);
+               xasprintf(&envp[n++], "REMOTEPORT=%s", port);
+               free(port);
+               free(address);
        }
 
+       xasprintf(&envp[n++], "NAME=%s", myself->name);
+
        name = up ? "subnet-up" : "subnet-down";
 
        if(!subnet) {
-               for(node = owner->subnet_tree->head; node; node = node->next) {
-                       subnet = node->data;
-                       if(!net2str(netstr + 7, sizeof netstr - 7, subnet))
+               for splay_each(subnet_t, subnet, owner->subnet_tree) {
+                       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, '#');
+                       if(weight)
+                               *weight++ = 0;
+                       else
+                               weight = empty;
+
+                       // Prepare the SUBNET and WEIGHT variables
+                       free(envp[n]);
+                       free(envp[n + 1]);
+                       xasprintf(&envp[n], "SUBNET=%s", netstr);
+                       xasprintf(&envp[n + 1], "WEIGHT=%s", weight);
+
                        execute_script(name, envp);
                }
        } else {
-               if(net2str(netstr + 7, sizeof netstr - 7, subnet))
+               if(net2str(netstr, sizeof netstr, subnet)) {
+                       // Strip the weight from the subnet, and put it in its own environment variable
+                       char *weight = strchr(netstr, '#');
+                       if(weight)
+                               *weight++ = 0;
+                       else
+                               weight = empty;
+
+                       // Prepare the SUBNET and WEIGHT variables
+                       xasprintf(&envp[n], "SUBNET=%s", netstr);
+                       xasprintf(&envp[n + 1], "WEIGHT=%s", weight);
+
                        execute_script(name, envp);
+               }
        }
 
-       for(i = 0; i < (owner != myself ? 6 : 4); i++)
+       for(int i = 0; envp[i] && i < 9; i++)
                free(envp[i]);
-
-       if(owner != myself) {
-               free(address);
-               free(port);
-       }
 }
 
-int dump_subnets(struct evbuffer *out)
-{
-       char netstr[MAXNETSTR];
-       subnet_t *subnet;
-       splay_node_t *node;
-
-       cp();
+bool dump_subnets(connection_t *c) {
+       for splay_each(subnet_t, subnet, subnet_tree) {
+               char netstr[MAXNETSTR];
 
-       for(node = subnet_tree->head; node; node = node->next) {
-               subnet = node->data;
                if(!net2str(netstr, sizeof netstr, subnet))
                        continue;
-               if(evbuffer_add_printf(out, _(" %s owner %s\n"),
-                                                          netstr, subnet->owner->name) == -1)
-                       return errno;
+
+               send_request(c, "%d %d %s %s",
+                               CONTROL, REQ_DUMP_SUBNETS,
+                               netstr, subnet->owner ? subnet->owner->name : "(broadcast)");
        }
 
-       return 0;
+       return send_request(c, "%d %d", CONTROL, REQ_DUMP_SUBNETS);
 }