Remove last vestiges of NFC (Peter Riley <Peter.Riley@hotpop.com>)

diff --git a/extensions/libip6t_HL.c b/extensions/libip6t_HL.c
index d215eaa50b5c5b8d6d576ec4eb9dff38f4ad1821..1330c4e6031a53acd198f729af4687ce6b136f38 100644 (file)
--- a/extensions/libip6t_HL.c
+++ b/extensions/libip6t_HL.c
@@ -16,7 +16,7 @@
 
 #define IP6T_HL_USED   1
 
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c
index a11b8c01af614b092d750e7808e2d133d6cbb778..7106d16c8775355e8f286eeaea37db0ceaa9b062 100644 (file)
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -44,7 +44,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
        struct ip6t_log_info *loginfo = (struct ip6t_log_info *)t->data;
 

diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c
index c67de0eb4428ab24a57294255c38a03d232d4e89..60a639061f727ad45528d08615001271c14db42e 100644 (file)
--- a/extensions/libip6t_REJECT.c
+++ b/extensions/libip6t_REJECT.c
@@ -72,7 +72,7 @@ static const struct option opts[] = {
 
 /* Allocate and initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
        struct ip6t_reject_info *reject = (struct ip6t_reject_info *)t->data;
 

diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c
index d3048a264d216a4c2e6fbb6cadbb813fd4c22af7..e96ba201144112957fba431de7d8c926526c38dc 100644 (file)
--- a/extensions/libip6t_ah.c
+++ b/extensions/libip6t_ah.c
@@ -72,7 +72,7 @@ parse_ah_spis(const char *spistring, u_int32_t *spis)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct ip6t_ah *ahinfo = (struct ip6t_ah *)m->data;
 
@@ -86,7 +86,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ip6t_ah *ahinfo = (struct ip6t_ah *)(*match)->data;

diff --git a/extensions/libip6t_condition.c b/extensions/libip6t_condition.c
index 40d05225ac72e6b2ecc3438622768f83c18d702c..d299902581af66b2b375cfd42ebb217cbe131881 100644 (file)
--- a/extensions/libip6t_condition.c
+++ b/extensions/libip6t_condition.c
@@ -26,7 +26,7 @@ static const struct option opts[] = {
 
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
-      const void *entry, unsigned int *nfcache,
+      const void *entry,
       struct xt_entry_match **match)
 {
        struct condition6_info *info =

diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c
index cb49c1fbc0dfdf3326755d4c68cdfa8a835db494..2207c3f453a45981eec6b03e2a981a852cbb0204 100644 (file)
--- a/extensions/libip6t_dst.c
+++ b/extensions/libip6t_dst.c
@@ -118,7 +118,7 @@ parse_options(const char *optsstr, u_int16_t *opts)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct ip6t_opts *optinfo = (struct ip6t_opts *)m->data;
 
@@ -133,7 +133,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ip6t_opts *optinfo = (struct ip6t_opts *)(*match)->data;

diff --git a/extensions/libip6t_eui64.c b/extensions/libip6t_eui64.c
index e95944b0a0ecdf85176c83bac28dc3c40c5bdeff..a38af34e014ba0506bd0395eefb14a0980ee490d 100644 (file)
--- a/extensions/libip6t_eui64.c
+++ b/extensions/libip6t_eui64.c
@@ -27,7 +27,6 @@ help(void)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        return 0;

diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c
index 1e184b73cddc7127a02ead47c27025d7b0368f2a..014351eec487eb68a3cccac8c80d3db71ad0cec1 100644 (file)
--- a/extensions/libip6t_frag.c
+++ b/extensions/libip6t_frag.c
@@ -78,7 +78,7 @@ parse_frag_ids(const char *idstring, u_int32_t *ids)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct ip6t_frag *fraginfo = (struct ip6t_frag *)m->data;
 
@@ -94,7 +94,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ip6t_frag *fraginfo = (struct ip6t_frag *)(*match)->data;

diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c
index c139c2337a7451fa2cfd48fffe3701b8579e112b..533d5106029b3890b23e0b85fca863e03bde744e 100644 (file)
--- a/extensions/libip6t_hbh.c
+++ b/extensions/libip6t_hbh.c
@@ -117,7 +117,7 @@ parse_options(const char *optsstr, u_int16_t *opts)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct ip6t_opts *optinfo = (struct ip6t_opts *)m->data;
 
@@ -132,7 +132,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ip6t_opts *optinfo = (struct ip6t_opts *)(*match)->data;

diff --git a/extensions/libip6t_hl.c b/extensions/libip6t_hl.c
index 197ef853d31cb5cb53eb598f6524147e4efaee96..20aff602792d0521d653d85d8ed49de61cb48c9a 100644 (file)
--- a/extensions/libip6t_hl.c
+++ b/extensions/libip6t_hl.c
@@ -26,7 +26,7 @@ static void help(void)
 }
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
-               const void *entry, unsigned int *nfcache,
+               const void *entry,
                struct xt_entry_match **match)
 {
        struct ip6t_hl_info *info = (struct ip6t_hl_info *) (*match)->data;

diff --git a/extensions/libip6t_icmp6.c b/extensions/libip6t_icmp6.c
index 46c9d38d368a36f9ba647af0cafa8e766f9d2f66..5c06c04b738c88dab1c1345a7fc743401e9213c8 100644 (file)
--- a/extensions/libip6t_icmp6.c
+++ b/extensions/libip6t_icmp6.c
@@ -145,7 +145,7 @@ parse_icmpv6(const char *icmpv6type, u_int8_t *type, u_int8_t code[])
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct ip6t_icmp *icmpv6info = (struct ip6t_icmp *)m->data;
 
@@ -157,7 +157,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ip6t_icmp *icmpv6info = (struct ip6t_icmp *)(*match)->data;

diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c
index 4dab33fcbcee966b13d898a7f141bc20a778ca1a..3d21f45073bb3e1ffdae8b0d1d183d1f049c125c 100644 (file)
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
@@ -155,7 +155,7 @@ static const struct option opts[] = {
 };
 
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct ip6t_ipv6header_info *info = (struct ip6t_ipv6header_info *)m->data;
 
@@ -186,7 +186,6 @@ parse_header(const char *flags) {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ip6t_ipv6header_info *info = (struct ip6t_ipv6header_info *)(*match)->data;

diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c
index d2f9cec917efdceaaf36577d0753b765bc9c339c..90d12046d40c354440fb1c23efd5bb1c505f4360 100644 (file)
--- a/extensions/libip6t_mh.c
+++ b/extensions/libip6t_mh.c
@@ -67,7 +67,7 @@ IPTABLES_VERSION);
        print_types_all();
 }
 
-static void init(struct xt_entry_match *m, unsigned int *nfcache)
+static void init(struct xt_entry_match *m)
 {
        struct ip6t_mh *mhinfo = (struct ip6t_mh *)m->data;
 
@@ -127,7 +127,6 @@ static void parse_mh_types(const char *mhtype, u_int8_t *types)
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
                 const void *entry,
-                unsigned int *nfcache,
                 struct xt_entry_match **match)
 {
        struct ip6t_mh *mhinfo = (struct ip6t_mh *)(*match)->data;

diff --git a/extensions/libip6t_owner.c b/extensions/libip6t_owner.c
index a5ec8da581af8813c010a66d76d5962411c04539..1f1c9055d705f75cacb96717e905b98207218ab5 100644 (file)
--- a/extensions/libip6t_owner.c
+++ b/extensions/libip6t_owner.c
@@ -52,7 +52,6 @@ static const struct option opts[] = {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ip6t_owner_info *ownerinfo = (struct ip6t_owner_info *)(*match)->data;

diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c
index 4612e141e37b6a158bc747ed9f3b4fea2d2030a5..d62272420743f5eda6aa756cedef76fe66eefc3c 100644 (file)
--- a/extensions/libip6t_policy.c
+++ b/extensions/libip6t_policy.c
@@ -133,9 +133,8 @@ extern void parse_hostnetworkmask(const char *name, struct in6_addr **addrpp,
 
 /* End duplicated code from ip6tables.c */
 
-static void init(struct xt_entry_match *m, unsigned int *nfcache)
+static void init(struct xt_entry_match *m)
 {
-       *nfcache |= NFC_UNKNOWN;
 }
 
 static int parse_direction(char *s)
@@ -167,7 +166,6 @@ static int parse_mode(char *s)
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
                  const void *entry,
-                 unsigned int *nfcache,
                  struct xt_entry_match **match)
 {
        struct ip6t_policy_info *info = (void *)(*match)->data;

diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c
index 3c3911e3fb3f017b7f8e137c6d7fa062cb0916d1..a21fd6881067d5b7b41a84af9841e56ebac05439 100644 (file)
--- a/extensions/libip6t_rt.c
+++ b/extensions/libip6t_rt.c
@@ -139,7 +139,7 @@ parse_addresses(const char *addrstr, struct in6_addr *addrp)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct ip6t_rt *rtinfo = (struct ip6t_rt *)m->data;
 
@@ -157,7 +157,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ip6t_rt *rtinfo = (struct ip6t_rt *)(*match)->data;

diff --git a/extensions/libip6t_state.c b/extensions/libip6t_state.c
index d7fc83c7f18864f9e9915221e4911b7888b1170c..9c43334bded17d63b15063d7bd8c35c08242068c 100644 (file)
--- a/extensions/libip6t_state.c
+++ b/extensions/libip6t_state.c
@@ -66,7 +66,6 @@ parse_states(const char *arg, struct ipt_state_info *sinfo)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ipt_state_info *sinfo = (struct ipt_state_info *)(*match)->data;

diff --git a/extensions/libipt_CLUSTERIP.c b/extensions/libipt_CLUSTERIP.c
index aa2ad2c78f33f7f1bc4ba15c337414d793d08a49..afc782337156f5ca6a27574d05f4102df052e018 100644 (file)
--- a/extensions/libipt_CLUSTERIP.c
+++ b/extensions/libipt_CLUSTERIP.c
@@ -55,7 +55,7 @@ static const struct option opts[] = {
 };
 
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libipt_ECN.c b/extensions/libipt_ECN.c
index 314531e38a6b9f776ba2a50f44b0f389562e5f32..6cba3619915b270ee69d5b120ff2862e45120efb 100644 (file)
--- a/extensions/libipt_ECN.c
+++ b/extensions/libipt_ECN.c
@@ -17,7 +17,7 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_ECN.h>
 
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index 4be14d5c079795e21b8fc468b081b1a5c7f34c97..c0d817772eb1fc410c37b15412d72faf4ef34f30 100644 (file)
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -44,7 +44,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
        struct ipt_log_info *loginfo = (struct ipt_log_info *)t->data;
 

diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c
index 07e93b3857c0cf055645f1a06c164cced22fa76d..36f2f2419c16b515af6fcf05baffbc1f4d9d142c 100644 (file)
--- a/extensions/libipt_MASQUERADE.c
+++ b/extensions/libipt_MASQUERADE.c
@@ -31,7 +31,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
        struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)t->data;
 

