diff options
| author | Florian Westphal <fw@strlen.de> | 2013-01-11 01:30:45 -0500 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-01-17 18:28:16 -0500 |
| commit | 0ceabd83875b72a29f33db4ab703d6ba40ea4c58 (patch) | |
| tree | b046f3b29ccb522f0593472029567ff4d5fcd7c7 /include | |
| parent | c539f01717c239cfa0921dd43927afc976f1eedc (diff) | |
netfilter: ctnetlink: deliver labels to userspace
Introduce CTA_LABELS attribute to send a bit-vector of currently active labels
to userspace.
Future patch will permit userspace to also set/delete active labels.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/netfilter/nf_conntrack_common.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nfnetlink_conntrack.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/netfilter/nf_conntrack_common.h b/include/uapi/linux/netfilter/nf_conntrack_common.h index 1644cdd8be91..d69483fb3825 100644 --- a/include/uapi/linux/netfilter/nf_conntrack_common.h +++ b/include/uapi/linux/netfilter/nf_conntrack_common.h | |||
| @@ -101,6 +101,7 @@ enum ip_conntrack_events { | |||
| 101 | IPCT_MARK, /* new mark has been set */ | 101 | IPCT_MARK, /* new mark has been set */ |
| 102 | IPCT_NATSEQADJ, /* NAT is doing sequence adjustment */ | 102 | IPCT_NATSEQADJ, /* NAT is doing sequence adjustment */ |
| 103 | IPCT_SECMARK, /* new security mark has been set */ | 103 | IPCT_SECMARK, /* new security mark has been set */ |
| 104 | IPCT_LABEL, /* new connlabel has been set */ | ||
| 104 | }; | 105 | }; |
| 105 | 106 | ||
| 106 | enum ip_conntrack_expect_events { | 107 | enum ip_conntrack_expect_events { |
diff --git a/include/uapi/linux/netfilter/nfnetlink_conntrack.h b/include/uapi/linux/netfilter/nfnetlink_conntrack.h index 86e930cf3dfb..9e71e0c081fd 100644 --- a/include/uapi/linux/netfilter/nfnetlink_conntrack.h +++ b/include/uapi/linux/netfilter/nfnetlink_conntrack.h | |||
| @@ -49,6 +49,7 @@ enum ctattr_type { | |||
| 49 | CTA_SECCTX, | 49 | CTA_SECCTX, |
| 50 | CTA_TIMESTAMP, | 50 | CTA_TIMESTAMP, |
| 51 | CTA_MARK_MASK, | 51 | CTA_MARK_MASK, |
| 52 | CTA_LABELS, | ||
| 52 | __CTA_MAX | 53 | __CTA_MAX |
| 53 | }; | 54 | }; |
| 54 | #define CTA_MAX (__CTA_MAX - 1) | 55 | #define CTA_MAX (__CTA_MAX - 1) |
