diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2020-10-21 18:55:09 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2020-10-21 18:55:09 -0400 |
| commit | 37b4b3cc340e8198c8a45700ef981b79084913af (patch) | |
| tree | 3ea024bd677829a4455b5428bbcaea207cd41f46 /eigrpd/eigrp_hello.c | |
| parent | 719e0a6a6c4af04d1e9f4ef4bcc1855fc35fda6c (diff) | |
eigrpd: Replace inet_ntoa with %pI4
Search and destroy the inet_ntoa usage in eigrp
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'eigrpd/eigrp_hello.c')
| -rw-r--r-- | eigrpd/eigrp_hello.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c index 6f93cd7b3e..f512833e0a 100644 --- a/eigrpd/eigrp_hello.c +++ b/eigrpd/eigrp_hello.c @@ -144,10 +144,11 @@ eigrp_hello_parameter_decode(struct eigrp_neighbor *nbr, && (eigrp->k_values[4] == nbr->K5)) { if (eigrp_nbr_state_get(nbr) == EIGRP_NEIGHBOR_DOWN) { - zlog_info("Neighbor %s (%s) is pending: new adjacency", - inet_ntoa(nbr->src), - ifindex2ifname(nbr->ei->ifp->ifindex, - eigrp->vrf_id)); + zlog_info( + "Neighbor %pI4 (%s) is pending: new adjacency", + &nbr->src, + ifindex2ifname(nbr->ei->ifp->ifindex, + eigrp->vrf_id)); /* Expedited hello sent */ eigrp_hello_send(nbr->ei, EIGRP_HELLO_NORMAL, NULL); @@ -164,16 +165,16 @@ eigrp_hello_parameter_decode(struct eigrp_neighbor *nbr, & param->K5) == 255) { zlog_info( - "Neighbor %s (%s) is down: Interface PEER-TERMINATION received", - inet_ntoa(nbr->src), + "Neighbor %pI4 (%s) is down: Interface PEER-TERMINATION received", + &nbr->src, ifindex2ifname(nbr->ei->ifp->ifindex, eigrp->vrf_id)); eigrp_nbr_delete(nbr); return NULL; } else { zlog_info( - "Neighbor %s (%s) going down: Kvalue mismatch", - inet_ntoa(nbr->src), + "Neighbor %pI4 (%s) going down: Kvalue mismatch", + &nbr->src, ifindex2ifname(nbr->ei->ifp->ifindex, eigrp->vrf_id)); eigrp_nbr_state_set(nbr, EIGRP_NEIGHBOR_DOWN); @@ -253,9 +254,10 @@ static void eigrp_peer_termination_decode(struct eigrp_neighbor *nbr, uint32_t received_ip = param->neighbor_ip; if (my_ip == received_ip) { - zlog_info("Neighbor %s (%s) is down: Peer Termination received", - inet_ntoa(nbr->src), - ifindex2ifname(nbr->ei->ifp->ifindex, eigrp->vrf_id)); + zlog_info( + "Neighbor %pI4 (%s) is down: Peer Termination received", + &nbr->src, + ifindex2ifname(nbr->ei->ifp->ifindex, eigrp->vrf_id)); /* set neighbor to DOWN */ nbr->state = EIGRP_NEIGHBOR_DOWN; /* delete neighbor */ @@ -330,9 +332,9 @@ void eigrp_hello_receive(struct eigrp *eigrp, struct ip *iph, assert(nbr); if (IS_DEBUG_EIGRP_PACKET(eigrph->opcode - 1, RECV)) - zlog_debug("Processing Hello size[%u] int(%s) nbr(%s)", size, + zlog_debug("Processing Hello size[%u] int(%s) nbr(%pI4)", size, ifindex2ifname(nbr->ei->ifp->ifindex, eigrp->vrf_id), - inet_ntoa(nbr->src)); + &nbr->src); size -= EIGRP_HEADER_LEN; if (size < 0) @@ -403,8 +405,7 @@ void eigrp_hello_receive(struct eigrp *eigrp, struct ip *iph, } if (IS_DEBUG_EIGRP_PACKET(0, RECV)) - zlog_debug("Hello Packet received from %s", - inet_ntoa(nbr->src)); + zlog_debug("Hello Packet received from %pI4", &nbr->src); } uint32_t FRR_MAJOR; @@ -708,9 +709,8 @@ void eigrp_hello_send_ack(struct eigrp_neighbor *nbr) if (ep) { if (IS_DEBUG_EIGRP_PACKET(0, SEND)) - zlog_debug("Queueing [Hello] Ack Seq [%u] nbr [%s]", - nbr->recv_sequence_number, - inet_ntoa(nbr->src)); + zlog_debug("Queueing [Hello] Ack Seq [%u] nbr [%pI4]", + nbr->recv_sequence_number, &nbr->src); /* Add packet to the top of the interface output queue*/ eigrp_fifo_push(nbr->ei->obuf, ep); |