[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190530031746.2040-10-dsahern@kernel.org>
Date: Wed, 29 May 2019 20:17:46 -0700
From: David Ahern <dsahern@...nel.org>
To: stephen@...workplumber.org
Cc: netdev@...r.kernel.org, David Ahern <dsa@...ulusnetworks.com>
Subject: [PATCH iproute2-next 9/9] ipmonitor: Add nexthop option to monitor
From: David Ahern <dsa@...ulusnetworks.com>
Add capability to ip-monitor to listen and dump nexthop messages
Signed-off-by: David Ahern <dsa@...ulusnetworks.com>
---
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
Powered by blists - more mailing lists