From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 6 Jun 2017 19:09:51 +0000 (-0400)
Subject: pimd: Fix 'show ip pim state...' vrf changes
X-Git-Tag: frr-4.0-dev~468^2~59
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=56243c3a4ae215314efd6f478034c00e287de685;p=mirror%2Ffrr.git

pimd: Fix 'show ip pim state...' vrf changes

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 2949d17cd9..4547bbb9fd 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -3628,11 +3628,11 @@ DEFUN (show_ip_pim_state,
 	if (uj)
 		argc--;
 
-	if (argc == 6) {
-		src_or_group = argv[4]->arg;
-		group = argv[5]->arg;
-	} else if (argc == 5)
-		src_or_group = argv[4]->arg;
+	if (argv_find(argv, argc, "A.B.C.D", &idx)) {
+		src_or_group = argv[idx]->arg;
+		if (idx + 1 < argc)
+			group = argv[idx + 1]->arg;
+	}
 
 	pim_show_state(vty, vrf->info, src_or_group, group, uj);