diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2006-08-22 03:31:49 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 17:55:25 -0400 |
commit | b9a37e0c81c498be2db9f52063c53e55d76c815e (patch) | |
tree | 9ffb59b51a083c12db5616aeba15f77efbc86508 /net | |
parent | 2521c12cf1a29f6c380b13ca32a38175f6beed08 (diff) |
[NETFILTER]: ctnetlink: dump connection mark
ctnetlink dumps the mark iif the event mark happened
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/netfilter/ip_conntrack_netlink.c | 4 | ||||
-rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c index 0d4cc92391fa..38708e6cfae7 100644 --- a/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/net/ipv4/netfilter/ip_conntrack_netlink.c | |||
@@ -385,6 +385,10 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, | |||
385 | ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0) | 385 | ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0) |
386 | goto nfattr_failure; | 386 | goto nfattr_failure; |
387 | 387 | ||
388 | if (events & IPCT_MARK | ||
389 | && ctnetlink_dump_mark(skb, ct) < 0) | ||
390 | goto nfattr_failure; | ||
391 | |||
388 | nlh->nlmsg_len = skb->tail - b; | 392 | nlh->nlmsg_len = skb->tail - b; |
389 | nfnetlink_send(skb, 0, group, 0); | 393 | nfnetlink_send(skb, 0, group, 0); |
390 | return NOTIFY_DONE; | 394 | return NOTIFY_DONE; |
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 6527d4e048d8..aa0148f418a9 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
@@ -395,6 +395,10 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, | |||
395 | ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0) | 395 | ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0) |
396 | goto nfattr_failure; | 396 | goto nfattr_failure; |
397 | 397 | ||
398 | if (events & IPCT_MARK | ||
399 | && ctnetlink_dump_mark(skb, ct) < 0) | ||
400 | goto nfattr_failure; | ||
401 | |||
398 | nlh->nlmsg_len = skb->tail - b; | 402 | nlh->nlmsg_len = skb->tail - b; |
399 | nfnetlink_send(skb, 0, group, 0); | 403 | nfnetlink_send(skb, 0, group, 0); |
400 | return NOTIFY_DONE; | 404 | return NOTIFY_DONE; |