diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2022-04-25 13:53:17 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2022-04-26 10:49:03 +0200 |
| commit | 92fed03c3d91da24735017c571ef47a5459d03b8 (patch) | |
| tree | 33b18fdea2a74d8a54d408a43ce5d7ec9c2deb20 | |
| parent | d45a846e5ca313e5ab132ef57c495cc0407b50d9 (diff) | |
pimd: fix reversed logic for "debug ... detail"
The normal flag was enabling detail messages, but what we want is the
detail flag enabling normal messages.
Remove the _ONLY macro while at it, it's only used for config print &
that seems like a place where making the difference explicitly visible
is helpful regardless.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
| -rw-r--r-- | pimd/pim_vty.c | 17 | ||||
| -rw-r--r-- | pimd/pimd.h | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index b0db6b4d96..4a02ebb09b 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -70,18 +70,18 @@ int pim_debug_config_write(struct vty *vty) ++writes; } - if (PIM_DEBUG_MROUTE) { + /* PIM_DEBUG_MROUTE catches _DETAIL too */ + if (router->debugs & PIM_MASK_MROUTE) { vty_out(vty, "debug mroute\n"); ++writes; } - - if (PIM_DEBUG_MTRACE) { - vty_out(vty, "debug mtrace\n"); + if (PIM_DEBUG_MROUTE_DETAIL) { + vty_out(vty, "debug mroute detail\n"); ++writes; } - if (PIM_DEBUG_MROUTE_DETAIL_ONLY) { - vty_out(vty, "debug mroute detail\n"); + if (PIM_DEBUG_MTRACE) { + vty_out(vty, "debug mtrace\n"); ++writes; } @@ -102,11 +102,12 @@ int pim_debug_config_write(struct vty *vty) ++writes; } - if (PIM_DEBUG_PIM_TRACE) { + /* PIM_DEBUG_PIM_TRACE catches _DETAIL too */ + if (router->debugs & PIM_MASK_PIM_TRACE) { vty_out(vty, "debug pim trace\n"); ++writes; } - if (PIM_DEBUG_PIM_TRACE_DETAIL_ONLY) { + if (PIM_DEBUG_PIM_TRACE_DETAIL) { vty_out(vty, "debug pim trace detail\n"); ++writes; } diff --git a/pimd/pimd.h b/pimd/pimd.h index 1f7919ac6c..aeb4859952 100644 --- a/pimd/pimd.h +++ b/pimd/pimd.h @@ -157,23 +157,22 @@ extern uint8_t qpim_ecmp_rebalance_enable; (router->debugs & PIM_MASK_PIM_PACKETDUMP_SEND) #define PIM_DEBUG_PIM_PACKETDUMP_RECV \ (router->debugs & PIM_MASK_PIM_PACKETDUMP_RECV) -#define PIM_DEBUG_PIM_TRACE (router->debugs & PIM_MASK_PIM_TRACE) +#define PIM_DEBUG_PIM_TRACE \ + (router->debugs & (PIM_MASK_PIM_TRACE | PIM_MASK_PIM_TRACE_DETAIL)) #define PIM_DEBUG_PIM_TRACE_DETAIL \ - (router->debugs & (PIM_MASK_PIM_TRACE_DETAIL | PIM_MASK_PIM_TRACE)) -#define PIM_DEBUG_PIM_TRACE_DETAIL_ONLY \ (router->debugs & PIM_MASK_PIM_TRACE_DETAIL) #define PIM_DEBUG_IGMP_EVENTS (router->debugs & PIM_MASK_IGMP_EVENTS) #define PIM_DEBUG_IGMP_PACKETS (router->debugs & PIM_MASK_IGMP_PACKETS) -#define PIM_DEBUG_IGMP_TRACE (router->debugs & PIM_MASK_IGMP_TRACE) +#define PIM_DEBUG_IGMP_TRACE \ + (router->debugs & (PIM_MASK_IGMP_TRACE | PIM_MASK_IGMP_TRACE_DETAIL)) #define PIM_DEBUG_IGMP_TRACE_DETAIL \ - (router->debugs & (PIM_MASK_IGMP_TRACE_DETAIL | PIM_MASK_IGMP_TRACE)) + (router->debugs & PIM_MASK_IGMP_TRACE_DETAIL) #define PIM_DEBUG_ZEBRA (router->debugs & PIM_MASK_ZEBRA) #define PIM_DEBUG_MLAG (router->debugs & PIM_MASK_MLAG) #define PIM_DEBUG_SSMPINGD (router->debugs & PIM_MASK_SSMPINGD) -#define PIM_DEBUG_MROUTE (router->debugs & PIM_MASK_MROUTE) -#define PIM_DEBUG_MROUTE_DETAIL \ - (router->debugs & (PIM_MASK_MROUTE_DETAIL | PIM_MASK_MROUTE)) -#define PIM_DEBUG_MROUTE_DETAIL_ONLY (router->debugs & PIM_MASK_MROUTE_DETAIL) +#define PIM_DEBUG_MROUTE \ + (router->debugs & (PIM_MASK_MROUTE | PIM_MASK_MROUTE_DETAIL)) +#define PIM_DEBUG_MROUTE_DETAIL (router->debugs & PIM_MASK_MROUTE_DETAIL) #define PIM_DEBUG_PIM_HELLO (router->debugs & PIM_MASK_PIM_HELLO) #define PIM_DEBUG_PIM_J_P (router->debugs & PIM_MASK_PIM_J_P) #define PIM_DEBUG_PIM_REG (router->debugs & PIM_MASK_PIM_REG) |