lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: conntrack: introduce connection mark event

Browse Source 
This patch introduces the mark event. ctnetlink can use this to know if
the mark needs to be dumped.

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>
This commit is contained in:
Pablo Neira Ayuso
2006-08-22 00:31:24 -07:00
committed by David S. Miller
parent b93ff78317
commit 2521c12cf1
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/netfilter/nf_conntrack_common.h
View File

@@ -125,6 +125,10 @@ enum ip_conntrack_events
/* Counter highest bit has been set */ /* Counter highest bit has been set */
IPCT_COUNTER_FILLING_BIT = 11, IPCT_COUNTER_FILLING_BIT = 11,
IPCT_COUNTER_FILLING = (1 << IPCT_COUNTER_FILLING_BIT), IPCT_COUNTER_FILLING = (1 << IPCT_COUNTER_FILLING_BIT),
/* Mark is set */
IPCT_MARK_BIT = 12,
IPCT_MARK = (1 << IPCT_MARK_BIT),
}; };
enum ip_conntrack_expect_events { enum ip_conntrack_expect_events {

16
net/netfilter/xt_CONNMARK.c
View File

@@ -52,13 +52,25 @@ target(struct sk_buff **pskb,
switch(markinfo->mode) { switch(markinfo->mode) {
case XT_CONNMARK_SET: case XT_CONNMARK_SET:
newmark = (*ctmark & ~markinfo->mask) | markinfo->mark; newmark = (*ctmark & ~markinfo->mask) | markinfo->mark;
if (newmark != *ctmark) if (newmark != *ctmark) {
*ctmark = newmark; *ctmark = newmark;
#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS
ip_conntrack_event_cache(IPCT_MARK, *pskb);
#else
nf_conntrack_event_cache(IPCT_MARK, *pskb);
#endif
}
break; break;
case XT_CONNMARK_SAVE: case XT_CONNMARK_SAVE:
newmark = (*ctmark & ~markinfo->mask) | ((*pskb)->nfmark & markinfo->mask); newmark = (*ctmark & ~markinfo->mask) | ((*pskb)->nfmark & markinfo->mask);
if (*ctmark != newmark) if (*ctmark != newmark) {
*ctmark = newmark; *ctmark = newmark;
#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS
ip_conntrack_event_cache(IPCT_MARK, *pskb);
#else
nf_conntrack_event_cache(IPCT_MARK, *pskb);
#endif
}
break; break;
case XT_CONNMARK_RESTORE: case XT_CONNMARK_RESTORE:
nfmark = (*pskb)->nfmark; nfmark = (*pskb)->nfmark;