Remove unused (and potentially segfaulting) net2str() call.
authorGuus Sliepen <guus@tinc-vpn.org>
Wed, 6 Apr 2005 20:43:37 +0000 (20:43 +0000)
committerGuus Sliepen <guus@tinc-vpn.org>
Wed, 6 Apr 2005 20:43:37 +0000 (20:43 +0000)
src/subnet.c

index b52dfa5..3652cd3 100644 (file)
@@ -247,6 +247,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",
@@ -424,9 +429,6 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
                        execute_script(name, envp);
        }
 
-       net2str(netstr, sizeof netstr, subnet);
-       envp[6] = envp[7] = NULL;
-
        for(i = 0; i < (owner != myself ? 6 : 4); i++)
                free(envp[i]);