Remove global variables from the event loop code.

[meshlink] / src / net.h

diff --git a/src/net.h b/src/net.h
index 432825fe099e58bcc10586170a04ef263dab3a06..2e38477815719805d2ea4d06129c5a5b265fdda0 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -20,8 +20,6 @@
 #ifndef __TINC_NET_H__
 #define __TINC_NET_H__
 
-#include "cipher.h"
-#include "digest.h"
 #include "event.h"
 #include "sockaddr.h"
 
@@ -31,14 +29,12 @@
 #define MTU 1518        /* 1500 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
 #endif
 
-/* MAXSIZE is the maximum size of an encapsulated packet: MTU + seqno + padding + HMAC + compressor overhead */
-#define MAXSIZE (MTU + 4 + CIPHER_MAX_BLOCK_SIZE + DIGEST_MAX_SIZE + MTU/64 + 20)
+/* MAXSIZE is the maximum size of an encapsulated packet: MTU + seqno + HMAC + compressor overhead */
+#define MAXSIZE (MTU + 4 + 32 + MTU/64 + 20)
 
 /* MAXBUFSIZE is the maximum size of a request: enough for a MAXSIZEd packet or a 8192 bits RSA key */
 #define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128)
 
-#define MAXSOCKETS 8    /* Probably overkill... */
-
 typedef struct vpn_packet_t {
        struct {
                unsigned int probe:1;
@@ -59,13 +55,6 @@ typedef enum packet_type_t {
        PACKET_PROBE
 } packet_type_t;
 
-typedef struct listen_socket_t {
-       struct io_t tcp;
-       struct io_t udp;
-       sockaddr_t sa;
-       bool bindto;
-} listen_socket_t;
-
 #include "conf.h"
 #include "list.h"
 
@@ -83,8 +72,6 @@ extern int maxoutbufsize;
 extern int addressfamily;
 extern unsigned replaywin;
 
-extern listen_socket_t listen_socket[MAXSOCKETS];
-extern int listen_sockets;
 extern int keylifetime;
 extern int max_connection_burst;
 extern bool do_prune;
@@ -95,10 +82,10 @@ extern int autoconnect;
 #include "node.h"
 
 extern void retry_outgoing(outgoing_t *);
-extern void handle_incoming_vpn_data(void *, int);
+extern void handle_incoming_vpn_data(struct event_loop_t *loop, 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_meta_connection(struct event_loop_t *loop, 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);
@@ -117,7 +104,6 @@ extern void terminate_connection(struct connection_t *, bool);
 extern bool node_read_ecdsa_public_key(struct node_t *);
 extern bool read_ecdsa_public_key(struct connection_t *);
 extern void send_mtu_probe(struct node_t *);
-extern void handle_device_data(void *, int);
 extern void handle_meta_connection_data(struct connection_t *);
 extern void regenerate_key(void);
 extern void purge(void);