[netfilter-cvslog] r7015 - in trunk/iptables: . extensions include libiptc

kaber at trash.net kaber at trash.net
Sun Sep 2 15:09:08 CEST 2007


Author: kaber at trash.net
Date: 2007-09-02 15:09:07 +0200 (Sun, 02 Sep 2007)
New Revision: 7015

Modified:
   trunk/iptables/extensions/libip6t_HL.c
   trunk/iptables/extensions/libip6t_LOG.c
   trunk/iptables/extensions/libip6t_REJECT.c
   trunk/iptables/extensions/libip6t_ah.c
   trunk/iptables/extensions/libip6t_condition.c
   trunk/iptables/extensions/libip6t_dst.c
   trunk/iptables/extensions/libip6t_eui64.c
   trunk/iptables/extensions/libip6t_frag.c
   trunk/iptables/extensions/libip6t_hbh.c
   trunk/iptables/extensions/libip6t_hl.c
   trunk/iptables/extensions/libip6t_icmp6.c
   trunk/iptables/extensions/libip6t_ipv6header.c
   trunk/iptables/extensions/libip6t_mh.c
   trunk/iptables/extensions/libip6t_owner.c
   trunk/iptables/extensions/libip6t_policy.c
   trunk/iptables/extensions/libip6t_rt.c
   trunk/iptables/extensions/libip6t_state.c
   trunk/iptables/extensions/libipt_CLUSTERIP.c
   trunk/iptables/extensions/libipt_ECN.c
   trunk/iptables/extensions/libipt_LOG.c
   trunk/iptables/extensions/libipt_MASQUERADE.c
   trunk/iptables/extensions/libipt_MIRROR.c
   trunk/iptables/extensions/libipt_NETMAP.c
   trunk/iptables/extensions/libipt_REDIRECT.c
   trunk/iptables/extensions/libipt_REJECT.c
   trunk/iptables/extensions/libipt_SAME.c
   trunk/iptables/extensions/libipt_SET.c
   trunk/iptables/extensions/libipt_TOS.c
   trunk/iptables/extensions/libipt_TTL.c
   trunk/iptables/extensions/libipt_ULOG.c
   trunk/iptables/extensions/libipt_addrtype.c
   trunk/iptables/extensions/libipt_ah.c
   trunk/iptables/extensions/libipt_condition.c
   trunk/iptables/extensions/libipt_connrate.c
   trunk/iptables/extensions/libipt_conntrack.c
   trunk/iptables/extensions/libipt_ecn.c
   trunk/iptables/extensions/libipt_icmp.c
   trunk/iptables/extensions/libipt_iprange.c
   trunk/iptables/extensions/libipt_owner.c
   trunk/iptables/extensions/libipt_policy.c
   trunk/iptables/extensions/libipt_realm.c
   trunk/iptables/extensions/libipt_recent.c
   trunk/iptables/extensions/libipt_set.c
   trunk/iptables/extensions/libipt_tos.c
   trunk/iptables/extensions/libipt_ttl.c
   trunk/iptables/extensions/libipt_unclean.c
   trunk/iptables/extensions/libxt_CLASSIFY.c
   trunk/iptables/extensions/libxt_CONNMARK.c
   trunk/iptables/extensions/libxt_DSCP.c
   trunk/iptables/extensions/libxt_MARK.c
   trunk/iptables/extensions/libxt_NFLOG.c
   trunk/iptables/extensions/libxt_NFQUEUE.c
   trunk/iptables/extensions/libxt_NOTRACK.c
   trunk/iptables/extensions/libxt_SECMARK.c
   trunk/iptables/extensions/libxt_TCPMSS.c
   trunk/iptables/extensions/libxt_TRACE.c
   trunk/iptables/extensions/libxt_comment.c
   trunk/iptables/extensions/libxt_connbytes.c
   trunk/iptables/extensions/libxt_connlimit.c
   trunk/iptables/extensions/libxt_connmark.c
   trunk/iptables/extensions/libxt_dccp.c
   trunk/iptables/extensions/libxt_dscp.c
   trunk/iptables/extensions/libxt_esp.c
   trunk/iptables/extensions/libxt_hashlimit.c
   trunk/iptables/extensions/libxt_helper.c
   trunk/iptables/extensions/libxt_length.c
   trunk/iptables/extensions/libxt_limit.c
   trunk/iptables/extensions/libxt_mac.c
   trunk/iptables/extensions/libxt_mark.c
   trunk/iptables/extensions/libxt_multiport.c
   trunk/iptables/extensions/libxt_physdev.c
   trunk/iptables/extensions/libxt_pkttype.c
   trunk/iptables/extensions/libxt_quota.c
   trunk/iptables/extensions/libxt_sctp.c
   trunk/iptables/extensions/libxt_standard.c
   trunk/iptables/extensions/libxt_state.c
   trunk/iptables/extensions/libxt_statistic.c
   trunk/iptables/extensions/libxt_string.c
   trunk/iptables/extensions/libxt_tcp.c
   trunk/iptables/extensions/libxt_tcpmss.c
   trunk/iptables/extensions/libxt_udp.c
   trunk/iptables/include/xtables.h
   trunk/iptables/ip6tables.c
   trunk/iptables/iptables.c
   trunk/iptables/libiptc/libip4tc.c
   trunk/iptables/libiptc/libip6tc.c
