Big header file cleanup: everything that has to do with standard system

libraries is moved to system.h.

diff --git a/configure.in b/configure.in
index a51bd296581e75c49b9d021a8e314fab52c1c892..52b9196beb81d8a9b29617a5d95bc1fcbca96dff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.66 2003/07/11 16:12:58 guus Exp $
+dnl $Id: configure.in,v 1.13.2.67 2003/07/17 15:06:25 guus Exp $
 
 AC_PREREQ(2.53)
 AC_INIT(src/tincd.c)
@@ -67,6 +67,10 @@ case $host_os in
     AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
     [ rm -f src/device.c; ln -sf cygwin/device.c src/device.c ]
   ;;
+  *mingw*)
+    AC_DEFINE(HAVE_CYGWIN, 1, [MinGW])
+    [ rm -f src/device.c; ln -sf mingw/device.c src/device.c ]
+  ;;
   *)
     AC_MSG_ERROR("Unknown operating system.")
   ;;
@@ -85,14 +89,18 @@ dnl Checks for libraries.
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
-       sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h])
-AC_CHECK_HEADERS([net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h netinet/ip6.h], [], [],
-       [#include <sys/types.h>
-        #include <sys/socket.h>
-        #ifdef HAVE_NETINET_IN_SYSTM_H
-     #include <netinet/in_systm.h>
-        #endif])
+AC_CHECK_HEADERS([syslog.h sys/file.h sys/ioctl.h sys/param.h \
+  sys/time.h sys/socket.h sys/wait.h netdb.h arpa/inet.h netinet/in_systm.h])
+AC_CHECK_HEADERS([net/ethernet.h net/if.h net/if_arp.h netinet/if_ether.h netinet/ip.h \
+  netinet/tcp.h netinet/ip_icmp.h netinet/ip6.h netinet/icmp6.h],
+  [], [],
+  [#include <sys/types.h>
+   #include <sys/socket.h>
+   #ifdef HAVE_NETINET_IN_SYSTM_H
+   #include <netinet/in_systm.h>
+   #endif
+  ]
+)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

diff --git a/lib/avl_tree.c b/lib/avl_tree.c
index fc3c27e7b039b52eeb27aad62bb0b3feb1dbd60a..65df7b79f946a0e5c7a07631714b6187cb8467a0 100644 (file)
--- a/lib/avl_tree.c
+++ b/lib/avl_tree.c
@@ -29,14 +29,13 @@
     library for inclusion into tinc (http://tinc.nl.linux.org/) by
     Guus Sliepen <guus@sliepen.eu.org>.
 
-    $Id: avl_tree.c,v 1.1.2.15 2003/07/12 17:48:38 guus Exp $
+    $Id: avl_tree.c,v 1.1.2.16 2003/07/17 15:06:25 guus Exp $
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <xalloc.h>
+#include "system.h"
 
 #include "avl_tree.h"
+#include "xalloc.h"
 
 #ifdef AVL_COUNT
 #define AVL_NODE_COUNT(n)  ((n) ? (n)->count : 0)

diff --git a/lib/dropin.c b/lib/dropin.c
index 24d25ca50a3049d2c3566062d063f50058e054aa..0efa5f2be5e84d2afc53d7183bffcd339f71c846 100644 (file)
--- a/lib/dropin.c
+++ b/lib/dropin.c
@@ -17,23 +17,10 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: dropin.c,v 1.1.2.14 2003/07/12 17:48:38 guus Exp $
+    $Id: dropin.c,v 1.1.2.15 2003/07/17 15:06:25 guus Exp $
 */
 
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include <xalloc.h>
-
-#include <system.h>
-#include <errno.h>
+#include "system.h"
 
 #ifndef HAVE_DAEMON
 /*

diff --git a/lib/dropin.h b/lib/dropin.h
index e4aa7021328c160b4a5d5d15a512dac42cb9f6a5..c0bf14da6a68b4a48a6e699dc9e52491d75beb91 100644 (file)
--- a/lib/dropin.h
+++ b/lib/dropin.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: dropin.h,v 1.1.2.11 2003/07/12 17:48:38 guus Exp $
+    $Id: dropin.h,v 1.1.2.12 2003/07/17 15:06:25 guus Exp $
 */
 
 #ifndef __DROPIN_H__
@@ -36,8 +36,6 @@ extern int asprintf(char **, const char *, ...);
 #endif
 
 #ifndef HAVE_GETNAMEINFO
-#include <sys/types.h>
-#include <sys/socket.h>
 extern int getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
                                           size_t hostlen, char *serv, size_t servlen, int flags);
 #endif

diff --git a/lib/fake-getaddrinfo.c b/lib/fake-getaddrinfo.c
index 5e95a2a2efdd9601ab8a8d6b88c26768b1c06e3f..e17068028b151960e7dad23dbf6489e34ed4d717 100644 (file)
--- a/lib/fake-getaddrinfo.c
+++ b/lib/fake-getaddrinfo.c
@@ -9,17 +9,7 @@
  * that ai_family is AF_INET. Don't use it for another purpose.
  */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-
-#include <system.h>
+#include "system.h"
 
 #include "fake-getaddrinfo.h"
 

diff --git a/lib/fake-getaddrinfo.h b/lib/fake-getaddrinfo.h
index 3f24375c3b647178c24ea37a47a3a89c8b485eeb..db7b14704eba6d624a6cc217268a508716eefc71 100644 (file)
--- a/lib/fake-getaddrinfo.h
+++ b/lib/fake-getaddrinfo.h
@@ -1,14 +1,8 @@
-/* $Id: fake-getaddrinfo.h,v 1.1.2.2 2003/07/06 23:16:27 guus Exp $ */
+/* $Id: fake-getaddrinfo.h,v 1.1.2.3 2003/07/17 15:06:25 guus Exp $ */
 
 #ifndef _FAKE_GETADDRINFO_H
 #define _FAKE_GETADDRINFO_H
 
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
 #include "fake-gai-errnos.h"
 
 #ifndef AI_PASSIVE

diff --git a/lib/fake-getnameinfo.c b/lib/fake-getnameinfo.c
index 50d0722f7d350f73144cbc2d0ffd454f67f61c3d..8774da2716ff998b9529491f54de72b423e70966 100644 (file)
--- a/lib/fake-getnameinfo.c
+++ b/lib/fake-getnameinfo.c
@@ -9,17 +9,7 @@
  * that ai_family is AF_INET. Don't use it for another purpose.
  */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-
-#include <system.h>
+#include "system.h"
 
 #include "fake-getnameinfo.h"
 #include "fake-getaddrinfo.h"

diff --git a/lib/fake-getnameinfo.h b/lib/fake-getnameinfo.h
index 20889a6e099b213ad0f28a52038efd46bb91e574..1d7b0db7cd928a6d584a850b2d410b060c7a14fd 100644 (file)
--- a/lib/fake-getnameinfo.h
+++ b/lib/fake-getnameinfo.h
@@ -1,13 +1,8 @@
-/* $Id: fake-getnameinfo.h,v 1.1.2.2 2003/07/12 17:41:45 guus Exp $ */
+/* $Id: fake-getnameinfo.h,v 1.1.2.3 2003/07/17 15:06:25 guus Exp $ */
 
 #ifndef _FAKE_GETNAMEINFO_H
 #define _FAKE_GETNAMEINFO_H
 
-#include "config.h"
-
-#include <sys/socket.h>
-#include <netdb.h>
-
 #ifndef HAVE_GETNAMEINFO
 int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, 
                 size_t hostlen, char *serv, size_t servlen, int flags);

diff --git a/lib/ipv6.h b/lib/ipv6.h
index c04ada25447864c20e8b274146e6dafd5e3ddf89..92a0ae092ca94cb71b93f1482a6b9c87933c0c10 100644 (file)
--- a/lib/ipv6.h
+++ b/lib/ipv6.h
@@ -17,19 +17,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: ipv6.h,v 1.1.2.3 2003/07/11 16:12:59 guus Exp $
+    $Id: ipv6.h,v 1.1.2.4 2003/07/17 15:06:25 guus Exp $
 */
 
 #ifndef __TINC_IPV6_H__
 #define __TINC_IPV6_H__
 
-#include "config.h"
-
-#include <netinet/in.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
 #ifndef AF_INET6
 #define AF_INET6 10
 #endif

diff --git a/lib/list.c b/lib/list.c
index 0b516c880fb0236a947ecc99dafe87883ee9d4ca..573bc9e15389e3671330b40d17d2a27a50aeccd9 100644 (file)
--- a/lib/list.c
+++ b/lib/list.c
@@ -17,17 +17,13 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: list.c,v 1.1.2.15 2003/07/12 17:48:38 guus Exp $
+    $Id: list.c,v 1.1.2.16 2003/07/17 15:06:25 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-
-#include <xalloc.h>
-#include <system.h>
+#include "system.h"
 
 #include "list.h"
+#include "xalloc.h"
 
 /* (De)constructors */
 

diff --git a/lib/pidfile.c b/lib/pidfile.c
index 250f67b75ccf5b3c3d80023873dedb456670bdfb..2dea70b9ceed5f4ac617501fe329ffbff0dea830 100644 (file)
--- a/lib/pidfile.c
+++ b/lib/pidfile.c
@@ -25,16 +25,7 @@
  *     First version (v0.2) released
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <string.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <fcntl.h>
+#include "system.h"
 
 /* read_pid
  *

diff --git a/lib/utils.c b/lib/utils.c
index 9552c5c0fda2e1a0654279fc15a40c90f0acc85f..9ffad70289c11945fbf82662af2e3970f07d86cf 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -18,15 +18,10 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "config.h"
+#include "system.h"
 
-#include <sys/types.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <utils.h>
-#include <syslog.h>
-#include <xalloc.h>
+#include "../src/logger.h"
+#include "utils.h"
 
 #ifdef ENABLE_TRACING
 volatile int (cp_line[]) = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -64,7 +59,7 @@ void bin2hex(char *src, char *dst, int length)
 #ifdef ENABLE_TRACING
 void cp_trace()
 {
-       syslog(LOG_DEBUG, "Checkpoint trace: %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d...",
+       logger(LOG_DEBUG, "Checkpoint trace: %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d...",
                   cp_file[(cp_index + 15) % 16], cp_line[(cp_index + 15) % 16],
                   cp_file[(cp_index + 14) % 16], cp_line[(cp_index + 14) % 16],
                   cp_file[(cp_index + 13) % 16], cp_line[(cp_index + 13) % 16],

diff --git a/lib/utils.h b/lib/utils.h
index 2a56ef5ac0f6ae7b5e7a0e91be486d6739059867..caf6e6f630c222281b09d1b8191add12071bdb45 100644 (file)
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -21,14 +21,6 @@
 #ifndef __TINC_UTILS_H__
 #define __TINC_UTILS_H__
 
-#include <ctype.h>
-
-#include "fake-getaddrinfo.h"
-#include "fake-getnameinfo.h"
-#include "ipv6.h"
-
-#define min(a,b) (((a)<(b))?(a):(b))
-
 #ifdef ENABLE_TRACING
 extern volatile int cp_line[];
 extern volatile char *cp_file[];

diff --git a/src/conf.c b/src/conf.c
index b6d2b0af835a05dafdf62da11ebf1afcce3d2c39..f7019d14a8e7a3a9227500cfdd0a02c0429e327d 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,31 +19,17 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.c,v 1.9.4.65 2003/07/12 17:41:45 guus Exp $
+    $Id: conf.c,v 1.9.4.66 2003/07/17 15:06:26 guus Exp $
 */
 
-#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;
 

diff --git a/src/conf.h b/src/conf.h
index 76e38932fb7cd8908fcf5f367fbe032c799b9ce5..32bb90910fb9bfc4670d254ca20f62d6515385e8 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -17,18 +17,13 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.h,v 1.6.4.38 2003/07/12 17:41:45 guus Exp $
+    $Id: conf.h,v 1.6.4.39 2003/07/17 15:06:26 guus Exp $
 */
 
 #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_bool(config_t *, int *);
 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 *);

