add new bitmask functions
cover add new bitmask functions
Hello,
I've changed nfct_bitmask_equal() from previous to use bool, as you adviced. Would you revew again?
PATCH 1/2 add two new bitmask functions
This patch adds two functions, useful for ulogd IPFIX output module.
--- .../libnetfilter_conntrack.h | 3 +++ src/conntrack/api.c | 29 ++++++++++++++++++++++ 2 files changed, 32 insertions(+)
include/libnetfilter_conntrack/libnetfilter_conntrack.h +3 -0
@@ -10,6 +10,7 @@#ifndef _LIBNETFILTER_CONNTRACK_H_#define _LIBNETFILTER_CONNTRACK_H_ +#include <stdbool.h> #include <netinet/in.h> #include <libnfnetlink/linux_nfnetlink.h> #include <libnfnetlink/libnfnetlink.h>
@@ -286,6 +287,8 @@ 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 *); +void nfct_bitmask_clear (struct nfct_bitmask *); +bool nfct_bitmask_equal (const struct nfct_bitmask *,const struct nfct_bitmask *);/* connlabel name <-> bit translation mapping */ struct nfct_labelmap ;
src/conntrack/api.c +29 -0
@@ -8,6 +8,7 @@*/ #include <stdlib.h> +#include <stdbool.h> #include <string.h> /* for memset */ #include <errno.h> #include <assert.h>
@@ -1702,6 +1703,34 @@ void nfct_bitmask_destroy(struct nfct_bitmask *b)free (b); } +/* +* nfct_bitmask_clear - clear a bitmask object +* +* \param b pointer to the bitmask object to clear +*/ +void nfct_bitmask_clear (struct nfct_bitmask *b) +{ +unsigned int bytes = b->words *sizeof (b->bits[0 ]); +memset (b->bits,0 , bytes); +} + +/* +* nfct_bitmask_equal - compare two bitmask objects +* +* \param b1 pointer to a valid bitmask object +* \param b2 pointer to a valid bitmask object +* +* If both bitmask object are equal, this function returns true, otherwise +* false is returned. +*/ +bool nfct_bitmask_equal (const struct nfct_bitmask *b1,const struct nfct_bitmask *b2) +{ +if (b1->words != b2->words) +return false; + +return memcmp (b1->bits, b2->bits, b1->words *sizeof (b1->bits[0 ])) ==0 ; +} +/** * @} */
Signature · 1 line
2.1.0
Florian Westphal
maintainerRe: [PATCH lnf-ct 1/2] add two new bitmask functions
Quoted 2 lines · Ken-ichirou MATSUZAWA
This patch adds two functions, useful for ulogd IPFIX output module.
Looks great, if there are no other comments I'll apply this soon.
Thanks!
PATCH 2/2 qa: add tests for new bitmask functions
In reply to Ken-ichirou MATSUZAWAfor nfct_bitmask_clear() and nfct_bitmask_equal()
--- qa/test_api.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
qa/test_api.c +37 -0
@@ -80,6 +80,43 @@ static void test_nfct_bitmask(void)assert (!nfct_bitmask_test_bit (b, i)); } +/* nfct_bitmask_clear() */ +for (i =0 ; i < maxb; i++) { +nfct_bitmask_set_bit (b, i); +assert (nfct_bitmask_test_bit (b, i)); +nfct_bitmask_clear (b); +assert (!nfct_bitmask_test_bit (b, i)); + } + +for (i =0 ; i < maxb; i++) +nfct_bitmask_set_bit (b, i); +nfct_bitmask_clear (b); +for (i =0 ; i < maxb; i++) +assert (!nfct_bitmask_test_bit (b, i)); + +/* nfct_bitmask_equal() */ +for (i =0 ; i < maxb /32 *32 ; i +=32 ) { + a =nfct_bitmask_new (i); +assert (!nfct_bitmask_equal (a, b)); +nfct_bitmask_destroy (a); + } + + a =nfct_bitmask_clone (b); +assert (nfct_bitmask_equal (a, b)); +for (i =0 ; i < maxb; i++) { +if (nfct_bitmask_test_bit (a, i)) { +nfct_bitmask_unset_bit (a, i); +assert (!nfct_bitmask_equal (a, b)); +nfct_bitmask_set_bit (a, i); + }else { +nfct_bitmask_set_bit (a, i); +assert (!nfct_bitmask_equal (a, b)); +nfct_bitmask_unset_bit (a, i); + } +assert (nfct_bitmask_equal (a, b)); + } + +nfct_bitmask_destroy (a);nfct_bitmask_destroy (b); ct1 =nfct_new ();
Signature · 1 line
2.1.0
Re: [PATCH lnf-ct 1/2] add two new bitmask functions
In reply to Ken-ichirou MATSUZAWAQuoted 2 lines · Ken-ichirou MATSUZAWA
This patch adds two functions, useful for ulogd IPFIX output module.
Applied, thanks!
Florian Westphal
maintainerRe: [PATCH lnf-ct 2/2] qa: add tests for new bitmask functions
In reply to Ken-ichirou MATSUZAWAQuoted 1 line · Ken-ichirou MATSUZAWA
for
nfct_bitmask_clear()andnfct_bitmask_equal()
Also applied, thank you.