X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=ec342b39f4c96cd45f9150fc26d317ae7d32ccd9;hb=ff306f0cdaedb50de1472e7c1fb55de922a6ca60;hp=854e29f23a56bbb5a8540bb27749afb152ca3d46;hpb=6dfdb323612184529b4b83c1be914dda8262de47;p=tinc diff --git a/src/connection.h b/src/connection.h index 854e29f2..ec342b39 100644 --- a/src/connection.h +++ b/src/connection.h @@ -25,7 +25,7 @@ #include "cipher.h" #include "digest.h" #include "rsa.h" -#include "splay_tree.h" +#include "list.h" #include "sptps.h" #define OPTION_INDIRECT 0x0001 @@ -38,7 +38,7 @@ 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 */ @@ -100,14 +100,13 @@ 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); 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 *);