Remove pidfile/logfile/netname and so on.

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index a4cc2367bfb2cd3757fe7395f38a508d6a2ce364..35b301d828f9eb672defd4461eb30bc5f8b385f4 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -25,15 +25,12 @@
 #include "cipher.h"
 #include "conf.h"
 #include "connection.h"
-#include "control.h"
 #include "digest.h"
 #include "ecdsa.h"
 #include "graph.h"
 #include "logger.h"
-#include "names.h"
 #include "net.h"
 #include "netutl.h"
-#include "process.h"
 #include "protocol.h"
 #include "route.h"
 #include "rsa.h"
@@ -187,7 +184,7 @@ static bool read_ecdsa_private_key(void) {
        if(!fp) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file `%s': %s", fname, strerror(errno));
                if(errno == ENOENT)
-                       logger(DEBUG_ALWAYS, LOG_INFO, "Create an ECDSA keypair with `tinc -n %s generate-ecdsa-keys'.", netname ?: ".");
+                       logger(DEBUG_ALWAYS, LOG_INFO, "Create an ECDSA keypair with `tinc generate-ecdsa-keys'.");
                free(fname);
                return false;
        }
@@ -805,69 +802,27 @@ bool setup_myself(void) {
 
        /* Open sockets */
 
-       if(!do_detach && getenv("LISTEN_FDS")) {
-               sockaddr_t sa;
-               socklen_t salen;
-
-               listen_sockets = atoi(getenv("LISTEN_FDS"));
-#ifdef HAVE_UNSETENV
-               unsetenv("LISTEN_FDS");
-#endif
+       listen_sockets = 0;
+       int cfgs = 0;
 
-               if(listen_sockets > MAXSOCKETS) {
-                       logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
+       for(config_t *cfg = lookup_config(config_tree, "BindToAddress"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+               cfgs++;
+               get_config_string(cfg, &address);
+               if(!add_listen_address(address, true))
                        return false;
-               }
-
-               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));
-                               return false;
-                       }
-
-#ifdef FD_CLOEXEC
-                       fcntl(i + 3, F_SETFD, FD_CLOEXEC);
-#endif
-
-                       int udp_fd = setup_vpn_in_socket(&sa);
-                       if(udp_fd < 0)
-                               return false;
-
-                       io_add(&listen_socket[i].tcp, (io_cb_t)handle_new_meta_connection, &listen_socket[i], i + 3, IO_READ);
-                       io_add(&listen_socket[i].udp, (io_cb_t)handle_incoming_vpn_data, &listen_socket[i], udp_fd, IO_READ);
-
-                       if(debug_level >= DEBUG_CONNECTIONS) {
-                               hostname = sockaddr2hostname(&sa);
-                               logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
-                               free(hostname);
-                       }
-
-                       memcpy(&listen_socket[i].sa, &sa, salen);
-               }
-       } else {
-               listen_sockets = 0;
-               int cfgs = 0;
-
-               for(config_t *cfg = lookup_config(config_tree, "BindToAddress"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
-                       cfgs++;
-                       get_config_string(cfg, &address);
-                       if(!add_listen_address(address, true))
-                               return false;
-               }
-
-               for(config_t *cfg = lookup_config(config_tree, "ListenAddress"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
-                       cfgs++;
-                       get_config_string(cfg, &address);
-                       if(!add_listen_address(address, false))
-                               return false;
-               }
+       }
 
-               if(!cfgs)
-                       if(!add_listen_address(address, NULL))
-                               return false;
+       for(config_t *cfg = lookup_config(config_tree, "ListenAddress"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+               cfgs++;
+               get_config_string(cfg, &address);
+               if(!add_listen_address(address, false))
+                       return false;
        }
 
+       if(!cfgs)
+               if(!add_listen_address(address, NULL))
+                       return false;
+
        if(!listen_sockets) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Unable to create any listening socket!");
                return false;
@@ -923,9 +878,6 @@ bool setup_network(void) {
        if(!setup_myself())
                return false;
 
-       if(!init_control())
-               return false;
-
        return true;
 }
 
@@ -936,9 +888,6 @@ void close_network_connections(void) {
        for(list_node_t *node = connection_list->head, *next; node; node = next) {
                next = node->next;
                connection_t *c = node->data;
-               /* Keep control connections open until the end, so they know when we really terminated */
-               if(c->status.control)
-                       c->socket = -1;
                c->outgoing = NULL;
                terminate_connection(c, false);
        }
@@ -965,7 +914,5 @@ void close_network_connections(void) {
 
        if(myport) free(myport);
 
-       exit_control();
-
        return;
 }