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

Merge pull request #16757 from mjstapp/fix_ospfd_dlist_sa

Browse Source 
ospfd: add assert to resolve SA warning
This commit is contained in:
Donald Sharp 2024-09-06 12:16:45 -04:00 committed by GitHub
commit 8d3d7644e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ospfd/ospf_flood.c
View File

@ -1094,8 +1094,13 @@ void ospf_ls_retransmit_add(struct ospf_neighbor *nbr, struct ospf_lsa *lsa)
if (ls_rxmt_node->lsa_list_entry == if (ls_rxmt_node->lsa_list_entry ==
ospf_lsa_list_first(&nbr->ls_rxmt_list)) ospf_lsa_list_first(&nbr->ls_rxmt_list))
rxmt_head_replaced = true; rxmt_head_replaced = true;
/* Keep SA happy */
assert(ls_rxmt_node->lsa_list_entry != NULL);
ospf_lsa_list_del(&nbr->ls_rxmt_list, ospf_lsa_list_del(&nbr->ls_rxmt_list,
ls_rxmt_node->lsa_list_entry); ls_rxmt_node->lsa_list_entry);
XFREE(MTYPE_OSPF_LSA_LIST, ls_rxmt_node->lsa_list_entry); XFREE(MTYPE_OSPF_LSA_LIST, ls_rxmt_node->lsa_list_entry);
ospf_lsdb_delete(&nbr->ls_rxmt, old); ospf_lsdb_delete(&nbr->ls_rxmt, old);
if (IS_DEBUG_OSPF(lsa, LSA_FLOODING)) if (IS_DEBUG_OSPF(lsa, LSA_FLOODING))
@ -1163,8 +1168,13 @@ void ospf_ls_retransmit_delete(struct ospf_neighbor *nbr, struct ospf_lsa *lsa)
rxmt_timer_reset = false; rxmt_timer_reset = false;
lsa->retransmit_counter--; lsa->retransmit_counter--;
/* Keep SA happy */
assert(ls_rxmt_node->lsa_list_entry != NULL);
ospf_lsa_list_del(&nbr->ls_rxmt_list, ospf_lsa_list_del(&nbr->ls_rxmt_list,
ls_rxmt_node->lsa_list_entry); ls_rxmt_node->lsa_list_entry);
XFREE(MTYPE_OSPF_LSA_LIST, ls_rxmt_node->lsa_list_entry); XFREE(MTYPE_OSPF_LSA_LIST, ls_rxmt_node->lsa_list_entry);
ospf_lsdb_delete(&nbr->ls_rxmt, lsa); ospf_lsdb_delete(&nbr->ls_rxmt, lsa);
if (IS_DEBUG_OSPF(lsa, LSA_FLOODING)) if (IS_DEBUG_OSPF(lsa, LSA_FLOODING))