X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fnet.h;h=2ed8a9cee1630e871832589a2020658e2e577fe3;hp=2547b1eaeb902c70b0dd974595e98da37446c998;hb=a0f7af3ed79c55d9680cbb0a569b3c8987581d43;hpb=e9635ae38e0e2e3eb92568a1e234f8348856dd69

diff --git a/src/net.h b/src/net.h
index 2547b1e..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.16 2000/10/14 17:04:15 guus Exp $
+    $Id: net.h,v 1.9.4.23 2000/11/30 23:18:21 zarq Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -44,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];
@@ -74,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;
@@ -124,10 +102,12 @@ 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];
 
-#include "connlist.h"		/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
+#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);
@@ -135,10 +115,19 @@ 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 xrecv(vpn_packet_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 <config.h>
+#ifdef HAVE_OPENSSL_RSA_H
+# include <openssl/rsa.h>
+#else
+# include <rsa.h>
+#endif
+
+extern int read_rsa_public_key(RSA **, const char *);
+
 #endif /* __TINC_NET_H__ */