lib: move SG prefix2str APIs from pimd to lib

This is to allow zebra to use these APIs instead of re-defining.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>

1 files changed, 1 insertions, 36 deletions

diff --git a/pimd/pim_str.c b/pimd/pim_str.c
index fa1a6e624..f6acd0873 100644
--- a/pimd/pim_str.c
+++ b/pimd/pim_str.c
@@ -42,47 +42,12 @@ void pim_addr_dump(const char *onfail, struct prefix *p, char *buf,
 	errno = save_errno;
 }
 
-void pim_inet4_dump(const char *onfail, struct in_addr addr, char *buf,
-		    int buf_size)
-{
-	int save_errno = errno;
-
-	if (addr.s_addr == INADDR_ANY)
-		strcpy(buf, "*");
-	else {
-		if (!inet_ntop(AF_INET, &addr, buf, buf_size)) {
-			zlog_warn(
-				"pim_inet4_dump: inet_ntop(AF_INET,buf_size=%d): errno=%d: %s",
-				buf_size, errno, safe_strerror(errno));
-			if (onfail)
-				snprintf(buf, buf_size, "%s", onfail);
-		}
-	}
-
-	errno = save_errno;
-}
-
 char *pim_str_sg_dump(const struct prefix_sg *sg)
 {
-	char src_str[INET_ADDRSTRLEN];
-	char grp_str[INET_ADDRSTRLEN];
 	static char sg_str[PIM_SG_LEN];
 
-	pim_inet4_dump("<src?>", sg->src, src_str, sizeof(src_str));
-	pim_inet4_dump("<grp?>", sg->grp, grp_str, sizeof(grp_str));
-	snprintf(sg_str, PIM_SG_LEN, "(%s,%s)", src_str, grp_str);
+	pim_str_sg_set(sg, sg_str);
 
 	return sg_str;
 }
 
-char *pim_str_sg_set(const struct prefix_sg *sg, char *sg_str)
-{
-	char src_str[INET_ADDRSTRLEN];
-	char grp_str[INET_ADDRSTRLEN];
-
-	pim_inet4_dump("<src?>", sg->src, src_str, sizeof(src_str));
-	pim_inet4_dump("<grp?>", sg->grp, grp_str, sizeof(grp_str));
-	snprintf(sg_str, PIM_SG_LEN, "(%s,%s)", src_str, grp_str);
-
-	return sg_str;
-}