From 3010e99a56c9f4eedeb74b2899567bea39bfb648 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 17 Jun 2016 10:38:45 -0400 Subject: [PATCH] pim --- pimd/pim_pim.c | 2 +- pimd/pimd.h | 30 +++++++++++++++++------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index a492d57db5..2ff062bd67 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -374,7 +374,7 @@ static void pim_sock_read_on(struct interface *ifp) pim_ifp = ifp->info; - if (PIM_DEBUG_PIM_TRACE) { + if (PIM_DEBUG_PIM_TRACE_DETAIL) { zlog_debug("Scheduling READ event on PIM socket fd=%d", pim_ifp->pim_sock_fd); } diff --git a/pimd/pimd.h b/pimd/pimd.h index 7114e07a22..dd48ab415c 100644 --- a/pimd/pimd.h +++ b/pimd/pimd.h @@ -54,19 +54,21 @@ #define PIM_INADDR_ISNOT_ANY(addr) ((addr).s_addr != PIM_NET_INADDR_ANY) /* struct in_addr addr */ #define PIM_MASK_PIM_EVENTS (1 << 0) -#define PIM_MASK_PIM_PACKETS (1 << 1) -#define PIM_MASK_PIM_PACKETDUMP_SEND (1 << 2) -#define PIM_MASK_PIM_PACKETDUMP_RECV (1 << 3) -#define PIM_MASK_PIM_TRACE (1 << 4) -#define PIM_MASK_IGMP_EVENTS (1 << 5) -#define PIM_MASK_IGMP_PACKETS (1 << 6) -#define PIM_MASK_IGMP_TRACE (1 << 7) -#define PIM_MASK_ZEBRA (1 << 8) -#define PIM_MASK_SSMPINGD (1 << 9) -#define PIM_MASK_MROUTE (1 << 10) -#define PIM_MASK_PIM_HELLO (1 << 11) -#define PIM_MASK_PIM_J_P (1 << 12) -#define PIM_MASK_STATIC (1 << 13) +#define PIM_MASK_PIM_EVENTS_DETAIL (1 << 1) +#define PIM_MASK_PIM_PACKETS (1 << 2) +#define PIM_MASK_PIM_PACKETDUMP_SEND (1 << 3) +#define PIM_MASK_PIM_PACKETDUMP_RECV (1 << 4) +#define PIM_MASK_PIM_TRACE (1 << 5) +#define PIM_MASK_PIM_TRACE_DETAIL (1 << 6) +#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) const char *const PIM_ALL_SYSTEMS; const char *const PIM_ALL_ROUTERS; @@ -118,10 +120,12 @@ extern int32_t qpim_register_probe_time; #define PIM_REGISTER_PROBE_TIME_DEFAULT (5) #define PIM_DEBUG_PIM_EVENTS (qpim_debugs & PIM_MASK_PIM_EVENTS) +#define PIM_DEBUG_PIM_EVENTS_DETAIL (qpim_debugs & PIM_MASK_PIM_EVENTS_DETAIL) #define PIM_DEBUG_PIM_PACKETS (qpim_debugs & PIM_MASK_PIM_PACKETS) #define PIM_DEBUG_PIM_PACKETDUMP_SEND (qpim_debugs & PIM_MASK_PIM_PACKETDUMP_SEND) #define PIM_DEBUG_PIM_PACKETDUMP_RECV (qpim_debugs & PIM_MASK_PIM_PACKETDUMP_RECV) #define PIM_DEBUG_PIM_TRACE (qpim_debugs & PIM_MASK_PIM_TRACE) +#define PIM_DEBUG_PIM_TRACE_DETAIL (qpim_debugs & PIM_MASK_PIM_TRACE_DETAIL) #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) -- 2.39.5