From patchwork Thu Jan 7 15:23:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 12004361 X-Patchwork-Delegate: dsahern@gmail.com 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 5D751C433E0 for ; Thu, 7 Jan 2021 15:25:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2CC57224B0 for ; Thu, 7 Jan 2021 15:25:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728068AbhAGPZD (ORCPT ); Thu, 7 Jan 2021 10:25:03 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:41303 "EHLO wout1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727912AbhAGPZD (ORCPT ); Thu, 7 Jan 2021 10:25:03 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 0009EB6E; Thu, 7 Jan 2021 10:23:56 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 07 Jan 2021 10:23:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=F7fnM8zd/xF4bF/u+T209mIHfXva57fEXsETJl7wk74=; b=N5kPGpCJ 5jMkEZwa/v+2v3fE0nCQV7j7t1wQPrsXl60xEux6U94VuLdBCzFFm50/yqZCOBU3 LXrWfFH0shuMlvr1E4F4BbwTHOx5mhlLfUWfCKDS4HvZp0D5pbz5drrIAE6nQ0N9 dKUonWvhT8GjRmG4FJkk+GfsGt+yx0Fvda7qO8xJQMHLYNteH0qSyfCxj89Nex/P EhGYT4UVNa5JEs3YJi/3UXEfCxs4Y98vI3XR1rqXZ6CPycf59oadoOXo9cKt3565 d4UXqtqPHRsR9iFH/qvL5gOFiIy5d2G1tX9Qbl9oOLvsMSH7D36eUiUIFtAmUTmA wJrv24bLQPHENQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdegvddgjeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepkfguohcuufgthhhimhhmvghluceoihguohhstghhsehiugho shgthhdrohhrgheqnecuggftrfgrthhtvghrnhepudetieevffffveelkeeljeffkefhke ehgfdtffethfelvdejgffghefgveejkefhnecukfhppeekgedrvddvledrudehfedrgeeg necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihguoh hstghhsehiughoshgthhdrohhrgh X-ME-Proxy: Received: from shredder.lan (igld-84-229-153-44.inter.net.il [84.229.153.44]) by mail.messagingengine.com (Postfix) with ESMTPA id D7DA5240064; Thu, 7 Jan 2021 10:23:54 -0500 (EST) From: Ido Schimmel To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, dsahern@gmail.com, petrm@nvidia.com, mlxsw@nvidia.com, Ido Schimmel Subject: [PATCH iproute2 1/2] nexthop: Fix usage output Date: Thu, 7 Jan 2021 17:23:26 +0200 Message-Id: <20210107152327.1141060-2-idosch@idosch.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210107152327.1141060-1-idosch@idosch.org> References: <20210107152327.1141060-1-idosch@idosch.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com From: Ido Schimmel Before: # ip nexthop help Usage: ip nexthop { list | flush } [ protocol ID ] SELECTOR ip nexthop { add | replace } id ID NH [ protocol ID ] ip nexthop { get| del } id ID SELECTOR := [ id ID ] [ dev DEV ] [ vrf NAME ] [ master DEV ] [ groups ] [ fdb ] NH := { blackhole | [ via ADDRESS ] [ dev DEV ] [ onlink ] [ encap ENCAPTYPE ENCAPHDR ] | group GROUP ] } GROUP := [ id[,weight]>//... ] ENCAPTYPE := [ mpls ] ENCAPHDR := [ MPLSLABEL ] After: # ip nexthop help Usage: ip nexthop { list | flush } [ protocol ID ] SELECTOR ip nexthop { add | replace } id ID NH [ protocol ID ] ip nexthop { get | del } id ID SELECTOR := [ id ID ] [ dev DEV ] [ vrf NAME ] [ master DEV ] [ groups ] [ fdb ] NH := { blackhole | [ via ADDRESS ] [ dev DEV ] [ onlink ] [ encap ENCAPTYPE ENCAPHDR ] | group GROUP [ fdb ] } GROUP := [ //... ] ENCAPTYPE := [ mpls ] ENCAPHDR := [ MPLSLABEL ] Signed-off-by: Ido Schimmel --- ip/ipnexthop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ip/ipnexthop.c b/ip/ipnexthop.c index b7ffff77c160..20cde586596b 100644 --- a/ip/ipnexthop.c +++ b/ip/ipnexthop.c @@ -38,12 +38,12 @@ static void usage(void) fprintf(stderr, "Usage: ip nexthop { list | flush } [ protocol ID ] SELECTOR\n" " ip nexthop { add | replace } id ID NH [ protocol ID ]\n" - " ip nexthop { get| del } id ID\n" + " ip nexthop { get | del } id ID\n" "SELECTOR := [ id ID ] [ dev DEV ] [ vrf NAME ] [ master DEV ]\n" " [ groups ] [ fdb ]\n" "NH := { blackhole | [ via ADDRESS ] [ dev DEV ] [ onlink ]\n" - " [ encap ENCAPTYPE ENCAPHDR ] | group GROUP ] }\n" - "GROUP := [ id[,weight]>//... ]\n" + " [ encap ENCAPTYPE ENCAPHDR ] | group GROUP [ fdb ] }\n" + "GROUP := [ //... ]\n" "ENCAPTYPE := [ mpls ]\n" "ENCAPHDR := [ MPLSLABEL ]\n"); exit(-1); From patchwork Thu Jan 7 15:23:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 12004363 X-Patchwork-Delegate: dsahern@gmail.com 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 7DC38C433DB for ; Thu, 7 Jan 2021 15:25:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 474DE23403 for ; Thu, 7 Jan 2021 15:25:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728112AbhAGPZG (ORCPT ); Thu, 7 Jan 2021 10:25:06 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:50721 "EHLO wout1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727912AbhAGPZF (ORCPT ); Thu, 7 Jan 2021 10:25:05 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id DFCC415E0; Thu, 7 Jan 2021 10:23:58 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 07 Jan 2021 10:23:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=2/ZuYU7mv7wM+SDXOjdBeDem2k6bStbMYKThaNATVRc=; b=jFZ5WUZ9 qVh7b1xU2uFqxkppYSH+TqwgWHTamPLRBFo0RkL62aGMOxIaxqJzu56w6IHVJQbx hVA/fwyGaDX/E2P21Rr8CuoPUIplfOJRXBzhpzKDdh7W/BYgoWRwhmYWvR0/axkj wRMho5IG3rBX4qnUOwChkxyZMhkra7JrFur5Tl89am5+wXf/gPwluvSg0lRnXRuj oHjvQoyJV8gdUJUPL+EKJoJ0JJdUKu+YFzn+l2mEAKGQ9ckA6FhPnNpCg312cTd+ A1r14Nu7m0So+rDqX3I5m+l+c/cgpd1oLfbL8i0dlldgRYZCOVACsl5FWWSj/YQ3 7azFqSYqeJMcRw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdegvddgjeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepkfguohcuufgthhhimhhmvghluceoihguohhstghhsehiugho shgthhdrohhrgheqnecuggftrfgrthhtvghrnhepudetieevffffveelkeeljeffkefhke ehgfdtffethfelvdejgffghefgveejkefhnecukfhppeekgedrvddvledrudehfedrgeeg necuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrhhomhepihguoh hstghhsehiughoshgthhdrohhrgh X-ME-Proxy: Received: from shredder.lan (igld-84-229-153-44.inter.net.il [84.229.153.44]) by mail.messagingengine.com (Postfix) with ESMTPA id E4978240066; Thu, 7 Jan 2021 10:23:56 -0500 (EST) From: Ido Schimmel To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, dsahern@gmail.com, petrm@nvidia.com, mlxsw@nvidia.com, Ido Schimmel Subject: [PATCH iproute2 2/2] ipmonitor: Mention "nexthop" object in help and man page Date: Thu, 7 Jan 2021 17:23:27 +0200 Message-Id: <20210107152327.1141060-3-idosch@idosch.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210107152327.1141060-1-idosch@idosch.org> References: <20210107152327.1141060-1-idosch@idosch.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com From: Ido Schimmel Before: # ip monitor help Usage: ip monitor [ all | LISTofOBJECTS ] [ FILE ] [ label ] [all-nsid] [dev DEVICE] LISTofOBJECTS := link | address | route | mroute | prefix | neigh | netconf | rule | nsid FILE := file FILENAME After: # ip monitor help Usage: ip monitor [ all | LISTofOBJECTS ] [ FILE ] [ label ] [all-nsid] [dev DEVICE] LISTofOBJECTS := link | address | route | mroute | prefix | neigh | netconf | rule | nsid | nexthop FILE := file FILENAME Signed-off-by: Ido Schimmel --- ip/ipmonitor.c | 2 +- man/man8/ip-monitor.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c index 685be52cfe64..99f5fda8ba1f 100644 --- a/ip/ipmonitor.c +++ b/ip/ipmonitor.c @@ -32,7 +32,7 @@ static void usage(void) fprintf(stderr, "Usage: ip monitor [ all | LISTofOBJECTS ] [ FILE ] [ label ] [all-nsid] [dev DEVICE]\n" "LISTofOBJECTS := link | address | route | mroute | prefix |\n" - " neigh | netconf | rule | nsid\n" + " neigh | netconf | rule | nsid | nexthop\n" "FILE := file FILENAME\n"); exit(-1); } diff --git a/man/man8/ip-monitor.8 b/man/man8/ip-monitor.8 index 86f8f9885fef..f886d31b8013 100644 --- a/man/man8/ip-monitor.8 +++ b/man/man8/ip-monitor.8 @@ -55,7 +55,7 @@ command is the first in the command line and then the object list follows: is the list of object types that we want to monitor. It may contain .BR link ", " address ", " route ", " mroute ", " prefix ", " -.BR neigh ", " netconf ", " rule " and " nsid "." +.BR neigh ", " netconf ", " rule ", " nsid " and " nexthop "." If no .B file argument is given,