ldpd: replace inet_ntoa

[mirror_frr.git] / ldpd / neighbor.c

diff --git a/ldpd/neighbor.c b/ldpd/neighbor.c
index 236d3eaa58a317867e2e84ae8caee5a431acd04a..423410f29098285b8b84af5915c8d4dd848dd6fc 100644 (file)
--- a/ldpd/neighbor.c
+++ b/ldpd/neighbor.c
@@ -143,7 +143,7 @@ nbr_fsm(struct nbr *nbr, enum nbr_event event)
 
        if (nbr_fsm_tbl[i].state == -1) {
                /* event outside of the defined fsm, ignore it. */
-               log_warnx("%s: lsr-id %s, event %s not expected in state %s", __func__, inet_ntoa(nbr->id),
+               log_warnx("%s: lsr-id %pI4, event %s not expected in state %s", __func__, &nbr->id,
                    nbr_event_names[event], nbr_state_name(old_state));
                return (0);
        }
@@ -152,10 +152,10 @@ nbr_fsm(struct nbr *nbr, enum nbr_event event)
                nbr->state = new_state;
 
        if (old_state != nbr->state) {
-               log_debug("%s: event %s resulted in action %s and changing state for lsr-id %s from %s to %s",
+               log_debug("%s: event %s resulted in action %s and changing state for lsr-id %pI4 from %s to %s",
                    __func__, nbr_event_names[event],
                    nbr_action_names[nbr_fsm_tbl[i].action],
-                   inet_ntoa(nbr->id), nbr_state_name(old_state),
+                   &nbr->id, nbr_state_name(old_state),
                    nbr_state_name(nbr->state));
 
                if (nbr->state == NBR_STA_OPER) {
@@ -223,8 +223,8 @@ nbr_new(struct in_addr id, int af, int ds_tlv, union ldpd_addr *addr,
        struct adj              *adj;
        struct pending_conn     *pconn;
 
-       log_debug("%s: lsr-id %s transport-address %s", __func__,
-           inet_ntoa(id), log_addr(af, addr));
+       log_debug("%s: lsr-id %pI4 transport-address %s", __func__,
+           &id, log_addr(af, addr));
 
        if ((nbr = calloc(1, sizeof(*nbr))) == NULL)
                fatal(__func__);
@@ -289,7 +289,7 @@ nbr_del(struct nbr *nbr)
 {
        struct adj              *adj;
 
-       log_debug("%s: lsr-id %s", __func__, inet_ntoa(nbr->id));
+       log_debug("%s: lsr-id %pI4", __func__, &nbr->id);
 
        nbr_fsm(nbr, NBR_EVT_CLOSE_SESSION);
 #ifdef __OpenBSD__
@@ -436,7 +436,7 @@ nbr_ktimeout(struct thread *thread)
 
        nbr->keepalive_timeout = NULL;
 
-       log_debug("%s: lsr-id %s", __func__, inet_ntoa(nbr->id));
+       log_debug("%s: lsr-id %pI4", __func__, &nbr->id);
 
        session_shutdown(nbr, S_KEEPALIVE_TMR, 0, 0);
 
@@ -465,7 +465,7 @@ nbr_itimeout(struct thread *thread)
 {
        struct nbr      *nbr = THREAD_ARG(thread);
 
-       log_debug("%s: lsr-id %s", __func__, inet_ntoa(nbr->id));
+       log_debug("%s: lsr-id %pI4", __func__, &nbr->id);
 
        nbr_fsm(nbr, NBR_EVT_CLOSE_SESSION);
 
@@ -498,7 +498,7 @@ nbr_idtimer(struct thread *thread)
 
        nbr->initdelay_timer = NULL;
 
-       log_debug("%s: lsr-id %s", __func__, inet_ntoa(nbr->id));
+       log_debug("%s: lsr-id %pI4", __func__, &nbr->id);
 
        nbr_establish_connection(nbr);
 
@@ -619,12 +619,12 @@ nbr_establish_connection(struct nbr *nbr)
 
        if (nbr->af == AF_INET) {
                if (sock_set_ipv4_tos(nbr->fd, IPTOS_PREC_INTERNETCONTROL) == -1)
-                       log_warn("%s: lsr-id %s, sock_set_ipv4_tos error",
-                               __func__, inet_ntoa(nbr->id));
+                       log_warn("%s: lsr-id %pI4, sock_set_ipv4_tos error",
+                               __func__, &nbr->id);
        } else if (nbr->af == AF_INET6) {
                if (sock_set_ipv6_dscp(nbr->fd, IPTOS_PREC_INTERNETCONTROL) == -1)
-                       log_warn("%s: lsr-id %s, sock_set_ipv6_dscp error",
-                               __func__, inet_ntoa(nbr->id));
+                       log_warn("%s: lsr-id %pI4, sock_set_ipv6_dscp error",
+                               __func__, &nbr->id);
        }
 
        addr2sa(nbr->af, &nbr->laddr, 0, &local_su);
@@ -746,8 +746,8 @@ nbr_gtsm_check(int fd, struct nbr *nbr, struct nbr_params *nbrp)
        }
 
        if (nbr_gtsm_setup(fd, nbr->af, nbrp) == -1) {
-               log_warnx("%s: error enabling GTSM for lsr-id %s", __func__,
-                   inet_ntoa(nbr->id));
+               log_warnx("%s: error enabling GTSM for lsr-id %pI4", __func__,
+                   &nbr->id);
                return (-1);
        }