[hipl-commit] [trunk] Rev 4581: the grand #include cleanup - part IV: firewall/ directory

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Sun, 23 May 2010 15:48:10 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 23/05/2010 at 15:48:10
Revision: 4581
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  the grand #include cleanup - part IV: firewall/ directory
  
  Add required headers, remove unnecessary headers, reorder #includes.

Modified:
  M  firewall/cache.c
  M  firewall/cache.h
  M  firewall/cache_port.c
  M  firewall/cache_port.h
  M  firewall/common_hipd_msg.c
  M  firewall/common_hipd_msg.h
  M  firewall/conntrack.c
  M  firewall/conntrack.h
  M  firewall/datapkt.c
  M  firewall/datapkt.h
  M  firewall/dlist.c
  M  firewall/dlist.h
  M  firewall/esp_prot_api.c
  M  firewall/esp_prot_api.h
  M  firewall/esp_prot_config.c
  M  firewall/esp_prot_conntrack.c
  M  firewall/esp_prot_conntrack.h
  M  firewall/esp_prot_defines.h
  M  firewall/esp_prot_fw_msg.c
  M  firewall/esp_prot_fw_msg.h
  M  firewall/firewall.c
  M  firewall/firewall.h
  M  firewall/firewall_control.c
  M  firewall/firewall_control.h
  M  firewall/firewall_defines.h
  M  firewall/firewalldb.c
  M  firewall/firewalldb.h
  M  firewall/helpers.c
  M  firewall/helpers.h
  M  firewall/hslist.c
  M  firewall/hslist.h
  M  firewall/lsi.c
  M  firewall/lsi.h
  M  firewall/midauth.c
  M  firewall/midauth.h
  M  firewall/opptcp.c
  M  firewall/pisa.c
  M  firewall/pisa_cert.c
  M  firewall/pisa_cert.h
  M  firewall/proxy.c
  M  firewall/proxy.h
  M  firewall/proxyconndb.c
  M  firewall/proxyconndb.h
  M  firewall/proxydb.c
  M  firewall/proxydb.h
  M  firewall/rule_management.c
  M  firewall/rule_management.h
  M  firewall/sysopp.c
  M  firewall/sysopp.h
  M  firewall/user_ipsec_api.c
  M  firewall/user_ipsec_api.h
  M  firewall/user_ipsec_esp.c
  M  firewall/user_ipsec_esp.h
  M  firewall/user_ipsec_fw_msg.c
  M  firewall/user_ipsec_sadb.c
  M  firewall/user_ipsec_sadb.h

=== modified file 'firewall/cache.c'
--- firewall/cache.c    2010-05-18 12:48:55 +0000
+++ firewall/cache.c    2010-05-23 12:47:35 +0000
@@ -13,15 +13,24 @@
 
 #define _BSD_SOURCE
 
+#include <errno.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
+#include <netinet/in.h>
 
-#include "cache.h"
+#include "lib/core/builder.h"
 #include "lib/core/debug.h"
-#include "lib/core/builder.h"
+#include "lib/core/hashtable.h"
+#include "lib/core/icomm.h"
+#include "lib/core/list.h"
 #include "lib/core/message.h"
+#include "lib/core/prefix.h"
+#include "lib/core/protodefs.h"
 
 #include "firewall.h"
 #include "user_ipsec_api.h"
+#include "cache.h"
 
 static HIP_HASHTABLE *firewall_cache_db = NULL;
 

=== modified file 'firewall/cache.h'
--- firewall/cache.h    2010-04-22 10:12:54 +0000
+++ firewall/cache.h    2010-05-23 12:47:35 +0000
@@ -7,6 +7,9 @@
 #ifndef HIP_FIREWALL_CACHE_H
 #define HIP_FIREWALL_CACHE_H
 
