X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=ba17331ce18bd0486f64c2a08cb944093dbd47de;hp=3be9acf9be3a7da98d665f879dcf7dc32c7196da;hb=fcf869cd4250a240ea8d443f70fa373e4fbacf07;hpb=2228b16159a7aff64e6559ee1635716154e67fe6 diff --git a/src/net.h b/src/net.h index 3be9acf9..ba17331c 100644 --- a/src/net.h +++ b/src/net.h @@ -1,6 +1,7 @@ /* net.h -- header for net.c - Copyright (C) 1998,1999,2000 Ivo Timmermans + Copyright (C) 1998-2001 Ivo Timmermans + 2000,2001 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 @@ -16,7 +17,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.13 2000/10/01 03:21:49 guus Exp $ + $Id: net.h,v 1.9.4.31 2001/05/25 11:54:28 guus Exp $ */ #ifndef __TINC_NET_H__ @@ -25,10 +26,10 @@ #include #include "config.h" -#include "conf.h" -#define MAXSIZE 1700 /* should be a bit more than the MTU for the tapdevice */ +#define MAXSIZE 1700 /* should be a bit more than the MTU for the tapdevice */ #define MTU 1600 +#define SALTLEN 2 /* to spice things up for the NSA... */ #define MAC_ADDR_S "%02x:%02x:%02x:%02x:%02x:%02x" #define MAC_ADDR_V(x) ((unsigned char*)&(x))[0],((unsigned char*)&(x))[1], \ @@ -45,57 +46,34 @@ ((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 struct ipv6_t +{ + unsigned short x[8]; +} ipv6_t; -typedef unsigned long ip_t; typedef unsigned short port_t; -typedef short length_t; -struct conn_list_t; +typedef short length_t; typedef struct vpn_packet_t { - length_t len; /* the actual number of bytes in the `data' field */ + length_t len; /* the actual number of bytes in the `data' field */ + unsigned char salt[SALTLEN]; /* two bytes of randomness */ 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 encryptout:1; /* 1 if we can encrypt outgoing traffic */ - int encryptin:1; /* 1 if we have to decrypt incoming traffic */ - int encrypted:1; - int unused:18; -} status_bits_t; - -typedef struct option_bits_t { - int unused:32; -} option_bits_t; - typedef struct queue_element_t { void *packet; struct queue_element_t *prev; @@ -113,45 +91,6 @@ typedef struct enc_key_t { time_t expiry; } enc_key_t; -typedef struct conn_list_t { - char *name; /* name of this connection */ - ip_t real_ip; /* his real (internet) ip */ - char *hostname; /* the hostname of its real ip */ - short unsigned int port; /* his portnumber */ - int protocol_version; /* used protocol */ - int options; /* options turned on for this connection */ - - int flags; /* his flags */ - int socket; /* our udp vpn socket */ - int meta_socket; /* our tcp meta socket */ - status_bits_t status; /* status info */ - 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 *datakey; /* encrypt data packets with this key */ - enc_key_t *rsakey; - - char *buffer; /* metadata input buffer */ - int buflen; /* bytes read into buffer */ - int reqlen; /* length of first request in buffer */ - int allow_request; /* defined if there's only one request possible */ - - 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. Shouldn't this go into status? (GS) */ - - char *mychallenge; /* challenge we received from him */ - char *hischallenge; /* challenge we sent to him */ - - struct conn_list_t *nexthop; /* nearest meta-hop in this direction, will be changed to myuplink (GS) */ - struct conn_list_t *hisuplink; /* his nearest meta-hop in our direction */ - struct conn_list_t *myuplink; /* our nearest meta-hop in his direction */ - - struct subnet_t *subnets; /* Pointer to a list of subnets belonging to this connection */ - - 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; @@ -159,22 +98,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 void send_packet(connection_t *, vpn_packet_t *); +extern void receive_packet(connection_t *, vpn_packet_t *); +extern void receive_tcppacket(connection_t *, char *, int); +extern void accept_packet(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 xrecv(conn_list_t *, void *); -extern void add_queue(packet_queue_t **, void *, size_t); +extern void terminate_connection(connection_t *); +extern void flush_queue(connection_t *); + +#include +#ifdef HAVE_OPENSSL_RSA_H +# include +#else +# include +#endif + +extern int read_rsa_public_key(connection_t *); #endif /* __TINC_NET_H__ */