* [PATCH 6/7] bump the expectation helper name
@ 2008-07-30 11:06 Pablo Neira Ayuso
0 siblings, 0 replies; only message in thread
From: Pablo Neira Ayuso @ 2008-07-30 11:06 UTC (permalink / raw)
To: Patrick McHardy, Netfilter Development Mailinglist
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
[PATCH] bump the expectation helper name
Include the expectation helper name at expectation dumping.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
--
"Los honestos son inadaptados sociales" -- Les Luthiers
[-- Attachment #2: 06.patch --]
[-- Type: text/x-diff, Size: 1156 bytes --]
[PATCH] bump the expectation helper name
Include the expectation helper name at expectation dumping.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Index: net-next-2.6.git/net/netfilter/nf_conntrack_netlink.c
===================================================================
--- net-next-2.6.git.orig/net/netfilter/nf_conntrack_netlink.c 2008-07-30 09:09:03.000000000 +0200
+++ net-next-2.6.git/net/netfilter/nf_conntrack_netlink.c 2008-07-30 09:34:47.000000000 +0200
@@ -1375,6 +1375,7 @@ ctnetlink_exp_dump_expect(struct sk_buff
const struct nf_conntrack_expect *exp)
{
struct nf_conn *master = exp->master;
+ struct nf_conn_help *help = nfct_help(master);
long timeout = (exp->timeout.expires - jiffies) / HZ;
if (timeout < 0)
@@ -1392,6 +1393,14 @@ ctnetlink_exp_dump_expect(struct sk_buff
NLA_PUT_BE32(skb, CTA_EXPECT_TIMEOUT, htonl(timeout));
NLA_PUT_BE32(skb, CTA_EXPECT_ID, htonl((unsigned long)exp));
+ if (help) {
+ struct nf_conntrack_helper *helper;
+
+ helper = rcu_dereference(help->helper);
+ if (helper)
+ NLA_PUT_STRING(skb, CTA_EXPECT_HELP_NAME, helper->name);
+ }
+
return 0;
nla_put_failure:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-07-30 11:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-30 11:06 [PATCH 6/7] bump the expectation helper name Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox