bgpd: fix show ip bgp ipv4|ipv6 vpn command

The fix consists in setting the correct safi value.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index f9cdc1a0dbfa5540e11e7f7e878dda2fbb1f386d..eea0f86b349ba67c21833137d65688618fad1b0d 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -7882,15 +7882,9 @@ DEFUN (show_ip_bgp_ipv4,
     afi = strmatch(argv[idx]->text, "ipv6") ? AFI_IP6 : AFI_IP;
     if (argv_find (argv, argc, "unicast", &idx) || argv_find (argv, argc, "multicast", &idx))
       safi = bgp_vty_safi_from_arg (argv[idx]->text);
+    else if (argv_find (argv, argc, "encap", &idx) || argv_find (argv, argc, "vpn", &idx))
+      safi = strmatch (argv[idx]->text, "encap") ? SAFI_ENCAP : SAFI_MPLS_VPN;
   }
-  else if (argv_find (argv, argc, "encap", &idx) || argv_find (argv, argc, "vpnv4", &idx))
-  {
-    afi = AFI_IP;
-    safi = strmatch (argv[idx]->text, "encap") ? SAFI_ENCAP : SAFI_MPLS_VPN;
-    // advance idx if necessary
-    argv_find (argv, argc, "unicast", &idx);
-  }
-
   int uj = use_json (argc, argv);
   if (uj) argc--;