diff --git a/src/connection.c b/src/connection.c
index dbfe6d655016f072fa58483717f1dad1b91c9635..9890f51f16275db1cf746612d3552f8490746e07 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -17,27 +17,20 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: connection.c,v 1.1.2.39 2003/07/12 17:41:45 guus Exp $
+    $Id: connection.c,v 1.1.2.40 2003/07/17 15:06:26 guus Exp $
 */
 
-#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;

diff --git a/src/connection.h b/src/connection.h
index 30102f2c7eacb838fe5912cffcf1e01941a2ef3c..1b3ca36755d24564ce9547db6d73d082026319e2 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -17,34 +17,21 @@
     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.34 2003/07/17 15:06:26 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 "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

diff --git a/src/edge.c b/src/edge.c
index 3bceb00433581aaf50983d67469329c7364d90b0..48ead007e413cdb10672135b48930894bd9890d7 100644 (file)
--- a/src/edge.c
+++ b/src/edge.c
@@ -17,28 +17,18 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: edge.c,v 1.1.2.21 2003/07/12 17:41:45 guus Exp $
+    $Id: edge.c,v 1.1.2.22 2003/07/17 15:06:26 guus Exp $
 */
 
-#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 */
 

diff --git a/src/edge.h b/src/edge.h
index 3fe8645adabe6b877930cdf9ad47212f5bc10781..b841bc9b71576d1aa7a65461568d37ea5dc9a3be 100644 (file)
--- a/src/edge.h
+++ b/src/edge.h
@@ -17,17 +17,16 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: edge.h,v 1.1.2.13 2003/07/12 17:41:45 guus Exp $
+    $Id: edge.h,v 1.1.2.14 2003/07/17 15:06:26 guus Exp $
 */
 
 #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;

