mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-07 07:48:07 +00:00
Merge pull request #979 from donaldsharp/ifchannel_fix
pimd: Ensure cleanup of S,G on ifchannel failure to create
This commit is contained in:
commit
1208e7bca2
@ -553,6 +553,9 @@ struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp,
|
|||||||
"%s: could not attach upstream (S,G)=%s on interface %s",
|
"%s: could not attach upstream (S,G)=%s on interface %s",
|
||||||
__PRETTY_FUNCTION__, pim_str_sg_dump(sg), ifp->name);
|
__PRETTY_FUNCTION__, pim_str_sg_dump(sg), ifp->name);
|
||||||
|
|
||||||
|
if (ch->parent)
|
||||||
|
listnode_delete(ch->parent->sources, ch);
|
||||||
|
|
||||||
pim_ifchannel_remove_children(ch);
|
pim_ifchannel_remove_children(ch);
|
||||||
if (ch->sources)
|
if (ch->sources)
|
||||||
list_delete(ch->sources);
|
list_delete(ch->sources);
|
||||||
|
Loading…
Reference in New Issue
Block a user