Remove unused (and potentially segfaulting) net2str() call.

[tinc] / src / subnet.c

diff --git a/src/subnet.c b/src/subnet.c
index ae8d029..3652cd3 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-2004 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2004 Ivo Timmermans <ivo@tinc-vpn.org>
 
     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.51 2003/11/17 15:30:18 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"
@@ -177,16 +179,13 @@ void subnet_del(node_t *n, subnet_t *subnet)
 
 /* Ascii representation of subnets */
 
-subnet_t *str2net(const char *subnetstr)
+bool str2net(subnet_t *subnet, const char *subnetstr)
 {
        int i, l;
-       subnet_t *subnet;
        uint16_t x[8];
 
        cp();
 
-       subnet = new_subnet();
-
        if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d",
                          &x[0], &x[1], &x[2], &x[3], &l) == 5) {
                subnet->type = SUBNET_IPV4;
@@ -195,7 +194,7 @@ subnet_t *str2net(const char *subnetstr)
                for(i = 0; i < 4; i++)
                        subnet->net.ipv4.address.x[i] = x[i];
 
-               return subnet;
+               return true;
        }
 
        if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
@@ -207,7 +206,7 @@ subnet_t *str2net(const char *subnetstr)
                for(i = 0; i < 8; i++)
                        subnet->net.ipv6.address.x[i] = htons(x[i]);
 
-               return subnet;
+               return true;
        }
 
        if(sscanf(subnetstr, "%hu.%hu.%hu.%hu", &x[0], &x[1], &x[2], &x[3]) == 4) {
@@ -217,7 +216,7 @@ subnet_t *str2net(const char *subnetstr)
                for(i = 0; i < 4; i++)
                        subnet->net.ipv4.address.x[i] = x[i];
 
-               return subnet;
+               return true;
        }
 
        if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
@@ -228,7 +227,7 @@ subnet_t *str2net(const char *subnetstr)
                for(i = 0; i < 8; i++)
                        subnet->net.ipv6.address.x[i] = htons(x[i]);
 
-               return subnet;
+               return true;
        }
 
        if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx",
@@ -238,23 +237,24 @@ subnet_t *str2net(const char *subnetstr)
                for(i = 0; i < 6; i++)
                        subnet->net.mac.address.x[i] = x[i];
 
-               return subnet;
+               return true;
        }
 
-       free(subnet);
-
-       return NULL;
+       return false;
 }
 
-char *net2str(const subnet_t *subnet)
+bool net2str(char *netstr, int len, const subnet_t *subnet)
 {
-       char *netstr;
-
        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:
-                       asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx",
+                       snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx",
                                         subnet->net.mac.address.x[0],
                                         subnet->net.mac.address.x[1],
                                         subnet->net.mac.address.x[2],
@@ -263,7 +263,7 @@ char *net2str(const subnet_t *subnet)
                        break;
 
                case SUBNET_IPV4:
-                       asprintf(&netstr, "%hu.%hu.%hu.%hu/%d",
+                       snprintf(netstr, len, "%hu.%hu.%hu.%hu/%d",
                                         subnet->net.ipv4.address.x[0],
                                         subnet->net.ipv4.address.x[1],
                                         subnet->net.ipv4.address.x[2],
@@ -271,7 +271,7 @@ char *net2str(const subnet_t *subnet)
                        break;
 
                case SUBNET_IPV6:
-                       asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
+                       snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
                                         ntohs(subnet->net.ipv6.address.x[0]),
                                         ntohs(subnet->net.ipv6.address.x[1]),
                                         ntohs(subnet->net.ipv6.address.x[2]),
@@ -291,7 +291,7 @@ char *net2str(const subnet_t *subnet)
                        exit(0);
        }
 
-       return netstr;
+       return true;
 }
 
 /* Subnet lookup routines */
@@ -392,9 +392,55 @@ 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;
+       char netstr[MAXNETSTR];
        subnet_t *subnet;
        avl_node_t *node;
 
@@ -404,9 +450,9 @@ void dump_subnets(void)
 
        for(node = subnet_tree->head; node; node = node->next) {
                subnet = node->data;
-               netstr = net2str(subnet);
+               if(!net2str(netstr, sizeof netstr, subnet))
+                       continue;
                logger(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
-               free(netstr);
        }
 
        logger(LOG_DEBUG, _("End of subnet list."));