X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.h;h=2f3a93aca93593274fcc713192d0f9ead21d1380;hb=2cfd1205dc9c6e9d42cc569f415afe13f52357ec;hp=184dd934d050624491c2c972889ae1ac3976240e;hpb=4ea5d218c5c8e5739071bc6e57cf8404db5323ef;p=meshlink

diff --git a/src/net.h b/src/net.h
index 184dd934..2f3a93ac 100644
--- 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"
 
@@ -80,14 +69,9 @@ typedef struct outgoing_t {
 } outgoing_t;
 
 extern int maxoutbufsize;
-extern int seconds_till_retry;
 extern int addressfamily;
 extern unsigned replaywin;
-extern bool localdiscovery;
-extern sockaddr_t localdiscovery_address;
 
-extern listen_socket_t listen_socket[MAXSOCKETS];
-extern int listen_sockets;
 extern int keylifetime;
 extern int max_connection_burst;
 extern bool do_prune;
@@ -97,37 +81,32 @@ extern int autoconnect;
 #include "connection.h"
 #include "node.h"
 
-extern void retry_outgoing(outgoing_t *);
-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 retry_outgoing(struct meshlink_handle *mesh, outgoing_t *);
+extern void handle_incoming_vpn_data(struct event_loop_t *loop, void *, int);
+extern void finish_connecting(struct meshlink_handle *mesh, struct connection_t *);
+extern bool do_outgoing_connection(struct meshlink_handle *mesh, struct outgoing_t *);
+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);
-extern bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t len);
-extern void send_packet(struct node_t *, struct vpn_packet_t *);
-extern void receive_tcppacket(struct connection_t *, const char *, int);
-extern void broadcast_packet(const struct node_t *, struct vpn_packet_t *);
-extern char *get_name(void);
-extern bool setup_myself_reloadable(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);
-extern int main_loop(void);
-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);
-extern void retry(void);
-extern int reload_configuration(void);
-extern void load_all_subnets(void);
-extern void load_all_nodes(void);
+extern int setup_vpn_in_socket(struct meshlink_handle *mesh, const sockaddr_t *);
+extern bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len);
+extern bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t len);
+extern void send_packet(struct meshlink_handle *mesh, struct node_t *, struct vpn_packet_t *);
+extern void receive_tcppacket(struct meshlink_handle *mesh, struct connection_t *, const char *, int);
+extern void broadcast_packet(struct meshlink_handle *mesh, const struct node_t *, struct vpn_packet_t *);
+extern char *get_name(struct meshlink_handle *mesh);
+extern void load_all_nodes(struct meshlink_handle *mesh);
+extern bool setup_myself_reloadable(struct meshlink_handle *mesh);
+extern bool setup_network(struct meshlink_handle *mesh);
+extern void setup_outgoing_connection(struct meshlink_handle *mesh, struct outgoing_t *);
+extern void try_outgoing_connections(struct meshlink_handle *mesh);
+extern void close_network_connections(struct meshlink_handle *mesh);
+extern int main_loop(struct meshlink_handle *mesh);
+extern void terminate_connection(struct meshlink_handle *mesh, struct connection_t *, bool);
+extern bool node_read_ecdsa_public_key(struct meshlink_handle *mesh, struct node_t *);
+extern bool read_ecdsa_public_key(struct meshlink_handle *mesh, struct connection_t *);
+extern void send_mtu_probe(struct meshlink_handle *mesh, struct node_t *);
+extern void handle_meta_connection_data(struct meshlink_handle *mesh, struct connection_t *);
+extern void retry(struct meshlink_handle *mesh);
 
 #ifndef HAVE_MINGW
 #define closesocket(s) close(s)