From 2944807553e5ce368c0e47c3a95db3e573eae368 Mon Sep 17 00:00:00 2001 From: sri-mohan1 Date: Mon, 22 Aug 2022 23:00:35 +0530 Subject: [PATCH] ospfd: changes for code maintainability these changes are for improving the code maintainability Signed-off-by: sri-mohan1 --- ospfd/ospf_interface.c | 43 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index 2a758d5583..646d318362 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -909,18 +909,19 @@ struct ospf_interface *ospf_vl_new(struct ospf *ospf, struct prefix_ipv4 *p; if (IS_DEBUG_OSPF_EVENT) - zlog_debug("ospf_vl_new()(%s): Start", ospf_get_name(ospf)); + zlog_debug("%s: (%s): Start", __func__, ospf_get_name(ospf)); if (vlink_count == OSPF_VL_MAX_COUNT) { if (IS_DEBUG_OSPF_EVENT) zlog_debug( - "ospf_vl_new(): Alarm: cannot create more than OSPF_MAX_VL_COUNT virtual links"); + "%s: Alarm: cannot create more than OSPF_MAX_VL_COUNT virtual links", + __func__); + return NULL; } if (IS_DEBUG_OSPF_EVENT) - zlog_debug( - "ospf_vl_new(): creating pseudo zebra interface vrf id %u", - ospf->vrf_id); + zlog_debug("%s: creating pseudo zebra interface vrf id %u", + __func__, ospf->vrf_id); snprintf(ifname, sizeof(ifname), "VLINK%u", vlink_count); vi = if_get_by_name(ifname, ospf->vrf_id, ospf->name); @@ -944,7 +945,9 @@ struct ospf_interface *ospf_vl_new(struct ospf *ospf, if (voi == NULL) { if (IS_DEBUG_OSPF_EVENT) zlog_debug( - "ospf_vl_new(): Alarm: OSPF int structure is not created"); + "%s: Alarm: OSPF int structure is not created", + __func__); + return NULL; } voi->connected = co; @@ -954,17 +957,15 @@ struct ospf_interface *ospf_vl_new(struct ospf *ospf, vlink_count++; if (IS_DEBUG_OSPF_EVENT) - zlog_debug("ospf_vl_new(): Created name: %s", ifname); - if (IS_DEBUG_OSPF_EVENT) - zlog_debug("ospf_vl_new(): set if->name to %s", vi->name); + zlog_debug("%s: Created name: %s set if->name to %s", __func__, + ifname, vi->name); area_id.s_addr = INADDR_ANY; area = ospf_area_get(ospf, area_id); voi->area = area; if (IS_DEBUG_OSPF_EVENT) - zlog_debug( - "ospf_vl_new(): set associated area to the backbone"); + zlog_debug("%s: set associated area to the backbone", __func__); /* Add pseudo neighbor. */ ospf_nbr_self_reset(voi, voi->ospf->router_id); @@ -972,7 +973,7 @@ struct ospf_interface *ospf_vl_new(struct ospf *ospf, ospf_area_add_if(voi->area, voi); if (IS_DEBUG_OSPF_EVENT) - zlog_debug("ospf_vl_new(): Stop"); + zlog_debug("%s: Stop", __func__); return voi; } @@ -1167,10 +1168,8 @@ void ospf_vl_up_check(struct ospf_area *area, struct in_addr rid, struct ospf_interface *oi; if (IS_DEBUG_OSPF_EVENT) { - zlog_debug("ospf_vl_up_check(): Start"); - zlog_debug("ospf_vl_up_check(): Router ID is %pI4", - &rid); - zlog_debug("ospf_vl_up_check(): Area is %pI4", + zlog_debug("%s: Start", __func__); + zlog_debug("%s: Router ID is %pI4 Area is %pI4", __func__, &rid, &area->area_id); } @@ -1189,13 +1188,13 @@ void ospf_vl_up_check(struct ospf_area *area, struct in_addr rid, SET_FLAG(vl_data->flags, OSPF_VL_FLAG_APPROVED); if (IS_DEBUG_OSPF_EVENT) - zlog_debug( - "ospf_vl_up_check(): this VL matched"); + zlog_debug("%s: this VL matched", __func__); if (oi->state == ISM_Down) { if (IS_DEBUG_OSPF_EVENT) zlog_debug( - "ospf_vl_up_check(): VL is down, waking it up"); + "%s: VL is down, waking it up", + __func__); SET_FLAG(oi->ifp->flags, IFF_UP); OSPF_ISM_EVENT_EXECUTE(oi, ISM_InterfaceUp); } @@ -1203,13 +1202,15 @@ void ospf_vl_up_check(struct ospf_area *area, struct in_addr rid, if (ospf_vl_set_params(area, vl_data, v)) { if (IS_DEBUG_OSPF(ism, ISM_EVENTS)) zlog_debug( - "ospf_vl_up_check: VL cost change, scheduling router lsa refresh"); + "%s: VL cost change, scheduling router lsa refresh", + __func__); if (ospf->backbone) ospf_router_lsa_update_area( ospf->backbone); else if (IS_DEBUG_OSPF(ism, ISM_EVENTS)) zlog_debug( - "ospf_vl_up_check: VL cost change, no backbone!"); + "%s: VL cost change, no backbone!", + __func__); } } } -- 2.39.5