Dump through control socket

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index 87988db..ddff03b 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -26,23 +26,28 @@
 #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
 #define OPTION_PMTU_DISCOVERY  0x0004
 
-typedef struct connection_status_t {
-       int pinged:1;                           /* sent ping */
-       int active:1;                           /* 1 if active.. */
-       int connecting:1;                       /* 1 if we are waiting for a non-blocking connect() to finish */
-       int termreq:1;                          /* the termination of this connection was requested */
-       int remove:1;                           /* Set to 1 if you want this connection removed */
-       int timeout:1;                          /* 1 if gotten timeout */
-       int encryptout:1;                       /* 1 if we can encrypt outgoing traffic */
-       int decryptin:1;                        /* 1 if we have to decrypt incoming traffic */
-       int mst:1;                              /* 1 if this connection is part of a minimum spanning tree */
-       int unused:23;
+typedef union connection_status_t {
+       struct {
+               int pinged:1;                           /* sent ping */
+               int active:1;                           /* 1 if active.. */
+               int connecting:1;                       /* 1 if we are waiting for a non-blocking connect() to finish */
+               int termreq:1;                          /* the termination of this connection was requested */
+               int remove_unused:1;                            /* Set to 1 if you want this connection removed */
+               int timeout_unused:1;                           /* 1 if gotten timeout */
+               int encryptout:1;                       /* 1 if we can encrypt outgoing traffic */
+               int decryptin:1;                        /* 1 if we have to decrypt incoming traffic */
+               int mst:1;                              /* 1 if this connection is part of a minimum spanning tree */
+               int unused:23;
+       };
+       uint32_t value;
 } connection_status_t;
 
 #include "edge.h"
@@ -59,7 +64,7 @@ typedef struct connection_t {
 
        int socket;                                     /* socket used for this connection */
        long int options;                       /* options for this connection */
-       struct connection_status_t status;      /* status info */
+       connection_status_t status;     /* status info */
        int estimated_weight;           /* estimation for the weight of the edge for this connection */
        struct timeval start;           /* time this connection was started, used for above estimation */
        struct outgoing_t *outgoing;    /* used to keep track of outgoing connections */
@@ -85,24 +90,17 @@ typedef struct connection_t {
        char *mychallenge;                      /* challenge we received from him */
        char *hischallenge;                     /* challenge we sent to him */
 
-       char buffer[MAXBUFSIZE];        /* metadata input buffer */
-       int buflen;                                     /* bytes read into buffer */
-       int reqlen;                                     /* length of incoming request */
+       struct bufferevent *buffer;                     /* buffer events on this metadata connection */
+       struct event inevent;                           /* input event on this metadata connection */
        int tcplen;                                     /* length of incoming TCPpacket */
        int allow_request;                      /* defined if there's only one request possible */
 
-       char *outbuf;                           /* metadata output buffer */
-       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 */
-
        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);
@@ -111,7 +109,7 @@ extern connection_t *new_connection(void) __attribute__ ((__malloc__));
 extern void free_connection(connection_t *);
 extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
-extern void dump_connections(void);
+extern int dump_connections(struct evbuffer *);
 extern bool read_connection_config(connection_t *);
 
 #endif                                                 /* __TINC_CONNECTION_H__ */