diff --git a/src/event.c b/src/event.c
index 45961659fbd07f687c9e9cd6b9075343c592b13b..4eae34d134ab3bbee86e130f3eb50b07f95ff125 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -17,21 +17,15 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: event.c,v 1.1.4.8 2003/07/12 17:41:45 guus Exp $
+    $Id: event.c,v 1.1.4.9 2003/07/17 15:06:26 guus Exp $
 */
 
-#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;

diff --git a/src/event.h b/src/event.h
index fb10c4a0dd56c81af74b2d0ee1818933fe635cd0..71aae18dff4b2470b0be1edc765e97fd248c8be3 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -17,14 +17,13 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: event.h,v 1.1.4.6 2003/07/12 17:41:45 guus Exp $
+    $Id: event.h,v 1.1.4.7 2003/07/17 15:06:26 guus Exp $
 */
 
 #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;
 

diff --git a/src/graph.c b/src/graph.c
index 3692f4463baddcd9ef7e3275c5e8363de216db41..2c6ad22e445adb47e5750cd9aa2266c87807f8c7 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -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: graph.c,v 1.1.2.24 2003/07/12 17:41:45 guus Exp $
+    $Id: graph.c,v 1.1.2.25 2003/07/17 15:06:26 guus Exp $
 */
 
 /* We need to generate two trees from the graph:
@@ -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)

diff --git a/src/linux/device.c b/src/linux/device.c
index f9105e655f26b1a580d777171f65a56182901142..08d9364daef97ff848c9e7c034c4fd27350edf54 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -17,20 +17,10 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: device.c,v 1.1.2.17 2003/07/12 17:41:48 guus Exp $
+    $Id: device.c,v 1.1.2.18 2003/07/17 15:06:27 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
+#include "system.h"
 
 #ifdef HAVE_TUNTAP
 #ifdef LINUX_IF_TUN_H
@@ -43,13 +33,11 @@
 #define DEFAULT_DEVICE "/dev/tap0"
 #endif
 
-#include <utils.h>
 #include "conf.h"
+#include "logger.h"
 #include "net.h"
 #include "route.h"
-#include "logger.h"
-
-#include "system.h"
+#include "utils.h"
 
 enum {
        DEVICE_TYPE_ETHERTAP,

diff --git a/src/logger.c b/src/logger.c
index 012f19d0f0eecf27e2d60d33dd1c56b33cf06fe2..b8ea0922d9938978a09af1f2bbba7f040387ff74 100644 (file)
--- a/src/logger.c
+++ b/src/logger.c
@@ -17,19 +17,14 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: logger.c,v 1.1.2.3 2003/07/12 17:41:45 guus Exp $
+    $Id: logger.c,v 1.1.2.4 2003/07/17 15:06:26 guus Exp $
 */
 
