From 22c8af6991eab12a87fec4f06559e1d7ea3826f1 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Fri, 14 Dec 2012 12:42:48 +0100 Subject: 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 --- include/internal/object.h | 1 + include/libnetfilter_conntrack/libnetfilter_conntrack.h | 1 + include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h | 1 + 3 files changed, 3 insertions(+) (limited to 'include') 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) -- cgit v1.2.3