commit 24e3a9b5ff17553d20a2f9e4ce2a61b5012cd0f6
author Everton Marques <everton.marques@gmail.com> Tue Sep 30 19:14:19 2014 -0300
committer David Lamparter <equinox@opensourcerouting.org> Wed Feb 04 06:08:02 2015 +0100
tree 6e2dc00ba0b41e56b9527182532e4460c119fd75
parent ddc6659dd0f05b304ef579dcee6ac803e1a4b6d2

pimd: Report del_oif() failure within igmp_source_forward_stop().

pimd/pim_igmpv3.c

diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c
index b95adb6..3baddbf 100644
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@ -388,6 +388,10 @@
   }
 }
 
+/*
+  igmp_source_delete:       stop fowarding, and delete the source
+  igmp_source_forward_stop: stop fowarding, but keep the source
+*/
 void igmp_source_delete(struct igmp_source *source)
 {
   struct igmp_group *group;

pimd/pim_zebra.c

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 68aee68..fbc7c16 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -1073,6 +1073,7 @@
 void igmp_source_forward_start(struct igmp_source *source)
 {
   struct igmp_group *group;
+  int result;
 
   if (PIM_DEBUG_IGMP_TRACE) {
     char source_str[100];
@@ -1158,9 +1159,12 @@
     }
   }
 
-  if (add_oif(source->source_channel_oil,
-	      group->group_igmp_sock->interface,
-	      PIM_OIF_FLAG_PROTO_IGMP)) {
+  result = add_oif(source->source_channel_oil,
+		   group->group_igmp_sock->interface,
+		   PIM_OIF_FLAG_PROTO_IGMP);
+  if (result) {
+    zlog_warn("%s: add_oif() failed with return=%d",
+	      __func__, result);
     return;
   }
 
@@ -1174,9 +1178,14 @@
   IGMP_SOURCE_DO_FORWARDING(source->source_flags);
 }
 
+/*
+  igmp_source_forward_stop: stop fowarding, but keep the source
+  igmp_source_delete:       stop fowarding, and delete the source
+ */
 void igmp_source_forward_stop(struct igmp_source *source)
 {
   struct igmp_group *group;
+  int result;
 
   if (PIM_DEBUG_IGMP_TRACE) {
     char source_str[100];
@@ -1210,14 +1219,14 @@
    fixes the issue without ill effect, similar to 
    pim_forward_stop below.   
   */
-  /*if (del_oif(source->source_channel_oil,
-	      group->group_igmp_sock->interface,
-	      PIM_OIF_FLAG_PROTO_IGMP)) {
+  result = del_oif(source->source_channel_oil,
+		   group->group_igmp_sock->interface,
+		   PIM_OIF_FLAG_PROTO_IGMP);
+  if (result) {
+    zlog_warn("%s: del_oif() failed with return=%d",
+	      __func__, result);
     return;
-  }*/
-  del_oif(source->source_channel_oil,
-	      group->group_igmp_sock->interface,
-	      PIM_OIF_FLAG_PROTO_IGMP);
+  }
 
   /*
     Feed IGMPv3-gathered local membership information into PIM