diff options
| author | Phil Sutter <phil@nwl.cc> | 2018-10-24 12:35:04 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-24 12:55:13 +0200 |
| commit | 841d5f5a3deacfe7b4245df0890849d8e4ad5817 (patch) | |
| tree | efdc53ae1ea90bec9d9cd9efdd9d075a11192ce2 /src/parser_json.c | |
| parent | 0eb1b3f9a83dfbe2f3001fd3d9cec497a352b9af (diff) | |
json: Fix for recent changes to context structs
Commits introducing nft_ctx pointer to netlink and eval contexts did not
update JSON code accordingly.
Fixes: 00f777bfc414a ("src: pass struct nft_ctx through struct eval_ctx")
Fixes: 2dc07bcd7eaa5 ("src: pass struct nft_ctx through struct netlink_ctx")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/parser_json.c')
| -rw-r--r-- | src/parser_json.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/parser_json.c b/src/parser_json.c index 46a02fe1..e497f0ce 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -3301,11 +3301,8 @@ static int json_verify_metainfo(struct json_ctx *ctx, json_t *root) static int __json_parse(struct json_ctx *ctx, json_t *root) { struct eval_ctx ectx = { - .nf_sock = ctx->nft->nf_sock, + .nft = ctx->nft, .msgs = ctx->msgs, - .cache = &ctx->nft->cache, - .octx = &ctx->nft->output, - .debug_mask = ctx->nft->debug_mask, }; json_t *tmp, *value; size_t index; |