From: Renato Westphal <renato@opensourcerouting.org>
Date: Tue, 4 Apr 2017 00:14:18 +0000 (-0300)
Subject: zebra: fix v4/v6 typos in some show commands
X-Git-Tag: frr-3.1-dev~11^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=10dad4242a63a221fdd0b51499a10a026658642d;p=matthieu%2Ffrr.git

zebra: fix v4/v6 typos in some show commands

This fixes a few problems like this one:
vtysh# show ipv6 route ospf6
Unknown route type

Also, replace SAFI_UNICAST with SAFI_MULTICAST in the "show ipv6 mroute
vrf all" command.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index ffc075f43f..35aa69cc97 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -3143,7 +3143,7 @@ DEFUN (show_ipv6_route_protocol,
     VRF_GET_ID (vrf_id, argv[idx]->arg);
 
   char *proto = argv[argc - 1]->text;
-  type = proto_redistnum (AFI_IP, proto);
+  type = proto_redistnum (AFI_IP6, proto);
 
   if (type < 0)
     {
@@ -3431,7 +3431,7 @@ DEFUN (show_ipv6_route_vrf_all_tag,
   RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
     {
       if ((zvrf = vrf->info) == NULL ||
-          (table = zvrf->table[AFI_IP][SAFI_UNICAST]) == NULL)
+          (table = zvrf->table[AFI_IP6][SAFI_UNICAST]) == NULL)
         continue;
 
       /* Show all IPv6 routes with matching tag value. */
@@ -3541,7 +3541,7 @@ DEFUN (show_ipv6_route_vrf_all_protocol,
   int vrf_header = 1;
 
   char *proto = argv[argc - 1]->text;
-  type = proto_redistnum (AFI_IP, proto);
+  type = proto_redistnum (AFI_IP6, proto);
 
   if (type < 0)
     {
@@ -3705,7 +3705,7 @@ DEFUN (show_ipv6_mroute_vrf_all,
   RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
     {
       if ((zvrf = vrf->info) == NULL ||
-          (table = zvrf->table[AFI_IP6][SAFI_UNICAST]) == NULL)
+          (table = zvrf->table[AFI_IP6][SAFI_MULTICAST]) == NULL)
         continue;
 
       /* Show all IPv6 route. */