diff --git a/extensions/libipt_MIRROR.c b/extensions/libipt_MIRROR.c
index 2e3fb47a5d4bb155cf2c24085f2fb52ffd0aa028..255f4c2ff4d5da6bfa938e3ca32f25d355a69c86 100644 (file)
--- a/extensions/libipt_MIRROR.c
+++ b/extensions/libipt_MIRROR.c
@@ -18,7 +18,7 @@ IPTABLES_VERSION);
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c
index ef06e01c19ebc5a567002e90d1d9baec79b25847..06115ce8c0d73b45416f8c6597ba783456e5ab6d 100644 (file)
--- a/extensions/libipt_NETMAP.c
+++ b/extensions/libipt_NETMAP.c
@@ -56,7 +56,7 @@ netmask2bits(u_int32_t netmask)
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
        struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)t->data;
 

diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c
index 919fde578b8cae327adbeb4257597d43d695ba1d..3b6fe12734dd5b5adc16b52d69f791fa279fffa8 100644 (file)
--- a/extensions/libipt_REDIRECT.c
+++ b/extensions/libipt_REDIRECT.c
@@ -30,7 +30,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
        struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)t->data;
 

diff --git a/extensions/libipt_REJECT.c b/extensions/libipt_REJECT.c
index 8aba561ecf0003243a07331c0d2a94c0fbabdc4e..4af37136d6785ca26471311eb49570e204c62f3b 100644 (file)
--- a/extensions/libipt_REJECT.c
+++ b/extensions/libipt_REJECT.c
@@ -87,7 +87,7 @@ static const struct option opts[] = {
 
 /* Allocate and initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
        struct ipt_reject_info *reject = (struct ipt_reject_info *)t->data;
 

diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c
index fe4df9928f10e0681ca918528d153a159792390e..acfbdef11ab8d2920b5c331db450de0d364855ac 100644 (file)
--- a/extensions/libipt_SAME.c
+++ b/extensions/libipt_SAME.c
@@ -38,7 +38,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
        struct ipt_same_info *mr = (struct ipt_same_info *)t->data;
 

diff --git a/extensions/libipt_SET.c b/extensions/libipt_SET.c
index 0425d20d73e75a97266ce473d5313c8b2cf71239..0d96e45d7b8e4545d1ce057a1aa4194785e22383 100644 (file)
--- a/extensions/libipt_SET.c
+++ b/extensions/libipt_SET.c
@@ -41,7 +41,7 @@ static const struct option opts[] = {
 };
 
 /* Initialize the target. */
-static void init(struct xt_entry_target *target, unsigned int *nfcache)
+static void init(struct xt_entry_target *target)
 {
        struct ipt_set_info_target *info =
            (struct ipt_set_info_target *) target->data;

diff --git a/extensions/libipt_TOS.c b/extensions/libipt_TOS.c
index d6b8c36d475c00534c109432ec06b237d017c335..ba4c5652784ff7b3485da72516dbf83984f56532 100644 (file)
--- a/extensions/libipt_TOS.c
+++ b/extensions/libipt_TOS.c
@@ -54,7 +54,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libipt_TTL.c b/extensions/libipt_TTL.c
index fa3205a1449ad21ebfa287d17fe116d90b025d99..ed6b0fef06970e49b09270300a764a9440f1623f 100644 (file)
--- a/extensions/libipt_TTL.c
+++ b/extensions/libipt_TTL.c
@@ -16,7 +16,7 @@
 
 #define IPT_TTL_USED   1
 
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libipt_ULOG.c b/extensions/libipt_ULOG.c
index cc65bba973e37939a817e74d3cf43017a0a572f2..84816a0d98fc597cae0f28dff5e2c95bf7cd79f4 100644 (file)
--- a/extensions/libipt_ULOG.c
+++ b/extensions/libipt_ULOG.c
@@ -53,7 +53,7 @@ static const struct option opts[] = {
 };
 
 /* Initialize the target. */
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
        struct ipt_ulog_info *loginfo = (struct ipt_ulog_info *) t->data;
 

diff --git a/extensions/libipt_addrtype.c b/extensions/libipt_addrtype.c
index f377e90d0f16a8d511bb91f3b1d6abc97ef5a23a..c3fd3c8d67621976652b7c471a83548fa5e576c9 100644 (file)
--- a/extensions/libipt_addrtype.c
+++ b/extensions/libipt_addrtype.c
@@ -82,7 +82,7 @@ static void parse_types(const char *arg, u_int16_t *mask)
 #define IPT_ADDRTYPE_OPT_DSTTYPE       0x2
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
-               const void *entry, unsigned int *nfcache,
+               const void *entry,
                struct xt_entry_match **match)
 {
        struct ipt_addrtype_info *info =

diff --git a/extensions/libipt_ah.c b/extensions/libipt_ah.c
index feba38ac6409fe74cd672d72517512eed127cc2c..daf85bd5a2ea8e36cad351fd2d13b49b1955ccfb 100644 (file)
--- a/extensions/libipt_ah.c
+++ b/extensions/libipt_ah.c
@@ -68,7 +68,7 @@ parse_ah_spis(const char *spistring, u_int32_t *spis)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct ipt_ah *ahinfo = (struct ipt_ah *)m->data;
 
@@ -82,7 +82,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ipt_ah *ahinfo = (struct ipt_ah *)(*match)->data;

diff --git a/extensions/libipt_condition.c b/extensions/libipt_condition.c
index 30391d3582663532ca323716556184338d46ecff..8ce9b530dbac1a4e7684356953acaa3a61fd670b 100644 (file)
--- a/extensions/libipt_condition.c
+++ b/extensions/libipt_condition.c
@@ -26,7 +26,7 @@ static const struct option opts[] = {
 
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
-      const void *entry, unsigned int *nfcache,
+      const void *entry,
       struct xt_entry_match **match)
 {
        struct condition_info *info =

diff --git a/extensions/libipt_connrate.c b/extensions/libipt_connrate.c
index a12cd8aa2a2bb0e05736bf4860a48796cbf873f0..a469f050b8cc3384ad1b9dccbd539c9c2cd9417b 100644 (file)
--- a/extensions/libipt_connrate.c
+++ b/extensions/libipt_connrate.c
@@ -77,7 +77,6 @@ parse_range(const char *arg, struct ipt_connrate_info *si)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ipt_connrate_info *sinfo = (struct ipt_connrate_info *)(*match)->data;

diff --git a/extensions/libipt_conntrack.c b/extensions/libipt_conntrack.c
index d3999cf1836f02fd6e64cf832bfa936cf96de6ca..8f74257aa054d05468b512020dfef6804748cfb2 100644 (file)
--- a/extensions/libipt_conntrack.c
+++ b/extensions/libipt_conntrack.c
@@ -168,7 +168,6 @@ parse_expires(const char *s, struct ipt_conntrack_info *sinfo)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ipt_conntrack_info *sinfo = (struct ipt_conntrack_info *)(*match)->data;

diff --git a/extensions/libipt_ecn.c b/extensions/libipt_ecn.c
index 538966ff49af64ea381df5a5f804a8ffba102ee3..d443e536e46199d07b7e6d0c9d679b6a5ff957ee 100644 (file)
--- a/extensions/libipt_ecn.c
+++ b/extensions/libipt_ecn.c
@@ -36,7 +36,6 @@ static const struct option opts[] = {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        unsigned int result;

diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c
index f46c004abbe3c39bc194e0681d0cdb4faf7920ed..9ee1baaa3ff522f929c12b006916bdabefcdbcb7 100644 (file)
--- a/extensions/libipt_icmp.c
+++ b/extensions/libipt_icmp.c
@@ -169,7 +169,7 @@ parse_icmp(const char *icmptype, u_int8_t *type, u_int8_t code[])
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct ipt_icmp *icmpinfo = (struct ipt_icmp *)m->data;
 
@@ -182,7 +182,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ipt_icmp *icmpinfo = (struct ipt_icmp *)(*match)->data;

diff --git a/extensions/libipt_iprange.c b/extensions/libipt_iprange.c
index 30696aaff2bb92acac7c9737aab257a181557292..3c2a0143717191d12de9548dff3dd58fa4c27712 100644 (file)
--- a/extensions/libipt_iprange.c
+++ b/extensions/libipt_iprange.c
@@ -57,7 +57,6 @@ parse_iprange(char *arg, struct ipt_iprange *range)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ipt_iprange_info *info = (struct ipt_iprange_info *)(*match)->data;

diff --git a/extensions/libipt_owner.c b/extensions/libipt_owner.c
index 03f9b05384b64d928f0bd571e85d530f476a4d19..2c910413d788bda96d79dc44e05737e46495e6c7 100644 (file)
--- a/extensions/libipt_owner.c
+++ b/extensions/libipt_owner.c
@@ -54,7 +54,6 @@ static const struct option opts[] = {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ipt_owner_info *ownerinfo = (struct ipt_owner_info *)(*match)->data;

diff --git a/extensions/libipt_policy.c b/extensions/libipt_policy.c
index 97b7d02dc89069dc199d6853596d1be4e6721daa..6d6013dc6a740deb9a2e44e276b9d5673e91af24 100644 (file)
--- a/extensions/libipt_policy.c
+++ b/extensions/libipt_policy.c
@@ -93,9 +93,8 @@ static const struct option opts[] =
        { }
 };
 
-static void init(struct xt_entry_match *m, unsigned int *nfcache)
+static void init(struct xt_entry_match *m)
 {
-       *nfcache |= NFC_UNKNOWN;
 }
 
 static int parse_direction(char *s)
@@ -127,7 +126,6 @@ static int parse_mode(char *s)
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
                  const void *entry,
-                 unsigned int *nfcache,
                  struct xt_entry_match **match)
 {
        struct ipt_policy_info *info = (void *)(*match)->data;

diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c
index 0b11457b1da022ba71b42cd2c7e3fa111faac425..86f712590cb79b4da842e7bd66867c560a857e1f 100644 (file)
--- a/extensions/libipt_realm.c
+++ b/extensions/libipt_realm.c
@@ -157,7 +157,6 @@ const char* realm_id2name(int id)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ipt_realm_info *realminfo = (struct ipt_realm_info *)(*match)->data;

diff --git a/extensions/libipt_recent.c b/extensions/libipt_recent.c
index 94721b3fdabd3ad8eb923b39e603946180f85be9..cad01202b5d8f457392d0274bc7d7f7283589781 100644 (file)
--- a/extensions/libipt_recent.c
+++ b/extensions/libipt_recent.c
@@ -68,7 +68,7 @@ IPTABLES_VERSION);
   
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *match, unsigned int *nfcache)
+init(struct xt_entry_match *match)
 {
        struct ipt_recent_info *info = (struct ipt_recent_info *)(match)->data;
 
@@ -85,7 +85,6 @@ init(struct xt_entry_match *match, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ipt_recent_info *info = (struct ipt_recent_info *)(*match)->data;

diff --git a/extensions/libipt_set.c b/extensions/libipt_set.c
index d5cc1c3ef9eda0a046a852379b182d0b452025d0..e2804b0aab56644b25ca05e0d4bf0b4884568985 100644 (file)
--- a/extensions/libipt_set.c
+++ b/extensions/libipt_set.c
@@ -38,7 +38,7 @@ static const struct option opts[] = {
 };
 
 /* Initialize the match. */
-static void init(struct xt_entry_match *match, unsigned int *nfcache)
+static void init(struct xt_entry_match *match)
 {
        struct ipt_set_info_match *info = 
                (struct ipt_set_info_match *) match->data;
@@ -52,7 +52,7 @@ static void init(struct xt_entry_match *match, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache, struct xt_entry_match **match)
+      struct xt_entry_match **match)
 {
        struct ipt_set_info_match *myinfo = 
                (struct ipt_set_info_match *) (*match)->data;

diff --git a/extensions/libipt_tos.c b/extensions/libipt_tos.c
index 2f5f9159e86de4836ae5ec7a5c308122034b3ec1..66489a9f8ae6609d040081ea2523ac6d4c4519c5 100644 (file)
--- a/extensions/libipt_tos.c
+++ b/extensions/libipt_tos.c
@@ -77,7 +77,6 @@ parse_tos(const char *s, struct ipt_tos_info *info)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct ipt_tos_info *tosinfo = (struct ipt_tos_info *)(*match)->data;

diff --git a/extensions/libipt_ttl.c b/extensions/libipt_ttl.c
index f5602f5eacde86f534c7bb91cee3d2a377b4608a..4b241f510d8709f8a821d6633016aea4d74ae458 100644 (file)
--- a/extensions/libipt_ttl.c
+++ b/extensions/libipt_ttl.c
@@ -25,7 +25,7 @@ static void help(void)
 }
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
-               const void *entry, unsigned int *nfcache,
+               const void *entry,
                struct xt_entry_match **match)
 {
        struct ipt_ttl_info *info = (struct ipt_ttl_info *) (*match)->data;

diff --git a/extensions/libipt_unclean.c b/extensions/libipt_unclean.c
index 4ac4191908dbc56f79e5b19b7a3fe56a59e8f6ce..9f7712a3faab477bc7f787e6d5f9ebe4da5d3e57 100644 (file)
--- a/extensions/libipt_unclean.c
+++ b/extensions/libipt_unclean.c
@@ -18,7 +18,6 @@ help(void)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        return 0;

diff --git a/extensions/libxt_CLASSIFY.c b/extensions/libxt_CLASSIFY.c
index acebd926551ee8186886fca9c2b55c5ec76f30b7..6d637c7788a55f9da0f68a189aa83dffbfe3f734 100644 (file)
--- a/extensions/libxt_CLASSIFY.c
+++ b/extensions/libxt_CLASSIFY.c
@@ -28,7 +28,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libxt_CONNMARK.c b/extensions/libxt_CONNMARK.c
index 785f40b7a015b347dde0445d4ab650c05f12f06d..36803230da540c0461db441fa99ec5585e5a90de 100644 (file)
--- a/extensions/libxt_CONNMARK.c
+++ b/extensions/libxt_CONNMARK.c
@@ -58,7 +58,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libxt_DSCP.c b/extensions/libxt_DSCP.c
index b062c63822276d46bbc8bfa3b003ece4caf1a92c..b42d99dc42da18a15169edc38f54e41c96b0c1e8 100644 (file)
--- a/extensions/libxt_DSCP.c
+++ b/extensions/libxt_DSCP.c
@@ -22,7 +22,7 @@
 #include "libipt_dscp_helper.c"
 
 
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libxt_MARK.c b/extensions/libxt_MARK.c
index ff73767ca7d05d95dc69f49b285ffd124888ea83..3ab767d6f528aec9ba5f33d80e3b0cbb38a69d04 100644 (file)
--- a/extensions/libxt_MARK.c
+++ b/extensions/libxt_MARK.c
@@ -30,7 +30,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libxt_NFLOG.c b/extensions/libxt_NFLOG.c
index 9c5ea0994f1c3d572e8a748062a1f8333a5f9c52..b42f801183a4d37a76fbc0067ff08f1eca4e9c93 100644 (file)
--- a/extensions/libxt_NFLOG.c
+++ b/extensions/libxt_NFLOG.c
@@ -32,7 +32,7 @@ static void help(void)
               IPTABLES_VERSION);
 }
 
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
        struct xt_nflog_info *info = (struct xt_nflog_info *)t->data;
 

diff --git a/extensions/libxt_NFQUEUE.c b/extensions/libxt_NFQUEUE.c
index c5e73250068c2438abcd2225c485bb8ae39f83b4..10aa152e41d9ce9c1d99ef3ba5fa2dca6f3d75eb 100644 (file)
--- a/extensions/libxt_NFQUEUE.c
+++ b/extensions/libxt_NFQUEUE.c
@@ -14,7 +14,7 @@
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_NFQUEUE.h>
 
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libxt_NOTRACK.c b/extensions/libxt_NOTRACK.c
index 370ff21cba1cf6de1d67a665c1c3fd0eee6f7376..4973303ccc11dca53d2423a7ea3084d528acb541 100644 (file)
--- a/extensions/libxt_NOTRACK.c
+++ b/extensions/libxt_NOTRACK.c
@@ -18,7 +18,7 @@ IPTABLES_VERSION);
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libxt_SECMARK.c b/extensions/libxt_SECMARK.c
index 11a617b7184f4411fb1c0e8eb21a032a79aff573..d0c21a943f6d7240401b5348e951c56ee94ff7e7 100644 (file)
--- a/extensions/libxt_SECMARK.c
+++ b/extensions/libxt_SECMARK.c
@@ -29,7 +29,7 @@ static const struct option opts[] = {
 };
 
 /* Initialize the target. */
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 { }
 
 /*

diff --git a/extensions/libxt_TCPMSS.c b/extensions/libxt_TCPMSS.c
index 12b4cb61abfe9f36ce179707c6653399024d5174..a779b9320b2cdb92d5921e80cb7a46d362d0982b 100644 (file)
--- a/extensions/libxt_TCPMSS.c
+++ b/extensions/libxt_TCPMSS.c
@@ -44,7 +44,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libxt_TRACE.c b/extensions/libxt_TRACE.c
index 8319b32986aab64fe7404c5edbd6b93c02d93da8..e6761f0f6db64604f5a775f09728569ef21377ee 100644 (file)
--- a/extensions/libxt_TRACE.c
+++ b/extensions/libxt_TRACE.c
@@ -18,7 +18,7 @@ IPTABLES_VERSION);
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libxt_comment.c b/extensions/libxt_comment.c
index db45ab668fcc582ce8246467cf456b1627f4d880..1a82f00ba23a753d4f7bb0d198ef2fb7a4aa75b1 100644 (file)
--- a/extensions/libxt_comment.c
+++ b/extensions/libxt_comment.c
@@ -46,7 +46,6 @@ parse_comment(const char *s, struct xt_comment_info *info)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_comment_info *commentinfo = (struct xt_comment_info *)(*match)->data;

diff --git a/extensions/libxt_connbytes.c b/extensions/libxt_connbytes.c
index 48ef9a37180cd61c58434bd5444ad91efb17f5c8..1a3cf6e42ce51f7f1e41b766257162802dfd6465 100644 (file)
--- a/extensions/libxt_connbytes.c
+++ b/extensions/libxt_connbytes.c
@@ -50,7 +50,6 @@ parse_range(const char *arg, struct xt_connbytes_info *si)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_connbytes_info *sinfo = (struct xt_connbytes_info *)(*match)->data;

diff --git a/extensions/libxt_connlimit.c b/extensions/libxt_connlimit.c
index 28a9caa083638cb5e0e06d512916df76f049db31..58faa11cf527f532681b428b807f3cde66cec412 100644 (file)
--- a/extensions/libxt_connlimit.c
+++ b/extensions/libxt_connlimit.c
@@ -24,7 +24,7 @@ static const struct option connlimit_opts[] = {
        {NULL},
 };
 
-static void connlimit_init(struct ipt_entry_match *match, unsigned int *nfc)
+static void connlimit_init(struct ipt_entry_match *match)
 {
        struct xt_connlimit_info *info = (void *)match->data;
        info->v4_mask = 0xFFFFFFFFUL;
@@ -101,7 +101,6 @@ static int connlimit_parse(int c, char **argv, int invert, unsigned int *flags,
 
 static int connlimit_parse4(int c, char **argv, int invert,
                             unsigned int *flags, const void *entry,
-                            unsigned int *nfcache,
                             struct xt_entry_match **match)
 {
        return connlimit_parse(c, argv, invert, flags,
@@ -110,7 +109,6 @@ static int connlimit_parse4(int c, char **argv, int invert,
 
 static int connlimit_parse6(int c, char **argv, int invert,
                             unsigned int *flags, const void *entry,
-                            unsigned int *nfcache,
                             struct xt_entry_match **match)
 {
        return connlimit_parse(c, argv, invert, flags,

diff --git a/extensions/libxt_connmark.c b/extensions/libxt_connmark.c
index 2ed9a918433384ff055bc144c3a081b49c6ba54c..64f6c752d5a7289e2781fded75ae15b5112ff4d6 100644 (file)
--- a/extensions/libxt_connmark.c
+++ b/extensions/libxt_connmark.c
@@ -49,7 +49,6 @@ static const struct option opts[] = {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_connmark_info *markinfo = (struct xt_connmark_info *)(*match)->data;

diff --git a/extensions/libxt_dccp.c b/extensions/libxt_dccp.c
index 45c7e380107a70cafb940905489462e4af19a0a7..02b84f1febfc71a9c0c3df51405d95e1d58d5f8c 100644 (file)
--- a/extensions/libxt_dccp.c
+++ b/extensions/libxt_dccp.c
@@ -26,8 +26,7 @@
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m,
-     unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct xt_dccp_info *einfo = (struct xt_dccp_info *)m->data;
 
@@ -135,7 +134,6 @@ static u_int8_t parse_dccp_option(char *optstring)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_dccp_info *einfo

diff --git a/extensions/libxt_dscp.c b/extensions/libxt_dscp.c
index e2de94063cc63228993db795f70c3ef1fb876c07..7e0c3e4af864014d5ec8cd7dfd7a689f629ec314 100644 (file)
--- a/extensions/libxt_dscp.c
+++ b/extensions/libxt_dscp.c
@@ -76,7 +76,6 @@ parse_class(const char *s, struct xt_dscp_info *dinfo)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_dscp_info *dinfo

diff --git a/extensions/libxt_esp.c b/extensions/libxt_esp.c
index 6836dfc3486d6a63718b887daaa868e0f4b34b64..8811d6647441aad9da8f7f3d1a8921dc29ef4761 100644 (file)
--- a/extensions/libxt_esp.c
+++ b/extensions/libxt_esp.c
@@ -71,7 +71,7 @@ parse_esp_spis(const char *spistring, u_int32_t *spis)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct xt_esp *espinfo = (struct xt_esp *)m->data;
 
@@ -85,7 +85,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_esp *espinfo = (struct xt_esp *)(*match)->data;

diff --git a/extensions/libxt_hashlimit.c b/extensions/libxt_hashlimit.c
index b47c4324bf4f059eb74c723add070cff3ae5fb5e..e845a9cde6867d622dbb6d2ef2e708f47f832fa6 100644 (file)
--- a/extensions/libxt_hashlimit.c
+++ b/extensions/libxt_hashlimit.c
@@ -96,7 +96,7 @@ int parse_rate(const char *rate, u_int32_t *val)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct xt_hashlimit_info *r = (struct xt_hashlimit_info *)m->data;
 
@@ -152,7 +152,6 @@ static int parse_mode(struct xt_hashlimit_info *r, char *optarg)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_hashlimit_info *r = 

diff --git a/extensions/libxt_helper.c b/extensions/libxt_helper.c
index ca3cb21f7b6dad6fd8fc53173c7fd5726b72d8d5..bce0f286acde8f84b5356b38a591da315a4495b8 100644 (file)
--- a/extensions/libxt_helper.c
+++ b/extensions/libxt_helper.c
@@ -29,7 +29,6 @@ static const struct option opts[] = {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_helper_info *info = (struct xt_helper_info *)(*match)->data;

diff --git a/extensions/libxt_length.c b/extensions/libxt_length.c
index 46a4ad2cc98f57b408d2ad3b5b9d215d3f564275..79e6f41a64746a0d88542632b32e21c014dfe438 100644 (file)
--- a/extensions/libxt_length.c
+++ b/extensions/libxt_length.c
@@ -67,7 +67,6 @@ parse_lengths(const char *s, struct xt_length_info *info)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_length_info *info = (struct xt_length_info *)(*match)->data;

diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c
index f8c9e6410a759f15610246aace2adeb949fd4e6a..c1db72a52183458345680f8ab26834d5d22e0902 100644 (file)
--- a/extensions/libxt_limit.c
+++ b/extensions/libxt_limit.c
@@ -74,7 +74,7 @@ int parse_rate(const char *rate, u_int32_t *val)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct xt_rateinfo *r = (struct xt_rateinfo *)m->data;
 
@@ -94,7 +94,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_rateinfo *r = (struct xt_rateinfo *)(*match)->data;

diff --git a/extensions/libxt_mac.c b/extensions/libxt_mac.c
index b935ea554447ebbf0d7e1286d5f1ed5b3bf6bfda..a9874cdf3f41d1f248f88333440cdc2b85dc5834 100644 (file)
--- a/extensions/libxt_mac.c
+++ b/extensions/libxt_mac.c
@@ -57,7 +57,6 @@ parse_mac(const char *mac, struct xt_mac_info *info)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_mac_info *macinfo = (struct xt_mac_info *)(*match)->data;

diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c
index 23643dcd1f8b89fa5ec85a82539163dd7fef33a3..7edaf2e6c0f1716e6fbabd2117cbcd9bc2598798 100644 (file)
--- a/extensions/libxt_mark.c
+++ b/extensions/libxt_mark.c
@@ -30,7 +30,6 @@ static const struct option opts[] = {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_mark_info *markinfo = (struct xt_mark_info *)(*match)->data;

diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c
index f7e67daa3343b9b115af9c3e564554ad482ceac5..25aa628405d8e561e924426aa79dba7f58367eb3 100644 (file)
--- a/extensions/libxt_multiport.c
+++ b/extensions/libxt_multiport.c
@@ -135,7 +135,7 @@ parse_multi_ports_v1(const char *portstring,
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 }
 
@@ -213,7 +213,6 @@ __parse(int c, char **argv, int invert, unsigned int *flags,
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
         const void *e,
-        unsigned int *nfcache,
         struct xt_entry_match **match)
 {
        const struct ipt_entry *entry = e;
@@ -224,7 +223,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
 static int
 parse6(int c, char **argv, int invert, unsigned int *flags,
         const void *e,
-        unsigned int *nfcache,
         struct xt_entry_match **match)
 {
        const struct ip6t_entry *entry = (const struct ip6t_entry *)e;
@@ -280,7 +278,6 @@ __parse_v1(int c, char **argv, int invert, unsigned int *flags,
 static int
 parse_v1(int c, char **argv, int invert, unsigned int *flags,
         const void *e,
-        unsigned int *nfcache,
         struct xt_entry_match **match)
 {
        const struct ipt_entry *entry = e;
@@ -291,7 +288,6 @@ parse_v1(int c, char **argv, int invert, unsigned int *flags,
 static int
 parse6_v1(int c, char **argv, int invert, unsigned int *flags,
          const void *e,
-         unsigned int *nfcache,
          struct xt_entry_match **match)
 {
        const struct ip6t_entry *entry = (const struct ip6t_entry *)e;

diff --git a/extensions/libxt_physdev.c b/extensions/libxt_physdev.c
index 551747244874183fbedfe24449f8358ce7fde666..ed58501b81009debbdd2353888b67839934a5458 100644 (file)
--- a/extensions/libxt_physdev.c
+++ b/extensions/libxt_physdev.c
@@ -35,14 +35,13 @@ static const struct option opts[] = {
 };
 
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 }
 
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_physdev_info *info =

diff --git a/extensions/libxt_pkttype.c b/extensions/libxt_pkttype.c
index 3732034cbc79b22b79144402c26b52af78aa64f2..85e43eafd4e7d6dd51357f69408f06eba66a2314 100644 (file)
--- a/extensions/libxt_pkttype.c
+++ b/extensions/libxt_pkttype.c
@@ -87,7 +87,6 @@ static void parse_pkttype(const char *pkttype, struct xt_pkttype_info *info)
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_pkttype_info *info = (struct xt_pkttype_info *)(*match)->data;

diff --git a/extensions/libxt_quota.c b/extensions/libxt_quota.c
index ab4fb96fb34537b6c4409b6476077d78eef10e3c..1d3ef6341023d7013f8a962afe883d2cbfac2695 100644 (file)
--- a/extensions/libxt_quota.c
+++ b/extensions/libxt_quota.c
@@ -60,7 +60,7 @@ parse_quota(const char *s, u_int64_t * quota)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache, struct xt_entry_match **match)
+      struct xt_entry_match **match)
 {
         struct xt_quota_info *info = (struct xt_quota_info *) (*match)->data;
 

diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c
index 734e706a8c8135f9daf21910c3dfa2ea359fa7e6..39553bf5d4033e06fc52ec2b69372fc37771c8dc 100644 (file)
--- a/extensions/libxt_sctp.c
+++ b/extensions/libxt_sctp.c
@@ -42,8 +42,7 @@ print_chunk(u_int32_t chunknum, int numeric);
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m,
-     unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        int i;
        struct xt_sctp_info *einfo = (struct xt_sctp_info *)m->data;
@@ -263,7 +262,6 @@ parse_sctp_chunks(struct xt_sctp_info *einfo,
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_sctp_info *einfo

diff --git a/extensions/libxt_standard.c b/extensions/libxt_standard.c
index 9aafb6c0f154e0b5e4756493e4c4259d2eae87fb..ccdb599b331bae4b78d76d5fc055794c4f25fc19 100644 (file)
--- a/extensions/libxt_standard.c
+++ b/extensions/libxt_standard.c
@@ -18,7 +18,7 @@ help(void)
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

diff --git a/extensions/libxt_state.c b/extensions/libxt_state.c
index 3972a3bb120023d5ddfee75709d5ce56aa078b69..8d193faa3c263537e24086bf77cef17b9d2df15c 100644 (file)
--- a/extensions/libxt_state.c
+++ b/extensions/libxt_state.c
@@ -66,7 +66,6 @@ parse_states(const char *arg, struct xt_state_info *sinfo)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_state_info *sinfo = (struct xt_state_info *)(*match)->data;

diff --git a/extensions/libxt_statistic.c b/extensions/libxt_statistic.c
index 6f88c45f6029a27a53f95770d2a4a14626225924..d2210faf19f99d6cad7d0d6da4cded8fc18ebafe 100644 (file)
--- a/extensions/libxt_statistic.c
+++ b/extensions/libxt_statistic.c
@@ -36,7 +36,6 @@ static struct xt_statistic_info *info;
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        double prob;

diff --git a/extensions/libxt_string.c b/extensions/libxt_string.c
index ea0a2aa43cfa3b7002aa83d5fc4cc20e18921834..698504d0a2718f84c2b75fa82b1dd6de50d39726 100644 (file)
--- a/extensions/libxt_string.c
+++ b/extensions/libxt_string.c
@@ -54,7 +54,7 @@ static const struct option opts[] = {
 };
 
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct xt_string_info *i = (struct xt_string_info *) m->data;
 
@@ -171,7 +171,6 @@ parse_hex_string(const char *s, struct xt_string_info *info)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_string_info *stringinfo = (struct xt_string_info *)(*match)->data;

diff --git a/extensions/libxt_tcp.c b/extensions/libxt_tcp.c
index e5db6376f2fdd92ec98f90f41be0461ae601225f..2c1a21a3ebad6f118ba8bd08ded4257bd3f2c100 100644 (file)
--- a/extensions/libxt_tcp.c
+++ b/extensions/libxt_tcp.c
@@ -131,7 +131,7 @@ parse_tcp_option(const char *option, u_int8_t *result)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct xt_tcp *tcpinfo = (struct xt_tcp *)m->data;
 
@@ -148,7 +148,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_tcp *tcpinfo = (struct xt_tcp *)(*match)->data;

diff --git a/extensions/libxt_tcpmss.c b/extensions/libxt_tcpmss.c
index 817578a120aa096f52593eb0d556f2681b00995f..df56879b2366f452644a5fecc2d221ff0228bea5 100644 (file)
--- a/extensions/libxt_tcpmss.c
+++ b/extensions/libxt_tcpmss.c
@@ -61,7 +61,6 @@ parse_tcp_mssvalues(const char *mssvaluestring,
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_tcpmss_match_info *mssinfo =

diff --git a/extensions/libxt_udp.c b/extensions/libxt_udp.c
index 81ff3145b6354968858cdfe12ded243908f31d50..dcfa48d6a5cc7bc2109a45070cd257ef47717862 100644 (file)
--- a/extensions/libxt_udp.c
+++ b/extensions/libxt_udp.c
@@ -55,7 +55,7 @@ parse_udp_ports(const char *portstring, u_int16_t *ports)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
        struct xt_udp *udpinfo = (struct xt_udp *)m->data;
 
@@ -70,7 +70,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
        struct xt_udp *udpinfo = (struct xt_udp *)(*match)->data;

diff --git a/include/xtables.h b/include/xtables.h
index 3ac561f5f77694a77926a85d8c34ec483579992f..f23c303ff9f485c9389a05945f90a92404646522 100644 (file)
--- a/include/xtables.h
+++ b/include/xtables.h
@@ -80,14 +80,13 @@ struct xtables_match
        void (*help)(void);
 
        /* Initialize the match. */
-       void (*init)(struct xt_entry_match *m, unsigned int *nfcache);
+       void (*init)(struct xt_entry_match *m);
 
        /* Function which parses command options; returns true if it
            ate an option */
        /* entry is struct ipt_entry for example */
        int (*parse)(int c, char **argv, int invert, unsigned int *flags,
                     const void *entry,
-                    unsigned int *nfcache,
                     struct xt_entry_match **match);
 
        /* Final check; exit if not ok. */
@@ -137,7 +136,7 @@ struct xtables_target
        void (*help)(void);
 
        /* Initialize the target. */
-       void (*init)(struct xt_entry_target *t, unsigned int *nfcache);
+       void (*init)(struct xt_entry_target *t);
 
        /* Function which parses command options; returns true if it
            ate an option */

diff --git a/ip6tables.c b/ip6tables.c
index aeebed4cf4284dcea60d3cc5615542263ed94ef1..79c31bb9ede1913cdfb185b6de5c9ffb09ae5b35 100644 (file)
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -1627,7 +1627,7 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
                                target->t->u.target_size = size;
                                strcpy(target->t->u.user.name, jumpto);
                                if (target->init != NULL)
-                                       target->init(target->t, &fw.nfcache);
+                                       target->init(target->t);
                                opts = merge_options(opts, target->extra_opts, &target->option_offset);
                        }
                        break;
