1 files changed, 69 insertions, 84 deletions

diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index 2b798b14b2..783c9b97e7 100644
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -84,7 +84,7 @@ int pim_rp_list_cmp(void *v1, void *v2)
 	/*
 	 * Sort by RP IP address
 	 */
-	ret = prefix_cmp(&rp1->rp.rpf_addr, &rp2->rp.rpf_addr);
+	ret = pim_addr_cmp(rp1->rp.rpf_addr, rp2->rp.rpf_addr);
 	if (ret)
 		return ret;
 
@@ -119,7 +119,7 @@ void pim_rp_init(struct pim_instance *pim)
 		XFREE(MTYPE_PIM_RP, rp_info);
 		return;
 	}
-	pim_addr_to_prefix(&rp_info->rp.rpf_addr, PIMADDR_ANY);
+	rp_info->rp.rpf_addr = PIMADDR_ANY;
 
 	listnode_add(pim->rp_list, rp_info);
 
@@ -149,12 +149,9 @@ static struct rp_info *pim_rp_find_prefix_list(struct pim_instance *pim,
 {
 	struct listnode *node;
 	struct rp_info *rp_info;
-	struct prefix rp_prefix;
-
-	pim_addr_to_prefix(&rp_prefix, rp);
 
 	for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) {
-		if (prefix_same(&rp_prefix, &rp_info->rp.rpf_addr) &&
+		if ((!pim_addr_cmp(rp, rp_info->rp.rpf_addr)) &&
 		    rp_info->plist && strcmp(rp_info->plist, plist) == 0) {
 			return rp_info;
 		}
@@ -189,11 +186,9 @@ static struct rp_info *pim_rp_find_exact(struct pim_instance *pim, pim_addr rp,
 {
 	struct listnode *node;
 	struct rp_info *rp_info;
-	struct prefix rp_prefix;
 
-	pim_addr_to_prefix(&rp_prefix, rp);
 	for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) {
-		if (prefix_same(&rp_prefix, &rp_info->rp.rpf_addr) &&
+		if ((!pim_addr_cmp(rp, rp_info->rp.rpf_addr)) &&
 		    prefix_same(&rp_info->group, group))
 			return rp_info;
 	}
@@ -344,11 +339,9 @@ static int pim_rp_check_interface_addrs(struct rp_info *rp_info,
 {
 	struct listnode *node;
 	struct pim_secondary_addr *sec_addr;
-	pim_addr rpf_addr;
-
-	rpf_addr = pim_addr_from_prefix(&rp_info->rp.rpf_addr);
+	pim_addr sec_paddr;
 
-	if (!pim_addr_cmp(pim_ifp->primary_address, rpf_addr))
+	if (!pim_addr_cmp(pim_ifp->primary_address, rp_info->rp.rpf_addr))
 		return 1;
 
 	if (!pim_ifp->sec_addr_list) {
@@ -356,9 +349,11 @@ static int pim_rp_check_interface_addrs(struct rp_info *rp_info,
 	}
 
 	for (ALL_LIST_ELEMENTS_RO(pim_ifp->sec_addr_list, node, sec_addr)) {
-		if (prefix_same(&sec_addr->addr, &rp_info->rp.rpf_addr)) {
+		sec_paddr = pim_addr_from_prefix(&sec_addr->addr);
+		/* If an RP-address is self, It should be enough to say
+		 * I am RP the prefix-length should not matter here */
+		if (!pim_addr_cmp(sec_paddr, rp_info->rp.rpf_addr))
 			return 1;
-		}
 	}
 
 	return 0;
@@ -388,7 +383,6 @@ void pim_upstream_update(struct pim_instance *pim, struct pim_upstream *up)
 	enum pim_rpf_result rpf_result;
 	pim_addr old_upstream_addr;
 	pim_addr new_upstream_addr;
-	struct prefix nht_p;
 
 	old_upstream_addr = up->upstream_addr;
 	pim_rp_set_upstream_addr(pim, &new_upstream_addr, up->sg.src,
@@ -408,12 +402,11 @@ void pim_upstream_update(struct pim_instance *pim, struct pim_upstream *up)
 	 */
 	if (!pim_addr_is_any(old_upstream_addr)) {
 		/* Deregister addr with Zebra NHT */
-		pim_addr_to_prefix(&nht_p, old_upstream_addr);
 		if (PIM_DEBUG_PIM_TRACE)
 			zlog_debug(
-				"%s: Deregister upstream %s addr %pFX with Zebra NHT",
-				__func__, up->sg_str, &nht_p);
-		pim_delete_tracked_nexthop(pim, &nht_p, up, NULL);
+				"%s: Deregister upstream %s addr %pPA with Zebra NHT",
+				__func__, up->sg_str, &old_upstream_addr);
+		pim_delete_tracked_nexthop(pim, old_upstream_addr, up, NULL);
 	}
 
 	/* Update the upstream address */
@@ -446,7 +439,7 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 	struct listnode *node, *nnode;
 	struct rp_info *tmp_rp_info;
 	char buffer[BUFSIZ];
-	struct prefix nht_p;
+	pim_addr nht_p;
 	struct route_node *rn = NULL;
 	struct pim_upstream *up;
 	bool upstream_updated = false;
@@ -456,7 +449,7 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 
 	rp_info = XCALLOC(MTYPE_PIM_RP, sizeof(*rp_info));
 
-	pim_addr_to_prefix(&rp_info->rp.rpf_addr, rp_addr);
+	rp_info->rp.rpf_addr = rp_addr;
 	prefix_copy(&rp_info->group, &group);
 	rp_info->rp_src = rp_src_flag;
 
@@ -482,8 +475,8 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 		 */
 		for (ALL_LIST_ELEMENTS(pim->rp_list, node, nnode,
 				       tmp_rp_info)) {
-			if (prefix_same(&rp_info->rp.rpf_addr,
-					&tmp_rp_info->rp.rpf_addr)) {
+			if (!pim_addr_cmp(rp_info->rp.rpf_addr,
+					  tmp_rp_info->rp.rpf_addr)) {
 				if (tmp_rp_info->plist)
 					pim_rp_del_config(pim, rp_addr, NULL,
 							  tmp_rp_info->plist);
@@ -519,8 +512,8 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 		for (ALL_LIST_ELEMENTS(pim->rp_list, node, nnode,
 				       tmp_rp_info)) {
 			if (tmp_rp_info->plist &&
-			    prefix_same(&rp_info->rp.rpf_addr,
-					&tmp_rp_info->rp.rpf_addr)) {
+			    (!pim_addr_cmp(rp_info->rp.rpf_addr,
+					   tmp_rp_info->rp.rpf_addr))) {
 				pim_rp_del_config(pim, rp_addr, NULL,
 						  tmp_rp_info->plist);
 			}
@@ -539,7 +532,7 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 			nht_p = rp_all->rp.rpf_addr;
 			if (PIM_DEBUG_PIM_NHT_RP)
 				zlog_debug(
-					"%s: NHT Register rp_all addr %pFX grp %pFX ",
+					"%s: NHT Register rp_all addr %pPA grp %pFX ",
 					__func__, &nht_p, &rp_all->group);
 
 			frr_each (rb_pim_upstream, &pim->upstream_head, up) {
@@ -565,12 +558,12 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 
 			pim_rp_check_interfaces(pim, rp_all);
 			pim_rp_refresh_group_to_rp_mapping(pim);
-			pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_all,
+			pim_find_or_track_nexthop(pim, nht_p, NULL, rp_all,
 						  NULL);
 
 			if (!pim_ecmp_nexthop_lookup(pim,
 						     &rp_all->rp.source_nexthop,
-						     &nht_p, &rp_all->group, 1))
+						     nht_p, &rp_all->group, 1))
 				return PIM_RP_NO_PATH;
 			return PIM_SUCCESS;
 		}
@@ -660,10 +653,10 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 	/* Register addr with Zebra NHT */
 	nht_p = rp_info->rp.rpf_addr;
 	if (PIM_DEBUG_PIM_NHT_RP)
-		zlog_debug("%s: NHT Register RP addr %pFX grp %pFX with Zebra ",
+		zlog_debug("%s: NHT Register RP addr %pPA grp %pFX with Zebra ",
 			   __func__, &nht_p, &rp_info->group);
-	pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_info, NULL);
-	if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop, &nht_p,
+	pim_find_or_track_nexthop(pim, nht_p, NULL, rp_info, NULL);
+	if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop, nht_p,
 				     &rp_info->group, 1))
 		return PIM_RP_NO_PATH;
 
@@ -698,7 +691,7 @@ int pim_rp_del(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 	struct prefix g_all;
 	struct rp_info *rp_info;
 	struct rp_info *rp_all;
-	struct prefix nht_p;
+	pim_addr nht_p;
 	struct route_node *rn;
 	bool was_plist = false;
 	struct rp_info *trp_info;
@@ -753,9 +746,9 @@ int pim_rp_del(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 	/* Deregister addr with Zebra NHT */
 	nht_p = rp_info->rp.rpf_addr;
 	if (PIM_DEBUG_PIM_NHT_RP)
-		zlog_debug("%s: Deregister RP addr %pFX with Zebra ", __func__,
+		zlog_debug("%s: Deregister RP addr %pPA with Zebra ", __func__,
 			   &nht_p);
-	pim_delete_tracked_nexthop(pim, &nht_p, NULL, rp_info);
+	pim_delete_tracked_nexthop(pim, nht_p, NULL, rp_info);
 
 	if (!pim_get_all_mcast_group(&g_all))
 		return PIM_RP_BAD_ADDRESS;
@@ -769,7 +762,7 @@ int pim_rp_del(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 			 */
 			pim_addr rpf_addr;
 
-			rpf_addr = pim_addr_from_prefix(&rp_info->rp.rpf_addr);
+			rpf_addr = rp_info->rp.rpf_addr;
 			if (!pim_addr_cmp(up->upstream_addr, rpf_addr) &&
 			    pim_addr_is_any(up->sg.src)) {
 				struct prefix grp;
@@ -782,7 +775,7 @@ int pim_rp_del(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 				}
 			}
 		}
-		pim_addr_to_prefix(&rp_all->rp.rpf_addr, PIMADDR_ANY);
+		rp_all->rp.rpf_addr = PIMADDR_ANY;
 		rp_all->i_am_rp = 0;
 		return PIM_SUCCESS;
 	}
@@ -817,7 +810,7 @@ int pim_rp_del(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 		 */
 		pim_addr rpf_addr;
 
-		rpf_addr = pim_addr_from_prefix(&rp_info->rp.rpf_addr);
+		rpf_addr = rp_info->rp.rpf_addr;
 		if (!pim_addr_cmp(up->upstream_addr, rpf_addr) &&
 		    pim_addr_is_any(up->sg.src)) {
 			struct prefix grp;
@@ -851,7 +844,7 @@ int pim_rp_del(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 int pim_rp_change(struct pim_instance *pim, pim_addr new_rp_addr,
 		  struct prefix group, enum rp_source rp_src_flag)
 {
-	struct prefix nht_p;
+	pim_addr nht_p;
 	struct route_node *rn;
 	int result = 0;
 	struct rp_info *rp_info = NULL;
@@ -873,7 +866,7 @@ int pim_rp_change(struct pim_instance *pim, pim_addr new_rp_addr,
 		return result;
 	}
 
-	old_rp_addr = pim_addr_from_prefix(&rp_info->rp.rpf_addr);
+	old_rp_addr = rp_info->rp.rpf_addr;
 	if (!pim_addr_cmp(new_rp_addr, old_rp_addr)) {
 		if (rp_info->rp_src != rp_src_flag) {
 			rp_info->rp_src = rp_src_flag;
@@ -882,24 +875,21 @@ int pim_rp_change(struct pim_instance *pim, pim_addr new_rp_addr,
 		}
 	}
 
-	nht_p.family = PIM_AF;
-	nht_p.prefixlen = PIM_MAX_BITLEN;
-
 	/* Deregister old RP addr with Zebra NHT */
 
 	if (!pim_addr_is_any(old_rp_addr)) {
 		nht_p = rp_info->rp.rpf_addr;
 		if (PIM_DEBUG_PIM_NHT_RP)
-			zlog_debug("%s: Deregister RP addr %pFX with Zebra ",
+			zlog_debug("%s: Deregister RP addr %pPA with Zebra ",
 				   __func__, &nht_p);
-		pim_delete_tracked_nexthop(pim, &nht_p, NULL, rp_info);
+		pim_delete_tracked_nexthop(pim, nht_p, NULL, rp_info);
 	}
 
 	pim_rp_nexthop_del(rp_info);
 	listnode_delete(pim->rp_list, rp_info);
 	/* Update the new RP address*/
 
-	pim_addr_to_prefix(&rp_info->rp.rpf_addr, new_rp_addr);
+	rp_info->rp.rpf_addr = new_rp_addr;
 	rp_info->rp_src = rp_src_flag;
 	rp_info->i_am_rp = 0;
 
@@ -926,11 +916,11 @@ int pim_rp_change(struct pim_instance *pim, pim_addr new_rp_addr,
 	/* Register new RP addr with Zebra NHT */
 	nht_p = rp_info->rp.rpf_addr;
 	if (PIM_DEBUG_PIM_NHT_RP)
-		zlog_debug("%s: NHT Register RP addr %pFX grp %pFX with Zebra ",
+		zlog_debug("%s: NHT Register RP addr %pPA grp %pFX with Zebra ",
 			   __func__, &nht_p, &rp_info->group);
 
-	pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_info, NULL);
-	if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop, &nht_p,
+	pim_find_or_track_nexthop(pim, nht_p, NULL, rp_info, NULL);
+	if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop, nht_p,
 				     &rp_info->group, 1)) {
 		route_unlock_node(rn);
 		return PIM_RP_NO_PATH;
@@ -949,7 +939,7 @@ void pim_rp_setup(struct pim_instance *pim)
 {
 	struct listnode *node;
 	struct rp_info *rp_info;
-	struct prefix nht_p;
+	pim_addr nht_p;
 
 	for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) {
 		if (pim_rpf_addr_is_inaddr_any(&rp_info->rp))
@@ -957,9 +947,9 @@ void pim_rp_setup(struct pim_instance *pim)
 
 		nht_p = rp_info->rp.rpf_addr;
 
-		pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_info, NULL);
+		pim_find_or_track_nexthop(pim, nht_p, NULL, rp_info, NULL);
 		if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop,
-					     &nht_p, &rp_info->group, 1))
+					     nht_p, &rp_info->group, 1))
 			if (PIM_DEBUG_PIM_NHT_RP)
 				zlog_debug(
 					"Unable to lookup nexthop for rp specified");
@@ -994,12 +984,9 @@ void pim_rp_check_on_if_add(struct pim_interface *pim_ifp)
 		if (pim_rp_check_interface_addrs(rp_info, pim_ifp)) {
 			i_am_rp_changed = true;
 			rp_info->i_am_rp = 1;
-			if (PIM_DEBUG_PIM_NHT_RP) {
-				char rp[PREFIX_STRLEN];
-				pim_addr_dump("<rp?>", &rp_info->rp.rpf_addr,
-					      rp, sizeof(rp));
-				zlog_debug("%s: %s: i am rp", __func__, rp);
-			}
+			if (PIM_DEBUG_PIM_NHT_RP)
+				zlog_debug("%s: %pPA: i am rp", __func__,
+					   &rp_info->rp.rpf_addr);
 		}
 	}
 
@@ -1032,16 +1019,15 @@ void pim_i_am_rp_re_evaluate(struct pim_instance *pim)
 		if (old_i_am_rp != rp_info->i_am_rp) {
 			i_am_rp_changed = true;
 			if (PIM_DEBUG_PIM_NHT_RP) {
-				char rp[PREFIX_STRLEN];
-				pim_addr_dump("<rp?>", &rp_info->rp.rpf_addr,
-					      rp, sizeof(rp));
-				if (rp_info->i_am_rp) {
-					zlog_debug("%s: %s: i am rp", __func__,
-						   rp);
-				} else {
-					zlog_debug("%s: %s: i am no longer rp",
-						   __func__, rp);
-				}
+				if (rp_info->i_am_rp)
+					zlog_debug("%s: %pPA: i am rp",
+						   __func__,
+						   &rp_info->rp.rpf_addr);
+				else
+					zlog_debug(
+						"%s: %pPA: i am no longer rp",
+						__func__,
+						&rp_info->rp.rpf_addr);
 			}
 		}
 	}
@@ -1088,18 +1074,18 @@ struct pim_rpf *pim_rp_g(struct pim_instance *pim, pim_addr group)
 	rp_info = pim_rp_find_match_group(pim, &g);
 
 	if (rp_info) {
-		struct prefix nht_p;
+		pim_addr nht_p;
 
 		/* Register addr with Zebra NHT */
 		nht_p = rp_info->rp.rpf_addr;
 		if (PIM_DEBUG_PIM_NHT_RP)
 			zlog_debug(
-				"%s: NHT Register RP addr %pFX grp %pFX with Zebra",
+				"%s: NHT Register RP addr %pPA grp %pFX with Zebra",
 				__func__, &nht_p, &rp_info->group);
-		pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_info, NULL);
+		pim_find_or_track_nexthop(pim, nht_p, NULL, rp_info, NULL);
 		pim_rpf_set_refresh_time(pim);
 		(void)pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop,
-					      &nht_p, &rp_info->group, 1);
+					      nht_p, &rp_info->group, 1);
 		return (&rp_info->rp);
 	}
 
@@ -1137,7 +1123,7 @@ int pim_rp_set_upstream_addr(struct pim_instance *pim, pim_addr *up,
 	}
 
 	if (pim_addr_is_any(source))
-		*up = pim_addr_from_prefix(&rp_info->rp.rpf_addr);
+		*up = rp_info->rp.rpf_addr;
 	else
 		*up = source;
 
@@ -1159,7 +1145,7 @@ int pim_rp_config_write(struct pim_instance *pim, struct vty *vty,
 		if (rp_info->rp_src == RP_SRC_BSR)
 			continue;
 
-		rp_addr = pim_addr_from_prefix(&rp_info->rp.rpf_addr);
+		rp_addr = rp_info->rp.rpf_addr;
 		if (rp_info->plist)
 			vty_out(vty,
 				"%s" PIM_AF_NAME
@@ -1215,10 +1201,10 @@ void pim_rp_show_information(struct pim_instance *pim, struct prefix *range,
 			 * entry for the previous RP
 			 */
 			if (prev_rp_info &&
-			    prefix_cmp(&prev_rp_info->rp.rpf_addr,
-				       &rp_info->rp.rpf_addr)) {
+			    (pim_addr_cmp(prev_rp_info->rp.rpf_addr,
+					  rp_info->rp.rpf_addr))) {
 				json_object_object_addf(
-					json, json_rp_rows, "%pFXh",
+					json, json_rp_rows, "%pPA",
 					&prev_rp_info->rp.rpf_addr);
 				json_rp_rows = NULL;
 			}
@@ -1227,7 +1213,7 @@ void pim_rp_show_information(struct pim_instance *pim, struct prefix *range,
 				json_rp_rows = json_object_new_array();
 
 			json_row = json_object_new_object();
-			json_object_string_addf(json_row, "rpAddress", "%pFXh",
+			json_object_string_addf(json_row, "rpAddress", "%pPA",
 						&rp_info->rp.rpf_addr);
 			if (rp_info->rp.source_nexthop.interface)
 				json_object_string_add(
@@ -1257,7 +1243,7 @@ void pim_rp_show_information(struct pim_instance *pim, struct prefix *range,
 
 			json_object_array_add(json_rp_rows, json_row);
 		} else {
-			vty_out(vty, "%-15pFXh  ", &rp_info->rp.rpf_addr);
+			vty_out(vty, "%-15pPA  ", &rp_info->rp.rpf_addr);
 
 			if (rp_info->plist)
 				vty_out(vty, "%-18s  ", rp_info->plist);
@@ -1284,7 +1270,7 @@ void pim_rp_show_information(struct pim_instance *pim, struct prefix *range,
 
 	if (json) {
 		if (prev_rp_info && json_rp_rows)
-			json_object_object_addf(json, json_rp_rows, "%pFXh",
+			json_object_object_addf(json, json_rp_rows, "%pPA",
 						&prev_rp_info->rp.rpf_addr);
 	}
 }
@@ -1294,7 +1280,7 @@ void pim_resolve_rp_nh(struct pim_instance *pim, struct pim_neighbor *nbr)
 	struct listnode *node = NULL;
 	struct rp_info *rp_info = NULL;
 	struct nexthop *nh_node = NULL;
-	struct prefix nht_p;
+	pim_addr nht_p;
 	struct pim_nexthop_cache pnc;
 
 	for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) {
@@ -1303,8 +1289,7 @@ void pim_resolve_rp_nh(struct pim_instance *pim, struct pim_neighbor *nbr)
 
 		nht_p = rp_info->rp.rpf_addr;
 		memset(&pnc, 0, sizeof(struct pim_nexthop_cache));
-		if (!pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_info,
-					       &pnc))
+		if (!pim_find_or_track_nexthop(pim, nht_p, NULL, rp_info, &pnc))
 			continue;
 
 		for (nh_node = pnc.nexthop; nh_node; nh_node = nh_node->next) {
@@ -1329,7 +1314,7 @@ void pim_resolve_rp_nh(struct pim_instance *pim, struct pim_neighbor *nbr)
 #endif
 			if (PIM_DEBUG_PIM_NHT_RP)
 				zlog_debug(
-					"%s: addr %pFXh new nexthop addr %pPAs interface %s",
+					"%s: addr %pPA new nexthop addr %pPAs interface %s",
 					__func__, &nht_p, &nbr->source_addr,
 					ifp1->name);
 		}