-#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;
 static pid_t logpid;

diff --git a/src/logger.h b/src/logger.h
index edd0d93335dee36d9d3a2694eb8608307a768e90..615d0c3a1af4532fa28627410dca0f25f061fb8e 100644 (file)
--- a/src/logger.h
+++ b/src/logger.h
@@ -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,

diff --git a/src/meta.c b/src/meta.c
index 939f76b8d3deff91945c041bfc789512db096547..967477b5a97d4f4445feb4387c474acc5bb243e7 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -17,27 +17,20 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: meta.c,v 1.1.2.35 2003/07/12 17:41:45 guus Exp $
+    $Id: meta.c,v 1.1.2.36 2003/07/17 15:06:26 guus Exp $
 */
 
-#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)
 {

diff --git a/src/net.c b/src/net.c
index 8b2c9f03336cfb4e568f43bc7e46f2b4fcb2e923..d43aede4e1a45de1013129d635ebaf26f1297fc4 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -17,62 +17,28 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.190 2003/07/12 17:41:45 guus Exp $
+    $Id: net.c,v 1.35.4.191 2003/07/17 15:06:26 guus Exp $
 */
 
-#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;

diff --git a/src/net.h b/src/net.h
index 8ad89947cdcac72962407c523ce015181e096035..43371adb756ec79d84560e53a4b0af2b284a25d0 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -17,26 +17,14 @@
     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.63 2003/07/12 17:41:46 guus Exp $
+    $Id: net.h,v 1.9.4.64 2003/07/17 15:06:26 guus Exp $
 */
 
 #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 @@ typedef struct packet_queue_t {
        queue_element_t *tail;
 } packet_queue_t;
 
