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 <nsaigomathi@vmware.com>

diff --git a/pimd/pim_addr.h b/pimd/pim_addr.h
index 7852d1788a7758a7c9edc76868361ce6d42c76cf..d15e978855560f147c6c862c58ff012fcb5b1a90 100644 (file)
--- 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 315fbae95c8007f50c0450844a34bf45b0f366fc..9021f1e12f560c7bc6a343eb3fd80f6f1e60ba5d 100644 (file)
--- 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;
        }