From patchwork Sat Aug 14 09:54:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gokul Sivakumar X-Patchwork-Id: 497613 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 64784C4338F for ; Sat, 14 Aug 2021 09:55:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4723060F00 for ; Sat, 14 Aug 2021 09:55:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237720AbhHNJzx (ORCPT ); Sat, 14 Aug 2021 05:55:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237724AbhHNJzw (ORCPT ); Sat, 14 Aug 2021 05:55:52 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAB47C0613CF for ; Sat, 14 Aug 2021 02:55:22 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id n12so14484167plf.4 for ; Sat, 14 Aug 2021 02:55:22 -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=UaqMohjFo+elS2MSyFLXBc3MzsxvlvD6ImWSWlbucthLsR94v+n37av1oNM05ulQtH y+EHYy53FoFRM3MmOlyFfA9JIHyAlklmQLlDI2LwGYtB6FJRAnItrSivI/XuUNQLe/AJ ncS0wmlc79EJzrsnnQ5ERFoUMEaoKSCkBoYiYCuu8SCZJm2Z2zbWiWEv6ax4AM55tqgA 0xqrQlPQOyMrleV9COW9q1TPADur3pIudi95fwF4/J4+pE7wQd3F+VYz3eJgs3Zr8Z1h txHj6B5m2hNd3Px7zZfcX9fTm2gCfOv1d7d/5+lYDazzLvH526z+JHifPm3za3JsTiYQ v4fQ== 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=chBBvsQzPf7xmnzCfrt40iRIJYYjagpkSImt7VSiVCfOUYaLxumklS0aYa4bN1t7WU EZrxJYS5WpPu772t9FcNzwxhGa1O4F8/4BcoyPtbgzVUrcR34qg7xmgH88CcAQjWusyx gmCET88732kw9hf2lrhuaQTsMpdvs92hMCnUp0undCslXClOolDeZKIa70fCa3ALVdAg Y8fJLfrqz45Mf1b95wo3MVpyk6SusIC5JKn/4+uhlebhtXUyyPpuSyFVCSqOtViUThjk LPebY/o7CR0MzVdIiv58ncDpBRpxvf/JpMLJaa6TMf2FfDxfq7MQx1PG7o2Ycyo1AfiV m5jA== X-Gm-Message-State: AOAM533bu5MMTezzq0YBijWHxDPFS98M/PeGp2ruha0VMW1F6/16SosV pXbEKt+pFwKxvRTWnLBg1E1gUWFKH7aGEQ== X-Google-Smtp-Source: ABdhPJwYNmY/heCuODfNr72E0yZ+5AXVv7t04nhChgrdaaPjjGjKltOo75IHivcQRYDHBBPuq1qq6w== X-Received: by 2002:a17:90a:2ecb:: with SMTP id h11mr7013929pjs.159.1628934922234; Sat, 14 Aug 2021 02:55:22 -0700 (PDT) Received: from lattitude.lan ([49.206.113.179]) by smtp.googlemail.com with ESMTPSA id y7sm5220436pfp.102.2021.08.14.02.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Aug 2021 02:55:21 -0700 (PDT) From: Gokul Sivakumar To: netdev@vger.kernel.org, David Ahern Cc: Gokul Sivakumar Subject: [PATCH iproute2-next 1/3] bridge: reorder cmd line arg parsing to let "-c" detected as "color" option Date: Sat, 14 Aug 2021 15:24:37 +0530 Message-Id: <20210814095439.1736737-2-gokulkumar792@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210814095439.1736737-1-gokulkumar792@gmail.com> References: <20210814095439.1736737-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 09:54:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gokul Sivakumar X-Patchwork-Id: 497347 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 1E0ACC4338F for ; Sat, 14 Aug 2021 09:55:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0674160F00 for ; Sat, 14 Aug 2021 09:55:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237770AbhHNJz6 (ORCPT ); Sat, 14 Aug 2021 05:55:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237703AbhHNJz5 (ORCPT ); Sat, 14 Aug 2021 05:55:57 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96592C061764 for ; Sat, 14 Aug 2021 02:55:29 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id l11so15162523plk.6 for ; Sat, 14 Aug 2021 02:55:29 -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=mtLOOO3xTQU/BNF8IScqa++f9UBU8LRR9TjCuJXv4Ss=; b=DPwpsxsLPwYD5FPr/h+9+WwLixMdg31zCuV/romby+YscnF/O+HNO3cUY0Svp1yG3x 946mhAhXWHa/QfYJuVtufZKTnCS9XzcTUSprRC4TnveoXtMy4neLc9B9JVetMXWuu6vp YsCDXkuAOf9nhBoqaLeSrn3f9Is2ejrr1uJydUibp+CokYodcEGffJd7vPk9JYCY6Zzo 50FjPRSys9g6pVEWA7YnA0G2Q+ubY91ywhJWd23L8/3RfQpcjiMjVW8320t90rEsUceE +3C+KT6Yxs8/xZEbsv1FPPDmf5TroYtmDl98h0vlaESEADrckxxRZCA+1QZbXmTzz6E6 WZYQ== 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=mtLOOO3xTQU/BNF8IScqa++f9UBU8LRR9TjCuJXv4Ss=; b=VzfnjOW4pKkSRI3Jk/XACSiQHzAlHBkplKJIjtOw1P/p2QvOgk7YWUJEz+1IH0xZi4 y8G/PrCoGc4dan/i7QsmFlBZymNUWWYl+4XZ2kMqWU/SijQD9ClLfGtyjf2Cy5uHlf0H lYITLvweeIj5BdntQpR1IFarTeA+S/PSfevv4a5hcRQKOJ94wPOrBbBSII/BG+GzYdVt hDO+DQhLKWBAeQ0kzl3wBTC45bHb9TSQRAGB/j7Zhr8sEdPAfEg6q5os0xUzIbF5Tc6b Ex62Cp6S9pMe+3gSAEsxz2w2/9v/BQPtV9YZmpbzK5MaEV4BT1f7nhSP/LQp1XH+pdOC 5/xQ== X-Gm-Message-State: AOAM532GlieZIDHBkvu5rAbJabsJObLEtNf3WRAHT6x9qDNPLzxgAZGs TgdqWk7CHk3zivS9hRC4ux2C5W+5Sy1zfw== X-Google-Smtp-Source: ABdhPJzCTHi7SqqhTGNo7bdQaDWux/IEy7y0Q1Guy8dpyxwqfcfMSdKKwHENQufwNJCC20NMB+N5ng== X-Received: by 2002:a65:6a0d:: with SMTP id m13mr6137688pgu.371.1628934929040; Sat, 14 Aug 2021 02:55:29 -0700 (PDT) Received: from lattitude.lan ([49.206.113.179]) by smtp.googlemail.com with ESMTPSA id y7sm5220436pfp.102.2021.08.14.02.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Aug 2021 02:55:28 -0700 (PDT) From: Gokul Sivakumar To: netdev@vger.kernel.org, David Ahern Cc: Gokul Sivakumar Subject: [PATCH iproute2-next 2/3] bridge: fdb: don't colorize the "dev" & "dst" keywords in "bridge -c fdb" Date: Sat, 14 Aug 2021 15:24:38 +0530 Message-Id: <20210814095439.1736737-3-gokulkumar792@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210814095439.1736737-1-gokulkumar792@gmail.com> References: <20210814095439.1736737-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..21433dac 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()) + fprintf(fp, "dev "); + 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()) + fprintf(fp, "dst "); + print_color_string(PRINT_ANY, ifa_family_color(family), - "dst", "dst %s ", dst); + "dst", "%s ", dst); } if (vid) From patchwork Sat Aug 14 09:54:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gokul Sivakumar X-Patchwork-Id: 497612 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 207E2C4338F for ; Sat, 14 Aug 2021 09:55:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0764E60F00 for ; Sat, 14 Aug 2021 09:55:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237773AbhHNJ4B (ORCPT ); Sat, 14 Aug 2021 05:56:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237703AbhHNJ4A (ORCPT ); Sat, 14 Aug 2021 05:56:00 -0400 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E229C061764 for ; Sat, 14 Aug 2021 02:55:32 -0700 (PDT) Received: by mail-pl1-x62d.google.com with SMTP id a5so15146470plh.5 for ; Sat, 14 Aug 2021 02:55:32 -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=IlrAQcaRs4egO7XI6fvo5e/R3y1djXS1GoZTlfTZYyUiaUiYjB3b/kipNfh6gHKDgv 7+SDF6732UOCQ4XJXqEGyVEVNOZlBjDGwbaQ3BIAnSerYmHNOtppoNmx9LOkivOzAb4t +KUdpQRPuZF+GQn6A9lN3UvqpQTgJnQhcNQ6PSo2+b2zj8oH4/pyQ00VkH+89CVXdQgL PfsSzzkUN9+ENwVA0lf8jLWwMkpRLBJNCkjdMSJ9t/1/iz6kHixM3/1Xfu750lOKIIKE Ttt2cabCKtuc1z0LLiAHbUaKeg55Ny8XALmVL5WT+xuQjs3lCAbjnDh1csSOIiEyv8Il 2ugQ== 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=qCa2AGaSL01FpoDikD0HZBMVvSOZWdZwbUi1X/1Io81owGd5oRKxq2UiqNVlVSj20x CCBNMheoIjJHKdVcW7lggAEDtxoTELT2ha3JP9xvsxo+DYeQkOisHD4/+xQD8WziiFTd 3KTt7lUZfwDkcM2zKmrXzV4HVF7DSoDAVeYkz/fLlNpoUMrCZEHObaCxMOiQ2dpuRg2K 5wwwY/uIX8ziJG1F/VQcXvqhv55USPrQPUFnevl8l1pRZTSWyFpqA4Vs4muCwbQl194D 2GK/dnzzzdXDVyQn0+cC8VALsLya5wP4GfsYLrs5npPH5H+ax6HPFueqOS4BCbwQHBV+ XTYw== X-Gm-Message-State: AOAM531+hdOjCwaErRI03oENl6E9hQd7W5qhzMuXBExTqEi90VwYpS/p 56MBxUdfpyo6gLKbtvYeKdD4vnMhjP2zmQ== X-Google-Smtp-Source: ABdhPJy2c3zSxNse2446TRiHXHpozy4gWMphDEN3Ke3YW6chanqBtVieG0ER3Tm7XHZwa7qCgaXfvQ== X-Received: by 2002:a17:90a:bc84:: with SMTP id x4mr6922370pjr.36.1628934931789; Sat, 14 Aug 2021 02:55:31 -0700 (PDT) Received: from lattitude.lan ([49.206.113.179]) by smtp.googlemail.com with ESMTPSA id y7sm5220436pfp.102.2021.08.14.02.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Aug 2021 02:55:31 -0700 (PDT) From: Gokul Sivakumar To: netdev@vger.kernel.org, David Ahern Cc: Gokul Sivakumar Subject: [PATCH iproute2-next 3/3] man: bridge: fix the typo to change "-c[lor]" into "-c[olor]" in man page Date: Sat, 14 Aug 2021 15:24:39 +0530 Message-Id: <20210814095439.1736737-4-gokulkumar792@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210814095439.1736737-1-gokulkumar792@gmail.com> References: <20210814095439.1736737-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] }