Merge branch 'master' into dirtydebug

[meshlink] / src / net.h

diff --git a/src/net.h b/src/net.h
index 845fd7585ce5806166690d1c51fff0b6098da396..f534efdda46efc3f1acf7e89c59959ade976669d 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -130,7 +130,6 @@ extern sockaddr_t localdiscovery_address;
 
 extern listen_socket_t listen_socket[MAXSOCKETS];
 extern int listen_sockets;
-extern io_t unix_socket;
 extern int keylifetime;
 extern int udp_rcvbuf;
 extern int udp_sndbuf;
@@ -169,7 +168,6 @@ extern void handle_incoming_vpn_data(void *, int);
 extern void finish_connecting(struct connection_t *);
 extern bool do_outgoing_connection(struct outgoing_t *);
 extern void handle_new_meta_connection(void *, int);
-extern void handle_new_unix_connection(void *, int);
 extern int setup_listen_socket(const sockaddr_t *);
 extern int setup_vpn_in_socket(const sockaddr_t *);
 extern bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len);
@@ -204,4 +202,7 @@ extern void load_all_nodes(void);
 extern CRITICAL_SECTION mutex;
 #endif
 
+//TODO: move this to a better place
+extern char *confbase;
+
 #endif /* __TINC_NET_H__ */