bgpd: use %pRDP for printing evpn rd

Use %pRDP for printing evpn rd Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
louis-6wind · Apr 16, 2024 · 85b54f9 · 85b54f9
1 parent d2131dc
commit 85b54f9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
@@ -6221,8 +6221,6 @@ void bgp_evpn_derive_auto_rd(struct bgp *bgp, struct bgpevpn *vpn)
 	vpn->prd.prefixlen = 64;
 	snprintfrr(buf, sizeof(buf), "%pI4:%hu", &bgp->router_id, vpn->rd_id);
 	(void)str2prefix_rd(buf, &vpn->prd);
-	if (vpn->prd_pretty)
-		XFREE(MTYPE_BGP_NAME, vpn->prd_pretty);
 	UNSET_FLAG(vpn->flags, VNI_FLAG_RD_CFGD);
 }
 
@@ -6338,8 +6336,6 @@ void bgp_evpn_free(struct bgp *bgp, struct bgpevpn *vpn)
 	bf_release_index(bm->rd_idspace, vpn->rd_id);
 	hash_release(bgp->vni_svi_hash, vpn);
 	hash_release(bgp->vnihash, vpn);
-	if (vpn->prd_pretty)
-		XFREE(MTYPE_BGP_NAME, vpn->prd_pretty);
 	QOBJ_UNREG(vpn);
 	XFREE(MTYPE_BGP_EVPN, vpn);
 }

diff --git a/bgpd/bgp_evpn_private.h b/bgpd/bgp_evpn_private.h
@@ -76,7 +76,6 @@ struct bgpevpn {
 
 	/* RD for this VNI. */
 	struct prefix_rd prd;
-	char *prd_pretty;
 
 	/* Route type 3 field */
 	struct in_addr originator_ip;

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
@@ -2343,7 +2343,6 @@ static void evpn_configure_rd(struct bgp *bgp, struct bgpevpn *vpn,
 
 	/* update RD */
 	memcpy(&vpn->prd, rd, sizeof(struct prefix_rd));
-	vpn->prd_pretty = XSTRDUP(MTYPE_BGP_NAME, rd_pretty);
 	SET_FLAG(vpn->flags, VNI_FLAG_RD_CFGD);
 
 	if (is_vni_live(vpn))
@@ -3563,7 +3562,7 @@ static void write_vni_config(struct vty *vty, struct bgpevpn *vpn)
 	if (is_vni_configured(vpn)) {
 		vty_out(vty, "  vni %u\n", vpn->vni);
 		if (is_rd_configured(vpn))
-			vty_out(vty, "   rd %s\n", vpn->prd_pretty);
+			vty_out(vty, "   rd %pRDP\n", &vpn->prd);
 
 		if (is_import_rt_configured(vpn)) {
 			for (ALL_LIST_ELEMENTS(vpn->import_rtl, node, nnode,