X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=983663494ed7cbf5931da61ece1e52f0edfa95fa;hp=e2b6d0637045219f1b053d60833f5a9881644254;hb=8fa9bc017d89b53798903df3fa98311067d4de90;hpb=183a8edd22ba4bc682392c73ae02fc9e121eda68

diff --git a/src/net.h b/src/net.h
index e2b6d063..98366349 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.15 2000/10/11 22:01:00 guus Exp $
+    $Id: net.h,v 1.9.4.20 2000/10/29 09:19:25 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -25,7 +25,6 @@
 #include <sys/time.h>
 
 #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,17 @@
                       ((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];
@@ -75,32 +78,6 @@ typedef struct vpn_packet_t {
   unsigned char data[MAXSIZE];
 } vpn_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 decryptin:1;                 /* 1 if we have to decrypt incoming traffic */
-  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;
@@ -125,6 +102,8 @@ extern int total_tap_out;
 extern int total_socket_in;
 extern int total_socket_out;
 
+extern char *unknown;
+
 extern char *request_name[256];
 extern char *status_text[10];