X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.h;h=5d34cd215afaade6d8ba7b8385f297d415cd8cdf;hp=5d2d3be460922a8a71ba5719540769abd95f2bd2;hb=24a2c7e51a0b080c4bdb55f697b3f0458ebc3fb1;hpb=34f9e6cf2d6d2b81eb63f9f28963b447a2157740

diff --git a/src/connection.h b/src/connection.h
index 5d2d3be4..5d34cd21 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: connection.h,v 1.1.2.8 2001/03/04 13:59:25 guus Exp $
+    $Id: connection.h,v 1.1.2.12 2001/09/24 14:11:59 guus Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
@@ -65,6 +65,7 @@ typedef struct status_bits_t {
 typedef struct connection_t {
   char *name;                      /* name of this connection */
   ipv4_t address;                  /* his real (internet) ip */
+  short unsigned int meta_port;    /* port number of meta connection */
   char *hostname;                  /* the hostname of its real ip */
   int protocol_version;            /* used protocol */
   short unsigned int port;         /* port number for UDP traffic */
@@ -85,7 +86,7 @@ typedef struct connection_t {
 
   char *buffer;                    /* metadata input buffer */
   int buflen;                      /* bytes read into buffer */
-  int reqlen;                      /* length of first request in buffer */
+  int tcplen;                      /* length of incoming TCPpacket */
   int allow_request;               /* defined if there's only one request possible */
 
   time_t last_ping_time;           /* last time we saw some activity from the other end */  
@@ -96,6 +97,7 @@ typedef struct connection_t {
   char *hischallenge;              /* challenge we sent to him */
 
   struct connection_t *nexthop;    /* nearest meta-hop in this direction */
+  struct connection_t *lastbutonehop; /* meta-hop closest to him */
   
   avl_tree_t *subnet_tree;         /* Pointer to a tree of subnets belonging to this connection */
 
@@ -103,19 +105,23 @@ typedef struct connection_t {
 } connection_t;
 
 extern avl_tree_t *connection_tree;
+extern avl_tree_t *active_tree;
 extern connection_t *myself;
 
 extern void init_connections(void);
 extern connection_t *new_connection(void);
 extern void free_connection(connection_t *);
 extern void id_add(connection_t *);
+extern void active_add(connection_t *);
+extern void active_del(connection_t *);
 extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
+extern void prune_add(connection_t *);
+extern void prune_flush(void);
 extern connection_t *lookup_id(char *);
-extern connection_t *lookup_connection(ipv4_t, short unsigned int);
+extern connection_t *lookup_active(ipv4_t, short unsigned int);
 extern void dump_connection_list(void);
 extern int read_host_config(connection_t *);
-extern void destroy_connection_tree(void);
-extern void prune_connection_tree(void);
+extern void destroy_trees(void);
 
 #endif /* __TINC_CONNECTION_H__ */