]> git.puffer.fish Git - matthieu/frr.git/commitdiff
Fix PIM DBG message
authorChirag Shah <chirag@marvel-06.cumulusnetworks.com>
Sat, 7 Jan 2017 00:44:49 +0000 (16:44 -0800)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 14 Feb 2017 20:51:09 +0000 (15:51 -0500)
Ticket: CM-13771
Reviewed By: CCR-5537
Testing Done: yes

Fix to CM-13771 where DBG message was out of order.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
pimd/pim_join.c

index 028f77f53214c5684cc74f7a2c79643e9e15a631..cedce8165cfdf28546e96134eb584fbb49368b8a 100644 (file)
@@ -325,14 +325,6 @@ int pim_joinprune_send(struct interface *ifp,
     return -1;
   }
 
-  if (PIM_DEBUG_PIM_J_P) {
-    char dst_str[INET_ADDRSTRLEN];
-    pim_inet4_dump("<dst?>", upstream_addr, dst_str, sizeof(dst_str));
-    zlog_debug("%s: sending %s(S,G)=%s to upstream=%s on interface %s",
-              __PRETTY_FUNCTION__,
-              send_join ? "Join" : "Prune",
-              up->sg_str, dst_str, ifp->name);
-  }
 
   if (PIM_INADDR_IS_ANY(upstream_addr)) {
     if (PIM_DEBUG_PIM_J_P) {
@@ -366,6 +358,15 @@ int pim_joinprune_send(struct interface *ifp,
   if (pim_msg_size < 0)
     return pim_msg_size;
 
+  if (PIM_DEBUG_PIM_J_P) {
+    char dst_str[INET_ADDRSTRLEN];
+    pim_inet4_dump("<dst?>", upstream_addr, dst_str, sizeof(dst_str));
+    zlog_debug("%s: sending %s(S,G)=%s to upstream=%s on interface %s",
+              __PRETTY_FUNCTION__,
+              send_join ? "Join" : "Prune",
+              up->sg_str, dst_str, ifp->name);
+  }
+
   if (pim_msg_send(pim_ifp->pim_sock_fd,
                   pim_ifp->primary_address,
                   qpim_all_pim_routers_addr,