Merge branch 'master' into evpn-symmetric-routing

[mirror_frr.git] / zebra / zebra_vty.c

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 716a404cac3340522e632bb50c024c8e7c0b2b37..82b0157ad377ae8cca95fff71f6af55549d49c73 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -483,8 +483,13 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
                vty_out(vty, "\"");
                vty_out(vty, ", distance %u, metric %u", re->distance,
                        re->metric);
-               if (re->tag)
+               if (re->tag) {
                        vty_out(vty, ", tag %u", re->tag);
+#if defined(SUPPORT_REALMS)
+                       if (re->tag > 0 && re->tag <= 255)
+                               vty_out(vty, "(realm)");
+#endif
+               }
                if (re->mtu)
                        vty_out(vty, ", mtu %u", re->mtu);
                if (re->vrf_id != VRF_DEFAULT) {
@@ -972,6 +977,7 @@ static int do_show_ip_route(struct vty *vty, const char *vrf_name, afi_t afi,
                            u_short ospf_instance_id)
 {
        struct route_table *table;
+       rib_dest_t *dest;
        struct route_node *rn;
        struct route_entry *re;
        int first = 1;
@@ -1009,10 +1015,11 @@ static int do_show_ip_route(struct vty *vty, const char *vrf_name, afi_t afi,
 
        /* Show all routes. */
        for (rn = route_top(table); rn; rn = route_next(rn)) {
+               dest = rib_dest_from_rnode(rn);
+
                RNODE_FOREACH_RE (rn, re) {
                        if (use_fib
-                           && !CHECK_FLAG(re->status,
-                                          ROUTE_ENTRY_SELECTED_FIB))
+                           && re != dest->selected_fib)
                                continue;
 
                        if (tag && re->tag != tag)