From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sun, 17 Jul 2016 23:51:56 +0000 (-0400)
Subject: pimd: Add pim_channel_del_oif
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~379
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=887fa0149fbba33c702c949b9e0072faa53c98fb;p=matthieu%2Ffrr.git

pimd: Add pim_channel_del_oif

For a given interface remove the interface from the list
of outgoing interfaces for a mroute and reinstall it
into the kernel.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c
index 96f9ef2b62..d072c73dd8 100644
--- a/pimd/pim_oil.c
+++ b/pimd/pim_oil.c
@@ -142,6 +142,92 @@ void pim_channel_oil_del(struct channel_oil *c_oil)
   }
 }
 
+int
+pim_channel_del_oif (struct channel_oil *channel_oil,
+		     struct interface *oif,
+		     uint32_t proto_mask)
+{
+  struct pim_interface *pim_ifp;
+
+  zassert (channel_oil);
+  zassert (oif);
+
+  pim_ifp = oif->info;
+
+  if (PIM_DEBUG_MROUTE)
+    {
+      char group_str[100];
+      char source_str[100];
+      pim_inet4_dump("<group?>", channel_oil->oil.mfcc_mcastgrp, group_str, sizeof(group_str));
+      pim_inet4_dump("<source?>", channel_oil->oil.mfcc_origin, source_str, sizeof(source_str));
+      zlog_debug("%s %s: (S,G)=(%s,%s): proto_mask=%u OIF=%s vif_index=%d",
+		 __FILE__, __PRETTY_FUNCTION__,
+		 source_str, group_str,
+		 proto_mask, oif->name, pim_ifp->mroute_vif_index);
+    }
+
+  /*
+   * Don't do anything if we've been asked to remove a source
+   * that is not actually on it.
+   */
+  if (!(channel_oil->oif_flags[pim_ifp->mroute_vif_index] & proto_mask))
+    {
+      if (PIM_DEBUG_MROUTE)
+	{
+	  char group_str[100];
+	  char source_str[100];
+	  pim_inet4_dump("<group?>", channel_oil->oil.mfcc_mcastgrp, group_str, sizeof(group_str));
+	  pim_inet4_dump("<source?>", channel_oil->oil.mfcc_origin, source_str, sizeof(source_str));
+	  zlog_debug("%s %s: no existing protocol mask %u(%u) for requested OIF %s (vif_index=%d, min_ttl=%d) for channel (S,G)=(%s,%s)",
+		     __FILE__, __PRETTY_FUNCTION__,
+		     proto_mask, channel_oil->oif_flags[pim_ifp->mroute_vif_index],
+		     oif->name, pim_ifp->mroute_vif_index,
+		     channel_oil->oil.mfcc_ttls[pim_ifp->mroute_vif_index],
+		     source_str, group_str);
+	}
+      return 0;
+    }
+
+  channel_oil->oif_flags[pim_ifp->mroute_vif_index] &= ~proto_mask;
+
+  if (channel_oil->oif_flags[pim_ifp->mroute_vif_index])
+    {
+      if (PIM_DEBUG_MROUTE)
+	{
+	  char group_str[100];
+	  char source_str[100];
+	  pim_inet4_dump("<group?>", channel_oil->oil.mfcc_mcastgrp, group_str, sizeof(group_str));
+	  pim_inet4_dump("<source?>", channel_oil->oil.mfcc_origin, source_str, sizeof(source_str));
+	  zlog_debug("%s %s: other protocol masks remain for requested OIF %s (vif_index=%d, min_ttl=%d) for channel (S,G)=(%s,%s)",
+		     __FILE__, __PRETTY_FUNCTION__,
+		     oif->name, pim_ifp->mroute_vif_index,
+		     channel_oil->oil.mfcc_ttls[pim_ifp->mroute_vif_index],
+		     source_str, group_str);
+	}
+      return 0;
+    }
+
+  channel_oil->oil.mfcc_ttls[pim_ifp->mroute_vif_index] = 0;
+
+  if (pim_mroute_add (channel_oil)) {
+    if (PIM_DEBUG_MROUTE)
+      {
+        char group_str[100];
+        char source_str[100];
+        pim_inet4_dump("<group?>", channel_oil->oil.mfcc_mcastgrp, group_str, sizeof(group_str));
+        pim_inet4_dump("<source?>", channel_oil->oil.mfcc_origin, source_str, sizeof(source_str));
+        zlog_debug("%s %s: could not remove output interface %s (vif_index=%d) for channel (S,G)=(%s,%s)",
+                   __FILE__, __PRETTY_FUNCTION__,
+                   oif->name, pim_ifp->mroute_vif_index,
+                   source_str, group_str);
+      }
+    return -1;
+  }
+
+  return 0;
+}
+
+
 int pim_channel_add_oif(struct channel_oil *channel_oil,
 		   struct interface *oif,
 		   uint32_t proto_mask)
diff --git a/pimd/pim_oil.h b/pimd/pim_oil.h
index c63c026c0f..0edb50787e 100644
--- a/pimd/pim_oil.h
+++ b/pimd/pim_oil.h
@@ -87,5 +87,8 @@ void pim_channel_oil_del(struct channel_oil *c_oil);
 int pim_channel_add_oif(struct channel_oil *c_oil,
 			struct interface *oif,
 			uint32_t proto_mask);
+int pim_channel_del_oif (struct channel_oil *c_oil,
+			 struct interface *oif,
+			 uint32_t proto_mask);
 
 #endif /* PIM_OIL_H */