X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=0fc49ef38d4fe19228d191d0db37b5707474d302;hb=a22041922f160667573e9a5ae3f4195e1668906a;hp=ec6c0635dc3ce2c66e2f22559c7707e9a0bb7c76;hpb=bc0a24ec810cb911610ae7aafa245e47d1268cd2;p=tinc

diff --git a/src/connection.h b/src/connection.h
index ec6c0635..0fc49ef3 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,6 +1,6 @@
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2010 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -13,29 +13,25 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #ifndef __TINC_CONNECTION_H__
 #define __TINC_CONNECTION_H__
 
-#include <openssl/rsa.h>
-#include <openssl/evp.h>
-
-#include <event.h>
-
+#include "cipher.h"
+#include "digest.h"
+#include "rsa.h"
 #include "splay_tree.h"
 
 #define OPTION_INDIRECT		0x0001
 #define OPTION_TCPONLY		0x0002
 #define OPTION_PMTU_DISCOVERY	0x0004
+#define OPTION_CLAMP_MSS	0x0008
 
-typedef union connection_status_t {
-	struct {
+typedef struct connection_status_t {
 		int pinged:1;				/* sent ping */
 		int active:1;				/* 1 if active.. */
 		int connecting:1;			/* 1 if we are waiting for a non-blocking connect() to finish */
@@ -45,9 +41,8 @@ typedef union connection_status_t {
 		int encryptout:1;			/* 1 if we can encrypt outgoing traffic */
 		int decryptin:1;			/* 1 if we have to decrypt incoming traffic */
 		int mst:1;				/* 1 if this connection is part of a minimum spanning tree */
-		int unused:23;
-	};
-	uint32_t value;
+		int control:1;
+		int unused:22;
 } connection_status_t;
 
 #include "edge.h"
@@ -62,9 +57,8 @@ typedef struct connection_t {
 	char *hostname;				/* the hostname of its real ip */
 	int protocol_version;		/* used protocol */
 
-	struct event ev;			/* events on this metadata connection */
 	int socket;					/* socket used for this connection */
-	long int options;			/* options for this connection */
+	uint32_t options;			/* options for this connection */
 	connection_status_t status;	/* status info */
 	int estimated_weight;		/* estimation for the weight of the edge for this connection */
 	struct timeval start;		/* time this connection was started, used for above estimation */
@@ -73,36 +67,24 @@ typedef struct connection_t {
 	struct node_t *node;		/* node associated with the other end */
 	struct edge_t *edge;		/* edge associated with this connection */
 
-	RSA *rsa_key;				/* his public/private key */
-	const EVP_CIPHER *incipher;	/* Cipher he will use to send data to us */
-	const EVP_CIPHER *outcipher;	/* Cipher we will use to send data to him */
-	EVP_CIPHER_CTX *inctx;		/* Context of encrypted meta data that will come from him to us */
-	EVP_CIPHER_CTX *outctx;		/* Context of encrypted meta data that will be sent from us to him */
-	char *inkey;				/* His symmetric meta key + iv */
-	char *outkey;				/* Our symmetric meta key + iv */
-	int inkeylength;			/* Length of his key + iv */
-	int outkeylength;			/* Length of our key + iv */
-	const EVP_MD *indigest;
-	const EVP_MD *outdigest;
+	rsa_t rsa;			/* his public/private key */
+	cipher_t incipher;		/* Cipher he will use to send data to us */
+	cipher_t outcipher;		/* Cipher we will use to send data to him */
+	digest_t indigest;
+	digest_t outdigest;
+
 	int inmaclength;
 	int outmaclength;
 	int incompression;
 	int outcompression;
-	char *mychallenge;			/* challenge we received from him */
-	char *hischallenge;			/* challenge we sent to him */
 
-	char buffer[MAXBUFSIZE];	/* metadata input buffer */
-	int buflen;					/* bytes read into buffer */
-	int reqlen;					/* length of incoming request */
+	char *hischallenge;		/* The challenge we sent to him */
+
+	struct bufferevent *buffer;			/* buffer events on this metadata connection */
+	struct event inevent;				/* input event on this metadata connection */
 	int tcplen;					/* length of incoming TCPpacket */
 	int allow_request;			/* defined if there's only one request possible */
 
-	char *outbuf;				/* metadata output buffer */
-	int outbufstart;			/* index of first meaningful byte in output buffer */
-	int outbuflen;				/* number of meaningful bytes in output buffer */
-	int outbufsize;				/* number of bytes allocated to output buffer */
-	struct event outev;			/* events on this metadata connection */
-
 	time_t last_ping_time;		/* last time we saw some activity from the other end or pinged them */
 
 	splay_tree_t *config_tree;	/* Pointer to configuration tree belonging to him */
@@ -117,7 +99,6 @@ extern connection_t *new_connection(void) __attribute__ ((__malloc__));
 extern void free_connection(connection_t *);
 extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
-extern void dump_connections(void);
-extern bool read_connection_config(connection_t *);
+extern bool dump_connections(struct connection_t *);
 
 #endif							/* __TINC_CONNECTION_H__ */