X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=2547b1eaeb902c70b0dd974595e98da37446c998;hp=8d416ec2a5f314985e819aea7fe64ad7b7e20e53;hb=e9635ae38e0e2e3eb92568a1e234f8348856dd69;hpb=950fb8e916b0e248dcaa72c96859acd6046683aa

diff --git a/src/net.h b/src/net.h
index 8d416ec2..2547b1ea 100644
--- a/src/net.h
+++ b/src/net.h
@@ -16,7 +16,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.h,v 1.9.4.14 2000/10/11 10:35:16 guus Exp $
+    $Id: net.h,v 1.9.4.16 2000/10/14 17:04:15 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -25,8 +25,6 @@
 #include <sys/time.h>
 
 #include "config.h"
-#include "conf.h"
-#include "connlist.h"
 
 #define MAXSIZE 1700  /* should be a bit more than the MTU for the tapdevice */
 #define MTU 1600
@@ -129,6 +127,8 @@ extern int total_socket_out;
 extern char *request_name[256];
 extern char *status_text[10];
 
+#include "connlist.h"		/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
+
 extern int str2opt(const char *);
 extern char *opt2str(int);
 extern int send_packet(ip_t, vpn_packet_t *);
@@ -137,7 +137,7 @@ extern void close_network_connections(void);
 extern void main_loop(void);
 extern int setup_vpn_connection(conn_list_t *);
 extern void terminate_connection(conn_list_t *);
-extern void flush_queues(conn_list_t*);
+extern void flush_queues(conn_list_t *);
 extern int xrecv(vpn_packet_t *);
 extern void add_queue(packet_queue_t **, void *, size_t);