netfilter: ctnetlink: dump expectation helper name
authorPatrick McHardy <kaber@trash.net>
Thu, 11 Feb 2010 11:22:28 +0000 (12:22 +0100)
committerPatrick McHardy <kaber@trash.net>
Thu, 11 Feb 2010 11:22:28 +0000 (12:22 +0100)
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/netfilter/nf_conntrack_netlink.c

index 5c103b8c7df09c948f82f7f9f57e833ee55f623b..db35edac307bcd03342151e6287970eb1f9990e6 100644 (file)
@@ -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;