X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.h;h=0092f04e77c5bf469e5b09d8671070dba79fd60c;hp=30102f2c7eacb838fe5912cffcf1e01941a2ef3c;hb=eefa28059ab989c915a7d95fb4ae728abd7ce713;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a

diff --git a/src/connection.h b/src/connection.h
index 30102f2c..0092f04e 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -17,34 +17,16 @@
     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.33 2003/07/12 17:41:45 guus Exp $
+    $Id: connection.h,v 1.1.2.35 2003/07/22 20:55:19 guus Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
 #define __TINC_CONNECTION_H__
 
-#include <sys/time.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
 
-#include <avl_tree.h>
-#include <list.h>
-
-#ifdef HAVE_OPENSSL_EVP_H
-# include <openssl/evp.h>
-#else
-# include <evp.h>
-#endif
-
-#ifdef HAVE_OPENSSL_RSA_H
-# include <openssl/rsa.h>
-#else
-# include <rsa.h>
-#endif
-
-#include "net.h"
-#include "conf.h"
-
-#include "node.h"
-#include "edge.h"
+#include "avl_tree.h"
 
 #define OPTION_INDIRECT		0x0001
 #define OPTION_TCPONLY		0x0002
@@ -62,10 +44,15 @@ typedef struct connection_status_t {
 	int unused:18;
 } 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 */
 
@@ -118,6 +105,6 @@ 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__ */