diff options
| author |   Patrick McHardy <kaber@trash.net> | 2010-02-11 12:22:28 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-02-11 12:22:28 +0100 |
| commit | d1e7a03f4fee4059ee3fa7ce0edb7c48c1a75fcf (patch) | |
| tree | d3ce367cc791bde357bfac0d49679d4700cee4ac /net/netfilter | |
| parent | Merge branch 'master' of git://dev.medozas.de/linux (diff) | |
| download | linux-dev-d1e7a03f4fee4059ee3fa7ce0edb7c48c1a75fcf.tar.xz linux-dev-d1e7a03f4fee4059ee3fa7ce0edb7c48c1a75fcf.zip | |
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.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |