Merge branch 'master' into 1.1

[tinc] / src / net.h

diff --git a/src/net.h b/src/net.h
index d320c15..a28f478 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -131,7 +131,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 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);