From patchwork Tue Aug 17 17:28:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gokul Sivakumar X-Patchwork-Id: 498597 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.8 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 B3494C4338F for ; Tue, 17 Aug 2021 17:28:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 98F1260231 for ; Tue, 17 Aug 2021 17:28:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231452AbhHQR3F (ORCPT ); Tue, 17 Aug 2021 13:29:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231837AbhHQR3D (ORCPT ); Tue, 17 Aug 2021 13:29:03 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10289C061764 for ; Tue, 17 Aug 2021 10:28:30 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id n13-20020a17090a4e0d00b0017946980d8dso6405334pjh.5 for ; Tue, 17 Aug 2021 10:28:30 -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=WQONYWKd4ubtFSEQqseJqp+S0FcKXr+9DRiMqqkq7nlAqwJSA6OIkSOUeSXEBn/vej T6hV0ipZek2LFVTFd5au4d7D+VuHeLvidn20BkHmfBUH8Ro3fbLA/ua9j5HT7PLytRSL 4asJgpSKwQMVnwR8Loig0ovqK9ZpVjQ2hZEx0fMJzpmrnjnGxHmSjKe89dws8eiA5P2u +sQKM7g26Gz+ou6qoohMWyH4lUPChE7Hy7UosU7rA5RO6D3xmNbPS7/fT99hsemEcn0P XYjDagQCTkxotiw6UJo7waPVaQiiNfzdcuXzOpfHk/U5mrFa5DKzEkAgmN07MRhN/Ht0 KQFg== 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=EH2Ly69WAuMvPR2ZGYhgd/yCBm3xr9xlo6UD1kXDvsaifGHlkCmqwpqvzixBTCow8f Fz2KTokyT9thg8jZ4DPg9xIjuqmZqn6LvmP6wU5/a3LI5sG4Q23NCmmzu43E13PmWxA+ WtDst+hE33Lz04RkW81OzjdX36iaReiMfBtmUim8u11PQbYLwawnpXAW/M0ivYMMjYRS In78Ye5ToqhOM5baAtpMpThmWfPfm9Dd92JfeAx8jE1R7ksZ+APETAYWamVSJDlID5iB KXw9AwQrCC4iFfnyJavJxRMSZ9YYfqrxJhJe6EfbShkVDj1ici/rTITZEevTc82x7Tsy ePPQ== X-Gm-Message-State: AOAM533ltJMenyAQihV/E8kvA/n+YL22lOnumbQZiT2InP24IDIx6K/I fLw2bypA+e5RbJLrJOGgB29TW2GqeifvoJcQ X-Google-Smtp-Source: ABdhPJy+HKRXwpaq1lwg7mPFIKXh9fsOuAOWOBUJSoFeGCRxM3wgINi3hhTz0GzMzUJnmlnhFEvrfQ== X-Received: by 2002:a17:90a:1f44:: with SMTP id y4mr4724912pjy.51.1629221309415; Tue, 17 Aug 2021 10:28:29 -0700 (PDT) Received: from lattitude.lan ([49.206.114.79]) by smtp.googlemail.com with ESMTPSA id y5sm3872096pgs.27.2021.08.17.10.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Aug 2021 10:28:29 -0700 (PDT) From: Gokul Sivakumar To: netdev@vger.kernel.org, David Ahern , Stephen Hemminger Cc: Gokul Sivakumar Subject: [PATCH iproute2 v3 1/3] bridge: reorder cmd line arg parsing to let "-c" detected as "color" option Date: Tue, 17 Aug 2021 22:58:05 +0530 Message-Id: <20210817172807.3196427-2-gokulkumar792@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210817172807.3196427-1-gokulkumar792@gmail.com> References: <20210817172807.3196427-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 Tue Aug 17 17:28:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gokul Sivakumar X-Patchwork-Id: 499635 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.8 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 253EEC4338F for ; Tue, 17 Aug 2021 17:28:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0AAA560F58 for ; Tue, 17 Aug 2021 17:28:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232272AbhHQR3I (ORCPT ); Tue, 17 Aug 2021 13:29:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232253AbhHQR3H (ORCPT ); Tue, 17 Aug 2021 13:29:07 -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 0B103C06179A for ; Tue, 17 Aug 2021 10:28:34 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id om1-20020a17090b3a8100b0017941c44ce4so6427552pjb.3 for ; Tue, 17 Aug 2021 10:28:34 -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=aeFtRhSEJbzsPSHwAOVZxdiX+JzPhBUDakNsooVwFFY=; b=aw2kNv5zZt/Jzl5qxLU9BG1mlyb2D0Mk+O7qN8HQOjiaCBKoWGt6jneB8Gn/HqBNaQ vP4kwqEQhl/t3zBgXFxYl1RM5SUfBUgxRl46BN1sB2WSb2rZvIwdkllKrtHLWIQFMbCX 3FoDvQPvMu2cbx+BY7PE0fcb64jM2Al0bLUDO4hZmDVWx/KdvZPMQXkuDFmowUb+Aly8 9Mb8KEg/Hf0Xw3x8HTDkRIezw8Y+bWMkTf8vusgK5a5jyBq8VEiLdXU207ZayVGjdOqJ oFHDqktkelVua7G79wcKVowznwpk73GlsLF9E+Emm5HQmR6mYSeR7r5O+oVsoizU+MlI zicw== 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=aeFtRhSEJbzsPSHwAOVZxdiX+JzPhBUDakNsooVwFFY=; b=IHekq7aVQwlk9W4fiXgBenF/LFi/EVSbxlA3tPo9yIlONFLdDWknOX8Lr3X51meJtM /jGAoylT8VGJpDbYkgYW9mDpU9lotyTXQ1atq65oqB5pcmsf9n7K+p6hjrd1kZ4jFtMm baQlfUxeptdqGPnA2XcBc6Fk1T8i9wbNfgR9GkSve+PIQsmxrtsvNVueyNanBzahH/kG F6l3QYnW9PfCco2u20fmRg0sfkoz6EMgJdbDFdUBos9a2k7xIA/X3UObgauxWyvQLarZ oXiYk+mMA/Ju6TVpIVRU2XsAnGzO3J6hS68ooc9M1jigynurLFfTUf7N5YlgRVS8L6if uNWA== X-Gm-Message-State: AOAM530jZaR4DjKf4l/divVAjdarjjXD37HaeCdJCkD1ilOsPbt4zEOC iw72ssQ859YMttOoZBngXxTRsyfIn9Jq72y4 X-Google-Smtp-Source: ABdhPJw5OyiXb9BUWMGbSNLv8vciY+HfNtZ2Tjwj699ZPrmosNfiQpvuLygLpT4hRq1km5qpbb0jWA== X-Received: by 2002:a17:902:c401:b0:12d:b1c4:5df3 with SMTP id k1-20020a170902c40100b0012db1c45df3mr3620806plk.15.1629221313379; Tue, 17 Aug 2021 10:28:33 -0700 (PDT) Received: from lattitude.lan ([49.206.114.79]) by smtp.googlemail.com with ESMTPSA id y5sm3872096pgs.27.2021.08.17.10.28.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Aug 2021 10:28:32 -0700 (PDT) From: Gokul Sivakumar To: netdev@vger.kernel.org, David Ahern , Stephen Hemminger Cc: Gokul Sivakumar Subject: [PATCH iproute2 v3 2/3] bridge: fdb: don't colorize the "dev" & "dst" keywords in "bridge -c fdb" Date: Tue, 17 Aug 2021 22:58:06 +0530 Message-Id: <20210817172807.3196427-3-gokulkumar792@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210817172807.3196427-1-gokulkumar792@gmail.com> References: <20210817172807.3196427-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 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bridge/fdb.c b/bridge/fdb.c index 37465e46..8912f092 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -192,10 +192,13 @@ int print_fdb(struct nlmsghdr *n, void *arg) "mac", "%s ", lladdr); } - if (!filter_index && r->ndm_ifindex) + if (!filter_index && r->ndm_ifindex) { + 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 +211,11 @@ int print_fdb(struct nlmsghdr *n, void *arg) RTA_PAYLOAD(tb[NDA_DST]), RTA_DATA(tb[NDA_DST])); + 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 Tue Aug 17 17:28:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gokul Sivakumar X-Patchwork-Id: 498596 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.8 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 BDCCBC4338F for ; Tue, 17 Aug 2021 17:29:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A7A060231 for ; Tue, 17 Aug 2021 17:29:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232253AbhHQRaK (ORCPT ); Tue, 17 Aug 2021 13:30:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232301AbhHQR3J (ORCPT ); Tue, 17 Aug 2021 13:29:09 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F060C061764 for ; Tue, 17 Aug 2021 10:28:36 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id n13-20020a17090a4e0d00b0017946980d8dso6405926pjh.5 for ; Tue, 17 Aug 2021 10:28:36 -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=Ab9w0u0f+XjH+v0VZ7oInuANGo0mNOViwHc1HjGyrPgONsg4iMEzLrsrpA9FaaqSnR 22+d9QGjCMJO71WgC0f6H9v5cGG6iMz+12C3ZspYIQga4ujGt92KoURcP5Q+U/8wHra3 h0Q3hL684ICK8OonsHjV6IlM//ovj6cabljsfs+AIN8HMGGfEUTezCaFW7aEj3PeNrSZ b5rnQ9C5o9XQ876AKzaHyh2Ew1fgnELQiDGo8g9MME7D7Cnat0aodUxMqOUT0sHd/ehN SYgSV3JO36M7hjLbaKg06Gs9Zxn5yKIVRhT0K0lj3LUi+iUaUZBq9WzbCoweW588IWxg sLAw== 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=TZBNGWxAVdE0c0p21NateJnY/zp3wj0/zWd0yYq0j0BDphk0zpDKYnuWZpdpIl6zM3 yvIk4z5WOQXq4deVK7FN9twijYm4U7v6DC0TTfn+TVvKUVr6vFsaKtvWtjguSRA09GhC NNkBHF11ZQi5I6CxoLdmwV1F90Qb8k05jARthemBNZkjc/SL+M3VezzVqaKr/JbMxyTw wgO1gpwg6TF4/qg1ty8hXFRlaPn70zcd8LtIk+Jkmfbee+1fn3kyeLFTBVN+ZItegqNh jsIOeDlo5hieiPjMZeo/YvQtacjYlxKkUSqU6wJUtJFgblmh/lv75T15ErdZoamCVdNl GY0Q== X-Gm-Message-State: AOAM533g6PeZxj6d0MeHCoqtl7S3LZrG2hnq+/KlXemsHvibS8lN9OKJ eJhuvs4p3FJdJ7216QcEk4jTGLhNqHA7pEc1 X-Google-Smtp-Source: ABdhPJwD56RUEqAKTVsZq+kjRfQl3bIoVtTF2yL72ovLr8L5AGxiVtasHfZhH5Bo7viw4QCgApUY4g== X-Received: by 2002:a17:902:ac87:b029:12d:3e59:cb7d with SMTP id h7-20020a170902ac87b029012d3e59cb7dmr3640415plr.22.1629221315796; Tue, 17 Aug 2021 10:28:35 -0700 (PDT) Received: from lattitude.lan ([49.206.114.79]) by smtp.googlemail.com with ESMTPSA id y5sm3872096pgs.27.2021.08.17.10.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Aug 2021 10:28:35 -0700 (PDT) From: Gokul Sivakumar To: netdev@vger.kernel.org, David Ahern , Stephen Hemminger Cc: Gokul Sivakumar Subject: [PATCH iproute2 v3 3/3] man: bridge: fix the typo to change "-c[lor]" into "-c[olor]" in man page Date: Tue, 17 Aug 2021 22:58:07 +0530 Message-Id: <20210817172807.3196427-4-gokulkumar792@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210817172807.3196427-1-gokulkumar792@gmail.com> References: <20210817172807.3196427-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] }