diff options
author | Fabian Hugelshofer <hugelshofer2006@gmx.ch> | 2008-06-09 18:59:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-09 18:59:58 -0400 |
commit | e57dce60c7478fdeeb9a1ebd311261ec901afe4d (patch) | |
tree | 25f5a6da9c8709c96448fcbcb64ba7bf98fefef4 /net/netfilter | |
parent | 718d4ad98e272daebc258e49dc02f52a6a8de9d3 (diff) |
netfilter: ctnetlink: include conntrack status in destroy event message
When a conntrack is destroyed, the connection status does not get
exported to netlink. I don't see a reason for not doing so. This patch
exports the status on all conntrack events.
Signed-off-by: Fabian Hugelshofer <hugelshofer2006@gmx.ch>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index ab655f660dfa..63c4e1f299b8 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
@@ -475,14 +475,14 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, | |||
475 | if (ctnetlink_dump_id(skb, ct) < 0) | 475 | if (ctnetlink_dump_id(skb, ct) < 0) |
476 | goto nla_put_failure; | 476 | goto nla_put_failure; |
477 | 477 | ||
478 | if (ctnetlink_dump_status(skb, ct) < 0) | ||
479 | goto nla_put_failure; | ||
480 | |||
478 | if (events & IPCT_DESTROY) { | 481 | if (events & IPCT_DESTROY) { |
479 | if (ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 || | 482 | if (ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 || |
480 | ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0) | 483 | ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0) |
481 | goto nla_put_failure; | 484 | goto nla_put_failure; |
482 | } else { | 485 | } else { |
483 | if (ctnetlink_dump_status(skb, ct) < 0) | ||
484 | goto nla_put_failure; | ||
485 | |||
486 | if (ctnetlink_dump_timeout(skb, ct) < 0) | 486 | if (ctnetlink_dump_timeout(skb, ct) < 0) |
487 | goto nla_put_failure; | 487 | goto nla_put_failure; |
488 | 488 | ||