X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=ec342b39f4c96cd45f9150fc26d317ae7d32ccd9;hb=ff306f0cdaedb50de1472e7c1fb55de922a6ca60;hp=75015ffe3214669958cc5dedd3e23007993bf691;hpb=79e9a4f743b7b59fed968575f6b36171cf4a0063;p=tinc

diff --git a/src/connection.h b/src/connection.h
index 75015ffe..ec342b39 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,6 +1,6 @@
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000-2010 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -25,28 +25,32 @@
 #include "cipher.h"
 #include "digest.h"
 #include "rsa.h"
-#include "splay_tree.h"
+#include "list.h"
+#include "sptps.h"
 
 #define OPTION_INDIRECT		0x0001
 #define OPTION_TCPONLY		0x0002
 #define OPTION_PMTU_DISCOVERY	0x0004
 #define OPTION_CLAMP_MSS	0x0008
+#define OPTION_VERSION(x) ((x) >> 24) /* Top 8 bits are for protocol minor version */
 
 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 unused_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;
+		unsigned int control:1;			/* 1 if this is a control connection */
+		unsigned int pcap:1;			/* 1 if this is a control connection requesting packet capture */
+		unsigned int log:1;			/* 1 if this is a control connection requesting log dump */
+		unsigned int unused:20;
 } connection_status_t;
 
+#include "ecdsa.h"
 #include "edge.h"
 #include "net.h"
 #include "node.h"
@@ -56,7 +60,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 */
@@ -68,11 +73,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;
@@ -93,8 +100,8 @@ typedef struct connection_t {
 	splay_tree_t *config_tree;	/* Pointer to configuration tree belonging to him */
 } connection_t;
 
-extern splay_tree_t *connection_tree;
-extern connection_t *broadcast;
+extern list_t *connection_list;
+extern connection_t *everyone;
 
 extern void init_connections(void);
 extern void exit_connections(void);