Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #18714 from FRRouting/mergify/bp/stable/10.3/pr-18672
Some checks failed
build-test / Build the x86 ubuntu 22.04 docker image (push) Has been cancelled
Details
build-test / Test ubuntu x86 docker image (push) Has been cancelled
Details
build-test / Build the ARM ubuntu 22.04 docker image (push) Has been cancelled
Details
build-test / Test ubuntu ARM docker image (push) Has been cancelled
Details

Browse source 
pimd: Fix for crash during networking restart (backport #18672)
This commit is contained in:
Donald Sharp 2025-04-24 10:00:39 -04:00 committed by GitHub
parent 8efa737e79 ba720c16d6
commit 4608ce8465
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pimd/pim_instance.c
View file

@ -271,6 +271,8 @@ void pim_vrf_terminate(void)
}
vrf_terminate();
/* Delete the vxlan_info.work_list as all the VRFs are deleted*/
pim_vxlan_work_list_delete();
}
bool pim_msdp_log_neighbor_events(const struct pim_instance *pim)

7
pimd/pim_vxlan.c
View file

@ -1249,9 +1249,14 @@ void pim_vxlan_exit(struct pim_instance *pim)
{
hash_clean_and_free(&pim->vxlan.sg_hash,
(void (*)(void *))pim_vxlan_sg_del_item);
}
if (vxlan_info.work_list)
void pim_vxlan_work_list_delete(void)
{
if (vxlan_info.work_list) {
list_delete(&vxlan_info.work_list);
UNSET_FLAG(vxlan_info.flags, PIM_VXLANF_WORK_INITED);
}
}
void pim_vxlan_terminate(void)

1
pimd/pim_vxlan_instance.h
View file

@ -33,5 +33,6 @@ struct pim_vxlan_instance {
extern void pim_vxlan_init(struct pim_instance *pim);
extern void pim_vxlan_exit(struct pim_instance *pim);
void pim_vxlan_work_list_delete(void);
#endif /* PIM_VXLAN_INSTANCE_H */