X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.h;h=349fd97135d02f32a3665db9bda7fcaf9a3b1abd;hp=5307147af16d81a7f3082629a412e938e4425e69;hb=74e1299fb58025f7506c7e2608c353a76f98d8df;hpb=b6298e2c082035b8238ea08673ced15d0fb7b89a

diff --git a/src/connection.h b/src/connection.h
index 5307147a..349fd971 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.20 2001/10/28 22:42:49 guus Exp $
+    $Id: connection.h,v 1.1.2.23 2001/11/16 12:01:48 zarq Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
@@ -46,6 +46,9 @@
 #include "node.h"
 #include "edge.h"
 
+#include <config.h>
+#include <dropin.h>
+
 #define OPTION_INDIRECT		0x0001
 #define OPTION_TCPONLY		0x0002
 
@@ -65,8 +68,8 @@ typedef struct 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 */
 
@@ -77,7 +80,7 @@ typedef struct connection_t {
   struct timeval start;            /* time this connection was started, used for above estimation */
 
   struct node_t *node;             /* node associated with the other end */
-  struct edge_t *edge;         /* edge 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 */
@@ -104,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 *);