From 664b2a31d62ecaa966bac39ac1243f0b59977dee Mon Sep 17 00:00:00 2001 From: Anuradha Karuppiah Date: Thu, 6 Feb 2020 09:30:48 -0800 Subject: [PATCH] pimd: force update inherited OIL when vxlan local membership is created When local member is added the (*, G) entry may already be in a JOINED state. In that case the OIL is not updated i.e. pim_channel_add_oif is not happening for ipmr-lo. Because of this the traffic associated with the multicast vxlan tunnel is pulled down to the VTEP but not terminated by the kernel. This change force updates the OIL anytime ipmr-lo is added or removed as a local member. Signed-off-by: Anuradha Karuppiah --- pimd/pim_vxlan.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pimd/pim_vxlan.c b/pimd/pim_vxlan.c index abfea538e1..5c085cc416 100644 --- a/pimd/pim_vxlan.c +++ b/pimd/pim_vxlan.c @@ -533,6 +533,13 @@ static void pim_vxlan_term_mr_oif_add(struct pim_vxlan_sg *vxlan_sg) if (pim_ifchannel_local_membership_add(vxlan_sg->term_oif, &vxlan_sg->sg)) { vxlan_sg->flags |= PIM_VXLAN_SGF_OIF_INSTALLED; + /* update the inherited OIL */ + /* XXX - I don't see the inherited OIL updated when a local + * member is added. And that probably needs to be fixed. Till + * that happens we do a force update on the inherited OIL + * here. + */ + pim_upstream_inherited_olist(vxlan_sg->pim, vxlan_sg->up); } else { zlog_warn("vxlan SG %s term-oif %s add failed", vxlan_sg->sg_str, vxlan_sg->term_oif->name); @@ -550,6 +557,12 @@ static void pim_vxlan_term_mr_oif_del(struct pim_vxlan_sg *vxlan_sg) vxlan_sg->flags &= ~PIM_VXLAN_SGF_OIF_INSTALLED; pim_ifchannel_local_membership_del(vxlan_sg->term_oif, &vxlan_sg->sg); + /* update the inherited OIL */ + /* XXX - I don't see the inherited OIL updated when a local member + * is deleted. And that probably needs to be fixed. Till that happens + * we do a force update on the inherited OIL here. + */ + pim_upstream_inherited_olist(vxlan_sg->pim, vxlan_sg->up); } static void pim_vxlan_update_sg_entry_mlag(struct pim_instance *pim, -- 2.39.5