From 80077787f8f21da1efd8dc27a4c5767ab47a1df6 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 9 Oct 2018 00:03:28 +0200 Subject: src: remove json support We have better json support in libnftables these days. Signed-off-by: Pablo Neira Ayuso --- src/expr/hash.c | 70 --------------------------------------------------------- 1 file changed, 70 deletions(-) (limited to 'src/expr/hash.c') diff --git a/src/expr/hash.c b/src/expr/hash.c index 415537e..280ea0c 100644 --- a/src/expr/hash.c +++ b/src/expr/hash.c @@ -220,47 +220,6 @@ nftnl_expr_hash_parse(struct nftnl_expr *e, struct nlattr *attr) return ret; } -static int nftnl_expr_hash_json_parse(struct nftnl_expr *e, json_t *root, - struct nftnl_parse_err *err) -{ -#ifdef JSON_PARSING - uint32_t sreg, dreg, len, modulus, seed, offset, type; - - if (nftnl_jansson_parse_reg(root, "sreg", NFTNL_TYPE_U32, - &sreg, err) == 0) - nftnl_expr_set_u32(e, NFTNL_EXPR_HASH_SREG, sreg); - - if (nftnl_jansson_parse_reg(root, "dreg", NFTNL_TYPE_U32, - &dreg, err) == 0) - nftnl_expr_set_u32(e, NFTNL_EXPR_HASH_DREG, dreg); - - if (nftnl_jansson_parse_val(root, "len", NFTNL_TYPE_U32, - &len, err) == 0) - nftnl_expr_set_u32(e, NFTNL_EXPR_HASH_LEN, len); - - if (nftnl_jansson_parse_val(root, "modulus", NFTNL_TYPE_U32, - &modulus, err) == 0) - nftnl_expr_set_u32(e, NFTNL_EXPR_HASH_MODULUS, modulus); - - if (nftnl_jansson_parse_val(root, "seed", NFTNL_TYPE_U32, - &seed, err) == 0) - nftnl_expr_set_u32(e, NFTNL_EXPR_HASH_SEED, seed); - - if (nftnl_jansson_parse_val(root, "offset", NFTNL_TYPE_U32, - &offset, err) == 0) - nftnl_expr_set_u32(e, NFTNL_EXPR_HASH_OFFSET, offset); - - if (nftnl_jansson_parse_val(root, "type", NFTNL_TYPE_U32, - &type, err) == 0) - nftnl_expr_set_u32(e, NFTNL_EXPR_HASH_TYPE, type); - - return 0; -#else - errno = EOPNOTSUPP; - return -1; -#endif -} - static int nftnl_expr_hash_snprintf_default(char *buf, size_t size, const struct nftnl_expr *e) @@ -302,33 +261,6 @@ nftnl_expr_hash_snprintf_default(char *buf, size_t size, return offset; } -static int nftnl_expr_hash_export(char *buf, size_t size, - const struct nftnl_expr *e, int type) -{ - struct nftnl_expr_hash *hash = nftnl_expr_data(e); - - NFTNL_BUF_INIT(b, buf, size); - - if (e->flags & (1 << NFTNL_EXPR_HASH_SREG)) - nftnl_buf_u32(&b, type, hash->sreg, SREG); - if (e->flags & (1 << NFTNL_EXPR_HASH_DREG)) - nftnl_buf_u32(&b, type, hash->dreg, DREG); - if (e->flags & (1 << NFTNL_EXPR_HASH_LEN)) - nftnl_buf_u32(&b, type, hash->len, LEN); - if (e->flags & (1 << NFTNL_EXPR_HASH_MODULUS)) - nftnl_buf_u32(&b, type, hash->modulus, MODULUS); - if (e->flags & (1 << NFTNL_EXPR_HASH_SEED)) - nftnl_buf_u32(&b, type, hash->seed, SEED); - if (e->flags & (1 << NFTNL_EXPR_HASH_OFFSET)) - nftnl_buf_u32(&b, type, hash->offset, OFFSET); - if (e->flags & (1 << NFTNL_EXPR_HASH_TYPE)) - nftnl_buf_u32(&b, type, hash->type, TYPE); - if (e->flags & (1 << NFTNL_EXPR_HASH_SET_NAME)) - nftnl_buf_str(&b, type, hash->map.name, SET); - - return nftnl_buf_done(&b); -} - static int nftnl_expr_hash_snprintf(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e) @@ -338,7 +270,6 @@ nftnl_expr_hash_snprintf(char *buf, size_t len, uint32_t type, return nftnl_expr_hash_snprintf_default(buf, len, e); case NFTNL_OUTPUT_XML: case NFTNL_OUTPUT_JSON: - return nftnl_expr_hash_export(buf, len, e, type); default: break; } @@ -384,5 +315,4 @@ struct expr_ops expr_ops_hash = { .parse = nftnl_expr_hash_parse, .build = nftnl_expr_hash_build, .snprintf = nftnl_expr_hash_snprintf, - .json_parse = nftnl_expr_hash_json_parse, }; -- cgit v1.2.3