X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.h;h=2e5b910d6520a076de48dd4256f8db14a9a9f95f;hp=0de989adb188e6bfde74f49195934c8ffbbfeb20;hb=b5bb06200eda170c9836e1b4474d6f5b920c2151;hpb=31db57bb4a00f5ca3743b89f8bb2fbd39919bf28 diff --git a/src/edge.h b/src/edge.h index 0de989ad..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.4 2001/11/16 12:13:34 zarq Exp $ + $Id: edge.h,v 1.1.2.8 2002/06/21 10:11:12 guus Exp $ */ #ifndef __TINC_EDGE_H__ @@ -25,21 +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 */ - - struct addrinfo *address; /* real (internet) ip on 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 */