X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=5730fbb84e9779bf32ad999ffb5c7e2188e15a4a;hb=ce059e36fdb3d3049c278e8b2f36b03c93778996;hp=2b6870e41c60d90260c0f2e561f237268c9fdd89;hpb=86c2990327fdf7ec1197aa73cb2b9a926a734db4;p=tinc

diff --git a/src/connection.h b/src/connection.h
index 2b6870e4..5730fbb8 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -32,12 +32,13 @@
 #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 */
@@ -49,7 +50,6 @@ typedef struct connection_status_t {
 		unsigned int unused:20;
 } connection_status_t;
 
-#include "ecdh.h"
 #include "ecdsa.h"
 #include "edge.h"
 #include "net.h"
@@ -107,7 +107,6 @@ extern void init_connections(void);
 extern void exit_connections(void);
 extern connection_t *new_connection(void) __attribute__ ((__malloc__));
 extern void free_connection(connection_t *);
-extern void free_connection_partially(connection_t *);
 extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
 extern bool dump_connections(struct connection_t *);