X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet.h;fp=src%2Fnet.h;h=68cca02ee08704c7344a32f8a579a00ce4dd9a19;hb=f4851be7f5dade24a5f43d366188c033c0f8b426;hp=66e29642fda170ff84969f31cd1cdd40d822c980;hpb=9de37fa18e63d71a4676e9d1c9820b09861c949b;p=tinc

diff --git a/src/net.h b/src/net.h
index 66e29642..68cca02e 100644
--- a/src/net.h
+++ b/src/net.h
@@ -85,10 +85,9 @@ typedef struct vpn_packet_t {
 } vpn_packet_t;
 
 typedef struct listen_socket_t {
-	struct event ev_tcp;
-	struct event ev_udp;
 	int tcp;
 	int udp;
+	thread_t tcp_thread;
 	thread_t udp_thread;
 	sockaddr_t sa;
 } listen_socket_t;
@@ -130,7 +129,7 @@ extern void retry_outgoing(outgoing_t *);
 extern void handle_incoming_vpn_data(void *);
 extern void finish_connecting(struct connection_t *);
 extern void do_outgoing_connection(struct connection_t *);
-extern void handle_new_meta_connection(int, short, void *);
+extern void handle_new_meta_connection(void *);
 extern int setup_listen_socket(const sockaddr_t *);
 extern int setup_vpn_in_socket(const sockaddr_t *);
 extern void send_packet(const struct node_t *, vpn_packet_t *);