Use splay trees instead of AVL trees.

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index 087d8f0..9906f0d 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -26,7 +26,9 @@
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
 
-#include "avl_tree.h"
+#include <event.h>
+
+#include "splay_tree.h"
 
 #define OPTION_INDIRECT                0x0001
 #define OPTION_TCPONLY         0x0002
@@ -60,6 +62,7 @@ typedef struct connection_t {
        char *hostname;                         /* the hostname of its real ip */
        int protocol_version;           /* used protocol */
 
+       struct event ev;                        /* events on this metadata connection */
        int socket;                                     /* socket used for this connection */
        long int options;                       /* options for this connection */
        connection_status_t status;     /* status info */
@@ -98,14 +101,14 @@ typedef struct connection_t {
        int outbufstart;                        /* index of first meaningful byte in output buffer */
        int outbuflen;                          /* number of meaningful bytes in output buffer */
        int outbufsize;                         /* number of bytes allocated to output buffer */
+       struct event outev;                     /* events on this metadata connection */
 
        time_t last_ping_time;          /* last time we saw some activity from the other end or pinged them */
-       time_t last_flushed_time;       /* last time buffer was empty. Only meaningful if outbuflen > 0 */
 
-       avl_tree_t *config_tree;        /* Pointer to configuration tree belonging to him */
+       splay_tree_t *config_tree;      /* Pointer to configuration tree belonging to him */
 } connection_t;
 
-extern avl_tree_t *connection_tree;
+extern splay_tree_t *connection_tree;
 extern connection_t *broadcast;
 
 extern void init_connections(void);