X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.h;h=06797446012dca0574696670c0b863966fbda2e8;hb=752526ca2fd3a0c5b730d1d96540118ff54c462b;hp=c87bbf3684bfd0ede2bff6fe36133e1deb2b8f4e;hpb=2a18ac20efd8ed3e1fd76f11f6f816e77c099e47;p=meshlink diff --git a/src/net.h b/src/net.h index c87bbf36..06797446 100644 --- a/src/net.h +++ b/src/net.h @@ -37,8 +37,6 @@ /* 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 +57,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,34 +71,13 @@ 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; -extern char *myport; extern int autoconnect; -extern bool disablebuggypeers; - -extern char *proxyhost; -extern char *proxyport; -extern char *proxyuser; -extern char *proxypass; -typedef enum proxytype_t { - PROXY_NONE = 0, - PROXY_SOCKS4, - PROXY_SOCKS4A, - PROXY_SOCKS5, - PROXY_HTTP, - PROXY_EXEC, -} proxytype_t; -extern proxytype_t proxytype; /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */ #include "connection.h"