Committer: Diego Biurrun <diego@xxxxxxxxxx> Date: 23/05/2010 at 13:24:54 Revision: 4575 Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: trunk Log: Remove some apparently unused debug code. Modified: M firewall/firewalldb.c === modified file 'firewall/firewalldb.c' --- firewall/firewalldb.c 2010-05-22 12:37:40 +0000 +++ firewall/firewalldb.c 2010-05-23 10:24:38 +0000 @@ -31,9 +31,6 @@ #include "lib/tool/checksum.h" -#define DISABLE_hip_firewall_hldb_dump -#define DISABLE_firewall_init_raw_sock_esp_v6 - static int firewall_raw_sock_tcp_v4 = 0; static int firewall_raw_sock_udp_v4 = 0; static int firewall_raw_sock_icmp_v4 = 0; @@ -43,15 +40,11 @@ static int firewall_raw_sock_icmp_outbound = 0; static int firewall_raw_sock_esp_v4 = 0; - -#ifndef DISABLE_firewall_init_raw_sock_esp_v6 static int firewall_raw_sock_esp_v6 = 0; -#endif HIP_HASHTABLE *firewall_hit_lsi_ip_db; -#ifndef DISABLE_hip_firewall_hldb_dump /** * display the contents of the database */ @@ -74,8 +67,6 @@ HIP_UNLOCK_HT(&firewall_lsi_hit_db); } -#endif - /** * Search in the database the given peer ip * @@ -84,9 +75,7 @@ */ firewall_hl_t *hip_firewall_ip_db_match(const struct in6_addr *ip_peer) { -#ifndef DISABLE_hip_firewall_hldb_dump hip_firewall_hldb_dump(); -#endif HIP_DEBUG_IN6ADDR("peer ip", ip_peer); return (firewall_hl_t *) hip_ht_find(firewall_hit_lsi_ip_db, (void *) ip_peer); @@ -477,7 +466,6 @@ return err; } -#ifndef DISABLE_firewall_init_raw_sock_esp_v6 /** * Initialize ESPv6-based raw socket * @@ -501,8 +489,6 @@ return err; } -#endif - /** * Initialize all raw sockets * @@ -517,9 +503,7 @@ hip_firewall_init_raw_sock_udp_v6(&firewall_raw_sock_udp_v6); hip_firewall_init_raw_sock_icmp_v6(&firewall_raw_sock_icmp_v6); hip_firewall_init_raw_sock_esp_v4(&firewall_raw_sock_esp_v4); -#ifndef DISABLE_firewall_init_raw_sock_esp_v6 hip_firewall_init_raw_sock_esp_v6(&firewall_raw_sock_esp_v6); -#endif } /**