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/log.c | 63 ---------------------------------------------------------- 1 file changed, 63 deletions(-) (limited to 'src/expr/log.c') diff --git a/src/expr/log.c b/src/expr/log.c index 86d9651..e4bf051 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -186,45 +186,6 @@ nftnl_expr_log_parse(struct nftnl_expr *e, struct nlattr *attr) return 0; } -static int nftnl_expr_log_json_parse(struct nftnl_expr *e, json_t *root, - struct nftnl_parse_err *err) -{ -#ifdef JSON_PARSING - const char *prefix; - uint32_t snaplen, level, flags; - uint16_t group, qthreshold; - - prefix = nftnl_jansson_parse_str(root, "prefix", err); - if (prefix != NULL) - nftnl_expr_set_str(e, NFTNL_EXPR_LOG_PREFIX, prefix); - - if (nftnl_jansson_parse_val(root, "group", NFTNL_TYPE_U16, &group, - err) == 0) - nftnl_expr_set_u16(e, NFTNL_EXPR_LOG_GROUP, group); - - if (nftnl_jansson_parse_val(root, "snaplen", NFTNL_TYPE_U32, &snaplen, - err) == 0) - nftnl_expr_set_u32(e, NFTNL_EXPR_LOG_SNAPLEN, snaplen); - - if (nftnl_jansson_parse_val(root, "qthreshold", NFTNL_TYPE_U16, - &qthreshold, err) == 0) - nftnl_expr_set_u16(e, NFTNL_EXPR_LOG_QTHRESHOLD, qthreshold); - - if (nftnl_jansson_parse_val(root, "level", NFTNL_TYPE_U32, &level, - err) == 0) - nftnl_expr_set_u32(e, NFTNL_EXPR_LOG_LEVEL, level); - - if (nftnl_jansson_parse_val(root, "flags", NFTNL_TYPE_U32, &flags, - err) == 0) - nftnl_expr_set_u32(e, NFTNL_EXPR_LOG_FLAGS, flags); - - return 0; -#else - errno = EOPNOTSUPP; - return -1; -#endif -} - static int nftnl_expr_log_snprintf_default(char *buf, size_t size, const struct nftnl_expr *e) { @@ -275,28 +236,6 @@ static int nftnl_expr_log_snprintf_default(char *buf, size_t size, return offset; } -static int nftnl_expr_log_export(char *buf, size_t size, - const struct nftnl_expr *e, int type) -{ - struct nftnl_expr_log *log = nftnl_expr_data(e); - NFTNL_BUF_INIT(b, buf, size); - - if (e->flags & (1 << NFTNL_EXPR_LOG_PREFIX)) - nftnl_buf_str(&b, type, log->prefix, PREFIX); - if (e->flags & (1 << NFTNL_EXPR_LOG_GROUP)) - nftnl_buf_u32(&b, type, log->group, GROUP); - if (e->flags & (1 << NFTNL_EXPR_LOG_SNAPLEN)) - nftnl_buf_u32(&b, type, log->snaplen, SNAPLEN); - if (e->flags & (1 << NFTNL_EXPR_LOG_QTHRESHOLD)) - nftnl_buf_u32(&b, type, log->qthreshold, QTHRESH); - if (e->flags & (1 << NFTNL_EXPR_LOG_LEVEL)) - nftnl_buf_u32(&b, type, log->level, LEVEL); - if (e->flags & (1 << NFTNL_EXPR_LOG_FLAGS)) - nftnl_buf_u32(&b, type, log->flags, FLAGS); - - return nftnl_buf_done(&b); -} - static int nftnl_expr_log_snprintf(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e) @@ -306,7 +245,6 @@ nftnl_expr_log_snprintf(char *buf, size_t len, uint32_t type, return nftnl_expr_log_snprintf_default(buf, len, e); case NFTNL_OUTPUT_XML: case NFTNL_OUTPUT_JSON: - return nftnl_expr_log_export(buf, len, e, type); default: break; } @@ -354,5 +292,4 @@ struct expr_ops expr_ops_log = { .parse = nftnl_expr_log_parse, .build = nftnl_expr_log_build, .snprintf = nftnl_expr_log_snprintf, - .json_parse = nftnl_expr_log_json_parse, }; -- cgit v1.2.3