matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pim6d: fix format string mistakes in ssmpingd

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

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2022-03-25 11:35:32 +01:00
parent 86c1ef5667
commit 34389f8886
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pimd/pim_ssmpingd.c
View file

@ -212,7 +212,7 @@ static void ssmpingd_delete(struct ssmpingd_sock *ss)
if (close(ss->sock_fd)) { if (close(ss->sock_fd)) {
zlog_warn( 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, __func__, ss->sock_fd, &ss->source_addr, errno,
safe_strerror(errno)); safe_strerror(errno));
/* warning only */ /* warning only */
@ -262,7 +262,7 @@ static int ssmpingd_read_msg(struct ssmpingd_sock *ss)
if (len < 0) { if (len < 0) {
zlog_warn( 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, __func__, &ss->source_addr, ss->sock_fd, errno,
safe_strerror(errno)); safe_strerror(errno));
return -1; return -1;
@ -272,7 +272,7 @@ static int ssmpingd_read_msg(struct ssmpingd_sock *ss)
if (buf[0] != PIM_SSMPINGD_REQUEST) { if (buf[0] != PIM_SSMPINGD_REQUEST) {
zlog_warn( 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, __func__, buf[0], &from, &to,
ifp ? ifp->name : "<iface?>", ifindex, ss->sock_fd, ifp ? ifp->name : "<iface?>", ifindex, ss->sock_fd,
&ss->source_addr); &ss->source_addr);
@ -281,7 +281,7 @@ static int ssmpingd_read_msg(struct ssmpingd_sock *ss)
if (PIM_DEBUG_SSMPINGD) { if (PIM_DEBUG_SSMPINGD) {
zlog_debug( 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?>", __func__, &from, &to, ifp ? ifp->name : "<iface?>",
ifindex, ss->sock_fd, &ss->source_addr); ifindex, ss->sock_fd, &ss->source_addr);
} }
@ -330,7 +330,7 @@ static struct ssmpingd_sock *ssmpingd_new(struct pim_instance *pim,
sock_fd = sock_fd =
ssmpingd_socket(source_addr, /* port: */ 4321, /* mTTL: */ 64); ssmpingd_socket(source_addr, /* port: */ 4321, /* mTTL: */ 64);
if (sock_fd < 0) { 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); __func__, &source_addr);
return 0; return 0;
} }

2
pimd/pim_vty.c
View file

@ -264,7 +264,7 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
struct ssmpingd_sock *ss; struct ssmpingd_sock *ss;
++writes; ++writes;
for (ALL_LIST_ELEMENTS_RO(pim->ssmpingd_list, node, ss)) { 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); &ss->source_addr);
++writes; ++writes;
} }