bgpd, lib, ripngd: Add agg_node_get_prefix

Modify code to use lookup function agg_node_get_prefix()
as the abstraction layer.  When we rework bgp_node to
bgp_dest this will allow us to greatly limit the amount
of work needed to do that.

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

17 files changed, 246 insertions, 289 deletions

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index e1c72d8bb..c958e330c 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -4028,7 +4028,7 @@ filtered:
 	return 0;
 }
 
-int bgp_withdraw(struct peer *peer, struct prefix *p, uint32_t addpath_id,
+int bgp_withdraw(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
 		 struct attr *attr, afi_t afi, safi_t safi, int type,
 		 int sub_type, struct prefix_rd *prd, mpls_label_t *label,
 		 uint32_t num_labels, struct bgp_route_evpn *evpn)
diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h
index 36d15fabc..5f6a15891 100644
--- a/bgpd/bgp_route.h
+++ b/bgpd/bgp_route.h
@@ -564,9 +564,11 @@ extern int bgp_update(struct peer *peer, const struct prefix *p,
 		      struct prefix_rd *prd, mpls_label_t *label,
 		      uint32_t num_labels, int soft_reconfig,
 		      struct bgp_route_evpn *evpn);
-extern int bgp_withdraw(struct peer *, struct prefix *, uint32_t, struct attr *,
-			afi_t, safi_t, int, int, struct prefix_rd *,
-			mpls_label_t *, uint32_t, struct bgp_route_evpn *);
+extern int bgp_withdraw(struct peer *peer, const struct prefix *p,
+			uint32_t addpath_id, struct attr *attr, afi_t afi,
+			safi_t safi, int type, int sub_type,
+			struct prefix_rd *prd, mpls_label_t *label,
+			uint32_t num_labels, struct bgp_route_evpn *evpn);
 
 /* for bgp_nexthop and bgp_damp */
 extern void bgp_process(struct bgp *, struct bgp_node *, afi_t, safi_t);
diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c
index f31ecc017..4d7fccbe9 100644
--- a/bgpd/rfapi/rfapi_import.c
+++ b/bgpd/rfapi/rfapi_import.c
@@ -663,14 +663,17 @@ rfapiMonitorMoveShorter(struct agg_node *original_vpn_node, int lockoffset)
 	 * If no less-specific routes, try to use the 0/0 node
 	 */
 	if (!par) {
+		const struct prefix *p;
 		/* this isn't necessarily 0/0 */
 		par = agg_route_table_top(original_vpn_node);
 
+		if (par)
+			p = agg_node_get_prefix(par);
 		/*
 		 * If we got the top node but it wasn't 0/0,
 		 * ignore it
 		 */
-		if (par && par->p.prefixlen) {
+		if (par && p->prefixlen) {
 			agg_unlock_node(par); /* maybe free */
 			par = NULL;
 		}
@@ -685,9 +688,10 @@ rfapiMonitorMoveShorter(struct agg_node *original_vpn_node, int lockoffset)
 	 */
 	if (!par) {
 		struct prefix pfx_default;
+		const struct prefix *p = agg_node_get_prefix(original_vpn_node);
 
 		memset(&pfx_default, 0, sizeof(pfx_default));
-		pfx_default.family = original_vpn_node->p.family;
+		pfx_default.family = p->family;
 
 		/* creates default node if none exists */
 		par = agg_node_get(agg_get_table(original_vpn_node),
@@ -768,6 +772,7 @@ static void rfapiMonitorMoveLonger(struct agg_node *new_vpn_node)
 	struct rfapi_monitor_vpn *mlast;
 	struct bgp_path_info *bpi;
 	struct agg_node *par;
+	const struct prefix *new_vpn_node_p = agg_node_get_prefix(new_vpn_node);
 
 	RFAPI_CHECK_REFCOUNT(new_vpn_node, SAFI_MPLS_VPN, 0);
 
@@ -808,12 +813,11 @@ static void rfapiMonitorMoveLonger(struct agg_node *new_vpn_node)
 	 * specific updated node
 	 */
 	for (mlast = NULL, monitor = RFAPI_MONITOR_VPN(par); monitor;) {
-
 		/*
 		 * If new longest match for monitor prefix is the new
 		 * route's prefix, move monitor to new route's prefix
 		 */
-		if (prefix_match(&new_vpn_node->p, &monitor->p)) {
+		if (prefix_match(new_vpn_node_p, &monitor->p)) {
 			/* detach */
 			if (mlast) {
 				mlast->next = monitor->next;
@@ -1266,6 +1270,7 @@ rfapiRouteInfo2NextHopEntry(struct rfapi_ip_prefix *rprefix,
 {
 	struct rfapi_next_hop_entry *new;
 	int have_vnc_tunnel_un = 0;
+	const struct prefix *p = agg_node_get_prefix(rn);
 
 #ifdef DEBUG_ENCAP_MONITOR
 	vnc_zlog_debug_verbose("%s: entry, bpi %p, rn %p", __func__, bpi, rn);
@@ -1289,8 +1294,7 @@ rfapiRouteInfo2NextHopEntry(struct rfapi_ip_prefix *rprefix,
 
 		vo->type = RFAPI_VN_OPTION_TYPE_L2ADDR;
 
-		memcpy(&vo->v.l2addr.macaddr, &rn->p.u.prefix_eth.octet,
-		       ETH_ALEN);
+		memcpy(&vo->v.l2addr.macaddr, &p->u.prefix_eth.octet, ETH_ALEN);
 		/* only low 3 bytes of this are significant */
 		(void)rfapiEcommunityGetLNI(bpi->attr->ecommunity,
 					    &vo->v.l2addr.logical_net_id);
@@ -1493,7 +1497,8 @@ static int rfapiNhlAddNodeRoutes(
 	struct prefix pfx_un;
 	struct skiplist *seen_nexthops;
 	int count = 0;
-	int is_l2 = (rn->p.family == AF_ETHERNET);
+	const struct prefix *p = agg_node_get_prefix(rn);
+	int is_l2 = (p->family == AF_ETHERNET);
 
 	if (rfd_rib_node) {
 		struct agg_table *atable = agg_get_table(rfd_rib_node);
@@ -1626,14 +1631,14 @@ static int rfapiNhlAddSubtree(
 	 * hands in node->link */
 	if (agg_node_left(rn) && agg_node_left(rn) != omit_node) {
 		if (agg_node_left(rn)->info) {
+			const struct prefix *p =
+				agg_node_get_prefix(agg_node_left(rn));
 			int count = 0;
 			struct agg_node *rib_rn = NULL;
 
-			rfapiQprefix2Rprefix(&agg_node_left(rn)->p, &rprefix);
-			if (rfd_rib_table) {
-				rib_rn = agg_node_get(rfd_rib_table,
-						      &agg_node_left(rn)->p);
-			}
+			rfapiQprefix2Rprefix(p, &rprefix);
+			if (rfd_rib_table)
+				rib_rn = agg_node_get(rfd_rib_table, p);
 
 			count = rfapiNhlAddNodeRoutes(
 				agg_node_left(rn), &rprefix, lifetime, 0, head,
@@ -1653,14 +1658,15 @@ static int rfapiNhlAddSubtree(
 
 	if (agg_node_right(rn) && agg_node_right(rn) != omit_node) {
 		if (agg_node_right(rn)->info) {
+			const struct prefix *p =
+				agg_node_get_prefix(agg_node_right(rn));
 			int count = 0;
 			struct agg_node *rib_rn = NULL;
 
-			rfapiQprefix2Rprefix(&agg_node_right(rn)->p, &rprefix);
-			if (rfd_rib_table) {
-				rib_rn = agg_node_get(rfd_rib_table,
-						      &agg_node_right(rn)->p);
-			}
+			rfapiQprefix2Rprefix(p, &rprefix);
+			if (rfd_rib_table)
+				rib_rn = agg_node_get(rfd_rib_table, p);
+
 			count = rfapiNhlAddNodeRoutes(
 				agg_node_right(rn), &rprefix, lifetime, 0, head,
 				tail, exclude_vnaddr, rib_rn,
@@ -1712,23 +1718,18 @@ struct rfapi_next_hop_entry *rfapiRouteNode2NextHopList(
 	struct rfapi_next_hop_entry *answer = NULL;
 	struct rfapi_next_hop_entry *last = NULL;
 	struct agg_node *parent;
+	const struct prefix *p = agg_node_get_prefix(rn);
 	int count = 0;
 	struct agg_node *rib_rn;
 
 #ifdef DEBUG_RETURNED_NHL
-	{
-		char buf[PREFIX_STRLEN];
-
-		prefix2str(&rn->p, buf, sizeof(buf));
-		vnc_zlog_debug_verbose("%s: called with node pfx=%s", __func__,
-				       buf);
-	}
+	vnc_zlog_debug_verbose("%s: called with node pfx=%rRN", __func__, rn);
 	rfapiDebugBacktrace();
 #endif
 
-	rfapiQprefix2Rprefix(&rn->p, &rprefix);
+	rfapiQprefix2Rprefix(p, &rprefix);
 
-	rib_rn = rfd_rib_table ? agg_node_get(rfd_rib_table, &rn->p) : NULL;
+	rib_rn = rfd_rib_table ? agg_node_get(rfd_rib_table, p) : NULL;
 
 	/*
 	 * Add non-withdrawn routes at this node
@@ -1780,9 +1781,10 @@ struct rfapi_next_hop_entry *rfapiRouteNode2NextHopList(
 	 * Add non-withdrawn routes from less-specific prefix
 	 */
 	if (parent) {
-		rib_rn = rfd_rib_table ? agg_node_get(rfd_rib_table, &parent->p)
-				       : NULL;
-		rfapiQprefix2Rprefix(&parent->p, &rprefix);
+		const struct prefix *p = agg_node_get_prefix(parent);
+
+		rib_rn = rfd_rib_table ? agg_node_get(rfd_rib_table, p) : NULL;
+		rfapiQprefix2Rprefix(p, &rprefix);
 		count += rfapiNhlAddNodeRoutes(parent, &rprefix, lifetime, 0,
 					       &answer, &last, exclude_vnaddr,
 					       rib_rn, pfx_target_original);
@@ -1863,7 +1865,9 @@ struct rfapi_next_hop_entry *rfapiEthRouteNode2NextHopList(
 	struct rfapi_next_hop_entry *last = NULL;
 	struct agg_node *rib_rn;
 
-	rib_rn = rfd_rib_table ? agg_node_get(rfd_rib_table, &rn->p) : NULL;
+	rib_rn = rfd_rib_table
+			 ? agg_node_get(rfd_rib_table, agg_node_get_prefix(rn))
+			 : NULL;
 
 	count = rfapiNhlAddNodeRoutes(rn, rprefix, lifetime, 0, &answer, &last,
 				      NULL, rib_rn, pfx_target_original);
@@ -2090,6 +2094,7 @@ static void rfapiItBiIndexAdd(struct agg_node *rn, /* Import table VPN node */
 			      struct bgp_path_info *bpi) /* new BPI */
 {
 	struct skiplist *sl;
+	const struct prefix *p;
 
 	assert(rn);
 	assert(bpi);
@@ -2106,7 +2111,8 @@ static void rfapiItBiIndexAdd(struct agg_node *rn, /* Import table VPN node */
 
 	sl = RFAPI_RDINDEX_W_ALLOC(rn);
 	if (!sl) {
-		if (AF_ETHERNET == rn->p.family) {
+		p = agg_node_get_prefix(rn);
+		if (AF_ETHERNET == p->family) {
 			sl = skiplist_new(0, rfapi_bi_peer_rd_aux_cmp, NULL);
 		} else {
 			sl = skiplist_new(0, rfapi_bi_peer_rd_cmp, NULL);
@@ -2376,7 +2382,7 @@ static int rfapiWithdrawTimerVPN(struct thread *t)
 	struct rfapi_withdraw *wcb = t->arg;
 	struct bgp_path_info *bpi = wcb->info;
 	struct bgp *bgp = bgp_get_default();
-
+	const struct prefix *p;
 	struct rfapi_monitor_vpn *moved;
 	afi_t afi;
 
@@ -2399,15 +2405,8 @@ static int rfapiWithdrawTimerVPN(struct thread *t)
 
 	RFAPI_CHECK_REFCOUNT(wcb->node, SAFI_MPLS_VPN, wcb->lockoffset);
 
-	{
-		char buf[BUFSIZ];
-
-		vnc_zlog_debug_verbose(
-			"%s: removing bpi %p at prefix %s/%d", __func__, bpi,
-			rfapi_ntop(wcb->node->p.family, &wcb->node->p.u.prefix,
-				   buf, BUFSIZ),
-			wcb->node->p.prefixlen);
-	}
+	vnc_zlog_debug_verbose("%s: removing bpi %p at prefix %pRN", __func__,
+			       bpi, wcb->node);
 
 	/*
 	 * Remove the route (doubly-linked)
@@ -2416,7 +2415,8 @@ static int rfapiWithdrawTimerVPN(struct thread *t)
 	    && VALID_INTERIOR_TYPE(bpi->type))
 		RFAPI_MONITOR_EXTERIOR(wcb->node)->valid_interior_count--;
 
-	afi = family2afi(wcb->node->p.family);
+	p = agg_node_get_prefix(wcb->node);
+	afi = family2afi(p->family);
 	wcb->import_table->holddown_count[afi] -= 1; /* keep count consistent */
 	rfapiItBiIndexDel(wcb->node, bpi);
 	rfapiBgpInfoDetach(wcb->node, bpi); /* with removed bpi */
@@ -3077,11 +3077,8 @@ static void rfapiBgpInfoFilteredImportEncap(
 			if (action == FIF_ACTION_WITHDRAW) {
 
 				vnc_zlog_debug_verbose(
-					"%s: withdrawing at prefix %s/%d",
-					__func__,
-					inet_ntop(rn->p.family, &rn->p.u.prefix,
-						  buf, BUFSIZ),
-					rn->p.prefixlen);
+					"%s: withdrawing at prefix %pRN",
+					__func__, rn);
 
 				rfapiBiStartWithdrawTimer(
 					import_table, rn, bpi, afi, SAFI_ENCAP,
@@ -3089,13 +3086,11 @@ static void rfapiBgpInfoFilteredImportEncap(
 
 			} else {
 				vnc_zlog_debug_verbose(
-					"%s: %s at prefix %s/%d", __func__,
+					"%s: %s at prefix %pRN", __func__,
 					((action == FIF_ACTION_KILL)
 						 ? "killing"
 						 : "replacing"),
-					inet_ntop(rn->p.family, &rn->p.u.prefix,
-						  buf, BUFSIZ),
-					rn->p.prefixlen);
+					rn);
 
 				/*
 				 * If this route is waiting to be deleted
@@ -3163,10 +3158,8 @@ static void rfapiBgpInfoFilteredImportEncap(
 		rn = agg_node_get(rt, p);
 	}
 
-	vnc_zlog_debug_verbose(
-		"%s: (afi=%d, rn=%p) inserting at prefix %s/%d", __func__, afi,
-		rn, inet_ntop(rn->p.family, &rn->p.u.prefix, buf, BUFSIZ),
-		rn->p.prefixlen);
+	vnc_zlog_debug_verbose("%s: (afi=%d, rn=%p) inserting at prefix %pRN",
+			       __func__, afi, rn, rn);
 
 	rfapiBgpInfoAttachSorted(rn, info_new, afi, SAFI_ENCAP);
 
@@ -3249,6 +3242,7 @@ static void rfapiBgpInfoFilteredImportEncap(
 				       __func__, rn);
 #endif
 		for (m = RFAPI_MONITOR_ENCAP(rn); m; m = m->next) {
+			const struct prefix *p;
 
 			/*
 			 * For each referenced bpi/route, copy the ENCAP route's
@@ -3276,9 +3270,9 @@ static void rfapiBgpInfoFilteredImportEncap(
 			 * list
 			 * per prefix.
 			 */
-
+			p = agg_node_get_prefix(m->node);
 			referenced_vpn_prefix =
-				agg_node_get(referenced_vpn_table, &m->node->p);
+				agg_node_get(referenced_vpn_table, p);
 			assert(referenced_vpn_prefix);
 			for (mnext = referenced_vpn_prefix->info; mnext;
 			     mnext = mnext->next) {
@@ -3528,11 +3522,8 @@ void rfapiBgpInfoFilteredImportVPN(
 							     BGP_PATH_REMOVED);
 
 				vnc_zlog_debug_verbose(
-					"%s: withdrawing at prefix %s/%d%s",
-					__func__, rfapi_ntop(rn->p.family,
-							     &rn->p.u.prefix,
-							     buf, BUFSIZ),
-					rn->p.prefixlen,
+					"%s: withdrawing at prefix %pRN%s",
+					__func__, rn,
 					(washolddown
 						 ? " (already being withdrawn)"
 						 : ""));
@@ -3551,14 +3542,11 @@ void rfapiBgpInfoFilteredImportVPN(
 				VNC_ITRCCK;
 			} else {
 				vnc_zlog_debug_verbose(
-					"%s: %s at prefix %s/%d", __func__,
+					"%s: %s at prefix %pRN", __func__,
 					((action == FIF_ACTION_KILL)
 						 ? "killing"
 						 : "replacing"),
-					rfapi_ntop(rn->p.family,
-						   &rn->p.u.prefix, buf,
-						   BUFSIZ),
-					rn->p.prefixlen);
+					rn);
 
 				/*
 				 * If this route is waiting to be deleted
@@ -3676,10 +3664,8 @@ void rfapiBgpInfoFilteredImportVPN(
 		info_new->extra->vnc.import.aux_prefix = *aux_prefix;
 	}
 
-	vnc_zlog_debug_verbose(
-		"%s: inserting bpi %p at prefix %s/%d #%d", __func__, info_new,
-		rfapi_ntop(rn->p.family, &rn->p.u.prefix, buf, BUFSIZ),
-		rn->p.prefixlen, rn->lock);
+	vnc_zlog_debug_verbose("%s: inserting bpi %p at prefix %pRN #%d",
+			       __func__, info_new, rn, rn->lock);
 
 	rfapiBgpInfoAttachSorted(rn, info_new, afi, SAFI_MPLS_VPN);
 	rfapiItBiIndexAdd(rn, info_new);
@@ -4447,27 +4433,20 @@ static void rfapiDeleteRemotePrefixesIt(
 		for (rn = agg_route_top(rt); rn; rn = agg_route_next(rn)) {
 			struct bgp_path_info *bpi;
 			struct bgp_path_info *next;
+			const struct prefix *rn_p = agg_node_get_prefix(rn);
 
 			if (p && VNC_DEBUG(IMPORT_DEL_REMOTE)) {
 				char p1line[PREFIX_STRLEN];
-				char p2line[PREFIX_STRLEN];
 
 				prefix2str(p, p1line, sizeof(p1line));
-				prefix2str(&rn->p, p2line, sizeof(p2line));
-				vnc_zlog_debug_any("%s: want %s, have %s",
-						   __func__, p1line, p2line);
+				vnc_zlog_debug_any("%s: want %s, have %pRN",
+						   __func__, p1line, rn);
 			}
 
-			if (p && prefix_cmp(p, &rn->p))
+			if (p && prefix_cmp(p, rn_p))
 				continue;
 
-			{
-				char buf_pfx[PREFIX_STRLEN];
-
-				prefix2str(&rn->p, buf_pfx, sizeof(buf_pfx));
-				vnc_zlog_debug_verbose("%s: rn pfx=%s",
-						       __func__, buf_pfx);
-			}
+			vnc_zlog_debug_verbose("%s: rn pfx=%pRN", __func__, rn);
 
 			/* TBD is this valid for afi == AFI_L2VPN? */
 			RFAPI_CHECK_REFCOUNT(rn, SAFI_MPLS_VPN, 1);
@@ -4599,7 +4578,7 @@ static void rfapiDeleteRemotePrefixesIt(
 					}
 				}
 
-				vnc_direct_bgp_rh_del_route(bgp, afi, &rn->p,
+				vnc_direct_bgp_rh_del_route(bgp, afi, rn_p,
 							    bpi->peer);
 
 				RFAPI_UPDATE_ITABLE_COUNT(bpi, it, afi, -1);
diff --git a/bgpd/rfapi/rfapi_monitor.c b/bgpd/rfapi/rfapi_monitor.c
index 74094efdf..6aea18e0b 100644
--- a/bgpd/rfapi/rfapi_monitor.c
+++ b/bgpd/rfapi/rfapi_monitor.c
@@ -789,7 +789,8 @@ static void rfapiMonitorTimerRestart(struct rfapi_monitor_vpn *m)
  * been responsible for the response, i.e., any monitors for
  * the exact prefix or a parent of it.
  */
-void rfapiMonitorTimersRestart(struct rfapi_descriptor *rfd, struct prefix *p)
+void rfapiMonitorTimersRestart(struct rfapi_descriptor *rfd,
+			       const struct prefix *p)
 {
 	struct agg_node *rn;
 
@@ -818,12 +819,14 @@ void rfapiMonitorTimersRestart(struct rfapi_descriptor *rfd, struct prefix *p)
 		for (rn = agg_route_top(rfd->mon); rn;
 		     rn = agg_route_next(rn)) {
 			struct rfapi_monitor_vpn *m;
+			const struct prefix *p_node;
 
 			if (!((m = rn->info)))
 				continue;
 
+			p_node = agg_node_get_prefix(m->node);
 			/* NB order of test is significant ! */
-			if (!m->node || prefix_match(&m->node->p, p)) {
+			if (!m->node || prefix_match(p_node, p)) {
 				rfapiMonitorTimerRestart(m);
 			}
 		}
@@ -841,7 +844,8 @@ void rfapiMonitorItNodeChanged(
 	struct skiplist *nves_seen;
 	struct agg_node *rn = it_node;
 	struct bgp *bgp = bgp_get_default();
-	afi_t afi = family2afi(rn->p.family);
+	const struct prefix *p = agg_node_get_prefix(rn);
+	afi_t afi = family2afi(p->family);
 #if DEBUG_L2_EXTRA
 	char buf_prefix[PREFIX_STRLEN];
 #endif
@@ -931,17 +935,14 @@ void rfapiMonitorItNodeChanged(
 					assert(!skiplist_insert(nves_seen,
 								m->rfd, NULL));
 
-					char buf_attach_pfx[PREFIX_STRLEN];
 					char buf_target_pfx[PREFIX_STRLEN];
 
-					prefix2str(&m->node->p, buf_attach_pfx,
-						   sizeof(buf_attach_pfx));
 					prefix2str(&m->p, buf_target_pfx,
 						   sizeof(buf_target_pfx));
 					vnc_zlog_debug_verbose(
-						"%s: update rfd %p attached to pfx %s (targ=%s)",
-						__func__, m->rfd,
-						buf_attach_pfx, buf_target_pfx);
+						"%s: update rfd %p attached to pfx %pRN (targ=%s)",
+						__func__, m->rfd, m->node,
+						buf_target_pfx);
 
 					/*
 					 * update its RIB
diff --git a/bgpd/rfapi/rfapi_monitor.h b/bgpd/rfapi/rfapi_monitor.h
index b8eec5647..3a2248aa6 100644
--- a/bgpd/rfapi/rfapi_monitor.h
+++ b/bgpd/rfapi/rfapi_monitor.h
@@ -167,7 +167,7 @@ extern void rfapiMonitorResponseRemovalOn(struct bgp *bgp);
 extern void rfapiMonitorExtraPrune(safi_t safi, struct agg_node *rn);
 
 extern void rfapiMonitorTimersRestart(struct rfapi_descriptor *rfd,
-				      struct prefix *p);
+				      const struct prefix *p);
 
 extern void rfapiMonitorItNodeChanged(struct rfapi_import_table *import_table,
 				      struct agg_node *it_node,
diff --git a/bgpd/rfapi/rfapi_private.h b/bgpd/rfapi/rfapi_private.h
index 3baccee7c..68caba600 100644
--- a/bgpd/rfapi/rfapi_private.h
+++ b/bgpd/rfapi/rfapi_private.h
@@ -272,9 +272,6 @@ struct rfapi {
 			    ? ((prefix)->prefixlen == 128)                     \
 			    : 0))
 
-extern void rfapiQprefix2Rprefix(struct prefix *qprefix,
-				 struct rfapi_ip_prefix *rprefix);
-
 extern int rfapi_find_rfd(struct bgp *bgp, struct rfapi_ip_addr *vn_addr,
 			  struct rfapi_ip_addr *un_addr,
 			  struct rfapi_descriptor **rfd);
diff --git a/bgpd/rfapi/rfapi_rib.c b/bgpd/rfapi/rfapi_rib.c
index 141fb03d3..c64658181 100644
--- a/bgpd/rfapi/rfapi_rib.c
+++ b/bgpd/rfapi/rfapi_rib.c
@@ -340,7 +340,6 @@ static void rfapiRibStartTimer(struct rfapi_descriptor *rfd,
 {
 	struct thread *t = ri->timer;
 	struct rfapi_rib_tcb *tcb = NULL;
-	char buf_prefix[PREFIX_STRLEN];
 
 	if (t) {
 		tcb = t->arg;
@@ -361,9 +360,8 @@ static void rfapiRibStartTimer(struct rfapi_descriptor *rfd,
 		UNSET_FLAG(tcb->flags, RFAPI_RIB_TCB_FLAG_DELETED);
 	}
 
-	prefix2str(&rn->p, buf_prefix, sizeof(buf_prefix));
-	vnc_zlog_debug_verbose("%s: rfd %p pfx %s life %u", __func__, rfd,
-			       buf_prefix, ri->lifetime);
+	vnc_zlog_debug_verbose("%s: rfd %p pfx %pRN life %u", __func__, rfd, rn,
+			       ri->lifetime);
 	ri->timer = NULL;
 	thread_add_timer(bm->master, rfapiRibExpireTimer, tcb, ri->lifetime,
 			 &ri->timer);
@@ -741,11 +739,12 @@ int rfapiRibPreloadBi(
 	struct rfapi_rib_key rk;
 	struct agg_node *trn;
 	afi_t afi;
+	const struct prefix *p = agg_node_get_prefix(rfd_rib_node);
 
 	if (!rfd_rib_node)
 		return 0;
 
-	afi = family2afi(rfd_rib_node->p.family);
+	afi = family2afi(p->family);
 
 	rfd = agg_get_table_info(agg_get_table(rfd_rib_node));
 
@@ -803,8 +802,7 @@ int rfapiRibPreloadBi(
 	/*
 	 * Update last sent time for prefix
 	 */
-	trn = agg_node_get(rfd->rsp_times[afi],
-			   &rfd_rib_node->p); /* locks trn */
+	trn = agg_node_get(rfd->rsp_times[afi], p); /* locks trn */
 	trn->info = (void *)(uintptr_t)bgp_clock();
 	if (trn->lock > 1)
 		agg_unlock_node(trn);
@@ -852,10 +850,9 @@ static void process_pending_node(struct bgp *bgp, struct rfapi_descriptor *rfd,
 	struct list *lPendCost = NULL;
 	struct list *delete_list = NULL;
 	int printedprefix = 0;
-	char buf_prefix[PREFIX_STRLEN];
 	int rib_node_started_nonempty = 0;
 	int sendingsomeroutes = 0;
-
+	const struct prefix *p;
 #if DEBUG_PROCESS_PENDING_NODE
 	unsigned int count_rib_initial = 0;
 	unsigned int count_pend_vn_initial = 0;
@@ -863,12 +860,12 @@ static void process_pending_node(struct bgp *bgp, struct rfapi_descriptor *rfd,
 #endif
 
 	assert(pn);
-	prefix2str(&pn->p, buf_prefix, sizeof(buf_prefix));
-	vnc_zlog_debug_verbose("%s: afi=%d, %s pn->info=%p", __func__, afi,
-			       buf_prefix, pn->info);
+	p = agg_node_get_prefix(pn);
+	vnc_zlog_debug_verbose("%s: afi=%d, %pRN pn->info=%p", __func__, afi,
+			       pn, pn->info);
 
 	if (AFI_L2VPN != afi) {
-		rfapiQprefix2Rprefix(&pn->p, &hp);
+		rfapiQprefix2Rprefix(p, &hp);
 	}
 
 	RFAPI_RIB_CHECK_COUNTS(1, 0);
@@ -876,7 +873,7 @@ static void process_pending_node(struct bgp *bgp, struct rfapi_descriptor *rfd,
 	/*
 	 * Find corresponding RIB node
 	 */
-	rn = agg_node_get(rfd->rib[afi], &pn->p); /* locks rn */
+	rn = agg_node_get(rfd->rib[afi], p); /* locks rn */
 
 	/*
 	 * RIB skiplist has key=rfapi_addr={vn,un}, val = rfapi_info,
@@ -935,9 +932,9 @@ static void process_pending_node(struct bgp *bgp, struct rfapi_descriptor *rfd,
 				prefix2str(&ri->rk.vn, buf, sizeof(buf));
 				prefix2str(&ri->un, buf2, sizeof(buf2));
 				vnc_zlog_debug_verbose(
-					"%s:   put dl pfx=%s vn=%s un=%s cost=%d life=%d vn_options=%p",
-					__func__, buf_prefix, buf, buf2,
-					ri->cost, ri->lifetime, ri->vn_options);
+					"%s:   put dl pfx=%pRN vn=%s un=%s cost=%d life=%d vn_options=%p",
+					__func__, pn, buf, buf2, ri->cost,
+					ri->lifetime, ri->vn_options);
 
 				skiplist_delete_first(slRibPt);
 			}
@@ -1186,8 +1183,7 @@ callback:
 
 		vnc_zlog_debug_verbose("%s: lPendCost->count now %d", __func__,
 				       lPendCost->count);
-		vnc_zlog_debug_verbose("%s: For prefix %s (a)", __func__,
-				       buf_prefix);
+		vnc_zlog_debug_verbose("%s: For prefix %pRN (a)", __func__, pn);
 		printedprefix = 1;
 
 		for (ALL_LIST_ELEMENTS(lPendCost, node, nnode, ri)) {
@@ -1246,7 +1242,7 @@ callback:
 			 * update this NVE's timestamp for this prefix
 			 */
 			trn = agg_node_get(rfd->rsp_times[afi],
-					   &pn->p); /* locks trn */
+					   p); /* locks trn */
 			trn->info = (void *)(uintptr_t)bgp_clock();
 			if (trn->lock > 1)
 				agg_unlock_node(trn);
@@ -1268,8 +1264,8 @@ callback:
 		char buf2[BUFSIZ];
 
 		if (!printedprefix) {
-			vnc_zlog_debug_verbose("%s: For prefix %s (d)",
-					       __func__, buf_prefix);
+			vnc_zlog_debug_verbose("%s: For prefix %pRN (d)",
+					       __func__, pn);
 		}
 		vnc_zlog_debug_verbose("%s: delete_list has %d elements",
 				       __func__, delete_list->count);
@@ -1465,7 +1461,7 @@ callback:
 	}
 
 	if (sendingsomeroutes)
-		rfapiMonitorTimersRestart(rfd, &pn->p);
+		rfapiMonitorTimersRestart(rfd, p);
 
 	agg_unlock_node(rn); /* agg_node_get() */
 
@@ -1589,7 +1585,7 @@ void rfapiRibUpdatePendingNode(
 	struct rfapi_import_table *it, /* needed for L2 */
 	struct agg_node *it_node, uint32_t lifetime)
 {
-	struct prefix *prefix;
+	const struct prefix *prefix;
 	struct bgp_path_info *bpi;
 	struct agg_node *pn;
 	afi_t afi;
@@ -1606,7 +1602,7 @@ void rfapiRibUpdatePendingNode(
 
 	RFAPI_RIB_CHECK_COUNTS(1, 0);
 
-	prefix = &it_node->p;
+	prefix = agg_node_get_prefix(it_node);
 	afi = family2afi(prefix->family);
 	prefix2str(prefix, buf, sizeof(buf));
 	vnc_zlog_debug_verbose("%s: prefix=%s", __func__, buf);
@@ -1794,7 +1790,8 @@ int rfapiRibFTDFilterRecentPrefix(
 	struct prefix *pfx_target_original) /* query target */
 {
 	struct bgp *bgp = rfd->bgp;
-	afi_t afi = family2afi(it_rn->p.family);
+	const struct prefix *p = agg_node_get_prefix(it_rn);
+	afi_t afi = family2afi(p->family);
 	time_t prefix_time;
 	struct agg_node *trn;
 
@@ -1809,7 +1806,7 @@ int rfapiRibFTDFilterRecentPrefix(
 	 * This matches behavior of now-obsolete rfapiRibFTDFilterRecent(),
 	 * but we need to decide if that is correct.
 	 */
-	if (it_rn->p.family == AF_ETHERNET)
+	if (p->family == AF_ETHERNET)
 		return 0;
 
 #ifdef DEBUG_FTD_FILTER_RECENT
@@ -1824,7 +1821,7 @@ int rfapiRibFTDFilterRecentPrefix(
 	/*
 	 * prefix covers target address, so allow prefix
 	 */
-	if (prefix_match(&it_rn->p, pfx_target_original)) {
+	if (prefix_match(p, pfx_target_original)) {
 #ifdef DEBUG_FTD_FILTER_RECENT
 		vnc_zlog_debug_verbose("%s: prefix covers target, allowed",
 				       __func__);
@@ -1835,7 +1832,7 @@ int rfapiRibFTDFilterRecentPrefix(
 	/*
 	 * check this NVE's timestamp for this prefix
 	 */
-	trn = agg_node_get(rfd->rsp_times[afi], &it_rn->p); /* locks trn */
+	trn = agg_node_get(rfd->rsp_times[afi], p); /* locks trn */
 	prefix_time = (time_t)trn->info;
 	if (trn->lock > 1)
 		agg_unlock_node(trn);
@@ -2114,11 +2111,10 @@ void rfapiRibPendingDeleteRoute(struct bgp *bgp, struct rfapi_import_table *it,
 {
 	struct rfapi_descriptor *rfd;
 	struct listnode *node;
-	char buf[PREFIX_STRLEN];
+	const struct prefix *p = agg_node_get_prefix(it_node);
 
-	prefix2str(&it_node->p, buf, sizeof(buf));
-	vnc_zlog_debug_verbose("%s: entry, it=%p, afi=%d, it_node=%p, pfx=%s",
-			       __func__, it, afi, it_node, buf);
+	vnc_zlog_debug_verbose("%s: entry, it=%p, afi=%d, it_node=%p, pfx=%pRN",
+			       __func__, it, afi, it_node, it_node);
 
 	if (AFI_L2VPN == afi) {
 		/*
@@ -2157,7 +2153,7 @@ void rfapiRibPendingDeleteRoute(struct bgp *bgp, struct rfapi_import_table *it,
 				 * delete
 				 */
 				if ((rn = agg_node_lookup(m->rfd->rib[afi],
-							  &it_node->p))) {
+							  p))) {
 					rfapiRibUpdatePendingNode(
 						bgp, m->rfd, it, it_node,
 						m->rfd->response_lifetime);
@@ -2179,8 +2175,7 @@ void rfapiRibPendingDeleteRoute(struct bgp *bgp, struct rfapi_import_table *it,
 			 * this
 			 * NVE, it's OK to send an update with the delete
 			 */
-			if ((rn = agg_node_lookup(m->rfd->rib[afi],
-						  &it_node->p))) {
+			if ((rn = agg_node_lookup(m->rfd->rib[afi], p))) {
 				rfapiRibUpdatePendingNode(
 					bgp, m->rfd, it, it_node,
 					m->rfd->response_lifetime);
@@ -2212,8 +2207,7 @@ void rfapiRibPendingDeleteRoute(struct bgp *bgp, struct rfapi_import_table *it,
 			 * prefix
 			 * previously, we should send an updated response.
 			 */
-			if ((rn = agg_node_lookup(rfd->rib[afi],
-						  &it_node->p))) {
+			if ((rn = agg_node_lookup(rfd->rib[afi], p))) {
 				rfapiRibUpdatePendingNode(
 					bgp, rfd, it, it_node,
 					rfd->response_lifetime);
@@ -2416,7 +2410,8 @@ void rfapiRibShowResponses(void *stream, struct prefix *pfx_match,
 
 			for (rn = agg_route_top(rfd->rib[afi]); rn;
 			     rn = agg_route_next(rn)) {
-
+				const struct prefix *p =
+					agg_node_get_prefix(rn);
 				struct skiplist *sl;
 				char str_pfx[PREFIX_STRLEN];
 				int printedprefix = 0;
@@ -2433,9 +2428,8 @@ void rfapiRibShowResponses(void *stream, struct prefix *pfx_match,
 				nhs_total += skiplist_count(sl);
 				++prefixes_total;
 
-				if (pfx_match
-				    && !prefix_match(pfx_match, &rn->p)
-				    && !prefix_match(&rn->p, pfx_match))
+				if (pfx_match && !prefix_match(pfx_match, p)
+				    && !prefix_match(p, pfx_match))
 					continue;
 
 				++prefixes_displayed;
@@ -2472,7 +2466,7 @@ void rfapiRibShowResponses(void *stream, struct prefix *pfx_match,
 								str_un,
 								BUFSIZ));
 				}
-				prefix2str(&rn->p, str_pfx, sizeof(str_pfx));
+				prefix2str(p, str_pfx, sizeof(str_pfx));
 				// fp(out, "  %s\n", buf);  /* prefix */
 
 				routes_displayed++;
diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index aa9c21695..5a84d14bd 100644
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -194,7 +194,7 @@ int rfapiQprefix2Raddr(struct prefix *qprefix, struct rfapi_ip_addr *raddr)
  * Translate Quagga prefix to RFAPI prefix
  */
 /* rprefix->cost set to 0 */
-void rfapiQprefix2Rprefix(struct prefix *qprefix,
+void rfapiQprefix2Rprefix(const struct prefix *qprefix,
 			  struct rfapi_ip_prefix *rprefix)
 {
 	memset(rprefix, 0, sizeof(struct rfapi_ip_prefix));
@@ -743,7 +743,6 @@ static void rfapiDebugPrintMonitorEncap(void *stream,
 void rfapiShowItNode(void *stream, struct agg_node *rn)
 {
 	struct bgp_path_info *bpi;
-	char buf[BUFSIZ];
 
 	int (*fp)(void *, const char *, ...);
 	struct vty *vty;
@@ -753,9 +752,7 @@ void rfapiShowItNode(void *stream, struct agg_node *rn)
 	if (rfapiStream2Vty(stream, &fp, &vty, &out, &vty_newline) == 0)
 		return;
 
-	fp(out, "%s/%d @%p #%d%s",
-	   rfapi_ntop(rn->p.family, &rn->p.u.prefix, buf, BUFSIZ),
-	   rn->p.prefixlen, rn, rn->lock, HVTYNL);
+	fp(out, "%pRN @%p #%d%s", rn, rn, rn->lock, HVTYNL);
 
 	for (bpi = rn->info; bpi; bpi = bpi->next) {
 		rfapiPrintBi(stream, bpi);
@@ -782,14 +779,15 @@ void rfapiShowImportTable(void *stream, const char *label, struct agg_table *rt,
 
 	for (rn = agg_route_top(rt); rn; rn = agg_route_next(rn)) {
 		struct bgp_path_info *bpi;
+		const struct prefix *p = agg_node_get_prefix(rn);
 
-		if (rn->p.family == AF_ETHERNET) {
-			rfapiEthAddr2Str(&rn->p.u.prefix_eth, buf, BUFSIZ);
+		if (p->family == AF_ETHERNET) {
+			rfapiEthAddr2Str(&p->u.prefix_eth, buf, BUFSIZ);
 		} else {
-			inet_ntop(rn->p.family, &rn->p.u.prefix, buf, BUFSIZ);
+			inet_ntop(p->family, &p->u.prefix, buf, BUFSIZ);
 		}
 
-		fp(out, "%s/%d @%p #%d%s", buf, rn->p.prefixlen, rn,
+		fp(out, "%s/%d @%p #%d%s", buf, p->prefixlen, rn,
 		   rn->lock - 1, /* account for loop iterator locking */
 		   HVTYNL);
 
@@ -868,6 +866,8 @@ int rfapiShowVncQueries(void *stream, struct prefix *pfx_match)
 		if (rfd->mon) {
 			for (rn = agg_route_top(rfd->mon); rn;
 			     rn = agg_route_next(rn)) {
+				const struct prefix *p =
+					agg_node_get_prefix(rn);
 				struct rfapi_monitor_vpn *m;
 				char buf_remain[BUFSIZ];
 				char buf_pfx[BUFSIZ];
@@ -879,9 +879,8 @@ int rfapiShowVncQueries(void *stream, struct prefix *pfx_match)
 
 				++queries_total;
 
-				if (pfx_match
-				    && !prefix_match(pfx_match, &rn->p)
-				    && !prefix_match(&rn->p, pfx_match))
+				if (pfx_match && !prefix_match(pfx_match, p)
+				    && !prefix_match(p, pfx_match))
 					continue;
 
 				++queries_displayed;
@@ -1028,6 +1027,7 @@ static int rfapiPrintRemoteRegBi(struct bgp *bgp, void *stream,
 	char buf_vn[BUFSIZ];
 	char buf_lifetime[BUFSIZ];
 	int nlines = 0;
+	const struct prefix *p = agg_node_get_prefix(rn);
 
 	if (!stream)
 		return 0; /* for debug log, print into buf & call output once */
@@ -1040,8 +1040,8 @@ static int rfapiPrintRemoteRegBi(struct bgp *bgp, void *stream,
 	 */
 	buf_pfx[0] = 0;
 	snprintf(buf_pfx, BUFSIZ, "%s/%d",
-		 rfapi_ntop(rn->p.family, &rn->p.u.prefix, buf_ntop, BUFSIZ),
-		 rn->p.prefixlen);
+		 rfapi_ntop(p->family, &p->u.prefix, buf_ntop, BUFSIZ),
+		 p->prefixlen);
 	buf_pfx[BUFSIZ - 1] = 0;
 	nlines++;
 
@@ -1155,7 +1155,7 @@ static int rfapiPrintRemoteRegBi(struct bgp *bgp, void *stream,
 	}
 	fp(out, "%s", HVTYNL);
 
-	if (rn->p.family == AF_ETHERNET) {
+	if (p->family == AF_ETHERNET) {
 		/*
 		 * If there is a corresponding IP address && != VN address,
 		 * print that on the next line
@@ -1221,13 +1221,13 @@ static int rfapiShowRemoteRegistrationsIt(struct bgp *bgp, void *stream,
 
 		for (rn = agg_route_top(it->imported_vpn[afi]); rn;
 		     rn = agg_route_next(rn)) {
-
+			const struct prefix *p = agg_node_get_prefix(rn);
 			struct bgp_path_info *bpi;
 			int count_only;
 
 			/* allow for wider or more narrow mask from user */
-			if (prefix_only && !prefix_match(prefix_only, &rn->p)
-			    && !prefix_match(&rn->p, prefix_only))
+			if (prefix_only && !prefix_match(prefix_only, p)
+			    && !prefix_match(p, prefix_only))
 				count_only = 1;
 			else
 				count_only = 0;
diff --git a/bgpd/rfapi/rfapi_vty.h b/bgpd/rfapi/rfapi_vty.h
index 8b881292a..b5e1c38b0 100644
--- a/bgpd/rfapi/rfapi_vty.h
+++ b/bgpd/rfapi/rfapi_vty.h
@@ -43,7 +43,7 @@ extern void rfapiRprefixApplyMask(struct rfapi_ip_prefix *rprefix);
 extern int rfapiQprefix2Raddr(struct prefix *qprefix,
 			      struct rfapi_ip_addr *raddr);
 
-extern void rfapiQprefix2Rprefix(struct prefix *qprefix,
+extern void rfapiQprefix2Rprefix(const struct prefix *qprefix,
 				 struct rfapi_ip_prefix *rprefix);
 
 extern int rfapiRprefix2Qprefix(struct rfapi_ip_prefix *rprefix,
diff --git a/bgpd/rfapi/vnc_export_bgp.c b/bgpd/rfapi/vnc_export_bgp.c
index 3fe0fdaed..6e928c2a4 100644
--- a/bgpd/rfapi/vnc_export_bgp.c
+++ b/bgpd/rfapi/vnc_export_bgp.c
@@ -177,7 +177,7 @@ void vnc_direct_bgp_add_route_ce(struct bgp *bgp, struct agg_node *rn,
 {
 	struct attr *attr = bpi->attr;
 	struct peer *peer = bpi->peer;
-	struct prefix *prefix = &rn->p;
+	const struct prefix *prefix = agg_node_get_prefix(rn);
 	afi_t afi = family2afi(prefix->family);
 	struct bgp_node *urn;
 	struct bgp_path_info *ubpi;
@@ -330,7 +330,8 @@ void vnc_direct_bgp_add_route_ce(struct bgp *bgp, struct agg_node *rn,
 void vnc_direct_bgp_del_route_ce(struct bgp *bgp, struct agg_node *rn,
 				 struct bgp_path_info *bpi)
 {
-	afi_t afi = family2afi(rn->p.family);
+	const struct prefix *p = agg_node_get_prefix(rn);
+	afi_t afi = family2afi(p->family);
 	struct bgp_path_info *vbpi;
 	struct prefix ce_nexthop;
 
@@ -395,8 +396,8 @@ void vnc_direct_bgp_del_route_ce(struct bgp *bgp, struct agg_node *rn,
 	/*
 	 * withdraw the route
 	 */
-	bgp_withdraw(bpi->peer, &rn->p, 0, /* addpath_id */
-		     NULL,		   /* attr, ignored */
+	bgp_withdraw(bpi->peer, p, 0, /* addpath_id */
+		     NULL,	      /* attr, ignored */
 		     afi, SAFI_UNICAST, ZEBRA_ROUTE_VNC_DIRECT,
 		     BGP_ROUTE_REDISTRIBUTE, NULL, /* RD not used for unicast */
 		     NULL, 0, NULL); /* tag not used for unicast */
@@ -432,17 +433,11 @@ static void vnc_direct_bgp_vpn_enable_ce(struct bgp *bgp, afi_t afi)
 	 */
 	for (rn = agg_route_top(bgp->rfapi->it_ce->imported_vpn[afi]); rn;
 	     rn = agg_route_next(rn)) {
-
 		if (!rn->info)
 			continue;
 
-		{
-			char prefixstr[PREFIX_STRLEN];
-
-			prefix2str(&rn->p, prefixstr, sizeof(prefixstr));
-			vnc_zlog_debug_verbose("%s: checking prefix %s",
-					       __func__, prefixstr);
-		}
+		vnc_zlog_debug_verbose("%s: checking prefix %pRN", __func__,
+				       rn);
 
 		for (ri = rn->info; ri; ri = ri->next) {
 
@@ -698,7 +693,8 @@ void vnc_direct_bgp_add_prefix(struct bgp *bgp,
 	struct attr attr = {0};
 	struct listnode *node, *nnode;
 	struct rfapi_rfg_name *rfgn;
-	afi_t afi = family2afi(rn->p.family);
+	const struct prefix *p = agg_node_get_prefix(rn);
+	afi_t afi = family2afi(p->family);
 
 	if (!afi) {
 		flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi of route node",
@@ -769,7 +765,7 @@ void vnc_direct_bgp_add_prefix(struct bgp *bgp,
 		 */
 		if (rfgn->rfg->plist_export_bgp[afi]) {
 			if (prefix_list_apply(rfgn->rfg->plist_export_bgp[afi],
-					      &rn->p)
+					      p)
 			    == PREFIX_DENY)
 
 				continue;
@@ -808,7 +804,8 @@ void vnc_direct_bgp_del_prefix(struct bgp *bgp,
 {
 	struct listnode *node, *nnode;
 	struct rfapi_rfg_name *rfgn;
-	afi_t afi = family2afi(rn->p.family);
+	const struct prefix *p = agg_node_get_prefix(rn);
+	afi_t afi = family2afi(p->family);
 
 	if (!afi) {
 		flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi route node",
@@ -877,9 +874,9 @@ void vnc_direct_bgp_del_prefix(struct bgp *bgp,
 			if (rfapiRaddr2Qprefix(&irfd->vn_addr, &nhp))
 				continue;
 
-			bgp_withdraw(irfd->peer, &rn->p, /* prefix */
-				     0,			 /* addpath_id */
-				     NULL,		 /* attr, ignored */
+			bgp_withdraw(irfd->peer, p, /* prefix */
+				     0,		    /* addpath_id */
+				     NULL,	    /* attr, ignored */
 				     afi, SAFI_UNICAST, ZEBRA_ROUTE_VNC_DIRECT,
 				     BGP_ROUTE_REDISTRIBUTE,
 				     NULL, /* RD not used for unicast */
@@ -907,9 +904,9 @@ void vnc_direct_bgp_del_prefix(struct bgp *bgp,
 			if (rfapiRaddr2Qprefix(&irfd->vn_addr, &nhp))
 				continue;
 
-			bgp_withdraw(irfd->peer, &rn->p, /* prefix */
-				     0,			 /* addpath_id */
-				     NULL,		 /* attr, ignored */
+			bgp_withdraw(irfd->peer, p, /* prefix */
+				     0,		    /* addpath_id */
+				     NULL,	    /* attr, ignored */
 				     afi, SAFI_UNICAST, ZEBRA_ROUTE_VNC_DIRECT,
 				     BGP_ROUTE_REDISTRIBUTE,
 				     NULL, /* RD not used for unicast */
@@ -998,6 +995,8 @@ void vnc_direct_bgp_add_nve(struct bgp *bgp, struct rfapi_descriptor *rfd)
 					struct attr hattr;
 					struct attr *iattr;
 					struct bgp_path_info info;
+					const struct prefix *p =
+						agg_node_get_prefix(rn);
 
 					if (rfapiRaddr2Qprefix(&irfd->vn_addr,
 							       &nhp))
@@ -1010,7 +1009,7 @@ void vnc_direct_bgp_add_nve(struct bgp *bgp, struct rfapi_descriptor *rfd)
 						if (prefix_list_apply(
 							    rfgn->rfg->plist_export_bgp
 								    [afi],
-							    &rn->p)
+							    p)
 						    == PREFIX_DENY)
 
 							continue;
@@ -1033,8 +1032,7 @@ void vnc_direct_bgp_add_nve(struct bgp *bgp, struct rfapi_descriptor *rfd)
 						ret = route_map_apply(
 							rfgn->rfg
 								->routemap_export_bgp,
-							&rn->p, RMAP_BGP,
-							&info);
+							p, RMAP_BGP, &info);
 						if (ret == RMAP_DENYMATCH) {
 							bgp_attr_flush(&hattr);
 							continue;
@@ -1044,8 +1042,8 @@ void vnc_direct_bgp_add_nve(struct bgp *bgp, struct rfapi_descriptor *rfd)
 					iattr = bgp_attr_intern(&hattr);
 					bgp_attr_flush(&hattr);
 					bgp_update(
-						irfd->peer, &rn->p, /* prefix */
-						0,     /* addpath_id */
+						irfd->peer, p, /* prefix */
+						0,	       /* addpath_id */
 						iattr, /* bgp_update copies
 							  it */
 						afi, SAFI_UNICAST,
@@ -1134,7 +1132,8 @@ void vnc_direct_bgp_del_nve(struct bgp *bgp, struct rfapi_descriptor *rfd)
 			     rn = agg_route_next(rn)) {
 
 				if (rn->info) {
-
+					const struct prefix *p =
+						agg_node_get_prefix(rn);
 					struct prefix nhp;
 					struct rfapi_descriptor *irfd = rfd;
 
@@ -1142,10 +1141,9 @@ void vnc_direct_bgp_del_nve(struct bgp *bgp, struct rfapi_descriptor *rfd)
 							       &nhp))
 						continue;
 
-					bgp_withdraw(irfd->peer,
-						     &rn->p, /* prefix */
-						     0,      /* addpath_id */
-						     NULL,   /* attr, ignored */
+					bgp_withdraw(irfd->peer, p, /* prefix */
+						     0,	   /* addpath_id */
+						     NULL, /* attr, ignored */
 						     afi, SAFI_UNICAST,
 						     ZEBRA_ROUTE_VNC_DIRECT,
 						     BGP_ROUTE_REDISTRIBUTE,
@@ -1169,6 +1167,7 @@ static void vnc_direct_add_rn_group_rd(struct bgp *bgp,
 	struct bgp_path_info info;
 	struct attr hattr;
 	struct attr *iattr;
+	const struct prefix *p = agg_node_get_prefix(rn);
 
 	if (irfd == NULL && rfg->type != RFAPI_GROUP_CFG_VRF) {
 		/* need new rfapi_handle, for peer strcture
@@ -1242,8 +1241,8 @@ static void vnc_direct_add_rn_group_rd(struct bgp *bgp,
 
 		info.peer = irfd->peer;
 		info.attr = &hattr;
-		ret = route_map_apply(rfg->routemap_export_bgp, &rn->p,
-				      RMAP_BGP, &info);
+		ret = route_map_apply(rfg->routemap_export_bgp, p, RMAP_BGP,
+				      &info);
 		if (ret == RMAP_DENYMATCH) {
 			bgp_attr_flush(&hattr);
 			vnc_zlog_debug_verbose(
@@ -1261,9 +1260,9 @@ static void vnc_direct_add_rn_group_rd(struct bgp *bgp,
 	iattr = bgp_attr_intern(&hattr);
 	bgp_attr_flush(&hattr);
 
-	bgp_update(irfd->peer, &rn->p, /* prefix */
-		   0,		       /* addpath_id */
-		   iattr,	      /* bgp_update copies it */
+	bgp_update(irfd->peer, p, /* prefix */
+		   0,		  /* addpath_id */
+		   iattr,	  /* bgp_update copies it */
 		   afi, SAFI_UNICAST, ZEBRA_ROUTE_VNC_DIRECT,
 		   BGP_ROUTE_REDISTRIBUTE, NULL, /* RD not used for unicast */
 		   NULL,			 /* tag not used for unicast */
@@ -1317,7 +1316,7 @@ static void vnc_direct_bgp_add_group_afi(struct bgp *bgp,
 	for (rn = agg_route_top(rt); rn; rn = agg_route_next(rn)) {
 
 		if (rn->info) {
-
+			const struct prefix *p = agg_node_get_prefix(rn);
 			struct listnode *ln;
 
 			/*
@@ -1325,7 +1324,7 @@ static void vnc_direct_bgp_add_group_afi(struct bgp *bgp,
 			 */
 			if (rfg->plist_export_bgp[afi]) {
 				if (prefix_list_apply(
-					    rfg->plist_export_bgp[afi], &rn->p)
+					    rfg->plist_export_bgp[afi], p)
 				    == PREFIX_DENY)
 
 					continue;
@@ -1374,9 +1373,10 @@ static void vnc_direct_del_rn_group_rd(struct bgp *bgp,
 {
 	if (irfd == NULL)
 		return;
-	bgp_withdraw(irfd->peer, &rn->p, /* prefix */
-		     0,			 /* addpath_id */
-		     NULL,		 /* attr, ignored */
+
+	bgp_withdraw(irfd->peer, agg_node_get_prefix(rn), /* prefix */
+		     0,					  /* addpath_id */
+		     NULL,				  /* attr, ignored */
 		     afi, SAFI_UNICAST, ZEBRA_ROUTE_VNC_DIRECT,
 		     BGP_ROUTE_REDISTRIBUTE, NULL, /* RD not used for unicast */
 		     NULL, 0, NULL); /* tag not used for unicast */
@@ -1493,9 +1493,9 @@ static void vnc_direct_bgp_unexport_table(afi_t afi, struct agg_table *rt,
 							  irfd)) {
 
 					bgp_withdraw(irfd->peer,
-						     &rn->p, /* prefix */
-						     0,      /* addpath_id */
-						     NULL,   /* attr, ignored */
+						     agg_node_get_prefix(rn),
+						     0,	   /* addpath_id */
+						     NULL, /* attr, ignored */
 						     afi, SAFI_UNICAST,
 						     ZEBRA_ROUTE_VNC_DIRECT,
 						     BGP_ROUTE_REDISTRIBUTE,
@@ -1732,13 +1732,14 @@ void vnc_direct_bgp_rh_add_route(struct bgp *bgp, afi_t afi,
 static int vncExportWithdrawTimer(struct thread *t)
 {
 	struct vnc_export_info *eti = t->arg;
+	const struct prefix *p = agg_node_get_prefix(eti->node);
 
 	/*
 	 * withdraw the route
 	 */
-	bgp_withdraw(eti->peer, &eti->node->p, 0, /* addpath_id */
-		     NULL,			  /* attr, ignored */
-		     family2afi(eti->node->p.family), SAFI_UNICAST, eti->type,
+	bgp_withdraw(eti->peer, p, 0, /* addpath_id */
+		     NULL,	      /* attr, ignored */
+		     family2afi(p->family), SAFI_UNICAST, eti->type,
 		     eti->subtype, NULL, /* RD not used for unicast */
 		     NULL, 0,
 		     NULL); /* tag not used for unicast, EVPN neither */
diff --git a/bgpd/rfapi/vnc_import_bgp.c b/bgpd/rfapi/vnc_import_bgp.c
index 1ce5d370b..50256d994 100644
--- a/bgpd/rfapi/vnc_import_bgp.c
+++ b/bgpd/rfapi/vnc_import_bgp.c
@@ -2028,7 +2028,8 @@ void vnc_import_bgp_exterior_add_route_interior(
 	struct agg_node *rn_interior,       /* VPN IT node */
 	struct bgp_path_info *bpi_interior) /* VPN IT route */
 {
-	afi_t afi = family2afi(rn_interior->p.family);
+	const struct prefix *p = agg_node_get_prefix(rn_interior);
+	afi_t afi = family2afi(p->family);
 	struct agg_node *par;
 	struct bgp_path_info *bpi_exterior;
 	struct prefix *pfx_exterior; /* exterior pfx */
@@ -2058,13 +2059,8 @@ void vnc_import_bgp_exterior_add_route_interior(
 	}
 
 	/*debugging */
-	{
-		char str_pfx[PREFIX_STRLEN];
-
-		prefix2str(&rn_interior->p, str_pfx, sizeof(str_pfx));
-		vnc_zlog_debug_verbose("%s: interior prefix=%s, bpi type=%d",
-				       __func__, str_pfx, bpi_interior->type);
-	}
+	vnc_zlog_debug_verbose("%s: interior prefix=%pRN, bpi type=%d",
+			       __func__, rn_interior, bpi_interior->type);
 
 	if (RFAPI_HAS_MONITOR_EXTERIOR(rn_interior)) {
 
@@ -2179,7 +2175,7 @@ void vnc_import_bgp_exterior_add_route_interior(
 			rfapiUnicastNexthop2Prefix(afi, bpi_exterior->attr,
 						   &pfx_nexthop);
 
-			if (prefix_match(&rn_interior->p, &pfx_nexthop)) {
+			if (prefix_match(p, &pfx_nexthop)) {
 
 				struct bgp_path_info *bpi;
 				struct prefix_rd *prd;
@@ -2322,7 +2318,7 @@ void vnc_import_bgp_exterior_add_route_interior(
 		rfapiUnicastNexthop2Prefix(afi, bpi_exterior->attr,
 					   &pfx_nexthop);
 
-		if (prefix_match(&rn_interior->p, &pfx_nexthop)) {
+		if (prefix_match(p, &pfx_nexthop)) {
 
 			struct prefix_rd *prd;
 			struct attr new_attr;
@@ -2410,7 +2406,8 @@ void vnc_import_bgp_exterior_del_route_interior(
 	struct agg_node *rn_interior,       /* VPN IT node */
 	struct bgp_path_info *bpi_interior) /* VPN IT route */
 {
-	afi_t afi = family2afi(rn_interior->p.family);
+	const struct prefix *p = agg_node_get_prefix(rn_interior);
+	afi_t afi = family2afi(p->family);
 	struct agg_node *par;
 	struct bgp_path_info *bpi_exterior;
 	struct prefix *pfx_exterior; /* exterior pfx */
@@ -2444,14 +2441,8 @@ void vnc_import_bgp_exterior_del_route_interior(
 	}
 
 	/*debugging */
-	{
-		char str_pfx[PREFIX_STRLEN];
-
-		prefix2str(&rn_interior->p, str_pfx, sizeof(str_pfx));
-
-		vnc_zlog_debug_verbose("%s: interior prefix=%s, bpi type=%d",
-				       __func__, str_pfx, bpi_interior->type);
-	}
+	vnc_zlog_debug_verbose("%s: interior prefix=%pRN, bpi type=%d",
+			       __func__, rn_interior, bpi_interior->type);
 
 	/*
 	 * Remove constructed routes based on the deleted interior route
diff --git a/bgpd/rfapi/vnc_zebra.c b/bgpd/rfapi/vnc_zebra.c
index 80a590f56..ca4a32822 100644
--- a/bgpd/rfapi/vnc_zebra.c
+++ b/bgpd/rfapi/vnc_zebra.c
@@ -380,7 +380,7 @@ static int vnc_zebra_read_route(ZAPI_CALLBACK_ARGS)
 /*
  * low-level message builder
  */
-static void vnc_zebra_route_msg(struct prefix *p, unsigned int nhp_count,
+static void vnc_zebra_route_msg(const struct prefix *p, unsigned int nhp_count,
 				void *nhp_ary, int add) /* 1 = add, 0 = del */
 {
 	struct zapi_route api;
@@ -560,7 +560,7 @@ static void vnc_zebra_add_del_prefix(struct bgp *bgp,
 				     int add) /* !0 = add, 0 = del */
 {
 	struct list *nves;
-
+	const struct prefix *p = agg_node_get_prefix(rn);
 	unsigned int nexthop_count = 0;
 	void *nh_ary = NULL;
 	void *nhp_ary = NULL;
@@ -570,15 +570,15 @@ static void vnc_zebra_add_del_prefix(struct bgp *bgp,
 	if (zclient_vnc->sock < 0)
 		return;
 
-	if (rn->p.family != AF_INET && rn->p.family != AF_INET6) {
+	if (p->family != AF_INET && p->family != AF_INET6) {
 		flog_err(EC_LIB_DEVELOPMENT,
 			 "%s: invalid route node addr family", __func__);
 		return;
 	}
 
-	if (!vrf_bitmap_check(zclient_vnc->redist[family2afi(rn->p.family)]
-						 [ZEBRA_ROUTE_VNC],
-			      VRF_DEFAULT))
+	if (!vrf_bitmap_check(
+		    zclient_vnc->redist[family2afi(p->family)][ZEBRA_ROUTE_VNC],
+		    VRF_DEFAULT))
 		return;
 
 	if (!bgp->rfapi_cfg) {
@@ -592,17 +592,16 @@ static void vnc_zebra_add_del_prefix(struct bgp *bgp,
 		return;
 	}
 
-	import_table_to_nve_list_zebra(bgp, import_table, &nves, rn->p.family);
+	import_table_to_nve_list_zebra(bgp, import_table, &nves, p->family);
 
 	if (nves) {
-		nve_list_to_nh_array(rn->p.family, nves, &nexthop_count,
-				     &nh_ary, &nhp_ary);
+		nve_list_to_nh_array(p->family, nves, &nexthop_count, &nh_ary,
+				     &nhp_ary);
 
 		list_delete(&nves);
 
 		if (nexthop_count)
-			vnc_zebra_route_msg(&rn->p, nexthop_count, nhp_ary,
-					    add);
+			vnc_zebra_route_msg(p, nexthop_count, nhp_ary, add);
 	}
 
 	XFREE(MTYPE_TMP, nhp_ary);
@@ -695,15 +694,14 @@ static void vnc_zebra_add_del_nve(struct bgp *bgp, struct rfapi_descriptor *rfd,
 			 */
 			for (rn = agg_route_top(rt); rn;
 			     rn = agg_route_next(rn)) {
-
-				if (rn->info) {
-
-					vnc_zlog_debug_verbose(
-						"%s: sending %s", __func__,
-						(add ? "add" : "del"));
-					vnc_zebra_route_msg(&rn->p, 1, &pAddr,
-							    add);
-				}
+				if (!rn->info)
+					continue;
+
+				vnc_zlog_debug_verbose("%s: sending %s",
+						       __func__,
+						       (add ? "add" : "del"));
+				vnc_zebra_route_msg(agg_node_get_prefix(rn), 1,
+						    &pAddr, add);
 			}
 		}
 	}
@@ -778,9 +776,9 @@ static void vnc_zebra_add_del_group_afi(struct bgp *bgp,
 			for (rn = agg_route_top(rt); rn;
 			     rn = agg_route_next(rn)) {
 				if (rn->info) {
-					vnc_zebra_route_msg(&rn->p,
-							    nexthop_count,
-							    nhp_ary, add);
+					vnc_zebra_route_msg(
+						agg_node_get_prefix(rn),
+						nexthop_count, nhp_ary, add);
 				}
 			}
 		}
diff --git a/lib/agg_table.h b/lib/agg_table.h
index f95fed675..9fddc975e 100644
--- a/lib/agg_table.h
+++ b/lib/agg_table.h
@@ -155,6 +155,12 @@ static inline struct agg_table *agg_get_table(struct agg_node *node)
 	return (struct agg_table *)route_table_get_info(node->table);
 }
 
+static inline const struct prefix *
+agg_node_get_prefix(const struct agg_node *node)
+{
+	return &node->p;
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index 6a30c07d9..25d9ed2b9 100644
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -867,17 +867,12 @@ int ripng_network_write(struct vty *vty, struct ripng *ripng)
 	unsigned int i;
 	const char *ifname;
 	struct agg_node *node;
-	char buf[BUFSIZ];
 
 	/* Write enable network. */
 	for (node = agg_route_top(ripng->enable_network); node;
 	     node = agg_route_next(node))
-		if (node->info) {
-			struct prefix *p = &node->p;
-			vty_out(vty, "    %s/%d\n",
-				inet_ntop(p->family, &p->u.prefix, buf, BUFSIZ),
-				p->prefixlen);
-		}
+		if (node->info)
+			vty_out(vty, "    %pRN\n", node);
 
 	/* Write enable interface. */
 	for (i = 0; i < vector_active(ripng->enable_if); i++)
diff --git a/ripngd/ripng_nb_state.c b/ripngd/ripng_nb_state.c
index 167077ea2..75dec3cb3 100644
--- a/ripngd/ripng_nb_state.c
+++ b/ripngd/ripng_nb_state.c
@@ -158,7 +158,8 @@ int ripngd_instance_state_routes_route_get_keys(const void *list_entry,
 	const struct agg_node *rn = list_entry;
 
 	keys->num = 1;
-	(void)prefix2str(&rn->p, keys->key[0], sizeof(keys->key[0]));
+	(void)prefix2str(agg_node_get_prefix(rn), keys->key[0],
+			 sizeof(keys->key[0]));
 
 	return NB_OK;
 }
@@ -191,7 +192,7 @@ ripngd_instance_state_routes_route_prefix_get_elem(const char *xpath,
 	const struct agg_node *rn = list_entry;
 	const struct ripng_info *rinfo = listnode_head(rn->info);
 
-	return yang_data_new_ipv6p(xpath, &rinfo->rp->p);
+	return yang_data_new_ipv6p(xpath, agg_node_get_prefix(rinfo->rp));
 }
 
 /*
diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c
index f9bd56d1d..baf7f0096 100644
--- a/ripngd/ripng_zebra.c
+++ b/ripngd/ripng_zebra.c
@@ -46,12 +46,13 @@ static void ripng_zebra_ipv6_send(struct ripng *ripng, struct agg_node *rp,
 	struct listnode *listnode = NULL;
 	struct ripng_info *rinfo = NULL;
 	int count = 0;
+	const struct prefix *p = agg_node_get_prefix(rp);
 
 	memset(&api, 0, sizeof(api));
 	api.vrf_id = ripng->vrf->vrf_id;
 	api.type = ZEBRA_ROUTE_RIPNG;
 	api.safi = SAFI_UNICAST;
-	api.prefix = rp->p;
+	api.prefix = *p;
 
 	SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
 	for (ALL_LIST_ELEMENTS_RO(list, listnode, rinfo)) {
@@ -85,18 +86,17 @@ static void ripng_zebra_ipv6_send(struct ripng *ripng, struct agg_node *rp,
 
 	if (IS_RIPNG_DEBUG_ZEBRA) {
 		if (ripng->ecmp)
-			zlog_debug("%s: %s/%d nexthops %d",
+			zlog_debug("%s: %pRN nexthops %d",
 				   (cmd == ZEBRA_ROUTE_ADD)
 					   ? "Install into zebra"
 					   : "Delete from zebra",
-				   inet6_ntoa(rp->p.u.prefix6), rp->p.prefixlen,
-				   count);
+				   rp, count);
 		else
-			zlog_debug(
-				"%s: %s/%d",
-				(cmd == ZEBRA_ROUTE_ADD) ? "Install into zebra"
-							 : "Delete from zebra",
-				inet6_ntoa(rp->p.u.prefix6), rp->p.prefixlen);
+			zlog_debug("%s: %pRN",
+				   (cmd == ZEBRA_ROUTE_ADD)
+					   ? "Install into zebra"
+					   : "Delete from zebra",
+				   rp);
 	}
 }
 
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index bb33abdb2..1ea006abd 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -1087,7 +1087,8 @@ void ripng_redistribute_withdraw(struct ripng *ripng, int type)
 
 				if (IS_RIPNG_DEBUG_EVENT) {
 					struct prefix_ipv6 *p =
-						(struct prefix_ipv6 *)&rp->p;
+						(struct prefix_ipv6 *)
+							agg_node_get_prefix(rp);
 
 					zlog_debug(
 						"Poisone %s/%d on the interface %s [withdraw]",
@@ -1619,7 +1620,7 @@ void ripng_output_process(struct interface *ifp, struct sockaddr_in6 *to,
 			 * following
 			 * information.
 			 */
-			p = (struct prefix_ipv6 *)&rp->p;
+			p = (struct prefix_ipv6 *)agg_node_get_prefix(rp);
 			rinfo->metric_out = rinfo->metric;
 			rinfo->tag_out = rinfo->tag;
 			memset(&rinfo->nexthop_out, 0,
@@ -1761,7 +1762,7 @@ void ripng_output_process(struct interface *ifp, struct sockaddr_in6 *to,
 			 * following
 			 * information.
 			 */
-			p = (struct prefix_ipv6 *)&rp->p;
+			p = (struct prefix_ipv6 *)agg_node_get_prefix(rp);
 			aggregate->metric_set = 0;
 			aggregate->metric_out = aggregate->metric;
 			aggregate->tag_out = aggregate->tag;
@@ -2053,7 +2054,6 @@ DEFUN (show_ipv6_ripng,
 	struct agg_node *rp;
 	struct ripng_info *rinfo;
 	struct ripng_aggregate *aggregate;
-	struct prefix_ipv6 *p;
 	struct list *list = NULL;
 	struct listnode *listnode = NULL;
 	int len;
@@ -2085,15 +2085,11 @@ DEFUN (show_ipv6_ripng,
 
 	for (rp = agg_route_top(ripng->table); rp; rp = agg_route_next(rp)) {
 		if ((aggregate = rp->aggregate) != NULL) {
-			p = (struct prefix_ipv6 *)&rp->p;
-
 #ifdef DEBUG
-			vty_out(vty, "R(a) %d/%d %s/%d ", aggregate->count,
-				aggregate->suppress, inet6_ntoa(p->prefix),
-				p->prefixlen);
+			vty_out(vty, "R(a) %d/%d %pRN ", aggregate->count,
+				aggregate->suppress, rp);
 #else
-			vty_out(vty, "R(a) %s/%d ", inet6_ntoa(p->prefix),
-				p->prefixlen);
+			vty_out(vty, "R(a) %pRN ", rp);
 #endif /* DEBUG */
 			vty_out(vty, "\n");
 			vty_out(vty, "%*s", 18, " ");
@@ -2105,19 +2101,15 @@ DEFUN (show_ipv6_ripng,
 
 		if ((list = rp->info) != NULL)
 			for (ALL_LIST_ELEMENTS_RO(list, listnode, rinfo)) {
-				p = (struct prefix_ipv6 *)&rp->p;
-
 #ifdef DEBUG
-				vty_out(vty, "%c(%s) 0/%d %s/%d ",
+				vty_out(vty, "%c(%s) 0/%d %pRN ",
 					zebra_route_char(rinfo->type),
 					ripng_route_subtype_print(rinfo),
-					rinfo->suppress, inet6_ntoa(p->prefix),
-					p->prefixlen);
+					rinfo->suppress, rp);
 #else
-				vty_out(vty, "%c(%s) %s/%d ",
+				vty_out(vty, "%c(%s) %pRN ",
 					zebra_route_char(rinfo->type),
-					ripng_route_subtype_print(rinfo),
-					inet6_ntoa(p->prefix), p->prefixlen);
+					ripng_route_subtype_print(rinfo), rp);
 #endif /* DEBUG */
 				vty_out(vty, "\n");
 				vty_out(vty, "%*s", 18, " ");