pimd, pim6d: Changing IGMP to GM in debug macros

Changing
PIM_DO_DEBUG_IGMP_EVENTS to PIM_DO_DEBUG_GM_EVENTS
PIM_DO_DEBUG_IGMP_PACKETS to PIM_DO_DEBUG_GM_PACKETS
PIM_DO_DEBUG_IGMP_TRACE to PIM_DO_DEBUG_GM_TRACE
PIM_DO_DEBUG_IGMP_TRACE_DETAIL to PIM_DO_DEBUG_GM_TRACE_DETAIL
PIM_DONT_DEBUG_IGMP_EVENTS to PIM_DONT_DEBUG_GM_EVENTS
PIM_DONT_DEBUG_IGMP_PACKETS to PIM_DONT_DEBUG_GM_PACKETS
PIM_DONT_DEBUG_IGMP_TRACE to PIM_DONT_DEBUG_GM_TRACE
PIM_DONT_DEBUG_IGMP_TRACE_DETAIL to PIM_DONT_DEBUG_GM_TRACE_DETAIL
PIM_MASK_IGMP_EVENTS to PIM_MASK_GM_EVENTS
PIM_MASK_IGMP_PACKETS to PIM_MASK_GM_PACKETS
PIM_MASK_IGMP_TRACE to PIM_MASK_GM_TRACE
PIM_MASK_IGMP_TRACE_DETAIL to PIM_MASK_GM_TRACE_DETAIL
to be used for both IGMP and MLD debugs.

Signed-off-by: Sai Gomathi N <nsaigomathi@vmware.com>

4 files changed, 41 insertions, 44 deletions

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index f0b6037db9..c2f7396c18 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -4358,9 +4358,9 @@ DEFUN (debug_igmp,
        DEBUG_STR
        DEBUG_IGMP_STR)
 {
-	PIM_DO_DEBUG_IGMP_EVENTS;
-	PIM_DO_DEBUG_IGMP_PACKETS;
-	PIM_DO_DEBUG_IGMP_TRACE;
+	PIM_DO_DEBUG_GM_EVENTS;
+	PIM_DO_DEBUG_GM_PACKETS;
+	PIM_DO_DEBUG_GM_TRACE;
 	return CMD_SUCCESS;
 }
 
@@ -4371,9 +4371,9 @@ DEFUN (no_debug_igmp,
        DEBUG_STR
        DEBUG_IGMP_STR)
 {
-	PIM_DONT_DEBUG_IGMP_EVENTS;
-	PIM_DONT_DEBUG_IGMP_PACKETS;
-	PIM_DONT_DEBUG_IGMP_TRACE;
+	PIM_DONT_DEBUG_GM_EVENTS;
+	PIM_DONT_DEBUG_GM_PACKETS;
+	PIM_DONT_DEBUG_GM_TRACE;
 	return CMD_SUCCESS;
 }
 
@@ -4385,7 +4385,7 @@ DEFUN (debug_igmp_events,
        DEBUG_IGMP_STR
        DEBUG_IGMP_EVENTS_STR)
 {
-	PIM_DO_DEBUG_IGMP_EVENTS;
+	PIM_DO_DEBUG_GM_EVENTS;
 	return CMD_SUCCESS;
 }
 
@@ -4397,7 +4397,7 @@ DEFUN (no_debug_igmp_events,
        DEBUG_IGMP_STR
        DEBUG_IGMP_EVENTS_STR)
 {
-	PIM_DONT_DEBUG_IGMP_EVENTS;
+	PIM_DONT_DEBUG_GM_EVENTS;
 	return CMD_SUCCESS;
 }
 
@@ -4409,7 +4409,7 @@ DEFUN (debug_igmp_packets,
        DEBUG_IGMP_STR
        DEBUG_IGMP_PACKETS_STR)
 {
-	PIM_DO_DEBUG_IGMP_PACKETS;
+	PIM_DO_DEBUG_GM_PACKETS;
 	return CMD_SUCCESS;
 }
 
@@ -4421,7 +4421,7 @@ DEFUN (no_debug_igmp_packets,
        DEBUG_IGMP_STR
        DEBUG_IGMP_PACKETS_STR)
 {
-	PIM_DONT_DEBUG_IGMP_PACKETS;
+	PIM_DONT_DEBUG_GM_PACKETS;
 	return CMD_SUCCESS;
 }
 
@@ -4433,7 +4433,7 @@ DEFUN (debug_igmp_trace,
        DEBUG_IGMP_STR
        DEBUG_IGMP_TRACE_STR)
 {
-	PIM_DO_DEBUG_IGMP_TRACE;
+	PIM_DO_DEBUG_GM_TRACE;
 	return CMD_SUCCESS;
 }
 
