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

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

Browse Source 
ospfd: changes for code maintainability
This commit is contained in:
Donatas Abraitis 2022-08-24 09:19:51 +03:00 committed by GitHub
commit e02865fe34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 57 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
ospfd/ospf_opaque.c
View File

@ -358,9 +358,8 @@ static struct list *ospf_get_opaque_funclist(uint8_t lsa_type)
funclist = ospf_opaque_type11_funclist; funclist = ospf_opaque_type11_funclist;
break; break;
default: default:
flog_warn(EC_OSPF_LSA_UNEXPECTED, flog_warn(EC_OSPF_LSA_UNEXPECTED, "%s: Unexpected LSA-type(%u)",
"ospf_get_opaque_funclist: Unexpected LSA-type(%u)", __func__, lsa_type);
lsa_type);
break; break;
} }
return funclist; return funclist;
@ -396,8 +395,8 @@ int ospf_register_opaque_functab(
if (functab->opaque_type == opaque_type) { if (functab->opaque_type == opaque_type) {
flog_warn( flog_warn(
EC_OSPF_LSA, EC_OSPF_LSA,
"ospf_register_opaque_functab: Duplicated entry?: lsa_type(%u), opaque_type(%u)", "%s: Duplicated entry?: lsa_type(%u), opaque_type(%u)",
lsa_type, opaque_type); __func__, lsa_type, opaque_type);
return -1; return -1;
} }
@ -565,10 +564,8 @@ register_opaque_info_per_type(struct ospf_opaque_functab *functab,
listnode_add(top->opaque_lsa_self, oipt); listnode_add(top->opaque_lsa_self, oipt);
break; break;
default: default:
flog_warn( flog_warn(EC_OSPF_LSA_UNEXPECTED, "%s: Unexpected LSA-type(%u)",
EC_OSPF_LSA_UNEXPECTED, __func__, new->data->type);
"register_opaque_info_per_type: Unexpected LSA-type(%u)",
new->data->type);
free_opaque_info_per_type(oipt, true); free_opaque_info_per_type(oipt, true);
oipt = NULL; oipt = NULL;
goto out; /* This case may not exist. */ goto out; /* This case may not exist. */
@ -675,9 +672,8 @@ lookup_opaque_info_by_type(struct ospf_lsa *lsa)
listtop = top->opaque_lsa_self; listtop = top->opaque_lsa_self;
break; break;
default: default:
flog_warn(EC_OSPF_LSA_UNEXPECTED, flog_warn(EC_OSPF_LSA_UNEXPECTED, "%s: Unexpected LSA-type(%u)",
"lookup_opaque_info_by_type: Unexpected LSA-type(%u)", __func__, lsa->data->type);
lsa->data->type);
break; break;
} }
@ -1303,16 +1299,14 @@ void ospf_opaque_lsa_originate_schedule(struct ospf_interface *oi, int *delay0)
if ((top = oi_to_top(oi)) == NULL || (area = oi->area) == NULL) { if ((top = oi_to_top(oi)) == NULL || (area = oi->area) == NULL) {
if (IS_DEBUG_OSPF_EVENT) if (IS_DEBUG_OSPF_EVENT)
zlog_debug( zlog_debug("%s: Invalid argument?", __func__);
"ospf_opaque_lsa_originate_schedule: Invalid argument?");
return; return;
} }
/* It may not a right time to schedule origination now. */ /* It may not a right time to schedule origination now. */
if (!CHECK_FLAG(top->opaque, OPAQUE_OPERATION_READY_BIT)) { if (!CHECK_FLAG(top->opaque, OPAQUE_OPERATION_READY_BIT)) {
if (IS_DEBUG_OSPF_EVENT) if (IS_DEBUG_OSPF_EVENT)
zlog_debug( zlog_debug("%s: Not operational.", __func__);
"ospf_opaque_lsa_originate_schedule: Not operational.");
return; /* This is not an error. */ return; /* This is not an error. */
} }
@ -1529,10 +1523,8 @@ static void ospf_opaque_lsa_reoriginate_resume(struct list *listtop, void *arg)
continue; continue;
if ((*functab->lsa_originator)(arg) != 0) { if ((*functab->lsa_originator)(arg) != 0) {
flog_warn( flog_warn(EC_OSPF_LSA, "%s: Failed (opaque-type=%u)",
EC_OSPF_LSA, __func__, oipt->opaque_type);
"ospf_opaque_lsa_reoriginate_resume: Failed (opaque-type=%u)",
oipt->opaque_type);
continue; continue;
} }
} }
@ -1570,8 +1562,7 @@ struct ospf_lsa *ospf_opaque_lsa_install(struct ospf_lsa *lsa, int rt_recalc)
} }
/* Register the new lsa entry */ /* Register the new lsa entry */
else if (register_opaque_lsa(lsa) == NULL) { else if (register_opaque_lsa(lsa) == NULL) {
flog_warn(EC_OSPF_LSA, flog_warn(EC_OSPF_LSA, "%s: register_opaque_lsa() ?", __func__);
"ospf_opaque_lsa_install: register_opaque_lsa() ?");
goto out; goto out;
} }
@ -1583,16 +1574,16 @@ struct ospf_lsa *ospf_opaque_lsa_install(struct ospf_lsa *lsa, int rt_recalc)
case OSPF_OPAQUE_LINK_LSA: case OSPF_OPAQUE_LINK_LSA:
if ((top = oi_to_top(lsa->oi)) == NULL) { if ((top = oi_to_top(lsa->oi)) == NULL) {
/* Above conditions must have passed. */ /* Above conditions must have passed. */
flog_warn(EC_OSPF_LSA, flog_warn(EC_OSPF_LSA, "%s: Something wrong?",
"ospf_opaque_lsa_install: Something wrong?"); __func__);
goto out; goto out;
} }
break; break;
case OSPF_OPAQUE_AREA_LSA: case OSPF_OPAQUE_AREA_LSA:
if (lsa->area == NULL || (top = lsa->area->ospf) == NULL) { if (lsa->area == NULL || (top = lsa->area->ospf) == NULL) {
/* Above conditions must have passed. */ /* Above conditions must have passed. */
flog_warn(EC_OSPF_LSA, flog_warn(EC_OSPF_LSA, "%s: Something wrong?",
"ospf_opaque_lsa_install: Something wrong?"); __func__);
goto out; goto out;
} }
break; break;
@ -1600,15 +1591,14 @@ struct ospf_lsa *ospf_opaque_lsa_install(struct ospf_lsa *lsa, int rt_recalc)
top = ospf_lookup_by_vrf_id(lsa->vrf_id); top = ospf_lookup_by_vrf_id(lsa->vrf_id);
if (lsa->area != NULL && (top = lsa->area->ospf) == NULL) { if (lsa->area != NULL && (top = lsa->area->ospf) == NULL) {
/* Above conditions must have passed. */ /* Above conditions must have passed. */
flog_warn(EC_OSPF_LSA, flog_warn(EC_OSPF_LSA, "%s: Something wrong?",
"ospf_opaque_lsa_install: Something wrong?"); __func__);
goto out; goto out;
} }
break; break;
default: default:
flog_warn(EC_OSPF_LSA_UNEXPECTED, flog_warn(EC_OSPF_LSA_UNEXPECTED, "%s: Unexpected LSA-type(%u)",
"ospf_opaque_lsa_install: Unexpected LSA-type(%u)", __func__, lsa->data->type);
lsa->data->type);
goto out; goto out;
} }
@ -1679,16 +1669,14 @@ void ospf_opaque_lsa_reoriginate_schedule(void *lsa_type_dependent,
case OSPF_OPAQUE_LINK_LSA: case OSPF_OPAQUE_LINK_LSA:
if ((oi = (struct ospf_interface *)lsa_type_dependent) if ((oi = (struct ospf_interface *)lsa_type_dependent)
== NULL) { == NULL) {
flog_warn( flog_warn(EC_OSPF_LSA,
EC_OSPF_LSA, "%s: Type-9 Opaque-LSA: Invalid parameter?",
"ospf_opaque_lsa_reoriginate_schedule: Type-9 Opaque-LSA: Invalid parameter?"); __func__);
goto out; goto out;
} }
if ((top = oi_to_top(oi)) == NULL) { if ((top = oi_to_top(oi)) == NULL) {
flog_warn( flog_warn(EC_OSPF_LSA, "%s: OI(%s) -> TOP?", __func__,
EC_OSPF_LSA, IF_NAME(oi));
"ospf_opaque_lsa_reoriginate_schedule: OI(%s) -> TOP?",
IF_NAME(oi));
goto out; goto out;
} }
if (!list_isempty(ospf_opaque_type9_funclist) if (!list_isempty(ospf_opaque_type9_funclist)
@ -1704,16 +1692,14 @@ void ospf_opaque_lsa_reoriginate_schedule(void *lsa_type_dependent,
break; break;
case OSPF_OPAQUE_AREA_LSA: case OSPF_OPAQUE_AREA_LSA:
if ((area = (struct ospf_area *)lsa_type_dependent) == NULL) { if ((area = (struct ospf_area *)lsa_type_dependent) == NULL) {
flog_warn( flog_warn(EC_OSPF_LSA,
EC_OSPF_LSA, "%s: Type-10 Opaque-LSA: Invalid parameter?",
"ospf_opaque_lsa_reoriginate_schedule: Type-10 Opaque-LSA: Invalid parameter?"); __func__);
goto out; goto out;
} }
if ((top = area->ospf) == NULL) { if ((top = area->ospf) == NULL) {
flog_warn( flog_warn(EC_OSPF_LSA, "%s: AREA(%pI4) -> TOP?",
EC_OSPF_LSA, __func__, &area->area_id);
"ospf_opaque_lsa_reoriginate_schedule: AREA(%pI4) -> TOP?",
&area->area_id);
goto out; goto out;
} }
if (!list_isempty(ospf_opaque_type10_funclist) if (!list_isempty(ospf_opaque_type10_funclist)
@ -1729,9 +1715,9 @@ void ospf_opaque_lsa_reoriginate_schedule(void *lsa_type_dependent,
break; break;
case OSPF_OPAQUE_AS_LSA: case OSPF_OPAQUE_AS_LSA:
if ((top = (struct ospf *)lsa_type_dependent) == NULL) { if ((top = (struct ospf *)lsa_type_dependent) == NULL) {
flog_warn( flog_warn(EC_OSPF_LSA,
EC_OSPF_LSA, "%s: Type-11 Opaque-LSA: Invalid parameter?",
"ospf_opaque_lsa_reoriginate_schedule: Type-11 Opaque-LSA: Invalid parameter?"); __func__);
goto out; goto out;
} }
if (!list_isempty(ospf_opaque_type11_funclist) if (!list_isempty(ospf_opaque_type11_funclist)
@ -1751,18 +1737,15 @@ void ospf_opaque_lsa_reoriginate_schedule(void *lsa_type_dependent,
func = ospf_opaque_type11_lsa_reoriginate_timer; func = ospf_opaque_type11_lsa_reoriginate_timer;
break; break;
default: default:
flog_warn( flog_warn(EC_OSPF_LSA_UNEXPECTED, "%s: Unexpected LSA-type(%u)",
EC_OSPF_LSA_UNEXPECTED, __func__, lsa_type);
"ospf_opaque_lsa_reoriginate_schedule: Unexpected LSA-type(%u)",
lsa_type);
goto out; goto out;
} }
/* It may not a right time to schedule reorigination now. */ /* It may not a right time to schedule reorigination now. */
if (!CHECK_FLAG(top->opaque, OPAQUE_OPERATION_READY_BIT)) { if (!CHECK_FLAG(top->opaque, OPAQUE_OPERATION_READY_BIT)) {
if (IS_DEBUG_OSPF_EVENT) if (IS_DEBUG_OSPF_EVENT)
zlog_debug( zlog_debug("%s: Not operational.", __func__);
"ospf_opaque_lsa_reoriginate_schedule: Not operational.");
goto out; /* This is not an error. */ goto out; /* This is not an error. */
} }
@ -1775,16 +1758,16 @@ void ospf_opaque_lsa_reoriginate_schedule(void *lsa_type_dependent,
if ((functab = ospf_opaque_functab_lookup(lsa)) == NULL) { if ((functab = ospf_opaque_functab_lookup(lsa)) == NULL) {
flog_warn( flog_warn(
EC_OSPF_LSA, EC_OSPF_LSA,
"ospf_opaque_lsa_reoriginate_schedule: No associated function?: lsa_type(%u), opaque_type(%u)", "%s: No associated function?: lsa_type(%u), opaque_type(%u)",
lsa_type, opaque_type); __func__, lsa_type, opaque_type);
goto out; goto out;
} }
if ((oipt = register_opaque_info_per_type(functab, lsa)) if ((oipt = register_opaque_info_per_type(functab, lsa))
== NULL) { == NULL) {
flog_warn( flog_warn(
EC_OSPF_LSA, EC_OSPF_LSA,
"ospf_opaque_lsa_reoriginate_schedule: Cannot get a control info?: lsa_type(%u), opaque_type(%u)", "%s: Cannot get a control info?: lsa_type(%u), opaque_type(%u)",
lsa_type, opaque_type); __func__, lsa_type, opaque_type);
goto out; goto out;
} }
} }
@ -1850,17 +1833,13 @@ static void ospf_opaque_type9_lsa_reoriginate_timer(struct thread *t)
if ((functab = oipt->functab) == NULL if ((functab = oipt->functab) == NULL
|| functab->lsa_originator == NULL) { || functab->lsa_originator == NULL) {
flog_warn( flog_warn(EC_OSPF_LSA, "%s: No associated function?", __func__);
EC_OSPF_LSA,
"ospf_opaque_type9_lsa_reoriginate_timer: No associated function?");
return; return;
} }
oi = (struct ospf_interface *)oipt->owner; oi = (struct ospf_interface *)oipt->owner;
if ((top = oi_to_top(oi)) == NULL) { if ((top = oi_to_top(oi)) == NULL) {
flog_warn( flog_warn(EC_OSPF_LSA, "%s: Something wrong?", __func__);
EC_OSPF_LSA,
"ospf_opaque_type9_lsa_reoriginate_timer: Something wrong?");
return; return;
} }
@ -1898,17 +1877,13 @@ static void ospf_opaque_type10_lsa_reoriginate_timer(struct thread *t)
if ((functab = oipt->functab) == NULL if ((functab = oipt->functab) == NULL
|| functab->lsa_originator == NULL) { || functab->lsa_originator == NULL) {
flog_warn( flog_warn(EC_OSPF_LSA, "%s: No associated function?", __func__);
EC_OSPF_LSA,
"ospf_opaque_type10_lsa_reoriginate_timer: No associated function?");
return; return;
} }
area = (struct ospf_area *)oipt->owner; area = (struct ospf_area *)oipt->owner;
if (area == NULL || (top = area->ospf) == NULL) { if (area == NULL || (top = area->ospf) == NULL) {
flog_warn( flog_warn(EC_OSPF_LSA, "%s: Something wrong?", __func__);
EC_OSPF_LSA,
"ospf_opaque_type10_lsa_reoriginate_timer: Something wrong?");
return; return;
} }
@ -1947,16 +1922,12 @@ static void ospf_opaque_type11_lsa_reoriginate_timer(struct thread *t)
if ((functab = oipt->functab) == NULL if ((functab = oipt->functab) == NULL
|| functab->lsa_originator == NULL) { || functab->lsa_originator == NULL) {
flog_warn( flog_warn(EC_OSPF_LSA, "%s: No associated function?", __func__);
EC_OSPF_LSA,
"ospf_opaque_type11_lsa_reoriginate_timer: No associated function?");
return; return;
} }
if ((top = (struct ospf *)oipt->owner) == NULL) { if ((top = (struct ospf *)oipt->owner) == NULL) {
flog_warn( flog_warn(EC_OSPF_LSA, "%s: Something wrong?", __func__);
EC_OSPF_LSA,
"ospf_opaque_type11_lsa_reoriginate_timer: Something wrong?");
return; return;
} }
@ -1988,16 +1959,13 @@ void ospf_opaque_lsa_refresh_schedule(struct ospf_lsa *lsa0)
if ((oipt = lookup_opaque_info_by_type(lsa0)) == NULL if ((oipt = lookup_opaque_info_by_type(lsa0)) == NULL
|| (oipi = lookup_opaque_info_by_id(oipt, lsa0)) == NULL) { || (oipi = lookup_opaque_info_by_id(oipt, lsa0)) == NULL) {
flog_warn( flog_warn(EC_OSPF_LSA, "%s: Invalid parameter?", __func__);
EC_OSPF_LSA,
"ospf_opaque_lsa_refresh_schedule: Invalid parameter?");
goto out; goto out;
} }
/* Given "lsa0" and current "oipi->lsa" may different, but harmless. */ /* Given "lsa0" and current "oipi->lsa" may different, but harmless. */
if ((lsa = oipi->lsa) == NULL) { if ((lsa = oipi->lsa) == NULL) {
flog_warn(EC_OSPF_LSA, flog_warn(EC_OSPF_LSA, "%s: Something wrong?", __func__);
"ospf_opaque_lsa_refresh_schedule: Something wrong?");
goto out; goto out;
} }
@ -2024,10 +1992,8 @@ void ospf_opaque_lsa_refresh_schedule(struct ospf_lsa *lsa0)
ospf_ls_retransmit_delete_nbr_as(top, lsa); ospf_ls_retransmit_delete_nbr_as(top, lsa);
break; break;
default: default:
flog_warn( flog_warn(EC_OSPF_LSA_UNEXPECTED, "%s: Unexpected LSA-type(%u)",
EC_OSPF_LSA_UNEXPECTED, __func__, lsa->data->type);
"ospf_opaque_lsa_refresh_schedule: Unexpected LSA-type(%u)",
lsa->data->type);
goto out; goto out;
} }
@ -2074,15 +2040,13 @@ void ospf_opaque_lsa_flush_schedule(struct ospf_lsa *lsa0)
if ((oipt = lookup_opaque_info_by_type(lsa0)) == NULL if ((oipt = lookup_opaque_info_by_type(lsa0)) == NULL
|| (oipi = lookup_opaque_info_by_id(oipt, lsa0)) == NULL) { || (oipi = lookup_opaque_info_by_id(oipt, lsa0)) == NULL) {
flog_warn(EC_OSPF_LSA, flog_warn(EC_OSPF_LSA, "%s: Invalid parameter?", __func__);
"ospf_opaque_lsa_flush_schedule: Invalid parameter?");
goto out; goto out;
} }
/* Given "lsa0" and current "oipi->lsa" may different, but harmless. */ /* Given "lsa0" and current "oipi->lsa" may different, but harmless. */
if ((lsa = oipi->lsa) == NULL) { if ((lsa = oipi->lsa) == NULL) {
flog_warn(EC_OSPF_LSA, flog_warn(EC_OSPF_LSA, "%s: Something wrong?", __func__);
"ospf_opaque_lsa_flush_schedule: Something wrong?");
goto out; goto out;
} }
@ -2098,10 +2062,8 @@ void ospf_opaque_lsa_flush_schedule(struct ospf_lsa *lsa0)
ospf_ls_retransmit_delete_nbr_as(top, lsa); ospf_ls_retransmit_delete_nbr_as(top, lsa);
break; break;
default: default:
flog_warn( flog_warn(EC_OSPF_LSA_UNEXPECTED, "%s: Unexpected LSA-type(%u)",
EC_OSPF_LSA_UNEXPECTED, __func__, lsa->data->type);
"ospf_opaque_lsa_flush_schedule: Unexpected LSA-type(%u)",
lsa->data->type);
goto out; goto out;
} }
@ -2154,10 +2116,8 @@ void ospf_opaque_self_originated_lsa_received(struct ospf_neighbor *nbr,
ospf_flood_through_as(top, NULL /*inbr*/, lsa); ospf_flood_through_as(top, NULL /*inbr*/, lsa);
break; break;
default: default:
flog_warn( flog_warn(EC_OSPF_LSA_UNEXPECTED, "%s: Unexpected LSA-type(%u)",
EC_OSPF_LSA_UNEXPECTED, __func__, lsa->data->type);
"ospf_opaque_self_originated_lsa_received: Unexpected LSA-type(%u)",
lsa->data->type);
return; return;
} }
ospf_lsa_discard(lsa); /* List "lsas" will be deleted by caller. */ ospf_lsa_discard(lsa); /* List "lsas" will be deleted by caller. */