X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=3be9acf9be3a7da98d665f879dcf7dc32c7196da;hp=3dfc3a56d3814010c90105bd077bec60844df6b3;hb=2228b16159a7aff64e6559ee1635716154e67fe6;hpb=e20e143f1e99bdc0a7d92e97da1bd0dc40e8a83b

diff --git a/src/net.h b/src/net.h
index 3dfc3a56..3be9acf9 100644
--- a/src/net.h
+++ b/src/net.h
@@ -15,6 +15,8 @@
     You should have received a copy of the GNU General Public License
     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 $
 */
 
 #ifndef __TINC_NET_H__
@@ -45,9 +47,17 @@
 
 #define MAXBUFSIZE 2048 /* 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) */
+
 typedef unsigned long ip_t;
+typedef unsigned short port_t;
 typedef short length_t;
 
+struct conn_list_t;
+
 typedef struct vpn_packet_t {
   length_t len;		/* the actual number of bytes in the `data' field */
   unsigned char data[MAXSIZE];
@@ -76,9 +86,16 @@ typedef struct status_bits_t {
   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;
+  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;
@@ -97,27 +114,41 @@ typedef struct enc_key_t {
 } enc_key_t;
 
 typedef struct conn_list_t {
-  ip_t vpn_ip;                     /* his vpn ip */
-  ip_t vpn_mask;                   /* his vpn network address */
+  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 */
-  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 */
+  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 */
-  struct conn_list_t *nexthop;     /* nearest meta-hop in this direction */
+  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;
 
@@ -131,6 +162,11 @@ extern int total_socket_out;
 extern conn_list_t *conn_list;
 extern conn_list_t *myself;
 
+extern char *request_name[256];
+extern char *status_text[10];
+
+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);
@@ -138,5 +174,7 @@ 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);
 
 #endif /* __TINC_NET_H__ */