From d3a8a0f5b3742855fa4177c35b7d75bf09a55fb7 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 23 Jun 2016 12:24:32 -0400 Subject: [PATCH] pimd: Fix igmp Trace logging In general we don't need to know when a read is scheduled. Signed-off-by: Donald Sharp --- pimd/pim_igmp.c | 6 +++--- pimd/pimd.h | 16 ++++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c index b16f4e2e35..eacd605006 100644 --- a/pimd/pim_igmp.c +++ b/pimd/pim_igmp.c @@ -934,7 +934,7 @@ static void igmp_read_on(struct igmp_sock *igmp) { zassert(igmp); - if (PIM_DEBUG_IGMP_TRACE) { + if (PIM_DEBUG_IGMP_TRACE_DETAIL) { zlog_debug("Scheduling READ event on IGMP socket fd=%d", igmp->fd); } @@ -1033,7 +1033,7 @@ static void sock_close(struct igmp_sock *igmp) pim_igmp_other_querier_timer_off(igmp); pim_igmp_general_query_off(igmp); - if (PIM_DEBUG_IGMP_TRACE) { + if (PIM_DEBUG_IGMP_TRACE_DETAIL) { if (igmp->t_igmp_read) { zlog_debug("Cancelling READ event on IGMP socket %s fd=%d on interface %s", inet_ntoa(igmp->ifaddr), igmp->fd, @@ -1049,7 +1049,7 @@ static void sock_close(struct igmp_sock *igmp) errno, safe_strerror(errno)); } - if (PIM_DEBUG_IGMP_TRACE) { + if (PIM_DEBUG_IGMP_TRACE_DETAIL) { zlog_debug("Deleted IGMP socket %s fd=%d on interface %s", inet_ntoa(igmp->ifaddr), igmp->fd, igmp->interface->name); } diff --git a/pimd/pimd.h b/pimd/pimd.h index dd48ab415c..c5fec76675 100644 --- a/pimd/pimd.h +++ b/pimd/pimd.h @@ -63,12 +63,13 @@ #define PIM_MASK_IGMP_EVENTS (1 << 7) #define PIM_MASK_IGMP_PACKETS (1 << 8) #define PIM_MASK_IGMP_TRACE (1 << 9) -#define PIM_MASK_ZEBRA (1 << 10) -#define PIM_MASK_SSMPINGD (1 << 11) -#define PIM_MASK_MROUTE (1 << 12) -#define PIM_MASK_PIM_HELLO (1 << 13) -#define PIM_MASK_PIM_J_P (1 << 14) -#define PIM_MASK_STATIC (1 << 15) +#define PIM_MASK_IGMP_TRACE_DETAIL (1 << 10) +#define PIM_MASK_ZEBRA (1 << 11) +#define PIM_MASK_SSMPINGD (1 << 12) +#define PIM_MASK_MROUTE (1 << 13) +#define PIM_MASK_PIM_HELLO (1 << 14) +#define PIM_MASK_PIM_J_P (1 << 15) +#define PIM_MASK_STATIC (1 << 16) const char *const PIM_ALL_SYSTEMS; const char *const PIM_ALL_ROUTERS; @@ -129,6 +130,7 @@ extern int32_t qpim_register_probe_time; #define PIM_DEBUG_IGMP_EVENTS (qpim_debugs & PIM_MASK_IGMP_EVENTS) #define PIM_DEBUG_IGMP_PACKETS (qpim_debugs & PIM_MASK_IGMP_PACKETS) #define PIM_DEBUG_IGMP_TRACE (qpim_debugs & PIM_MASK_IGMP_TRACE) +#define PIM_DEBUG_IGMP_TRACE_DETAIL (qpim_debugs & PIM_MASK_IGMP_TRACE_DETAIL) #define PIM_DEBUG_ZEBRA (qpim_debugs & PIM_MASK_ZEBRA) #define PIM_DEBUG_SSMPINGD (qpim_debugs & PIM_MASK_SSMPINGD) #define PIM_DEBUG_MROUTE (qpim_debugs & PIM_MASK_MROUTE) @@ -148,6 +150,7 @@ extern int32_t qpim_register_probe_time; #define PIM_DO_DEBUG_IGMP_EVENTS (qpim_debugs |= PIM_MASK_IGMP_EVENTS) #define PIM_DO_DEBUG_IGMP_PACKETS (qpim_debugs |= PIM_MASK_IGMP_PACKETS) #define PIM_DO_DEBUG_IGMP_TRACE (qpim_debugs |= PIM_MASK_IGMP_TRACE) +#define PIM_DO_DEBUG_IGMP_TRACE_DETAIL (qpim_debugs |= PIM_MASK_IGMP_TRACE_DETAIL) #define PIM_DO_DEBUG_ZEBRA (qpim_debugs |= PIM_MASK_ZEBRA) #define PIM_DO_DEBUG_SSMPINGD (qpim_debugs |= PIM_MASK_SSMPINGD) #define PIM_DO_DEBUG_MROUTE (qpim_debugs |= PIM_MASK_MROUTE) @@ -163,6 +166,7 @@ extern int32_t qpim_register_probe_time; #define PIM_DONT_DEBUG_IGMP_EVENTS (qpim_debugs &= ~PIM_MASK_IGMP_EVENTS) #define PIM_DONT_DEBUG_IGMP_PACKETS (qpim_debugs &= ~PIM_MASK_IGMP_PACKETS) #define PIM_DONT_DEBUG_IGMP_TRACE (qpim_debugs &= ~PIM_MASK_IGMP_TRACE) +#define PIM_DONT_DEBUG_IGMP_TRACE_DETAIL (qpim_debugs &= ~PIM_MASK_IGMP_TRACE_DETAIL) #define PIM_DONT_DEBUG_ZEBRA (qpim_debugs &= ~PIM_MASK_ZEBRA) #define PIM_DONT_DEBUG_SSMPINGD (qpim_debugs &= ~PIM_MASK_SSMPINGD) #define PIM_DONT_DEBUG_MROUTE (qpim_debugs &= ~PIM_MASK_MROUTE) -- 2.39.5