+#include "conf.h"
+
 typedef struct outgoing_t {
        char *name;
        int timeout;
@@ -115,8 +105,6 @@ extern int maxtimeout;
 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 char *myport;
 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 setup_outgoing_connection(struct outgoing_t *);
 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 *);
 

diff --git a/src/net_packet.c b/src/net_packet.c
index c0bd24767ad5fefae59adedeafa15fa0d6aeb5f2..e858daa06e1aa2dc238d186749342d2a4269d0f4 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -17,37 +17,10 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_packet.c,v 1.1.2.33 2003/07/12 17:41:46 guus Exp $
+    $Id: net_packet.c,v 1.1.2.34 2003/07/17 15:06:26 guus Exp $
 */
 
-#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;

diff --git a/src/net_setup.c b/src/net_setup.c
index 4c258abb3087f77d6c58697bf40c658d9939a8ab..ca7aa61ed80aa83c5fa5527c75e16265054ffbcb 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -17,63 +17,30 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_setup.c,v 1.1.2.34 2003/07/12 17:41:46 guus Exp $
+    $Id: net_setup.c,v 1.1.2.35 2003/07/17 15:06:26 guus Exp $
 */
 
-#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;
 

diff --git a/src/net_socket.c b/src/net_socket.c
index 1b5c18fed8b70a8ee721e02a02373e62af917660..bb5208f8cbab46f317dbab98edddeaff92827f82 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -17,63 +17,22 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_socket.c,v 1.1.2.26 2003/07/12 17:41:46 guus Exp $
+    $Id: net_socket.c,v 1.1.2.27 2003/07/17 15:06:26 guus Exp $
 */
 
-#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;

diff --git a/src/netutl.c b/src/netutl.c
index 1f5e4afcaa33ca9713f707b7f8236dddc1ec1559..6784833dabe7e5e22dd640d8ec8664a059d12de5 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -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: netutl.c,v 1.12.4.46 2003/07/12 17:41:46 guus Exp $
+    $Id: netutl.c,v 1.12.4.47 2003/07/17 15:06:26 guus Exp $
 */
 
-#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 "errno.h"
-#include "conf.h"
+#include "system.h"
+
 #include "net.h"
 #include "netutl.h"
 #include "logger.h"
-
-#include "system.h"
+#include "utils.h"
+#include "xalloc.h"
 
 int hostnames = 0;
 

