From: Davide Caratti Date: Thu, 11 Nov 2021 09:52:13 +0000 (+0100) Subject: mptcp: fix JSON output when dumping endpoints by id X-Git-Tag: v5.16.0~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bd5ab0f091301033e68b5c3ec34b091d7aa8306;p=thirdparty%2Fiproute2.git mptcp: fix JSON output when dumping endpoints by id iproute ignores '-j' command line argument when dumping endpoints by id: [dcaratti@dcaratti iproute2]$ ./ip/ip -j mptcp endpoint show [{"address":"1.2.3.4","id":42,"signal":true,"backup":true}] [dcaratti@dcaratti iproute2]$ ./ip/ip -j mptcp endpoint show id 42 1.2.3.4 id 42 signal backup fix mptcp_addr_show() to use the proper JSON helpers. Fixes: 7e0767cd862b ("add support for mptcp netlink interface") Signed-off-by: Davide Caratti Acked-by: Andrea Claudi Signed-off-by: Stephen Hemminger --- diff --git a/ip/ipmptcp.c b/ip/ipmptcp.c index 0f5b6e2d0..857004446 100644 --- a/ip/ipmptcp.c +++ b/ip/ipmptcp.c @@ -305,7 +305,11 @@ static int mptcp_addr_show(int argc, char **argv) if (rtnl_talk(&genl_rth, &req.n, &answer) < 0) return -2; - return print_mptcp_addr(answer, stdout); + new_json_obj(json); + ret = print_mptcp_addr(answer, stdout); + delete_json_obj(); + fflush(stdout); + return ret; } static int mptcp_addr_flush(int argc, char **argv)