ospfd: use ospf_get_name() wherever possible

[mirror_frr.git] / ospfd / ospf_packet.c

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 1dcf93dcdef7c6302e967aac08323ae73c0f556f..23817d2eab2dd023a0d73bd2cb37a4345738bd2c 100644 (file)
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -1378,8 +1378,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);
 
@@ -3879,9 +3878,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. */
@@ -3899,9 +3897,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. */