X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=20e00763c0a1d9881b15509b34061b0327b0bce0;hb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;hp=08778bf3fda5bdf8f9069ffa6521964e0e47afa3;hpb=5a132550deb58473285e5f91705d286aef47be71;p=tinc

diff --git a/src/connection.h b/src/connection.h
index 08778bf3..20e00763 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,16 +13,15 @@
     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 "buffer.h"
 #include "cipher.h"
 #include "digest.h"
 #include "rsa.h"
@@ -31,25 +30,26 @@
 #define OPTION_INDIRECT		0x0001
 #define OPTION_TCPONLY		0x0002
 #define OPTION_PMTU_DISCOVERY	0x0004
-
-typedef union connection_status_t {
-	struct {
-		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 */
-		int termreq:1;				/* the termination of this connection was requested */
-		int remove_unused:1;				/* Set to 1 if you want this connection removed */
-		int timeout_unused:1;				/* 1 if gotten timeout */
-		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;
+#define OPTION_CLAMP_MSS	0x0008
+
+typedef struct connection_status_t {
+		unsigned int pinged:1;			/* sent ping */
+		unsigned int active:1;			/* 1 if active.. */
+		unsigned int connecting:1;		/* 1 if we are waiting for a non-blocking connect() to finish */
+		unsigned int termreq:1;			/* the termination of this connection was requested */
+		unsigned int remove_unused:1;		/* Set to 1 if you want this connection removed */
+		unsigned int timeout_unused:1;		/* 1 if gotten timeout */
+		unsigned int encryptout:1;		/* 1 if we can encrypt outgoing traffic */
+		unsigned int decryptin:1;		/* 1 if we have to decrypt incoming traffic */
+		unsigned int mst:1;			/* 1 if this connection is part of a minimum spanning tree */
+		unsigned int control:1;
+		unsigned int pcap:1;
+		unsigned int unused:21;
 } connection_status_t;
 
+#include "ecdh.h"
+#include "ecdsa.h"
 #include "edge.h"
-#include "list.h"
 #include "net.h"
 #include "node.h"
 
@@ -58,10 +58,11 @@ typedef struct connection_t {
 
 	union sockaddr_t address;			/* his real (internet) ip */
 	char *hostname;				/* the hostname of its real ip */
-	int protocol_version;		/* used protocol */
+	int protocol_major;		/* used protocol */
+	int protocol_minor;		/* used protocol */
 
 	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 */
@@ -70,7 +71,9 @@ typedef struct connection_t {
 	struct node_t *node;		/* node associated with the other end */
 	struct edge_t *edge;		/* edge associated with this connection */
 
-	rsa_t rsa;			/* his public/private key */
+	rsa_t rsa;			/* his public RSA key */
+	ecdsa_t ecdsa;			/* his public ECDSA key */
+	ecdsa_t ecdh;			/* state for ECDH key exchange */
 	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;
@@ -83,8 +86,10 @@ typedef struct connection_t {
 
 	char *hischallenge;		/* The challenge we sent to him */
 
-	struct bufferevent *buffer;			/* buffer events on this metadata connection */
+	struct buffer_t inbuf;
+	struct buffer_t outbuf;
 	struct event inevent;				/* input event on this metadata connection */
+	struct event outevent;				/* output event on this metadata connection */
 	int tcplen;					/* length of incoming TCPpacket */
 	int allow_request;			/* defined if there's only one request possible */
 
@@ -94,7 +99,7 @@ typedef struct connection_t {
 } connection_t;
 
 extern splay_tree_t *connection_tree;
-extern connection_t *broadcast;
+extern connection_t *everyone;
 
 extern void init_connections(void);
 extern void exit_connections(void);
@@ -102,7 +107,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 int dump_connections(struct evbuffer *);
-extern bool read_connection_config(connection_t *);
+extern bool dump_connections(struct connection_t *);
 
 #endif							/* __TINC_CONNECTION_H__ */