tinc/src conf.c,1.9.4.65,1.9.4.66 conf.h,1.6.4.38,1.6.4.39 connection.c,1.1.2.39,1.1.2.40 connection.h,1.1.2.33,1.1.2.34 edge.c,1.1.2.21,1.1.2.22 edge.h,1.1.2.13,1.1.2.14 event.c,1.1.4.8,1.1.4.9 event.h,1.1.4.6,1.1.4.7 graph.c,1.1.2.24,1.1.2.25 logger.c,1.1.2.3,1.1.2.4 logger.h,1.1.2.3,1.1.2.4 meta.c,1.1.2.35,1.1.2.36 net.c,1.35.4.190,1.35.4.191 net.h,1.9.4.63,1.9.4.64 net_packet.c,1.1.2.33,1.1.2.34 net_setup.c,1.1.2.34,1.1.2.35 net_socket.c,1.1.2.26,1.1.2.27 netutl.c,1.12.4.46,1.12.4.47 netutl.h,1.2.4.15,1.2.4.16 node.c,1.1.2.22,1.1.2.23 node.h,1.1.2.24,1.1.2.25 process.c,1.1.2.54,1.1.2.55 process.h,1.1.2.15,1.1.2.16 protocol.c,1.28.4.140,1.28.4.141 protocol.h,1.5.4.38,1.5.4.39 protocol_auth.c,1.1.4.23,1.1.4.24 protocol_edge.c,1.1.4.17,1.1.4.18 protocol_key.c,1.1.4.18,1.1.4.19 protocol_misc.c,1.1.4.10,1.1.4.11 protocol_subnet.c,1.1.4.11,1.1.4.12 route.c,1.1.2.58,1.1.2.59 subnet.c,1.1.2.46,1.1.2.47 tincd.c,1.10.4.72,1.10.4.73

[Guus Sliepen <guus@nl.linux.org>]

Update of /home/CVS/tinc/src
In directory humbolt:/tmp/cvs-serv5751/src

Modified Files:
      Tag: CABAL
	conf.c conf.h connection.c connection.h edge.c edge.h event.c 
	event.h graph.c logger.c logger.h meta.c net.c net.h 
	net_packet.c net_setup.c net_socket.c netutl.c netutl.h node.c 
	node.h process.c process.h protocol.c protocol.h 
	protocol_auth.c protocol_edge.c protocol_key.c protocol_misc.c 
	protocol_subnet.c route.c subnet.c tincd.c 
Log Message:
Big header file cleanup: everything that has to do with standard system
libraries is moved to system.h.


Index: conf.c
===================================================================
RCS file: /home/CVS/tinc/src/Attic/conf.c,v
retrieving revision 1.9.4.65
retrieving revision 1.9.4.66
diff -u -r1.9.4.65 -r1.9.4.66
--- conf.c	2003/07/12 17:41:45	1.9.4.65
+++ conf.c	2003/07/17 15:06:26	1.9.4.66
@@ -22,28 +22,14 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <xalloc.h>
-#include <utils.h>				/* for cp */
-#include <avl_tree.h>
+#include "system.h"
 
+#include "avl_tree.h"
 #include "conf.h"
-#include "netutl.h"				/* for str2address */
 #include "logger.h"
-
-#include "system.h"
+#include "netutl.h"				/* for str2address */
+#include "utils.h"				/* for cp */
+#include "xalloc.h"
 
 avl_tree_t *config_tree;
 

