X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=e5daed9e676d0ba9eaa82668abc11a40416693c4;hp=e3d974edbe79efb01712584c971439dc312072b3;hb=ac066bb057dcb187bf91670793ba5e6ca456e052;hpb=698191fd2f512f3618e2d60592fcd57cd750b965

diff --git a/src/net.h b/src/net.h
index e3d974ed..e5daed9e 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1,6 +1,7 @@
 /*
     net.h -- header for net.c
-    Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1998-2001 Ivo Timmermans <zarq@iname.com>
+                  2000,2001 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
@@ -16,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.21 2000/11/04 22:57:31 guus Exp $
+    $Id: net.h,v 1.9.4.36 2001/10/27 13:13:35 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -26,8 +27,9 @@
 
 #include "config.h"
 
-#define MAXSIZE 1700  /* should be a bit more than the MTU for the tapdevice */
+#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 MAC_ADDR_S "%02x:%02x:%02x:%02x:%02x:%02x"
 #define MAC_ADDR_V(x) ((unsigned char*)&(x))[0],((unsigned char*)&(x))[1], \
@@ -46,11 +48,6 @@
 
 #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
@@ -62,7 +59,10 @@ typedef struct mac_t
 
 typedef unsigned long ipv4_t;
 
-typedef ipv4_t ip_t; /* alias for ipv4_t */
+typedef struct ip_mask_t {
+  ipv4_t address;
+  ipv4_t mask;
+} ip_mask_t;
 
 typedef struct ipv6_t
 {
@@ -74,7 +74,8 @@ 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 */
+  length_t len;			/* the actual number of bytes in the `data' field */
+  unsigned char salt[SALTLEN];	/* two bytes of randomness */
   unsigned char data[MAXSIZE];
 } vpn_packet_t;
 
@@ -89,35 +90,24 @@ typedef struct packet_queue_t {
   queue_element_t *tail;
 } packet_queue_t;
 
-typedef struct enc_key_t {
-  int length;
-  char *key;
-  time_t expiry;
-} enc_key_t;
-
-extern int tap_fd;
-
-extern int total_tap_in;
-extern int total_tap_out;
-extern int total_socket_in;
-extern int total_socket_out;
-
-extern char *unknown;
+extern int maxtimeout;
+extern int seconds_till_retry;
 
 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);
-extern int send_packet(ip_t, vpn_packet_t *);
+extern void send_packet(struct node_t *, vpn_packet_t *);
+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 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 void add_queue(packet_queue_t **, void *, size_t);
+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__ */