X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.h;h=fa34dcf7eaa2faf6f87fcfdfb46c8508bc138e7e;hb=6a73467d16a57ca1645d805776c4dfcaf2b05798;hp=706f56904f79cb46907662f4c918e3c60638aa8b;hpb=daee99be3e42946e3b554150c32d310836b37da6;p=meshlink diff --git a/src/net.h b/src/net.h index 706f5690..fa34dcf7 100644 --- a/src/net.h +++ b/src/net.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_NET_H +#define MESHLINK_NET_H + /* net.h -- header for net.c - Copyright (C) 2014 Guus Sliepen + Copyright (C) 2014, 2017 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 @@ -17,11 +20,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_NET_H__ -#define __TINC_NET_H__ - -#include "cipher.h" -#include "digest.h" #include "event.h" #include "sockaddr.h" @@ -31,18 +29,16 @@ #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; - unsigned int tcp:1; + unsigned int probe: 1; + unsigned int tcp: 1; }; uint16_t len; /* the actual number of bytes in the `data' field */ uint8_t data[MAXSIZE]; @@ -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" @@ -74,82 +63,51 @@ typedef struct outgoing_t { int timeout; struct splay_tree_t *config_tree; struct config_t *cfg; - struct addrinfo *ai; + struct addrinfo *ai; // addresses from config files struct addrinfo *aip; + struct addrinfo *nai; // addresses known via other online nodes (use free_known_addresses()) timeout_t ev; + struct meshlink_handle *mesh; } 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 int contradicting_add_edge; -extern int contradicting_del_edge; -extern time_t last_config_check; - -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; - -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(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 bool read_ecdsa_private_key(struct meshlink_handle *mesh); +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) @@ -157,7 +115,4 @@ extern void load_all_nodes(void); extern CRITICAL_SECTION mutex; #endif -//TODO: move this to a better place -extern char *confbase; - -#endif /* __TINC_NET_H__ */ +#endif