X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=a28f47858cbb1327b06e64c0cf0602f1189ea77d;hp=092b9dc97f8f5c740b2c52ac31f2b07a6dc66786;hb=5a132550deb58473285e5f91705d286aef47be71;hpb=013a2e159e42c46808ea8d0b6abd57525db30a50

diff --git a/src/net.h b/src/net.h
index 092b9dc9..a28f4785 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1,7 +1,7 @@
 /*
     net.h -- header for net.c
-    Copyright (C) 1998-2003 Ivo Timmermans <zarq@iname.com>
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2005 Ivo Timmermans <zarq@iname.com>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
 
     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,28 +17,26 @@
     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.13 2003/08/24 20:38:24 guus Exp $
+    $Id$
 */
 
 #ifndef __TINC_NET_H__
 #define __TINC_NET_H__
 
-#include <openssl/evp.h>
-
 #include "ipv6.h"
+#include "cipher.h"
+#include "digest.h"
 
 #ifdef ENABLE_JUMBOGRAMS
-#define MTU 9014				/* 9000 bytes payload + 14 bytes ethernet header */
+#define MTU 9018				/* 9000 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
 #else
-#define MTU 1514				/* 1500 bytes payload + 14 bytes ethernet header */
+#define MTU 1518				/* 1500 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
 #endif
 
-#define MAXSIZE (MTU + 4 + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE + MTU/64 + 20)	/* MTU + seqno + padding + HMAC + compressor overhead */
+#define MAXSIZE (MTU + 4 + CIPHER_MAX_BLOCK_SIZE + DIGEST_MAX_SIZE + MTU/64 + 20)	/* MTU + seqno + padding + HMAC + compressor overhead */
 #define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128)	/* Enough room for a request with a MAXSIZEd packet or a 8192 bits RSA key */
 
-#define MAXSOCKETS 128			/* Overkill... */
-
-#define MAXQUEUELENGTH 8		/* Maximum number of packats in a single queue */
+#define MAXSOCKETS 8			/* Probably overkill... */
 
 typedef struct mac_t {
 	uint8_t x[6];
@@ -54,7 +52,7 @@ typedef struct ipv6_t {
 
 typedef short length_t;
 
-#define AF_UNKNOWN 0xFFFF
+#define AF_UNKNOWN 255
 
 struct sockaddr_unknown {
 	uint16_t family;
@@ -87,24 +85,16 @@ typedef struct vpn_packet_t {
 	uint8_t data[MAXSIZE];
 } vpn_packet_t;
 
-typedef struct queue_element_t {
-	void *packet;
-	struct queue_element_t *prev;
-	struct queue_element_t *next;
-} queue_element_t;
-
-typedef struct packet_queue_t {
-	queue_element_t *head;
-	queue_element_t *tail;
-} packet_queue_t;
-
 typedef struct listen_socket_t {
+	struct event ev_tcp;
+	struct event ev_udp;
 	int tcp;
 	int udp;
 	sockaddr_t sa;
 } listen_socket_t;
 
 #include "conf.h"
+#include "list.h"
 
 typedef struct outgoing_t {
 	char *name;
@@ -112,37 +102,36 @@ typedef struct outgoing_t {
 	struct config_t *cfg;
 	struct addrinfo *ai;
 	struct addrinfo *aip;
+	struct event ev;
 } outgoing_t;
 
-extern int maxtimeout;
+extern list_t *outgoing_list;
+
+extern int maxoutbufsize;
 extern int seconds_till_retry;
 extern int addressfamily;
 
 extern listen_socket_t listen_socket[MAXSOCKETS];
 extern int listen_sockets;
-extern int keyexpires;
 extern int keylifetime;
 extern bool do_prune;
-extern bool do_purge;
 extern char *myport;
-extern time_t now;
-extern EVP_CIPHER_CTX packet_ctx;
 
 /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
 #include "connection.h"
 #include "node.h"
 
 extern void retry_outgoing(outgoing_t *);
-extern void handle_incoming_vpn_data(int);
+extern void handle_incoming_vpn_data(int, short, void *);
 extern void finish_connecting(struct connection_t *);
 extern void do_outgoing_connection(struct connection_t *);
-extern bool handle_new_meta_connection(int);
+extern void handle_new_meta_connection(int, short, void *);
 extern int setup_listen_socket(const sockaddr_t *);
 extern int setup_vpn_in_socket(const sockaddr_t *);
 extern void send_packet(const struct node_t *, vpn_packet_t *);
 extern void receive_tcppacket(struct connection_t *, char *, int);
 extern void broadcast_packet(const struct node_t *, vpn_packet_t *);
-extern bool setup_network_connections(void);
+extern bool setup_network(void);
 extern void setup_outgoing_connection(struct outgoing_t *);
 extern void try_outgoing_connections(void);
 extern void close_network_connections(void);
@@ -150,6 +139,13 @@ extern int main_loop(void);
 extern void terminate_connection(struct connection_t *, bool);
 extern void flush_queue(struct node_t *);
 extern bool read_rsa_public_key(struct connection_t *);
+extern void send_mtu_probe(struct node_t *);
+extern void handle_device_data(int, short, void *);
+extern void handle_meta_connection_data(int, short, void *);
+extern void regenerate_key();
+extern void purge(void);
+extern void retry(void);
+extern int reload_configuration(void);
 
 #ifndef HAVE_MINGW
 #define closesocket(s) close(s)