diff options
| author | Jose M. Guisado Gomez <guigom@riseup.net> | 2020-08-04 12:38:46 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2020-12-02 10:45:15 +0100 |
| commit | cb7e02f44d6a6fd1c6001e23cecb3d7534110617 (patch) | |
| tree | 7c4f1876a86ca65bed87ecf3cbb826a46794bf00 /include/nftables.h | |
| parent | 389a0e1edc89a4048a272e569d3349b1d43bc567 (diff) | |
src: enable json echo output when reading native syntax
This patch fixes a bug in which nft did not print any output when
specifying --echo and --json and reading nft native syntax.
This patch respects behavior when input is json, in which the output
would be the identical input plus the handles.
Adds a json_echo member inside struct nft_ctx to build and store the json object
containing the json command objects, the object is built using a mock
monitor to reuse monitor json code. This json object is only used when
we are sure we have not read json from input.
[ added json_alloc_echo() to compile without json support --pablo ]
Fixes: https://bugzilla.netfilter.org/show_bug.cgi?id=1446
Signed-off-by: Jose M. Guisado Gomez <guigom@riseup.net>
Tested-by: Eric Garver <eric@garver.life>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/nftables.h')
| -rw-r--r-- | include/nftables.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/nftables.h b/include/nftables.h index 3556728d..9095ff3d 100644 --- a/include/nftables.h +++ b/include/nftables.h @@ -122,6 +122,7 @@ struct nft_ctx { void *scanner; struct scope *top_scope; void *json_root; + json_t *json_echo; }; enum nftables_exit_codes { |