X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=2d84aced1cdee1119a549dbc222800c7625b2d17;hb=65d6f023c46ac3a087f59b60762f87c869783f21;hp=0fc49ef38d4fe19228d191d0db37b5707474d302;hpb=886a6f61a1f4cc48a77b42d10f34f9126377d904;p=tinc

diff --git a/src/connection.h b/src/connection.h
index 0fc49ef3..2d84aced 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -21,10 +21,12 @@
 #ifndef __TINC_CONNECTION_H__
 #define __TINC_CONNECTION_H__
 
+#include "buffer.h"
 #include "cipher.h"
 #include "digest.h"
 #include "rsa.h"
 #include "splay_tree.h"
+#include "sptps.h"
 
 #define OPTION_INDIRECT		0x0001
 #define OPTION_TCPONLY		0x0002
@@ -32,21 +34,23 @@
 #define OPTION_CLAMP_MSS	0x0008
 
 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 */
-		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 control:1;
-		int unused:22;
+		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"
 
@@ -55,7 +59,8 @@ 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 */
 	uint32_t options;			/* options for this connection */
@@ -67,11 +72,13 @@ 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 */
 	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;
+	sptps_t sptps;
 
 	int inmaclength;
 	int outmaclength;
@@ -80,8 +87,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 */
 
@@ -91,7 +100,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);