From patchwork Mon Apr 27 23:50:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 1278077 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.a=rsa-sha256 header.s=google header.b=e15KRVd0; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49B1kh5CxNz9sRY for ; Tue, 28 Apr 2020 09:51:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726381AbgD0XvH (ORCPT ); Mon, 27 Apr 2020 19:51:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726244AbgD0XvG (ORCPT ); Mon, 27 Apr 2020 19:51:06 -0400 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35C24C0610D5 for ; Mon, 27 Apr 2020 16:51:05 -0700 (PDT) Received: by mail-pf1-x434.google.com with SMTP id 18so8574027pfv.8 for ; Mon, 27 Apr 2020 16:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=EH8Sl7z522Zd8cUL5SMXyaBdw4FbKuGabTcfzp6iVp0=; b=e15KRVd0mwbMy8jlxszzmC2IbB8hynkcGAXxI9UKTlkW9KQSHbsdh2ORkpnTeTP3Ia HTfnkNfI4Fb2ZVMKZxinL9ecJ/Qocwz06E60SPFTkzosyxbKiNKo5bLaxu2Ays7wjHmH dqyF7+ZkX0Qe5mxUk16/FvO4kFdhy8fuyWkPs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EH8Sl7z522Zd8cUL5SMXyaBdw4FbKuGabTcfzp6iVp0=; b=OItIXYGV8bEkQgpeVv8EYcHBLs9HZX903PQsc/LxNVuh1CFU/2HpJD4RBvoWn+ItLM aGm4J4Y/uoEZKjZcs1E52t0JFOMkKnIbkAmiBDYCJp4Wq8vkDy62abgczlqdLatxzryd oQTMvimSsSAOyblxxfmQ7d5ooYYd8VC+6UXhyZLS2m60c2tMY/fi6tyDahtS93doAG9k N6iML1/HZWUbMmUSZGrRzjXrWGHrXIMbUOrzoe5eEEbB+E/TrbEe0KbiGhlq2XFM0C40 BQ9sEHJgn+yJlfpER5+erCpjtMUJZoLU+6N66MP9EokSPOJnfK+wS1osj1AG3zvQimFs djxQ== X-Gm-Message-State: AGi0PuZimGpUDWNSHsd5xSeIjQc4vOniy8kfhwOiGkzNqu2mp0KuYe/r VnDeJm672xeJX/AUbnbNLJzlErB/Cn0= X-Google-Smtp-Source: APiQypIgTPuc+QO/iSHqEziagX39U/r19KNr8JnwtqUlUCGJ2sOj1mcEiVMCZfMKCdZB+7qqOKkCTw== X-Received: by 2002:a63:fc5d:: with SMTP id r29mr19621050pgk.131.1588031464175; Mon, 27 Apr 2020 16:51:04 -0700 (PDT) Received: from f3.synalogic.ca (ae055068.dynamic.ppp.asahi-net.or.jp. [14.3.55.68]) by smtp.gmail.com with ESMTPSA id 128sm13058106pfy.5.2020.04.27.16.51.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 16:51:03 -0700 (PDT) From: Benjamin Poirier To: netdev@vger.kernel.org Subject: [PATCH iproute2 4/7] bridge: Fix output with empty vlan lists Date: Tue, 28 Apr 2020 08:50:48 +0900 Message-Id: <20200427235051.250058-5-bpoirier@cumulusnetworks.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200427235051.250058-1-bpoirier@cumulusnetworks.com> References: <20200427235051.250058-1-bpoirier@cumulusnetworks.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Consider this configuration: ip link add br0 type bridge ip link add vx0 type vxlan dstport 4789 external ip link set dev vx0 master br0 bridge vlan del vid 1 dev vx0 ip link add vx1 type vxlan dstport 4790 external ip link set dev vx1 master br0 root@vsid:/src/iproute2# ./bridge/bridge vlan port vlan ids br0 1 pvid untagged vx0 None vx1 1 pvid untagged root@vsid:/src/iproute2# Note the useless and inconsistent empty lines. root@vsid:/src/iproute2# ./bridge/bridge vlan tunnelshow port vlan ids tunnel id br0 vx0 None vx1 What's the difference between "None" and ""? root@vsid:/src/iproute2# ./bridge/bridge -j -p vlan tunnelshow [ { "ifname": "br0", "tunnels": [ ] },{ "ifname": "vx1", "tunnels": [ ] } ] Why does vx0 appear in normal output and not json output? Why output an empty list for br0 and vx1? Fix these inconsistencies and avoid outputting entries with no values. This makes the behavior consistent with other iproute2 commands, for example `ip -6 addr`: if an interface doesn't have any ipv6 addresses, it is not part of the listing. Fixes: 8652eeb3ab12 ("bridge: vlan: support for per vlan tunnel info") Signed-off-by: Benjamin Poirier --- bridge/vlan.c | 36 +++++++++++++----------- testsuite/tests/bridge/vlan/show.t | 30 ++++++++++++++++++++ testsuite/tests/bridge/vlan/tunnelshow.t | 2 +- 3 files changed, 50 insertions(+), 18 deletions(-) create mode 100755 testsuite/tests/bridge/vlan/show.t diff --git a/bridge/vlan.c b/bridge/vlan.c index 3ed60951..1ca7322a 100644 --- a/bridge/vlan.c +++ b/bridge/vlan.c @@ -290,8 +290,7 @@ static void print_vlan_tunnel_info(struct rtattr *tb, int ifindex) int rem = RTA_PAYLOAD(list); __u16 last_vid_start = 0; __u32 last_tunid_start = 0; - - open_vlan_port(ifindex, "%s", VLAN_SHOW_TUNNELINFO); + bool opened = false; for (i = RTA_DATA(list); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) { struct rtattr *ttb[IFLA_BRIDGE_VLAN_TUNNEL_MAX+1]; @@ -331,13 +330,20 @@ static void print_vlan_tunnel_info(struct rtattr *tb, int ifindex) else if (vcheck_ret == 0) continue; + if (!opened) { + open_vlan_port(ifindex, "%s", VLAN_SHOW_TUNNELINFO); + opened = true; + } + open_json_object(NULL); print_range("vlan", last_vid_start, tunnel_vid); print_range("tunid", last_tunid_start, tunnel_id); close_json_object(); print_string(PRINT_FP, NULL, "%s", _SL_); } - close_vlan_port(); + + if (opened) + close_vlan_port(); } static int print_vlan(struct nlmsghdr *n, void *arg) @@ -366,16 +372,8 @@ static int print_vlan(struct nlmsghdr *n, void *arg) return 0; parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifm), len); - - /* if AF_SPEC isn't there, vlan table is not preset for this port */ - if (!tb[IFLA_AF_SPEC]) { - if (!filter_vlan && !is_json_context()) { - color_fprintf(stdout, COLOR_IFNAME, "%s", - ll_index_to_name(ifm->ifi_index)); - fprintf(stdout, "\tNone\n"); - } + if (!tb[IFLA_AF_SPEC]) return 0; - } switch (*subject) { case VLAN_SHOW_VLAN: @@ -385,9 +383,7 @@ static int print_vlan(struct nlmsghdr *n, void *arg) print_vlan_tunnel_info(tb[IFLA_AF_SPEC], ifm->ifi_index); break; } - print_string(PRINT_FP, NULL, "%s", _SL_); - fflush(stdout); return 0; } @@ -588,8 +584,7 @@ void print_vlan_info(struct rtattr *tb, int ifindex) struct rtattr *i, *list = tb; int rem = RTA_PAYLOAD(list); __u16 last_vid_start = 0; - - open_vlan_port(ifindex, "%s", VLAN_SHOW_VLAN); + bool opened = false; for (i = RTA_DATA(list); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) { struct bridge_vlan_info *vinfo; @@ -608,6 +603,11 @@ void print_vlan_info(struct rtattr *tb, int ifindex) else if (vcheck_ret == 0) continue; + if (!opened) { + open_vlan_port(ifindex, "%s", VLAN_SHOW_VLAN); + opened = true; + } + open_json_object(NULL); print_range("vlan", last_vid_start, vinfo->vid); @@ -615,7 +615,9 @@ void print_vlan_info(struct rtattr *tb, int ifindex) close_json_object(); print_string(PRINT_FP, NULL, "%s", _SL_); } - close_vlan_port(); + + if (opened) + close_vlan_port(); } int do_vlan(int argc, char **argv) diff --git a/testsuite/tests/bridge/vlan/show.t b/testsuite/tests/bridge/vlan/show.t new file mode 100755 index 00000000..3def2022 --- /dev/null +++ b/testsuite/tests/bridge/vlan/show.t @@ -0,0 +1,30 @@ +#!/bin/sh + +. lib/generic.sh + +ts_log "[Testing vlan show]" + +BR_DEV="$(rand_dev)" +VX0_DEV="$(rand_dev)" +VX1_DEV="$(rand_dev)" + +ts_ip "$0" "Add $BR_DEV bridge interface" link add $BR_DEV type bridge + +ts_ip "$0" "Add $VX0_DEV vxlan interface" \ + link add $VX0_DEV type vxlan dstport 4789 external +ts_ip "$0" "Enslave $VX0_DEV under $BR_DEV" \ + link set dev $VX0_DEV master $BR_DEV +ts_bridge "$0" "Delete default vlan from $VX0_DEV" \ + vlan del dev $VX0_DEV vid 1 +ts_ip "$0" "Add $VX1_DEV vxlan interface" \ + link add $VX1_DEV type vxlan dstport 4790 external +ts_ip "$0" "Enslave $VX1_DEV under $BR_DEV" \ + link set dev $VX1_DEV master $BR_DEV + +# Test that bridge ports without vlans do not appear in the output +ts_bridge "$0" "Show vlan" vlan +test_on_not "$VX0_DEV" + +# Test that bridge ports without tunnels do not appear in the output +ts_bridge "$0" "Show vlan tunnel info" vlan tunnelshow +test_lines_count 1 # header only diff --git a/testsuite/tests/bridge/vlan/tunnelshow.t b/testsuite/tests/bridge/vlan/tunnelshow.t index fd41bfcb..3e9c12a2 100755 --- a/testsuite/tests/bridge/vlan/tunnelshow.t +++ b/testsuite/tests/bridge/vlan/tunnelshow.t @@ -28,6 +28,6 @@ ts_bridge "$0" "Add tunnel with vni > 16k" \ ts_bridge "$0" "Show tunnel info" vlan tunnelshow dev $VX_DEV test_on "1030\s+65556" -test_lines_count 5 +test_lines_count 4 ts_bridge "$0" "Dump tunnel info" -j vlan tunnelshow dev $VX_DEV