: ctnetlink: dump conntrack ID in event messages

Hi Dave,

these two patches add missing modules aliases to xt_iprange, fixing autoloading with old (as in: not from SVN) iptables versions and change ctnetlink to include the conntrack ID in event messages, which we wanted to do some time ago already, apparently I lost the patch. I'll also push the xt_iprange patch to -stable.

Please apply, thanks.

 net/netfilter/nf_conntrack_netlink.c |    3 +++
 net/netfilter/xt_iprange.c           |    2 ++
 2 files changed, 5 insertions(+), 0 deletions(-)

Eric Leblond (1):
[NETFILTER]: ctnetlink: dump conntrack ID in event messages

Phil Oester (1):
[NETFILTER]: xt_iprange: module aliases for xt_iprange

[NETFILTER]: ctnetlink: dump conntrack ID in event messages

Conntrack ID is not put (anymore ?) in event messages. This causes current ulogd2 code to fail because it uses the ID to build a hash in userspace. This hash is used to be able to output the starting time of a connection.

Conntrack ID can be used in userspace application to maintain an easy match between kernel connections list and userspace one. It may worth to add it if there is no performance related issue.

[ Patrick: it was never included in events, but really should be ]

---
commit fee65a663d85aa9af3b295064e974ccb692e2c9c
tree 270fe662a648b07d5a4e26c2bc78a28356af5424
parent c4492586a618d18e8a5343a04bad0ec606064846
author Eric Leblond <[email protected]> Tue, 13 May 2008 13:21:47 +0200 committer Patrick McHardy <[email protected]> Tue, 13 May 2008 13:21:47 +0200

 net/netfilter/nf_conntrack_netlink.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

index 16774ec..0edefcf 100644
@@ -472,6 +472,9 @@ static int ctnetlink_conntrack_event(struct notifier_block *this,
 		goto nla_put_failure;
 	nla_nest_end(skb, nest_parms);
 
+	if (ctnetlink_dump_id(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)

From: Patrick McHardy <[email protected]>
Date: Tue, 13 May 2008 13:33:54 +0200

Applied.