Replace Opaque and Strict options with a TunnelServer option.

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index 1b3ca36..cc6ff71 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -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.34 2003/07/17 15:06:26 guus Exp $
+    $Id: connection.h,v 1.1.2.38 2003/11/17 15:30:16 guus Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
@@ -27,11 +27,6 @@
 #include <openssl/evp.h>
 
 #include "avl_tree.h"
-#include "conf.h"
-#include "edge.h"
-#include "list.h"
-#include "net.h"
-#include "node.h"
 
 #define OPTION_INDIRECT                0x0001
 #define OPTION_TCPONLY         0x0002
@@ -45,14 +40,19 @@ typedef struct connection_status_t {
        int timeout:1;                          /* 1 if gotten timeout */
        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:18;
+       int mst:1;                              /* 1 if this connection is part of a minimum spanning tree */
+       int unused:23;
 } connection_status_t;
 
+#include "edge.h"
+#include "list.h"
+#include "net.h"
+#include "node.h"
+
 typedef struct connection_t {
        char *name;                                     /* name he claims to have */
 
-       sockaddr_t address;                     /* his real (internet) ip */
+       union sockaddr_t address;                       /* his real (internet) ip */
        char *hostname;                         /* the hostname of its real ip */
        int protocol_version;           /* used protocol */
 
@@ -100,11 +100,11 @@ extern connection_t *broadcast;
 
 extern void init_connections(void);
 extern void exit_connections(void);
-extern connection_t *new_connection(void) __attribute__ ((malloc));
+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 void dump_connections(void);
-extern int read_connection_config(connection_t *);
+extern bool read_connection_config(connection_t *);
 
 #endif                                                 /* __TINC_CONNECTION_H__ */