Remove broadcast-based local discovery mechanism.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 8c04d00..0a97e03 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -417,7 +417,7 @@ char *get_name(void) {
                                return false;
                        }
                        if(gethostname(hostname, sizeof hostname) || !*hostname) {
-                               logger(DEBUG_ALWAYS, LOG_ERR, "Could not get hostname: %s\n", strerror(errno));
+                               logger(DEBUG_ALWAYS, LOG_ERR, "Could not get hostname: %s\n", sockstrerror(sockerrno));
                                return false;
                        }
                        hostname[31] = 0;
@@ -532,16 +532,6 @@ 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;
@@ -728,6 +718,9 @@ static bool add_listen_address(char *address, bool bindto) {
 }
 
 void device_enable(void) {
+       if (devops.enable)
+               devops.enable();
+
        /* Run tinc-up script to further initialize the tap interface */
 
        char *envp[5] = {NULL};
@@ -753,6 +746,9 @@ void device_disable(void) {
 
        for(int i = 0; i < 4; i++)
                free(envp[i]);
+
+       if (devops.disable)
+               devops.disable();
 }
 
 /*
@@ -974,7 +970,7 @@ static bool setup_myself(void) {
                for(int i = 0; i < listen_sockets; i++) {
                        salen = sizeof sa;
                        if(getsockname(i + 3, &sa.sa, &salen) < 0) {
-                               logger(DEBUG_ALWAYS, LOG_ERR, "Could not get address of listen fd %d: %s", i + 3, sockstrerror(errno));
+                               logger(DEBUG_ALWAYS, LOG_ERR, "Could not get address of listen fd %d: %s", i + 3, sockstrerror(sockerrno));
                                return false;
                        }