Log:
[PATCH]: Remove last vestiges of NFC (Peter Riley <Peter.Riley at hotpop.com>)


Modified: trunk/iptables/extensions/libip6t_HL.c
===================================================================
--- trunk/iptables/extensions/libip6t_HL.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_HL.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -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)
 {
 }
 

Modified: trunk/iptables/extensions/libip6t_LOG.c
===================================================================
--- trunk/iptables/extensions/libip6t_LOG.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_LOG.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -44,7 +44,7 @@
 
 /* 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;
 

Modified: trunk/iptables/extensions/libip6t_REJECT.c
===================================================================
--- trunk/iptables/extensions/libip6t_REJECT.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_REJECT.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -72,7 +72,7 @@
 
 /* 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;
 

Modified: trunk/iptables/extensions/libip6t_ah.c
===================================================================
--- trunk/iptables/extensions/libip6t_ah.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_ah.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -72,7 +72,7 @@
 
 /* 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 @@
 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;

Modified: trunk/iptables/extensions/libip6t_condition.c
===================================================================
--- trunk/iptables/extensions/libip6t_condition.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_condition.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -26,7 +26,7 @@
 
 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 =

Modified: trunk/iptables/extensions/libip6t_dst.c
===================================================================
--- trunk/iptables/extensions/libip6t_dst.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_dst.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -118,7 +118,7 @@
 
 /* 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 @@
 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;

Modified: trunk/iptables/extensions/libip6t_eui64.c
===================================================================
--- trunk/iptables/extensions/libip6t_eui64.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_eui64.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -27,7 +27,6 @@
 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;

Modified: trunk/iptables/extensions/libip6t_frag.c
===================================================================
--- trunk/iptables/extensions/libip6t_frag.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_frag.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -78,7 +78,7 @@
 
 /* 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 @@
 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;

Modified: trunk/iptables/extensions/libip6t_hbh.c
===================================================================
--- trunk/iptables/extensions/libip6t_hbh.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_hbh.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -117,7 +117,7 @@
 
 /* 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 @@
 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;

Modified: trunk/iptables/extensions/libip6t_hl.c
===================================================================
--- trunk/iptables/extensions/libip6t_hl.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_hl.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -26,7 +26,7 @@
 }
 
 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;

Modified: trunk/iptables/extensions/libip6t_icmp6.c
===================================================================
--- trunk/iptables/extensions/libip6t_icmp6.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_icmp6.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -145,7 +145,7 @@
 
 /* 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 @@
 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;

Modified: trunk/iptables/extensions/libip6t_ipv6header.c
===================================================================
--- trunk/iptables/extensions/libip6t_ipv6header.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_ipv6header.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -155,7 +155,7 @@
 };
 
 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 @@
 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;

Modified: trunk/iptables/extensions/libip6t_mh.c
===================================================================
--- trunk/iptables/extensions/libip6t_mh.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_mh.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -67,7 +67,7 @@
 	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 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;

Modified: trunk/iptables/extensions/libip6t_owner.c
===================================================================
--- trunk/iptables/extensions/libip6t_owner.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_owner.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -52,7 +52,6 @@
 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;

Modified: trunk/iptables/extensions/libip6t_policy.c
===================================================================
--- trunk/iptables/extensions/libip6t_policy.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_policy.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -133,9 +133,8 @@
 
 /* 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(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;

Modified: trunk/iptables/extensions/libip6t_rt.c
===================================================================
--- trunk/iptables/extensions/libip6t_rt.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_rt.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -139,7 +139,7 @@
 
 /* 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 @@
 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;

Modified: trunk/iptables/extensions/libip6t_state.c
===================================================================
--- trunk/iptables/extensions/libip6t_state.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libip6t_state.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -66,7 +66,6 @@
 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;

Modified: trunk/iptables/extensions/libipt_CLUSTERIP.c
===================================================================
--- trunk/iptables/extensions/libipt_CLUSTERIP.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_CLUSTERIP.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -55,7 +55,7 @@
 };
 
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

Modified: trunk/iptables/extensions/libipt_ECN.c
===================================================================
--- trunk/iptables/extensions/libipt_ECN.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_ECN.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -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)
 {
 }
 

Modified: trunk/iptables/extensions/libipt_LOG.c
===================================================================
--- trunk/iptables/extensions/libipt_LOG.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_LOG.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -44,7 +44,7 @@
 
 /* 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;
 

Modified: trunk/iptables/extensions/libipt_MASQUERADE.c
===================================================================
--- trunk/iptables/extensions/libipt_MASQUERADE.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_MASQUERADE.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -31,7 +31,7 @@
 
 /* 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;
 

Modified: trunk/iptables/extensions/libipt_MIRROR.c
===================================================================
--- trunk/iptables/extensions/libipt_MIRROR.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_MIRROR.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -18,7 +18,7 @@
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

Modified: trunk/iptables/extensions/libipt_NETMAP.c
===================================================================
--- trunk/iptables/extensions/libipt_NETMAP.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_NETMAP.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -56,7 +56,7 @@
 
 /* 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;
 

Modified: trunk/iptables/extensions/libipt_REDIRECT.c
===================================================================
--- trunk/iptables/extensions/libipt_REDIRECT.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_REDIRECT.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -30,7 +30,7 @@
 
 /* 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;
 

Modified: trunk/iptables/extensions/libipt_REJECT.c
===================================================================
--- trunk/iptables/extensions/libipt_REJECT.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_REJECT.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -87,7 +87,7 @@
 
 /* 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;
 

Modified: trunk/iptables/extensions/libipt_SAME.c
===================================================================
--- trunk/iptables/extensions/libipt_SAME.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_SAME.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -38,7 +38,7 @@
 
 /* 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;
 

Modified: trunk/iptables/extensions/libipt_SET.c
===================================================================
--- trunk/iptables/extensions/libipt_SET.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_SET.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -41,7 +41,7 @@
 };
 
 /* 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;

Modified: trunk/iptables/extensions/libipt_TOS.c
===================================================================
--- trunk/iptables/extensions/libipt_TOS.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_TOS.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -54,7 +54,7 @@
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

Modified: trunk/iptables/extensions/libipt_TTL.c
===================================================================
--- trunk/iptables/extensions/libipt_TTL.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_TTL.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -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)
 {
 }
 

Modified: trunk/iptables/extensions/libipt_ULOG.c
===================================================================
--- trunk/iptables/extensions/libipt_ULOG.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_ULOG.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -53,7 +53,7 @@
 };
 
 /* 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;
 

Modified: trunk/iptables/extensions/libipt_addrtype.c
===================================================================
--- trunk/iptables/extensions/libipt_addrtype.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_addrtype.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -82,7 +82,7 @@
 #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 =

Modified: trunk/iptables/extensions/libipt_ah.c
===================================================================
--- trunk/iptables/extensions/libipt_ah.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_ah.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -68,7 +68,7 @@
 
 /* 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 @@
 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;

Modified: trunk/iptables/extensions/libipt_condition.c
===================================================================
--- trunk/iptables/extensions/libipt_condition.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_condition.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -26,7 +26,7 @@
 
 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 =

Modified: trunk/iptables/extensions/libipt_connrate.c
===================================================================
--- trunk/iptables/extensions/libipt_connrate.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_connrate.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -77,7 +77,6 @@
 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;

Modified: trunk/iptables/extensions/libipt_conntrack.c
===================================================================
--- trunk/iptables/extensions/libipt_conntrack.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_conntrack.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -168,7 +168,6 @@
 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;

Modified: trunk/iptables/extensions/libipt_ecn.c
===================================================================
--- trunk/iptables/extensions/libipt_ecn.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_ecn.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -36,7 +36,6 @@
 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;

Modified: trunk/iptables/extensions/libipt_icmp.c
===================================================================
--- trunk/iptables/extensions/libipt_icmp.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_icmp.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -169,7 +169,7 @@
 
 /* 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 @@
 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;

Modified: trunk/iptables/extensions/libipt_iprange.c
===================================================================
--- trunk/iptables/extensions/libipt_iprange.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_iprange.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -57,7 +57,6 @@
 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;

Modified: trunk/iptables/extensions/libipt_owner.c
===================================================================
--- trunk/iptables/extensions/libipt_owner.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_owner.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -54,7 +54,6 @@
 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;

Modified: trunk/iptables/extensions/libipt_policy.c
===================================================================
--- trunk/iptables/extensions/libipt_policy.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_policy.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -93,9 +93,8 @@
 	{ }
 };
 
-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(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;

Modified: trunk/iptables/extensions/libipt_realm.c
===================================================================
--- trunk/iptables/extensions/libipt_realm.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_realm.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -157,7 +157,6 @@
 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;

Modified: trunk/iptables/extensions/libipt_recent.c
===================================================================
--- trunk/iptables/extensions/libipt_recent.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_recent.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -68,7 +68,7 @@
   
 /* 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 @@
 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;

Modified: trunk/iptables/extensions/libipt_set.c
===================================================================
--- trunk/iptables/extensions/libipt_set.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_set.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -38,7 +38,7 @@
 };
 
 /* 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 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;

Modified: trunk/iptables/extensions/libipt_tos.c
===================================================================
--- trunk/iptables/extensions/libipt_tos.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_tos.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -77,7 +77,6 @@
 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;

Modified: trunk/iptables/extensions/libipt_ttl.c
===================================================================
--- trunk/iptables/extensions/libipt_ttl.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_ttl.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -25,7 +25,7 @@
 }
 
 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;

Modified: trunk/iptables/extensions/libipt_unclean.c
===================================================================
--- trunk/iptables/extensions/libipt_unclean.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libipt_unclean.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -18,7 +18,6 @@
 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;

Modified: trunk/iptables/extensions/libxt_CLASSIFY.c
===================================================================
--- trunk/iptables/extensions/libxt_CLASSIFY.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_CLASSIFY.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -28,7 +28,7 @@
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

Modified: trunk/iptables/extensions/libxt_CONNMARK.c
===================================================================
--- trunk/iptables/extensions/libxt_CONNMARK.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_CONNMARK.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -58,7 +58,7 @@
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

Modified: trunk/iptables/extensions/libxt_DSCP.c
===================================================================
--- trunk/iptables/extensions/libxt_DSCP.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_DSCP.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -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)
 {
 }
 

Modified: trunk/iptables/extensions/libxt_MARK.c
===================================================================
--- trunk/iptables/extensions/libxt_MARK.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_MARK.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -30,7 +30,7 @@
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

Modified: trunk/iptables/extensions/libxt_NFLOG.c
===================================================================
--- trunk/iptables/extensions/libxt_NFLOG.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_NFLOG.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -32,7 +32,7 @@
 	       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;
 

Modified: trunk/iptables/extensions/libxt_NFQUEUE.c
===================================================================
--- trunk/iptables/extensions/libxt_NFQUEUE.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_NFQUEUE.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -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)
 {
 }
 

Modified: trunk/iptables/extensions/libxt_NOTRACK.c
===================================================================
--- trunk/iptables/extensions/libxt_NOTRACK.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_NOTRACK.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -18,7 +18,7 @@
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

Modified: trunk/iptables/extensions/libxt_SECMARK.c
===================================================================
--- trunk/iptables/extensions/libxt_SECMARK.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_SECMARK.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -29,7 +29,7 @@
 };
 
 /* Initialize the target. */
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 { }
 
 /*

Modified: trunk/iptables/extensions/libxt_TCPMSS.c
===================================================================
--- trunk/iptables/extensions/libxt_TCPMSS.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_TCPMSS.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -44,7 +44,7 @@
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

Modified: trunk/iptables/extensions/libxt_TRACE.c
===================================================================
--- trunk/iptables/extensions/libxt_TRACE.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_TRACE.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -18,7 +18,7 @@
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

Modified: trunk/iptables/extensions/libxt_comment.c
===================================================================
--- trunk/iptables/extensions/libxt_comment.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_comment.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -46,7 +46,6 @@
 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;

Modified: trunk/iptables/extensions/libxt_connbytes.c
===================================================================
--- trunk/iptables/extensions/libxt_connbytes.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_connbytes.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -50,7 +50,6 @@
 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;

Modified: trunk/iptables/extensions/libxt_connlimit.c
===================================================================
--- trunk/iptables/extensions/libxt_connlimit.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_connlimit.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -24,7 +24,7 @@
 	{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_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_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,

Modified: trunk/iptables/extensions/libxt_connmark.c
===================================================================
--- trunk/iptables/extensions/libxt_connmark.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_connmark.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -49,7 +49,6 @@
 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;

Modified: trunk/iptables/extensions/libxt_dccp.c
===================================================================
--- trunk/iptables/extensions/libxt_dccp.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_dccp.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -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 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

Modified: trunk/iptables/extensions/libxt_dscp.c
===================================================================
--- trunk/iptables/extensions/libxt_dscp.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_dscp.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -76,7 +76,6 @@
 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

Modified: trunk/iptables/extensions/libxt_esp.c
===================================================================
--- trunk/iptables/extensions/libxt_esp.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_esp.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -71,7 +71,7 @@
 
 /* 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 @@
 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;

Modified: trunk/iptables/extensions/libxt_hashlimit.c
===================================================================
--- trunk/iptables/extensions/libxt_hashlimit.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_hashlimit.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -96,7 +96,7 @@
 
 /* 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(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 = 

Modified: trunk/iptables/extensions/libxt_helper.c
===================================================================
--- trunk/iptables/extensions/libxt_helper.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_helper.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -29,7 +29,6 @@
 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;

Modified: trunk/iptables/extensions/libxt_length.c
===================================================================
--- trunk/iptables/extensions/libxt_length.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_length.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -67,7 +67,6 @@
 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;

Modified: trunk/iptables/extensions/libxt_limit.c
===================================================================
--- trunk/iptables/extensions/libxt_limit.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_limit.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -74,7 +74,7 @@
 
 /* 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 @@
 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;

Modified: trunk/iptables/extensions/libxt_mac.c
===================================================================
--- trunk/iptables/extensions/libxt_mac.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_mac.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -57,7 +57,6 @@
 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;

Modified: trunk/iptables/extensions/libxt_mark.c
===================================================================
--- trunk/iptables/extensions/libxt_mark.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_mark.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -30,7 +30,6 @@
 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;

Modified: trunk/iptables/extensions/libxt_multiport.c
===================================================================
--- trunk/iptables/extensions/libxt_multiport.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_multiport.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -135,7 +135,7 @@
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 }
 
@@ -213,7 +213,6 @@
 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 @@
 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 @@
 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 @@
 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;

Modified: trunk/iptables/extensions/libxt_physdev.c
===================================================================
--- trunk/iptables/extensions/libxt_physdev.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_physdev.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -35,14 +35,13 @@
 };
 
 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 =

Modified: trunk/iptables/extensions/libxt_pkttype.c
===================================================================
--- trunk/iptables/extensions/libxt_pkttype.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_pkttype.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -87,7 +87,6 @@
 
 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;

Modified: trunk/iptables/extensions/libxt_quota.c
===================================================================
--- trunk/iptables/extensions/libxt_quota.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_quota.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -60,7 +60,7 @@
 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;
 

Modified: trunk/iptables/extensions/libxt_sctp.c
===================================================================
--- trunk/iptables/extensions/libxt_sctp.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_sctp.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -42,8 +42,7 @@
 
 /* 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 @@
 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

Modified: trunk/iptables/extensions/libxt_standard.c
===================================================================
--- trunk/iptables/extensions/libxt_standard.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_standard.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -18,7 +18,7 @@
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 

Modified: trunk/iptables/extensions/libxt_state.c
===================================================================
--- trunk/iptables/extensions/libxt_state.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_state.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -66,7 +66,6 @@
 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;

Modified: trunk/iptables/extensions/libxt_statistic.c
===================================================================
--- trunk/iptables/extensions/libxt_statistic.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_statistic.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -36,7 +36,6 @@
 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;

Modified: trunk/iptables/extensions/libxt_string.c
===================================================================
--- trunk/iptables/extensions/libxt_string.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_string.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -54,7 +54,7 @@
 };
 
 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 @@
 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;

Modified: trunk/iptables/extensions/libxt_tcp.c
===================================================================
--- trunk/iptables/extensions/libxt_tcp.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_tcp.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -131,7 +131,7 @@
 
 /* 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 @@
 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;

Modified: trunk/iptables/extensions/libxt_tcpmss.c
===================================================================
--- trunk/iptables/extensions/libxt_tcpmss.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_tcpmss.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -61,7 +61,6 @@
 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 =

Modified: trunk/iptables/extensions/libxt_udp.c
===================================================================
--- trunk/iptables/extensions/libxt_udp.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/extensions/libxt_udp.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -55,7 +55,7 @@
 
 /* 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 @@
 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;

Modified: trunk/iptables/include/xtables.h
===================================================================
--- trunk/iptables/include/xtables.h	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/include/xtables.h	2007-09-02 13:09:07 UTC (rev 7015)
@@ -80,14 +80,13 @@
 	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 @@
 	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 */

