X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=0fc49ef38d4fe19228d191d0db37b5707474d302;hb=a22041922f160667573e9a5ae3f4195e1668906a;hp=08778bf3fda5bdf8f9069ffa6521964e0e47afa3;hpb=5a132550deb58473285e5f91705d286aef47be71;p=tinc

diff --git a/src/connection.h b/src/connection.h
index 08778bf3..0fc49ef3 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,6 +1,6 @@
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2010 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -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$
+    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__
@@ -31,9 +29,9 @@
 #define OPTION_INDIRECT		0x0001
 #define OPTION_TCPONLY		0x0002
 #define OPTION_PMTU_DISCOVERY	0x0004
+#define OPTION_CLAMP_MSS	0x0008
 
-typedef union connection_status_t {
-	struct {
+typedef struct connection_status_t {
 		int pinged:1;				/* sent ping */
 		int active:1;				/* 1 if active.. */
 		int connecting:1;			/* 1 if we are waiting for a non-blocking connect() to finish */
@@ -43,9 +41,8 @@ typedef union 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 unused:23;
-	};
-	uint32_t value;
+		int control:1;
+		int unused:22;
 } connection_status_t;
 
 #include "edge.h"
@@ -61,7 +58,7 @@ typedef struct connection_t {
 	int protocol_version;		/* used protocol */
 
 	int socket;					/* socket used for this connection */
-	long int options;			/* options for this connection */
+	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 */
@@ -102,7 +99,6 @@ extern connection_t *new_connection(void) __attribute__ ((__malloc__));
 extern void free_connection(connection_t *);
 extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
-extern int dump_connections(struct evbuffer *);
-extern bool read_connection_config(connection_t *);
+extern bool dump_connections(struct connection_t *);
 
 #endif							/* __TINC_CONNECTION_H__ */