Set $NAME when calling host-up/down and subnet-up/down scripts.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index c61a901..8ae1e72 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -444,6 +444,7 @@ bool setup_myself_reloadable(void) {
        char *fmode = NULL;
        char *bmode = NULL;
        char *afname = NULL;
+       char *address = NULL;
        char *space;
        bool choice;
 
@@ -534,6 +535,16 @@ bool setup_myself_reloadable(void) {
        get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
        get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
 
+       memset(&localdiscovery_address, 0, sizeof localdiscovery_address);
+       if(get_config_string(lookup_config(config_tree, "LocalDiscoveryAddress"), &address)) {
+               struct addrinfo *ai = str2addrinfo(address, myport, SOCK_DGRAM);
+               free(address);
+               if(!ai)
+                       return false;
+               memcpy(&localdiscovery_address, ai->ai_addr, ai->ai_addrlen);
+       }
+
+
        if(get_config_string(lookup_config(config_tree, "Mode"), &rmode)) {
                if(!strcasecmp(rmode, "router"))
                        routing_mode = RMODE_ROUTER;
@@ -817,12 +828,11 @@ static bool setup_myself(void) {
                io_add(&device_io, handle_device_data, NULL, device_fd, IO_READ);
 
        /* Run tinc-up script to further initialize the tap interface */
-       char *envp[5];
+       char *envp[5] = {NULL};
        xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
        xasprintf(&envp[1], "DEVICE=%s", device ? : "");
        xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
        xasprintf(&envp[3], "NAME=%s", myself->name);
-       envp[4] = NULL;
 
        execute_script("tinc-up", envp);
 
@@ -1054,12 +1064,11 @@ void close_network_connections(void) {
        close(unix_socket.fd);
 #endif
 
-       char *envp[5];
+       char *envp[5] = {NULL};
        xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
        xasprintf(&envp[1], "DEVICE=%s", device ? : "");
        xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
        xasprintf(&envp[3], "NAME=%s", myself->name);
-       envp[4] = NULL;
 
        exit_requests();
        exit_edges();