Modified: trunk/iptables/ip6tables.c
===================================================================
--- trunk/iptables/ip6tables.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/ip6tables.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -1627,7 +1627,7 @@
 				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 @@
 			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 @@
 						     argv, invert,
 						     &matchp->match->mflags,
 						     &fw,
-						     &fw.nfcache,
 						     &matchp->match->m))
 						break;
 				}
@@ -1819,7 +1818,7 @@
 					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 @@
 			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) {

Modified: trunk/iptables/iptables.c
===================================================================
--- trunk/iptables/iptables.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/iptables.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -1687,7 +1687,7 @@
 				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 @@
 			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 @@
 						     argv, invert,
 						     &matchp->match->mflags,
 						     &fw,
-						     &fw.nfcache,
 						     &matchp->match->m))
 						break;
 				}
@@ -1885,7 +1884,7 @@
 					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 @@
 				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) {

Modified: trunk/iptables/libiptc/libip4tc.c
===================================================================
--- trunk/iptables/libiptc/libip4tc.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/libiptc/libip4tc.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -148,10 +148,7 @@
 	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 @@
 			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;
 

Modified: trunk/iptables/libiptc/libip6tc.c
===================================================================
--- trunk/iptables/libiptc/libip6tc.c	2007-09-02 10:02:28 UTC (rev 7014)
+++ trunk/iptables/libiptc/libip6tc.c	2007-09-02 13:09:07 UTC (rev 7015)
@@ -179,10 +179,7 @@
 	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 @@
 			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;
 




More information about the netfilter-cvslog mailing list