proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 14:05:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7953 from mjstapp/fix_more_ntoa

Browse Source 
libs, ospfd: remove inet_ntoa
This commit is contained in:
Rafael Zalamena 2021-01-29 08:01:03 -03:00 committed by GitHub
commit ecf497baed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/link_state.c
View File

@ -1273,10 +1273,8 @@ void ls_dump_ted(struct ls_ted *ted)
frr_each(subnets, &ted->subnets, subnet) { frr_each(subnets, &ted->subnets, subnet) {
ls_subnet2msg(&msg, subnet); ls_subnet2msg(&msg, subnet);
zlog_debug( zlog_debug(
"\tTed subnet key:%s vertex:%pI4 pfx:%pFX", "\tTed subnet key:%pFX vertex:%pI4 pfx:%pFX",
subnet->key.family == AF_INET &subnet->key,
? inet_ntoa(subnet->key.u.prefix4)
: inet6_ntoa(subnet->key.u.prefix6),
&subnet->vertex->node->adv.id.ip.addr, &subnet->vertex->node->adv.id.ip.addr,
&subnet->ls_pref->pref); &subnet->ls_pref->pref);
} }

5
ospfd/ospf_lsa.c
View File

@ -2835,9 +2835,10 @@ static int ospf_maxage_lsa_remover(struct thread *thread)
*/ */
if (old != lsa) { if (old != lsa) {
flog_err(EC_OSPF_LSA_MISSING, flog_err(EC_OSPF_LSA_MISSING,
"%s: LSA[Type%d:%s]: LSA not in LSDB", "%s: LSA[Type%d:%pI4]: LSA not in LSDB",
__func__, lsa->data->type, __func__, lsa->data->type,
inet_ntoa(lsa->data->id)); &lsa->data->id);
continue; continue;
} }
ospf_discard_from_db(ospf, lsa->lsdb, lsa); ospf_discard_from_db(ospf, lsa->lsdb, lsa);