aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-02-11 06:22:28 -0500
committerPatrick McHardy <kaber@trash.net>2010-02-11 06:22:28 -0500
commitd1e7a03f4fee4059ee3fa7ce0edb7c48c1a75fcf (patch)
treed3ce367cc791bde357bfac0d49679d4700cee4ac /net/netfilter
parenta8c28d05150f758625c5da38199b247887735e65 (diff)
netfilter: ctnetlink: dump expectation helper name
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 5c103b8c7df..db35edac307 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,
1512 const struct nf_conntrack_expect *exp) 1512 const struct nf_conntrack_expect *exp)
1513{ 1513{
1514 struct nf_conn *master = exp->master; 1514 struct nf_conn *master = exp->master;
1515 struct nf_conntrack_helper *helper;
1515 long timeout = (exp->timeout.expires - jiffies) / HZ; 1516 long timeout = (exp->timeout.expires - jiffies) / HZ;
1516 1517
1517 if (timeout < 0) 1518 if (timeout < 0)
@@ -1528,6 +1529,9 @@ ctnetlink_exp_dump_expect(struct sk_buff *skb,
1528 1529
1529 NLA_PUT_BE32(skb, CTA_EXPECT_TIMEOUT, htonl(timeout)); 1530 NLA_PUT_BE32(skb, CTA_EXPECT_TIMEOUT, htonl(timeout));
1530 NLA_PUT_BE32(skb, CTA_EXPECT_ID, htonl((unsigned long)exp)); 1531 NLA_PUT_BE32(skb, CTA_EXPECT_ID, htonl((unsigned long)exp));
1532 helper = rcu_dereference(nfct_help(master)->helper);
1533 if (helper)
1534 NLA_PUT_STRING(skb, CTA_EXPECT_HELP_NAME, helper->name);
1531 1535
1532 return 0; 1536 return 0;
1533 1537