From: Lou Berger <lberger@labn.net>
Date: Fri, 3 Feb 2017 02:35:24 +0000 (-0500)
Subject: bgpd: get rid of 'unknown' in show safi
X-Git-Tag: frr-3.0-branchpoint~53^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f62a5c334a21e3a0814578860acdf6fe14cc0511;p=mirror%2Ffrr.git

bgpd: get rid of 'unknown' in show safi
      Merge 2.0 change, adapted to master

Signed-off-by: Lou Berger <lberger@labn.net>
---

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 52a27e51e4..51839b784b 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -6653,10 +6653,10 @@ bgp_show_summary_afi_safi (struct vty *vty, struct bgp *bgp, int afi, int safi,
                 }
             }
           bgp_show_summary (vty, bgp, afi, safi, use_json, json);
-          if (safi == SAFI_MPLS_VPN) /* handle special cases to match zebra.h */
-            safi = SAFI_ENCAP;
-          else
-              safi++;
+          safi++;
+          if (safi == SAFI_RESERVED_4 || 
+              safi == SAFI_RESERVED_5) /* handle special cases to match zebra.h */
+            safi++;
           if (! safi_wildcard)
             safi = SAFI_MAX;
         }