X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.h;h=4532eb49024c249496afd89057c85d4ad4cb2549;hp=eef6338291e6f413aa5beef0cb015a8b6d691b68;hb=319e0cb48eb00565a11c85b901f54141f8160334;hpb=447a43d63960802a7a29201c512246be11eb9c94

diff --git a/src/connection.h b/src/connection.h
index eef63382..4532eb49 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.7 2001/01/07 20:19:29 guus Exp $
+    $Id: connection.h,v 1.1.2.10 2001/07/15 18:07:31 guus Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
@@ -65,12 +65,12 @@ 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 */
   long int options;                /* options turned on for this connection */
 
-  int flags;                       /* his flags */
   int socket;                      /* our udp vpn socket */
   int meta_socket;                 /* our tcp meta socket */
   status_bits_t status;            /* status info */
@@ -86,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 */  
@@ -104,16 +104,18 @@ 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 connection_add(connection_t *);
 extern void connection_del(connection_t *);
 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);