bridge: mdb: add support for extended router port information

Recently a new temp router port mode was added and with it the dumped
information was extended similar to how mdb entries were done. This
patch adds support to dump the new information by using the "-s" switch.
Example:
$ bridge -d -s mdb show
dev br0 port eth1 grp ff02::1:ffbf:5716 temp 234.39
dev br0 port eth1 grp 239.0.0.2 temp  97.17
dev br0 port eth1 grp 239.0.0.3 temp 105.36
router ports on br0: eth1    0.00 permanent
router ports on br0: eth2  254.87 temp

It also updates the bridge man page.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>

diff --git a/bridge/br_common.h b/bridge/br_common.h
index 41eb0dc3829352221a2e154defd892433a825311..5ea45c9e654d78adf716f770a1c1b91b94ca063c 100644 (file)
--- a/bridge/br_common.h
+++ b/bridge/br_common.h
@@ -1,6 +1,9 @@
 #define MDB_RTA(r) \
                ((struct rtattr *)(((char *)(r)) + RTA_ALIGN(sizeof(struct br_mdb_entry))))
 
+#define MDB_RTR_RTA(r) \
+               ((struct rtattr *)(((char *)(r)) + RTA_ALIGN(sizeof(__u32))))
+
 extern int print_linkinfo(const struct sockaddr_nl *who,
                          struct nlmsghdr *n,
                          void *arg);

diff --git a/bridge/mdb.c b/bridge/mdb.c
index 600596c94969b91d8db4432d3264168494f10df1..97da4dc98f234c399f82d749894ce436138830d4 100644 (file)
--- a/bridge/mdb.c
+++ b/bridge/mdb.c
@@ -33,19 +33,56 @@ static void usage(void)
        exit(-1);
 }
 
-static void br_print_router_ports(FILE *f, struct rtattr *attr)
+static bool is_temp_mcast_rtr(__u8 type)
+{
+       return type == MDB_RTR_TYPE_TEMP_QUERY || type == MDB_RTR_TYPE_TEMP;
+}
+
+static void __print_router_port_stats(FILE *f, struct rtattr *pattr)
+{
+       struct rtattr *tb[MDBA_ROUTER_PATTR_MAX + 1];
+       struct timeval tv;
+       __u8 type;
+
+       parse_rtattr(tb, MDBA_ROUTER_PATTR_MAX, MDB_RTR_RTA(RTA_DATA(pattr)),
+                    RTA_PAYLOAD(pattr) - RTA_ALIGN(sizeof(uint32_t)));
+       if (tb[MDBA_ROUTER_PATTR_TIMER]) {
+               __jiffies_to_tv(&tv,
+                               rta_getattr_u32(tb[MDBA_ROUTER_PATTR_TIMER]));
+               fprintf(f, " %4i.%.2i",
+                       (int)tv.tv_sec, (int)tv.tv_usec/10000);
+       }
+       if (tb[MDBA_ROUTER_PATTR_TYPE]) {
+               type = rta_getattr_u8(tb[MDBA_ROUTER_PATTR_TYPE]);
+               fprintf(f, " %s",
+                       is_temp_mcast_rtr(type) ? "temp" : "permanent");
+       }
+}
+
+static void br_print_router_ports(FILE *f, struct rtattr *attr, __u32 brifidx)
 {
        uint32_t *port_ifindex;
        struct rtattr *i;
        int rem;
 
+       if (!show_stats)
+               fprintf(f, "router ports on %s: ", ll_index_to_name(brifidx));
+
        rem = RTA_PAYLOAD(attr);
        for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
                port_ifindex = RTA_DATA(i);
-               fprintf(f, "%s ", ll_index_to_name(*port_ifindex));
+               if (show_stats) {
+                       fprintf(f, "router ports on %s: %s",
+                               ll_index_to_name(brifidx),
+                               ll_index_to_name(*port_ifindex));
+                       __print_router_port_stats(f, i);
+                       fprintf(f, "\n");
+               } else {
+                       fprintf(f, "%s ", ll_index_to_name(*port_ifindex));
+               }
        }
-
-       fprintf(f, "\n");
+       if (!show_stats)
+               fprintf(f, "\n");
 }
 
 static void print_mdb_entry(FILE *f, int ifindex, struct br_mdb_entry *e,
@@ -127,11 +164,9 @@ int print_mdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 
        if (tb[MDBA_ROUTER]) {
                if (n->nlmsg_type == RTM_GETMDB) {
-                       if (show_details) {
-                               fprintf(fp, "router ports on %s: ",
-                                       ll_index_to_name(r->ifindex));
-                               br_print_router_ports(fp, tb[MDBA_ROUTER]);
-                       }
+                       if (show_details)
+                               br_print_router_ports(fp, tb[MDBA_ROUTER],
+                                                     r->ifindex);
                } else {
                        uint32_t *port_ifindex;
 

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index 0e98edf4762fab564d174a07c82994b736606f0e..08e8a5bf5a087503ec3625166f246710bc9859b2 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -118,6 +118,10 @@ output more information. If this option
 is given multiple times, the amount of information increases.
 As a rule, the information is statistics or some time values.
 
+.TP
+.BR "\-d" , " \-details"
+print detailed information about MDB router ports.
+
 .TP
 .BR "\-n" , " \-net" , " \-netns " <NETNS>
 switches
@@ -506,7 +510,7 @@ a connected router.
 .PP
 With the
 .B -statistics
-option, the command displays timer values for mdb entries.
+option, the command displays timer values for mdb and router port entries.
 
 .SH bridge vlan - VLAN filter list