diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2021-10-14 00:42:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-14 00:42:29 +0200 |
| commit | bb3cd4189a7b2ae40b3dbaf58a7b30ba210e9805 (patch) | |
| tree | bc294039c0de405b5258a09d6dd19be619ee38d3 /ospfd/ospf_packet.c | |
| parent | Merge pull request #9676 from donaldsharp/import_register (diff) | |
| parent | ospfd: use ospf_get_name() wherever possible (diff) | |
| download | frr-bb3cd4189a7b2ae40b3dbaf58a7b30ba210e9805.tar.xz frr-bb3cd4189a7b2ae40b3dbaf58a7b30ba210e9805.zip | |
Merge pull request #9795 from opensourcerouting/ospf_get_name
ospfd: use ospf_get_name() wherever possible
Diffstat (limited to 'ospfd/ospf_packet.c')
| -rw-r--r-- | ospfd/ospf_packet.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index eacc30eba..4294c255a 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -1393,8 +1393,7 @@ static void ospf_db_desc(struct ip *iph, struct ospf_header *ospfh, if (CHECK_FLAG(oi->ospf->config, OSPF_LOG_ADJACENCY_DETAIL)) zlog_info( "%s:Packet[DD]: Neighbor %pI4 state is %s, seq_num:0x%x, local:0x%x", - (oi->ospf->name) ? oi->ospf->name : VRF_DEFAULT_NAME, - &nbr->router_id, + ospf_get_name(oi->ospf), &nbr->router_id, lookup_msg(ospf_nsm_state_msg, nbr->state, NULL), ntohl(dd->dd_seqnum), nbr->dd_seqnum); @@ -3894,9 +3893,8 @@ void ospf_db_desc_send(struct ospf_neighbor *nbr) if (CHECK_FLAG(oi->ospf->config, OSPF_LOG_ADJACENCY_DETAIL)) zlog_info( "%s:Packet[DD]: %pI4 DB Desc send with seqnum:%x , flags:%x", - (oi->ospf->name) ? oi->ospf->name : VRF_DEFAULT_NAME, - &nbr->router_id, nbr->dd_seqnum, - nbr->dd_flags); + ospf_get_name(oi->ospf), &nbr->router_id, + nbr->dd_seqnum, nbr->dd_flags); } /* Re-send Database Description. */ @@ -3914,9 +3912,8 @@ void ospf_db_desc_resend(struct ospf_neighbor *nbr) if (CHECK_FLAG(oi->ospf->config, OSPF_LOG_ADJACENCY_DETAIL)) zlog_info( "%s:Packet[DD]: %pI4 DB Desc resend with seqnum:%x , flags:%x", - (oi->ospf->name) ? oi->ospf->name : VRF_DEFAULT_NAME, - &nbr->router_id, nbr->dd_seqnum, - nbr->dd_flags); + ospf_get_name(oi->ospf), &nbr->router_id, + nbr->dd_seqnum, nbr->dd_flags); } /* Send Link State Request. */ |