Sync rahunas ipset header and fix compiler warning
authorNeutron Soutmun <neo.neutron@gmail.com>
Sun, 17 Jun 2012 04:04:52 +0000 (11:04 +0700)
committerNeutron Soutmun <neo.neutron@gmail.com>
Sun, 17 Jun 2012 04:04:52 +0000 (11:04 +0700)
* src/ipset/ip_set_rahunas_ipiphash.h:
  - Sync rahunas ipset ipiphash header.
* src/ipset/ip_set_{rahunas,rahunas_ipiphash}.h:
  - Fix compiler warning.

src/ipset/ip_set_rahunas.h
src/ipset/ip_set_rahunas_ipiphash.h

index 8c6dcda..41e990d 100644 (file)
 #  include <time.h>
 #endif
 
+#ifdef  SETTYPE_NAME
+#undef  SETTYPE_NAME
 #define SETTYPE_NAME "rahunas"
+#endif
 
 /* general flags */
 #define IPSET_RAHUNAS_MATCHUNSET       1
index d850929..8cae01d 100644 (file)
@@ -6,7 +6,10 @@
 #include "ip_set.h"
 #include "ip_set_hashes.h"
 
+#ifdef  SETTYPE_NAME
+#undef  SETTYPE_NAME
 #define SETTYPE_NAME           "rahunas_ipiphash"
+#endif
 
 struct rahunas_ipip {
   ip_set_ip_t ip;
@@ -14,7 +17,7 @@ struct rahunas_ipip {
 };
 
 struct ip_set_rahunas_ipiphash {
-       struct ip_set_rahunas_ipip *members;            /* the ipiphash proper */
+       struct rahunas_ipip *members;   /* the ipiphash proper */
        uint32_t elements;              /* number of elements */
        uint32_t hashsize;              /* hash size */
        uint16_t probes;                /* max number of probes  */
@@ -33,6 +36,4 @@ struct ip_set_req_rahunas_ipiphash {
   ip_set_ip_t ip1;
 };
 
-extern __u32 rahunas_ipiphash_id(struct ip_set *set, ip_set_ip_t ip);
-
 #endif /* __IP_SET_RAHUNAS_IPIPHASH_H */