proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 22:57:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Fix igmp Trace logging

Browse Source 
In general we don't need to know
when a read is scheduled.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-06-23 12:24:32 -04:00
parent ce9a064388
commit d3a8a0f5b3
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pimd/pim_igmp.c
View File

@ -934,7 +934,7 @@ static void igmp_read_on(struct igmp_sock *igmp)
{ {
zassert(igmp); zassert(igmp);
if (PIM_DEBUG_IGMP_TRACE) { if (PIM_DEBUG_IGMP_TRACE_DETAIL) {
zlog_debug("Scheduling READ event on IGMP socket fd=%d", zlog_debug("Scheduling READ event on IGMP socket fd=%d",
igmp->fd); igmp->fd);
} }
@ -1033,7 +1033,7 @@ static void sock_close(struct igmp_sock *igmp)
pim_igmp_other_querier_timer_off(igmp); pim_igmp_other_querier_timer_off(igmp);
pim_igmp_general_query_off(igmp); pim_igmp_general_query_off(igmp);
if (PIM_DEBUG_IGMP_TRACE) { if (PIM_DEBUG_IGMP_TRACE_DETAIL) {
if (igmp->t_igmp_read) { if (igmp->t_igmp_read) {
zlog_debug("Cancelling READ event on IGMP socket %s fd=%d on interface %s", zlog_debug("Cancelling READ event on IGMP socket %s fd=%d on interface %s",
inet_ntoa(igmp->ifaddr), igmp->fd, inet_ntoa(igmp->ifaddr), igmp->fd,
@ -1049,7 +1049,7 @@ static void sock_close(struct igmp_sock *igmp)
errno, safe_strerror(errno)); 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", zlog_debug("Deleted IGMP socket %s fd=%d on interface %s",
inet_ntoa(igmp->ifaddr), igmp->fd, igmp->interface->name); inet_ntoa(igmp->ifaddr), igmp->fd, igmp->interface->name);
} }

16
pimd/pimd.h
View File

@ -63,12 +63,13 @@
#define PIM_MASK_IGMP_EVENTS (1 << 7) #define PIM_MASK_IGMP_EVENTS (1 << 7)
#define PIM_MASK_IGMP_PACKETS (1 << 8) #define PIM_MASK_IGMP_PACKETS (1 << 8)
#define PIM_MASK_IGMP_TRACE (1 << 9) #define PIM_MASK_IGMP_TRACE (1 << 9)
#define PIM_MASK_ZEBRA (1 << 10) #define PIM_MASK_IGMP_TRACE_DETAIL (1 << 10)
#define PIM_MASK_SSMPINGD (1 << 11) #define PIM_MASK_ZEBRA (1 << 11)
#define PIM_MASK_MROUTE (1 << 12) #define PIM_MASK_SSMPINGD (1 << 12)
#define PIM_MASK_PIM_HELLO (1 << 13) #define PIM_MASK_MROUTE (1 << 13)
#define PIM_MASK_PIM_J_P (1 << 14) #define PIM_MASK_PIM_HELLO (1 << 14)
#define PIM_MASK_STATIC (1 << 15) #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_SYSTEMS;
const char *const PIM_ALL_ROUTERS; 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_EVENTS (qpim_debugs & PIM_MASK_IGMP_EVENTS)
#define PIM_DEBUG_IGMP_PACKETS (qpim_debugs & PIM_MASK_IGMP_PACKETS) #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 (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_ZEBRA (qpim_debugs & PIM_MASK_ZEBRA)
#define PIM_DEBUG_SSMPINGD (qpim_debugs & PIM_MASK_SSMPINGD) #define PIM_DEBUG_SSMPINGD (qpim_debugs & PIM_MASK_SSMPINGD)
#define PIM_DEBUG_MROUTE (qpim_debugs & PIM_MASK_MROUTE) #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_EVENTS (qpim_debugs |= PIM_MASK_IGMP_EVENTS)
#define PIM_DO_DEBUG_IGMP_PACKETS (qpim_debugs |= PIM_MASK_IGMP_PACKETS) #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 (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_ZEBRA (qpim_debugs |= PIM_MASK_ZEBRA)
#define PIM_DO_DEBUG_SSMPINGD (qpim_debugs |= PIM_MASK_SSMPINGD) #define PIM_DO_DEBUG_SSMPINGD (qpim_debugs |= PIM_MASK_SSMPINGD)
#define PIM_DO_DEBUG_MROUTE (qpim_debugs |= PIM_MASK_MROUTE) #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_EVENTS (qpim_debugs &= ~PIM_MASK_IGMP_EVENTS)
#define PIM_DONT_DEBUG_IGMP_PACKETS (qpim_debugs &= ~PIM_MASK_IGMP_PACKETS) #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 (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_ZEBRA (qpim_debugs &= ~PIM_MASK_ZEBRA)
#define PIM_DONT_DEBUG_SSMPINGD (qpim_debugs &= ~PIM_MASK_SSMPINGD) #define PIM_DONT_DEBUG_SSMPINGD (qpim_debugs &= ~PIM_MASK_SSMPINGD)
#define PIM_DONT_DEBUG_MROUTE (qpim_debugs &= ~PIM_MASK_MROUTE) #define PIM_DONT_DEBUG_MROUTE (qpim_debugs &= ~PIM_MASK_MROUTE)