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

ospfd: Fix ships in the night PR's and list_delete

Browse Source 
list_delete_and_null should be used.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-10-10 13:33:14 -04:00
parent 6bab451dcd
commit 84519c8164
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ospfd/ospfd.c
View File

@ -634,7 +634,7 @@ static void ospf_finish_final(struct ospf *ospf)
/* Reset interface. */ /* Reset interface. */
for (ALL_LIST_ELEMENTS(ospf->oiflist, node, nnode, oi)) for (ALL_LIST_ELEMENTS(ospf->oiflist, node, nnode, oi))
ospf_if_free(oi); ospf_if_free(oi);
list_delete(ospf->oiflist); list_delete_and_null(&ospf->oiflist);
/* De-Register VRF */ /* De-Register VRF */
ospf_zebra_vrf_deregister(ospf); ospf_zebra_vrf_deregister(ospf);
@ -769,7 +769,7 @@ static void ospf_finish_final(struct ospf *ospf)
if (!CHECK_FLAG(om->options, OSPF_MASTER_SHUTDOWN)) if (!CHECK_FLAG(om->options, OSPF_MASTER_SHUTDOWN))
instance = ospf->instance; instance = ospf->instance;
list_delete(ospf->oi_write_q); list_delete_and_null(&ospf->oi_write_q);
ospf_delete(ospf); ospf_delete(ospf);