Transmit mark to userspace during conntrack event
Subsystems (2)
PATCH 1/1 Transmit mark to userspace during conntrack event
Hi,
When userspace listen to conntrack event, the connection mark was not sent in the ctnetlink message. The following patch transmits the connection mark to userspace.
BR,
Signature · 2 lines
Eric Leblond <[email protected]> INL
net/ipv4/netfilter/ip_conntrack_netlink.c +3 -0
@@ -385,6 +385,9 @@ static int ctnetlink_conntrack_event(str ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0) goto nfattr_failure; +if (ctnetlink_dump_mark (skb,ct) <0 ) + goto nfattr_failure; + nlh->nlmsg_len = skb->tail - b;nfnetlink_send (skb,0 , group,0 );return NOTIFY_DONE ;
net/netfilter/nf_conntrack_netlink.c +3 -0
@@ -394,6 +394,9 @@ static int ctnetlink_conntrack_event(str ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0) goto nfattr_failure; +if (ctnetlink_dump_mark (skb,ct) <0 ) + goto nfattr_failure; + nlh->nlmsg_len = skb->tail - b;nfnetlink_send (skb,0 , group,0 );return NOTIFY_DONE ;
PATCH 1/1 Rsend : Transmit mark to userspace during conntrack event
Quoted 7 lines · Eric Leblond
Hi,
When userspace listen to conntrack event, the connection mark was not sent in the ctnetlink message. The following patch transmits the connection mark to userspace.
BR,
---
Transmit connection mark to userspace
Connection mark was not sent to userspace when used in event linstening mode.
net/ipv4/netfilter/ip_conntrack_netlink.c +3 -0
@@ -385,6 +385,9 @@ static int ctnetlink_conntrack_event(str ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0) goto nfattr_failure; +if (ctnetlink_dump_mark (skb,ct) <0 ) + goto nfattr_failure; + nlh->nlmsg_len = skb->tail - b;nfnetlink_send (skb,0 , group,0 );return NOTIFY_DONE ;
net/netfilter/nf_conntrack_netlink.c +3 -0
@@ -394,6 +394,9 @@ static int ctnetlink_conntrack_event(str ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0) goto nfattr_failure; +if (ctnetlink_dump_mark (skb,ct) <0 ) + goto nfattr_failure; + nlh->nlmsg_len = skb->tail - b;nfnetlink_send (skb,0 , group,0 );return NOTIFY_DONE ;
Re: [PATCH] Rsend : Transmit mark to userspace during conntrack event
Quoted 3 lines · Eric Leblond
Quoted 3 lines
When userspace listen to conntrack event, the connection mark was not sent in the ctnetlink message. The following patch transmits the connection mark to userspace.
Thanks Eric. After looking at xt_CONNMARK I think I know why the mark wasn't included in the update messages, we didn't even had notifications for changes. I've queued this patch instead.
[NETFILTER]: ctnetlink: fix conntrack mark change notifications
The connection mark was not included in event messages and changes didn't cause event delivery.
Based on patch by Eric Leblond <[email protected]>
---
commit f62ae14f884c89b9e34417435265780ead18976e
tree 93bedfa47324e1819751854359e97e8c9a15b620
parent d3adb6926baf464a3dfc5130a67fe5bb02319ab7
author Patrick McHardy <[email protected]> Sat, 22 Apr 2006 01:55:07 +0200 committer Patrick McHardy <[email protected]> Sat, 22 Apr 2006 01:55:07 +0200
include/linux/netfilter/nf_conntrack_common.h | 4 ++++ net/ipv4/netfilter/ip_conntrack_netlink.c | 6 +++++- net/netfilter/nf_conntrack_netlink.c | 6 +++++- net/netfilter/xt_CONNMARK.c | 8 ++++++-- 4 files changed, 20 insertions(+), 4 deletions(-)
include/linux/netfilter/nf_conntrack_common.h +4 -0
@@ -121,6 +121,10 @@ enum ip_conntrack_events/* Counter highest bit has been set */ IPCT_COUNTER_FILLING_BIT =11 ,IPCT_COUNTER_FILLING = (1 <<IPCT_COUNTER_FILLING_BIT ), + +/* Connection mark */ +IPCT_MARK_BIT =12 , + IPCT_MARK = (1 << IPCT_MARK_BIT), }; enum ip_conntrack_expect_events {
net/ipv4/netfilter/ip_conntrack_netlink.c +5 -1
@@ -333,7 +333,8 @@ static int ctnetlink_conntrack_event(str IPCT_PROTOINFO | IPCT_HELPER | IPCT_HELPINFO | - IPCT_NATINFO)) { + IPCT_NATINFO | + IPCT_MARK)) { type =IPCTNL_MSG_CT_NEW ; group =NFNLGRP_CONNTRACK_UPDATE ; } else
@@ -380,6 +381,9 @@ static int ctnetlink_conntrack_event(strif (events &IPCT_HELPINFO &&ctnetlink_dump_helpinfo (skb, ct) <0 ) goto nfattr_failure; +if (events &IPCT_MARK + &&ctnetlink_dump_mark (skb, ct) <0 ) + goto nfattr_failure;if (ctnetlink_dump_counters (skb, ct,IP_CT_DIR_ORIGINAL ) <0 ||ctnetlink_dump_counters (skb, ct,IP_CT_DIR_REPLY ) <0 )
net/netfilter/nf_conntrack_netlink.c +5 -1
@@ -342,7 +342,8 @@ static int ctnetlink_conntrack_event(str IPCT_PROTOINFO | IPCT_HELPER | IPCT_HELPINFO | - IPCT_NATINFO)) { + IPCT_NATINFO | + IPCT_MARK)) { type =IPCTNL_MSG_CT_NEW ; group =NFNLGRP_CONNTRACK_UPDATE ; } else
@@ -389,6 +390,9 @@ static int ctnetlink_conntrack_event(strif (events &IPCT_HELPINFO &&ctnetlink_dump_helpinfo (skb, ct) <0 ) goto nfattr_failure; +if (events &IPCT_MARK + &&ctnetlink_dump_mark (skb, ct) <0 ) + goto nfattr_failure;if (ctnetlink_dump_counters (skb, ct,IP_CT_DIR_ORIGINAL ) <0 ||ctnetlink_dump_counters (skb, ct,IP_CT_DIR_REPLY ) <0 )
net/netfilter/xt_CONNMARK.c +6 -2
@@ -52,13 +52,17 @@ target(struct sk_buff **pskb,switch (markinfo->mode) {case XT_CONNMARK_SET : newmark = (*ctmark & ~markinfo->mask) | markinfo->mark; -if (newmark != *ctmark) +if (newmark != *ctmark) { *ctmark = newmark; +ip_conntrack_event_cache (IPCT_MARK , *pskb); + }break ;case XT_CONNMARK_SAVE : newmark = (*ctmark & ~markinfo->mask) | ((*pskb)->nfmark & markinfo->mask); -if (*ctmark != newmark) +if (*ctmark != newmark) { *ctmark = newmark; +ip_conntrack_event_cache (IPCT_MARK , *pskb); + }break ;case XT_CONNMARK_RESTORE : nfmark = (*pskb)->nfmark;