pim6d: fix format string mistakes in ssmpingd

PR #10653 forgot to update a bunch of format specifiers.  Fix.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c
index da903bd9802acea01e4ab89a1e67cd4e409c5ecd..afa7e37da15103995aa8d3cb8527aff49b702196 100644 (file)
--- a/pimd/pim_ssmpingd.c
+++ b/pimd/pim_ssmpingd.c
@@ -212,7 +212,7 @@ static void ssmpingd_delete(struct ssmpingd_sock *ss)
 
        if (close(ss->sock_fd)) {
                zlog_warn(
-                       "%s: failure closing ssmpingd sock_fd=%d for source %pI4: errno=%d: %s",
+                       "%s: failure closing ssmpingd sock_fd=%d for source %pPA: errno=%d: %s",
                        __func__, ss->sock_fd, &ss->source_addr, errno,
                        safe_strerror(errno));
                /* warning only */
@@ -262,7 +262,7 @@ static int ssmpingd_read_msg(struct ssmpingd_sock *ss)
 
        if (len < 0) {
                zlog_warn(
-                       "%s: failure receiving ssmping for source %pI4 on fd=%d: errno=%d: %s",
+                       "%s: failure receiving ssmping for source %pPA on fd=%d: errno=%d: %s",
                        __func__, &ss->source_addr, ss->sock_fd, errno,
                        safe_strerror(errno));
                return -1;
@@ -272,7 +272,7 @@ static int ssmpingd_read_msg(struct ssmpingd_sock *ss)
 
        if (buf[0] != PIM_SSMPINGD_REQUEST) {
                zlog_warn(
-                       "%s: bad ssmping type=%d from %pSUp to %pSUp on interface %s ifindex=%d fd=%d src=%pI4",
+                       "%s: bad ssmping type=%d from %pSUp to %pSUp on interface %s ifindex=%d fd=%d src=%pPA",
                        __func__, buf[0], &from, &to,
                        ifp ? ifp->name : "<iface?>", ifindex, ss->sock_fd,
                        &ss->source_addr);
@@ -281,7 +281,7 @@ static int ssmpingd_read_msg(struct ssmpingd_sock *ss)
 
        if (PIM_DEBUG_SSMPINGD) {
                zlog_debug(
-                       "%s: recv ssmping from %pSUp, to %pSUp, on interface %s ifindex=%d fd=%d src=%pI4",
+                       "%s: recv ssmping from %pSUp, to %pSUp, on interface %s ifindex=%d fd=%d src=%pPA",
                        __func__, &from, &to, ifp ? ifp->name : "<iface?>",
                        ifindex, ss->sock_fd, &ss->source_addr);
        }
@@ -330,7 +330,7 @@ static struct ssmpingd_sock *ssmpingd_new(struct pim_instance *pim,
        sock_fd =
                ssmpingd_socket(source_addr, /* port: */ 4321, /* mTTL: */ 64);
        if (sock_fd < 0) {
-               zlog_warn("%s: ssmpingd_socket() failure for source %pI4",
+               zlog_warn("%s: ssmpingd_socket() failure for source %pPA",
                          __func__, &source_addr);
                return 0;
        }

diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index a7d598665560dd1e3690d9f217455535ad0a4677..a0dea63b792ad3b8671e27542956511d7ef24c64 100644 (file)
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -264,7 +264,7 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
                struct ssmpingd_sock *ss;
                ++writes;
                for (ALL_LIST_ELEMENTS_RO(pim->ssmpingd_list, node, ss)) {
-                       vty_out(vty, "%sip ssmpingd %pI4\n", spaces,
+                       vty_out(vty, "%sip ssmpingd %pPA\n", spaces,
                                &ss->source_addr);
                        ++writes;
                }