Changed prototype for lookup_connection to use struct addrinfo

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index b32e329..349fd97 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -17,12 +17,14 @@
     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.17 2001/10/27 12:13:17 guus Exp $
+    $Id: connection.h,v 1.1.2.23 2001/11/16 12:01:48 zarq Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
 #define __TINC_CONNECTION_H__
 
+#include <sys/time.h>
+
 #include <avl_tree.h>
 #include <list.h>
 
@@ -42,7 +44,10 @@
 #include "conf.h"
 
 #include "node.h"
-#include "vertex.h"
+#include "edge.h"
+
+#include <config.h>
+#include <dropin.h>
 
 #define OPTION_INDIRECT                0x0001
 #define OPTION_TCPONLY         0x0002
@@ -56,23 +61,26 @@ typedef struct connection_status_t {
   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 unused:18;
+  int mst:1;                      /* 1 if this connection is part of a minimum spanning tree */
+  int unused:17;
 } connection_status_t;
 
 typedef struct connection_t {
   char *name;                      /* name he claims to have */
 
-  ipv4_t address;                  /* his real (internet) ip */
-  short unsigned int port;         /* port number of meta connection */
+  struct addrinfo *address;        /* his real (internet) ip */
+  char *port;                      /* port number of meta connection */
   char *hostname;                  /* the hostname of its real ip */
   int protocol_version;            /* used protocol */
 
   int socket;                      /* socket used for this connection */
   long int options;                /* options for this connection */
   struct 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 node_t *node;             /* node associated with the other end */
-  struct vertex_t *vertex;         /* vertex associated with this connection */
+  struct edge_t *edge;             /* edge associated with this connection */
 
   RSA *rsa_key;                    /* his public/private key */
   EVP_CIPHER *incipher;            /* Cipher he will use to send data to us */
@@ -99,12 +107,12 @@ typedef struct connection_t {
 extern avl_tree_t *connection_tree;
 
 extern void init_connections(void);
-extern void exit_connection(void);
+extern void exit_connections(void);
 extern connection_t *new_connection(void);
 extern void free_connection(connection_t *);
 extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
-extern connection_t *lookup_connection(ipv4_t, short unsigned int);
+extern connection_t *lookup_connection(struct addrinfo *);
 extern void dump_connections(void);
 extern int read_connection_config(connection_t *);