Make sure the prefixlength of subnets is sane.

[oweals/tinc.git] / src / subnet.c

diff --git a/src/subnet.c b/src/subnet.c
index d5eca5830b72043034d833da8fd8a81298f9bba1..52ed443713e2147779061bb135b98f3ba28c7eb9 100644 (file)
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -1,7 +1,7 @@
 /*
     subnet.c -- handle subnet lookups and lists
-    Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,16 +17,18 @@
     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.52 2003/12/12 19:52:25 guus Exp $
+    $Id$
 */
 
 #include "system.h"
 
 #include "avl_tree.h"
+#include "device.h"
 #include "logger.h"
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
+#include "process.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
@@ -186,11 +188,17 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
 
        if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d",
                          &x[0], &x[1], &x[2], &x[3], &l) == 5) {
+               if(l < 0 || l > 32)
+                       return false;
+
                subnet->type = SUBNET_IPV4;
                subnet->net.ipv4.prefixlength = l;
 
-               for(i = 0; i < 4; i++)
+               for(i = 0; i < 4; i++) {
+                       if(x[i] > 255)
+                               return false;
                        subnet->net.ipv4.address.x[i] = x[i];
+               }
 
                return true;
        }
@@ -198,6 +206,9 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
        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],
                          &l) == 9) {
+               if(l < 0 || l > 128)
+                       return false;
+
                subnet->type = SUBNET_IPV6;
                subnet->net.ipv6.prefixlength = l;
 
@@ -211,8 +222,11 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
                subnet->type = SUBNET_IPV4;
                subnet->net.ipv4.prefixlength = 32;
 
-               for(i = 0; i < 4; i++)
+               for(i = 0; i < 4; i++) {
+                       if(x[i] > 255)
+                               return false;
                        subnet->net.ipv4.address.x[i] = x[i];
+               }
 
                return true;
        }
@@ -245,6 +259,11 @@ 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",
@@ -284,7 +303,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet)
                        exit(0);
        }
 
-       return netstr;
+       return true;
 }
 
 /* Subnet lookup routines */
@@ -335,12 +354,14 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
                                break;
                        }
 
-                       if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength, sizeof(ipv4_t)))
+                       if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength))
                                break;
                        else {
                                /* Otherwise, see if there is a bigger enclosing subnet */
 
                                subnet.net.ipv4.prefixlength = p->net.ipv4.prefixlength - 1;
+                               if(subnet.net.ipv4.prefixlength < 0 || subnet.net.ipv4.prefixlength > 32)
+                                       return NULL;
                                maskcpy(&subnet.net.ipv4.address, &p->net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t));
                        }
                }
@@ -371,12 +392,14 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
                        if(p->type != SUBNET_IPV6)
                                return NULL;
 
-                       if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength, sizeof(ipv6_t)))
+                       if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength))
                                break;
                        else {
                                /* Otherwise, see if there is a bigger enclosing subnet */
 
                                subnet.net.ipv6.prefixlength = p->net.ipv6.prefixlength - 1;
+                               if(subnet.net.ipv6.prefixlength < 0 || subnet.net.ipv6.prefixlength > 128)
+                                       return NULL;
                                maskcpy(&subnet.net.ipv6.address, &p->net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t));
                        }
                }
@@ -385,6 +408,52 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
        return p;
 }
 
+void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
+       avl_node_t *node;
+       int i;
+       char *envp[8];
+       char netstr[MAXNETSTR + 7] = "SUBNET=";
+       char *name, *address, *port;
+
+       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);
+
+       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;
+       }
+
+       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))
+                               continue;
+                       execute_script(name, envp);
+               }
+       } else {
+               if(net2str(netstr + 7, sizeof netstr - 7, subnet))
+                       execute_script(name, envp);
+       }
+
+       for(i = 0; i < (owner != myself ? 6 : 4); i++)
+               free(envp[i]);
+
+       if(owner != myself) {
+               free(address);
+               free(port);
+       }
+}
+
 void dump_subnets(void)
 {
        char netstr[MAXNETSTR];