summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Riley <Peter.Riley@hotpop.com>2007-09-02 13:09:07 +0000
committerPatrick McHardy <kaber@trash.net>2007-09-02 13:09:07 +0000
commitea146a982e26c42f9954f140276f8deeb2edbe98 (patch)
treee37d5492b526d07b10205f00fcc7232fa0148361
parentdcfd0a487fc622c76feedeeae2c2bd985cd7e19f (diff)
Remove last vestiges of NFC (Peter Riley <Peter.Riley@hotpop.com>)
-rw-r--r--extensions/libip6t_HL.c2
-rw-r--r--extensions/libip6t_LOG.c2
-rw-r--r--extensions/libip6t_REJECT.c2
-rw-r--r--extensions/libip6t_ah.c3
-rw-r--r--extensions/libip6t_condition.c2
-rw-r--r--extensions/libip6t_dst.c3
-rw-r--r--extensions/libip6t_eui64.c1
-rw-r--r--extensions/libip6t_frag.c3
-rw-r--r--extensions/libip6t_hbh.c3
-rw-r--r--extensions/libip6t_hl.c2
-rw-r--r--extensions/libip6t_icmp6.c3
-rw-r--r--extensions/libip6t_ipv6header.c3
-rw-r--r--extensions/libip6t_mh.c3
-rw-r--r--extensions/libip6t_owner.c1
-rw-r--r--extensions/libip6t_policy.c4
-rw-r--r--extensions/libip6t_rt.c3
-rw-r--r--extensions/libip6t_state.c1
-rw-r--r--extensions/libipt_CLUSTERIP.c2
-rw-r--r--extensions/libipt_ECN.c2
-rw-r--r--extensions/libipt_LOG.c2
-rw-r--r--extensions/libipt_MASQUERADE.c2
-rw-r--r--extensions/libipt_MIRROR.c2
-rw-r--r--extensions/libipt_NETMAP.c2
-rw-r--r--extensions/libipt_REDIRECT.c2
-rw-r--r--extensions/libipt_REJECT.c2
-rw-r--r--extensions/libipt_SAME.c2
-rw-r--r--extensions/libipt_SET.c2
-rw-r--r--extensions/libipt_TOS.c2
-rw-r--r--extensions/libipt_TTL.c2
-rw-r--r--extensions/libipt_ULOG.c2
-rw-r--r--extensions/libipt_addrtype.c2
-rw-r--r--extensions/libipt_ah.c3
-rw-r--r--extensions/libipt_condition.c2
-rw-r--r--extensions/libipt_connrate.c1
-rw-r--r--extensions/libipt_conntrack.c1
-rw-r--r--extensions/libipt_ecn.c1
-rw-r--r--extensions/libipt_icmp.c3
-rw-r--r--extensions/libipt_iprange.c1
-rw-r--r--extensions/libipt_owner.c1
-rw-r--r--extensions/libipt_policy.c4
-rw-r--r--extensions/libipt_realm.c1
-rw-r--r--extensions/libipt_recent.c3
-rw-r--r--extensions/libipt_set.c4
-rw-r--r--extensions/libipt_tos.c1
-rw-r--r--extensions/libipt_ttl.c2
-rw-r--r--extensions/libipt_unclean.c1
-rw-r--r--extensions/libxt_CLASSIFY.c2
-rw-r--r--extensions/libxt_CONNMARK.c2
-rw-r--r--extensions/libxt_DSCP.c2
-rw-r--r--extensions/libxt_MARK.c2
-rw-r--r--extensions/libxt_NFLOG.c2
-rw-r--r--extensions/libxt_NFQUEUE.c2
-rw-r--r--extensions/libxt_NOTRACK.c2
-rw-r--r--extensions/libxt_SECMARK.c2
-rw-r--r--extensions/libxt_TCPMSS.c2
-rw-r--r--extensions/libxt_TRACE.c2
-rw-r--r--extensions/libxt_comment.c1
-rw-r--r--extensions/libxt_connbytes.c1
-rw-r--r--extensions/libxt_connlimit.c4
-rw-r--r--extensions/libxt_connmark.c1
-rw-r--r--extensions/libxt_dccp.c4
-rw-r--r--extensions/libxt_dscp.c1
-rw-r--r--extensions/libxt_esp.c3
-rw-r--r--extensions/libxt_hashlimit.c3
-rw-r--r--extensions/libxt_helper.c1
-rw-r--r--extensions/libxt_length.c1
-rw-r--r--extensions/libxt_limit.c3
-rw-r--r--extensions/libxt_mac.c1
-rw-r--r--extensions/libxt_mark.c1
-rw-r--r--extensions/libxt_multiport.c6
-rw-r--r--extensions/libxt_physdev.c3
-rw-r--r--extensions/libxt_pkttype.c1
-rw-r--r--extensions/libxt_quota.c2
-rw-r--r--extensions/libxt_sctp.c4
-rw-r--r--extensions/libxt_standard.c2
-rw-r--r--extensions/libxt_state.c1
-rw-r--r--extensions/libxt_statistic.c1
-rw-r--r--extensions/libxt_string.c3
-rw-r--r--extensions/libxt_tcp.c3
-rw-r--r--extensions/libxt_tcpmss.c1
-rw-r--r--extensions/libxt_udp.c3
-rw-r--r--include/xtables.h5
-rw-r--r--ip6tables.c9
-rw-r--r--iptables.c9
-rw-r--r--libiptc/libip4tc.c8
-rw-r--r--libiptc/libip6tc.c8
86 files changed, 73 insertions, 139 deletions
diff --git a/extensions/libip6t_HL.c b/extensions/libip6t_HL.c
index d215eaa5..1330c4e6 100644
--- 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 a11b8c01..7106d16c 100644
--- 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 c67de0eb..60a63906 100644
--- 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 d3048a26..e96ba201 100644
--- 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 40d05225..d2999025 100644
--- 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 cb49c1fb..2207c3f4 100644
--- 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 e95944b0..a38af34e 100644
--- 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 1e184b73..014351ee 100644
--- 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 c139c233..533d5106 100644
--- 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 197ef853..20aff602 100644
--- 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 46c9d38d..5c06c04b 100644
--- 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 4dab33fc..3d21f450 100644
--- 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 d2f9cec9..90d12046 100644
--- 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 a5ec8da5..1f1c9055 100644
--- 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 4612e141..d6227242 100644
--- 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 3c3911e3..a21fd688 100644
--- 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 d7fc83c7..9c43334b 100644
--- 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 aa2ad2c7..afc78233 100644
--- 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 314531e3..6cba3619 100644
--- 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 4be14d5c..c0d81777 100644
--- 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 07e93b38..36f2f241 100644
--- 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 2e3fb47a..255f4c2f 100644
--- 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 ef06e01c..06115ce8 100644
--- 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 919fde57..3b6fe127 100644
--- 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 8aba561e..4af37136 100644
--- 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 fe4df992..acfbdef1 100644
--- 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 0425d20d..0d96e45d 100644
--- 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 d6b8c36d..ba4c5652 100644
--- 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 fa3205a1..ed6b0fef 100644
--- 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 cc65bba9..84816a0d 100644
--- 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 f377e90d..c3fd3c8d 100644
--- 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 feba38ac..daf85bd5 100644
--- 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 30391d35..8ce9b530 100644
--- 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 a12cd8aa..a469f050 100644
--- 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 d3999cf1..8f74257a 100644
--- 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 538966ff..d443e536 100644
--- 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 f46c004a..9ee1baaa 100644
--- 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 30696aaf..3c2a0143 100644
--- 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 03f9b053..2c910413 100644
--- 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 97b7d02d..6d6013dc 100644
--- 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 0b11457b..86f71259 100644
--- 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 94721b3f..cad01202 100644
--- 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 d5cc1c3e..e2804b0a 100644
--- 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 2f5f9159..66489a9f 100644
--- 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 f5602f5e..4b241f51 100644
--- 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 4ac41919..9f7712a3 100644
--- 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 acebd926..6d637c77 100644
--- 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 785f40b7..36803230 100644
--- 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 b062c638..b42d99dc 100644
--- 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 ff73767c..3ab767d6 100644
--- 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 9c5ea099..b42f8011 100644
--- 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 c5e73250..10aa152e 100644
--- 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 370ff21c..4973303c 100644
--- 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 11a617b7..d0c21a94 100644
--- 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 12b4cb61..a779b932 100644
--- 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 8319b329..e6761f0f 100644
--- 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 db45ab66..1a82f00b 100644
--- 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 48ef9a37..1a3cf6e4 100644
--- 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 28a9caa0..58faa11c 100644
--- 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 2ed9a918..64f6c752 100644
--- 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 45c7e380..02b84f1f 100644
--- 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 e2de9406..7e0c3e4a 100644
--- 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 6836dfc3..8811d664 100644
--- 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 b47c4324..e845a9cd 100644
--- 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 ca3cb21f..bce0f286 100644
--- 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 46a4ad2c..79e6f41a 100644
--- 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 f8c9e641..c1db72a5 100644
--- 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 b935ea55..a9874cdf 100644
--- 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 23643dcd..7edaf2e6 100644
--- 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 f7e67daa..25aa6284 100644
--- 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 55174724..ed58501b 100644
--- 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 3732034c..85e43eaf 100644
--- 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 ab4fb96f..1d3ef634 100644
--- 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 734e706a..39553bf5 100644
--- 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 9aafb6c0..ccdb599b 100644
--- 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 3972a3bb..8d193faa 100644
--- 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 6f88c45f..d2210faf 100644
--- 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 ea0a2aa4..698504d0 100644
--- 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 e5db6376..2c1a21a3 100644
--- 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 817578a1..df56879b 100644
--- 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 81ff3145..dcfa48d6 100644
--- 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 3ac561f5..f23c303f 100644
--- 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 aeebed4c..79c31bb9 100644
--- 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 f77a6f08..344d2d65 100644
--- 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 a0cdc2f8..71af17f6 100644
--- 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 5b3ae0bf..effbd448 100644
--- 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;