From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 14 Jun 2017 12:08:12 +0000 (-0400)
Subject: ip: mroute: Add table output to show command
X-Git-Tag: v4.12.0~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dc98cf2f51ffa2ebcc6c592aa95eae78d04d0c7;p=thirdparty%2Fiproute2.git

ip: mroute: Add table output to show command

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>
---

diff --git a/ip/ipmroute.c b/ip/ipmroute.c
index 84950037a..b51c23cc5 100644
--- a/ip/ipmroute.c
+++ b/ip/ipmroute.c
@@ -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;