[netfilter-cvslog] r6836 - trunk/conntrack-tools/src

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2007-05-21 17:18:58 +0200 (Mon, 21 May 2007)
New Revision: 6836

Modified:
   trunk/conntrack-tools/src/netlink.c
   trunk/conntrack-tools/src/stats-mode.c
   trunk/conntrack-tools/src/sync-mode.c
Log:
add missing ignore_conntrack in the overrun handler


Modified: trunk/conntrack-tools/src/netlink.c
===================================================================
--- trunk/conntrack-tools/src/netlink.c	2007-05-20 21:13:06 UTC (rev 6835)
+++ trunk/conntrack-tools/src/netlink.c	2007-05-21 15:18:58 UTC (rev 6836)
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include "network.h"
 
-static int ignore_conntrack(struct nf_conntrack *ct)
+int ignore_conntrack(struct nf_conntrack *ct)
 {
 	/* ignore a certain protocol */
 	if (CONFIG(ignore_protocol)[nfct_get_attr_u8(ct, ATTR_ORIG_L4PROTO)])

Modified: trunk/conntrack-tools/src/stats-mode.c
===================================================================
--- trunk/conntrack-tools/src/stats-mode.c	2007-05-20 21:13:06 UTC (rev 6835)
+++ trunk/conntrack-tools/src/stats-mode.c	2007-05-21 15:18:58 UTC (rev 6836)
@@ -96,6 +96,9 @@
 		      struct nf_conntrack *ct,
 		      void *data)
 {
+	if (ignore_conntrack(ct))
+		return NFCT_CB_CONTINUE;
+
 	/* This is required by kernels < 2.6.20 */
 	nfct_attr_unset(ct, ATTR_TIMEOUT);
 	nfct_attr_unset(ct, ATTR_ORIG_COUNTER_BYTES);

Modified: trunk/conntrack-tools/src/sync-mode.c
===================================================================
--- trunk/conntrack-tools/src/sync-mode.c	2007-05-20 21:13:06 UTC (rev 6835)
+++ trunk/conntrack-tools/src/sync-mode.c	2007-05-21 15:18:58 UTC (rev 6836)
@@ -299,6 +299,9 @@
 {
 	struct us_conntrack *u;
 
+	if (ignore_conntrack(ct))
+		return NFCT_CB_CONTINUE;
+
 	/* This is required by kernels < 2.6.20 */
 	nfct_attr_unset(ct, ATTR_TIMEOUT);
 	nfct_attr_unset(ct, ATTR_ORIG_COUNTER_BYTES);