From patchwork Wed Sep 5 03:33:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangbin Liu X-Patchwork-Id: 966207 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GB2sEduk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 424q7W6XrSz9s5c for ; Wed, 5 Sep 2018 13:34:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726520AbeIEICQ (ORCPT ); Wed, 5 Sep 2018 04:02:16 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=gB7AQ0vsF483ugjBvhxXSTVZSBq+gmx/FpnYdfhj0bA=; b=GB2sEdukNGbedQhL1icEEpupUbCD+bK3pkN3HCeBi7+Y8+Q7kPLP7XpUQ6aNXQemkJ fWMN2hamAHRiUa3BbsvrX2oNe0svleD+JAxi+ReqFXYA9b5RedkOVLsV3QEKhVp4sc5o gOA0FqS1slDerliG3/FpfarkG73TzUY4qlLtUwn4R9LADf0A8msP5JNq2Q/dliQDZP+N MthCSEhSOK41SREbE63T3RFGGp0f5T8PGFRCLfI49DKCtzG9W+J2tKCphyWSMsmE1uzf dMn5x18qAfblv4Vwd6KZVSeb9ifOYG4ZVjT88yCXxcHQ8KHodIXJ0vcK5CL8YJ0ioUHk 78EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=gB7AQ0vsF483ugjBvhxXSTVZSBq+gmx/FpnYdfhj0bA=; b=Lp+5OSw4l6VxoVmTDJBpcQBq6UiCIqUBQ/4NCKctV54deoTDWxD8hSu1l13oWWliZP Fjmd5hF9f6qbN2C84In+NJx2ak+PMp5c3uHbnS7rfgsihQ8RyxmXtQQu3A7Zx+0wO3H+ i3t7T2x5PXNt610cYpXjMY3hFCRb6Foe8BfzOygy5eFMZYvqBVpzy9SB/p00mqh8Bso1 9/MHy+XR3+BwQPYklMi2pRK0qnnSPWKqJO7sYmwpcNATZY1UfpmgIipbkFlZ7xAHuKnM G5xedZQbGp8MOaPA6ZyVpxtBSiEoKOnRvUsqwriZnreY41y3TgTSofnzWJXvzNrn7F64 oV0w== X-Gm-Message-State: APzg51AB6ioZGFnsfbJ/lf6s7KX1GUyrLzmKbCLZZVitMI3SCXr5qpWs GegdosuYNnGp8W4UERgAEPv15meA X-Google-Smtp-Source: ANB0VdZ+FSzW7VfbRpZJGkiDmFO0Nb7I53p9pKTvl23sROxBSYZcL7ar/ptKuGZCe5x8zfCzbhVwXw== X-Received: by 2002:a17:902:7d87:: with SMTP id a7-v6mr30325944plm.103.1536118451029; Tue, 04 Sep 2018 20:34:11 -0700 (PDT) Received: from leo.usersys.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id s85-v6sm619127pfa.116.2018.09.04.20.34.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Sep 2018 20:34:10 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Stephen Hemminger , David Ahern , 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> X-Mailer: git-send-email 2.5.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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(); }