]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
ip: mroute: Add table output to show command
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 14 Jun 2017 12:08:12 +0000 (08:08 -0400)
committerStephen Hemminger <stephen@networkplumber.org>
Thu, 15 Jun 2017 15:29:30 +0000 (08:29 -0700)
When the user specifies `table all` or `table 0` to
the `ip mroute show` command we dump the entirety of
the known mroute tables.  Without some sort of
divisor to tell us what table we are looking at
the command is useless.

Add `Table: <vrf name>` to the output of 'ip mroute show table 0'

Follow the convention established by 'ip route show table 0'
for when to display

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
ip/ipmroute.c

index 84950037a18ed3af6d4612b0ddf6a155ed38f848..b51c23cc50e2c3f84e350a72dcdae5f3b17fe1cc 100644 (file)
@@ -178,6 +178,11 @@ int print_mroute(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                fprintf(fp, ", Age %4i.%.2i", (int)tv.tv_sec,
                        (int)tv.tv_usec/10000);
        }
+
+       if (table && (table != RT_TABLE_MAIN || show_details > 0) && !filter.tb)
+               fprintf(fp, " Table: %s",
+                       rtnl_rttable_n2a(table, b1, sizeof(b1)));
+
        fprintf(fp, "\n");
        fflush(fp);
        return 0;