From patchwork Sat Aug 14 18:47:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gokul Sivakumar X-Patchwork-Id: 497334 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D07FC4338F for ; Sat, 14 Aug 2021 18:50:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B54F6044F for ; Sat, 14 Aug 2021 18:50:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239057AbhHNSua (ORCPT ); Sat, 14 Aug 2021 14:50:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233256AbhHNSu3 (ORCPT ); Sat, 14 Aug 2021 14:50:29 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3C8FC061764 for ; Sat, 14 Aug 2021 11:50:00 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id j1so20231215pjv.3 for ; Sat, 14 Aug 2021 11:50:00 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=xkpSi38oXZami+XwnhE9QZye75VIwwT4zuGFKimZ9UQ=; b=uIktSVbku+dadRzGT0NaiQI7zgB9CQ1M/2iBlb1NL7gwaI1/C6mag5mdYAHJJ+wOOb 2PrD2W/hBqLE5nQMdmxXoIE7aVylJ9X1bcgPubMjtXINrHPdw7iSz0zmY2iV8BlqKsOG SbCqjNYVsTb6BoLBpNaQw41HgCmjihqChpysX+hz0IGfryrVwnjTIKc/LxvhdIsskHsZ Ss8mE/ONSen9y/r5PfWAceJN+DJLnS/z+2Kr8eastirA6EkacbQ/sBpyAUKEBgDS8ZtH /fmk+jXtB2fnApMtI+ZwVQiBxOgb8wE/Fs2vN31H8bGkuFwL6ryv/IMByTM3DEnVn3OV biYA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=xkpSi38oXZami+XwnhE9QZye75VIwwT4zuGFKimZ9UQ=; b=oEllU7hE5Vcu0z49FyDqcg1Bj4bQ/AXy1WJbZEUrFJzwusVip6mDEkuOT/0fQ70Gsa CFNhkJpILwknO7SsOqXHkenRMBYYpGQyKXWlnwldfJPeXBcUr1KEXA8opWm8qcLu/bGU YSX4g03RSpqhsg4195AywtEmBlnu3v31NuF5AQN+Ah6Q0xru6hcAULeudBMJ0RnXta5S 6WzAvZQiVMAkmETrovAfhyAh1PBcedZ1lXC/scVXm9YeDdEJLoaf+aaAlB9dc4fzMVGv 4pDY2YWFLNa4YAa8BxLjCuEiRX9NSCk+0sIolBzFZknRpdPKBnCPqLLXA8lMxDuJLtV8 sNkA== X-Gm-Message-State: AOAM530SvsEtDEZVSjAPMu0hqeREGIRGvVBaW9eCghEjQ5W+WE8+Wa2c wG5To6qz75INvDzdqkb73Xo+KV5MbtrG+h9Y X-Google-Smtp-Source: ABdhPJweOte7VJ9qtzz7kA40uijDAZN9IKqz7TQeq8vfnkCOIpP8fWNUWYfQlx0a0oXnfzYSIZ9m6w== X-Received: by 2002:a17:90b:104b:: with SMTP id gq11mr8493676pjb.64.1628967000386; Sat, 14 Aug 2021 11:50:00 -0700 (PDT) Received: from lattitude.lan ([49.206.113.179]) by smtp.googlemail.com with ESMTPSA id r16sm5294736pje.10.2021.08.14.11.49.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Aug 2021 11:50:00 -0700 (PDT) From: Gokul Sivakumar To: netdev@vger.kernel.org, David Ahern , Stephen Hemminger Cc: Gokul Sivakumar Subject: [PATCH iproute2-next v2 1/3] bridge: reorder cmd line arg parsing to let "-c" detected as "color" option Date: Sun, 15 Aug 2021 00:17:25 +0530 Message-Id: <20210814184727.2405108-2-gokulkumar792@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210814184727.2405108-1-gokulkumar792@gmail.com> References: <20210814184727.2405108-1-gokulkumar792@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As per the man/man8/bridge.8 page, the shorthand cmd line arg "-c" can be used to colorize the bridge cmd output. But while parsing the args in while loop, matches() detects "-c" as "-compressedvlans" instead of "-color", so fix this by doing the check for "-color" option first before checking for "-compressedvlans". Signed-off-by: Gokul Sivakumar --- bridge/bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridge/bridge.c b/bridge/bridge.c index f7bfe0b5..48b0e7f8 100644 --- a/bridge/bridge.c +++ b/bridge/bridge.c @@ -149,9 +149,9 @@ main(int argc, char **argv) NEXT_ARG(); if (netns_switch(argv[1])) exit(-1); + } else if (matches_color(opt, &color)) { } else if (matches(opt, "-compressvlans") == 0) { ++compress_vlans; - } else if (matches_color(opt, &color)) { } else if (matches(opt, "-force") == 0) { ++force; } else if (matches(opt, "-json") == 0) { From patchwork Sat Aug 14 18:47:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gokul Sivakumar X-Patchwork-Id: 497597 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8240DC4338F for ; Sat, 14 Aug 2021 18:50:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 68E5A60EE5 for ; Sat, 14 Aug 2021 18:50:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239046AbhHNSud (ORCPT ); Sat, 14 Aug 2021 14:50:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233256AbhHNSuc (ORCPT ); Sat, 14 Aug 2021 14:50:32 -0400 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3B48C061764 for ; Sat, 14 Aug 2021 11:50:03 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id 28-20020a17090a031cb0290178dcd8a4d1so14093360pje.0 for ; Sat, 14 Aug 2021 11:50:03 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=o7d1Of6Q0IHb2d2A0JAJ2UbdazS+8z9xR48ep8nqw7o=; b=fvd5WNiRoXdopwENdskP0i7XtulJ4FUbfmOzVcclKhy3ta+jK6StUolKE/IQXqUFA5 0NZlctmkR/FgwzIZkUAItAtvKU4bGSi0TwWe4YOAs08tmGe90EmQ+/Pa7GAIv8Kyv5RR jeou72lxKcWUzXQwkFXfy9W6Noqpd4Sy0zTVUDmyoTm6igOTkN5Lzqzl9+VkufsunDTG KdEk22cS6UFPG0wRiDxXx3cL3j7PbERnnbgC4e6JgXcAxhs6LrIglYj8Dxo2aemNocs5 AQ8gWK5ntyq23VzCVDYvybp9MqIG3I/kKZWLCfjvdOtnwJGdA39/flHVKVBWauTbNqIT wCUw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=o7d1Of6Q0IHb2d2A0JAJ2UbdazS+8z9xR48ep8nqw7o=; b=Pmuvwf9ZCo72Kn3m4Qw2z02gKFzD2VXpnDp+ZKMgJQVP5/9u0+fnc4PoOiWhv6hL6Y rfb5T8p6lW9jSsYmUYVz7qTOruTe5+utvOawterCkUgRL23HP+9QSqPcg6toR0DLaieN LjyTlBKT894ZrsjEFlZgaU2PB4QPzxRwv8nCh+I9RhXDUjE9ougWwSp7iLgw5FekuZ8w hkZ9onSXG92HeJ9aDoK08koX5HBjwJM8lTChCDQTcpRkYS6cQ21eGNayWsIPwBamf164 WfWT0h3tIjWfQvVqS5Kvzwdl8JIKEjmcC7/aJWQ3f2DlTMQJDUMcgYCYFczFyqe9/A7l Hj+w== X-Gm-Message-State: AOAM530eXPfPF+IW032uadzpbqucv40pXypBY3L7i/CfWge7BvEfyeQo bEKLNM9p+mFVuB43nn0t8qvBQ9OCBbWTLTSm X-Google-Smtp-Source: ABdhPJyK/kxgLpRUoNvlS+DKw1k4sHeOqcFMIERah6yl9qhObixEoyh1WsF5AI3moMo6u44PPHZ2nA== X-Received: by 2002:a17:90b:a12:: with SMTP id gg18mr8289973pjb.78.1628967003079; Sat, 14 Aug 2021 11:50:03 -0700 (PDT) Received: from lattitude.lan ([49.206.113.179]) by smtp.googlemail.com with ESMTPSA id r16sm5294736pje.10.2021.08.14.11.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Aug 2021 11:50:02 -0700 (PDT) From: Gokul Sivakumar To: netdev@vger.kernel.org, David Ahern , Stephen Hemminger Cc: Gokul Sivakumar Subject: [PATCH iproute2-next v2 2/3] bridge: fdb: don't colorize the "dev" & "dst" keywords in "bridge -c fdb" Date: Sun, 15 Aug 2021 00:17:26 +0530 Message-Id: <20210814184727.2405108-3-gokulkumar792@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210814184727.2405108-1-gokulkumar792@gmail.com> References: <20210814184727.2405108-1-gokulkumar792@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To be consistent with the colorized output of "ip" command and to increase readability, stop highlighting the "dev" & "dst" keywords in the colorized output of "bridge -c fdb" cmd. Example: in the following "bridge -c fdb" entry, only "00:00:00:00:00:00", "vxlan100" and "2001:db8:2::1" fields should be highlighted in color. 00:00:00:00:00:00 dev vxlan100 dst 2001:db8:2::1 self permanent Signed-off-by: Gokul Sivakumar --- bridge/fdb.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bridge/fdb.c b/bridge/fdb.c index 37465e46..ea61f65a 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -192,10 +192,14 @@ int print_fdb(struct nlmsghdr *n, void *arg) "mac", "%s ", lladdr); } - if (!filter_index && r->ndm_ifindex) + if (!filter_index && r->ndm_ifindex) { + if (!is_json_context()) + print_string(PRINT_FP, NULL, "dev ", NULL); + print_color_string(PRINT_ANY, COLOR_IFNAME, - "ifname", "dev %s ", + "ifname", "%s ", ll_index_to_name(r->ndm_ifindex)); + } if (tb[NDA_DST]) { int family = AF_INET; @@ -208,9 +212,12 @@ int print_fdb(struct nlmsghdr *n, void *arg) RTA_PAYLOAD(tb[NDA_DST]), RTA_DATA(tb[NDA_DST])); + if (!is_json_context()) + print_string(PRINT_FP, NULL, "dst ", NULL); + print_color_string(PRINT_ANY, ifa_family_color(family), - "dst", "dst %s ", dst); + "dst", "%s ", dst); } if (vid) From patchwork Sat Aug 14 18:47:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gokul Sivakumar X-Patchwork-Id: 497333 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65F7DC4338F for ; Sat, 14 Aug 2021 18:50:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4EF3D60EE5 for ; Sat, 14 Aug 2021 18:50:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239078AbhHNSuk (ORCPT ); Sat, 14 Aug 2021 14:50:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233870AbhHNSuf (ORCPT ); Sat, 14 Aug 2021 14:50:35 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2AA7C061764 for ; Sat, 14 Aug 2021 11:50:06 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id cp15-20020a17090afb8fb029017891959dcbso25830195pjb.2 for ; Sat, 14 Aug 2021 11:50:06 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=YiG0yf/5wgs/7bW0GtAApT1I94eSGtteWf/SCyGxK60=; b=ZSBKAY5SVXsDirai8GbkoELklBKSaQxsN2MoKBhKbmGtANukS+lSl2lxrGEQ7umxBt m3/q8tgw+m++M21nLbpGtm3a8K1f5uSswEz3iaIJA7FQBUUNExAyixF+mXd4NK3v6M4x bv+aUOpIzTUpJsM3XBZB3dZk49COqhAELzzr5lW0CE+337xBfod6u3dUd8iZk841rvhm 7GWSXhYgfWcMjHs8lZcz9cW11I9HBhOYr33fZ4OyeN+RsQMY/sgCLROUqdIk5D5ozHVP Y4+web+26EZmITUPObalP1KZEIkngNVjMjbvmGM1OAhn4AP1D9CtRYukyMaNXAVi1qGi Welw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=YiG0yf/5wgs/7bW0GtAApT1I94eSGtteWf/SCyGxK60=; b=cjYirlgQ4gadJ8hDtMrB/2Y+zf4fGwKtGPrLuxwxF0xGOjL2ld4asn8xPTLHQoEsJN DV1mIsZv4uwLcUJaihSR3qUs5R+eg1Kk5IIJrFdvGUSBBk8Nuez7KFcXqBDRDda2PRSh yOKWE1ocOX6NTEDnUkOzfbxISO/ir7f6eNZrsIEgNFWV8a3ZUxiUGI+V3xuyEfXsnJCE k52yjg2c2BwWoqDfByUB9yG80RRJNs80hMFN6zIm+b8WM/8kf+fKf4GJP+7jRxPp5Pj/ kHl/frEtUXr/PyMzjL1Zkg8/xdFspNNSLCy78XqplIysRCDaG+rmPNl4uMoiiGd0hGzr 83eA== X-Gm-Message-State: AOAM533nziTkHNUhN0CJVZGxCSKNhXkGwovI9m+aDFxyO3Ekd/pYPBr1 oqEbR5lRsQecSwYwhTqLV2GWRPyyP5YpJCaC X-Google-Smtp-Source: ABdhPJyci/Yp9Y6kH3/UOND2m7+oVMVKzMOYPl/Xg9zroHIm9Wb4n6krX0dxeH4RoAe9ZpQi5cRz9A== X-Received: by 2002:a17:90b:3794:: with SMTP id mz20mr4071219pjb.63.1628967006150; Sat, 14 Aug 2021 11:50:06 -0700 (PDT) Received: from lattitude.lan ([49.206.113.179]) by smtp.googlemail.com with ESMTPSA id r16sm5294736pje.10.2021.08.14.11.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Aug 2021 11:50:05 -0700 (PDT) From: Gokul Sivakumar To: netdev@vger.kernel.org, David Ahern , Stephen Hemminger Cc: Gokul Sivakumar Subject: [PATCH iproute2-next v2 3/3] man: bridge: fix the typo to change "-c[lor]" into "-c[olor]" in man page Date: Sun, 15 Aug 2021 00:17:27 +0530 Message-Id: <20210814184727.2405108-4-gokulkumar792@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210814184727.2405108-1-gokulkumar792@gmail.com> References: <20210814184727.2405108-1-gokulkumar792@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes: 3a1ca9a5b ("bridge: update man page for new color and json changes") Signed-off-by: Gokul Sivakumar --- man/man8/bridge.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/man8/bridge.8 b/man/man8/bridge.8 index eec7df43..db83a2a6 100644 --- a/man/man8/bridge.8 +++ b/man/man8/bridge.8 @@ -22,7 +22,7 @@ bridge \- show / manipulate bridge addresses and devices \fB\-s\fR[\fItatistics\fR] | \fB\-n\fR[\fIetns\fR] name | \fB\-b\fR[\fIatch\fR] filename | -\fB\-c\fR[\folor\fR] | +\fB\-c\fR[\fIolor\fR] | \fB\-p\fR[\fIretty\fR] | \fB\-j\fR[\fIson\fR] | \fB\-o\fR[\fIneline\fr] }