Merge pull request #7306 from donaldsharp/bgp_dest_print

Bgp dest print

diff --cc bgpd/bgp_evpn.c
Simple merge

diff --cc bgpd/bgp_route.c
index 5986f08a78292df3301b62ce5b878150c8cfc9d7,0acc407454efd3d08c2a971adef6d084d6d6ed6a..73f5526fe254da2b2122f69ed2a6988975695721
--- 1/bgpd/bgp_route.c
--- 2/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@@ -7625,12 -7618,13 +7618,12 @@@ static void route_vty_out_route(const s
                }
        } else if (p->family == AF_ETHERNET) {
                prefix2str(p, buf, PREFIX_STRLEN);
-               len = vty_out(vty, "%s", buf);
+               len = vty_out(vty, "%pFX", p);
        } else if (p->family == AF_EVPN) {
                if (!json)
 -                      len = vty_out(
 -                              vty, "%s",
 -                              bgp_evpn_route2str((struct prefix_evpn *)p, buf,
 -                                                 BUFSIZ));
 +                      len = vty_out(vty, "%s",
 +                                    prefix2str((struct prefix_evpn *)p, buf,
 +                                               BUFSIZ));
                else
                        bgp_evpn_route2json((struct prefix_evpn *)p, json);
        } else if (p->family == AF_FLOWSPEC) {