Introducing the Big Tinc Lock.

[tinc] / src / net.h

diff --git a/src/net.h b/src/net.h
index a6d5cb9..2be797d 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -21,6 +21,7 @@
 #ifndef __TINC_NET_H__
 #define __TINC_NET_H__
 
+#include "event.h"
 #include "ipv6.h"
 #include "cipher.h"
 #include "digest.h"
@@ -85,10 +86,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 +130,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 *);
@@ -146,7 +146,7 @@ extern void flush_queue(struct node_t *);
 extern bool read_rsa_public_key(struct connection_t *);
 extern void send_mtu_probe(struct node_t *);
 extern void handle_device_data(int, short, void *);
-extern void handle_meta_connection_data(int, short, void *);
+extern void handle_meta_connection_data(void *);
 extern void regenerate_key();
 extern void purge(void);
 extern void retry(void);
@@ -155,8 +155,8 @@ extern void load_all_subnets();
 
 #ifndef HAVE_MINGW
 #define closesocket(s) close(s)
-#else
-extern CRITICAL_SECTION mutex;
 #endif
 
+extern mutex_t mutex;
+
 #endif                                                 /* __TINC_NET_H__ */