From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hangbin Liu Subject: [PATCH iproute2] bridge/mdb: fix missing new line when show bridge mdb Date: Wed, 5 Sep 2018 11:33:43 +0800 Message-ID: <1536118423-20604-1-git-send-email-liuhangbin@gmail.com> Cc: Stephen Hemminger , David Ahern , Hangbin Liu To: netdev@vger.kernel.org Return-path: Received: from mail-pl1-f194.google.com ([209.85.214.194]:40259 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725939AbeIEICQ (ORCPT ); Wed, 5 Sep 2018 04:02:16 -0400 Received: by mail-pl1-f194.google.com with SMTP id s17-v6so2593954plp.7 for ; Tue, 04 Sep 2018 20:34:11 -0700 (PDT) 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 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..d89c065 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) + fprintf(f, "\n"); + 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()) + fprintf(f, "\n"); + close_json_object(); } -- 2.5.5