Replace the connection_tree with a connection_list.

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index 58eea4e..ec342b3 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -25,19 +25,20 @@
 #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 */
@@ -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"
@@ -100,7 +100,7 @@ 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 list_t *connection_list;
 extern connection_t *everyone;
 
 extern void init_connections(void);