xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: bpftool: provide JSON output for all possible commands

Browse Source 
As all commands can now return JSON output (possibly just a "null"
value), output of `bpftool --json batch file FILE` should also be fully
JSON compliant.

Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Quentin Monnet
2017-10-23 09:24:14 -07:00
committed by David S. Miller
parent 9a5ab8bf1d
commit 004b45c0e5
3 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/bpf/bpftool/map.c
View File

@@ -651,6 +651,8 @@ exit_free:
free(value);
close(fd);
if (!err && json_output)
jsonw_null(json_wtr);
return err;
}
@@ -812,16 +814,28 @@ exit_free:
free(key);
close(fd);
if (!err && json_output)
jsonw_null(json_wtr);
return err;
}
static int do_pin(int argc, char **argv)
{
return do_pin_any(argc, argv, bpf_map_get_fd_by_id);
int err;
err = do_pin_any(argc, argv, bpf_map_get_fd_by_id);
if (!err && json_output)
jsonw_null(json_wtr);
return err;
}
static int do_help(int argc, char **argv)
{
if (json_output) {
jsonw_null(json_wtr);
return 0;
}
fprintf(stderr,
"Usage: %s %s show [MAP]\n"
" %s %s dump MAP\n"