[PATCH 1/3] export conntrack status also on destroy event

[PATCH 1/3] export conntrack status also on destroy event

[Fabian Hugelshofer]

When a conntrack is destroyed, the connection status does not get 
exported to netlink. I don't see a reason for not doing so. This patch 
exports the status on all conntrack events.

--- linux-2.6.25.4.orig/net/netfilter/nf_conntrack_netlink.c	2008-05-20 21:05:05.000000000 +0100
+++ linux-2.6.25.4/net/netfilter/nf_conntrack_netlink.c	2008-05-20 22:21:56.000000000 +0100
@@ -472,14 +472,14 @@
 		goto nla_put_failure;
 	nla_nest_end(skb, nest_parms);
 
+	if (ctnetlink_dump_status(skb, ct) < 0)
+		goto nla_put_failure;
+
 	if (events & IPCT_DESTROY) {
 		if (ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 ||
 		    ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0)
 			goto nla_put_failure;
 	} else {
-		if (ctnetlink_dump_status(skb, ct) < 0)
-			goto nla_put_failure;
-
 		if (ctnetlink_dump_timeout(skb, ct) < 0)
 			goto nla_put_failure;
 


--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/3] export conntrack status also on destroy event

[Patrick McHardy]

Fabian Hugelshofer wrote:
> When a conntrack is destroyed, the connection status does not get 
> exported to netlink. I don't see a reason for not doing so. This patch 
> exports the status on all conntrack events.

Applied, thanks. I've added the missing Signed-off-by: line for you,
please object in case you're not OK with this.

Re: [PATCH 1/3] export conntrack status also on destroy event

[Fabian Hugelshofer]

(This is a repost as requested by Patrick. The patch is already applied
to net-next-2.6 but not yet to nf-next-2.6.)

netfilter: ctnetlink: include conntrack status in destroy event message

When a conntrack is destroyed, the connection status does not get 
exported to netlink. I don't see a reason for not doing so. This patch 
exports the status on all conntrack events.

Signed-off-by: Fabian Hugelshofer <hugelshofer2006@gmx.ch>

--- linux-2.6.25.4.orig/net/netfilter/nf_conntrack_netlink.c	2008-05-20 21:05:05.000000000 +0100
+++ linux-2.6.25.4/net/netfilter/nf_conntrack_netlink.c	2008-05-20 22:21:56.000000000 +0100
@@ -472,14 +472,14 @@
 		goto nla_put_failure;
 	nla_nest_end(skb, nest_parms);
 
+	if (ctnetlink_dump_status(skb, ct) < 0)
+		goto nla_put_failure;
+
 	if (events & IPCT_DESTROY) {
 		if (ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 ||
 		    ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0)
 			goto nla_put_failure;
 	} else {
-		if (ctnetlink_dump_status(skb, ct) < 0)
-			goto nla_put_failure;
-
 		if (ctnetlink_dump_timeout(skb, ct) < 0)
 			goto nla_put_failure;
 

Re: [PATCH 1/3] export conntrack status also on destroy event

[Patrick McHardy]

Fabian Hugelshofer wrote:
> (This is a repost as requested by Patrick. The patch is already applied
> to net-next-2.6 but not yet to nf-next-2.6.)

That means I just didn't push it out before submitting it upstream.
If its in net-next, everything is fine :) Sorry for the confusion.