X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.h;h=2e5b910d6520a076de48dd4256f8db14a9a9f95f;hp=4fff3878e5470cb137ece7a8cb1de80102de212b;hb=627f7c22b447bd464b536cd016278545674df93d;hpb=b6298e2c082035b8238ea08673ced15d0fb7b89a diff --git a/src/edge.h b/src/edge.h index 4fff3878..2e5b910d 100644 --- a/src/edge.h +++ b/src/edge.h @@ -1,7 +1,7 @@ /* edge.h -- header for edge.c - Copyright (C) 2001 Guus Sliepen , - 2001 Ivo Timmermans + Copyright (C) 2001-2002 Guus Sliepen , + 2001-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: edge.h,v 1.1.2.3 2001/10/28 22:42:49 guus Exp $ + $Id: edge.h,v 1.1.2.8 2002/06/21 10:11:12 guus Exp $ */ #ifndef __TINC_EDGE_H__ @@ -25,22 +25,19 @@ #include +#include "net.h" #include "node.h" #include "connection.h" -/* I don't know if halfconnection_t is useful... */ - typedef struct halfconnection_t { struct node_t *node; /* node associated with this end of the connection */ - - ipv4_t address; /* real (internet) ip on this end of the meta connection */ - short unsigned int port; /* port number of this end of the meta connection */ - char *hostname; /* the hostname of real ip */ +// sockaddr_t tcpaddress; /* real (internet) ip on this end of the meta connection */ + sockaddr_t udpaddress; /* real (internet) ip on this end of the vpn connection */ } halfconnection_t; typedef struct edge_t { - struct node_t *from; - struct node_t *to; + struct halfconnection_t from; + struct halfconnection_t to; long int options; /* options turned on for this edge */ int weight; /* weight of this edge */