X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=af465f6244770211a3a64db92d855b1e3f2f08da;hp=41f90b090202050011f8aa7879072f1147f590bc;hb=ed397b6ac676329b237e219c806143cccf456b3c;hpb=b6997b0050e78a2f2e517beba3ff01d9232b3d1f

diff --git a/src/net.h b/src/net.h
index 41f90b09..af465f62 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.8 2000/08/07 16:27:28 guus Exp $
+    $Id: net.h,v 1.9.4.11 2000/09/14 21:51:20 zarq Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -53,8 +53,19 @@
 #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 subnet_t {
+  ip_t netaddr;
+  ip_t netmask;
+  struct conn_list_t *owner;
+  struct subnet_t *next;
+  struct subnet_t *prev;
+} subnet_t;  
+
 typedef struct vpn_packet_t {
   length_t len;		/* the actual number of bytes in the `data' field */
   unsigned char data[MAXSIZE];
@@ -83,9 +94,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:21;
+  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;
@@ -104,28 +122,33 @@ typedef struct enc_key_t {
 } enc_key_t;
 
 typedef struct conn_list_t {
+  char *name;                      /* name of this connection */
   ip_t vpn_ip;                     /* his vpn ip */
   ip_t vpn_mask;                   /* his vpn network address */
   ip_t real_ip;                    /* his real (internet) ip */
-  char *real_hostname;             /* the hostname of its real ip */
-  char *vpn_hostname;              /* the hostname of the vpn 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 */
+  option_bits_t options;           /* options turned on for this connection */
   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 */
+  char *buffer;       /* metadata input buffer */
   int buflen;                      /* bytes read into buffer */
   int reqlen;                      /* length of first request in buffer */
+  int tcppacket;		   /* length of incoming TCP tunnelled packet */
   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 */
+  int allow_request;               /* defined if there's only one request possible */
+  char *chal_answer;               /* answer to the given challenge */
+  enc_key_t *rsakey;
   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;
@@ -140,6 +163,8 @@ extern int total_socket_out;
 extern conn_list_t *conn_list;
 extern conn_list_t *myself;
 
+extern char *request_name[256];
+
 extern int send_packet(ip_t, vpn_packet_t *);
 extern int setup_network_connections(void);
 extern void close_network_connections(void);