+#include <netinet/in.h>
+
+#include "lib/core/protodefs.h"
 #include "lib/core/icomm.h"
 
 int hip_firewall_cache_db_match(const struct in6_addr *, const struct in6_addr 
*,

=== modified file 'firewall/cache_port.c'
--- firewall/cache_port.c       2010-05-21 10:36:58 +0000
+++ firewall/cache_port.c       2010-05-23 12:47:35 +0000
@@ -21,15 +21,18 @@
  */
 
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
+#include <netinet/in.h>
 
 #include "lib/core/builder.h"
 #include "lib/core/debug.h"
 #include "lib/core/hashtable.h"
+#include "lib/core/icomm.h"
+#include "lib/core/list.h"
 #include "lib/tool/lutil.h"
+#include "cache.h"
 #include "cache_port.h"
-#include "cache.h"
-
 
 
 static HIP_HASHTABLE *firewall_port_cache_db = NULL;

=== modified file 'firewall/cache_port.h'
--- firewall/cache_port.h       2010-04-22 10:12:54 +0000
+++ firewall/cache_port.h       2010-05-23 12:47:35 +0000
@@ -7,6 +7,8 @@
 #ifndef HIP_FIREWALL_CACHE_PORT_H
 #define HIP_FIREWALL_CACHE_PORT_H
 
+#include <netinet/in.h>
+
 #include "lib/core/icomm.h"
 
 void hip_firewall_port_cache_init_hldb(void);

=== modified file 'firewall/common_hipd_msg.c'
--- firewall/common_hipd_msg.c  2010-04-15 20:47:19 +0000
+++ firewall/common_hipd_msg.c  2010-05-23 12:47:35 +0000
@@ -9,13 +9,17 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
+#include <netinet/in.h>
 
-#include "common_hipd_msg.h"
+#include "lib/core/builder.h"
+#include "lib/core/debug.h"
 #include "lib/core/ife.h"
-#include "lib/core/debug.h"
-#include "lib/core/builder.h"
 #include "lib/core/message.h"
+#include "lib/core/protodefs.h"
 #include "firewall.h"
+#include "common_hipd_msg.h"
+
 
 /**
  * Gets the state of the bex for a pair of ip addresses.

=== modified file 'firewall/common_hipd_msg.h'
--- firewall/common_hipd_msg.h  2010-04-22 10:12:54 +0000
+++ firewall/common_hipd_msg.h  2010-05-23 12:47:35 +0000
@@ -7,6 +7,8 @@
 #ifndef HIP_FIREWALL_COMMON_HIPD_MSG_H
 #define HIP_FIREWALL_COMMON_HIPD_MSG_H
 
+#include <netinet/in.h>
+
 #include "lib/core/protodefs.h"
 
 int hip_get_bex_state_from_IPs(const struct in6_addr *src_ip,

=== modified file 'firewall/conntrack.c'
--- firewall/conntrack.c        2010-05-22 12:37:40 +0000
+++ firewall/conntrack.c        2010-05-23 12:47:35 +0000
@@ -17,26 +17,39 @@
 
 #define _BSD_SOURCE
 
-#include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/udp.h>
+#include <openssl/dsa.h>
+#include <openssl/rsa.h>
+#include <sys/time.h>
 
-#include "config.h"
-#include "conntrack.h"
+#include "lib/core/builder.h"
+#include "lib/core/debug.h"
+#include "lib/core/hostid.h"
+#include "lib/core/ife.h"
+#include "lib/core/performance.h"
+#include "lib/core/prefix.h"
+#include "lib/core/protodefs.h"
+#include "lib/tool/pk.h"
+#include "common_types.h"
+#include "datapkt.h"
 #include "dlist.h"
-#include "hslist.h"
 #include "esp_prot_conntrack.h"
-#include "datapkt.h"
-
-#include "lib/core/hostid.h"
+#include "firewall_defines.h"
+#include "firewall.h"
+#include "firewalldb.h"
 #include "lib/core/hip_udp.h"
-#include "hipd/hadb.h"
-#include "lib/tool/pk.h"
-#include "firewalldb.h"
-#include "firewall.h"
-#include "lib/core/debug.h"
-#include "lib/core/performance.h"
 #include "helpers.h"
+#include "hslist.h"
 #include "pisa.h"
+#include "conntrack.h"
+#include "config.h"
+
 
 DList *hipList = NULL;
 DList *espList = NULL;

=== modified file 'firewall/conntrack.h'
--- firewall/conntrack.h        2010-04-22 10:12:54 +0000
+++ firewall/conntrack.h        2010-05-23 12:47:35 +0000
@@ -9,13 +9,13 @@
 
 #define _BSD_SOURCE
 
+#include <stdint.h>
 #include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
 
+#include "lib/core/protodefs.h"
+#include "common_types.h"
 #include "firewall_defines.h"
 #include "rule_management.h"
-#include "common_types.h"
 
 
 /*-------------- CONNECTION TRACKING ------------*/

=== modified file 'firewall/datapkt.c'
--- firewall/datapkt.c  2010-05-22 12:37:40 +0000
+++ firewall/datapkt.c  2010-05-23 12:47:35 +0000
@@ -26,18 +26,27 @@
 
 #define _BSD_SOURCE
 
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <netinet/in.h>
 #include <netinet/ip.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 
-#include "config.h"
-#include "datapkt.h"
-#include "user_ipsec_api.h"
-#include "user_ipsec_esp.h"
-#include "cache.h"
+#include "lib/core/builder.h"
 #include "lib/core/debug.h"
+#include "lib/core/hostid.h"
 #include "lib/core/ife.h"
-#include "lib/core/builder.h"
-#include "lib/core/hostid.h"
 #include "lib/core/message.h"
+#include "lib/core/prefix.h"
+#include "lib/core/protodefs.h"
+#include "cache.h"
+#include "firewall_defines.h"
+#include "user_ipsec_api.h"
+#include "user_ipsec_esp.h"
+#include "datapkt.h"
 
 static unsigned char *hip_data_packet = NULL;
 

=== modified file 'firewall/datapkt.h'
--- firewall/datapkt.h  2010-04-22 10:12:54 +0000
+++ firewall/datapkt.h  2010-05-23 12:47:35 +0000
@@ -7,6 +7,9 @@
 #ifndef HIP_FIREWALL_DATAPKT_H
 #define HIP_FIREWALL_DATAPKT_H
 
+#define _BSD_SOURCE
+
+#include "lib/core/protodefs.h"
 #include "firewall_defines.h"
 
 int hip_datapacket_mode_init(void);

=== modified file 'firewall/dlist.c'
--- firewall/dlist.c    2010-04-15 16:57:50 +0000
+++ firewall/dlist.c    2010-05-23 12:47:35 +0000
@@ -13,6 +13,7 @@
  * @author Essi Vehmersalo
  */
 
+#include "lib/core/debug.h"
 #include "dlist.h"
 
 /**

=== modified file 'firewall/dlist.h'
--- firewall/dlist.h    2010-04-22 10:12:54 +0000
+++ firewall/dlist.h    2010-05-23 12:47:35 +0000
@@ -7,9 +7,7 @@
 #ifndef HIP_FIREWALL_DLIST_H
 #define HIP_FIREWALL_DLIST_H
 
-#include <stdlib.h>
 #include "common_types.h"
-#include "lib/core/debug.h"
 
 DList *alloc_list(void);
 

=== modified file 'firewall/esp_prot_api.c'
--- firewall/esp_prot_api.c     2010-04-08 16:20:56 +0000
+++ firewall/esp_prot_api.c     2010-05-23 12:47:35 +0000
@@ -14,19 +14,27 @@
  *
  */
 
+#include <math.h>
+#include <stdint.h>
+#include <string.h>
+#include <arpa/inet.h>
 #include <openssl/rand.h>
+
+#include "lib/core/debug.h"
+#include "lib/core/hashchain.h"
+#include "lib/core/hashchain_store.h"
+#include "lib/core/hashtree.h"
+#include "lib/core/ife.h"
+#include "esp_prot_config.h"
+#include "esp_prot_fw_msg.h"
+#include "user_ipsec_sadb.h"
+#include "esp_prot_api.h"
+
 #include <openssl/sha.h>
-#include <math.h>
-
-#include "config.h"
 
 #include "lib/core/common_defines.h"
-#include "lib/core/debug.h"
 #include "lib/core/state.h"
 
-#include "esp_prot_api.h"
-#include "esp_prot_fw_msg.h"
-#include "esp_prot_config.h"
 
 /********* esp protection modes config *********/
 int token_transform;

=== modified file 'firewall/esp_prot_api.h'
--- firewall/esp_prot_api.h     2010-03-18 21:15:21 +0000
+++ firewall/esp_prot_api.h     2010-05-23 12:47:35 +0000
@@ -16,6 +16,9 @@
 #ifndef HIP_FIREWALL_ESP_PROT_API_H
 #define HIP_FIREWALL_ESP_PROT_API_H
 
+#include <stdint.h>
+
+#include "lib/core/hashchain.h"
 #include "user_ipsec_sadb.h"
 
 /* maps from the transform_id defined above to the hash-function id

=== modified file 'firewall/esp_prot_config.c'
--- firewall/esp_prot_config.c  2010-05-12 10:46:19 +0000
+++ firewall/esp_prot_config.c  2010-05-23 12:47:35 +0000
@@ -15,10 +15,14 @@
 
 #define _BSD_SOURCE
 
+#include <stdlib.h>
+
 #include "lib/core/debug.h"
+#include "lib/core/ife.h"
 #include "esp_prot_api.h"
+#include "esp_prot_conntrack.h"
 #include "esp_prot_config.h"
-#include "esp_prot_conntrack.h"
+#include "config.h"
 
 
 const char *config_file = {"/etc/hip/esp_prot_config.cfg"};

=== modified file 'firewall/esp_prot_conntrack.c'
--- firewall/esp_prot_conntrack.c       2010-04-15 16:57:50 +0000
+++ firewall/esp_prot_conntrack.c       2010-05-23 12:47:35 +0000
@@ -14,13 +14,27 @@
 
 #define _BSD_SOURCE
 
-#include <netinet/udp.h>
+#include <math.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <arpa/inet.h>
+
 #include "lib/core/builder.h"
-#include "config.h"
-#include "esp_prot_conntrack.h"
+#include "lib/core/debug.h"
+#include "lib/core/hashtree.h"
+#include "lib/core/ife.h"
+#include "lib/core/linkedlist.h"
+#include "lib/core/protodefs.h"
+#include "common_types.h"
+#include "conntrack.h"
 #include "esp_prot_api.h"
+#include "esp_prot_config.h"
+#include "esp_prot_defines.h"
+#include "firewall_defines.h"
 #include "hslist.h"
-#include "esp_prot_config.h"
+#include "esp_prot_conntrack.h"
+
 
 /* cached anchor element updates */
 struct esp_anchor_item {

=== modified file 'firewall/esp_prot_conntrack.h'
--- firewall/esp_prot_conntrack.h       2010-04-21 14:47:24 +0000
+++ firewall/esp_prot_conntrack.h       2010-05-23 12:47:35 +0000
@@ -17,7 +17,8 @@
 #define _BSD_SOURCE
 
 #include "lib/core/protodefs.h"
-#include "conntrack.h"
+#include "firewall_defines.h"
+
 
 typedef struct esp_prot_conntrack_tfm {
     hash_function_t hash_function;     /* pointer to the hash function */

=== modified file 'firewall/esp_prot_defines.h'
--- firewall/esp_prot_defines.h 2010-04-22 10:12:54 +0000
+++ firewall/esp_prot_defines.h 2010-05-23 12:47:35 +0000
@@ -7,6 +7,8 @@
 #ifndef HIP_FIREWALL_ESP_PROT_DEFINES_H
 #define HIP_FIREWALL_ESP_PROT_DEFINES_H
 
+#include <stdint.h>
+
 #include "lib/core/hashchain.h"
 
 

=== modified file 'firewall/esp_prot_fw_msg.c'
--- firewall/esp_prot_fw_msg.c  2010-04-15 20:47:19 +0000
+++ firewall/esp_prot_fw_msg.c  2010-05-23 12:47:35 +0000
@@ -10,16 +10,24 @@
  * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx>
  */
 
+#include <stdint.h>
 #include <stdlib.h>
-#include <netinet/udp.h>
 
+#include "lib/core/builder.h"
 #include "lib/core/debug.h"
+#include "lib/core/hashchain.h"
+#include "lib/core/hashchain_store.h"
+#include "lib/core/hashtree.h"
 #include "lib/core/ife.h"
-#include "lib/core/builder.h"
+#include "lib/core/linkedlist.h"
 #include "lib/core/message.h"
-
+#include "lib/core/protodefs.h"
+#include "esp_prot_api.h"
+#include "user_ipsec_sadb.h"
 #include "esp_prot_fw_msg.h"
-#include "esp_prot_api.h"
+
+#include <netinet/udp.h>
+
 #include "firewall.h"
 
 

=== modified file 'firewall/esp_prot_fw_msg.h'
--- firewall/esp_prot_fw_msg.h  2010-05-04 17:11:55 +0000
+++ firewall/esp_prot_fw_msg.h  2010-05-23 12:47:35 +0000
@@ -14,9 +14,12 @@
 #ifndef HIP_FIREWALL_ESP_PROT_FW_MSG_H
 #define HIP_FIREWALL_ESP_PROT_FW_MSG_H
 
+#include <stdint.h>
+
 #include "lib/core/hashchain_store.h"
+#include "lib/core/hashtree.h"
+#include "lib/core/protodefs.h"
 #include "user_ipsec_sadb.h"
-#include "lib/core/protodefs.h"
 
 int send_esp_prot_to_hipd(const int active);
 int send_bex_store_update_to_hipd(hchain_store_t *hcstore,

=== modified file 'firewall/firewall.c'
--- firewall/firewall.c 2010-05-22 17:33:20 +0000
+++ firewall/firewall.c 2010-05-23 12:47:35 +0000
@@ -25,33 +25,60 @@
 
 #define _BSD_SOURCE
 
+#include <libipq.h>
+#include <limits.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <limits.h> /* INT_MIN, INT_MAX */
-#include <netinet/in.h> /* in_addr, in6_addr */
-#include <linux/netfilter_ipv4.h> /* NF_IP_LOCAL_IN, etc */
+#include <string.h>
+#include <strings.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
+#include <linux/netfilter_ipv4.h>
 
+#include "lib/core/builder.h"
+#include "lib/core/capability.h"
+#include "lib/core/debug.h"
+#include "lib/core/filemanip.h"
+#include "lib/core/hip_udp.h"
+#include "lib/core/ife.h"
+#include "lib/core/message.h"
+#include "lib/core/performance.h"
+#include "lib/core/prefix.h"
+#include "lib/core/util.h"
+#include "lib/tool/lutil.h"
+#include "hipd/hipd.h"
 #include "config.h"
-#include "firewall.h" /* default include */
-#include "conntrack.h" /* connection tracking */
-#include "proxy.h" /* HIP Proxy */
-#include "opptcp.h" /* Opportunistic TCP */
-// TODO move functions to opptcp
-#include "cache.h" /* required by opptcp */
-#include "cache_port.h" /* required by opptcp */
-#include "lsi.h" /* LSI */
-#include "lib/core/capability.h" /* priviledge separation */
-#include "lib/core/hip_udp.h"
-#include "user_ipsec_api.h" /* Userspace IPsec */
-#include "esp_prot_conntrack.h" /* ESP Tokens */
-#include "esp_prot_api.h" /* ESP Tokens */
-#include "sysopp.h" /* System-based Opportunistic HIP */
+#include "cache.h"
+#include "cache_port.h"
+#include "common_types.h"
+#include "conntrack.h"
 #include "datapkt.h"
+#include "esp_prot_api.h"
+#include "esp_prot_conntrack.h"
+#include "firewall_control.h"
+#include "firewall_defines.h"
 #include "firewalldb.h"
-#include "pisa.h" /* PISA */
 #include "helpers.h"
-#include "lib/core/filemanip.h"
-#include "lib/core/performance.h"
-#include "lib/core/util.h"
+#include "lsi.h"
+#include "midauth.h"
+#include "opptcp.h"
+#include "pisa.h"
+#include "proxy.h"
+#include "rule_management.h"
+#include "sysopp.h"
+#include "user_ipsec_api.h"
+#include "firewall.h"
+
 
 /* packet types handled by the firewall */
 #define OTHER_PACKET          0

=== modified file 'firewall/firewall.h'
--- firewall/firewall.h 2010-04-22 10:12:54 +0000
+++ firewall/firewall.h 2010-05-23 12:47:35 +0000
@@ -7,7 +7,6 @@
 #ifndef HIP_FIREWALL_FIREWALL_H
 #define HIP_FIREWALL_FIREWALL_H
 
-#include "config.h"
 #include "lib/core/protodefs.h"
 
 /** globally used variables defined in firewall.c */

=== modified file 'firewall/firewall_control.c'
--- firewall/firewall_control.c 2010-05-12 16:09:38 +0000
+++ firewall/firewall_control.c 2010-05-23 12:47:35 +0000
@@ -14,14 +14,23 @@
 
 #define _BSD_SOURCE
 
-#include "config.h"
-#include "firewall_control.h"
-#include "firewall.h" /* extern int esp_relay */
-#include "proxy.h"
+#include <stdlib.h>
+#include <string.h>
+#include <netinet/in.h>
+
+#include "lib/core/builder.h"
+#include "lib/core/debug.h"
+#include "lib/core/ife.h"
+#include "lib/core/message.h"
+#include "lib/core/protodefs.h"
 #include "cache.h"
-#include "user_ipsec_fw_msg.h"
+#include "firewall.h"
 #include "firewalldb.h"
+#include "proxydb.h"
 #include "sysopp.h"
+#include "user_ipsec_fw_msg.h"
+#include "firewall_control.h"
+
 
 /**
  * Change the state of hadb state cache in the firewall

=== modified file 'firewall/firewall_control.h'
--- firewall/firewall_control.h 2010-04-22 10:12:54 +0000
+++ firewall/firewall_control.h 2010-05-23 12:47:35 +0000
@@ -7,8 +7,6 @@
 #ifndef HIP_FIREWALL_FIREWALL_CONTROL_H
 #define HIP_FIREWALL_FIREWALL_CONTROL_H
 
-#include "config.h"
-#include "lib/core/builder.h"
 #include "lib/core/protodefs.h"
 
 int hip_handle_msg(struct hip_common *msg);

=== modified file 'firewall/firewall_defines.h'
--- firewall/firewall_defines.h 2010-04-22 10:12:54 +0000
+++ firewall/firewall_defines.h 2010-05-23 12:47:35 +0000
@@ -9,18 +9,20 @@
 
 #define _BSD_SOURCE
 
-#include <net/if.h>
-#include <sys/time.h>
 #include <libipq.h>
-#include <string.h>
+#include <stdint.h>
+#include <netinet/in.h>
+#include <netinet/ip6.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
 
-#include "config.h"
+#include "lib/core/common_defines.h"
 #include "lib/core/linkedlist.h"
-#include "lib/core/common_defines.h"
-#include "lib/core/esp_prot_common.h"
 #include "lib/core/protodefs.h"
+#include "config.h"
+#include "common_types.h"
 #include "esp_prot_defines.h"
-#include "common_types.h"
+#include "firewall_defines.h"
 
 
 typedef struct hip_fw_context {

=== modified file 'firewall/firewalldb.c'
--- firewall/firewalldb.c       2010-05-23 10:24:38 +0000
+++ firewall/firewalldb.c       2010-05-23 12:47:35 +0000
@@ -15,21 +15,30 @@
 
 #define _BSD_SOURCE
 
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
+#include <netinet/icmp6.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
-#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
 #include <netinet/udp.h>
-#include <netinet/tcp.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 
-#include "firewalldb.h"
-#include "cache.h"
-#include "firewall_defines.h"
-#include "lib/core/icomm.h"
+#include "lib/core/builder.h"
 #include "lib/core/debug.h"
 #include "lib/core/hashtable.h"
-#include "lib/core/builder.h"
-
+#include "lib/core/icomm.h"
+#include "lib/core/ife.h"
+#include "lib/core/list.h"
+#include "lib/core/prefix.h"
+#include "lib/core/protodefs.h"
 #include "lib/tool/checksum.h"
+#include "cache.h"
+#include "firewalldb.h"
+
 
 static int firewall_raw_sock_tcp_v4        = 0;
 static int firewall_raw_sock_udp_v4        = 0;

=== modified file 'firewall/firewalldb.h'
--- firewall/firewalldb.h       2010-04-22 10:12:54 +0000
+++ firewall/firewalldb.h       2010-05-23 12:47:35 +0000
@@ -7,8 +7,11 @@
 #ifndef HIP_FIREWALL_FIREWALLDB_H
 #define HIP_FIREWALL_FIREWALLDB_H
 
-#include <netinet/ip_icmp.h>
+#include <stdint.h>
+#include <netinet/in.h>
+
 #include "lib/core/icomm.h"
+#include "lib/core/protodefs.h"
 
 void hip_firewall_init_hldb(void);
 firewall_hl_t *hip_firewall_ip_db_match(const struct in6_addr *ip_peer);

=== modified file 'firewall/helpers.c'
--- firewall/helpers.c  2010-05-17 18:24:10 +0000
+++ firewall/helpers.c  2010-05-23 12:47:35 +0000
@@ -10,9 +10,11 @@
  * @todo the actual utility of this file seems questionable (should be removed)
  */
 
-#include <limits.h>
+#include <stdlib.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 
+#include "lib/core/debug.h"
 #include "helpers.h"
 
 /**

=== modified file 'firewall/helpers.h'
--- firewall/helpers.h  2010-05-17 18:24:10 +0000
+++ firewall/helpers.h  2010-05-23 12:47:35 +0000
@@ -9,10 +9,6 @@
 
 #include <netinet/in.h>
 
-#include "lib/core/debug.h"
-#include "rule_management.h"
-#include "firewall.h"
-
 char *addr_to_numeric(const struct in6_addr *addrp);
 struct in6_addr *numeric_to_addr(const char *num);
 void system_print(const char *command);

=== modified file 'firewall/hslist.c'
--- firewall/hslist.c   2010-04-15 16:57:50 +0000
+++ firewall/hslist.c   2010-05-23 12:47:35 +0000
@@ -13,6 +13,9 @@
  * @author Essi Vehmersalo
  */
 
+#include <stdlib.h>
+
+#include "common_types.h"
 #include "hslist.h"
 
 /**

=== modified file 'firewall/hslist.h'
--- firewall/hslist.h   2010-04-22 10:12:54 +0000
+++ firewall/hslist.h   2010-05-23 12:47:35 +0000
@@ -7,7 +7,6 @@
 #ifndef HIP_FIREWALL_HSLIST_H
 #define HIP_FIREWALL_HSLIST_H
 
-#include <stdlib.h>
 #include "common_types.h"
 
 SList *alloc_slist(void);

=== modified file 'firewall/lsi.c'
--- firewall/lsi.c      2010-05-22 12:37:40 +0000
+++ firewall/lsi.c      2010-05-23 12:47:35 +0000
@@ -24,17 +24,28 @@
 
 #define _BSD_SOURCE
 
+#include <libipq.h>
+#include <stdint.h>
 #include <stdlib.h>
-#include <netinet/ip6.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/ip_icmp.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
+
+#include "lib/core/builder.h"
+#include "lib/core/icomm.h"
+#include "lib/core/ife.h"
+#include "lib/core/message.h"
+#include "lib/core/prefix.h"
+#include "lib/core/protodefs.h"
 #include "cache.h"
 #include "cache_port.h"
 #include "firewall.h"
 #include "firewalldb.h"
 #include "lsi.h"
-#include "lib/core/builder.h"
-#include "lib/core/message.h"
+
 
 #define BUFSIZE HIP_MAX_PACKET
 

=== modified file 'firewall/lsi.h'
--- firewall/lsi.h      2010-04-22 10:12:54 +0000
+++ firewall/lsi.h      2010-05-23 12:47:35 +0000
@@ -10,8 +10,8 @@
 #define _BSD_SOURCE
 
 #include <libipq.h>
-#include <netinet/ip_icmp.h>
-#include <linux/netfilter_ipv4/ip_queue.h>
+#include <netinet/in.h>
+
 #include "lib/core/protodefs.h"
 
 int hip_trigger_bex(const struct in6_addr *src_hit,

=== modified file 'firewall/midauth.c'
--- firewall/midauth.c  2010-04-21 16:08:58 +0000
+++ firewall/midauth.c  2010-05-23 12:47:35 +0000
@@ -19,15 +19,24 @@
 
 #define _BSD_SOURCE
 
+#include <stdint.h>
 #include <string.h>
+#include <arpa/inet.h>
+#include <netinet/ip.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <linux/netfilter.h>
 
-#include "config.h"
+#include "lib/core/builder.h"
+#include "lib/core/debug.h"
 #include "lib/core/ife.h"
-#include "midauth.h"
-#include "pisa.h"
-#include "lib/core/builder.h"
+#include "lib/core/protodefs.h"
 #include "lib/core/solve.h"
 #include "lib/tool/checksum.h"
+#include "firewall_defines.h"
+#include "pisa.h"
+#include "midauth.h"
+
 
 static struct midauth_handlers handlers;
 

=== modified file 'firewall/midauth.h'
--- firewall/midauth.h  2010-04-22 10:05:56 +0000
+++ firewall/midauth.h  2010-05-23 12:47:35 +0000
@@ -14,12 +14,9 @@
 
 #define _BSD_SOURCE
 
-#include <netinet/ip6.h>
-#include <netinet/ip.h>
-#include <netinet/udp.h>
-#include <linux/netfilter.h>
+#include <stdint.h>
+
 #include "lib/core/protodefs.h"
-#include "lib/core/debug.h"
 #include "firewall_defines.h"
 
 typedef int (*midauth_handler)(hip_fw_context_t *ctx);

=== modified file 'firewall/opptcp.c'
--- firewall/opptcp.c   2010-05-22 12:37:40 +0000
+++ firewall/opptcp.c   2010-05-23 12:47:35 +0000
@@ -35,16 +35,22 @@
 
 #define _BSD_SOURCE
 
+#include <netinet/in.h>
+#include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include "opptcp.h"
-#include "firewalldb.h"
+
+#include "lib/core/builder.h"
 #include "lib/core/debug.h"
+#include "lib/core/icomm.h"
+#include "lib/core/ife.h"
+#include "lib/core/message.h"
 #include "lib/core/protodefs.h"
-#include "lib/core/builder.h"
-#include "lib/core/message.h"
 #include "lib/tool/nlink.h"
 #include "common_hipd_msg.h"
 #include "firewall.h"
+#include "firewalldb.h"
+#include "opptcp.h"
+
 
 /**
  * Send the ip of a peer to hipd, so that it can:

=== modified file 'firewall/pisa.c'
--- firewall/pisa.c     2010-05-17 16:55:10 +0000
+++ firewall/pisa.c     2010-05-23 12:47:35 +0000
@@ -15,18 +15,29 @@
 
 #define _BSD_SOURCE
 
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <stdio.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <linux/netfilter.h>
 
 #include "config.h"
+#include "lib/core/builder.h"
+#include "lib/core/certtools.h"
+#include "lib/core/crypto.h"
+#include "lib/core/debug.h"
 #include "lib/core/ife.h"
-#include "lib/core/crypto.h"
 #include "lib/core/performance.h"
+#include "lib/core/prefix.h"
+#include "firewall_defines.h"
 #include "midauth.h"
-
+#include "pisa_cert.h"
 #include "pisa.h"
-#include "pisa_cert.h"
+
+
 #define PISA_RANDOM_LEN 16
 #define PISA_PUZZLE_SEED 0xDEADC0DE
 #define PISA_PUZZLE_OPAQUE_LEN (4 + HIP_AH_SHA_LEN)

=== modified file 'firewall/pisa_cert.c'
--- firewall/pisa_cert.c        2010-05-17 18:24:10 +0000
+++ firewall/pisa_cert.c        2010-05-23 12:47:35 +0000
@@ -13,13 +13,14 @@
 
 #define _BSD_SOURCE
 
+#include <string.h>
+#include <time.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+
 #include "pisa_cert.h"
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <string.h>
-#include <stdio.h>
 
 /**
  * Extract parts of a SPKI certificate.

=== modified file 'firewall/pisa_cert.h'
--- firewall/pisa_cert.h        2010-04-22 10:05:56 +0000
+++ firewall/pisa_cert.h        2010-05-23 12:47:35 +0000
@@ -12,7 +12,7 @@
 #define HIP_FIREWALL_PISA_CERT_H
 
 #include <time.h>
-#include <arpa/inet.h>
+#include <netinet/in.h>
 
 struct pisa_cert {
     struct in6_addr hit_issuer;

=== modified file 'firewall/proxy.c'
--- firewall/proxy.c    2010-05-23 11:33:26 +0000
+++ firewall/proxy.c    2010-05-23 12:47:35 +0000
@@ -11,14 +11,32 @@
 #define _BSD_SOURCE
 
 #include <errno.h>
+#include <libipq.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <netinet/icmp6.h>
+#include <netinet/ip_icmp.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 
+#include "config.h"
+#include "lib/core/builder.h"
+#include "lib/core/debug.h"
+#include "lib/core/ife.h"
+#include "lib/core/message.h"
+#include "lib/core/prefix.h"
+#include "lib/core/protodefs.h"
 #include "lib/tool/checksum.h"
+#include "firewall.h"
+#include "firewall_defines.h"
+#include "proxyconndb.h"
+#include "proxydb.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/proxy.h'
--- firewall/proxy.h    2010-04-22 10:12:54 +0000
+++ firewall/proxy.h    2010-05-23 12:47:35 +0000
@@ -10,10 +10,7 @@
 #define _BSD_SOURCE
 
 #include <libipq.h>
-
-#include "firewall.h"
-#include "proxydb.h"
-#include "config.h"
+#include <netinet/in.h>
 
 int request_hipproxy_status(void);
 

=== modified file 'firewall/proxyconndb.c'
--- firewall/proxyconndb.c      2010-04-15 23:33:52 +0000
+++ firewall/proxyconndb.c      2010-05-23 12:47:35 +0000
@@ -13,8 +13,17 @@
  * @author Weiwei Hu
  */
 
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <netinet/in.h>
+
+#include "lib/core/builder.h"
+#include "lib/core/debug.h"
+#include "lib/core/hashtable.h"
+#include "lib/core/list.h"
+#include "lib/core/prefix.h"
 #include "hipd/hidb.h"
-#include "lib/core/hashtable.h"
 #include "proxyconndb.h"
 
 

=== modified file 'firewall/proxyconndb.h'
--- firewall/proxyconndb.h      2010-04-22 10:12:54 +0000
+++ firewall/proxyconndb.h      2010-05-23 12:47:35 +0000
@@ -7,6 +7,9 @@
 #ifndef HIP_FIREWALL_PROXYCONNDB_H
 #define HIP_FIREWALL_PROXYCONNDB_H
 
+#include <stdint.h>
+#include <netinet/in.h>
+
 #include "lib/core/debug.h"
 
 struct hip_proxy_conn_key {

=== modified file 'firewall/proxydb.c'
--- firewall/proxydb.c  2010-04-15 23:33:52 +0000
+++ firewall/proxydb.c  2010-05-23 12:47:35 +0000
@@ -8,8 +8,21 @@
  * @author Weiwei Hu
  */
 
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <netinet/in.h>
+
+#include "lib/core/builder.h"
+#include "lib/core/debug.h"
+#include "lib/core/hashtable.h"
+#include "lib/core/list.h"
+#include "lib/core/prefix.h"
+#include "lib/core/protodefs.h"
 #include "proxydb.h"
 
+
 HIP_HASHTABLE *hip_proxy_db = NULL;
 
 

=== modified file 'firewall/proxydb.h'
--- firewall/proxydb.h  2010-04-22 10:12:54 +0000
+++ firewall/proxydb.h  2010-05-23 12:47:35 +0000
@@ -7,19 +7,9 @@
 #ifndef HIP_FIREWALL_PROXYDB_H
 #define HIP_FIREWALL_PROXYDB_H
 
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stddef.h>
-#include <sys/socket.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#include <netinet/ip_icmp.h>
+#include <netinet/in.h>
 
-#include "lib/core/debug.h"
-#include "hipd/hidb.h"
-#include "lib/core/hashtable.h"
-#include "firewall_control.h"
+#include "lib/core/protodefs.h"
 
 typedef struct hip_proxy_t {
     hip_hit_t       hit_proxy;

=== modified file 'firewall/rule_management.c'
--- firewall/rule_management.c  2010-05-22 17:33:20 +0000
+++ firewall/rule_management.c  2010-05-23 12:47:35 +0000
@@ -13,27 +13,32 @@
 
 #define _BSD_SOURCE
 
+#include <errno.h>
+#include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <net/if.h>
 #include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <linux/netfilter.h>
-#include <libipq.h>
-
-#include <stdio.h>
+#include <linux/netfilter_ipv6.h>
 #include <openssl/dsa.h>
+#include <openssl/pem.h>
 #include <openssl/rsa.h>
-#include <openssl/pem.h>
-#include <limits.h>
-#include <linux/netfilter_ipv6.h>
 
-#include "config.h"
-#include "rule_management.h"
-#include "helpers.h"
 #include "lib/core/builder.h"
-#include "lib/core/crypto.h"
 #include "lib/core/debug.h"
 #include "lib/core/hostid.h"
+#include "lib/core/prefix.h"
+#include "lib/core/protodefs.h"
+#include "dlist.h"
+#include "firewall.h"
+#include "helpers.h"
+#include "rule_management.h"
+
 
 /* string tokens for rule parsing */
 #define SRC_HIT_STR "-src_hit"

=== modified file 'firewall/rule_management.h'
--- firewall/rule_management.h  2010-05-22 12:40:19 +0000
+++ firewall/rule_management.h  2010-05-23 12:47:35 +0000
@@ -7,6 +7,9 @@
 #ifndef HIP_FIREWALL_RULE_MANAGEMENT_H
 #define HIP_FIREWALL_RULE_MANAGEMENT_H
 
+#include <netinet/in.h>
+
+#include "lib/core/protodefs.h"
 #include "dlist.h"
 
 #define DROP 0;

=== modified file 'firewall/sysopp.c'
--- firewall/sysopp.c   2010-05-22 17:46:57 +0000
+++ firewall/sysopp.c   2010-05-23 12:47:35 +0000
@@ -23,19 +23,27 @@
 
 #define _BSD_SOURCE
 
-#include <netinet/ip6.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
 
+#include "lib/core/builder.h"
 #include "lib/core/debug.h"
-#include "lib/core/builder.h"
+#include "lib/core/hostid.h"
+#include "lib/core/ife.h"
 #include "lib/core/message.h"
-#include "sysopp.h"
+#include "lib/core/prefix.h"
+#include "lib/core/protodefs.h"
+#include "common_hipd_msg.h"
 #include "firewall.h"
+#include "firewall_defines.h"
 #include "firewalldb.h"
 #include "lsi.h"
-#include "common_hipd_msg.h"
-#include "lib/core/hostid.h"
+#include "sysopp.h"
+
 
 /**
  * flush iptables rules for system-based opportunistic mode

=== modified file 'firewall/sysopp.h'
--- firewall/sysopp.h   2010-04-22 10:12:54 +0000
+++ firewall/sysopp.h   2010-05-23 12:47:35 +0000
@@ -7,8 +7,10 @@
 #ifndef HIP_FIREWALL_SYSOPP_H
 #define HIP_FIREWALL_SYSOPP_H
 
+#define _BSD_SOURCE
+
+#include "lib/core/protodefs.h"
 #include "firewall_defines.h"
-#include "lib/core/protodefs.h"
 
 int hip_fw_handle_outgoing_system_based_opp(const hip_fw_context_t *ctx,
                                             const int default_verdict);

=== modified file 'firewall/user_ipsec_api.c'
--- firewall/user_ipsec_api.c   2010-05-22 12:37:40 +0000
+++ firewall/user_ipsec_api.c   2010-05-23 12:47:35 +0000
@@ -14,14 +14,29 @@
 /* required for IFNAMSIZ in libipq headers */
 #define _BSD_SOURCE
 
-#include "user_ipsec_api.h"
-#include "user_ipsec_sadb.h"
-#include "user_ipsec_esp.h"
-#include "user_ipsec_fw_msg.h"
 #include "esp_prot_api.h"
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+
+#include "lib/core/common_defines.h"
+#include "lib/core/debug.h"
 #include "lib/core/ife.h"
-#include "lib/core/debug.h"
+#include "lib/core/prefix.h"
+#include "datapkt.h"
+#include "firewall_defines.h"
 #include "lsi.h"
+#include "user_ipsec_esp.h"
+#include "user_ipsec_fw_msg.h"
+#include "user_ipsec_sadb.h"
+#include "user_ipsec_api.h"
+
 
 #define USER_IPSEC_INACTIVE 0
 #define USER_IPSEC_ACTIVE 1

=== modified file 'firewall/user_ipsec_api.h'
--- firewall/user_ipsec_api.h   2010-04-21 14:47:24 +0000
+++ firewall/user_ipsec_api.h   2010-05-23 12:47:35 +0000
@@ -17,8 +17,11 @@
 #define _BSD_SOURCE
 
 #include <netinet/udp.h>
+#include <openssl/aes.h>
 #include <openssl/evp.h>
 
+#include "lib/core/hashchain.h"
+#include "lib/core/protodefs.h"
 #include "firewall_defines.h"
 
 /* this is the maximum buffer-size needed for an userspace ipsec esp packet

=== modified file 'firewall/user_ipsec_esp.c'
--- firewall/user_ipsec_esp.c   2010-05-23 11:33:26 +0000
+++ firewall/user_ipsec_esp.c   2010-05-23 12:47:35 +0000
@@ -28,18 +28,26 @@
 
 #define _BSD_SOURCE
 
+#include <stdint.h>
+#include <string.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>
+#include <openssl/hmac.h>
 #include <openssl/rand.h>
-#include <openssl/hmac.h>
-#include <openssl/evp.h>
 
+#include "lib/core/debug.h"
+#include "lib/core/ife.h"
+#include "lib/core/keylen.h"
 #include "lib/core/prefix.h"
 #include "lib/tool/checksum.h"
-#include "lib/core/keylen.h"
 #include "esp_prot_api.h"
+#include "firewall_defines.h"
+#include "user_ipsec_sadb.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-05-23 11:33:26 +0000
+++ firewall/user_ipsec_esp.h   2010-05-23 12:47:35 +0000
@@ -31,8 +31,11 @@
 
 #define _BSD_SOURCE
 
+#include <stdint.h>
+#include <netinet/in.h>
+
+#include "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 'firewall/user_ipsec_fw_msg.c'
--- firewall/user_ipsec_fw_msg.c        2010-04-15 20:47:19 +0000
+++ firewall/user_ipsec_fw_msg.c        2010-05-23 12:47:35 +0000
@@ -10,13 +10,21 @@
  * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx>
  */
 
+#include <stdint.h>
 #include <stdlib.h>
+#include <netinet/in.h>
 
+#include "lib/core/builder.h"
+#include "lib/core/debug.h"
+#include "lib/core/ife.h"
+#include "lib/core/message.h"
+#include "lib/core/prefix.h"
+#include "lib/core/protodefs.h"
 #include "esp_prot_fw_msg.h"
 #include "firewall.h"
+#include "user_ipsec_sadb.h"
 #include "user_ipsec_fw_msg.h"
-#include "lib/core/builder.h"
-#include "lib/core/message.h"
+
 
 #define DEFAULT_LIFETIME 0 /* place holder as timeout not implemented yet */
 

=== modified file 'firewall/user_ipsec_sadb.c'
--- firewall/user_ipsec_sadb.c  2010-05-22 12:37:40 +0000
+++ firewall/user_ipsec_sadb.c  2010-05-23 12:47:35 +0000
@@ -12,17 +12,29 @@
  *
  */
 
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <openssl/aes.h>
+#include <openssl/blowfish.h>
+#include <openssl/des.h>
 #include <openssl/sha.h>
-#include <string.h>
+#include <sys/time.h>
 
-#include "user_ipsec_sadb.h"
+#include "lib/core/builder.h"
+#include "lib/core/debug.h"
+#include "lib/core/hashtable.h"
+#include "lib/core/ife.h"
+#include "lib/core/keylen.h"
+#include "lib/core/list.h"
+#include "lib/core/esp_prot_common.h"
+#include "lib/core/hashchain.h"
 #include "esp_prot_api.h"
+#include "esp_prot_defines.h"
 #include "firewall.h"
-#include "lib/core/ife.h"
-#include "lib/core/keylen.h"
-#include "lib/core/debug.h"
-#include "lib/core/state.h"
-#include "lib/core/builder.h"
+#include "user_ipsec_sadb.h"
+
 
 /* hash functions used for calculating the entries' hashes
  *

=== modified file 'firewall/user_ipsec_sadb.h'
--- firewall/user_ipsec_sadb.h  2010-03-30 12:41:08 +0000
+++ firewall/user_ipsec_sadb.h  2010-05-23 12:47:35 +0000
@@ -15,15 +15,17 @@
 #ifndef HIP_FIREWALL_USER_IPSEC_SADB_H
 #define HIP_FIREWALL_USER_IPSEC_SADB_H
 
-#include <openssl/des.h>                /* des_key_schedule */
-#include <openssl/aes.h>                /* aes_key */
-#include <openssl/blowfish.h>   /* bf_key */
+#include <stdint.h>
+#include <netinet/in.h>
+#include <openssl/aes.h>
+#include <openssl/blowfish.h>
+#include <openssl/des.h>
 #include <sys/time.h>
-#include <inttypes.h>
-#include <netinet/in.h>
+
+#include "lib/core/esp_prot_common.h"
 #include "lib/core/hashchain.h"
 #include "esp_prot_defines.h"
-#include "lib/core/esp_prot_common.h"
+
 
 #define BEET_MODE 3 /* mode: 1-transport, 2-tunnel, 3-beet -> right now we 
only support mode 3 */

Other related posts:

  • » [hipl-commit] [trunk] Rev 4581: the grand #include cleanup - part IV: firewall/ directory - Diego Biurrun