mirror of https://github.com/FRRouting/frr.git
Merge pull request #9085 from mobash-rasool/pim-upst-4
pimd: memory leak fix and issue fix
This commit is contained in:
commit
5504fee4a3
|
@ -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)) {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue