Merge pull request #8376 from mjstapp/fix_remove_inet6_ntoa

[mirror_frr.git] / lib / prefix.c

diff --git a/lib/prefix.c b/lib/prefix.c
index 6b9a6942493f1911681c8c77bf0b947b43c1065e..7dbb5f07f0fd53af930d3fb0eb3bbc3a33c6adee 100644 (file)
--- a/lib/prefix.c
+++ b/lib/prefix.c
@@ -1352,92 +1352,92 @@ char *evpn_es_df_alg2str(uint8_t df_alg, char *buf, int buf_len)
 }
 
 printfrr_ext_autoreg_p("EA", printfrr_ea)
-static ssize_t printfrr_ea(char *buf, size_t bsz, const char *fmt,
-                          int prec, const void *ptr)
+static ssize_t printfrr_ea(struct fbuf *buf, struct printfrr_eargs *ea,
+                          const void *ptr)
 {
        const struct ethaddr *mac = ptr;
+       char cbuf[ETHER_ADDR_STRLEN];
 
-       if (mac)
-               prefix_mac2str(mac, buf, bsz);
-       else
-               strlcpy(buf, "NULL", bsz);
+       if (!mac)
+               return bputs(buf, "(null)");
 
-       return 2;
+       /* need real length even if buffer is too short */
+       prefix_mac2str(mac, cbuf, sizeof(cbuf));
+       return bputs(buf, cbuf);
 }
 
 printfrr_ext_autoreg_p("IA", printfrr_ia)
-static ssize_t printfrr_ia(char *buf, size_t bsz, const char *fmt,
-                          int prec, const void *ptr)
+static ssize_t printfrr_ia(struct fbuf *buf, struct printfrr_eargs *ea,
+                          const void *ptr)
 {
        const struct ipaddr *ipa = ptr;
+       char cbuf[INET6_ADDRSTRLEN];
 
-       if (ipa)
-               ipaddr2str(ipa, buf, bsz);
-       else
-               strlcpy(buf, "NULL", bsz);
+       if (!ipa)
+               return bputs(buf, "(null)");
 
-       return 2;
+       ipaddr2str(ipa, cbuf, sizeof(cbuf));
+       return bputs(buf, cbuf);
 }
 
 printfrr_ext_autoreg_p("I4", printfrr_i4)
-static ssize_t printfrr_i4(char *buf, size_t bsz, const char *fmt,
-                          int prec, const void *ptr)
+static ssize_t printfrr_i4(struct fbuf *buf, struct printfrr_eargs *ea,
+                          const void *ptr)
 {
-       if (ptr)
-               inet_ntop(AF_INET, ptr, buf, bsz);
-       else
-               strlcpy(buf, "NULL", bsz);
+       char cbuf[INET_ADDRSTRLEN];
+
+       if (!ptr)
+               return bputs(buf, "(null)");
 
-       return 2;
+       inet_ntop(AF_INET, ptr, cbuf, sizeof(cbuf));
+       return bputs(buf, cbuf);
 }
 
 printfrr_ext_autoreg_p("I6", printfrr_i6)
-static ssize_t printfrr_i6(char *buf, size_t bsz, const char *fmt,
-                          int prec, const void *ptr)
+static ssize_t printfrr_i6(struct fbuf *buf, struct printfrr_eargs *ea,
+                          const void *ptr)
 {
-       if (ptr)
-               inet_ntop(AF_INET6, ptr, buf, bsz);
-       else
-               strlcpy(buf, "NULL", bsz);
+       char cbuf[INET6_ADDRSTRLEN];
+
+       if (!ptr)
+               return bputs(buf, "(null)");
 
-       return 2;
+       inet_ntop(AF_INET6, ptr, cbuf, sizeof(cbuf));
+       return bputs(buf, cbuf);
 }
 
 printfrr_ext_autoreg_p("FX", printfrr_pfx)
-static ssize_t printfrr_pfx(char *buf, size_t bsz, const char *fmt,
-                           int prec, const void *ptr)
+static ssize_t printfrr_pfx(struct fbuf *buf, struct printfrr_eargs *ea,
+                           const void *ptr)
 {
-       if (ptr)
-               prefix2str(ptr, buf, bsz);
-       else
-               strlcpy(buf, "NULL", bsz);
+       char cbuf[PREFIX_STRLEN];
+
+       if (!ptr)
+               return bputs(buf, "(null)");
 
-       return 2;
+       prefix2str(ptr, cbuf, sizeof(cbuf));
+       return bputs(buf, cbuf);
 }
 
 printfrr_ext_autoreg_p("SG4", printfrr_psg)
-static ssize_t printfrr_psg(char *buf, size_t bsz, const char *fmt,
-                           int prec, const void *ptr)
+static ssize_t printfrr_psg(struct fbuf *buf, struct printfrr_eargs *ea,
+                           const void *ptr)
 {
        const struct prefix_sg *sg = ptr;
-       struct fbuf fb = { .buf = buf, .pos = buf, .len = bsz - 1 };
+       ssize_t ret = 0;
 
-       if (sg) {
-               if (sg->src.s_addr == INADDR_ANY)
-                       bprintfrr(&fb, "(*,");
-               else
-                       bprintfrr(&fb, "(%pI4,", &sg->src);
-
-               if (sg->grp.s_addr == INADDR_ANY)
-                       bprintfrr(&fb, "*)");
-               else
-                       bprintfrr(&fb, "%pI4)", &sg->grp);
+       if (!sg)
+               return bputs(buf, "(null)");
 
-               fb.pos[0] = '\0';
+       if (sg->src.s_addr == INADDR_ANY)
+               ret += bputs(buf, "(*,");
+       else
+               ret += bprintfrr(buf, "(%pI4,", &sg->src);
 
-       } else {
-               strlcpy(buf, "NULL", bsz);
-       }
+       if (sg->grp.s_addr == INADDR_ANY)
+               ret += bputs(buf, "*)");
+       else
+               ret += bprintfrr(buf, "%pI4)", &sg->grp);
 
-       return 3;
+       return ret;
 }