From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 5 Dec 2016 22:53:49 +0000 (-0500)
Subject: pimd: Cleanup debugs on
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~33
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4bbcefe91f55eaf9d84fcf855400da823b1d0b24;p=mirror%2Ffrr.git

pimd: Cleanup debugs on
---

diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c
index c8f6b504c1..6e77afd40a 100644
--- a/pimd/pim_oil.c
+++ b/pimd/pim_oil.c
@@ -204,18 +204,6 @@ pim_channel_del_oif (struct channel_oil *channel_oil,
 
   pim_ifp = oif->info;
 
-  if (PIM_DEBUG_MROUTE)
-    {
-      char group_str[INET_ADDRSTRLEN];
-      char source_str[INET_ADDRSTRLEN];
-      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.
@@ -274,6 +262,18 @@ pim_channel_del_oif (struct channel_oil *channel_oil,
     return -1;
   }
 
+  if (PIM_DEBUG_MROUTE)
+    {
+      char group_str[INET_ADDRSTRLEN];
+      char source_str[INET_ADDRSTRLEN];
+      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);
+    }
+
   return 0;
 }
 
@@ -297,17 +297,6 @@ int pim_channel_add_oif(struct channel_oil *channel_oil,
 
   pim_ifp = oif->info;
 
-  if (PIM_DEBUG_MROUTE) {
-    char group_str[INET_ADDRSTRLEN];
-    char source_str[INET_ADDRSTRLEN];
-    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);
-  }
-
 #ifdef PIM_ENFORCE_LOOPFREE_MFC
   /*
     Prevent creating MFC entry with OIF=IIF.