[NETFILTER]: ctnetlink: dump connection mark

ctnetlink dumps the mark iif the event mark happened

Signed-off-by: Pablo Neira Ayuso <[email protected]>
Signed-off-by: Patrick McHardy <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index 0d4cc92391fa54a23d26e64564c7b58b7e250d2f..38708e6cfae7cd6567bd7012dd83fa47c4b0a504 100644 (file)
--- 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,
            ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0)
                goto nfattr_failure;
 
+       if (events & IPCT_MARK
+           && ctnetlink_dump_mark(skb, ct) < 0)
+               goto nfattr_failure;
+
        nlh->nlmsg_len = skb->tail - b;
        nfnetlink_send(skb, 0, group, 0);
        return NOTIFY_DONE;

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 6527d4e048d81395f1e5263eb3103f6d65ed2114..aa0148f418a9094a3c72478eab612c4b086e1f96 100644 (file)
--- 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,
            ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0)
                goto nfattr_failure;
 
+       if (events & IPCT_MARK
+           && ctnetlink_dump_mark(skb, ct) < 0)
+               goto nfattr_failure;
+
        nlh->nlmsg_len = skb->tail - b;
        nfnetlink_send(skb, 0, group, 0);
        return NOTIFY_DONE;