[netfilter-cvslog] r3706 - in trunk/patch-o-matic-ng/nf_conntrack/linux-2.6: include/linux/netfilter net/netfilter

laforge at netfilter.org laforge at netfilter.org
Tue Feb 15 03:06:34 CET 2005


Author: laforge at netfilter.org
Date: 2005-02-15 03:06:33 +0100 (Tue, 15 Feb 2005)
New Revision: 3706

Modified:
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c
Log:
netfilter: Fix ip_ct_selective_cleanup(), and rename ip_ct_iterate_cleanup()


Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h	2005-02-15 02:03:34 UTC (rev 3705)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h	2005-02-15 02:06:33 UTC (rev 3706)
@@ -271,10 +271,9 @@
 
 extern int nf_ct_no_defrag;
 
-/* Delete all conntracks which match. */
+/* Iterate over all conntracks: if iter returns true, it's deleted. */
 extern void
-nf_ct_selective_cleanup(int (*kill)(const struct nf_conn *i, void *data),
-			void *data);
+nf_ct_iterate_cleanup(int (*iter)(struct nf_conn *i, void *data), void *data);
 
 /* It's confirmed if it is, or has been in the hash table. */
 static inline int is_confirmed(struct nf_conn *ct)

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c	2005-02-15 02:03:34 UTC (rev 3705)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c	2005-02-15 02:06:33 UTC (rev 3706)
@@ -51,7 +51,7 @@
 extern atomic_t nf_conntrack_count;
 DECLARE_PER_CPU(struct nf_conntrack_stat, nf_conntrack_stat);
 
-static int kill_l3proto(const struct nf_conn *i, void *data)
+static int kill_l3proto(struct nf_conn *i, void *data)
 {
 	struct nf_conntrack_l3proto *l3proto;
 	l3proto = (struct nf_conntrack_l3proto *)data;
@@ -59,7 +59,7 @@
 			l3proto->l3proto);
 }
 
-static int kill_proto(const struct nf_conn *i, void *data)
+static int kill_proto(struct nf_conn *i, void *data)
 {
 	struct nf_conntrack_protocol *proto;
 	proto = (struct nf_conntrack_protocol *)data;
@@ -694,7 +694,7 @@
 	synchronize_net();
 
 	/* Remove all contrack entries for this protocol */
-	nf_ct_selective_cleanup(kill_l3proto, proto);
+	nf_ct_iterate_cleanup(kill_l3proto, proto);
 }
 
 /* FIXME: Allow NULL functions and sub in pointers to generic for
@@ -765,7 +765,7 @@
 	synchronize_net();
 
 	/* Remove all contrack entries for this protocol */
-	nf_ct_selective_cleanup(kill_proto, proto);
+	nf_ct_iterate_cleanup(kill_proto, proto);
 }
 
 static int __init init(void)
@@ -797,7 +797,7 @@
 EXPORT_SYMBOL(need_nf_conntrack);
 EXPORT_SYMBOL(nf_conntrack_helper_register);
 EXPORT_SYMBOL(nf_conntrack_helper_unregister);
-EXPORT_SYMBOL(nf_ct_selective_cleanup);
+EXPORT_SYMBOL(nf_ct_iterate_cleanup);
 EXPORT_SYMBOL(nf_ct_refresh_acct);
 EXPORT_SYMBOL(nf_ct_protos);
 EXPORT_SYMBOL(nf_ct_find_proto);




More information about the netfilter-cvslog mailing list