zebra: Add hint to what instance we are looking at

FRR allows redistribution to a client with a specific
instance in mind.  The code was not allowing you to figure
out what instance was being looked at.  So let's clarify this
in the debugs.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/zebra/redistribute.c b/zebra/redistribute.c
index c59ff1bbec38a257580d44887b5386fad71c80b8..e7044bc67f6274c66872f18a6e0b09fa98cb802a 100644 (file)
--- a/zebra/redistribute.c
+++ b/zebra/redistribute.c
@@ -122,12 +122,12 @@ static void zebra_redistribute(struct zserv *client, int type,
 
                        if (IS_ZEBRA_DEBUG_RIB)
                                zlog_debug(
-                                       "%s: client %s %pFX(%u) checking: selected=%d, type=%d, distance=%d, metric=%d zebra_check_addr=%d",
+                                       "%s: client %s %pFX(%u:%u) checking: selected=%d, type=%d, distance=%d, metric=%d zebra_check_addr=%d",
                                        __func__,
                                        zebra_route_string(client->proto),
-                                       dst_p, vrf_id,
-                                       CHECK_FLAG(newre->flags,
-                                                  ZEBRA_FLAG_SELECTED),
+                                       dst_p, vrf_id, newre->instance,
+                                       !!CHECK_FLAG(newre->flags,
+                                                    ZEBRA_FLAG_SELECTED),
                                        newre->type, newre->distance,
                                        newre->metric, zebra_check_addr(dst_p));
 
@@ -200,8 +200,8 @@ void redistribute_update(const struct prefix *p, const struct prefix *src_p,
 
        if (IS_ZEBRA_DEBUG_RIB)
                zlog_debug(
-                       "(%u:%u):%pFX: Redist update re %p (%s), old %p (%s)",
-                       re->vrf_id, re->table, p, re,
+                       "(%u:%u):%pFX(%u): Redist update re %p (%s), old %p (%s)",
+                       re->vrf_id, re->table, p, re->instance, re,
                        zebra_route_string(re->type), prev_re,
                        prev_re ? zebra_route_string(prev_re->type) : "None");