X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=93ac391e4e7883116bade65b247145c2d673ebae;hp=6b2c6b4df98156327740f91c57bc8093cca54bed;hb=f0aa9641e82fb6e09c1e485366d14dddaa7f7c36;hpb=fb6dc0b0890ebae2471e00e7a3e1d86c1fc3d646

diff --git a/src/net.h b/src/net.h
index 6b2c6b4d..93ac391e 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1,7 +1,7 @@
 /*
     net.h -- header for net.c
-    Copyright (C) 1998-2001 Ivo Timmermans <zarq@iname.com>
-                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1998-2002 Ivo Timmermans <zarq@iname.com>
+                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
 
     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
@@ -17,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.37 2001/11/16 12:08:38 zarq Exp $
+    $Id: net.h,v 1.9.4.38 2002/02/10 21:57:54 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -27,41 +27,35 @@
 
 #include "config.h"
 
-#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 MTU 1514     /* 1500 bytes payload + 14 bytes ethernet header */
+#define MAXSIZE 1600 /* MTU + header (seqno) and trailer (CBC padding and HMAC) */
 
-#define MAC_ADDR_S "%02x:%02x:%02x:%02x:%02x:%02x"
-#define MAC_ADDR_V(x) ((unsigned char*)&(x))[0],((unsigned char*)&(x))[1], \
-                      ((unsigned char*)&(x))[2],((unsigned char*)&(x))[3], \
-                      ((unsigned char*)&(x))[4],((unsigned char*)&(x))[5]
-
-#define IP_ADDR_S "%d.%d.%d.%d"
-
-#ifdef WORDS_BIGENDIAN
-# define IP_ADDR_V(x) ((unsigned char*)&(x))[0],((unsigned char*)&(x))[1], \
-                      ((unsigned char*)&(x))[2],((unsigned char*)&(x))[3]
-#else
-# define IP_ADDR_V(x) ((unsigned char*)&(x))[3],((unsigned char*)&(x))[2], \
-                      ((unsigned char*)&(x))[1],((unsigned char*)&(x))[0]
-#endif
-
-#define MAXBUFSIZE 4096 /* Probably way too much, but it must fit every possible request. */
-
-/* tap types */
-#define TAP_TYPE_ETHERTAP 0
-#define TAP_TYPE_TUNTAP   1
+#define MAXBUFSIZE 2048 /* Probably way too much, but it must fit every possible request. */
 
 typedef struct mac_t
 {
   unsigned char x[6];
 } mac_t;
 
+typedef unsigned long ipv4_t;
+
+typedef struct ip_mask_t {
+  ipv4_t address;
+  ipv4_t mask;
+} ip_mask_t;
+
+typedef struct ipv6_t
+{
+  unsigned short x[8];
+} ipv6_t;
+
+typedef unsigned short port_t;
+
 typedef short length_t;
 
 typedef struct vpn_packet_t {
   length_t len;			/* the actual number of bytes in the `data' field */
-  unsigned char salt[SALTLEN];	/* two bytes of randomness */
+  unsigned int seqno;	        /* 32 bits sequence number (network byte order of course) */
   unsigned char data[MAXSIZE];
 } vpn_packet_t;
 
@@ -76,11 +70,16 @@ typedef struct packet_queue_t {
   queue_element_t *tail;
 } packet_queue_t;
 
+typedef struct outgoing_t {
+  char *name;
+  int timeout;
+} outgoing_t;
+
 extern int maxtimeout;
 extern int seconds_till_retry;
 
-extern char *request_name[256];
-extern char *status_text[10];
+extern char *request_name[];
+extern char *status_text[];
 
 #include "connection.h"		/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
 
@@ -89,11 +88,12 @@ extern void receive_packet(struct node_t *, vpn_packet_t *);
 extern void receive_tcppacket(struct connection_t *, char *, int);
 extern void broadcast_packet(struct node_t *, vpn_packet_t *);
 extern int setup_network_connections(void);
+extern void setup_outgoing_connection(struct outgoing_t *);
+extern void try_outgoing_connections(void);
 extern void close_network_connections(void);
 extern void main_loop(void);
 extern void terminate_connection(connection_t *, int);
 extern void flush_queue(struct node_t *);
 extern int read_rsa_public_key(struct connection_t *);
-extern RETSIGTYPE try_outgoing_connections(int);
 
 #endif /* __TINC_NET_H__ */