mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-04 08:21:42 +00:00
pim6d: fix crash on clear ipv6 mroute
Fix crash on `clear ipv6 mroute` when using embedded RP. Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
This commit is contained in:
parent
ccb57ad10f
commit
3b0b1adad7
@ -449,7 +449,7 @@ static void gm_sg_update(struct gm_sg *sg, bool has_expired)
|
||||
* this data structure.
|
||||
*/
|
||||
if (sg->oil)
|
||||
pim_channel_oil_del(sg->oil, __func__);
|
||||
sg->oil = pim_channel_oil_del(sg->oil, __func__);
|
||||
|
||||
/* multiple paths can lead to the last state going away;
|
||||
* t_sg_expire can still be running if we're arriving from
|
||||
|
@ -115,13 +115,8 @@ bool tib_sg_gm_join(struct pim_instance *pim, pim_sgaddr sg,
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!*oilp) {
|
||||
if (!*oilp)
|
||||
*oilp = tib_sg_oil_setup(pim, sg, oif);
|
||||
#if PIM_IPV == 6
|
||||
if (pim_embedded_rp_is_embedded(&sg.grp))
|
||||
(*oilp)->oil_ref_count--;
|
||||
#endif /* PIM_IPV == 6 */
|
||||
}
|
||||
if (!*oilp)
|
||||
return false;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user