1 files changed, 105 insertions, 136 deletions

diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c
index a494968e91..35c8469090 100644
--- a/pimd/pim_nht.c
+++ b/pimd/pim_nht.c
@@ -42,6 +42,7 @@
 #include "pim_zebra.h"
 #include "pim_zlookup.h"
 #include "pim_rp.h"
+#include "pim_addr.h"
 
 /**
  * pim_sendmsg_zebra_rnh -- Format and send a nexthop register/Unregister
@@ -75,10 +76,7 @@ struct pim_nexthop_cache *pim_nexthop_cache_find(struct pim_instance *pim,
 	struct pim_nexthop_cache *pnc = NULL;
 	struct pim_nexthop_cache lookup;
 
-	lookup.rpf.rpf_addr.family = rpf->rpf_addr.family;
-	lookup.rpf.rpf_addr.prefixlen = rpf->rpf_addr.prefixlen;
-	lookup.rpf.rpf_addr.u.prefix4.s_addr = rpf->rpf_addr.u.prefix4.s_addr;
-
+	lookup.rpf.rpf_addr = rpf->rpf_addr;
 	pnc = hash_lookup(pim->rpf_hash, &lookup);
 
 	return pnc;
@@ -92,10 +90,7 @@ static struct pim_nexthop_cache *pim_nexthop_cache_add(struct pim_instance *pim,
 
 	pnc = XCALLOC(MTYPE_PIM_NEXTHOP_CACHE,
 		      sizeof(struct pim_nexthop_cache));
-	pnc->rpf.rpf_addr.family = rpf_addr->rpf_addr.family;
-	pnc->rpf.rpf_addr.prefixlen = rpf_addr->rpf_addr.prefixlen;
-	pnc->rpf.rpf_addr.u.prefix4.s_addr =
-		rpf_addr->rpf_addr.u.prefix4.s_addr;
+	pnc->rpf.rpf_addr = rpf_addr->rpf_addr;
 
 	pnc = hash_get(pim->rpf_hash, pnc, hash_alloc_intern);
 
@@ -119,9 +114,7 @@ static struct pim_nexthop_cache *pim_nht_get(struct pim_instance *pim,
 
 	zclient = pim_zebra_zclient_get();
 	memset(&rpf, 0, sizeof(struct pim_rpf));
-	rpf.rpf_addr.family = addr->family;
-	rpf.rpf_addr.prefixlen = addr->prefixlen;
-	rpf.rpf_addr.u.prefix4 = addr->u.prefix4;
+	rpf.rpf_addr = *addr;
 
 	pnc = pim_nexthop_cache_find(pim, &rpf);
 	if (!pnc) {
@@ -169,6 +162,7 @@ int pim_find_or_track_nexthop(struct pim_instance *pim, struct prefix *addr,
 	return 0;
 }
 
+#if PIM_IPV == 4
 void pim_nht_bsr_add(struct pim_instance *pim, struct in_addr addr)
 {
 	struct pim_nexthop_cache *pnc;
@@ -182,6 +176,7 @@ void pim_nht_bsr_add(struct pim_instance *pim, struct in_addr addr)
 
 	pnc->bsr_count++;
 }
+#endif /* PIM_IPV == 4 */
 
 static void pim_nht_drop_maybe(struct pim_instance *pim,
 			       struct pim_nexthop_cache *pnc)
@@ -251,6 +246,7 @@ void pim_delete_tracked_nexthop(struct pim_instance *pim, struct prefix *addr,
 	pim_nht_drop_maybe(pim, pnc);
 }
 
+#if PIM_IPV == 4
 void pim_nht_bsr_del(struct pim_instance *pim, struct in_addr addr)
 {
 	struct pim_nexthop_cache *pnc = NULL;
@@ -405,12 +401,13 @@ bool pim_nht_bsr_rpf_check(struct pim_instance *pim, struct in_addr bsr_addr,
 	}
 	return false;
 }
