From acc847c999fe0aceecc880e017619bf707483aaa Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Wed, 27 Jan 2021 15:00:10 -0500 Subject: [PATCH] libs, ospfd: remove inet_ntoa inet_ntoa not permitted - replace instances. Signed-off-by: Mark Stapp --- lib/link_state.c | 6 ++---- ospfd/ospf_lsa.c | 7 ++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/link_state.c b/lib/link_state.c index f8fdda64f0..8dc5ab8eee 100644 --- a/lib/link_state.c +++ b/lib/link_state.c @@ -1273,10 +1273,8 @@ void ls_dump_ted(struct ls_ted *ted) frr_each(subnets, &ted->subnets, subnet) { ls_subnet2msg(&msg, subnet); zlog_debug( - "\tTed subnet key:%s vertex:%pI4 pfx:%pFX", - subnet->key.family == AF_INET - ? inet_ntoa(subnet->key.u.prefix4) - : inet6_ntoa(subnet->key.u.prefix6), + "\tTed subnet key:%pFX vertex:%pI4 pfx:%pFX", + &subnet->key, &subnet->vertex->node->adv.id.ip.addr, &subnet->ls_pref->pref); } diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index 72201355e7..8e4cfa3200 100644 --- a/ospfd/ospf_lsa.c +++ b/ospfd/ospf_lsa.c @@ -2854,9 +2854,10 @@ static int ospf_maxage_lsa_remover(struct thread *thread) */ if (old != lsa) { flog_err(EC_OSPF_LSA_MISSING, - "%s: LSA[Type%d:%s]: LSA not in LSDB", - __func__, lsa->data->type, - inet_ntoa(lsa->data->id)); + "%s: LSA[Type%d:%pI4]: LSA not in LSDB", + __func__, lsa->data->type, + &lsa->data->id); + continue; } ospf_discard_from_db(ospf, lsa->lsdb, lsa); -- 2.39.5