diff options
author | Phil Sutter <phil@nwl.cc> | 2017-10-04 15:59:32 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-10-06 14:30:56 +0200 |
commit | 881fad86fa4942571c74cdfa89831a2cd25dbe16 (patch) | |
tree | 8ddd4a0fde3e6306ad63884c691f02641b1dd255 /src/cli.c | |
parent | b873a1731d2481851c57eab3dcf3e719e9d45b50 (diff) |
evaluate: Fix debug output
When introducing output_fp, debug output in src/evaluate.c was not
adjusted and therefore broke.
This patch restores eval debug output by applying the following changes:
- Change erec_print() and erec_print_list() to take a struct output_ctx
pointer as first argument and use output_fp field as destination to
print to.
- Drop octx_debug_dummy variable and instead use octx pointer from
struct eval_ctx for debug output.
- Add missing calls to erec_destroy() in eval debug output which should
eliminate another mem leak.
Fixes: 2535ba7006f22 ("src: get rid of printf")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/cli.c')
-rw-r--r-- | src/cli.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -138,7 +138,7 @@ static void cli_complete(char *line) cli_nft->debug_mask, &cli_nft->output); scanner_push_buffer(scanner, &indesc_cli, line); nft_run(cli_nft, cli_nf_sock, scanner, state, &msgs); - erec_print_list(stdout, &msgs, cli_nft->debug_mask); + erec_print_list(&cli_nft->output, &msgs, cli_nft->debug_mask); xfree(line); cache_release(&cli_nft->cache); iface_cache_release(); |