tunnelserver: log which ADD_SUBNET was refused

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 7526779..94e25b6 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -314,7 +314,7 @@ bool setup_myself(void)
 
 #if !defined(SOL_IP) || !defined(IP_TOS)
        if(priorityinheritance)
-               logger(LOG_WARNING, _("PriorityInheritance not supported on this platform"));
+               logger(LOG_WARNING, _("%s not supported on this platform"), "PriorityInheritance");
 #endif
 
        if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
@@ -503,9 +503,9 @@ bool setup_myself(void)
 }
 
 /*
-  setup all initial network connections
+  initialize network
 */
-bool setup_network_connections(void)
+bool setup_network(void)
 {
        cp();
 
@@ -536,8 +536,6 @@ bool setup_network_connections(void)
        if(!setup_myself())
                return false;
 
-       try_outgoing_connections();
-
        return true;
 }
 
@@ -590,8 +588,6 @@ void close_network_connections(void)
 
        if(myport) free(myport);
 
-       EVP_CIPHER_CTX_cleanup(&packet_ctx);
-
        for(i = 0; i < 4; i++)
                free(envp[i]);