j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Rename setup_network_connections() and split out try_outgoing_connections()

Browse source 
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.
This commit is contained in:
Michael Tokarev 2009-05-18 16:25:10 +04:00 committed by Guus Sliepen
parent 3308d13e7e
commit 6698f7c390
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/net.h
View file

@ -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 send_packet(const struct node_t *, vpn_packet_t *);
extern void receive_tcppacket(struct connection_t *, char *, int); extern void receive_tcppacket(struct connection_t *, char *, int);
extern void broadcast_packet(const struct node_t *, vpn_packet_t *); 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 setup_outgoing_connection(struct outgoing_t *);
extern void try_outgoing_connections(void); extern void try_outgoing_connections(void);
extern void close_network_connections(void); extern void close_network_connections(void);

6
src/net_setup.c
View file

@ -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()) if(!setup_myself())
return false; return false;
try_outgoing_connections();
return true; return true;
} }

7
src/tincd.c
View file

@ -501,12 +501,15 @@ int main2(int argc, char **argv)
if(!detach()) if(!detach())
return 1; 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. */ /* Start main loop. It only exits when tinc is killed. */
status = main_loop(); status = main_loop();