diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-11-04 15:30:48 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-11-04 21:44:45 +0100 |
| commit | d87d12b407a8e9dff7af157663b583e78db40bd5 (patch) | |
| tree | 6df98e61e72bcebf08614639ce6f4e9d12947cc0 | |
| parent | 8d74a15d941c69b7d0f5961be1e56b87ca3235d0 (diff) | |
set: use NFTNL_SET_ELEM_VERDICT to print verdict
This patch reworks 228e8b174627 ("set_elem: Fix printing of verdict map
elements"), check if NFTNL_SET_ELEM_VERDICT is set then print the set
element verdict.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | include/set_elem.h | 3 | ||||
| -rw-r--r-- | src/set.c | 2 | ||||
| -rw-r--r-- | src/set_elem.c | 13 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/set_elem.h b/include/set_elem.h index 503dced..7628005 100644 --- a/include/set_elem.h +++ b/include/set_elem.h @@ -21,7 +21,6 @@ struct nftnl_set_elem { }; int nftnl_set_elem_snprintf_default(char *buf, size_t size, - const struct nftnl_set_elem *e, - enum nft_data_types dtype); + const struct nftnl_set_elem *e); #endif @@ -829,7 +829,7 @@ static int nftnl_set_snprintf_default(char *buf, size_t remain, SNPRINTF_BUFFER_SIZE(ret, remain, offset); ret = nftnl_set_elem_snprintf_default(buf + offset, remain, - elem, s->data_type); + elem); SNPRINTF_BUFFER_SIZE(ret, remain, offset); } diff --git a/src/set_elem.c b/src/set_elem.c index edcc4a2..12eadce 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -700,11 +700,9 @@ int nftnl_set_elem_parse_file(struct nftnl_set_elem *e, enum nftnl_parse_type ty } int nftnl_set_elem_snprintf_default(char *buf, size_t remain, - const struct nftnl_set_elem *e, - enum nft_data_types dtype) + const struct nftnl_set_elem *e) { - int dregtype = (dtype == NFT_DATA_VERDICT) ? DATA_VERDICT : DATA_VALUE; - int ret, offset = 0, i; + int ret, dregtype = DATA_VALUE, offset = 0, i; ret = snprintf(buf, remain, "element "); SNPRINTF_BUFFER_SIZE(ret, remain, offset); @@ -725,6 +723,9 @@ int nftnl_set_elem_snprintf_default(char *buf, size_t remain, ret = snprintf(buf + offset, remain, " : "); SNPRINTF_BUFFER_SIZE(ret, remain, offset); + if (e->flags & (1 << NFTNL_SET_ELEM_VERDICT)) + dregtype = DATA_VERDICT; + ret = nftnl_data_reg_snprintf(buf + offset, remain, &e->data, DATA_F_NOPFX, dregtype); SNPRINTF_BUFFER_SIZE(ret, remain, offset); @@ -761,9 +762,9 @@ static int nftnl_set_elem_cmd_snprintf(char *buf, size_t remain, if (type != NFTNL_OUTPUT_DEFAULT) return -1; - ret = nftnl_set_elem_snprintf_default(buf + offset, remain, e, - NFT_DATA_VALUE); + ret = nftnl_set_elem_snprintf_default(buf + offset, remain, e); SNPRINTF_BUFFER_SIZE(ret, remain, offset); + return offset; } |