@@ -1673,7 +1673,7 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
                        strcpy(m->m->u.user.name, m->name);
                        set_revision(m->m->u.user.name, m->revision);
                        if (m->init != NULL)
-                               m->init(m->m, &fw.nfcache);
+                               m->init(m->m);
                        if (m != m->next)
                                /* Merge options for non-cloned matches */
                                opts = merge_options(opts, m->extra_opts, &m->option_offset);
@@ -1766,7 +1766,6 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
                                                     argv, invert,
                                                     &matchp->match->mflags,
                                                     &fw,
-                                                    &fw.nfcache,
                                                     &matchp->match->m))
                                                break;
                                }
@@ -1819,7 +1818,7 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
                                        set_revision(m->m->u.user.name,
                                                     m->revision);
                                        if (m->init != NULL)
-                                               m->init(m->m, &fw.nfcache);
+                                               m->init(m->m);
 
                                        opts = merge_options(opts,
                                            m->extra_opts, &m->option_offset);
@@ -1948,7 +1947,7 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
                        target->t->u.target_size = size;
                        strcpy(target->t->u.user.name, jumpto);
                        if (target->init != NULL)
-                               target->init(target->t, &fw.nfcache);
+                               target->init(target->t);
                }
 
                if (!target) {

diff --git a/iptables.c b/iptables.c
index f77a6f085c6bc934075773af3f09d07304c4542e..344d2d65d4159b0befbaf49fe782a363fde37416 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -1687,7 +1687,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
                                set_revision(target->t->u.user.name,
                                             target->revision);
                                if (target->init != NULL)
-                                       target->init(target->t, &fw.nfcache);
+                                       target->init(target->t);
                                opts = merge_options(opts, target->extra_opts, &target->option_offset);
                        }
                        break;
