lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / pimd / pim_str.c

diff --git a/pimd/pim_str.c b/pimd/pim_str.c
index 4c25c00294d54b4846f064de0241e1ed8230fae0..fa1a6e624c5a8af1b0cc530d2e6694f6a450b33b 100644 (file)
--- a/pimd/pim_str.c
+++ b/pimd/pim_str.c
@@ -1,23 +1,21 @@
 /*
-  PIM for Quagga
-  Copyright (C) 2008  Everton da Silva Marques
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-  
-  You should have received a copy of the GNU General Public License
-  along with this program; see the file COPYING; if not, write to the
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-  MA 02110-1301 USA
-  
-*/
+ * PIM for Quagga
+ * Copyright (C) 2008  Everton da Silva Marques
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 #include <zebra.h>
 
@@ -29,48 +27,62 @@
 
 #include "pim_str.h"
 
-void pim_addr_dump (const char *onfail, struct prefix *p, char *buf, int buf_size)
+void pim_addr_dump(const char *onfail, struct prefix *p, char *buf,
+                  int buf_size)
 {
-  int save_errno = errno;
+       int save_errno = errno;
 
-  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);
-  }
+       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;
+       errno = save_errno;
 }
 
-void pim_inet4_dump(const char *onfail, struct in_addr addr, char *buf, int buf_size)
+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;
+       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 *pim_str_sg_dump(const struct prefix_sg *sg)
 {
-  char src_str[INET_ADDRSTRLEN];
-  char grp_str[INET_ADDRSTRLEN];
-  static char sg_str[200];
-
-  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, 200, "(%s,%s)", src_str, grp_str);
-  return sg_str;
+       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;
 }