monitor: add assignment check for json_echo
PATCH 1/2 monitor: add assignment check for json_echo
When --echo and --json is specified and native syntax is read, only the last instruction is printed. This happens because the reference to the json_echo is reassigned each time netlink_echo_callback is executed for an instruction to be echoed.
Add an assignment check for json_echo to avoid reassigning it.
syntax)
--- src/monitor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
src/monitor.c +2 -2
@@ -939,8 +939,8 @@ int netlink_echo_callback(const struct nlmsghdr *nlh, void *data)if (nft_output_json (&nft->output)) {if (nft->json_root)return json_events_cb (nlh, &echo_monh); - -json_alloc_echo (nft); +if (!nft->json_echo) +json_alloc_echo (nft); echo_monh.format =NFTNL_OUTPUT_JSON ; }
Signature · 1 line
2.28.0
PATCH 2/2 monitor: fix formatting of if statements
Replace some "if(" introduced in cb7e02f4 by "if ("
--- src/monitor.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
src/monitor.c +6 -6
@@ -225,7 +225,7 @@ static int netlink_events_table_cb(const struct nlmsghdr *nlh, int type,break ;case NFTNL_OUTPUT_JSON :monitor_print_table_json (monh, cmd, t); -if (!nft_output_echo (&monh->ctx->nft->output)) +if (!nft_output_echo (&monh->ctx->nft->output))nft_mon_print (monh,"\n" );break ; }
@@ -264,7 +264,7 @@ static int netlink_events_chain_cb(const struct nlmsghdr *nlh, int type,break ;case NFTNL_OUTPUT_JSON :monitor_print_chain_json (monh, cmd, c); -if (!nft_output_echo (&monh->ctx->nft->output)) +if (!nft_output_echo (&monh->ctx->nft->output))nft_mon_print (monh,"\n" );break ; }
@@ -312,7 +312,7 @@ static int netlink_events_set_cb(const struct nlmsghdr *nlh, int type,break ;case NFTNL_OUTPUT_JSON :monitor_print_set_json (monh, cmd, set); -if (!nft_output_echo (&monh->ctx->nft->output)) +if (!nft_output_echo (&monh->ctx->nft->output))nft_mon_print (monh,"\n" );break ; }
@@ -457,7 +457,7 @@ static int netlink_events_setelem_cb(const struct nlmsghdr *nlh, int type,/* prevent set_free() from trying to free those */ dummyset->handle.set.name =NULL ; dummyset->handle.table.name =NULL ; -if (!nft_output_echo (&monh->ctx->nft->output)) +if (!nft_output_echo (&monh->ctx->nft->output))nft_mon_print (monh,"\n" );break ; }
@@ -504,7 +504,7 @@ static int netlink_events_obj_cb(const struct nlmsghdr *nlh, int type,break ;case NFTNL_OUTPUT_JSON :monitor_print_obj_json (monh, cmd, obj); -if (!nft_output_echo (&monh->ctx->nft->output)) +if (!nft_output_echo (&monh->ctx->nft->output))nft_mon_print (monh,"\n" );break ; }
@@ -556,7 +556,7 @@ static int netlink_events_rule_cb(const struct nlmsghdr *nlh, int type,break ;case NFTNL_OUTPUT_JSON :monitor_print_rule_json (monh, cmd, r); -if (!nft_output_echo (&monh->ctx->nft->output)) +if (!nft_output_echo (&monh->ctx->nft->output))nft_mon_print (monh,"\n" );break ; }
Signature · 1 line
2.28.0
Pablo Neira Ayuso
maintainerRe: [PATCH nftables 2/2] monitor: fix formatting of if statements
Quoted 1 line · Jose M. Guisado Gomez
Replace some "if(" introduced in
cb7e02f4by "if ("
Also applied, thanks.
Quoted 6 lines · Jose M. Guisado Gomez
When --echo and --json is specified and native syntax is read, only the last instruction is printed. This happens because the reference to the
json_echois reassigned each timenetlink_echo_callbackis executed for an instruction to be echoed.Add an assignment check for
json_echoto avoid reassigning it.
Applied, thanks.