@@ -1739,7 +1739,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
                        strcpy(m->m->u.user.name, m->name);
                        set_revision(m->m->u.user.name, m->revision);
                        if (m->init != NULL)
-                               m->init(m->m, &fw.nfcache);
+                               m->init(m->m);
                        if (m != m->next)
                                /* Merge options for non-cloned matches */
                                opts = merge_options(opts, m->extra_opts, &m->option_offset);
@@ -1832,7 +1832,6 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
                                                     argv, invert,
                                                     &matchp->match->mflags,
                                                     &fw,
-                                                    &fw.nfcache,
                                                     &matchp->match->m))
                                                break;
                                }
@@ -1885,7 +1884,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
                                        set_revision(m->m->u.user.name,
                                                     m->revision);
                                        if (m->init != NULL)
-                                               m->init(m->m, &fw.nfcache);
+                                               m->init(m->m);
 
                                        opts = merge_options(opts,
                                            m->extra_opts, &m->option_offset);
@@ -2016,7 +2015,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
                                set_revision(target->t->u.user.name,
                                             target->revision);
                        if (target->init != NULL)
-                               target->init(target->t, &fw.nfcache);
+                               target->init(target->t);
                }
 
                if (!target) {

diff --git a/libiptc/libip4tc.c b/libiptc/libip4tc.c
index a0cdc2f8ecc7b81a25ac04efb443f3bbdc36dd3d..71af17f61b27d014828502a085246cfd3e0b0616 100644 (file)
--- a/libiptc/libip4tc.c
+++ b/libiptc/libip4tc.c
@@ -148,10 +148,7 @@ dump_entry(STRUCT_ENTRY *e, const TC_HANDLE_T handle)
        printf("Invflags: %02X\n", e->ip.invflags);
        printf("Counters: %llu packets, %llu bytes\n",
               (unsigned long long)e->counters.pcnt, (unsigned long long)e->counters.bcnt);
-       printf("Cache: %08X ", e->nfcache);
-       if (e->nfcache & NFC_ALTERED) printf("ALTERED ");
-       if (e->nfcache & NFC_UNKNOWN) printf("UNKNOWN ");
-       printf("\n");
+       printf("Cache: %08X\n", e->nfcache);
 
        IPT_MATCH_ITERATE(e, print_match);
 
@@ -204,8 +201,7 @@ is_same(const STRUCT_ENTRY *a, const STRUCT_ENTRY *b, unsigned char *matchmask)
                        return NULL;
        }
 
