Merge branch 'master' into 1.1

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index 2b6870e..854e29f 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -32,6 +32,7 @@
 #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 */
@@ -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"