lib: common debug config output

Implement common code for debug config output and remove daemon-specific
code that is duplicated everywhere.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

5 files changed, 10 insertions, 47 deletions

diff --git a/pathd/path_cli.c b/pathd/path_cli.c
index 700d1db8cb..754fdf7a62 100644
--- a/pathd/path_cli.c
+++ b/pathd/path_cli.c
@@ -1305,20 +1305,8 @@ int config_write_segment_routing(struct vty *vty)
 	return 1;
 }
 
-static int path_policy_cli_debug_config_write(struct vty *vty)
-{
-	if (DEBUG_MODE_CHECK(&path_policy_debug, DEBUG_MODE_CONF)) {
-		vty_out(vty, "debug pathd policy\n");
-		return 1;
-	}
-	return 0;
-}
-
 void path_cli_init(void)
 {
-	hook_register(nb_client_debug_config_write,
-		      path_policy_cli_debug_config_write);
-
 	debug_install(&path_policy_debug);
 
 	install_node(&segment_routing_node);
diff --git a/pathd/path_pcep.c b/pathd/path_pcep.c
index 65ee2b5a5f..a0a53b0d84 100644
--- a/pathd/path_pcep.c
+++ b/pathd/path_pcep.c
@@ -32,10 +32,10 @@ DEFINE_MTYPE(PATHD, PCEP, "PCEP module");
  * Globals.
  */
 static struct pcep_glob pcep_glob_space = {
-	.dbg_basic = {0, "PCEP basic"},
-	.dbg_path = {0, "PCEP path"},
-	.dbg_msg = {0, "PCEP message"},
-	.dbg_lib = {0, "PCEP lib"},
+	.dbg_basic = { 0, "debug pathd pcep basic", "PCEP basic" },
+	.dbg_path = { 0, "debug pathd pcep path", "PCEP path" },
+	.dbg_msg = { 0, "debug pathd pcep message", "PCEP message" },
+	.dbg_lib = { 0, "debug pathd pcep pceplib", "PCEP lib" },
 };
 struct pcep_glob *pcep_g = &pcep_glob_space;
 
diff --git a/pathd/path_pcep_cli.c b/pathd/path_pcep_cli.c
index 1e0d52e38d..4294b51c57 100644
--- a/pathd/path_pcep_cli.c
+++ b/pathd/path_pcep_cli.c
@@ -46,7 +46,6 @@
 #define BUFFER_PCC_PCE_SIZE 1024
 
 /* CLI Function declarations */
-static int pcep_cli_debug_config_write(struct vty *vty);
 static int pcep_cli_pcep_config_write(struct vty *vty);
 static int pcep_cli_pcc_config_write(struct vty *vty);
 static int pcep_cli_pce_config_write(struct vty *vty);
@@ -1695,20 +1694,6 @@ static int path_pcep_cli_clear_srte_pcep_session(struct vty *vty,
  * Config Write functions
  */
 
-int pcep_cli_debug_config_write(struct vty *vty)
-{
-	if (DEBUG_MODE_CHECK(&pcep_g->dbg_basic, DEBUG_MODE_CONF))
-		vty_out(vty, "debug pathd pcep basic\n");
-	if (DEBUG_MODE_CHECK(&pcep_g->dbg_path, DEBUG_MODE_CONF))
-		vty_out(vty, "debug pathd pcep path\n");
-	if (DEBUG_MODE_CHECK(&pcep_g->dbg_msg, DEBUG_MODE_CONF))
-		vty_out(vty, "debug pathd pcep message\n");
-	if (DEBUG_MODE_CHECK(&pcep_g->dbg_lib, DEBUG_MODE_CONF))
-		vty_out(vty, "debug pathd pcep pceplib\n");
-
-	return 0;
-}
-
 int pcep_cli_pcep_config_write(struct vty *vty)
 {
 	vty_out(vty, "  pcep\n");
@@ -2331,8 +2316,6 @@ DEFPY(pcep_cli_clear_srte_pcep_session,
 void pcep_cli_init(void)
 {
 	hook_register(pathd_srte_config_write, pcep_cli_pcep_config_write);
-	hook_register(nb_client_debug_config_write,
-		      pcep_cli_debug_config_write);
 
 	debug_install(&pcep_g->dbg_basic);
 	debug_install(&pcep_g->dbg_path);
diff --git a/pathd/path_ted.c b/pathd/path_ted.c
index 470a973ae2..88cda79187 100644
--- a/pathd/path_ted.c
+++ b/pathd/path_ted.c
@@ -30,11 +30,11 @@ static uint32_t path_ted_stop_importing_igp(void);
 static enum zclient_send_status path_ted_link_state_sync(void);
 static void path_ted_timer_handler_sync(struct event *thread);
 static void path_ted_timer_handler_refresh(struct event *thread);
-static int path_ted_cli_debug_config_write(struct vty *vty);
 
 extern struct zclient *zclient;
 
-struct ted_state ted_state_g = {};
+struct ted_state ted_state_g = { .dbg = { .conf = "debug pathd mpls-te",
+					  .desc = "Pathd TED" } };
 
 /*
  * path_path_ted public API function implementations
@@ -467,14 +467,6 @@ DEFPY (show_pathd_ted_db,
  * Config Write functions
  */
 
-int path_ted_cli_debug_config_write(struct vty *vty)
-{
-	if (DEBUG_MODE_CHECK(&ted_state_g.dbg, DEBUG_MODE_CONF)) {
-		vty_out(vty, "debug pathd mpls-te\n");
-		return 1;
-	}
-	return 0;
-}
 
 void path_ted_show_debugging(struct vty *vty)
 {
@@ -528,9 +520,6 @@ static void path_ted_register_vty(void)
 	install_element(CONFIG_NODE, &debug_path_ted_cmd);
 	install_element(ENABLE_NODE, &debug_path_ted_cmd);
 
-	hook_register(nb_client_debug_config_write,
-		      path_ted_cli_debug_config_write);
-
 	debug_install(&ted_state_g.dbg);
 }
 
diff --git a/pathd/pathd.c b/pathd/pathd.c
index d5c37898ae..5df0e9c2de 100644
--- a/pathd/pathd.c
+++ b/pathd/pathd.c
@@ -33,7 +33,10 @@ DEFINE_HOOK(pathd_candidate_updated, (struct srte_candidate * candidate),
 DEFINE_HOOK(pathd_candidate_removed, (struct srte_candidate * candidate),
 	    (candidate));
 
-struct debug path_policy_debug;
+struct debug path_policy_debug = {
+	.conf = "debug pathd policy",
+	.desc = "Pathd policy",
+};
 
 #define PATH_POLICY_DEBUG(fmt, ...)                                            \
 	DEBUGD(&path_policy_debug, "policy: " fmt, ##__VA_ARGS__)