@@ -4445,7 +4445,7 @@ DEFUN (no_debug_igmp_trace,
        DEBUG_IGMP_STR
        DEBUG_IGMP_TRACE_STR)
 {
-	PIM_DONT_DEBUG_IGMP_TRACE;
+	PIM_DONT_DEBUG_GM_TRACE;
 	return CMD_SUCCESS;
 }
 
@@ -4458,7 +4458,7 @@ DEFUN (debug_igmp_trace_detail,
        DEBUG_IGMP_TRACE_STR
        "detailed\n")
 {
-	PIM_DO_DEBUG_IGMP_TRACE_DETAIL;
+	PIM_DO_DEBUG_GM_TRACE_DETAIL;
 	return CMD_SUCCESS;
 }
 
@@ -4471,7 +4471,7 @@ DEFUN (no_debug_igmp_trace_detail,
        DEBUG_IGMP_TRACE_STR
        "detailed\n")
 {
-	PIM_DONT_DEBUG_IGMP_TRACE_DETAIL;
+	PIM_DONT_DEBUG_GM_TRACE_DETAIL;
 	return CMD_SUCCESS;
 }
 
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index 92c34f51a1..c168c0b098 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -153,9 +153,9 @@ int main(int argc, char **argv, char **envp)
 	PIM_DO_DEBUG_PIM_EVENTS;
 	PIM_DO_DEBUG_PIM_PACKETS;
 	PIM_DO_DEBUG_PIM_TRACE;
-	PIM_DO_DEBUG_IGMP_EVENTS;
-	PIM_DO_DEBUG_IGMP_PACKETS;
-	PIM_DO_DEBUG_IGMP_TRACE;
+	PIM_DO_DEBUG_GM_EVENTS;
+	PIM_DO_DEBUG_GM_PACKETS;
+	PIM_DO_DEBUG_GM_TRACE;
 	PIM_DO_DEBUG_ZEBRA;
 #endif
 
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index d191528f7e..544f926625 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -67,7 +67,7 @@ int pim_debug_config_write(struct vty *vty)
 		++writes;
 	}
 	/* PIM_DEBUG_IGMP_TRACE catches _DETAIL too */
