[hipl-commit] [trunk] Rev 4580: Drop unnecessary directory prefixes from #includes in the same directory.
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Sun, 23 May 2010 14:34:16 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 23/05/2010 at 14:34:16
Revision: 4580
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Drop unnecessary directory prefixes from #includes in the same directory.
Modified:
M firewall/proxy.c
M firewall/user_ipsec_esp.c
M firewall/user_ipsec_esp.h
M lib/core/builder.c
M lib/core/certtools.c
M lib/core/conf.c
M lib/core/conf.h
M lib/core/crypto.h
M lib/core/hostid.c
M lib/core/linkedlist.c
M lib/core/message.h
M lib/core/performance.c
M lib/core/solve.h
=== modified file 'firewall/proxy.c'
--- firewall/proxy.c 2010-05-22 12:37:40 +0000
+++ firewall/proxy.c 2010-05-23 11:33:26 +0000
@@ -15,10 +15,10 @@
#include <string.h>
#include <netinet/icmp6.h>
-#include "firewall/proxy.h"
-#include "firewall/proxyconndb.h"
-#include "firewall/firewall_defines.h"
#include "lib/tool/checksum.h"
+#include "proxy.h"
+#include "proxyconndb.h"
+#include "firewall_defines.h"
static int hip_proxy_raw_sock_tcp_v4 = 0;
static int hip_proxy_raw_sock_tcp_v6 = 0;
=== modified file 'firewall/user_ipsec_esp.c'
--- firewall/user_ipsec_esp.c 2010-05-22 12:37:40 +0000
+++ firewall/user_ipsec_esp.c 2010-05-23 11:33:26 +0000
@@ -33,12 +33,12 @@
#include <openssl/rand.h>
#include <openssl/hmac.h>
#include <openssl/evp.h>
-#include "user_ipsec_esp.h"
-#include "firewall/esp_prot_api.h"
+
#include "lib/core/prefix.h"
-
#include "lib/tool/checksum.h"
#include "lib/core/keylen.h"
+#include "esp_prot_api.h"
+#include "user_ipsec_esp.h"
/* for some reason the ICV for ESP authentication is truncated to 12 bytes */
#define ICV_LENGTH 12
=== modified file 'firewall/user_ipsec_esp.h'
--- firewall/user_ipsec_esp.h 2010-04-21 14:47:24 +0000
+++ firewall/user_ipsec_esp.h 2010-05-23 11:33:26 +0000
@@ -31,8 +31,8 @@
#define _BSD_SOURCE
-#include "firewall/user_ipsec_sadb.h"
-#include "firewall/firewall_defines.h"
+#include "user_ipsec_sadb.h"
+#include "firewall_defines.h"
int hip_beet_mode_output(const hip_fw_context_t *ctx,
=== modified file 'lib/core/builder.c'
--- lib/core/builder.c 2010-05-22 12:37:40 +0000
+++ lib/core/builder.c 2010-05-23 11:33:26 +0000
@@ -69,12 +69,13 @@
#include <stdlib.h>
+#include "hipd/input.h"
+#include "lib/tool/checksum.h"
#include "config.h"
#include "builder.h"
-#include "hipd/input.h"
-#include "lib/core/crypto.h"
-#include "lib/core/hostid.h"
-#include "lib/tool/checksum.h"
+#include "crypto.h"
+#include "hostid.h"
+
/* ARRAY_SIZE is defined in linux/kernel.h, but it is in #ifdef __KERNEL__ */
#ifndef ARRAY_SIZE
=== modified file 'lib/core/certtools.c'
--- lib/core/certtools.c 2010-05-22 12:37:40 +0000
+++ lib/core/certtools.c 2010-05-23 11:33:26 +0000
@@ -9,8 +9,8 @@
*/
#include "certtools.h"
+#include "crypto.h"
#include "straddr.h"
-#include "lib/core/crypto.h"
/*******************************************************************************
* FUNCTIONS FOR SPKI *
=== modified file 'lib/core/conf.c'
--- lib/core/conf.c 2010-05-22 12:37:40 +0000
+++ lib/core/conf.c 2010-05-23 11:33:26 +0000
@@ -48,21 +48,20 @@
#include <sys/socket.h>
#include <sys/types.h>
-#include "lib/core/builder.h"
-#include "lib/core/debug.h"
-#include "lib/core/hostid.h"
-#include "lib/core/ife.h"
-#include "lib/core/message.h"
-#include "lib/core/prefix.h"
-#include "lib/core/protodefs.h"
-#include "lib/core/straddr.h"
#include "lib/tool/lutil.h"
#include "config.h"
+#include "builder.h"
+#include "crypto.h"
+#include "debug.h"
+#include "hostid.h"
+#include "ife.h"
+#include "message.h"
+#include "prefix.h"
+#include "protodefs.h"
+#include "straddr.h"
#include "conf.h"
-#include "lib/core/crypto.h"
-
/**
* TYPE_ constant list, as an index for each action_handler function.
*
=== modified file 'lib/core/conf.h'
--- lib/core/conf.h 2010-05-18 11:19:26 +0000
+++ lib/core/conf.h 2010-05-23 11:33:26 +0000
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include "config.h"
-#include "lib/core/protodefs.h"
+#include "protodefs.h"
/*
* DO NOT TOUCH THESE, unless you know what you are doing.
=== modified file 'lib/core/crypto.h'
--- lib/core/crypto.h 2010-05-22 17:33:20 +0000
+++ lib/core/crypto.h 2010-05-23 11:33:26 +0000
@@ -29,11 +29,13 @@
#include <netinet/in.h>
#include "config.h"
+#include "hipd/hadb.h"
#include "hipd/hidb.h"
-#include "lib/core/debug.h"
-#include "lib/core/transform.h"
-#include "lib/core/ife.h"
-#include "hipd/hadb.h"
+#include "debug.h"
+#include "ife.h"
+#include "transform.h"
+
+
#define HIP_DSA_SIG_SIZE 41 /* T(1) + R(20) + S(20) from RFC 2536 */
#define DSA_PRIV 20 /* Size in bytes of DSA private key and Q value */
=== modified file 'lib/core/hostid.c'
--- lib/core/hostid.c 2010-05-22 17:33:20 +0000
+++ lib/core/hostid.c 2010-05-23 11:33:26 +0000
@@ -10,15 +10,16 @@
#include <netinet/in.h>
#include <stdlib.h>
-#include "lib/core/ife.h"
-#include "lib/core/debug.h"
-#include "lib/core/protodefs.h"
-#include "lib/core/crypto.h"
+
+#include "config.h"
#include "lib/tool/pk.h"
-
-#include "config.h"
+#include "crypto.h"
+#include "debug.h"
+#include "filemanip.h"
#include "hostid.h"
-#include "filemanip.h"
+#include "ife.h"
+#include "protodefs.h"
+
#define HOST_ID_FILENAME_MAX_LEN 256
=== modified file 'lib/core/linkedlist.c'
--- lib/core/linkedlist.c 2010-04-15 16:57:50 +0000
+++ lib/core/linkedlist.c 2010-05-23 11:33:26 +0000
@@ -7,8 +7,8 @@
*/
#include <stdlib.h> /* For malloc(). */
+#include "debug.h"
#include "linkedlist.h"
-#include "lib/core/debug.h" /* For debuging macros. */
/**
* Initializes a linked list. Sets the parameter @c linkedlist head to NULL if
=== modified file 'lib/core/message.h'
--- lib/core/message.h 2010-05-21 10:36:58 +0000
+++ lib/core/message.h 2010-05-23 11:33:26 +0000
@@ -14,8 +14,8 @@
#include <netinet/in.h>
#include <sys/socket.h>
-#include "lib/core/protodefs.h"
-#include "lib/core/state.h"
+#include "protodefs.h"
+#include "state.h"
#define HIP_DEFAULT_MSG_TIMEOUT 4000000000ul /* nanosecs */
=== modified file 'lib/core/performance.c'
--- lib/core/performance.c 2010-05-17 22:11:11 +0000
+++ lib/core/performance.c 2010-05-23 11:33:26 +0000
@@ -14,9 +14,9 @@
#include <sys/time.h>
+#include "debug.h"
+#include "ife.h"
#include "performance.h"
-#include "lib/core/debug.h"
-#include "lib/core/ife.h"
/*!
* \brief Create a set of performance slots. Each performance measurement type
=== modified file 'lib/core/solve.h'
--- lib/core/solve.h 2010-04-22 10:12:54 +0000
+++ lib/core/solve.h 2010-05-23 11:33:26 +0000
@@ -10,7 +10,7 @@
#include <sys/types.h>
#include "config.h"
-#include "lib/core/crypto.h"
+#include "crypto.h"
#include "protodefs.h"
#include "state.h"
Other related posts:
- » [hipl-commit] [trunk] Rev 4580: Drop unnecessary directory prefixes from #includes in the same directory. - Diego Biurrun
