bgpd: Fix EVPN type-5 route display

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Ticket: CM-19131
Reviewed By: None (trivial)
Testing Done: Manual

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 4e40daadb6eadd68b965cf7382776aee667bb68a..35703a759120c22667d05d3776b13c3f0d517513 100644 (file)
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -3624,7 +3624,7 @@ char *bgp_evpn_route2str(struct prefix_evpn *p, char *buf, int len)
                                           PREFIX2STR_BUFFER));
                }
        } else if (p->prefix.route_type == BGP_EVPN_IP_PREFIX_ROUTE) {
-               snprintf(buf, len, "[%d]:[0]:[%d]:[%s]",
+               snprintf(buf, len, "[%d]:[0]:[0]:[%d]:[%s]",
                         p->prefix.route_type,
                         p->prefix.ip_prefix_length,
                         IS_EVPN_PREFIX_IPADDR_V4(p) ?

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 56c138ae8cd610da83780b84d829909685160a9a..bd42ccdecfddaf86c83c704910bdac7f8ba5f781 100644 (file)
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -331,7 +331,8 @@ static void bgp_evpn_show_route_header(struct vty *vty, struct bgp *bgp,
        vty_out(vty, "Origin codes: i - IGP, e - EGP, ? - incomplete\n");
        vty_out(vty,
                "EVPN type-2 prefix: [2]:[ESI]:[EthTag]:[MAClen]:[MAC]:[IPlen]:[IP]\n");
-       vty_out(vty, "EVPN type-3 prefix: [3]:[EthTag]:[IPlen]:[OrigIP]\n\n");
+       vty_out(vty, "EVPN type-3 prefix: [3]:[EthTag]:[IPlen]:[OrigIP]\n");
+       vty_out(vty, "EVPN type-5 prefix: [5]:[ESI]:[EthTag]:[IPlen]:[IP]\n\n");
        vty_out(vty, "%s", ri_header);
 }
 
@@ -2168,7 +2169,7 @@ static void evpn_show_route_rd(struct vty *vty, struct bgp *bgp,
                                vty_out(vty,
                                        "EVPN type-3 prefix: [3]:[EthTag]:[IPlen]:[OrigIP]\n");
                                vty_out(vty,
-                                       "EVPN type-5 prefix: [5]:[EthTag]:[IPlen]:[IP]\n\n");
+                                       "EVPN type-5 prefix: [5]:[ESI]:[EthTag]:[IPlen]:[IP]\n\n");
                                rd_header = 0;
                        }