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/dup.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'src/expr/dup.c') diff --git a/src/expr/dup.c b/src/expr/dup.c index ed8e620..6fa6598 100644 --- a/src/expr/dup.c +++ b/src/expr/dup.c @@ -112,41 +112,6 @@ static int nftnl_expr_dup_parse(struct nftnl_expr *e, struct nlattr *attr) return ret; } -static int nftnl_expr_dup_json_parse(struct nftnl_expr *e, json_t *root, - struct nftnl_parse_err *err) -{ -#ifdef JSON_PARSING - uint32_t sreg_addr, sreg_dev; - int ret; - - ret = nftnl_jansson_parse_val(root, "sreg_addr", NFTNL_TYPE_U32, &sreg_addr, err); - if (ret >= 0) - nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_addr); - ret = nftnl_jansson_parse_val(root, "sreg_dev", NFTNL_TYPE_U32, &sreg_dev, err); - if (ret >= 0) - nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_dev); - - return 0; -#else - errno = EOPNOTSUPP; - return -1; -#endif -} - -static int nftnl_expr_dup_export(char *buf, size_t size, - const struct nftnl_expr *e, int type) -{ - struct nftnl_expr_dup *dup = nftnl_expr_data(e); - NFTNL_BUF_INIT(b, buf, size); - - if (e->flags & (1 << NFTNL_EXPR_DUP_SREG_ADDR)) - nftnl_buf_u32(&b, type, dup->sreg_addr, "sreg_addr"); - if (e->flags & (1 << NFTNL_EXPR_DUP_SREG_DEV)) - nftnl_buf_u32(&b, type, dup->sreg_addr, "sreg_dev"); - - return nftnl_buf_done(&b); -} - static int nftnl_expr_dup_snprintf_default(char *buf, size_t len, const struct nftnl_expr *e, uint32_t flags) @@ -175,7 +140,6 @@ static int nftnl_expr_dup_snprintf(char *buf, size_t len, uint32_t type, return nftnl_expr_dup_snprintf_default(buf, len, e, flags); case NFTNL_OUTPUT_XML: case NFTNL_OUTPUT_JSON: - return nftnl_expr_dup_export(buf, len, e, type); default: break; } @@ -207,5 +171,4 @@ struct expr_ops expr_ops_dup = { .parse = nftnl_expr_dup_parse, .build = nftnl_expr_dup_build, .snprintf = nftnl_expr_dup_snprintf, - .json_parse = nftnl_expr_dup_json_parse, }; -- cgit v1.2.3