zebra: Display a bit better debugging for rnh tracking

Add a expected count for the route node we will be processing
as part of nexthop resolution and modify the type to display
a useful string of what the type is instead of a number.

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

3 files changed, 31 insertions, 16 deletions

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index cc614abac..61645f95f 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -744,9 +744,10 @@ void zebra_rib_evaluate_rn_nexthops(struct route_node *rn, uint32_t seq)
 		if (IS_ZEBRA_DEBUG_NHT_DETAILED) {
 			char buf[PREFIX_STRLEN];
 
-			zlog_debug("%s: %s Being examined for Nexthop Tracking",
+			zlog_debug("%s: %s Being examined for Nexthop Tracking Count: %zd",
 				   __PRETTY_FUNCTION__,
-				   srcdest_rnode2str(rn, buf, sizeof(buf)));
+				   srcdest_rnode2str(rn, buf, sizeof(buf)),
+				   dest ? rnh_list_count(&dest->nht) : 0);
 		}
 		if (!dest) {
 			rn = rn->parent;
@@ -769,11 +770,12 @@ void zebra_rib_evaluate_rn_nexthops(struct route_node *rn, uint32_t seq)
 				char buf1[PREFIX_STRLEN];
 				char buf2[PREFIX_STRLEN];
 
-				zlog_debug("%u:%s has Nexthop(%s) depending on it, evaluating %u:%u",
+				zlog_debug("%u:%s has Nexthop(%s) Type: %s depending on it, evaluating %u:%u",
 					   zvrf->vrf->vrf_id,
 					   srcdest_rnode2str(rn, buf1,
 						      sizeof(buf1)),
 					   prefix2str(p, buf2, sizeof(buf2)),
+					   rnh_type2str(rnh->type),
 					   seq, rnh->seqno);
 			}
 
diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 1024f3a05..0a8dbfdde 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -160,14 +160,15 @@ struct rnh *zebra_add_rnh(struct prefix *p, vrf_id_t vrfid, rnh_type_t type,
 
 	if (IS_ZEBRA_DEBUG_NHT) {
 		prefix2str(p, buf, sizeof(buf));
-		zlog_debug("%u: Add RNH %s type %d", vrfid, buf, type);
+		zlog_debug("%u: Add RNH %s type %s", vrfid, buf,
+			   rnh_type2str(type));
 	}
 	table = get_rnh_table(vrfid, afi, type);
 	if (!table) {
 		prefix2str(p, buf, sizeof(buf));
 		flog_warn(EC_ZEBRA_RNH_NO_TABLE,
-			  "%u: Add RNH %s type %d - table not found", vrfid,
-			  buf, type);
+			  "%u: Add RNH %s type %s - table not found", vrfid,
+			  buf, rnh_type2str(type));
 		exists = false;
 		return NULL;
 	}
@@ -271,8 +272,8 @@ static void zebra_delete_rnh(struct rnh *rnh, rnh_type_t type)
 
 	if (IS_ZEBRA_DEBUG_NHT) {
 		char buf[PREFIX2STR_BUFFER];
-		zlog_debug("%u: Del RNH %s type %d", rnh->vrf_id,
-			   rnh_str(rnh, buf, sizeof(buf)), type);
+		zlog_debug("%u: Del RNH %s type %s", rnh->vrf_id,
+			   rnh_str(rnh, buf, sizeof(buf)), rnh_type2str(type));
 	}
 
 	zebra_free_rnh(rnh);
@@ -293,9 +294,9 @@ void zebra_add_rnh_client(struct rnh *rnh, struct zserv *client,
 {
 	if (IS_ZEBRA_DEBUG_NHT) {
 		char buf[PREFIX2STR_BUFFER];
-		zlog_debug("%u: Client %s registers for RNH %s type %d", vrf_id,
+		zlog_debug("%u: Client %s registers for RNH %s type %s", vrf_id,
 			   zebra_route_string(client->proto),
-			   rnh_str(rnh, buf, sizeof(buf)), type);
+			   rnh_str(rnh, buf, sizeof(buf)), rnh_type2str(type));
 	}
 	if (!listnode_lookup(rnh->client_list, client))
 		listnode_add(rnh->client_list, client);
@@ -312,9 +313,9 @@ void zebra_remove_rnh_client(struct rnh *rnh, struct zserv *client,
 {
 	if (IS_ZEBRA_DEBUG_NHT) {
 		char buf[PREFIX2STR_BUFFER];
-		zlog_debug("Client %s unregisters for RNH %s type %d",
+		zlog_debug("Client %s unregisters for RNH %s type %s",
 			   zebra_route_string(client->proto),
-			   rnh_str(rnh, buf, sizeof(buf)), type);
+			   rnh_str(rnh, buf, sizeof(buf)), rnh_type2str(type));
 	}
 	listnode_delete(rnh->client_list, client);
 	zebra_delete_rnh(rnh, type);
@@ -803,8 +804,8 @@ static void zebra_rnh_evaluate_entry(struct zebra_vrf *zvrf, afi_t afi,
 
 	if (IS_ZEBRA_DEBUG_NHT) {
 		prefix2str(&nrn->p, bufn, INET6_ADDRSTRLEN);
-		zlog_debug("%u:%s: Evaluate RNH, type %d %s", zvrf->vrf->vrf_id,
-			   bufn, type, force ? "(force)" : "");
+		zlog_debug("%u:%s: Evaluate RNH, type %s %s", zvrf->vrf->vrf_id,
+			   bufn, rnh_type2str(type), force ? "(force)" : "");
 	}
 
 	rnh = nrn->info;
@@ -1156,9 +1157,9 @@ static int zebra_cleanup_rnh_client(vrf_id_t vrf_id, afi_t afi,
 	struct rnh *rnh;
 
 	if (IS_ZEBRA_DEBUG_NHT)
-		zlog_debug("%u: Client %s RNH cleanup for family %s type %d",
+		zlog_debug("%u: Client %s RNH cleanup for family %s type %s",
 			   vrf_id, zebra_route_string(client->proto),
-			   afi2str(afi), type);
+			   afi2str(afi), rnh_type2str(type));
 
 	ntable = get_rnh_table(vrf_id, afi, type);
 	if (!ntable) {
diff --git a/zebra/zebra_rnh.h b/zebra/zebra_rnh.h
index 95a394118..c7d2c0d29 100644
--- a/zebra/zebra_rnh.h
+++ b/zebra/zebra_rnh.h
@@ -43,6 +43,18 @@ static inline int rnh_resolve_via_default(int family)
 		return 0;
 }
 
+static inline const char *rnh_type2str(rnh_type_t type)
+{
+	switch (type) {
+	case RNH_NEXTHOP_TYPE:
+		return "Nexthop";
+	case RNH_IMPORT_CHECK_TYPE:
+		return "Import";
+	}
+
+	return "ERROR";
+}
+
 extern struct rnh *zebra_add_rnh(struct prefix *p, vrf_id_t vrfid,
 				 rnh_type_t type, bool *exists);
 extern struct rnh *zebra_lookup_rnh(struct prefix *p, vrf_id_t vrfid,