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

ospfd: Convert ospf_sr.c to use error-card subsystem.

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-08-21 09:46:53 -04:00 committed by Quentin Young
parent 668e8a1183
commit dbb93f1b90
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ospfd/ospf_sr.c
View File

@ -1099,7 +1099,7 @@ void ospf_sr_ri_lsa_update(struct ospf_lsa *lsa)
if (OspfSR.neighbors == NULL) { if (OspfSR.neighbors == NULL) {
flog_err(OSPF_ERR_SR_INVALID_DB, flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Abort! no valid SR DataBase", __func__); "SR (%s): Abort! no valid SR DataBase", __func__);
return; return;
} }
@ -1163,8 +1163,9 @@ void ospf_sr_ri_lsa_update(struct ospf_lsa *lsa)
/* Check that we collect mandatory parameters */ /* Check that we collect mandatory parameters */
if (srn->algo[0] == SR_ALGORITHM_UNSET || srgb.range_size == 0 if (srn->algo[0] == SR_ALGORITHM_UNSET || srgb.range_size == 0
|| srgb.lower_bound == 0) { || srgb.lower_bound == 0) {
zlog_warn("SR (%s): Missing mandatory parameters. Abort!", flog_err(OSPF_ERR_SR_NODE_CREATE,
__func__); "SR (%s): Missing mandatory parameters. Abort!",
__func__);
hash_release(OspfSR.neighbors, &(srn->adv_router)); hash_release(OspfSR.neighbors, &(srn->adv_router));
XFREE(MTYPE_OSPF_SR_PARAMS, srn); XFREE(MTYPE_OSPF_SR_PARAMS, srn);
return; return;
@ -1210,7 +1211,7 @@ void ospf_sr_ri_lsa_delete(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (OspfSR.neighbors == NULL) { if (OspfSR.neighbors == NULL) {
flog_err(OSPF_ERR_SR_INVALID_DB, flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Abort! no valid SR Data Base", __func__); "SR (%s): Abort! no valid SR Data Base", __func__);
return; return;
} }
@ -1257,7 +1258,7 @@ void ospf_sr_ext_link_lsa_update(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (OspfSR.neighbors == NULL) { if (OspfSR.neighbors == NULL) {
flog_err(OSPF_ERR_SR_INVALID_DB, flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Abort! no valid SR DataBase", __func__); "SR (%s): Abort! no valid SR DataBase", __func__);
return; return;
} }
@ -1309,7 +1310,7 @@ void ospf_sr_ext_link_lsa_delete(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (OspfSR.neighbors == NULL) { if (OspfSR.neighbors == NULL) {
flog_err(OSPF_ERR_SR_INVALID_DB, flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Abort! no valid SR DataBase", __func__); "SR (%s): Abort! no valid SR DataBase", __func__);
return; return;
} }
@ -1322,8 +1323,9 @@ void ospf_sr_ext_link_lsa_delete(struct ospf_lsa *lsa)
* processing Router Information LSA deletion * processing Router Information LSA deletion
*/ */
if (srn == NULL) { if (srn == NULL) {
zlog_warn("SR (%s): Stop! no entry in SRDB for SR Node %s", flog_err(OSPF_ERR_SR_INVALID_DB,
__func__, inet_ntoa(lsah->adv_router)); "SR (%s): Stop! no entry in SRDB for SR Node %s",
__func__, inet_ntoa(lsah->adv_router));
return; return;
} }
@ -1339,11 +1341,11 @@ void ospf_sr_ext_link_lsa_delete(struct ospf_lsa *lsa)
listnode_delete(srn->ext_link, srl); listnode_delete(srn->ext_link, srl);
XFREE(MTYPE_OSPF_SR_PARAMS, srl); XFREE(MTYPE_OSPF_SR_PARAMS, srl);
} else { } else {
zlog_warn( flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Didn't found corresponding SR Link 8.0.0.%u " "SR (%s): Didn't found corresponding SR Link 8.0.0.%u "
"for SR Node %s", "for SR Node %s",
__func__, GET_OPAQUE_ID(ntohl(lsah->id.s_addr)), __func__, GET_OPAQUE_ID(ntohl(lsah->id.s_addr)),
inet_ntoa(lsah->adv_router)); inet_ntoa(lsah->adv_router));
} }
} }
@ -1367,7 +1369,7 @@ void ospf_sr_ext_prefix_lsa_update(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (OspfSR.neighbors == NULL) { if (OspfSR.neighbors == NULL) {
flog_err(OSPF_ERR_SR_INVALID_DB, flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Abort! no valid SR DataBase", __func__); "SR (%s): Abort! no valid SR DataBase", __func__);
return; return;
} }
@ -1379,8 +1381,8 @@ void ospf_sr_ext_prefix_lsa_update(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (srn == NULL) { if (srn == NULL) {
flog_err(OSPF_ERR_SR_NODE_CREATE, flog_err(OSPF_ERR_SR_NODE_CREATE,
"SR (%s): Abort! can't create SR node in hash table", "SR (%s): Abort! can't create SR node in hash table",
__func__); __func__);
return; return;
} }
@ -1420,7 +1422,7 @@ void ospf_sr_ext_prefix_lsa_delete(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (OspfSR.neighbors == NULL) { if (OspfSR.neighbors == NULL) {
flog_err(OSPF_ERR_SR_INVALID_DB, flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Abort! no valid SR DataBase", __func__); "SR (%s): Abort! no valid SR DataBase", __func__);
return; return;
} }
@ -1433,8 +1435,9 @@ void ospf_sr_ext_prefix_lsa_delete(struct ospf_lsa *lsa)
* processing Router Information LSA deletion * processing Router Information LSA deletion
*/ */
if (srn == NULL) { if (srn == NULL) {
zlog_warn("SR (%s): Stop! no entry in SRDB for SR Node %s", flog_err(OSPF_ERR_SR_INVALID_DB,
__func__, inet_ntoa(lsah->adv_router)); "SR (%s): Stop! no entry in SRDB for SR Node %s",
__func__, inet_ntoa(lsah->adv_router));
return; return;
} }
@ -1449,9 +1452,9 @@ void ospf_sr_ext_prefix_lsa_delete(struct ospf_lsa *lsa)
listnode_delete(srn->ext_link, srp); listnode_delete(srn->ext_link, srp);
XFREE(MTYPE_OSPF_SR_PARAMS, srp); XFREE(MTYPE_OSPF_SR_PARAMS, srp);
} else { } else {
zlog_warn( flog_err(
"SR (%s): Didn't found corresponding SR Prefix " OSPF_ERR_SR_INVALID_DB,
"7.0.0.%u for SR Node %s", "SR (%s): Didn't found corresponding SR Prefix 7.0.0.%u for SR Node %s",
__func__, GET_OPAQUE_ID(ntohl(lsah->id.s_addr)), __func__, GET_OPAQUE_ID(ntohl(lsah->id.s_addr)),
inet_ntoa(lsah->adv_router)); inet_ntoa(lsah->adv_router));
} }