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

Merge pull request #11867 from sri-mohan1/sri-ospf-dbg1

Browse Source 
ospfd: changes for code maintainability
This commit is contained in:
mobash-rasool 2022-08-29 11:50:54 +05:30 committed by GitHub
commit 6c231c2e38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ospfd/ospf_ase.c
View File

@ -212,12 +212,12 @@ int ospf_ase_calculate_route(struct ospf *ospf, struct ospf_lsa *lsa)
if (lsa->data->type == OSPF_AS_NSSA_LSA)
if (IS_DEBUG_OSPF_NSSA)
zlog_debug("ospf_ase_calc(): Processing Type-7");
zlog_debug("%s: Processing Type-7", __func__);
/* Stay away from any Local Translated Type-7 LSAs */
if (CHECK_FLAG(lsa->flags, OSPF_LSA_LOCAL_XLT)) {
if (IS_DEBUG_OSPF_NSSA)
zlog_debug("ospf_ase_calc(): Rejecting Local Xlt'd");
zlog_debug("%s: Rejecting Local Xlt'd", __func__);
return 0;
}
@ -589,9 +589,8 @@ static void ospf_ase_calculate_timer(struct thread *t)
if (ospf->anyNSSA)
for (ALL_LIST_ELEMENTS_RO(ospf->areas, node, area)) {
if (IS_DEBUG_OSPF_NSSA)
zlog_debug(
"ospf_ase_calculate_timer(): looking at area %pI4",
&area->area_id);
zlog_debug("%s: looking at area %pI4",
__func__, &area->area_id);
if (area->external_routing == OSPF_AREA_NSSA)
LSDB_LOOP (NSSA_LSDB(area), rn, lsa)

3
ospfd/ospf_flood.c
View File

@ -804,8 +804,7 @@ int ospf_flood_through(struct ospf *ospf, struct ospf_neighbor *inbr,
/* Any P-bit was installed with the Type-7. */
if (IS_DEBUG_OSPF_NSSA)
zlog_debug(
"ospf_flood_through: LOCAL NSSA FLOOD of Type-7.");
zlog_debug("%s: LOCAL NSSA FLOOD of Type-7.", __func__);
/* Fallthrough */
default:
lsa_ack_flag = ospf_flood_through_area(lsa->area, inbr, lsa);

28
ospfd/ospf_spf.c
View File

@ -799,7 +799,7 @@ static unsigned int ospf_nexthop_calculation(struct ospf_area *area,
unsigned int added = 0;
if (IS_DEBUG_OSPF_EVENT) {
zlog_debug("ospf_nexthop_calculation(): Start");
zlog_debug("%s: Start", __func__);
ospf_vertex_dump("V (parent):", v, 1, 1);
ospf_vertex_dump("W (dest) :", w, 1, 1);
zlog_debug("V->W distance: %d", distance);
@ -1021,7 +1021,8 @@ static unsigned int ospf_nexthop_calculation(struct ospf_area *area,
return 1;
} else
zlog_info(
"ospf_nexthop_calculation(): vl_data for VL link not found");
"%s: vl_data for VL link not found",
__func__);
} /* end virtual-link from V to W */
return 0;
} /* end W is a Router vertex */
@ -1569,7 +1570,7 @@ static void ospf_spf_process_stubs(struct ospf_area *area, struct vertex *v,
struct vertex *child;
if (IS_DEBUG_OSPF_EVENT)
zlog_debug("ospf_process_stub():processing stubs for area %pI4",
zlog_debug("%s: processing stubs for area %pI4", __func__,
&area->area_id);
if (v->type == OSPF_VERTEX_ROUTER) {
@ -1580,16 +1581,14 @@ static void ospf_spf_process_stubs(struct ospf_area *area, struct vertex *v,
int lsa_pos = 0;
if (IS_DEBUG_OSPF_EVENT)
zlog_debug(
"ospf_process_stubs():processing router LSA, id: %pI4",
&v->lsa->id);
zlog_debug("%s: processing router LSA, id: %pI4",
__func__, &v->lsa->id);
router_lsa = (struct router_lsa *)v->lsa;
if (IS_DEBUG_OSPF_EVENT)
zlog_debug(
"ospf_process_stubs(): we have %d links to process",
ntohs(router_lsa->links));
zlog_debug("%s: we have %d links to process", __func__,
ntohs(router_lsa->links));
p = ((uint8_t *)v->lsa) + OSPF_LSA_HEADER_SIZE + 4;
lim = ((uint8_t *)v->lsa) + ntohs(v->lsa->length);
@ -1683,9 +1682,8 @@ void ospf_spf_calculate(struct ospf_area *area, struct ospf_lsa *root_lsa,
struct vertex *v;
if (IS_DEBUG_OSPF_EVENT) {
zlog_debug("ospf_spf_calculate: Start");
zlog_debug("ospf_spf_calculate: running Dijkstra for area %pI4",
&area->area_id);
zlog_debug("%s: Start: running Dijkstra for area %pI4",
__func__, &area->area_id);
}
/*
@ -1696,8 +1694,8 @@ void ospf_spf_calculate(struct ospf_area *area, struct ospf_lsa *root_lsa,
if (!root_lsa) {
if (IS_DEBUG_OSPF_EVENT)
zlog_debug(
"ospf_spf_calculate: Skip area %pI4's calculation due to empty root LSA",
&area->area_id);
"%s: Skip area %pI4's calculation due to empty root LSA",
__func__, &area->area_id);
return;
}
@ -1777,7 +1775,7 @@ void ospf_spf_calculate(struct ospf_area *area, struct ospf_lsa *root_lsa,
area->ts_spf = area->ospf->ts_spf;
if (IS_DEBUG_OSPF_EVENT)
zlog_debug("ospf_spf_calculate: Stop. %zd vertices",
zlog_debug("%s: Stop. %zd vertices", __func__,
mtype_stats_alloc(MTYPE_OSPF_VERTEX));
}