[PATCH 8/8] dump ID and mark in conntrack events

[PATCH 8/8] dump ID and mark in conntrack events

[Pablo Neira Ayuso]

[-- Attachment #1: Type: text/plain, Size: 146 bytes --]


-- 
The dawn of the fourth age of Linux firewalling is coming; a time of
great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris

[-- Attachment #2: 17.patch --]
[-- Type: text/plain, Size: 976 bytes --]

Dump the ID and the mark in events. This info is useful for the userspace 
clients.

Signed-off-by: Christian Hentschel <chentschel@people.netfilter.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Index: netfilter-2.6.14.git/net/ipv4/netfilter/ip_conntrack_netlink.c
===================================================================
--- netfilter-2.6.14.git.orig/net/ipv4/netfilter/ip_conntrack_netlink.c	2005-12-04 04:12:23.000000000 +0100
+++ netfilter-2.6.14.git/net/ipv4/netfilter/ip_conntrack_netlink.c	2005-12-04 04:22:16.000000000 +0100
@@ -373,7 +373,9 @@ static int ctnetlink_conntrack_event(str
 		goto nfattr_failure;
 
 	if (ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 ||
-	    ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0)
+	    ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0 ||
+	    ctnetlink_dump_mark(skb, ct) < 0 ||
+	    ctnetlink_dump_id(skb, ct) < 0)
 		goto nfattr_failure;
 
 	nlh->nlmsg_len = skb->tail - b;

Re: [PATCH 8/8] dump ID and mark in conntrack events

[Patrick McHardy]

Pablo Neira Ayuso wrote:
> 
> ------------------------------------------------------------------------
> 
> Dump the ID and the mark in events. This info is useful for the userspace 
> clients.

I agree on dumping the mark, but do we really want to dump the ID?
That prevents us from getting rid of it even if figgure out a nicer
way to do the dumping.