+#endif /* PIM_IPV == 4 */
 
 void pim_rp_nexthop_del(struct rp_info *rp_info)
 {
 	rp_info->rp.source_nexthop.interface = NULL;
-	rp_info->rp.source_nexthop.mrib_nexthop_addr.u.prefix4.s_addr =
-		PIM_NET_INADDR_ANY;
+	pim_addr_to_prefix(&rp_info->rp.source_nexthop.mrib_nexthop_addr,
+			   PIMADDR_ANY);
 	rp_info->rp.source_nexthop.mrib_metric_preference =
 		router->infinite_assert_metric.metric_preference;
 	rp_info->rp.source_nexthop.mrib_route_metric =
@@ -426,7 +423,7 @@ static void pim_update_rp_nh(struct pim_instance *pim,
 
 	/*Traverse RP list and update each RP Nexthop info */
 	for (ALL_LIST_ELEMENTS_RO(pnc->rp_list, node, rp_info)) {
-		if (rp_info->rp.rpf_addr.u.prefix4.s_addr == INADDR_NONE)
+		if (pim_rpf_addr_is_inaddr_any(&rp_info->rp))
 			continue;
 
 		// Compute PIM RPF using cached nexthop
@@ -489,23 +486,13 @@ static int pim_update_upstream_nh(struct pim_instance *pim,
 uint32_t pim_compute_ecmp_hash(struct prefix *src, struct prefix *grp)
 {
 	uint32_t hash_val;
-	uint32_t s = 0, g = 0;
 
-	if ((!src))
+	if (!src)
 		return 0;
 
-	switch (src->family) {
-	case AF_INET: {
-		s = src->u.prefix4.s_addr;
-		s = s == 0 ? 1 : s;
-		if (grp)
-			g = grp->u.prefix4.s_addr;
-	} break;
-	default:
-		break;
-	}
-
-	hash_val = jhash_2words(g, s, 101);
+	hash_val = prefix_hash_key(src);
+	if (grp)
+		hash_val ^= prefix_hash_key(grp);
 	return hash_val;
 }
 
@@ -523,6 +510,9 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
 	uint32_t hash_val = 0, mod_val = 0;
 	uint8_t nh_iter = 0, found = 0;
 	uint32_t i, num_nbrs = 0;
+	pim_addr nh_addr = pim_addr_from_prefix(&(nexthop->mrib_nexthop_addr));
+	pim_addr src_addr = pim_addr_from_prefix(src);
+	pim_addr grp_addr = pim_addr_from_prefix(grp);
 
 	if (!pnc || !pnc->nexthop_num || !nexthop)
 		return 0;
@@ -530,10 +520,10 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
 	memset(&nbrs, 0, sizeof(nbrs));
 	memset(&ifps, 0, sizeof(ifps));
 
+
 	// Current Nexthop is VALID, check to stay on the current path.
-	if (nexthop->interface && nexthop->interface->info
-	    && nexthop->mrib_nexthop_addr.u.prefix4.s_addr
-		       != PIM_NET_INADDR_ANY) {
+	if (nexthop->interface && nexthop->interface->info &&
+	    (!pim_addr_is_any(nh_addr))) {
 		/* User configured knob to explicitly switch
 		   to new path is disabled or current path
 		   metric is less than nexthop update.
@@ -553,9 +543,9 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
 					break;
 			}
 
-			if (curr_route_valid
-			    && !pim_if_connected_to_source(nexthop->interface,
-							   src->u.prefix4)) {
+			if (curr_route_valid &&
+			    !pim_if_connected_to_source(nexthop->interface,
+							src_addr)) {
 				nbr = pim_neighbor_find_prefix(
 					nexthop->interface,
 					&nexthop->mrib_nexthop_addr);
@@ -573,23 +563,13 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
 						pnc->distance;
 					nexthop->mrib_route_metric =
 						pnc->metric;
-					if (PIM_DEBUG_PIM_NHT) {
-						char src_str[INET_ADDRSTRLEN];
-						pim_inet4_dump("<addr?>",
-							       src->u.prefix4,
-							       src_str,
-							       sizeof(src_str));
-						char grp_str[INET_ADDRSTRLEN];
-						pim_inet4_dump("<addr?>",
-							       grp->u.prefix4,
-							       grp_str,
-							       sizeof(grp_str));
+					if (PIM_DEBUG_PIM_NHT)
 						zlog_debug(
-							"%s: (%s,%s)(%s) current nexthop %s is valid, skipping new path selection",
-							__func__, src_str,
-							grp_str, pim->vrf->name,
+							"%s: (%pPA,%pPA)(%s) current nexthop %s is valid, skipping new path selection",
+							__func__, &src_addr,
+							&grp_addr,
+							pim->vrf->name,
 							nexthop->interface->name);
-					}
 					return 1;
 				}
 			}
@@ -612,7 +592,7 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
 #endif
 			nbrs[i] = pim_neighbor_find(ifps[i], nhaddr);
 			if (nbrs[i] ||
-			    pim_if_connected_to_source(ifps[i], src->u.prefix4))
+			    pim_if_connected_to_source(ifps[i], src_addr))
 				num_nbrs++;
 		}
 	}
@@ -635,38 +615,30 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
 		first_ifindex = nh_node->ifindex;
 		ifp = ifps[nh_iter];
 		if (!ifp) {
-			if (PIM_DEBUG_PIM_NHT) {
-				char addr_str[INET_ADDRSTRLEN];
-				pim_inet4_dump("<addr?>", src->u.prefix4,
-					       addr_str, sizeof(addr_str));
+			if (PIM_DEBUG_PIM_NHT)
 				zlog_debug(
-					"%s %s: could not find interface for ifindex %d (address %s(%s))",
+					"%s %s: could not find interface for ifindex %d (address %pPA(%s))",
 					__FILE__, __func__, first_ifindex,
-					addr_str, pim->vrf->name);
-			}
+					&src_addr, pim->vrf->name);
 			if (nh_iter == mod_val)
 				mod_val++; // Select nexthpath
 			nh_iter++;
 			continue;
 		}
 		if (!ifp->info) {
-			if (PIM_DEBUG_PIM_NHT) {
-				char addr_str[INET_ADDRSTRLEN];
-				pim_inet4_dump("<addr?>", src->u.prefix4,
-					       addr_str, sizeof(addr_str));
+			if (PIM_DEBUG_PIM_NHT)
 				zlog_debug(
-					"%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %s)",
+					"%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %pPA)",
 					__func__, ifp->name, pim->vrf->name,
-					first_ifindex, addr_str);
-			}
+					first_ifindex, &src_addr);
 			if (nh_iter == mod_val)
 				mod_val++; // Select nexthpath
 			nh_iter++;
 			continue;
 		}
 
-		if (neighbor_needed
-		    && !pim_if_connected_to_source(ifp, src->u.prefix4)) {
+		if (neighbor_needed &&
+		    !pim_if_connected_to_source(ifp, src_addr)) {
 			nbr = nbrs[nh_iter];
 			if (!nbr && !if_is_loopback(ifp)) {
 				if (PIM_DEBUG_PIM_NHT)
@@ -683,34 +655,27 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
 
 		if (nh_iter == mod_val) {
 			nexthop->interface = ifp;
-			nexthop->mrib_nexthop_addr.family = AF_INET;
-			nexthop->mrib_nexthop_addr.prefixlen = IPV4_MAX_BITLEN;
+			nexthop->mrib_nexthop_addr.family = PIM_AF;
+			nexthop->mrib_nexthop_addr.prefixlen = PIM_MAX_BITLEN;
+#if PIM_IPV == 4
 			nexthop->mrib_nexthop_addr.u.prefix4 =
 				nh_node->gate.ipv4;
+#else
+			nexthop->mrib_nexthop_addr.u.prefix6 =
+				nh_node->gate.ipv6;
+#endif
 			nexthop->mrib_metric_preference = pnc->distance;
 			nexthop->mrib_route_metric = pnc->metric;
-			nexthop->last_lookup = src->u.prefix4;
+			nexthop->last_lookup = src_addr;
 			nexthop->last_lookup_time = pim_time_monotonic_usec();
 			nexthop->nbr = nbr;
 			found = 1;
-			if (PIM_DEBUG_PIM_NHT) {
-				char buf[INET_ADDRSTRLEN];
-				char buf2[INET_ADDRSTRLEN];
-				char buf3[INET_ADDRSTRLEN];
-				pim_inet4_dump("<src?>", src->u.prefix4, buf2,
-					       sizeof(buf2));
-				pim_inet4_dump("<grp?>", grp->u.prefix4, buf3,
-					       sizeof(buf3));
-				pim_inet4_dump(
-					"<rpf?>",
-					nexthop->mrib_nexthop_addr.u.prefix4,
-					buf, sizeof(buf));
+			if (PIM_DEBUG_PIM_NHT)
 				zlog_debug(
-					"%s: (%s,%s)(%s) selected nhop interface %s addr %s mod_val %u iter %d ecmp %d",
-					__func__, buf2, buf3, pim->vrf->name,
-					ifp->name, buf, mod_val, nh_iter,
-					pim->ecmp_enable);
-			}
+					"%s: (%pPA,%pPA)(%s) selected nhop interface %s addr %pPAs mod_val %u iter %d ecmp %d",
+					__func__, &src_addr, &grp_addr,
+					pim->vrf->name, ifp->name, &nh_addr,
+					mod_val, nh_iter, pim->ecmp_enable);
 		}
 		nh_iter++;
 	}
@@ -737,19 +702,20 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
 	struct vrf *vrf = vrf_lookup_by_id(vrf_id);
 	struct pim_instance *pim;
 	struct zapi_route nhr;
+	struct prefix match;
 
 	if (!vrf)
 		return 0;
 	pim = vrf->info;
 
-	if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
+	if (!zapi_nexthop_update_decode(zclient->ibuf, &match, &nhr)) {
 		zlog_err("%s: Decode of nexthop update from zebra failed",
 			 __func__);
 		return 0;
 	}
 
 	if (cmd == ZEBRA_NEXTHOP_UPDATE) {
-		prefix_copy(&rpf.rpf_addr, &nhr.prefix);
+		prefix_copy(&rpf.rpf_addr, &match);
 		pnc = pim_nexthop_cache_find(pim, &rpf);
 		if (!pnc) {
 			if (PIM_DEBUG_PIM_NHT)
@@ -784,9 +750,15 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
 				 * RPF address from nexthop cache (i.e.
 				 * destination) as PIM nexthop.
 				 */
+#if PIM_IPV == 4
 				nexthop->type = NEXTHOP_TYPE_IPV4_IFINDEX;
 				nexthop->gate.ipv4 =
 					pnc->rpf.rpf_addr.u.prefix4;
+#else
+				nexthop->type = NEXTHOP_TYPE_IPV6_IFINDEX;
+				nexthop->gate.ipv6 =
+					pnc->rpf.rpf_addr.u.prefix6;
+#endif
 				break;
 			case NEXTHOP_TYPE_IPV6_IFINDEX:
 				ifp1 = if_lookup_by_index(nexthop->ifindex,
@@ -806,8 +778,11 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
 				else {
 					// Mark nexthop address to 0 until PIM
 					// Nbr is resolved.
-					nexthop->gate.ipv4.s_addr =
-						PIM_NET_INADDR_ANY;
+#if PIM_IPV == 4
+					nexthop->gate.ipv4 = PIMADDR_ANY;
+#else
+					nexthop->gate.ipv6 = PIMADDR_ANY;
+#endif
 				}
 
 				break;
@@ -832,9 +807,9 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
 			if (PIM_DEBUG_PIM_NHT)
 				zlog_debug(
 					"%s: NHT addr %pFX(%s) %d-nhop via %pI4(%s) type %d distance:%u metric:%u ",
-					__func__, &nhr.prefix, pim->vrf->name,
-					i + 1, &nexthop->gate.ipv4,
-					ifp->name, nexthop->type, nhr.distance,
+					__func__, &match, pim->vrf->name, i + 1,
+					&nexthop->gate.ipv4, ifp->name,
+					nexthop->type, nhr.distance,
 					nhr.metric);
 
 			if (!ifp->info) {
@@ -888,7 +863,7 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
 	if (PIM_DEBUG_PIM_NHT)
 		zlog_debug(
 			"%s: NHT Update for %pFX(%s) num_nh %d num_pim_nh %d vrf:%u up %ld rp %d",
-			__func__, &nhr.prefix, pim->vrf->name, nhr.nexthop_num,
+			__func__, &match, pim->vrf->name, nhr.nexthop_num,
 			pnc->nexthop_num, vrf_id, pnc->upstream_hash->count,
 			listcount(pnc->rp_list));
 
@@ -917,20 +892,14 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
 	uint8_t i = 0;
 	uint32_t hash_val = 0, mod_val = 0;
 	uint32_t num_nbrs = 0;
-	char addr_str[PREFIX_STRLEN];
+	pim_addr src_addr = pim_addr_from_prefix(src);
 
-	if (PIM_DEBUG_PIM_NHT) {
-		pim_inet4_dump("<addr?>", src->u.prefix4, addr_str,
-			       sizeof(addr_str));
-		zlog_debug("%s: Looking up: %s(%s), last lookup time: %lld",
-			   __func__, addr_str, pim->vrf->name,
+	if (PIM_DEBUG_PIM_NHT)
+		zlog_debug("%s: Looking up: %pPA(%s), last lookup time: %lld",
+			   __func__, &src_addr, pim->vrf->name,
 			   nexthop->last_lookup_time);
-	}
 
-	memset(&rpf, 0, sizeof(struct pim_rpf));
-	rpf.rpf_addr.family = AF_INET;
-	rpf.rpf_addr.prefixlen = IPV4_MAX_BITLEN;
-	rpf.rpf_addr.u.prefix4 = src->u.prefix4;
+	rpf.rpf_addr = *src;
 
 	pnc = pim_nexthop_cache_find(pim, &rpf);
 	if (pnc) {
@@ -941,14 +910,13 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
 
 	memset(nexthop_tab, 0,
 	       sizeof(struct pim_zlookup_nexthop) * MULTIPATH_NUM);
-	num_ifindex =
-		zclient_lookup_nexthop(pim, nexthop_tab, MULTIPATH_NUM,
-				       src->u.prefix4, PIM_NEXTHOP_LOOKUP_MAX);
+	num_ifindex = zclient_lookup_nexthop(pim, nexthop_tab, MULTIPATH_NUM,
+					     src_addr, PIM_NEXTHOP_LOOKUP_MAX);
 	if (num_ifindex < 1) {
 		if (PIM_DEBUG_PIM_NHT)
 			zlog_warn(
-				"%s: could not find nexthop ifindex for address %s(%s)",
-				__func__, addr_str, pim->vrf->name);
+				"%s: could not find nexthop ifindex for address %pPA(%s)",
+				__func__, &src_addr, pim->vrf->name);
 		return 0;
 	}
 
@@ -965,9 +933,8 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
 		if (ifps[i]) {
 			nbrs[i] = pim_neighbor_find_prefix(
 				ifps[i], &nexthop_tab[i].nexthop_addr);
-			if (nbrs[i]
-			    || pim_if_connected_to_source(ifps[i],
-							  src->u.prefix4))
+			if (nbrs[i] ||
+			    pim_if_connected_to_source(ifps[i], src_addr))
 				num_nbrs++;
 		}
 	}
@@ -997,9 +964,9 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
 		if (!ifp) {
 			if (PIM_DEBUG_PIM_NHT)
 				zlog_debug(
-					"%s %s: could not find interface for ifindex %d (address %s(%s))",
+					"%s %s: could not find interface for ifindex %d (address %pPA(%s))",
 					__FILE__, __func__, first_ifindex,
-					addr_str, pim->vrf->name);
+					&src_addr, pim->vrf->name);
 			if (i == mod_val)
 				mod_val++;
 			i++;
@@ -1009,16 +976,16 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
 		if (!ifp->info) {
 			if (PIM_DEBUG_PIM_NHT)
 				zlog_debug(
-					"%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %s)",
+					"%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %pPA)",
 					__func__, ifp->name, pim->vrf->name,
-					first_ifindex, addr_str);
+					first_ifindex, &src_addr);
 			if (i == mod_val)
 				mod_val++;
 			i++;
 			continue;
 		}
-		if (neighbor_needed
-		    && !pim_if_connected_to_source(ifp, src->u.prefix4)) {
+		if (neighbor_needed &&
+		    !pim_if_connected_to_source(ifp, src_addr)) {
 			nbr = nbrs[i];
 			if (PIM_DEBUG_PIM_NHT_DETAIL)
 				zlog_debug("ifp name: %s(%s), pim nbr: %p",
@@ -1026,12 +993,14 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
 			if (!nbr && !if_is_loopback(ifp)) {
 				if (i == mod_val)
 					mod_val++;
-				i++;
 				if (PIM_DEBUG_PIM_NHT)
 					zlog_debug(
-						"%s: NBR not found on input interface %s(%s) (RPF for source %s)",
-						__func__, ifp->name,
-						pim->vrf->name, addr_str);
+						"%s: NBR (%pFXh) not found on input interface %s(%s) (RPF for source %pPA)",
+						__func__,
+						&nexthop_tab[i].nexthop_addr,
+						ifp->name, pim->vrf->name,
+						&src_addr);
+				i++;
 				continue;
 			}
 		}
@@ -1044,8 +1013,8 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
 					      &nexthop_tab[i].nexthop_addr,
 					      nexthop_str, sizeof(nexthop_str));
 				zlog_debug(
-					"%s: found nhop %s for addr %s interface %s(%s) metric %d dist %d",
-					__func__, nexthop_str, addr_str,
+					"%s: found nhop %s for addr %pPA interface %s(%s) metric %d dist %d",
+					__func__, nexthop_str, &src_addr,
 					ifp->name, pim->vrf->name,
 					nexthop_tab[i].route_metric,
 					nexthop_tab[i].protocol_distance);
@@ -1058,7 +1027,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
 				nexthop_tab[i].protocol_distance;
 			nexthop->mrib_route_metric =
 				nexthop_tab[i].route_metric;
-			nexthop->last_lookup = src->u.prefix4;
+			nexthop->last_lookup = src_addr;
 			nexthop->last_lookup_time = pim_time_monotonic_usec();
 			nexthop->nbr = nbr;
 			found = 1;
@@ -1078,36 +1047,36 @@ int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim,
 	struct pim_nexthop nhop;
 	int vif_index;
 	ifindex_t ifindex;
-	char addr_str[PREFIX_STRLEN];
+	pim_addr src_addr;
 
-	if (PIM_DEBUG_PIM_NHT)
-		pim_inet4_dump("<addr?>", src->u.prefix4, addr_str,
-			       sizeof(addr_str));
+	if (PIM_DEBUG_PIM_NHT) {
+		src_addr = pim_addr_from_prefix(src);
+	}
 
 	memset(&nhop, 0, sizeof(nhop));
 	if (!pim_ecmp_nexthop_lookup(pim, &nhop, src, grp, 1)) {
 		if (PIM_DEBUG_PIM_NHT)
 			zlog_debug(
-				"%s: could not find nexthop ifindex for address %s(%s)",
-				__func__, addr_str, pim->vrf->name);
+				"%s: could not find nexthop ifindex for address %pPA(%s)",
+				__func__, &src_addr, pim->vrf->name);
 		return -1;
 	}
 
 	ifindex = nhop.interface->ifindex;
 	if (PIM_DEBUG_PIM_NHT)
 		zlog_debug(
-			"%s: found nexthop ifindex=%d (interface %s(%s)) for address %s",
+			"%s: found nexthop ifindex=%d (interface %s(%s)) for address %pPA",
 			__func__, ifindex,
 			ifindex2ifname(ifindex, pim->vrf->vrf_id),
-			pim->vrf->name, addr_str);
+			pim->vrf->name, &src_addr);
 
 	vif_index = pim_if_find_vifindex_by_ifindex(pim, ifindex);
 
 	if (vif_index < 0) {
 		if (PIM_DEBUG_PIM_NHT) {
 			zlog_debug(
-				"%s: low vif_index=%d(%s) < 1 nexthop for address %s",
-				__func__, vif_index, pim->vrf->name, addr_str);
+				"%s: low vif_index=%d(%s) < 1 nexthop for address %pPA",
+				__func__, vif_index, pim->vrf->name, &src_addr);
 		}
 		return -2;
 	}