X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=4851649272eea53c9340110e9cf162dcf9af204a;hp=a5765762168bbbdb537e933e7456b996ac3a30ce;hb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93;hpb=305505f5ec4bb738f175cd897fa409f08d2971a3 diff --git a/src/net.h b/src/net.h index a5765762..48516492 100644 --- a/src/net.h +++ b/src/net.h @@ -1,7 +1,7 @@ /* net.h -- header for net.c Copyright (C) 1998-2002 Ivo Timmermans - 2000-2002 Guus Sliepen + 2000-2002 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,101 +17,111 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.h,v 1.9.4.47 2002/03/18 22:47:20 guus Exp $ + $Id: net.h,v 1.9.4.60 2003/07/06 23:16:28 guus Exp $ */ #ifndef __TINC_NET_H__ #define __TINC_NET_H__ +#include "config.h" + #include #include #include #include +#include -#include "config.h" +#ifdef HAVE_INTTYPES_H +#include +#endif + +#ifdef ENABLE_JUMBOGRAMS +#define MTU 9014 /* 9000 bytes payload + 14 bytes ethernet header */ +#else +#define MTU 1514 /* 1500 bytes payload + 14 bytes ethernet header */ +#endif -#define MTU 1514 /* 1500 bytes payload + 14 bytes ethernet header */ -#define MAXSIZE 1600 /* MTU + header (seqno) and trailer (CBC padding and HMAC) */ +#define MAXSIZE (MTU + 4 + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_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 */ -#define MAXBUFSIZE 2048 /* Probably way too much, but it must fit every possible request. */ -#define MAXSOCKETS 128 /* Overkill... */ +#define MAXSOCKETS 128 /* Overkill... */ -typedef struct mac_t -{ - unsigned char x[6]; +#define MAXQUEUELENGTH 8 /* Maximum number of packats in a single queue */ + +typedef struct mac_t { + uint8_t x[6]; } mac_t; -typedef struct ipv4_t -{ - unsigned char x[4]; +typedef struct ipv4_t { + uint8_t x[4]; } ipv4_t; typedef struct ip_mask_t { - ipv4_t address; - ipv4_t mask; + ipv4_t address; + ipv4_t mask; } ip_mask_t; -typedef struct ipv6_t -{ - unsigned short x[8]; +typedef struct ipv6_t { + uint16_t x[8]; } ipv6_t; -typedef unsigned short port_t; - typedef short length_t; typedef union { - struct sockaddr sa; - struct sockaddr_in in; - struct sockaddr_in6 in6; + struct sockaddr sa; + struct sockaddr_in in; +#ifdef HAVE_STRUCT_SOCKADDR_IN6 + struct sockaddr_in6 in6; +#endif } sockaddr_t; #ifdef SA_LEN #define SALEN(s) SA_LEN(&s) #else +#ifdef HAVE_STRUCT_SOCKADDR_IN6 #define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6)) +#else +#define SALEN(s) (sizeof sockaddr_in) +#endif #endif typedef struct vpn_packet_t { - length_t len; /* the actual number of bytes in the `data' field */ - int priority; /* priority or TOS */ - unsigned int seqno; /* 32 bits sequence number (network byte order of course) */ - unsigned char data[MAXSIZE]; + 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) */ + uint8_t data[MAXSIZE]; } vpn_packet_t; typedef struct queue_element_t { - void *packet; - struct queue_element_t *prev; - struct queue_element_t *next; + void *packet; + struct queue_element_t *prev; + struct queue_element_t *next; } queue_element_t; typedef struct packet_queue_t { - queue_element_t *head; - queue_element_t *tail; + queue_element_t *head; + queue_element_t *tail; } packet_queue_t; typedef struct outgoing_t { - char *name; - int timeout; - struct config_t *cfg; - struct addrinfo *ai; - struct addrinfo *aip; + char *name; + int timeout; + struct config_t *cfg; + struct addrinfo *ai; + struct addrinfo *aip; } outgoing_t; typedef struct listen_socket_t { - int tcp; - int udp; - sockaddr_t sa; + int tcp; + int udp; + sockaddr_t sa; } listen_socket_t; extern int maxtimeout; extern int seconds_till_retry; extern int addressfamily; -extern char *request_name[]; -extern char *status_text[]; - -#include "connection.h" /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */ +#include "connection.h" /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */ extern listen_socket_t listen_socket[MAXSOCKETS]; extern int listen_sockets; @@ -121,6 +131,7 @@ extern int do_prune; extern int do_purge; extern char *myport; extern time_t now; +extern EVP_CIPHER_CTX packet_ctx; extern void retry_outgoing(outgoing_t *); extern void handle_incoming_vpn_data(int); @@ -130,7 +141,6 @@ extern int handle_new_meta_connection(int); extern int setup_listen_socket(sockaddr_t *); extern int setup_vpn_in_socket(sockaddr_t *); extern void send_packet(struct node_t *, vpn_packet_t *); -extern void receive_packet(struct node_t *, vpn_packet_t *); extern void receive_tcppacket(struct connection_t *, char *, int); extern void broadcast_packet(struct node_t *, vpn_packet_t *); extern int setup_network_connections(void); @@ -142,4 +152,4 @@ extern void terminate_connection(connection_t *, int); extern void flush_queue(struct node_t *); extern int read_rsa_public_key(struct connection_t *); -#endif /* __TINC_NET_H__ */ +#endif /* __TINC_NET_H__ */