diff options
author | Florian Westphal <fw@strlen.de> | 2012-12-14 12:42:48 +0100 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2013-05-06 21:34:35 +0200 |
commit | 22c8af6991eab12a87fec4f06559e1d7ea3826f1 (patch) | |
tree | 56bd05aa44b7273770a471e0bee2677282de45eb /include | |
parent | d5e1f43e14bff7072e5a7a232bb2b04fcd710d52 (diff) |
api: add CTA_LABEL_MASK attribute handling
allows to set/clear only a subset of the in-kernel label set, e.g.
"set bit 1 and do not change any others".
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/internal/object.h | 1 | ||||
-rw-r--r-- | include/libnetfilter_conntrack/libnetfilter_conntrack.h | 1 | ||||
-rw-r--r-- | include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/include/internal/object.h b/include/internal/object.h index bbb038a..540ad0d 100644 --- a/include/internal/object.h +++ b/include/internal/object.h @@ -191,6 +191,7 @@ struct nf_conntrack { size_t helper_info_len; struct nfct_bitmask *connlabels; + struct nfct_bitmask *connlabels_mask; }; /* diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h index c209184..39dc24c 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h @@ -134,6 +134,7 @@ enum nf_conntrack_attr { ATTR_TIMESTAMP_STOP = 64, /* u64 bits, linux >= 2.6.38 */ ATTR_HELPER_INFO, /* variable length */ ATTR_CONNLABELS, /* variable length */ + ATTR_CONNLABELS_MASK, /* variable length */ ATTR_MAX }; diff --git a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h index 3c69ba9..5812595 100644 --- a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +++ b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h @@ -54,6 +54,7 @@ enum ctattr_type { CTA_TIMESTAMP, CTA_MARK_MASK, CTA_LABELS, + CTA_LABELS_MASK, __CTA_MAX }; #define CTA_MAX (__CTA_MAX - 1) |