From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hangbin Liu Subject: [PATCHv2 iproute2] bridge/mdb: fix missing new line when show bridge mdb Date: Tue, 11 Sep 2018 09:26:35 +0800 Message-ID: <1536629195-12540-1-git-send-email-liuhangbin@gmail.com> References: <1536118423-20604-1-git-send-email-liuhangbin@gmail.com> Cc: Stephen Hemminger , David Ahern , Phil Sutter , Hangbin Liu To: netdev@vger.kernel.org Return-path: Received: from mail-pg1-f196.google.com ([209.85.215.196]:32801 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726353AbeIKGXe (ORCPT ); Tue, 11 Sep 2018 02:23:34 -0400 Received: by mail-pg1-f196.google.com with SMTP id s7-v6so11378994pgc.0 for ; Mon, 10 Sep 2018 18:26:49 -0700 (PDT) In-Reply-To: <1536118423-20604-1-git-send-email-liuhangbin@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: The bridge mdb show is broken on current iproute2. e.g. ]# bridge mdb show 34: br0 veth0_br 224.1.1.2 temp 34: br0 veth0_br 224.1.1.1 temp After fix: ]# bridge mdb show 34: br0 veth0_br 224.1.1.2 temp 34: br0 veth0_br 224.1.1.1 temp v2: use json print lib as Stephen suggested. Reported-by: Ying Xu Fixes: c7c1a1ef51aea ("bridge: colorize output and use JSON print library") Signed-off-by: Hangbin Liu --- bridge/mdb.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bridge/mdb.c b/bridge/mdb.c index f38dc67..408117d 100644 --- a/bridge/mdb.c +++ b/bridge/mdb.c @@ -107,6 +107,10 @@ static void br_print_router_ports(FILE *f, struct rtattr *attr, fprintf(f, "%s ", port_ifname); } } + + if (!is_json_context() && !show_stats) + print_string(PRINT_FP, NULL, "\n", NULL); + close_json_array(PRINT_JSON, NULL); } @@ -164,6 +168,10 @@ static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e, print_string(PRINT_ANY, "timer", " %s", format_timer(timer)); } + + if (!is_json_context()) + print_string(PRINT_FP, NULL, "\n", NULL); + close_json_object(); } -- 2.5.5