X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fnet.h;h=2ed8a9cee1630e871832589a2020658e2e577fe3;hp=35b500ff9f4dfcb87ca0a3da4b08749d4de1206f;hb=a0f7af3ed79c55d9680cbb0a569b3c8987581d43;hpb=7648bc606596851942dd6437ddaa93f53ab20f09 diff --git a/src/net.h b/src/net.h index 35b500f..2ed8a9c 100644 --- a/src/net.h +++ b/src/net.h @@ -16,7 +16,7 @@ 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.3 2000/06/25 15:22:16 guus Exp $ + $Id: net.h,v 1.9.4.23 2000/11/30 23:18:21 zarq Exp $ */ #ifndef __TINC_NET_H__ @@ -25,7 +25,6 @@ #include #include "config.h" -#include "conf.h" #define MAXSIZE 1700 /* should be a bit more than the MTU for the tapdevice */ #define MTU 1600 @@ -45,13 +44,33 @@ ((unsigned char*)&(x))[1],((unsigned char*)&(x))[0] #endif -#define MAXBUFSIZE 2048 /* Probably way too much, but it must fit every possible request. */ +#define MAXBUFSIZE 4096 /* Probably way too much, but it must fit every possible request. */ /* flags */ #define INDIRECTDATA 0x0001 /* Used to indicate that this host has to be reached indirect */ #define EXPORTINDIRECTDATA 0x0002 /* Used to indicate uplink that it has to tell others to do INDIRECTDATA */ +#define TCPONLY 0x0004 /* Tells sender to send packets over TCP instead of UDP (for firewalls) */ + +/* tap types */ +#define TAP_TYPE_ETHERTAP 0 +#define TAP_TYPE_TUNTAP 1 + +typedef struct mac_t +{ + unsigned char x[6]; +} mac_t; + +typedef unsigned long ipv4_t; + +typedef ipv4_t ip_t; /* alias for ipv4_t */ + +typedef struct ipv6_t +{ + unsigned short x[8]; +} ipv6_t; + +typedef unsigned short port_t; -typedef unsigned long ip_t; typedef short length_t; typedef struct vpn_packet_t { @@ -59,32 +78,6 @@ typedef struct vpn_packet_t { unsigned char data[MAXSIZE]; } vpn_packet_t; -typedef struct real_packet_t { - length_t len; /* the length of the entire packet */ - ip_t from; /* where the packet came from */ - vpn_packet_t data; /* encrypted vpn_packet_t */ -} real_packet_t; - -typedef struct passphrase_t { - unsigned short len; - unsigned char *phrase; -} passphrase_t; - -typedef struct status_bits_t { - int pinged:1; /* sent ping */ - int got_pong:1; /* received pong */ - int meta:1; /* meta connection exists */ - int active:1; /* 1 if active.. */ - int outgoing:1; /* I myself asked for this conn */ - int termreq:1; /* the termination of this connection was requested */ - int remove:1; /* Set to 1 if you want this connection removed */ - int timeout:1; /* 1 if gotten timeout */ - int validkey:1; /* 1 if we currently have a valid key for him */ - int waitingforkey:1; /* 1 if we already sent out a request */ - int dataopen:1; /* 1 if we have a valid UDP connection open */ - int unused:22; -} status_bits_t; - typedef struct queue_element_t { void *packet; struct queue_element_t *prev; @@ -102,32 +95,6 @@ typedef struct enc_key_t { time_t expiry; } enc_key_t; -typedef struct conn_list_t { - ip_t vpn_ip; /* his vpn ip */ - ip_t vpn_mask; /* his vpn network address */ - ip_t real_ip; /* his real (internet) ip */ -/* char *hostname; /* the hostname of its real ip */ - short unsigned int port; /* his portnumber */ - int flags; /* his flags */ - int socket; /* our udp vpn socket */ - int meta_socket; /* our tcp meta socket */ - int protocol_version; /* used protocol */ - status_bits_t status; /* status info */ - passphrase_t *pp; /* encoded passphrase */ - packet_queue_t *sq; /* pending outgoing packets */ - packet_queue_t *rq; /* pending incoming packets (they have no - valid key to be decrypted with) */ - enc_key_t *public_key; /* the other party's public key */ - enc_key_t *key; /* encrypt with this key */ - char buffer[MAXBUFSIZE+1]; /* metadata input buffer */ - int buflen; /* bytes read into buffer */ - int reqlen; /* length of first request in buffer */ - time_t last_ping_time; /* last time we saw some activity from the other end */ - int want_ping; /* 0 if there's no need to check for activity */ - struct conn_list_t *nexthop; /* nearest meta-hop in this direction */ - struct conn_list_t *next; /* after all, it's a list of connections */ -} conn_list_t; - extern int tap_fd; extern int total_tap_in; @@ -135,15 +102,32 @@ extern int total_tap_out; extern int total_socket_in; extern int total_socket_out; -extern conn_list_t *conn_list; -extern conn_list_t *myself; +extern char *unknown; +extern char *request_name[256]; +extern char *status_text[10]; + +#include "connection.h" /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */ + +extern int str2opt(const char *); +extern char *opt2str(int); extern int send_packet(ip_t, vpn_packet_t *); extern int setup_network_connections(void); extern void close_network_connections(void); extern void main_loop(void); -extern int setup_vpn_connection(conn_list_t *); -extern void terminate_connection(conn_list_t *); -extern void flush_queues(conn_list_t*); +extern int setup_vpn_connection(connection_t *); +extern void terminate_connection(connection_t *); +extern void flush_queues(connection_t *); +extern void add_queue(packet_queue_t **, void *, size_t); + + +#include +#ifdef HAVE_OPENSSL_RSA_H +# include +#else +# include +#endif + +extern int read_rsa_public_key(RSA **, const char *); #endif /* __TINC_NET_H__ */