diff --git a/src/netutl.h b/src/netutl.h
index b946b77dd134c4e48fa9d2a2983b76c49acb30d6..eb5aeebc1818ce8f1451659ad18d41f78cc91686 100644 (file)
--- a/src/netutl.h
+++ b/src/netutl.h
@@ -17,16 +17,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: netutl.h,v 1.2.4.15 2003/07/12 17:41:46 guus Exp $
+    $Id: netutl.h,v 1.2.4.16 2003/07/17 15:06:26 guus Exp $
 */
 
 #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;

diff --git a/src/node.c b/src/node.c
index 6dba7f2814d20dd3e8cc0262a5d8068bd7c930ae..5fc94a94017760607770d3b8603bcbe6fd7d4209 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -17,23 +17,18 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: node.c,v 1.1.2.22 2003/07/12 17:41:46 guus Exp $
+    $Id: node.c,v 1.1.2.23 2003/07/17 15:06:26 guus Exp $
 */
 
-#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 */

diff --git a/src/node.h b/src/node.h
index 085d6a4f134190a6afc208223f3adec611989ae1..a4e439a7a1fd7ca4ca06c9c7486f014dc857b202 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -17,20 +17,16 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: node.h,v 1.1.2.24 2003/07/12 17:41:46 guus Exp $
+    $Id: node.h,v 1.1.2.25 2003/07/17 15:06:26 guus Exp $
 */
 
 #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.. */

diff --git a/src/process.c b/src/process.c
index 326d3ff915f3e28328740da9464a08a6b3749311..b0e1e63f4c6227050d6fe2eb52c10cb2837abd13 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -17,37 +17,22 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: process.c,v 1.1.2.54 2003/07/12 17:41:46 guus Exp $
+    $Id: process.c,v 1.1.2.55 2003/07/17 15:06:26 guus Exp $
 */
 
-#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;

diff --git a/src/process.h b/src/process.h
index cae136c69f66ebb832ca9abbd5bb02935a602a2b..cb5f7c7c2fd3b923d3bd390f649911c6fd610670 100644 (file)
--- a/src/process.h
+++ b/src/process.h
@@ -17,14 +17,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: process.h,v 1.1.2.15 2003/07/12 17:41:46 guus Exp $
+    $Id: process.h,v 1.1.2.16 2003/07/17 15:06:26 guus Exp $
 */
 
 #ifndef __TINC_PROCESS_H__
 #define __TINC_PROCESS_H__
 
-#include "config.h"
-
 extern int do_detach;
 
 extern void setup_signals(void);

diff --git a/src/protocol.c b/src/protocol.c
index c8b868caa730ffee973f9ae46511dbb551821e17..47cc948768bfc52d54667662b9cabc368e8debab 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,29 +17,18 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.c,v 1.28.4.140 2003/07/12 17:41:46 guus Exp $
+    $Id: protocol.c,v 1.28.4.141 2003/07/17 15:06:26 guus Exp $
 */
 
-#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 */
 

diff --git a/src/protocol.h b/src/protocol.h
index 6e71f810e5b82f5573d2b7f79b3178acee435332..6f01a76c947a84a50b2ccbd17d0214e6163cd1ea 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -17,15 +17,15 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.h,v 1.5.4.38 2003/07/06 23:16:28 guus Exp $
+    $Id: protocol.h,v 1.5.4.39 2003/07/17 15:06:26 guus Exp $
 */
 
 #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,

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 1b8794d1385377b66de065afeebc1be9ae413ba6..88fba2665b995c9684d6dfc6c73beafbf34e83eb 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -17,37 +17,27 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_auth.c,v 1.1.4.23 2003/07/12 17:41:47 guus Exp $
+    $Id: protocol_auth.c,v 1.1.4.24 2003/07/17 15:06:26 guus Exp $
 */
 
