zebra: replace sockunion2str in kernel_socket.c

Use the frr format spec instead.

Signed-off-by: Mark Stapp <mjs.ietf@gmail.com>

diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index 5c060ac6f86015a4445a7049bd03925abdb9069b..2af6ebe6b14259ab073b34e43a8b2e24ebb568bd 100644 (file)
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -529,7 +529,7 @@ int ifm_read(struct if_msghdr *ifm)
        /* paranoia: sanity check structure */
        if (ifm->ifm_msglen < sizeof(struct if_msghdr)) {
                flog_err(EC_ZEBRA_NETLINK_LENGTH_ERROR,
-                        "ifm_read: ifm->ifm_msglen %d too short\n",
+                        "ifm_read: ifm->ifm_msglen %d too short",
                         ifm->ifm_msglen);
                return -1;
        }
@@ -807,23 +807,17 @@ static void ifam_read_mesg(struct ifa_msghdr *ifm, union sockunion *addr,
                switch (sockunion_family(addr)) {
                case AF_INET:
                case AF_INET6: {
-                       char buf[4][INET6_ADDRSTRLEN];
                        int masklen =
                                (sockunion_family(addr) == AF_INET)
                                        ? ip_masklen(mask->sin.sin_addr)
                                        : ip6_masklen(mask->sin6.sin6_addr);
                        zlog_debug(
-                               "%s: ifindex %d, ifname %s, ifam_addrs {%s}, ifam_flags 0x%x, addr %s/%d broad %s dst %s gateway %s",
+                               "%s: ifindex %d, ifname %s, ifam_addrs {%s}, ifam_flags 0x%x, addr %pSU/%d broad %pSU dst %pSU gateway %pSU",
                                __func__, ifm->ifam_index,
                                (ifnlen ? ifname : "(nil)"),
                                rtatostr(ifm->ifam_addrs, fbuf, sizeof(fbuf)),
-                               ifm->ifam_flags,
-                               sockunion2str(addr, buf[0], sizeof(buf[0])),
-                               masklen,
-                               sockunion2str(brd, buf[1], sizeof(buf[1])),
-                               sockunion2str(&dst, buf[2], sizeof(buf[2])),
-                               sockunion2str(&gateway, buf[2],
-                                             sizeof(buf[2])));
+                               ifm->ifam_flags, addr, masklen, brd, &dst,
+                               &gateway);
                } break;
                default:
                        zlog_debug("%s: ifindex %d, ifname %s, ifam_addrs {%s}",
@@ -951,7 +945,7 @@ static int rtm_read_mesg(struct rt_msghdr *rtm, union sockunion *dest,
        /* rt_msghdr version check. */
        if (rtm->rtm_version != RTM_VERSION)
                flog_warn(EC_ZEBRA_RTM_VERSION_MISMATCH,
-                         "Routing message version different %d should be %d.This may cause problem\n",
+                         "Routing message version different %d should be %d.This may cause problem",
                          rtm->rtm_version, RTM_VERSION);
 
        /* Be sure structure is cleared */