From 48f6dc2dae2572864db373ddc556518c2ab2ad85 Mon Sep 17 00:00:00 2001 From: Chirag Shah Date: Fri, 6 Jan 2017 16:44:49 -0800 Subject: [PATCH] Fix PIM DBG message 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 --- pimd/pim_join.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pimd/pim_join.c b/pimd/pim_join.c index 028f77f532..cedce8165c 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -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("", 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("", 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, -- 2.39.5