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 <anuradhak@cumulusnetworks.com>

diff --git a/pimd/pim_vxlan.c b/pimd/pim_vxlan.c
index abfea538e1efd95478e3cbe7f56e5b1b53069715..5c085cc4160eae3ea956f31896cb46a49d4f6f8e 100644 (file)
--- 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,