libnetfilter_conntrack: connlabel support
Florian Westphal
maintainercover libnetfilter_conntrack: connlabel support
The following four patches add support for the connlabel extension to libnetfilter_conntrack, i.e. support for accessing/changing labels via ctnetlink from userspace.
If there are no objections I'll push these changes soon.
I only wired CTA_LABELS up with the (newer) libmnl-based API.
Please let me know if there are any remaining issues.
summary of changes:
Florian Westphal (4):
api: add nfct_bitmask object
api: add connlabel api and attribute
examples: add connlabel dump/set/clear demo programs
api: add CTA_LABEL_MASK attribute handling
examples/Makefile.am | 10 + examples/nfct-mnl-dump-labels.c | 103 +++++++++ examples/nfct-mnl-set-label.c | 190 +++++++++++++++ include/internal/bitops.h | 2 + include/internal/object.h | 13 + include/internal/prototypes.h | 9 + .../libnetfilter_conntrack.h | 22 ++ .../linux_nfnetlink_conntrack.h | 2 + qa/Makefile.am | 5 +- qa/qa-connlabel.conf | 11 + qa/test_api.c | 74 ++++++- qa/test_connlabel.c | 70 ++++++ src/conntrack/Makefile.am | 1 + src/conntrack/api.c | 184 +++++++++++++++ src/conntrack/build_mnl.c | 18 ++ src/conntrack/copy.c | 32 +++- src/conntrack/getter.c | 12 + src/conntrack/labels.c | 243 ++++++++++++++++++++ src/conntrack/parse.c | 1 + src/conntrack/parse_mnl.c | 26 ++ src/conntrack/setter.c | 23 ++ 21 files changed, 1046 insertions(+), 5 deletions(-) create mode 100644 examples/nfct-mnl-dump-labels.c create mode 100644 examples/nfct-mnl-set-label.c create mode 100644 qa/qa-connlabel.conf create mode 100644 qa/test_connlabel.c create mode 100644 src/conntrack/labels.c
Florian Westphal
maintainerPATCH 1/4 api: add nfct_bitmask object
In order to use generic getter/setter API with upcoming conntrack label extension, add helper functions to set/test/unset bits in a vector of arbitrary size.
Conntrack labels will then be encoded via nfct_bitmask object.
Original idea from Pablo Neira Ayuso.
--- include/internal/bitops.h | 2 + include/internal/object.h | 8 ++ .../libnetfilter_conntrack.h | 12 ++ qa/test_api.c | 54 +++++++++ src/conntrack/api.c | 119 ++++++++++++++++++++ 5 files changed, 195 insertions(+), 0 deletions(-)
include/internal/bitops.h +2 -0
@@ -73,4 +73,6 @@ test_bitmask_u32_or(const uint32_t *buf1, const uint32_t *buf2, int len) return 0; } +#define DIV_ROUND_UP (n,d) (((n) + (d) - 1) / (d)) +#endif
include/internal/object.h +8 -0
@@ -297,4 +297,12 @@ struct nf_expect { u_int32_t set[1]; }; +/* +* bitmask object +*/ +struct nfct_bitmask { +unsigned int words; +uint32_t bits[]; +}; +#endif
include/libnetfilter_conntrack/libnetfilter_conntrack.h +12 -0
@@ -273,6 +273,18 @@ enum { NFCT_CB_STOLEN = 2, /* like continue, but ct is not freed */ }; +/* bitmask setter/getter */ +struct nfct_bitmask ; + +struct nfct_bitmask *nfct_bitmask_new (unsigned int maxbit); +struct nfct_bitmask *nfct_bitmask_clone (const struct nfct_bitmask *); +unsigned int nfct_bitmask_maxbit (const struct nfct_bitmask *); + +void nfct_bitmask_set_bit (struct nfct_bitmask *,unsigned int bit); +int nfct_bitmask_test_bit (const struct nfct_bitmask *,unsigned int bit); +void nfct_bitmask_unset_bit (struct nfct_bitmask *,unsigned int bit); +void nfct_bitmask_destroy (struct nfct_bitmask *); +/* setter */ extern void nfct_set_attr(struct nf_conntrack *ct, const enum nf_conntrack_attr type,
qa/test_api.c +54 -0
77 lines not on this page · raw message
src/conntrack/api.c +119 -0
122 lines not on this page · raw message
Signature · 1 line
1.7.8.6
Florian Westphal
maintainerPATCH 2/4 api: add connlabel api and attribute
In reply to Florian Westphaladds new labelmap api to create a name <-> bit mapping from a text file (default: /etc/xtables/connlabel.conf).
nfct_labelmap_new(filename) is used to create the map, nfct_labelmap_destroy() releases the resources allocated for the map.
Two functions are added to make map lookups:
nfct_labelmap_get_name(map, bit) returns the name of a bit, nfct_labelmap_get_bit returns the bit associated with a name.
The connlabel attribute is represented by a nfct_bitmask object, the nfct_bitmask api can be used to test/set/get individual bits ("labels").
The exisiting nfct_attr_get/set interfaces can be used to read or replace the existing labels associated with a conntrack with a new set.
--- include/internal/object.h | 4 + include/internal/prototypes.h | 9 + .../libnetfilter_conntrack.h | 9 + .../linux_nfnetlink_conntrack.h | 1 + qa/Makefile.am | 5 +- qa/qa-connlabel.conf | 11 + qa/test_api.c | 20 ++- qa/test_connlabel.c | 70 ++++++ src/conntrack/Makefile.am | 1 + src/conntrack/api.c | 65 ++++++ src/conntrack/build_mnl.c | 12 + src/conntrack/copy.c | 24 ++- src/conntrack/getter.c | 6 + src/conntrack/labels.c | 243 ++++++++++++++++++++ src/conntrack/parse.c | 1 + src/conntrack/parse_mnl.c | 25 ++ src/conntrack/setter.c | 12 + 17 files changed, 513 insertions(+), 5 deletions(-) create mode 100644 qa/qa-connlabel.conf create mode 100644 qa/test_connlabel.c create mode 100644 src/conntrack/labels.c
include/internal/object.h +4 -0
@@ -189,6 +189,8 @@ struct nf_conntrack {void *helper_info;size_t helper_info_len; + +struct nfct_bitmask *connlabels; };/*
@@ -305,4 +307,6 @@ struct nfct_bitmask { uint32_t bits[]; }; +struct nfct_labelmap ; +#endif
include/internal/prototypes.h +9 -0
@@ -54,4 +54,13 @@ int __snprintf_expect(char *buf, unsigned int len, const struct nf_expect *exp,int __snprintf_expect_default (char *buf,unsigned int len,const struct nf_expect *exp,unsigned int msg_type,unsigned int flags);int __snprintf_expect_xml (char *buf,unsigned int len,const struct nf_expect *exp,unsigned int msg_type,unsigned int flags); +/* +* connlabel internal prototypes +*/ +struct nfct_labelmap *__labelmap_new (const char *); +void __labelmap_destroy (struct nfct_labelmap *); + +int __labelmap_get_bit (struct nfct_labelmap *map,const char *name); +const char *__labelmap_get_name (struct nfct_labelmap *map,unsigned int bit); +#endif
include/libnetfilter_conntrack/libnetfilter_conntrack.h +9 -0
@@ -133,6 +133,7 @@ enum nf_conntrack_attr {ATTR_TIMESTAMP_START ,/* u64 bits, linux >= 2.6.38 */ ATTR_TIMESTAMP_STOP =64 ,/* u64 bits, linux >= 2.6.38 */ ATTR_HELPER_INFO ,/* variable length */ +ATTR_CONNLABELS ,/* variable length */ ATTR_MAX };
@@ -285,6 +286,14 @@ int nfct_bitmask_test_bit(const struct nfct_bitmask *, unsigned int bit);void nfct_bitmask_unset_bit (struct nfct_bitmask *,unsigned int bit);void nfct_bitmask_destroy (struct nfct_bitmask *); +/* connlabel name <-> bit translation mapping */ +struct nfct_labelmap ; + +struct nfct_labelmap *nfct_labelmap_new (const char *mapfile); +void nfct_labelmap_destroy (struct nfct_labelmap *map); +const char *nfct_labelmap_get_name (struct nfct_labelmap *m,unsigned int bit); +int nfct_labelmap_get_bit (struct nfct_labelmap *m,const char *name); +/* setter */ extern void nfct_set_attr(struct nf_conntrack *ct, const enum nf_conntrack_attr type,
include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +1 -0
@@ -51,6 +51,7 @@ enum ctattr_type {CTA_SECCTX ,CTA_TIMESTAMP ,CTA_MARK_MASK , +CTA_LABELS , __CTA_MAX };#define CTA_MAX (__CTA_MAX - 1)
qa/Makefile.am +4 -1
@@ -1,10 +1,13 @@ include $(top_srcdir)/Make_global.am -check_PROGRAMS = test_api test_filter ct_stress ct_events_reliable +check_PROGRAMS = test_api test_filter test_connlabel ct_stress ct_events_reliable test_api_SOURCES = test_api.c test_api_LDADD = ../src/libnetfilter_conntrack.la +test_connlabel_SOURCES = test_connlabel.c +test_connlabel_LDADD = ../src/libnetfilter_conntrack.la + test_filter_SOURCES = test_filter.c test_filter_LDADD = ../src/libnetfilter_conntrack.la
qa/qa-connlabel.conf new file +11 -0
@@ -0,0 +1,11 @@ +0 zero +# duplicate names should be skipped +1 zero +1 test label 1 +1 zero +# .. so this should have added bit 1 as "test label 1" +2 test label 2 +# duplicate bit, should be skipped, too +2 duplicate +5 unused label +42 T
qa/test_api.c +18 -2
@@ -88,6 +88,7 @@ int main(void)char data[256 ];const char *val;int status; +struct nfct_bitmask *b;srand (time (NULL ));
@@ -117,8 +118,15 @@ int main(void)eval_sigterm (status); } -for (i=0 ; i<ATTR_MAX ; i++) -nfct_set_attr (ct, i, data); +for (i=0 ; i<ATTR_MAX ; i++) { +if (i !=ATTR_CONNLABELS ) { +nfct_set_attr (ct, i, data); +continue ; + } + b =nfct_bitmask_new (rand () &0xffff ); +assert (b); +nfct_set_attr (ct, i, b); + }printf ("== test get API ==\n" ); ret =fork ();
@@ -150,11 +158,19 @@ int main(void)case ATTR_HELPER_INFO :nfct_set_attr_l (ct, i, data,sizeof (data));break ; +case ATTR_CONNLABELS : +/* already set above */ +break ;default : data[0 ] = (uint8_t ) i;nfct_set_attr (ct, i, data); } val =nfct_get_attr (ct, i); +switch (i) { +case ATTR_CONNLABELS : +assert ((void *) val == b); +continue ; + }if (val[0 ] != data[0 ]) { printf("ERROR: set/get operations don't match "
qa/test_connlabel.c new file +70 -0
70 lines not on this page · raw message
src/conntrack/Makefile.am +1 -0
@@ -4,6 +4,7 @@ noinst_LTLIBRARIES = libnfconntrack.la libnfconntrack_la_SOURCES = api.c \ getter.c setter.c \ + labels.c \ parse.c build.c \ parse_mnl.c build_mnl.c \ snprintf.c \
src/conntrack/api.c +65 -0
77 lines not on this page · raw message
src/conntrack/build_mnl.c +12 -0
@@ -10,6 +10,7 @@*/ #include "internal/internal.h" +#include <limits.h> #include <libmnl/libmnl.h> static int
@@ -379,6 +380,14 @@ nfct_build_zone(struct nlmsghdr *nlh, const struct nf_conntrack *ct)return 0 ; } +static void +nfct_build_labels (struct nlmsghdr *nlh,const struct nf_conntrack *ct) +{ +struct nfct_bitmask *b = ct->connlabels; +unsigned int size = b->words *sizeof (b->bits[0 ]); +mnl_attr_put (nlh,CTA_LABELS , size, b->bits); +} +int nfct_nlmsg_build (struct nlmsghdr *nlh,const struct nf_conntrack *ct) {
@@ -475,5 +484,8 @@ nfct_nlmsg_build(struct nlmsghdr *nlh, const struct nf_conntrack *ct)if (test_bit (ATTR_ZONE , ct->head.set))nfct_build_zone (nlh, ct); +if (test_bit (ATTR_CONNLABELS , ct->head.set)) +nfct_build_labels (nlh, ct); +return 0 ; }
src/conntrack/copy.c +22 -2
@@ -450,6 +450,22 @@ static void copy_attr_help_info(struct nf_conntrack *dest,memcpy (dest->helper_info, orig->helper_info, orig->helper_info_len); } +static void *do_copy_attr_connlabels (struct nfct_bitmask *dest, +const struct nfct_bitmask *orig) +{ +if (orig ==NULL ) +return dest; +if (dest) +nfct_bitmask_destroy (dest); +return nfct_bitmask_clone (orig); +} + +static void copy_attr_connlabels (struct nf_conntrack *dest, +const struct nf_conntrack *orig) +{ + dest->connlabels =do_copy_attr_connlabels (dest->connlabels, orig->connlabels); +} +const copy_attr copy_attr_array[ATTR_MAX ] = { [ATTR_ORIG_IPV4_SRC ] = copy_attr_orig_ipv4_src, [ATTR_ORIG_IPV4_DST ] = copy_attr_orig_ipv4_dst,
@@ -517,15 +533,19 @@ const copy_attr copy_attr_array[ATTR_MAX] = { [ATTR_TIMESTAMP_START] = copy_attr_timestamp_start, [ATTR_TIMESTAMP_STOP] = copy_attr_timestamp_stop, [ATTR_HELPER_INFO] = copy_attr_help_info, + [ATTR_CONNLABELS] = copy_attr_connlabels, };/* this is used by nfct_copy() with the NFCT_CP_OVERRIDE flag set. */ void __copy_fast (struct nf_conntrack *ct1,const struct nf_conntrack *ct2) {memcpy (ct1, ct2,sizeof (*ct1)); -/* special case: secctx attribute is allocated dinamically. */ - ct1->secctx =NULL ;/* don't free: ct2 uses it */ +/* malloc'd attributes: don't free, do copy */ + ct1->secctx =NULL ; ct1->helper_info =NULL ; + ct1->connlabels =NULL ; +copy_attr_secctx (ct1, ct2);copy_attr_help_info (ct1, ct2); +copy_attr_connlabels (ct1, ct2); }
src/conntrack/getter.c +6 -0
@@ -339,6 +339,11 @@ static const void *get_attr_helper_info(const struct nf_conntrack *ct)return ct->helper_info; } +static const void *get_attr_connlabels (const struct nf_conntrack *ct) +{ +return ct->connlabels; +} +const get_attr get_attr_array[ATTR_MAX ] = { [ATTR_ORIG_IPV4_SRC ] = get_attr_orig_ipv4_src, [ATTR_ORIG_IPV4_DST ] = get_attr_orig_ipv4_dst,
@@ -406,4 +411,5 @@ const get_attr get_attr_array[ATTR_MAX] = { [ATTR_TIMESTAMP_START] = get_attr_timestamp_start, [ATTR_TIMESTAMP_STOP] = get_attr_timestamp_stop, [ATTR_HELPER_INFO] = get_attr_helper_info, + [ATTR_CONNLABELS] = get_attr_connlabels, };
src/conntrack/labels.c new file +243 -0
243 lines not on this page · raw message
src/conntrack/parse.c +1 -0
@@ -8,6 +8,7 @@*/ #include "internal/internal.h" +#include <libmnl/libmnl.h> static void __parse_ip(const struct nfattr *attr, struct __nfct_tuple *tuple,
src/conntrack/parse_mnl.c +25 -0
@@ -11,6 +11,7 @@#include "internal/internal.h" #include <libmnl/libmnl.h> +#include <limits.h> #include <endian.h> static int
@@ -772,6 +773,25 @@ nfct_parse_timestamp(const struct nlattr *attr, struct nf_conntrack *ct)return 0 ; } +static int nfct_parse_labels (const struct nlattr *attr,struct nf_conntrack *ct) +{ +uint16_t len =mnl_attr_get_payload_len (attr); +struct nfct_bitmask *mask; +uint32_t *bits; + +if (len ==0 ) +return 0 ; + + mask =nfct_bitmask_new ((len *CHAR_BIT ) -1 ); +if (!mask) +return -1 ; + bits =mnl_attr_get_payload (attr); +if (len) +memcpy (mask->bits, bits, len); +nfct_set_attr (ct,ATTR_CONNLABELS , mask); +return 0 ; +} +static int nfct_parse_conntrack_attr_cb (const struct nlattr *attr,void *data) {
@@ -934,6 +954,11 @@ nfct_payload_parse(const void *payload, size_t payload_len,return -1 ; } +if (tb[CTA_LABELS ]) { +if (nfct_parse_labels (tb[CTA_LABELS ], ct) <0 ) +return -1 ; + } +return 0 ; }
src/conntrack/setter.c +12 -0
@@ -421,6 +421,17 @@ retry: }static void +set_attr_connlabels (struct nf_conntrack *ct,const void *value,size_t len) +{ +if (ct->connlabels == value) +return ; + +if (ct->connlabels) +nfct_bitmask_destroy (ct->connlabels); + ct->connlabels = (void *) value; +} + +static void set_attr_do_nothing (struct nf_conntrack *ct,const void *value,size_t len) {}const set_attr set_attr_array[ATTR_MAX ] = {
@@ -490,4 +501,5 @@ const set_attr set_attr_array[ATTR_MAX] = { [ATTR_TIMESTAMP_START] = set_attr_do_nothing, [ATTR_TIMESTAMP_STOP] = set_attr_do_nothing, [ATTR_HELPER_INFO] = set_attr_helper_info, + [ATTR_CONNLABELS] = set_attr_connlabels, };
Signature · 1 line
1.7.8.6
Florian Westphal
maintainerRe: api: add connlabel api and attribute
Hi.
I was about to push the pending connlabel patches
for libnetfilter_conntrack, but then noticed one important point, namely, handling of ATTR_CONNLABEL with nfct_set_attr().
The existing setters all copy their argument, but the current connlabel setter only assigns the pointer, i.e., 'ownership' of the bitmask object is then tied to conntrack object. This may not be whats expected.
Should I make this change:
set_attr_connlabels(struct nf_conntrack *ct, const void *value, size_t len) {
- ct->connlabels = (void *) value;
+ ct->connlabels = nfct_bitmask_clone(value);
}
to avoid this or not?
If noone objects, I will make this modifcation and push into -next branch.
Pablo Neira Ayuso
maintainerRe: api: add connlabel api and attribute
Quoted 18 lines · Florian Westphal
Hi.
I was about to push the pending connlabel patches
forlibnetfilter_conntrack, but then noticed one important point, namely, handling ofATTR_CONNLABELwithnfct_set_attr().The existing setters all copy their argument, but the current connlabel setter only assigns the pointer, i.e., 'ownership' of the bitmask object is then tied to conntrack object. This may not be whats expected.
Should I make this change:
set_attr_connlabels(struct nf_conntrack *ct, const void *value, size_t len){(quoted diff) +1
-1- ct->connlabels = (void *) value; + ct->connlabels = nfct_bitmask_clone(value);}
Quoted 1 line
to avoid this or not?
To attach expectations to master conntracks, we pass the object via the setter without cloning it.
So my suggestion is to document how it works and leave it as is. BTW, make sure that object is released in the nfct_destroy path if you do so.
Regards.
Re: api: add connlabel api and attribute
Quoted 12 lines · Pablo Neira Ayuso
Quoted 12 lines
The existing setters all copy their argument, but the current connlabel setter only assigns the pointer, i.e., 'ownership' of the bitmask object is then tied to conntrack object. This may not be whats expected.
Should I make this change:
set_attr_connlabels(struct nf_conntrack *ct, const void *value, size_t len){(quoted diff) +1
-1- ct->connlabels = (void *) value; + ct->connlabels = nfct_bitmask_clone(value);}
Quoted 4 lines
Quoted 1 line
to avoid this or not?
To attach expectations to master conntracks, we pass the object via the setter without cloning it.
Oh? Sorry, I failed to spot that. But perfect, so there is no need to make this change.
Quoted 3 lines
So my suggestion is to document how it works and leave it as is. BTW, make sure that object is released in the
nfct_destroypath if you do so.
pushed to -next.
Thanks for your suggestions, i've added a doc-comment to nfct_bitmask_destroy() about this.
Florian Westphal
maintainerPATCH 3/4 examples: add connlabel dump/set/clear demo programs
In reply to Florian Westphal--- examples/Makefile.am | 10 ++ examples/nfct-mnl-dump-labels.c | 103 ++++++++++++++++++++++ examples/nfct-mnl-set-label.c | 182 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 295 insertions(+), 0 deletions(-) create mode 100644 examples/nfct-mnl-dump-labels.c create mode 100644 examples/nfct-mnl-set-label.c
examples/Makefile.am +10 -0
@@ -3,6 +3,8 @@ include $(top_srcdir)/Make_global.am check_PROGRAMS = nfct-mnl-create \ nfct-mnl-del \ nfct-mnl-dump \ + nfct-mnl-dump-labels \ + nfct-mnl-set-label \ nfct-mnl-event \ nfct-mnl-flush \ nfct-mnl-get \
@@ -21,6 +23,14 @@ nfct_mnl_dump_SOURCES = nfct-mnl-dump.c nfct_mnl_dump_LDADD = ../src/libnetfilter_conntrack.la nfct_mnl_dump_LDFLAGS = -dynamic -ldl -lmnl +nfct_mnl_dump_labels_SOURCES = nfct-mnl-dump-labels.c +nfct_mnl_dump_labels_LDADD = ../src/libnetfilter_conntrack.la +nfct_mnl_dump_labels_LDFLAGS = -dynamic -ldl -lmnl + +nfct_mnl_set_label_SOURCES = nfct-mnl-set-label.c +nfct_mnl_set_label_LDADD = ../src/libnetfilter_conntrack.la +nfct_mnl_set_label_LDFLAGS = -dynamic -ldl -lmnl + nfct_mnl_event_SOURCES = nfct-mnl-event.c nfct_mnl_event_LDADD = ../src/libnetfilter_conntrack.la nfct_mnl_event_LDFLAGS = -dynamic -ldl -lmnl
examples/nfct-mnl-dump-labels.c new file +103 -0
103 lines not on this page · raw message
examples/nfct-mnl-set-label.c new file +182 -0
182 lines not on this page · raw message
Signature · 1 line
1.7.8.6
Florian Westphal
maintainerPATCH 4/4 api: add CTA_LABEL_MASK attribute handling
In reply to Florian Westphalallows to set/clear only a subset of the in-kernel label set, e.g. "set bit 1 and do not change any others".
--- examples/nfct-mnl-set-label.c | 8 +++++++ include/internal/object.h | 1 + .../libnetfilter_conntrack.h | 1 + .../linux_nfnetlink_conntrack.h | 1 + src/conntrack/build_mnl.c | 6 +++++ src/conntrack/copy.c | 8 +++++++ src/conntrack/getter.c | 6 +++++ src/conntrack/parse_mnl.c | 1 + src/conntrack/setter.c | 21 +++++++++++++++---- 9 files changed, 48 insertions(+), 5 deletions(-)
examples/nfct-mnl-set-label.c +8 -0
@@ -35,6 +35,14 @@ static void set_label(struct nf_conntrack *ct, struct callback_args *cbargs)nfct_bitmask_set_bit (b, bit);nfct_set_attr (ct,ATTR_CONNLABELS , b); +if (bit >=0 ) { + b =nfct_bitmask_new (bit); +if (b) { +nfct_bitmask_set_bit (b, bit); +nfct_set_attr (ct,ATTR_CONNLABELS_MASK , b); + } + } + cbargs->seq++; nlh =mnl_nlmsg_put_header (buf);
include/internal/object.h +1 -0
@@ -191,6 +191,7 @@ struct nf_conntrack {size_t helper_info_len;struct nfct_bitmask *connlabels; +struct nfct_bitmask *connlabels_mask; };/*
include/libnetfilter_conntrack/libnetfilter_conntrack.h +1 -0
@@ -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 };
include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +1 -0
@@ -52,6 +52,7 @@ enum ctattr_type {CTA_TIMESTAMP ,CTA_MARK_MASK ,CTA_LABELS , +CTA_LABELS_MASK , __CTA_MAX };#define CTA_MAX (__CTA_MAX - 1)
src/conntrack/build_mnl.c +6 -0
@@ -386,6 +386,12 @@ nfct_build_labels(struct nlmsghdr *nlh, const struct nf_conntrack *ct)struct nfct_bitmask *b = ct->connlabels;unsigned int size = b->words *sizeof (b->bits[0 ]);mnl_attr_put (nlh,CTA_LABELS , size, b->bits); + +if (test_bit (ATTR_CONNLABELS_MASK , ct->head.set)) { + b = ct->connlabels_mask; +if (size == (b->words *sizeof (b->bits[0 ]))) +mnl_attr_put (nlh,CTA_LABELS_MASK , size, b->bits); + } }int
src/conntrack/copy.c +8 -0
@@ -466,6 +466,12 @@ static void copy_attr_connlabels(struct nf_conntrack *dest, dest->connlabels =do_copy_attr_connlabels (dest->connlabels, orig->connlabels); } +static void copy_attr_connlabels_mask (struct nf_conntrack *dest, +const struct nf_conntrack *orig) +{ + dest->connlabels_mask =do_copy_attr_connlabels (dest->connlabels_mask, orig->connlabels_mask); +} +const copy_attr copy_attr_array[ATTR_MAX ] = { [ATTR_ORIG_IPV4_SRC ] = copy_attr_orig_ipv4_src, [ATTR_ORIG_IPV4_DST ] = copy_attr_orig_ipv4_dst,
@@ -534,6 +540,7 @@ const copy_attr copy_attr_array[ATTR_MAX] = { [ATTR_TIMESTAMP_STOP] = copy_attr_timestamp_stop, [ATTR_HELPER_INFO] = copy_attr_help_info, [ATTR_CONNLABELS] = copy_attr_connlabels, + [ATTR_CONNLABELS_MASK] = copy_attr_connlabels_mask, };/* this is used by nfct_copy() with the NFCT_CP_OVERRIDE flag set. */
@@ -548,4 +555,5 @@ void __copy_fast(struct nf_conntrack *ct1, const struct nf_conntrack *ct2)copy_attr_secctx (ct1, ct2);copy_attr_help_info (ct1, ct2);copy_attr_connlabels (ct1, ct2); +copy_attr_connlabels_mask (ct1, ct2); }
src/conntrack/getter.c +6 -0
@@ -344,6 +344,11 @@ static const void *get_attr_connlabels(const struct nf_conntrack *ct)return ct->connlabels; } +static const void *get_attr_connlabels_mask (const struct nf_conntrack *ct) +{ +return ct->connlabels_mask; +} +const get_attr get_attr_array[ATTR_MAX ] = { [ATTR_ORIG_IPV4_SRC ] = get_attr_orig_ipv4_src, [ATTR_ORIG_IPV4_DST ] = get_attr_orig_ipv4_dst,
@@ -412,4 +417,5 @@ const get_attr get_attr_array[ATTR_MAX] = { [ATTR_TIMESTAMP_STOP] = get_attr_timestamp_stop, [ATTR_HELPER_INFO] = get_attr_helper_info, [ATTR_CONNLABELS] = get_attr_connlabels, + [ATTR_CONNLABELS_MASK] = get_attr_connlabels_mask, };
src/conntrack/parse_mnl.c +1 -0
@@ -958,6 +958,7 @@ nfct_payload_parse(const void *payload, size_t payload_len,if (nfct_parse_labels (tb[CTA_LABELS ], ct) <0 )return -1 ; } +/* CTA_LABELS_MASK: never sent by kernel */ return 0 ; }
src/conntrack/setter.c +16 -5
@@ -421,17 +421,27 @@ retry: }static void -set_attr_connlabels (struct nf_conntrack *ct,const void *value,size_t len) +do_set_attr_connlabels (struct nfct_bitmask *current,const void *value) { -if (ct->connlabels == value) -return ; +if (current && current != value) +nfct_bitmask_destroy (current); +} -if (ct->connlabels) -nfct_bitmask_destroy (ct->connlabels); +static void +set_attr_connlabels (struct nf_conntrack *ct,const void *value,size_t len) +{ +do_set_attr_connlabels (ct->connlabels, value); ct->connlabels = (void *) value; }static void +set_attr_connlabels_mask (struct nf_conntrack *ct,const void *value,size_t len) +{ +do_set_attr_connlabels (ct->connlabels_mask, value); + ct->connlabels_mask = (void *) value; +} + +static void set_attr_do_nothing (struct nf_conntrack *ct,const void *value,size_t len) {}const set_attr set_attr_array[ATTR_MAX ] = {
@@ -502,4 +512,5 @@ const set_attr set_attr_array[ATTR_MAX] = { [ATTR_TIMESTAMP_STOP] = set_attr_do_nothing, [ATTR_HELPER_INFO] = set_attr_helper_info, [ATTR_CONNLABELS] = set_attr_connlabels, + [ATTR_CONNLABELS_MASK] = set_attr_connlabels_mask, };
Signature · 1 line
1.7.8.6