AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-03-07 01:47:48 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

bpftool: Fix bpftool net output

Browse Source 
Print `bpftool net` output to stdout instead of stderr. Only errors
should be printed to stderr. Regular output should go to stdout and this
is what all other subcommands of bpftool do, including --json and
--pretty formats of `bpftool net` itself.

Fixes: commit f6f3bac08f ("tools/bpf: bpftool: add net support")
Signed-off-by: Andrey Ignatov <rdna@fb.com>
Acked-by: Yonghong Song <yhs@fb.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Andrey Ignatov 2018-09-25 15:20:37 -07:00 committed by Daniel Borkmann
parent 1042caa79e
commit 53d6eb08e9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/bpf/bpftool/netlink_dumper.h
View File

@ -16,7 +16,7 @@
jsonw_name(json_wtr, name); \ jsonw_name(json_wtr, name); \
jsonw_start_object(json_wtr); \ jsonw_start_object(json_wtr); \
} else { \ } else { \
fprintf(stderr, "%s {", name); \ fprintf(stdout, "%s {", name); \
} \ } \
} }
@ -25,7 +25,7 @@
if (json_output) \ if (json_output) \
jsonw_start_object(json_wtr); \ jsonw_start_object(json_wtr); \
else \ else \
fprintf(stderr, "{"); \ fprintf(stdout, "{"); \
} }
#define NET_END_OBJECT_NESTED \ #define NET_END_OBJECT_NESTED \
@ -33,7 +33,7 @@
if (json_output) \ if (json_output) \
jsonw_end_object(json_wtr); \ jsonw_end_object(json_wtr); \
else \ else \
fprintf(stderr, "}"); \ fprintf(stdout, "}"); \
} }
#define NET_END_OBJECT \ #define NET_END_OBJECT \
@ -47,7 +47,7 @@
if (json_output) \ if (json_output) \
jsonw_end_object(json_wtr); \ jsonw_end_object(json_wtr); \
else \ else \
fprintf(stderr, "\n"); \ fprintf(stdout, "\n"); \
} }
#define NET_START_ARRAY(name, fmt_str) \ #define NET_START_ARRAY(name, fmt_str) \
@ -56,7 +56,7 @@
jsonw_name(json_wtr, name); \ jsonw_name(json_wtr, name); \
jsonw_start_array(json_wtr); \ jsonw_start_array(json_wtr); \
} else { \ } else { \
fprintf(stderr, fmt_str, name); \ fprintf(stdout, fmt_str, name); \
} \ } \
} }
@ -65,7 +65,7 @@
if (json_output) \ if (json_output) \
jsonw_end_array(json_wtr); \ jsonw_end_array(json_wtr); \
else \ else \
fprintf(stderr, "%s", endstr); \ fprintf(stdout, "%s", endstr); \
} }
#define NET_DUMP_UINT(name, fmt_str, val) \ #define NET_DUMP_UINT(name, fmt_str, val) \
@ -73,7 +73,7 @@
if (json_output) \ if (json_output) \
jsonw_uint_field(json_wtr, name, val); \ jsonw_uint_field(json_wtr, name, val); \
else \ else \
fprintf(stderr, fmt_str, val); \ fprintf(stdout, fmt_str, val); \
} }
#define NET_DUMP_STR(name, fmt_str, str) \ #define NET_DUMP_STR(name, fmt_str, str) \
@ -81,7 +81,7 @@
if (json_output) \ if (json_output) \
jsonw_string_field(json_wtr, name, str);\ jsonw_string_field(json_wtr, name, str);\
else \ else \
fprintf(stderr, fmt_str, str); \ fprintf(stdout, fmt_str, str); \
} }
#define NET_DUMP_STR_ONLY(str) \ #define NET_DUMP_STR_ONLY(str) \
@ -89,7 +89,7 @@
if (json_output) \ if (json_output) \
jsonw_string(json_wtr, str); \ jsonw_string(json_wtr, str); \
else \ else \
fprintf(stderr, "%s ", str); \ fprintf(stdout, "%s ", str); \
} }
#endif #endif