From a25597611dcee95d5a7f9d9b08a0705afab14a20 Mon Sep 17 00:00:00 2001 From: Sai Gomathi N Date: Mon, 26 Sep 2022 00:09:45 -0700 Subject: [PATCH] pimd,pim6d: Change the show running commands based on address family Change the show running commands for igmp and mld debug commands based on the address family. Signed-off-by: Sai Gomathi N --- pimd/pim_addr.h | 2 ++ pimd/pim_vty.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pimd/pim_addr.h b/pimd/pim_addr.h index 7852d1788a..d15e978855 100644 --- a/pimd/pim_addr.h +++ b/pimd/pim_addr.h @@ -37,6 +37,7 @@ typedef struct in_addr pim_addr; #define PIM_MAX_BITLEN IPV4_MAX_BITLEN #define PIM_AF_NAME "ip" #define PIM_AF_DBG "pim" +#define GM_AF_DBG "igmp" #define PIM_MROUTE_DBG "mroute" #define PIMREG "pimreg" #define GM "IGMP" @@ -65,6 +66,7 @@ typedef struct in6_addr pim_addr; #define PIM_MAX_BITLEN IPV6_MAX_BITLEN #define PIM_AF_NAME "ipv6" #define PIM_AF_DBG "pimv6" +#define GM_AF_DBG "mld" #define PIM_MROUTE_DBG "mroute6" #define PIMREG "pim6reg" #define GM "MLD" diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index 315fbae95c..9021f1e12f 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -59,20 +59,20 @@ int pim_debug_config_write(struct vty *vty) ++writes; } if (PIM_DEBUG_GM_EVENTS) { - vty_out(vty, "debug igmp events\n"); + vty_out(vty, "debug " GM_AF_DBG " events\n"); ++writes; } if (PIM_DEBUG_GM_PACKETS) { - vty_out(vty, "debug igmp packets\n"); + vty_out(vty, "debug " GM_AF_DBG " packets\n"); ++writes; } /* PIM_DEBUG_GM_TRACE catches _DETAIL too */ if (router->debugs & PIM_MASK_GM_TRACE) { - vty_out(vty, "debug igmp trace\n"); + vty_out(vty, "debug " GM_AF_DBG " trace\n"); ++writes; } if (PIM_DEBUG_GM_TRACE_DETAIL) { - vty_out(vty, "debug igmp trace detail\n"); + vty_out(vty, "debug " GM_AF_DBG " trace detail\n"); ++writes; } -- 2.39.5