From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,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 1F6ADC28CC0 for ; Thu, 30 May 2019 04:04:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDC9525022 for ; Thu, 30 May 2019 04:04:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559189068; bh=q4XWgk94DHiQSOHFmy9YG86ewVtVksqDQpele2P0ixQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zORcGGSiOIsRknEkSv8YJTWve3aqFlj8vmbm6oSnkQ6ieun2UV/LzG6MpVLr1ORLw GvLF65aSVWKNEAfZRS1JD0Y2JTRYlQNqied1N5G2q9r9KQK4qsQykzIn0qc6BIvJ5A GZ7uIUIGr16blyxB90vUVqjvcLOU5e1Yz8eN5DHg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731408AbfE3EE1 (ORCPT ); Thu, 30 May 2019 00:04:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:48242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731296AbfE3DRv (ORCPT ); Wed, 29 May 2019 23:17:51 -0400 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DA9702472C; Thu, 30 May 2019 03:17:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186271; bh=q4XWgk94DHiQSOHFmy9YG86ewVtVksqDQpele2P0ixQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UGI3fwQjezdHRGFwPyzqHc+ibHdxfWSktv/ucZRfWvdzy47lsxwxcpMF7khUEs49Z 23Kt2h0QwIeXE0xazoLl468lCkE1WvM3EuAMQycakC80MNC8HCfq6JjGVDqX3p1h1+ GSnvcTILpUAGeAPrKjErUVb9ykQfrVzyQeubCd3M= From: David Ahern To: stephen@networkplumber.org Cc: netdev@vger.kernel.org, David Ahern Subject: [PATCH iproute2-next 9/9] ipmonitor: Add nexthop option to monitor Date: Wed, 29 May 2019 20:17:46 -0700 Message-Id: <20190530031746.2040-10-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190530031746.2040-1-dsahern@kernel.org> References: <20190530031746.2040-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern Add capability to ip-monitor to listen and dump nexthop messages Signed-off-by: David Ahern --- ip/ipmonitor.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c index 9ecc7fd2011a..5da1256450b3 100644 --- a/ip/ipmonitor.c +++ b/ip/ipmonitor.c @@ -84,6 +84,12 @@ static int accept_msg(struct rtnl_ctrl_data *ctrl, } } + case RTM_NEWNEXTHOP: + case RTM_DELNEXTHOP: + print_headers(fp, "[NEXTHOP]", ctrl); + print_nexthop(n, arg); + return 0; + case RTM_NEWLINK: case RTM_DELLINK: ll_remember_index(n, NULL); @@ -173,6 +179,7 @@ int do_ipmonitor(int argc, char **argv) int lrule = 0; int lnsid = 0; int ifindex = 0; + int lnexthop = 1; groups |= nl_mgrp(RTNLGRP_LINK); groups |= nl_mgrp(RTNLGRP_IPV4_IFADDR); @@ -202,30 +209,42 @@ int do_ipmonitor(int argc, char **argv) } else if (matches(*argv, "link") == 0) { llink = 1; groups = 0; + lnexthop = 0; } else if (matches(*argv, "address") == 0) { laddr = 1; groups = 0; + lnexthop = 0; } else if (matches(*argv, "route") == 0) { lroute = 1; groups = 0; + lnexthop = 0; } else if (matches(*argv, "mroute") == 0) { lmroute = 1; groups = 0; + lnexthop = 0; } else if (matches(*argv, "prefix") == 0) { lprefix = 1; groups = 0; + lnexthop = 0; } else if (matches(*argv, "neigh") == 0) { lneigh = 1; groups = 0; + lnexthop = 0; } else if (matches(*argv, "netconf") == 0) { lnetconf = 1; groups = 0; + lnexthop = 0; } else if (matches(*argv, "rule") == 0) { lrule = 1; groups = 0; + lnexthop = 0; } else if (matches(*argv, "nsid") == 0) { lnsid = 1; groups = 0; + lnexthop = 0; + } else if (matches(*argv, "nexthop") == 0) { + groups = 0; + lnexthop = 1; } else if (strcmp(*argv, "all") == 0) { prefix_banner = 1; } else if (matches(*argv, "all-nsid") == 0) { @@ -313,6 +332,11 @@ int do_ipmonitor(int argc, char **argv) if (rtnl_open(&rth, groups) < 0) exit(1); + if (lnexthop && rtnl_add_nl_group(&rth, RTNLGRP_NEXTHOP) < 0) { + fprintf(stderr, "Failed to add nexthop group to list\n"); + exit(1); + } + if (listen_all_nsid && rtnl_listen_all_nsid(&rth) < 0) exit(1); -- 2.11.0