-	if (router->debugs & PIM_MASK_IGMP_TRACE) {
+	if (router->debugs & PIM_MASK_GM_TRACE) {
 		vty_out(vty, "debug igmp trace\n");
 		++writes;
 	}
diff --git a/pimd/pimd.h b/pimd/pimd.h
index bf30cab678..5b8a01279e 100644
--- a/pimd/pimd.h
+++ b/pimd/pimd.h
@@ -90,10 +90,10 @@
 #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_IGMP_TRACE_DETAIL   (1 << 10)
+#define PIM_MASK_GM_EVENTS (1 << 7)
+#define PIM_MASK_GM_PACKETS (1 << 8)
+#define PIM_MASK_GM_TRACE (1 << 9)
+#define PIM_MASK_GM_TRACE_DETAIL (1 << 10)
 #define PIM_MASK_ZEBRA               (1 << 11)
 #define PIM_MASK_SSMPINGD            (1 << 12)
 #define PIM_MASK_MROUTE              (1 << 13)
@@ -160,12 +160,11 @@ extern uint8_t qpim_ecmp_rebalance_enable;
 	(router->debugs & (PIM_MASK_PIM_TRACE | PIM_MASK_PIM_TRACE_DETAIL))
 #define PIM_DEBUG_PIM_TRACE_DETAIL                                             \
 	(router->debugs & PIM_MASK_PIM_TRACE_DETAIL)
-#define PIM_DEBUG_GM_EVENTS (router->debugs & PIM_MASK_IGMP_EVENTS)
-#define PIM_DEBUG_GM_PACKETS (router->debugs & PIM_MASK_IGMP_PACKETS)
+#define PIM_DEBUG_GM_EVENTS (router->debugs & PIM_MASK_GM_EVENTS)
+#define PIM_DEBUG_GM_PACKETS (router->debugs & PIM_MASK_GM_PACKETS)
 #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)
+	(router->debugs & (PIM_MASK_GM_TRACE | PIM_MASK_GM_TRACE_DETAIL))
+#define PIM_DEBUG_IGMP_TRACE_DETAIL (router->debugs & PIM_MASK_GM_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)
@@ -187,15 +186,13 @@ extern uint8_t qpim_ecmp_rebalance_enable;
 #define PIM_DEBUG_BSM	(router->debugs & PIM_MASK_BSM_PROC)
 
 #define PIM_DEBUG_EVENTS                                                       \
-	(router->debugs                                                        \
-	 & (PIM_MASK_PIM_EVENTS | PIM_MASK_IGMP_EVENTS                         \
-	    | PIM_MASK_MSDP_EVENTS | PIM_MASK_BSM_PROC))
+	(router->debugs & (PIM_MASK_PIM_EVENTS | PIM_MASK_GM_EVENTS |          \
+			   PIM_MASK_MSDP_EVENTS | PIM_MASK_BSM_PROC))
 #define PIM_DEBUG_PACKETS                                                      \
-	(router->debugs                                                        \
-	 & (PIM_MASK_PIM_PACKETS | PIM_MASK_IGMP_PACKETS                       \
-	    | PIM_MASK_MSDP_PACKETS))
+	(router->debugs &                                                      \
+	 (PIM_MASK_PIM_PACKETS | PIM_MASK_GM_PACKETS | PIM_MASK_MSDP_PACKETS))
 #define PIM_DEBUG_TRACE                                                        \
-	(router->debugs & (PIM_MASK_PIM_TRACE | PIM_MASK_IGMP_TRACE))
+	(router->debugs & (PIM_MASK_PIM_TRACE | PIM_MASK_GM_TRACE))
 
 #define PIM_DO_DEBUG_PIM_EVENTS (router->debugs |= PIM_MASK_PIM_EVENTS)
 #define PIM_DO_DEBUG_PIM_PACKETS (router->debugs |= PIM_MASK_PIM_PACKETS)
@@ -206,11 +203,11 @@ extern uint8_t qpim_ecmp_rebalance_enable;
 #define PIM_DO_DEBUG_PIM_TRACE (router->debugs |= PIM_MASK_PIM_TRACE)
 #define PIM_DO_DEBUG_PIM_TRACE_DETAIL                                          \
 	(router->debugs |= PIM_MASK_PIM_TRACE_DETAIL)
-#define PIM_DO_DEBUG_IGMP_EVENTS (router->debugs |= PIM_MASK_IGMP_EVENTS)
-#define PIM_DO_DEBUG_IGMP_PACKETS (router->debugs |= PIM_MASK_IGMP_PACKETS)
-#define PIM_DO_DEBUG_IGMP_TRACE (router->debugs |= PIM_MASK_IGMP_TRACE)
-#define PIM_DO_DEBUG_IGMP_TRACE_DETAIL                                         \
-	(router->debugs |= PIM_MASK_IGMP_TRACE_DETAIL)
+#define PIM_DO_DEBUG_GM_EVENTS (router->debugs |= PIM_MASK_GM_EVENTS)
+#define PIM_DO_DEBUG_GM_PACKETS (router->debugs |= PIM_MASK_GM_PACKETS)
+#define PIM_DO_DEBUG_GM_TRACE (router->debugs |= PIM_MASK_GM_TRACE)
+#define PIM_DO_DEBUG_GM_TRACE_DETAIL                                           \
+	(router->debugs |= PIM_MASK_GM_TRACE_DETAIL)
 #define PIM_DO_DEBUG_ZEBRA (router->debugs |= PIM_MASK_ZEBRA)
 #define PIM_DO_DEBUG_MLAG (router->debugs |= PIM_MASK_MLAG)
 #define PIM_DO_DEBUG_SSMPINGD (router->debugs |= PIM_MASK_SSMPINGD)
@@ -239,11 +236,11 @@ extern uint8_t qpim_ecmp_rebalance_enable;
 #define PIM_DONT_DEBUG_PIM_TRACE (router->debugs &= ~PIM_MASK_PIM_TRACE)
 #define PIM_DONT_DEBUG_PIM_TRACE_DETAIL                                        \
 	(router->debugs &= ~PIM_MASK_PIM_TRACE_DETAIL)
-#define PIM_DONT_DEBUG_IGMP_EVENTS (router->debugs &= ~PIM_MASK_IGMP_EVENTS)
-#define PIM_DONT_DEBUG_IGMP_PACKETS (router->debugs &= ~PIM_MASK_IGMP_PACKETS)
-#define PIM_DONT_DEBUG_IGMP_TRACE (router->debugs &= ~PIM_MASK_IGMP_TRACE)
-#define PIM_DONT_DEBUG_IGMP_TRACE_DETAIL                                       \
-	(router->debugs &= ~PIM_MASK_IGMP_TRACE_DETAIL)
+#define PIM_DONT_DEBUG_GM_EVENTS (router->debugs &= ~PIM_MASK_GM_EVENTS)
+#define PIM_DONT_DEBUG_GM_PACKETS (router->debugs &= ~PIM_MASK_GM_PACKETS)
+#define PIM_DONT_DEBUG_GM_TRACE (router->debugs &= ~PIM_MASK_GM_TRACE)
+#define PIM_DONT_DEBUG_GM_TRACE_DETAIL                                         \
+	(router->debugs &= ~PIM_MASK_GM_TRACE_DETAIL)
 #define PIM_DONT_DEBUG_ZEBRA (router->debugs &= ~PIM_MASK_ZEBRA)
 #define PIM_DONT_DEBUG_MLAG (router->debugs &= ~PIM_MASK_MLAG)
 #define PIM_DONT_DEBUG_SSMPINGD (router->debugs &= ~PIM_MASK_SSMPINGD)