diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2007-12-18 01:28:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:58:52 -0500 |
commit | 37fccd8577d38e249dde71512fb38d2f6a4d9d3c (patch) | |
tree | ede873cf656ad872b94bc88e6530831f4f2dfb01 /include/linux | |
parent | 0f417ce989f84cfd5418e3b316064bfbb2708196 (diff) |
[NETFILTER]: ctnetlink: add support for secmark
This patch adds support for James Morris' connsecmark.
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 'include/linux')
-rw-r--r-- | include/linux/netfilter/nf_conntrack_common.h | 4 | ||||
-rw-r--r-- | include/linux/netfilter/nfnetlink_conntrack.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/netfilter/nf_conntrack_common.h b/include/linux/netfilter/nf_conntrack_common.h index 19747e8f71cf..bad1eb760f61 100644 --- a/include/linux/netfilter/nf_conntrack_common.h +++ b/include/linux/netfilter/nf_conntrack_common.h | |||
@@ -133,6 +133,10 @@ enum ip_conntrack_events | |||
133 | /* NAT sequence adjustment */ | 133 | /* NAT sequence adjustment */ |
134 | IPCT_NATSEQADJ_BIT = 13, | 134 | IPCT_NATSEQADJ_BIT = 13, |
135 | IPCT_NATSEQADJ = (1 << IPCT_NATSEQADJ_BIT), | 135 | IPCT_NATSEQADJ = (1 << IPCT_NATSEQADJ_BIT), |
136 | |||
137 | /* Secmark is set */ | ||
138 | IPCT_SECMARK_BIT = 14, | ||
139 | IPCT_SECMARK = (1 << IPCT_SECMARK_BIT), | ||
136 | }; | 140 | }; |
137 | 141 | ||
138 | enum ip_conntrack_expect_events { | 142 | enum ip_conntrack_expect_events { |
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h index c19d976b1b75..e3e1533aba2d 100644 --- a/include/linux/netfilter/nfnetlink_conntrack.h +++ b/include/linux/netfilter/nfnetlink_conntrack.h | |||
@@ -39,6 +39,7 @@ enum ctattr_type { | |||
39 | CTA_TUPLE_MASTER, | 39 | CTA_TUPLE_MASTER, |
40 | CTA_NAT_SEQ_ADJ_ORIG, | 40 | CTA_NAT_SEQ_ADJ_ORIG, |
41 | CTA_NAT_SEQ_ADJ_REPLY, | 41 | CTA_NAT_SEQ_ADJ_REPLY, |
42 | CTA_SECMARK, | ||
42 | __CTA_MAX | 43 | __CTA_MAX |
43 | }; | 44 | }; |
44 | #define CTA_MAX (__CTA_MAX - 1) | 45 | #define CTA_MAX (__CTA_MAX - 1) |