|
 |
4aca6e |
From caf1f1dfd523c10dd8c9d3694ba485b6edb5dd5d Mon Sep 17 00:00:00 2001
|
|
|
4aca6e |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4aca6e |
Date: Tue, 28 Feb 2017 16:11:06 +0100
|
|
|
4aca6e |
Subject: [PATCH] bridge: mdb: add support for router add/del notifications
|
|
|
4aca6e |
monitoring
|
|
|
4aca6e |
|
|
|
4aca6e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1417289
|
|
|
4aca6e |
Upstream Status: iproute2.git commit 6b4867e62175c
|
|
|
4aca6e |
|
|
|
4aca6e |
commit 6b4867e62175ca0635f8cf6b22f882272d5a2219
|
|
|
4aca6e |
Author: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
|
|
|
4aca6e |
Date: Mon Jul 27 13:44:05 2015 +0200
|
|
|
4aca6e |
|
|
|
4aca6e |
bridge: mdb: add support for router add/del notifications monitoring
|
|
|
4aca6e |
|
|
|
4aca6e |
This patch adds support for ADDMDB/DELMDB notifications about router ports
|
|
|
4aca6e |
which have been added or deleted/expired respectively.
|
|
|
4aca6e |
|
|
|
4aca6e |
Example output:
|
|
|
4aca6e |
$ bridge -s monitor mdb
|
|
|
4aca6e |
Deleted router port dev eth3 master br0
|
|
|
4aca6e |
router port dev eth3 master br0
|
|
|
4aca6e |
|
|
|
4aca6e |
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
|
|
|
4aca6e |
---
|
|
|
4aca6e |
bridge/mdb.c | 22 +++++++++++++++++-----
|
|
|
4aca6e |
1 file changed, 17 insertions(+), 5 deletions(-)
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/bridge/mdb.c b/bridge/mdb.c
|
|
|
4aca6e |
index 9a8ed54..680ec30 100644
|
|
|
4aca6e |
--- a/bridge/mdb.c
|
|
|
4aca6e |
+++ b/bridge/mdb.c
|
|
|
4aca6e |
@@ -82,7 +82,7 @@ int print_mdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
|
|
|
4aca6e |
FILE *fp = arg;
|
|
|
4aca6e |
struct br_port_msg *r = NLMSG_DATA(n);
|
|
|
4aca6e |
int len = n->nlmsg_len;
|
|
|
4aca6e |
- struct rtattr * tb[MDBA_MAX+1];
|
|
|
4aca6e |
+ struct rtattr *tb[MDBA_MAX+1], *i;
|
|
|
4aca6e |
|
|
|
4aca6e |
if (n->nlmsg_type != RTM_GETMDB && n->nlmsg_type != RTM_NEWMDB && n->nlmsg_type != RTM_DELMDB) {
|
|
|
4aca6e |
fprintf(stderr, "Not RTM_GETMDB, RTM_NEWMDB or RTM_DELMDB: %08x %08x %08x\n",
|
|
|
4aca6e |
@@ -103,7 +103,6 @@ int print_mdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
|
|
|
4aca6e |
parse_rtattr(tb, MDBA_MAX, MDBA_RTA(r), n->nlmsg_len - NLMSG_LENGTH(sizeof(*r)));
|
|
|
4aca6e |
|
|
|
4aca6e |
if (tb[MDBA_MDB]) {
|
|
|
4aca6e |
- struct rtattr *i;
|
|
|
4aca6e |
int rem = RTA_PAYLOAD(tb[MDBA_MDB]);
|
|
|
4aca6e |
|
|
|
4aca6e |
for (i = RTA_DATA(tb[MDBA_MDB]); RTA_OK(i, rem); i = RTA_NEXT(i, rem))
|
|
|
4aca6e |
@@ -111,9 +110,22 @@ int print_mdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
|
|
|
4aca6e |
}
|
|
|
4aca6e |
|
|
|
4aca6e |
if (tb[MDBA_ROUTER]) {
|
|
|
4aca6e |
- if (show_details) {
|
|
|
4aca6e |
- fprintf(fp, "router ports on %s: ", ll_index_to_name(r->ifindex));
|
|
|
4aca6e |
- br_print_router_ports(fp, tb[MDBA_ROUTER]);
|
|
|
4aca6e |
+ if (n->nlmsg_type == RTM_GETMDB) {
|
|
|
4aca6e |
+ if (show_details) {
|
|
|
4aca6e |
+ fprintf(fp, "router ports on %s: ",
|
|
|
4aca6e |
+ ll_index_to_name(r->ifindex));
|
|
|
4aca6e |
+ br_print_router_ports(fp, tb[MDBA_ROUTER]);
|
|
|
4aca6e |
+ }
|
|
|
4aca6e |
+ } else {
|
|
|
4aca6e |
+ uint32_t *port_ifindex;
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ i = RTA_DATA(tb[MDBA_ROUTER]);
|
|
|
4aca6e |
+ port_ifindex = RTA_DATA(i);
|
|
|
4aca6e |
+ if (n->nlmsg_type == RTM_DELMDB)
|
|
|
4aca6e |
+ fprintf(fp, "Deleted ");
|
|
|
4aca6e |
+ fprintf(fp, "router port dev %s master %s\n",
|
|
|
4aca6e |
+ ll_index_to_name(*port_ifindex),
|
|
|
4aca6e |
+ ll_index_to_name(r->ifindex));
|
|
|
4aca6e |
}
|
|
|
4aca6e |
}
|
|
|
4aca6e |
|
|
|
4aca6e |
--
|
|
|
4aca6e |
1.8.3.1
|
|
|
4aca6e |
|