diff options
Diffstat (limited to 'src/jansson.c')
-rw-r--r-- | src/jansson.c | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/src/jansson.c b/src/jansson.c index b17d8a9..5ba26d3 100644 --- a/src/jansson.c +++ b/src/jansson.c @@ -23,21 +23,21 @@ #ifdef JSON_PARSING -static int nft_jansson_load_int_node(json_t *root, const char *node_name, - json_int_t *val, struct nft_parse_err *err) +static int nftnl_jansson_load_int_node(json_t *root, const char *node_name, + json_int_t *val, struct nftnl_parse_err *err) { json_t *node; node = json_object_get(root, node_name); if (node == NULL) { - err->error = NFT_PARSE_EMISSINGNODE; + err->error = NFTNL_PARSE_EMISSINGNODE; err->node_name = node_name; errno = EINVAL; return -1; } if (!json_is_integer(node)) { - err->error = NFT_PARSE_EBADTYPE; + err->error = NFTNL_PARSE_EBADTYPE; err->node_name = node_name; errno = ERANGE; return -1; @@ -47,15 +47,15 @@ static int nft_jansson_load_int_node(json_t *root, const char *node_name, return 0; } -const char *nft_jansson_parse_str(json_t *root, const char *node_name, - struct nft_parse_err *err) +const char *nftnl_jansson_parse_str(json_t *root, const char *node_name, + struct nftnl_parse_err *err) { json_t *node; const char *val; node = json_object_get(root, node_name); if (node == NULL) { - err->error = NFT_PARSE_EMISSINGNODE; + err->error = NFTNL_PARSE_EMISSINGNODE; err->node_name = node_name; errno = EINVAL; return NULL; @@ -63,42 +63,42 @@ const char *nft_jansson_parse_str(json_t *root, const char *node_name, val = json_string_value(node); if (val == NULL) { - err->error = NFT_PARSE_EBADTYPE; + err->error = NFTNL_PARSE_EBADTYPE; err->node_name = node_name; } return val; } -int nft_jansson_parse_val(json_t *root, const char *node_name, int type, - void *out, struct nft_parse_err *err) +int nftnl_jansson_parse_val(json_t *root, const char *node_name, int type, + void *out, struct nftnl_parse_err *err) { json_int_t val; - if (nft_jansson_load_int_node(root, node_name, &val, err) == -1) + if (nftnl_jansson_load_int_node(root, node_name, &val, err) == -1) return -1; - if (nft_get_value(type, &val, out) == -1) + if (nftnl_get_value(type, &val, out) == -1) return -1; return 0; } -bool nft_jansson_node_exist(json_t *root, const char *node_name) +bool nftnl_jansson_node_exist(json_t *root, const char *node_name) { return json_object_get(root, node_name) != NULL; } -json_t *nft_jansson_create_root(const void *json, json_error_t *error, - struct nft_parse_err *err, enum nft_parse_input input) +json_t *nftnl_jansson_create_root(const void *json, json_error_t *error, + struct nftnl_parse_err *err, enum nftnl_parse_input input) { json_t *root; switch (input) { - case NFT_PARSE_BUFFER: + case NFTNL_PARSE_BUFFER: root = json_loadb(json, strlen(json), 0, error); break; - case NFT_PARSE_FILE: + case NFTNL_PARSE_FILE: root = json_loadf((FILE *)json, 0, error); break; default: @@ -106,7 +106,7 @@ json_t *nft_jansson_create_root(const void *json, json_error_t *error, } if (root == NULL) { - err->error = NFT_PARSE_EBADINPUT; + err->error = NFTNL_PARSE_EBADINPUT; err->line = error->line; err->column = error->column; err->node_name = error->source; @@ -119,14 +119,14 @@ err: return NULL; } -json_t *nft_jansson_get_node(json_t *root, const char *node_name, - struct nft_parse_err *err) +json_t *nftnl_jansson_get_node(json_t *root, const char *node_name, + struct nftnl_parse_err *err) { json_t *node; node = json_object_get(root, node_name); if (node == NULL) { - err->error = NFT_PARSE_EMISSINGNODE; + err->error = NFTNL_PARSE_EMISSINGNODE; err->node_name = node_name; errno = EINVAL; return NULL; @@ -135,21 +135,21 @@ json_t *nft_jansson_get_node(json_t *root, const char *node_name, return node; } -void nft_jansson_free_root(json_t *root) +void nftnl_jansson_free_root(json_t *root) { json_decref(root); } -int nft_jansson_parse_family(json_t *root, void *out, struct nft_parse_err *err) +int nftnl_jansson_parse_family(json_t *root, void *out, struct nftnl_parse_err *err) { const char *str; int family; - str = nft_jansson_parse_str(root, "family", err); + str = nftnl_jansson_parse_str(root, "family", err); if (str == NULL) return -1; - family = nft_str2family(str); + family = nftnl_str2family(str); if (family < 0) { err->node_name = "family"; errno = EINVAL; @@ -160,10 +160,10 @@ int nft_jansson_parse_family(json_t *root, void *out, struct nft_parse_err *err) return 0; } -int nft_jansson_parse_reg(json_t *root, const char *node_name, int type, - void *out, struct nft_parse_err *err) +int nftnl_jansson_parse_reg(json_t *root, const char *node_name, int type, + void *out, struct nftnl_parse_err *err) { - if (nft_jansson_parse_val(root, node_name, type, out, err) < 0) + if (nftnl_jansson_parse_val(root, node_name, type, out, err) < 0) return -1; if (*((uint32_t *)out) > NFT_REG_MAX){ @@ -174,32 +174,32 @@ int nft_jansson_parse_reg(json_t *root, const char *node_name, int type, return 0; } -int nft_jansson_str2num(json_t *root, const char *node_name, int base, - void *out, enum nft_type type, struct nft_parse_err *err) +int nftnl_jansson_str2num(json_t *root, const char *node_name, int base, + void *out, enum nftnl_type type, struct nftnl_parse_err *err) { const char *str; - str = nft_jansson_parse_str(root, node_name, err); + str = nftnl_jansson_parse_str(root, node_name, err); if (str == NULL) return -1; - return nft_strtoi(str, base, out, type); + return nftnl_strtoi(str, base, out, type); } -struct nft_rule_expr *nft_jansson_expr_parse(json_t *root, - struct nft_parse_err *err, - struct nft_set_list *set_list) +struct nftnl_rule_expr *nftnl_jansson_expr_parse(json_t *root, + struct nftnl_parse_err *err, + struct nftnl_set_list *set_list) { - struct nft_rule_expr *e; + struct nftnl_rule_expr *e; const char *type; uint32_t set_id; int ret; - type = nft_jansson_parse_str(root, "type", err); + type = nftnl_jansson_parse_str(root, "type", err); if (type == NULL) return NULL; - e = nft_rule_expr_alloc(type); + e = nftnl_rule_expr_alloc(type); if (e == NULL) { err->node_name = "type"; return NULL; @@ -209,15 +209,15 @@ struct nft_rule_expr *nft_jansson_expr_parse(json_t *root, if (set_list != NULL && strcmp(type, "lookup") == 0 && - nft_set_lookup_id(e, set_list, &set_id)) - nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SET_ID, set_id); + nftnl_set_lookup_id(e, set_list, &set_id)) + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_LOOKUP_SET_ID, set_id); return ret < 0 ? NULL : e; } -int nft_jansson_data_reg_parse(json_t *root, const char *node_name, - union nft_data_reg *data_reg, - struct nft_parse_err *err) +int nftnl_jansson_data_reg_parse(json_t *root, const char *node_name, + union nftnl_data_reg *data_reg, + struct nftnl_parse_err *err) { json_t *data; int ret; @@ -229,13 +229,13 @@ int nft_jansson_data_reg_parse(json_t *root, const char *node_name, data = json_object_get(data, "reg"); if (data == NULL) { - err->error = NFT_PARSE_EMISSINGNODE; + err->error = NFTNL_PARSE_EMISSINGNODE; err->node_name = "reg"; errno = EINVAL; return -1; } - ret = nft_data_reg_json_parse(data_reg, data, err); + ret = nftnl_data_reg_json_parse(data_reg, data, err); if (ret == DATA_NONE) { errno = EINVAL; return -1; @@ -244,29 +244,29 @@ int nft_jansson_data_reg_parse(json_t *root, const char *node_name, return ret; } -int nft_jansson_set_elem_parse(struct nft_set_elem *e, json_t *root, - struct nft_parse_err *err) +int nftnl_jansson_set_elem_parse(struct nftnl_set_elem *e, json_t *root, + struct nftnl_parse_err *err) { int set_elem_data; uint32_t flags; - if (nft_jansson_parse_val(root, "flags", NFT_TYPE_U32, &flags, err) == 0) - nft_set_elem_attr_set_u32(e, NFT_SET_ELEM_ATTR_FLAGS, flags); + if (nftnl_jansson_parse_val(root, "flags", NFTNL_TYPE_U32, &flags, err) == 0) + nftnl_set_elem_attr_set_u32(e, NFTNL_SET_ELEM_ATTR_FLAGS, flags); - if (nft_jansson_data_reg_parse(root, "key", &e->key, err) == DATA_VALUE) - e->flags |= (1 << NFT_SET_ELEM_ATTR_KEY); + if (nftnl_jansson_data_reg_parse(root, "key", &e->key, err) == DATA_VALUE) + e->flags |= (1 << NFTNL_SET_ELEM_ATTR_KEY); - if (nft_jansson_node_exist(root, "data")) { - set_elem_data = nft_jansson_data_reg_parse(root, "data", + if (nftnl_jansson_node_exist(root, "data")) { + set_elem_data = nftnl_jansson_data_reg_parse(root, "data", &e->data, err); switch (set_elem_data) { case DATA_VALUE: - e->flags |= (1 << NFT_SET_ELEM_ATTR_DATA); + e->flags |= (1 << NFTNL_SET_ELEM_ATTR_DATA); break; case DATA_VERDICT: - e->flags |= (1 << NFT_SET_ELEM_ATTR_VERDICT); + e->flags |= (1 << NFTNL_SET_ELEM_ATTR_VERDICT); if (e->data.chain != NULL) - e->flags |= (1 << NFT_SET_ELEM_ATTR_CHAIN); + e->flags |= (1 << NFTNL_SET_ELEM_ATTR_CHAIN); break; case DATA_NONE: default: |