-       if (a->nfcache != b->nfcache
-           || a->target_offset != b->target_offset
+       if (a->target_offset != b->target_offset
            || a->next_offset != b->next_offset)
                return NULL;
 

diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c
index 5b3ae0bf6deb0178362087d483db23ce460a856e..effbd4481de9992c995dd341fcb6322c2a99e9e7 100644 (file)
--- a/libiptc/libip6tc.c
+++ b/libiptc/libip6tc.c
@@ -179,10 +179,7 @@ dump_entry(struct ip6t_entry *e, const ip6tc_handle_t handle)
        printf("Invflags: %02X\n", e->ipv6.invflags);
        printf("Counters: %llu packets, %llu bytes\n",
               (unsigned long long)e->counters.pcnt, (unsigned long long)e->counters.bcnt);
-       printf("Cache: %08X ", e->nfcache);
-       if (e->nfcache & NFC_ALTERED) printf("ALTERED ");
-       if (e->nfcache & NFC_UNKNOWN) printf("UNKNOWN ");
-       printf("\n");
+       printf("Cache: %08X\n", e->nfcache);
        
        IP6T_MATCH_ITERATE(e, print_match);
 
@@ -236,8 +233,7 @@ is_same(const STRUCT_ENTRY *a, const STRUCT_ENTRY *b,
                        return NULL;
        }
 
-       if (a->nfcache != b->nfcache
-           || a->target_offset != b->target_offset
+       if (a->target_offset != b->target_offset
            || a->next_offset != b->next_offset)
                return NULL;