Merge remote-tracking branch 'origin/master' into pr/111

1 files changed, 50 insertions, 5 deletions

diff --git a/pimd/pim_str.c b/pimd/pim_str.c
index c817045697..83f2a635b3 100644
--- a/pimd/pim_str.c
+++ b/pimd/pim_str.c
@@ -28,17 +28,62 @@
 
 #include "pim_str.h"
 
-void pim_inet4_dump(const char *onfail, struct in_addr addr, char *buf, int buf_size)
+void pim_addr_dump (const char *onfail, struct prefix *p, char *buf, int buf_size)
 {
   int save_errno = errno;
 
-  if (!inet_ntop(AF_INET, &addr, buf, buf_size)) {
-    int e = errno;
-    zlog_warn("pim_inet4_dump: inet_ntop(AF_INET,buf_size=%d): errno=%d: %s",
-	      buf_size, e, safe_strerror(e));
+  if (!inet_ntop(p->family, &p->u.prefix, buf, buf_size)) {
+    zlog_warn("pim_addr_dump: inet_ntop(buf_size=%d): errno=%d: %s",
+	      buf_size, errno, safe_strerror(errno));
     if (onfail)
       snprintf(buf, buf_size, "%s", onfail);
   }
 
   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);
+
+  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;
+}