Index: conf.h
===================================================================
RCS file: /home/CVS/tinc/src/Attic/conf.h,v
retrieving revision 1.6.4.38
retrieving revision 1.6.4.39
diff -u -r1.6.4.38 -r1.6.4.39
--- conf.h	2003/07/12 17:41:45	1.6.4.38
+++ conf.h	2003/07/17 15:06:26	1.6.4.39
@@ -23,12 +23,7 @@
 #ifndef __TINC_CONF_H__
 #define __TINC_CONF_H__
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
-#include <avl_tree.h>
-#include "net.h"
+#include "avl_tree.h"
 #include "subnet.h"
 
 typedef struct config_t {
@@ -57,7 +52,6 @@
 extern int get_config_int(config_t *, int *);
 extern int get_config_string(config_t *, char **);
 extern int get_config_address(config_t *, struct addrinfo **);
-struct subnet_t;				/* Needed for next line. */
 extern int get_config_subnet(config_t *, struct subnet_t **);
 
 extern int read_config_file(avl_tree_t *, const char *);

Index: connection.c
===================================================================
RCS file: /home/CVS/tinc/src/Attic/connection.c,v
retrieving revision 1.1.2.39
retrieving revision 1.1.2.40
diff -u -r1.1.2.39 -r1.1.2.40
--- connection.c	2003/07/12 17:41:45	1.1.2.39
+++ connection.c	2003/07/17 15:06:26	1.1.2.40
@@ -20,24 +20,17 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
 
+#include "avl_tree.h"
+#include "conf.h"
+#include "list.h"
+#include "logger.h"
 #include "net.h"				/* Don't ask. */
 #include "netutl.h"
-#include "conf.h"
-#include <utils.h>
 #include "subnet.h"
-#include "logger.h"
-
+#include "utils.h"
 #include "xalloc.h"
-#include "system.h"
 
 avl_tree_t *connection_tree;	/* Meta connections */
 connection_t *broadcast;

Index: connection.h
===================================================================
RCS file: /home/CVS/tinc/src/Attic/connection.h,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -r1.1.2.33 -r1.1.2.34
--- connection.h	2003/07/12 17:41:45	1.1.2.33
+++ connection.h	2003/07/17 15:06:26	1.1.2.34
@@ -23,28 +23,15 @@
 #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 "avl_tree.h"
 #include "conf.h"
-
-#include "node.h"
 #include "edge.h"
+#include "list.h"
+#include "net.h"
+#include "node.h"
 
 #define OPTION_INDIRECT		0x0001
 #define OPTION_TCPONLY		0x0002

Index: edge.c
===================================================================
RCS file: /home/CVS/tinc/src/Attic/edge.c,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- edge.c	2003/07/12 17:41:45	1.1.2.21
+++ edge.c	2003/07/17 15:06:26	1.1.2.22
@@ -20,25 +20,15 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
 
-#include "net.h"				/* Don't ask. */
-#include "netutl.h"
-#include "conf.h"
-#include <utils.h>
-#include "subnet.h"
+#include "avl_tree.h"
 #include "edge.h"
-#include "node.h"
 #include "logger.h"
-
+#include "netutl.h"
+#include "node.h"
+#include "utils.h"
 #include "xalloc.h"
-#include "system.h"
 
 avl_tree_t *edge_weight_tree;	/* Tree with all edges, sorted on weight */
 

Index: edge.h
===================================================================
RCS file: /home/CVS/tinc/src/Attic/edge.h,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- edge.h	2003/07/12 17:41:45	1.1.2.13
+++ edge.h	2003/07/17 15:06:26	1.1.2.14
@@ -23,11 +23,10 @@
 #ifndef __TINC_EDGE_H__
 #define __TINC_EDGE_H__
 
-#include <avl_tree.h>
-
+#include "avl_tree.h"
+#include "connection.h"
 #include "net.h"
 #include "node.h"
-#include "connection.h"
 
 typedef struct edge_t {
 	struct node_t *from;

Index: event.c
===================================================================
RCS file: /home/CVS/tinc/src/Attic/event.c,v
retrieving revision 1.1.4.8
retrieving revision 1.1.4.9
diff -u -r1.1.4.8 -r1.1.4.9
--- event.c	2003/07/12 17:41:45	1.1.4.8
+++ event.c	2003/07/17 15:06:26	1.1.4.9
@@ -20,18 +20,12 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <xalloc.h>
-#include <string.h>
-#include <utils.h>
-#include <avl_tree.h>
-#include <time.h>
+#include "system.h"
 
+#include "avl_tree.h"
 #include "event.h"
-
-#include "system.h"
+#include "utils.h"
+#include "xalloc.h"
 
 avl_tree_t *event_tree;
 extern time_t now;

Index: event.h
===================================================================
RCS file: /home/CVS/tinc/src/Attic/event.h,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -r1.1.4.6 -r1.1.4.7
--- event.h	2003/07/12 17:41:45	1.1.4.6
+++ event.h	2003/07/17 15:06:26	1.1.4.7
@@ -23,8 +23,7 @@
 #ifndef __TINC_EVENT_H__
 #define __TINC_EVENT_H__
 
-#include <time.h>
-#include <avl_tree.h>
+#include "avl_tree.h"
 
 extern avl_tree_t *event_tree;
 

Index: graph.c
===================================================================
RCS file: /home/CVS/tinc/src/Attic/graph.c,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- graph.c	2003/07/12 17:41:45	1.1.2.24
+++ graph.c	2003/07/17 15:06:26	1.1.2.25
@@ -44,27 +44,17 @@
    destination address and port of a node if possible.
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <string.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#include <netinet/in.h>
-
-#include <avl_tree.h>
-#include <utils.h>
+#include "system.h"
 
-#include "netutl.h"
-#include "node.h"
-#include "edge.h"
+#include "avl_tree.h"
 #include "connection.h"
-#include "process.h"
 #include "device.h"
+#include "edge.h"
 #include "logger.h"
-
-#include "system.h"
+#include "netutl.h"
+#include "node.h"
+#include "process.h"
+#include "utils.h"
 
 /* Implementation of Kruskal's algorithm.
    Running time: O(EN)

Index: logger.c
===================================================================
RCS file: /home/CVS/tinc/src/Attic/logger.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- logger.c	2003/07/12 17:41:45	1.1.2.3
+++ logger.c	2003/07/17 15:06:26	1.1.2.4
@@ -20,15 +20,10 @@
     $Id$
 */
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <syslog.h>
-#include <unistd.h>
+#include "system.h"
 
 #include "conf.h"
 #include "logger.h"
-
-#include "system.h"
 
 int debug_level = DEBUG_NOTHING;
 static int logmode = LOGMODE_STDERR;

Index: logger.h
===================================================================
RCS file: /home/CVS/tinc/src/Attic/logger.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- logger.h	2003/07/12 20:24:04	1.1.2.3
+++ logger.h	2003/07/17 15:06:26	1.1.2.4
@@ -1,8 +1,5 @@
 #ifndef __TINC_LOGGER_H__
 
-#include <syslog.h>
-#include <stdarg.h>
-
 enum {
 	DEBUG_NOTHING = 0,			/* Quiet mode, only show starting/stopping of the daemon */
 	DEBUG_ALWAYS = 0,

Index: meta.c
===================================================================
RCS file: /home/CVS/tinc/src/meta.c,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -u -r1.1.2.35 -r1.1.2.36
--- meta.c	2003/07/12 17:41:45	1.1.2.35
+++ meta.c	2003/07/17 15:06:26	1.1.2.36
@@ -20,24 +20,17 @@
     $Id$
 */
 
-#include "config.h"
-#include <utils.h>
-#include <avl_tree.h>
-
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-/* This line must be below the rest for FreeBSD */
-#include <sys/types.h>
-#include <sys/socket.h>
+#include "system.h"
 
 #include <openssl/evp.h>
 
-#include "net.h"
+#include "avl_tree.h"
 #include "connection.h"
-#include "system.h"
-#include "protocol.h"
 #include "logger.h"
+#include "net.h"
+#include "protocol.h"
+#include "system.h"
+#include "utils.h"
 
 int send_meta(connection_t *c, char *buffer, int length)
 {

Index: net.c
===================================================================
RCS file: /home/CVS/tinc/src/net.c,v
retrieving revision 1.35.4.190
retrieving revision 1.35.4.191
diff -u -r1.35.4.190 -r1.35.4.191
--- net.c	2003/07/12 17:41:45	1.35.4.190
+++ net.c	2003/07/17 15:06:26	1.35.4.191
@@ -20,59 +20,25 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-/* SunOS really wants sys/socket.h BEFORE net/if.h,
-   and FreeBSD wants these lines below the rest. */
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#include <netinet/in.h>
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
+#include "system.h"
 
 #include <openssl/rand.h>
 
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
-#include <list.h>
-
+#include "utils.h"
+#include "avl_tree.h"
 #include "conf.h"
 #include "connection.h"
+#include "device.h"
+#include "event.h"
+#include "graph.h"
+#include "logger.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
-#include "subnet.h"
-#include "graph.h"
-#include "process.h"
 #include "route.h"
-#include "device.h"
-#include "event.h"
-#include "logger.h"
-
-#include "system.h"
+#include "subnet.h"
 
 int do_purge = 0;
 int sighup = 0;

Index: net.h
===================================================================
RCS file: /home/CVS/tinc/src/Attic/net.h,v
retrieving revision 1.9.4.63
retrieving revision 1.9.4.64
diff -u -r1.9.4.63 -r1.9.4.64
--- net.h	2003/07/12 17:41:46	1.9.4.63
+++ net.h	2003/07/17 15:06:26	1.9.4.64
@@ -23,20 +23,8 @@
 #ifndef __TINC_NET_H__
 #define __TINC_NET_H__
 
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/time.h>
 #include <openssl/evp.h>
 
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-#include "utils.h"
-
 #ifdef ENABLE_JUMBOGRAMS
 #define MTU 9014				/* 9000 bytes payload + 14 bytes ethernet header */
 #else
@@ -97,6 +85,8 @@
 	queue_element_t *tail;
 } packet_queue_t;
 
+#include "conf.h"
+
 typedef struct outgoing_t {
 	char *name;
 	int timeout;
@@ -115,8 +105,6 @@
 extern int seconds_till_retry;
 extern int addressfamily;
 
-#include "connection.h"			/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
-
 extern listen_socket_t listen_socket[MAXSOCKETS];
 extern int listen_sockets;
 extern int keyexpires;
@@ -127,10 +115,14 @@
 extern time_t now;
 extern EVP_CIPHER_CTX packet_ctx;
 
+/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
+#include "connection.h"
+#include "node.h"
+
 extern void retry_outgoing(outgoing_t *);
 extern void handle_incoming_vpn_data(int);
-extern void finish_connecting(connection_t *);
-extern void do_outgoing_connection(connection_t *);
+extern void finish_connecting(struct connection_t *);
+extern void do_outgoing_connection(struct connection_t *);
 extern int handle_new_meta_connection(int);
 extern int setup_listen_socket(sockaddr_t *);
 extern int setup_vpn_in_socket(sockaddr_t *);
@@ -142,7 +134,7 @@
 extern void try_outgoing_connections(void);
 extern void close_network_connections(void);
 extern void main_loop(void);
-extern void terminate_connection(connection_t *, int);
+extern void terminate_connection(struct connection_t *, int);
 extern void flush_queue(struct node_t *);
 extern int read_rsa_public_key(struct connection_t *);
 

Index: net_packet.c
===================================================================
RCS file: /home/CVS/tinc/src/net_packet.c,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -r1.1.2.33 -r1.1.2.34
--- net_packet.c	2003/07/12 17:41:46	1.1.2.33
+++ net_packet.c	2003/07/17 15:06:26	1.1.2.34
@@ -20,34 +20,7 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-/* SunOS really wants sys/socket.h BEFORE net/if.h,
-   and FreeBSD wants these lines below the rest. */
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
+#include "system.h"
 
 #include <openssl/rand.h>
 #include <openssl/evp.h>
@@ -57,27 +30,21 @@
 #include <zlib.h>
 #include <lzo1x.h>
 
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
-#include <list.h>
-
+#include "avl_tree.h"
 #include "conf.h"
 #include "connection.h"
-#include "meta.h"
+#include "device.h"
+#include "event.h"
+#include "graph.h"
+#include "list.h"
+#include "logger.h"
 #include "net.h"
 #include "netutl.h"
-#include "process.h"
 #include "protocol.h"
-#include "subnet.h"
-#include "graph.h"
 #include "process.h"
 #include "route.h"
-#include "device.h"
-#include "event.h"
-#include "logger.h"
-
-#include "system.h"
+#include "utils.h"
+#include "xalloc.h"
 
 int keylifetime = 0;
 int keyexpires = 0;

Index: net_setup.c
===================================================================
RCS file: /home/CVS/tinc/src/net_setup.c,v
retrieving revision 1.1.2.34
retrieving revision 1.1.2.35
diff -u -r1.1.2.34 -r1.1.2.35
--- net_setup.c	2003/07/12 17:41:46	1.1.2.34
+++ net_setup.c	2003/07/17 15:06:26	1.1.2.35
@@ -20,60 +20,27 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-/* SunOS really wants sys/socket.h BEFORE net/if.h,
-   and FreeBSD wants these lines below the rest. */
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
+#include "system.h"
 
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/rand.h>
 
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
-#include <list.h>
-
+#include "avl_tree.h"
 #include "conf.h"
 #include "connection.h"
-#include "meta.h"
+#include "device.h"
+#include "event.h"
+#include "graph.h"
+#include "logger.h"
 #include "net.h"
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
-#include "subnet.h"
-#include "graph.h"
-#include "process.h"
 #include "route.h"
-#include "device.h"
-#include "event.h"
-#include "logger.h"
-
-#include "system.h"
+#include "subnet.h"
+#include "utils.h"
+#include "xalloc.h"
 
 char *myport;
 

Index: net_socket.c
===================================================================
RCS file: /home/CVS/tinc/src/net_socket.c,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- net_socket.c	2003/07/12 17:41:46	1.1.2.26
+++ net_socket.c	2003/07/17 15:06:26	1.1.2.27
@@ -20,60 +20,19 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-/* SunOS really wants sys/socket.h BEFORE net/if.h,
-   and FreeBSD wants these lines below the rest. */
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
-
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
 
+#include "avl_tree.h"
 #include "conf.h"
 #include "connection.h"
+#include "event.h"
+#include "logger.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
-#include "process.h"
 #include "protocol.h"
-#include "subnet.h"
-#include "graph.h"
-#include "process.h"
-#include "route.h"
-#include "device.h"
-#include "event.h"
-#include "logger.h"
-
-#include "system.h"
-
-#ifndef HAVE_RAND_PSEUDO_BYTES
-#define RAND_pseudo_bytes RAND_bytes
-#endif
+#include "utils.h"
+#include "xalloc.h"
 
 int addressfamily = AF_UNSPEC;
 int maxtimeout = 900;

Index: netutl.c
===================================================================
RCS file: /home/CVS/tinc/src/Attic/netutl.c,v
retrieving revision 1.12.4.46
retrieving revision 1.12.4.47
diff -u -r1.12.4.46 -r1.12.4.47
--- netutl.c	2003/07/12 17:41:46	1.12.4.46
+++ netutl.c	2003/07/17 15:06:26	1.12.4.47
@@ -20,31 +20,13 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-#include <string.h>
-#include <signal.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-
-#include <utils.h>
-#include <xalloc.h>
+#include "system.h"
 
-#include "errno.h"
-#include "conf.h"
 #include "net.h"
 #include "netutl.h"
 #include "logger.h"
-
-#include "system.h"
+#include "utils.h"
+#include "xalloc.h"
 
 int hostnames = 0;
 

Index: netutl.h
===================================================================
RCS file: /home/CVS/tinc/src/Attic/netutl.h,v
retrieving revision 1.2.4.15
retrieving revision 1.2.4.16
diff -u -r1.2.4.15 -r1.2.4.16
--- netutl.h	2003/07/12 17:41:46	1.2.4.15
+++ netutl.h	2003/07/17 15:06:26	1.2.4.16
@@ -23,10 +23,6 @@
 #ifndef __TINC_NETUTL_H__
 #define __TINC_NETUTL_H__
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
 #include "net.h"
 
 extern int hostnames;

Index: node.c
===================================================================
RCS file: /home/CVS/tinc/src/Attic/node.c,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- node.c	2003/07/12 17:41:46	1.1.2.22
+++ node.c	2003/07/17 15:06:26	1.1.2.23
@@ -20,20 +20,15 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <string.h>
+#include "system.h"
 
-#include <avl_tree.h>
-#include "node.h"
-#include "netutl.h"
-#include "net.h"
+#include "avl_tree.h"
 #include "logger.h"
-
-#include <utils.h>
-#include <xalloc.h>
-
-#include "system.h"
+#include "net.h"
+#include "netutl.h"
+#include "node.h"
+#include "utils.h"
+#include "xalloc.h"
 
 avl_tree_t *node_tree;			/* Known nodes, sorted by name */
 avl_tree_t *node_udp_tree;		/* Known nodes, sorted by address and port */

Index: node.h
===================================================================
RCS file: /home/CVS/tinc/src/Attic/node.h,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- node.h	2003/07/12 17:41:46	1.1.2.24
+++ node.h	2003/07/17 15:06:26	1.1.2.25
@@ -23,14 +23,10 @@
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-#include <avl_tree.h>
-
-#include "subnet.h"
+#include "avl_tree.h"
 #include "connection.h"
+#include "list.h"
+#include "subnet.h"
 
 typedef struct node_status_t {
 	int active:1;				/* 1 if active.. */

Index: process.c
===================================================================
RCS file: /home/CVS/tinc/src/process.c,v
retrieving revision 1.1.2.54
retrieving revision 1.1.2.55
diff -u -r1.1.2.54 -r1.1.2.55
--- process.c	2003/07/12 17:41:46	1.1.2.54
+++ process.c	2003/07/17 15:06:26	1.1.2.55
@@ -20,34 +20,19 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <termios.h>
-
-#include <pidfile.h>
-#include <utils.h>
-#include <xalloc.h>
+#include "system.h"
 
 #include "conf.h"
-#include "process.h"
-#include "subnet.h"
-#include "device.h"
 #include "connection.h"
 #include "device.h"
+#include "edge.h"
 #include "logger.h"
-
-#include "system.h"
+#include "node.h"
+#include "pidfile.h"
+#include "process.h"
+#include "subnet.h"
+#include "utils.h"
+#include "xalloc.h"
 
 /* If zero, don't detach from the terminal. */
 int do_detach = 1;

Index: process.h
===================================================================
RCS file: /home/CVS/tinc/src/process.h,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- process.h	2003/07/12 17:41:46	1.1.2.15
+++ process.h	2003/07/17 15:06:26	1.1.2.16
@@ -23,8 +23,6 @@
 #ifndef __TINC_PROCESS_H__
 #define __TINC_PROCESS_H__
 
-#include "config.h"
-
 extern int do_detach;
 
 extern void setup_signals(void);

Index: protocol.c
===================================================================
RCS file: /home/CVS/tinc/src/protocol.c,v
retrieving revision 1.28.4.140
retrieving revision 1.28.4.141
diff -u -r1.28.4.140 -r1.28.4.141
--- protocol.c	2003/07/12 17:41:46	1.28.4.140
+++ protocol.c	2003/07/17 15:06:26	1.28.4.141
@@ -20,26 +20,15 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include <utils.h>
-#include <xalloc.h>
+#include "system.h"
 
 #include "conf.h"
-#include "protocol.h"
-#include "meta.h"
 #include "connection.h"
 #include "logger.h"
-
-#include "system.h"
+#include "meta.h"
+#include "protocol.h"
+#include "utils.h"
+#include "xalloc.h"
 
 /* Jumptable for the request handlers */
 

Index: protocol.h
===================================================================
RCS file: /home/CVS/tinc/src/protocol.h,v
retrieving revision 1.5.4.38
retrieving revision 1.5.4.39
diff -u -r1.5.4.38 -r1.5.4.39
--- protocol.h	2003/07/06 23:16:28	1.5.4.38
+++ protocol.h	2003/07/17 15:06:26	1.5.4.39
@@ -23,9 +23,9 @@
 #ifndef __TINC_PROTOCOL_H__
 #define __TINC_PROTOCOL_H__
 
+#include "edge.h"
 #include "net.h"
 #include "node.h"
-#include "edge.h"
 #include "subnet.h"
 
 /* Protocol version. Different versions are incompatible,

Index: protocol_auth.c
===================================================================
RCS file: /home/CVS/tinc/src/protocol_auth.c,v
retrieving revision 1.1.4.23
retrieving revision 1.1.4.24
diff -u -r1.1.4.23 -r1.1.4.24
--- protocol_auth.c	2003/07/12 17:41:47	1.1.4.23
+++ protocol_auth.c	2003/07/17 15:06:26	1.1.4.24
@@ -20,34 +20,24 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
+#include "system.h"
 
 #include <openssl/sha.h>
 #include <openssl/rand.h>
 #include <openssl/evp.h>
 
+#include "avl_tree.h"
 #include "conf.h"
-#include "net.h"
-#include "netutl.h"
-#include "protocol.h"
-#include "meta.h"
 #include "connection.h"
-#include "node.h"
 #include "edge.h"
 #include "graph.h"
 #include "logger.h"
-
-#include "system.h"
+#include "net.h"
+#include "netutl.h"
+#include "node.h"
+#include "protocol.h"
+#include "utils.h"
+#include "xalloc.h"
 
 int send_id(connection_t *c)
 {

Index: protocol_edge.c
===================================================================
RCS file: /home/CVS/tinc/src/protocol_edge.c,v
retrieving revision 1.1.4.17
retrieving revision 1.1.4.18
diff -u -r1.1.4.17 -r1.1.4.18
--- protocol_edge.c	2003/07/12 17:41:47	1.1.4.17
+++ protocol_edge.c	2003/07/17 15:06:26	1.1.4.18
@@ -20,30 +20,21 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
+#include "system.h"
 
+#include "avl_tree.h"
 #include "conf.h"
-#include "net.h"
-#include "netutl.h"
-#include "protocol.h"
-#include "meta.h"
 #include "connection.h"
-#include "node.h"
 #include "edge.h"
 #include "graph.h"
 #include "logger.h"
-
-#include "system.h"
+#include "meta.h"
+#include "net.h"
+#include "netutl.h"
+#include "node.h"
+#include "protocol.h"
+#include "utils.h"
+#include "xalloc.h"
 
 int send_add_edge(connection_t *c, edge_t *e)
 {

Index: protocol_key.c
===================================================================
RCS file: /home/CVS/tinc/src/protocol_key.c,v
retrieving revision 1.1.4.18
retrieving revision 1.1.4.19
diff -u -r1.1.4.18 -r1.1.4.19
--- protocol_key.c	2003/07/12 17:41:47	1.1.4.18
+++ protocol_key.c	2003/07/17 15:06:26	1.1.4.19
@@ -20,28 +20,17 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
+#include "system.h"
 
-#include "conf.h"
+#include "avl_tree.h"
+#include "connection.h"
+#include "logger.h"
 #include "net.h"
 #include "netutl.h"
-#include "protocol.h"
-#include "meta.h"
-#include "connection.h"
 #include "node.h"
-#include "logger.h"
-
-#include "system.h"
+#include "protocol.h"
+#include "utils.h"
+#include "xalloc.h"
 
 int mykeyused = 0;
 

Index: protocol_misc.c
===================================================================
RCS file: /home/CVS/tinc/src/protocol_misc.c,v
retrieving revision 1.1.4.10
retrieving revision 1.1.4.11
diff -u -r1.1.4.10 -r1.1.4.11
--- protocol_misc.c	2003/07/12 17:41:47	1.1.4.10
+++ protocol_misc.c	2003/07/17 15:06:26	1.1.4.11
@@ -20,25 +20,16 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include <utils.h>
+#include "system.h"
 
 #include "conf.h"
+#include "connection.h"
+#include "logger.h"
+#include "meta.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
-#include "meta.h"
-#include "connection.h"
-#include "logger.h"
-
-#include "system.h"
+#include "utils.h"
 
 /* Status and error notification routines */
 

Index: protocol_subnet.c
===================================================================
RCS file: /home/CVS/tinc/src/protocol_subnet.c,v
retrieving revision 1.1.4.11
retrieving revision 1.1.4.12
diff -u -r1.1.4.11 -r1.1.4.12
--- protocol_subnet.c	2003/07/12 17:41:47	1.1.4.11
+++ protocol_subnet.c	2003/07/17 15:06:27	1.1.4.12
@@ -20,28 +20,18 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
+#include "system.h"
 
 #include "conf.h"
+#include "connection.h"
+#include "logger.h"
 #include "net.h"
 #include "netutl.h"
-#include "protocol.h"
-#include "meta.h"
-#include "connection.h"
 #include "node.h"
-#include "logger.h"
-
-#include "system.h"
+#include "protocol.h"
+#include "subnet.h"
+#include "utils.h"
+#include "xalloc.h"
 
 int send_add_subnet(connection_t *c, subnet_t *subnet)
 {

Index: route.c
===================================================================
RCS file: /home/CVS/tinc/src/route.c,v
retrieving revision 1.1.2.58
retrieving revision 1.1.2.59
diff -u -r1.1.2.58 -r1.1.2.59
--- route.c	2003/07/15 16:26:18	1.1.2.58
+++ route.c	2003/07/17 15:06:27	1.1.2.59
@@ -20,47 +20,36 @@
     $Id$
 */
 
-#include "config.h"
+#include "system.h"
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#include <sys/socket.h>
-#include <netinet/in.h>
-#ifdef HAVE_NET_IF_H
-#include <net/if.h>
-#endif
 #ifdef HAVE_NET_ETHERNET_H
 #include <net/ethernet.h>
 #endif
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
+#ifdef HAVE_NET_IF_ARP_H
+#include <net/if_arp.h>
 #endif
-#include <netinet/ip.h>
+#ifdef HAVE_NETINET_IP_ICMP_H
 #include <netinet/ip_icmp.h>
+#endif
 #ifdef HAVE_NETINET_IP6_H
 #include <netinet/ip6.h>
+#endif
+#ifdef HAVE_NETINET_ICMP6_H
 #include <netinet/icmp6.h>
 #endif
+#ifdef HAVE_NETINET_IF_ETHER_H
 #include <netinet/if_ether.h>
-#include <utils.h>
-#include <xalloc.h>
-#include <string.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
 #endif
 
-#include <avl_tree.h>
-
-#include "net.h"
+#include "avl_tree.h"
 #include "connection.h"
-#include "subnet.h"
-#include "route.h"
-#include "protocol.h"
 #include "device.h"
 #include "logger.h"
-
-#include "system.h"
+#include "net.h"
+#include "protocol.h"
+#include "route.h"
+#include "subnet.h"
+#include "utils.h"
 
 /* Missing definitions */
 

Index: subnet.c
===================================================================
RCS file: /home/CVS/tinc/src/Attic/subnet.c,v
retrieving revision 1.1.2.46
retrieving revision 1.1.2.47
diff -u -r1.1.2.46 -r1.1.2.47
--- subnet.c	2003/07/12 17:41:47	1.1.2.46
+++ subnet.c	2003/07/17 15:06:27	1.1.2.47
@@ -20,27 +20,16 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
+#include "system.h"
 
-#include "conf.h"
+#include "avl_tree.h"
+#include "logger.h"
 #include "net.h"
+#include "netutl.h"
 #include "node.h"
 #include "subnet.h"
-#include "netutl.h"
-#include "logger.h"
-
-#include "system.h"
+#include "utils.h"
+#include "xalloc.h"
 
 /* lists type of subnet */
 

Index: tincd.c
===================================================================
RCS file: /home/CVS/tinc/src/tincd.c,v
retrieving revision 1.10.4.72
retrieving revision 1.10.4.73
diff -u -r1.10.4.72 -r1.10.4.73
--- tincd.c	2003/07/12 17:41:47	1.10.4.72
+++ tincd.c	2003/07/17 15:06:27	1.10.4.73
@@ -20,18 +20,7 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <signal.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <string.h>
-#include <termios.h>
+#include "system.h"
 
 /* Darwin (MacOS/X) needs the following definition... */
 #ifndef _P1003_1B_VISIBLE
@@ -40,10 +29,6 @@
 
 #include <sys/mman.h>
 
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-#endif
-
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
@@ -51,18 +36,14 @@
 
 #include <lzo1x.h>
 
-#include <utils.h>
-#include <xalloc.h>
-
 #include "conf.h"
+#include "logger.h"
 #include "net.h"
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
-#include "subnet.h"
-#include "logger.h"
-
-#include "system.h"
+#include "utils.h"
+#include "xalloc.h"
 
 /* The name this program was run with. */
 char *program_name = NULL;

--
Tinc-cvs:     CVS changelog list for the tinc VPN daemon
Archive:      http://mail.nl.linux.org/tinc-cvs/
Tinc site:    http://tinc.nl.linux.org/