Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #9085 from mobash-rasool/pim-upst-4 

pimd: memory leak fix and issue fix
This commit is contained in:
Donald Sharp 2021-08-03 21:21:14 -04:00 committed by GitHub
parent 761704b370 906640dbaf
commit 5504fee4a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pimd/pim_ifchannel.c
View File

@ -1232,6 +1232,16 @@ int pim_ifchannel_local_membership_add(struct interface *ifp,
__FILE__, __func__, child->sg_str,
ifp->name, up->sg_str);
if (!child->rpf.source_nexthop.interface) {
/* when iif unknown, do not inherit */
if (PIM_DEBUG_EVENTS)
zlog_debug(
"Skipped (S,G)=%s(%s) from %s: no iif",
child->sg_str, ifp->name,
up->sg_str);
continue;
}
ch = pim_ifchannel_find(ifp, &child->sg);
if (pim_upstream_evaluate_join_desired_interface(
child, ch, starch)) {

5
pimd/pim_rp.c
View File

@ -139,11 +139,12 @@ void pim_rp_init(struct pim_instance *pim)
void pim_rp_free(struct pim_instance *pim)
{
if (pim->rp_list)
list_delete(&pim->rp_list);
if (pim->rp_table)
route_table_finish(pim->rp_table);
pim->rp_table = NULL;
if (pim->rp_list)
list_delete(&pim->rp_list);
}
/*