[netfilter-cvslog] r6855 - trunk/libnetfilter_conntrack/src/conntrack

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2007-06-04 13:06:31 +0200 (Mon, 04 Jun 2007)
New Revision: 6855

Modified:
   trunk/libnetfilter_conntrack/src/conntrack/build.c
Log:
fix invalid argument error: status flags may not be present in update messages


Modified: trunk/libnetfilter_conntrack/src/conntrack/build.c
===================================================================
--- trunk/libnetfilter_conntrack/src/conntrack/build.c	2007-06-03 18:42:10 UTC (rev 6854)
+++ trunk/libnetfilter_conntrack/src/conntrack/build.c	2007-06-04 11:06:31 UTC (rev 6855)
@@ -252,8 +252,13 @@
 	__build_tuple(req, size, &ct->tuple[__DIR_ORIG], CTA_TUPLE_ORIG);
 	__build_tuple(req, size, &ct->tuple[__DIR_REPL], CTA_TUPLE_REPLY);
 
-	/* always build IPS_CONFIRMED */
-	__build_status(req, size, ct);
+	if (test_bit(ATTR_STATUS, ct->set))
+		__build_status(req, size, ct);
+	else {
+		/* build IPS_CONFIRMED if we're creating a new conntrack */
+		if (type == IPCTNL_MSG_CT_NEW && flags & NLM_F_CREATE)
+			__build_status(req, size, ct);
+	}
 
 	if (test_bit(ATTR_TIMEOUT, ct->set))
 		__build_timeout(req, size, ct);