summaryrefslogtreecommitdiffstats
path: root/src/json.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2019-07-15 08:26:43 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2019-07-16 19:53:43 +0200
commit0fd53234e360d4dde8aa53dbcaad89495a4fab7f (patch)
tree8b8626a93e422f8d107a689c39407d15c91cb5e0 /src/json.c
parent28f22b78f7738a66f88089ecab135242c4c9156d (diff)
src: add set_is_datamap(), set_is_objmap() and set_is_map() helpers
Two map types are currently possible: * data maps, ie. set_is_datamap(). * object maps, ie. set_is_objmap(). This patch adds helper functions to check for the map type. set_is_map() allows you to check for either map type. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/json.c')
-rw-r--r--src/json.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/json.c b/src/json.c
index 1006d7bb..f40dc518 100644
--- a/src/json.c
+++ b/src/json.c
@@ -79,10 +79,10 @@ static json_t *set_print_json(struct output_ctx *octx, const struct set *set)
json_t *root, *tmp;
const char *type, *datatype_ext = NULL;
- if (set->flags & NFT_SET_MAP) {
+ if (set_is_datamap(set->flags)) {
type = "map";
datatype_ext = set->datatype->name;
- } else if (set->flags & NFT_SET_OBJECT) {
+ } else if (set_is_objmap(set->flags)) {
type = "map";
datatype_ext = obj_type_name(set->objtype);
} else if (set->flags & NFT_SET_EVAL) {