Rename setup_network_connections() and split out try_outgoing_connections()

In preparation of chroot/setuid operations, split out call to
try_outgoing_connections() from setup_network_connections()
(which was the last call in setup_network_connections()).
This is because dropping privileges should be done in-between
setup_network_connections() and try_outgoing_connections().

This patch renames setup_network_connections() to setup_network()
and moves call to try_outgoing_connections() into main routine.

No functional changes.

diff --git a/src/net.h b/src/net.h
index e07e646..ef21179 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -132,7 +132,7 @@ extern int setup_vpn_in_socket(const sockaddr_t *);
 extern void send_packet(const struct node_t *, vpn_packet_t *);
 extern void receive_tcppacket(struct connection_t *, char *, int);
 extern void broadcast_packet(const struct node_t *, vpn_packet_t *);
 extern void send_packet(const struct node_t *, vpn_packet_t *);
 extern void receive_tcppacket(struct connection_t *, char *, int);
 extern void broadcast_packet(const struct node_t *, vpn_packet_t *);

-extern bool setup_network_connections(void);
+extern bool setup_network(void);

 extern void setup_outgoing_connection(struct outgoing_t *);
 extern void try_outgoing_connections(void);
 extern void close_network_connections(void);
 extern void setup_outgoing_connection(struct outgoing_t *);
 extern void try_outgoing_connections(void);
 extern void close_network_connections(void);

diff --git a/src/net_setup.c b/src/net_setup.c
index 7526779..ec47558 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -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();
 
 {
        cp();
 


@@ -536,8 +536,6 @@ bool setup_network_connections(void)
        if(!setup_myself())
                return false;
 
        if(!setup_myself())
                return false;
 

-       try_outgoing_connections();
-

        return true;
 }
 
        return true;
 }
 

diff --git a/src/tincd.c b/src/tincd.c
index f909d9a..6fa8785 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -500,13 +500,16 @@ int main2(int argc, char **argv)
 
        if(!detach())
                return 1;
 
        if(!detach())
                return 1;

-               

 
        /* Setup sockets and open device. */
 
 
        /* Setup sockets and open device. */
 

-       if(!setup_network_connections())
+       if(!setup_network())

                goto end;
 
                goto end;
 

+       /* Initiate all outgoing connections. */
+
+       try_outgoing_connections();
+

        /* Start main loop. It only exits when tinc is killed. */
 
        status = main_loop();
        /* Start main loop. It only exits when tinc is killed. */
 
        status = main_loop();