X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.h;h=453fa74b743e0c4ea8f6942d998f459ae4014435;hb=a7ebfcff0fe55596cb18a3cb488d14c73aacbe5f;hp=4344f21c65e313afc81fb8a28575ffcfe3850726;hpb=6dfdb323612184529b4b83c1be914dda8262de47;p=meshlink diff --git a/src/net.h b/src/net.h index 4344f21c..453fa74b 100644 --- a/src/net.h +++ b/src/net.h @@ -1,7 +1,6 @@ /* net.h -- header for net.c - Copyright (C) 1998-2005 Ivo Timmermans - 2000-2012 Guus Sliepen + Copyright (C) 2014 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,32 +20,23 @@ #ifndef __TINC_NET_H__ #define __TINC_NET_H__ -#include "ipv6.h" #include "cipher.h" #include "digest.h" +#include "event.h" #ifdef ENABLE_JUMBOGRAMS -#define MTU 9018 /* 9000 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */ +#define MTU 9018 /* 9000 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */ #else -#define MTU 1518 /* 1500 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */ +#define MTU 1518 /* 1500 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */ #endif -#define MAXSIZE (MTU + 4 + CIPHER_MAX_BLOCK_SIZE + DIGEST_MAX_SIZE + MTU/64 + 20) /* MTU + seqno + padding + HMAC + compressor overhead */ -#define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128) /* Enough room for a request with a MAXSIZEd packet or a 8192 bits RSA key */ +/* 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) -#define MAXSOCKETS 8 /* Probably overkill... */ +/* 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) -typedef struct mac_t { - uint8_t x[6]; -} mac_t; - -typedef struct ipv4_t { - uint8_t x[4]; -} ipv4_t; - -typedef struct ipv6_t { - uint16_t x[8]; -} ipv6_t; +#define MAXSOCKETS 8 /* Probably overkill... */ typedef short length_t; @@ -77,16 +67,17 @@ typedef union sockaddr_t { #endif typedef struct vpn_packet_t { - length_t len; /* the actual number of bytes in the `data' field */ - int priority; /* priority or TOS */ - uint32_t seqno; /* 32 bits sequence number (network byte order of course) */ + struct { + unsigned int probe:1; + unsigned int tcp:1; + }; + length_t len; /* the actual number of bytes in the `data' field */ uint8_t data[MAXSIZE]; } vpn_packet_t; /* Packet types when using SPTPS */ #define PKT_COMPRESSED 1 -#define PKT_MAC 2 #define PKT_PROBE 4 typedef enum packet_type_t { @@ -96,11 +87,10 @@ typedef enum packet_type_t { } packet_type_t; typedef struct listen_socket_t { - struct event ev_tcp; - struct event ev_udp; - int tcp; - int udp; + io_t tcp; + io_t udp; sockaddr_t sa; + bool bindto; } listen_socket_t; #include "conf.h" @@ -109,10 +99,11 @@ typedef struct listen_socket_t { typedef struct outgoing_t { char *name; int timeout; + splay_tree_t *config_tree; struct config_t *cfg; struct addrinfo *ai; struct addrinfo *aip; - struct event ev; + timeout_t ev; } outgoing_t; extern list_t *outgoing_list; @@ -122,14 +113,16 @@ 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 udp_rcvbuf; -extern int udp_sndbuf; +extern int max_connection_burst; extern bool do_prune; extern char *myport; +extern int autoconnect; +extern bool disablebuggypeers; extern int contradicting_add_edge; extern int contradicting_del_edge; extern time_t last_config_check; @@ -148,15 +141,18 @@ typedef enum proxytype_t { } proxytype_t; extern proxytype_t proxytype; +extern char *scriptinterpreter; +extern char *scriptextension; + /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */ #include "connection.h" #include "node.h" extern void retry_outgoing(outgoing_t *); -extern void handle_incoming_vpn_data(int, short, void *); +extern void handle_incoming_vpn_data(void *, int); extern void finish_connecting(struct connection_t *); -extern bool do_outgoing_connection(struct connection_t *); -extern void handle_new_meta_connection(int, short, void *); +extern bool do_outgoing_connection(struct outgoing_t *); +extern void handle_new_meta_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); @@ -172,18 +168,17 @@ 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 void flush_queue(struct node_t *); extern bool node_read_ecdsa_public_key(struct node_t *); extern bool read_ecdsa_public_key(struct connection_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_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); #ifndef HAVE_MINGW #define closesocket(s) close(s) @@ -191,4 +186,7 @@ extern void load_all_subnets(void); extern CRITICAL_SECTION mutex; #endif -#endif /* __TINC_NET_H__ */ +//TODO: move this to a better place +extern char *confbase; + +#endif /* __TINC_NET_H__ */