X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.h;h=349fd97135d02f32a3665db9bda7fcaf9a3b1abd;hp=8ab81288a42b18a7d83120939018a30c8eec7b8a;hb=74e1299fb58025f7506c7e2608c353a76f98d8df;hpb=2165931c62f0433fd97bd3ac6aefea3627218946 diff --git a/src/connection.h b/src/connection.h index 8ab81288..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.21 2001/10/30 16:34:32 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 +#include + #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 */ @@ -109,7 +112,7 @@ 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 *);