X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.h;h=fdc87d74f2afc253cc37fe3ff3f70fad3eefd263;hp=0cdcc091523e6dbeff0fba8d1b28d5165f1540f1;hb=b5bb06200eda170c9836e1b4474d6f5b920c2151;hpb=c6d01588312bec7691e72b42cf20c59ffe2749c2 diff --git a/src/connection.h b/src/connection.h index 0cdcc091..fdc87d74 100644 --- a/src/connection.h +++ b/src/connection.h @@ -1,7 +1,7 @@ /* connection.h -- header for connection.c - Copyright (C) 2000-2002 Guus Sliepen , - 2000-2002 Ivo Timmermans + Copyright (C) 2000-2002 Guus Sliepen , + 2000-2002 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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.26 2002/02/20 19:25:09 guus Exp $ + $Id: connection.h,v 1.1.2.28 2002/09/03 20:43:24 guus Exp $ */ #ifndef __TINC_CONNECTION_H__ @@ -44,7 +44,6 @@ #include "conf.h" #include "node.h" -#include "edge.h" #define OPTION_INDIRECT 0x0001 #define OPTION_TCPONLY 0x0002 @@ -66,18 +65,19 @@ typedef struct connection_t { char *name; /* name he claims to have */ sockaddr_t address; /* his real (internet) ip */ + sockaddr_t myaddress; /* our own address as seen by him */ + 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 */ + int estimated_weight; /* estimation for the weight for this connection */ struct timeval start; /* time this connection was started, used for above estimation */ struct outgoing_t *outgoing; /* used to keep track of outgoing connections */ struct node_t *node; /* node associated with the other end */ - struct edge_t *edge; /* edge associated with this connection */ RSA *rsa_key; /* his public/private key */ const EVP_CIPHER *incipher; /* Cipher he will use to send data to us */