X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.h;h=943b7e61097f8f20b7d7260054d6524acad79d1e;hb=ddc6a81a854023e38b563f213aa9a449ee91add8;hp=60e4dea7ba6474eb2c4da056d42556495f308347;hpb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d;p=tinc

diff --git a/src/net.h b/src/net.h
index 60e4dea7..943b7e61 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1,7 +1,7 @@
 /*
     net.h -- header for net.c
     Copyright (C) 1998-2005 Ivo Timmermans <zarq@iname.com>
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 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
@@ -24,6 +24,7 @@
 #define __TINC_NET_H__
 
 #include <openssl/evp.h>
+#include <event.h>
 
 #include "ipv6.h"
 
@@ -36,7 +37,7 @@
 #define MAXSIZE (MTU + 4 + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_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 MAXSOCKETS 8			/* Probably overkill... */
 
 #define MAXQUEUELENGTH 8		/* Maximum number of packats in a single queue */
 
@@ -99,6 +100,8 @@ typedef struct packet_queue_t {
 } packet_queue_t;
 
 typedef struct listen_socket_t {
+	struct event ev_tcp;
+	struct event ev_udp;
 	int tcp;
 	int udp;
 	sockaddr_t sa;
@@ -112,21 +115,19 @@ typedef struct outgoing_t {
 	struct config_t *cfg;
 	struct addrinfo *ai;
 	struct addrinfo *aip;
+	struct event ev;
 } outgoing_t;
 
-extern int maxtimeout;
+extern int maxoutbufsize;
 extern int seconds_till_retry;
 extern int addressfamily;
-extern bool blockingtcp;
 
 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 */
@@ -134,10 +135,10 @@ extern EVP_CIPHER_CTX packet_ctx;
 #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 *);
@@ -152,6 +153,9 @@ 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();
 
 #ifndef HAVE_MINGW
 #define closesocket(s) close(s)