From: Patrick McHardy Date: Thu, 11 Feb 2010 11:22:28 +0000 (+0100) Subject: netfilter: ctnetlink: dump expectation helper name X-Git-Tag: MMI-PSA29.97-13-9~24841^2~154^2~30 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d1e7a03f4fee4059ee3fa7ce0edb7c48c1a75fcf;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git netfilter: ctnetlink: dump expectation helper name Signed-off-by: Patrick McHardy --- diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 5c103b8c7df0..db35edac307b 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -1512,6 +1512,7 @@ ctnetlink_exp_dump_expect(struct sk_buff *skb, const struct nf_conntrack_expect *exp) { struct nf_conn *master = exp->master; + struct nf_conntrack_helper *helper; long timeout = (exp->timeout.expires - jiffies) / HZ; if (timeout < 0) @@ -1528,6 +1529,9 @@ ctnetlink_exp_dump_expect(struct sk_buff *skb, NLA_PUT_BE32(skb, CTA_EXPECT_TIMEOUT, htonl(timeout)); NLA_PUT_BE32(skb, CTA_EXPECT_ID, htonl((unsigned long)exp)); + helper = rcu_dereference(nfct_help(master)->helper); + if (helper) + NLA_PUT_STRING(skb, CTA_EXPECT_HELP_NAME, helper->name); return 0;