Use struct addrinfo in connection_t to hold all host data such as IP

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index 9a35461..2a3a6b1 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -17,17 +17,17 @@
     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.16 2001/10/10 20:35:10 guus Exp $
+    $Id: connection.h,v 1.1.2.22 2001/11/16 00:23:28 zarq Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
 #define __TINC_CONNECTION_H__
 
+#include <sys/time.h>
+
 #include <avl_tree.h>
 #include <list.h>
 
-#include "config.h"
-
 #ifdef HAVE_OPENSSL_EVP_H
 # include <openssl/evp.h>
 #else
@@ -44,39 +44,40 @@
 #include "conf.h"
 
 #include "node.h"
-#include "vertex.h"
+#include "edge.h"
+
+#define OPTION_INDIRECT                0x0001
+#define OPTION_TCPONLY         0x0002
 
-typedef struct status_bits_t {
+typedef struct connection_status_t {
   int pinged:1;                    /* sent ping */
-  int meta:1;                      /* meta connection exists */
   int active:1;                    /* 1 if active.. */
   int outgoing:1;                  /* I myself asked for this conn */
   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 validkey:1;                  /* 1 if we currently have a valid key for him */
-  int waitingforkey:1;             /* 1 if we already sent out a request */
-  int dataopen:1;                  /* 1 if we have a valid UDP connection open */
   int encryptout:1;               /* 1 if we can encrypt outgoing traffic */
   int decryptin:1;                 /* 1 if we have to decrypt incoming traffic */
-  int unused:18;
-} status_bits_t;
-
-#define OPTION_INDIRECT                0x0001
-#define OPTION_TCPONLY         0x0002
+  int mst:1;                      /* 1 if this connection is part of a minimum spanning tree */
+  int unused:17;
+} connection_status_t;
 
 typedef struct connection_t {
-  ipv4_t address;                  /* his real (internet) ip */
-  short unsigned int port;         /* port number of meta connection */
+  char *name;                      /* name he claims to have */
+
+  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 */
-  status_bits_t status;            /* status info */
+  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 */
@@ -96,8 +97,20 @@ typedef struct connection_t {
   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 */
+
+  avl_tree_t *config_tree;         /* Pointer to configuration tree belonging to him */
 } connection_t;
 
 extern avl_tree_t *connection_tree;
 
+extern void init_connections(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 void dump_connections(void);
+extern int read_connection_config(connection_t *);
+
 #endif /* __TINC_CONNECTION_H__ */