diff options
| author | Pat Ruddy <pat@voltanet.io> | 2020-10-15 17:40:36 +0200 |
|---|---|---|
| committer | Pat Ruddy <pat@voltanet.io> | 2020-10-15 17:57:11 +0200 |
| commit | 26b6d034b0f3e0111b464b19c11026366f1e4192 (patch) | |
| tree | 1f31b20a8cbe7f933b0bf7b08550d40172cf2b9e /vrrpd | |
| parent | Merge pull request #6016 from sarav511/ppend (diff) | |
| download | frr-26b6d034b0f3e0111b464b19c11026366f1e4192.tar.xz frr-26b6d034b0f3e0111b464b19c11026366f1e4192.zip | |
vrrpd: Convert to using %pFX
Signed-off-by: Pat Ruddy <pat@voltanet.io>
Diffstat (limited to 'vrrpd')
| -rw-r--r-- | vrrpd/vrrp.c | 21 | ||||
| -rw-r--r-- | vrrpd/vrrp_zebra.c | 4 |
2 files changed, 8 insertions, 17 deletions
diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c index d3f9b0c73..7728717e9 100644 --- a/vrrpd/vrrp.c +++ b/vrrpd/vrrp.c @@ -700,7 +700,6 @@ static int vrrp_master_down_timer_expire(struct thread *thread); */ static int vrrp_bind_to_primary_connected(struct vrrp_router *r) { - char ipstr[INET6_ADDRSTRLEN]; struct interface *ifp; /* @@ -754,20 +753,15 @@ static int vrrp_bind_to_primary_connected(struct vrrp_router *r) if (bind(r->sock_tx, (const struct sockaddr *)&su, sizeof(su)) < 0) { zlog_err( VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM - "Failed to bind Tx socket to primary IP address %s: %s", - r->vr->vrid, family2str(r->family), - inet_ntop(r->family, - (const void *)&c->address->u.prefix, ipstr, - sizeof(ipstr)), + "Failed to bind Tx socket to primary IP address %pFX: %s", + r->vr->vrid, family2str(r->family), c->address, safe_strerror(errno)); ret = -1; } else { DEBUGD(&vrrp_dbg_sock, VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM - "Bound Tx socket to primary IP address %s", - r->vr->vrid, family2str(r->family), - inet_ntop(r->family, (const void *)&c->address->u.prefix, - ipstr, sizeof(ipstr))); + "Bound Tx socket to primary IP address %pFX", + r->vr->vrid, family2str(r->family), c->address); } return ret; @@ -1717,7 +1711,6 @@ static void vrrp_autoconfig_autoaddrupdate(struct vrrp_router *r) struct listnode *ln; struct connected *c = NULL; bool is_v6_ll; - char ipbuf[INET6_ADDRSTRLEN]; if (!r->mvl_ifp) return; @@ -1730,12 +1723,10 @@ static void vrrp_autoconfig_autoaddrupdate(struct vrrp_router *r) is_v6_ll = (c->address->family == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&c->address->u.prefix6)); if (c->address->family == r->family && !is_v6_ll) { - inet_ntop(r->family, &c->address->u.prefix, ipbuf, - sizeof(ipbuf)); DEBUGD(&vrrp_dbg_auto, VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM - "Adding %s", - r->vr->vrid, family2str(r->family), ipbuf); + "Adding %pFX", + r->vr->vrid, family2str(r->family), c->address); if (r->family == AF_INET) vrrp_add_ipv4(r->vr, c->address->u.prefix4); else if (r->vr->version == 3) diff --git a/vrrpd/vrrp_zebra.c b/vrrpd/vrrp_zebra.c index a578921df..37a1e4a62 100644 --- a/vrrpd/vrrp_zebra.c +++ b/vrrpd/vrrp_zebra.c @@ -56,8 +56,8 @@ static void vrrp_zebra_debug_if_dump_address(struct interface *ifp, for (ALL_LIST_ELEMENTS_RO(ifp->connected, node, ifc)) { struct prefix *p = ifc->address; - DEBUGD(&vrrp_dbg_zebra, "%s: interface %s address %s %s", func, - ifp->name, inet_ntoa(p->u.prefix4), + DEBUGD(&vrrp_dbg_zebra, "%s: interface %s address %pFX %s", + func, ifp->name, p, CHECK_FLAG(ifc->flags, ZEBRA_IFA_SECONDARY) ? "secondary" : "primary"); } |