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

Merge pull request #1323 from donaldsharp/ospf_list_delete

Browse Source 
ospfd: Fix ships in the night PR's and list_delete
This commit is contained in:
Renato Westphal 2017-10-10 20:59:45 -03:00 committed by GitHub
commit 02caabb5bb
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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);
@ -737,7 +737,6 @@ static void ospf_finish_final(struct ospf *ospf)
list_delete_and_null(&ospf->areas); list_delete_and_null(&ospf->areas);
list_delete_and_null(&ospf->oi_write_q); list_delete_and_null(&ospf->oi_write_q);
list_delete_and_null(&ospf->oiflist);
for (i = ZEBRA_ROUTE_SYSTEM; i <= ZEBRA_ROUTE_MAX; i++) { for (i = ZEBRA_ROUTE_SYSTEM; i <= ZEBRA_ROUTE_MAX; i++) {
struct list *ext_list; struct list *ext_list;
@ -769,8 +768,6 @@ 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);
ospf_delete(ospf); ospf_delete(ospf);
if (ospf->name) { if (ospf->name) {