TCPonly now works (in a relatively clean way too).

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index 7f742e1..f46d35b 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,7 +1,7 @@
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
+                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
 
     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.5 2001/01/07 15:25:41 guus Exp $
+    $Id: connection.h,v 1.1.2.9 2001/05/25 11:54:28 guus Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
@@ -59,9 +59,8 @@ typedef struct status_bits_t {
   int unused:18;
 } status_bits_t;
 
-typedef struct option_bits_t {
-  int unused:32;
-} option_bits_t;
+#define OPTION_INDIRECT                0x0001
+#define OPTION_TCPONLY         0x0002
 
 typedef struct connection_t {
   char *name;                      /* name of this connection */
@@ -69,9 +68,8 @@ typedef struct connection_t {
   char *hostname;                  /* the hostname of its real ip */
   int protocol_version;            /* used protocol */
   short unsigned int port;         /* port number for UDP traffic */
-  long unsigned int options;       /* options turned on for this connection */
+  long int options;                /* options turned on for this connection */
 
-  int flags;                       /* his flags */
   int socket;                      /* our udp vpn socket */
   int meta_socket;                 /* our tcp meta socket */
   status_bits_t status;            /* status info */
@@ -87,7 +85,7 @@ typedef struct connection_t {
 
   char *buffer;                    /* metadata input buffer */
   int buflen;                      /* bytes read into buffer */
-  int reqlen;                      /* length of first request in buffer */
+  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 */