set_elem: Use nftnl_data_reg_snprintf()
Phil Sutter
reviewerPATCH 1/2 set_elem: Use nftnl_data_reg_snprintf()
Introduce a flag to allow toggling the '0x' prefix when printing data values, then use the existing routines to print data registers from set_elem code.
--- include/data_reg.h | 4 ++++ src/expr/data_reg.c | 6 +++++- src/set_elem.c | 16 ++++++++-------- 3 files changed, 17 insertions(+), 9 deletions(-)
include/data_reg.h +4 -0
@@ -13,6 +13,10 @@ enum { DATA_CHAIN, }; +enum { +DATA_F_NOPFX =1 <<0 , +}; +union nftnl_data_reg {struct {uint32_t val[NFT_DATA_VALUE_MAXLEN /sizeof (uint32_t )];
src/expr/data_reg.c +5 -1
@@ -29,10 +29,14 @@ nftnl_data_reg_value_snprintf_default(char *buf, size_t size,const union nftnl_data_reg *reg, uint32_t flags) { + const char *pfx = flags & DATA_F_NOPFX ? "" : "0x";int remain = size, offset =0 , ret, i; + +for (i =0 ; i <div_round_up (reg->len,sizeof (uint32_t )); i++) { - ret =snprintf (buf + offset, remain,"0x%.8x " , reg->val[i]); + ret =snprintf (buf + offset, remain, +"%s%.8x " , pfx, reg->val[i]);SNPRINTF_BUFFER_SIZE (ret, remain, offset); }
src/set_elem.c +8 -8
@@ -629,18 +629,18 @@ static int nftnl_set_elem_snprintf_default(char *buf, size_t size, ret =snprintf (buf, remain,"element " );SNPRINTF_BUFFER_SIZE (ret, remain, offset); -for (i =0 ; i <div_round_up (e->key.len,sizeof (uint32_t )); i++) { - ret =snprintf (buf + offset, remain,"%.8x " , e->key.val[i]); -SNPRINTF_BUFFER_SIZE (ret, remain, offset); - } + ret =nftnl_data_reg_snprintf (buf + offset, remain, &e->key, +NFTNL_OUTPUT_DEFAULT , +DATA_F_NOPFX ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, remain, offset); ret =snprintf (buf + offset, remain," : " );SNPRINTF_BUFFER_SIZE (ret, remain, offset); -for (i =0 ; i <div_round_up (e->data.len,sizeof (uint32_t )); i++) { - ret =snprintf (buf + offset, remain,"%.8x " , e->data.val[i]); -SNPRINTF_BUFFER_SIZE (ret, remain, offset); - } + ret =nftnl_data_reg_snprintf (buf + offset, remain, &e->data, +NFTNL_OUTPUT_DEFAULT , +DATA_F_NOPFX ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, remain, offset); ret =snprintf (buf + offset, remain,"%u [end]" , e->set_elem_flags);SNPRINTF_BUFFER_SIZE (ret, remain, offset);
Signature · 1 line
2.28.0
Phil Sutter
reviewerPATCH 2/2 set_elem: Include key_end data reg in print output
Elements of concatenated range sets hold the upper boundary in an extra data_reg, print it using dash as a somewhat intuitive separator.
--- src/set_elem.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
src/set_elem.c +10 -0
@@ -634,6 +634,16 @@ static int nftnl_set_elem_snprintf_default(char *buf, size_t size, DATA_F_NOPFX, DATA_VALUE);SNPRINTF_BUFFER_SIZE (ret, remain, offset); +if (e->flags & (1 <<NFTNL_SET_ELEM_KEY_END )) { + ret =snprintf (buf + offset, remain," - " ); +SNPRINTF_BUFFER_SIZE (ret, remain, offset); + + ret =nftnl_data_reg_snprintf (buf + offset, remain, &e->key_end, +NFTNL_OUTPUT_DEFAULT , +DATA_F_NOPFX ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, remain, offset); + } + ret =snprintf (buf + offset, remain," : " );SNPRINTF_BUFFER_SIZE (ret, remain, offset);
Signature · 1 line
2.28.0
Pablo Neira Ayuso
maintainerQuoted 3 lines · Phil Sutter
Introduce a flag to allow toggling the '0x' prefix when printing data values, then use the existing routines to print data registers from
set_elemcode.
Patches LGTM.
You will have to update tests/py too, right?
Thanks.
Phil Sutter
reviewerHi Pablo,
Quoted 6 lines · Pablo Neira Ayuso
Quoted 3 lines · Phil Sutter
Introduce a flag to allow toggling the '0x' prefix when printing data values, then use the existing routines to print data registers from
set_elemcode.Patches LGTM.
Thanks, I'll push it along with the change in nftables' tests/py.
Quoted 1 line
You will have to update tests/py too, right?
To my surprise, it's merely a single test case that needed adjustment. Either I missed something (testing stops before payload comparison if e.g. input and output differ) or we really have quite low concat-range coverage.
Cheers, Phil