-#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)
 {

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index d81fc8780ec33176cf3d698c47fa5c24b1230a85..75b49950dcd2632fb8d8e3c27e7225c37fe5b0d2 100644 (file)
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -17,33 +17,24 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_edge.c,v 1.1.4.17 2003/07/12 17:41:47 guus Exp $
+    $Id: protocol_edge.c,v 1.1.4.18 2003/07/17 15:06:26 guus Exp $
 */
 
-#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)
 {

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 1a6804a4497e10256f2ee13dd01a110a4e9b9575..832b2af0255b26559020ec16aef0f04542d7c5b2 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -17,31 +17,20 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_key.c,v 1.1.4.18 2003/07/12 17:41:47 guus Exp $
+    $Id: protocol_key.c,v 1.1.4.19 2003/07/17 15:06:26 guus Exp $
 */
 
-#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;
 

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index d5c9aeb03db385309f12395cd2fe8512c18ba406..934a1820866f9cb710a4354795430473c66d37d2 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -17,28 +17,19 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_misc.c,v 1.1.4.10 2003/07/12 17:41:47 guus Exp $
+    $Id: protocol_misc.c,v 1.1.4.11 2003/07/17 15:06:26 guus Exp $
 */
 
-#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 */
 

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index c0a351f2b9d7f0c5c7a521853085ea352dfec02f..f29bdbe7337190b97278983f236ded4521e09c5b 100644 (file)
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@@ -17,31 +17,21 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_subnet.c,v 1.1.4.11 2003/07/12 17:41:47 guus Exp $
+    $Id: protocol_subnet.c,v 1.1.4.12 2003/07/17 15:06:27 guus Exp $
 */
 
-#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)
 {

diff --git a/src/route.c b/src/route.c
index f00728c76e71d30632621808153e5486576586d0..3d9b28bd24a24b7d158e753e74baaa5211d05e87 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -17,50 +17,39 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: route.c,v 1.1.2.58 2003/07/15 16:26:18 guus Exp $
+    $Id: route.c,v 1.1.2.59 2003/07/17 15:06:27 guus Exp $
 */
 
-#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 */
 

diff --git a/src/subnet.c b/src/subnet.c
index 2aab91d19435b8857c4b7f70dc424d9d34cd405c..f5a8bd4b8385cda443abbf721386e112dd9c0ad3 100644 (file)
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -17,30 +17,19 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: subnet.c,v 1.1.2.46 2003/07/12 17:41:47 guus Exp $
+    $Id: subnet.c,v 1.1.2.47 2003/07/17 15:06:27 guus Exp $
 */
 
-#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 */
 

diff --git a/src/tincd.c b/src/tincd.c
index 185a96a68f0af637f8cf1f5e4bb2a621f870d232..8ef8c51452bc10a1b6f2df36f29e90ccc99205a1 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -17,21 +17,10 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: tincd.c,v 1.10.4.72 2003/07/12 17:41:47 guus Exp $
+    $Id: tincd.c,v 1.10.4.73 2003/07/17 15:06:27 guus Exp $
 */
 
-#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;

diff --git a/system.h b/system.h
index 6391c3987824ed0adb6889af039dc12bbeeee611..c4dd0d14cdfe2a049fa63b395153ea523f23dab7 100644 (file)
--- a/system.h
+++ b/system.h
@@ -1,6 +1,7 @@
 /*
-    system.h -- header for locale settings
-    Copyright (C) 1998,99,2000 Ivo Timmermans <ivo@o2w.nl.com>
+    system.h -- system headers
+    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>
+                       2003 Guus Sliepen <guus@sliepen.eu.org>
 
     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
@@ -20,6 +21,102 @@
 #ifndef __TINC_SYSTEM_H__
 #define __TINC_SYSTEM_H__
 
+#include "config.h"
+
+/* Include standard headers */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <stdarg.h>
+#include <string.h>
+#include <ctype.h>
+#include <signal.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <termios.h>
+
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
+/* Include system specific headers */
+
+#ifdef HAVE_SYSLOG_H
+#include <syslog.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/ioctl.h>
+#endif
+
+/* SunOS really wants sys/socket.h BEFORE net/if.h,
+   and FreeBSD wants these lines below the rest. */
+
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#ifdef HAVE_NETINET_IP_H
+#include <netinet/ip.h>
+#endif
+
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
+
+#ifdef HAVE_MINGW
+#include <windows.h>
+#include <winsock.h>
+#endif
+
+/* Include localisation support */
+
 #include "gettext.h"
 
 #ifndef HAVE_STRSIGNAL
@@ -27,7 +124,8 @@
 #endif
 
 /* Other functions */
-#include <dropin.h>
+
+#include "dropin.h"
 
 #ifndef HAVE_SOCKLEN_T
 typedef int socklen_t;