X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.h;h=d5c14bd599ed210975d8fa5e51caca473f15d013;hp=f075f19a1b600a4d7d3aebeff01f4ee49c9bfef6;hb=b45511118421920771f5dcd5e4bafc04376e4450;hpb=0e59fb022c6c015a5be7ed70e0378cb011be98b5 diff --git a/src/connection.h b/src/connection.h index f075f19a..d5c14bd5 100644 --- a/src/connection.h +++ b/src/connection.h @@ -1,7 +1,7 @@ /* connection.h -- header for connection.c - Copyright (C) 2000-2003 Guus Sliepen , - 2000-2003 Ivo Timmermans + Copyright (C) 2000-2009 Guus Sliepen , + 2000-2005 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 @@ -13,11 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - 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.37 2003/11/10 22:31:53 guus Exp $ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef __TINC_CONNECTION_H__ @@ -30,6 +28,8 @@ #define OPTION_INDIRECT 0x0001 #define OPTION_TCPONLY 0x0002 +#define OPTION_PMTU_DISCOVERY 0x0004 +#define OPTION_CLAMP_MSS 0x0008 typedef struct connection_status_t { int pinged:1; /* sent ping */ @@ -41,9 +41,7 @@ typedef struct connection_status_t { int encryptout:1; /* 1 if we can encrypt outgoing traffic */ int decryptin:1; /* 1 if we have to decrypt incoming traffic */ int mst:1; /* 1 if this connection is part of a minimum spanning tree */ - int opaque:1; /* 1 if we do not forward information about other nodes */ - int strict:1; /* 1 if we strictly check edges and subnets received from this connection */ - int unused:18; + int unused:23; } connection_status_t; #include "edge.h" @@ -59,8 +57,8 @@ typedef struct connection_t { 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 */ + uint32_t options; /* options for this connection */ + connection_status_t status; /* status info */ int estimated_weight; /* estimation for the weight of the edge 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 */ @@ -92,7 +90,13 @@ typedef struct connection_t { int tcplen; /* length of incoming TCPpacket */ int allow_request; /* defined if there's only one request possible */ - time_t last_ping_time; /* last time we saw some activity from the other end */ + char *outbuf; /* metadata output buffer */ + int outbufstart; /* index of first meaningful byte in output buffer */ + int outbuflen; /* number of meaningful bytes in output buffer */ + int outbufsize; /* number of bytes allocated to output buffer */ + + time_t last_ping_time; /* last time we saw some activity from the other end or pinged them */ + time_t last_flushed_time; /* last time buffer was empty. Only meaningful if outbuflen > 0 */ avl_tree_t *config_tree; /* Pointer to configuration tree belonging to him */ } connection_t;