VTY: Context-sensitive help for logging related commands

3 files changed, 16 insertions, 11 deletions

diff --git a/openbsc/include/openbsc/debug.h b/openbsc/include/openbsc/debug.h
index 71e973a5f..11071343d 100644
--- a/openbsc/include/openbsc/debug.h
+++ b/openbsc/include/openbsc/debug.h
@@ -45,6 +45,7 @@ enum {
 #define BSC_CTX_NSVC	4
 
 #define LOGGING_STR	"Configure log message to this terminal\n"
+#define FILTER_STR	"Filter log messages\n"
 
 /* target */
 
diff --git a/openbsc/src/gprs/gprs_ns_vty.c b/openbsc/src/gprs/gprs_ns_vty.c
index c124d42cc..c20016aa5 100644
--- a/openbsc/src/gprs/gprs_ns_vty.c
+++ b/openbsc/src/gprs/gprs_ns_vty.c
@@ -346,7 +346,7 @@ DEFUN(nsvc_nsei, nsvc_nsei_cmd,
 DEFUN(logging_fltr_nsvc,
       logging_fltr_nsvc_cmd,
       "logging filter nsvc (nsei|nsvci) <0-65535>",
-	LOGGING_STR "Filter log messages\n"
+	LOGGING_STR FILTER_STR
 	"Filter based on NS Virtual Connection\n"
 	"Identify NS-VC by NSEI\n"
 	"Identify NS-VC by NSVCI\n"
diff --git a/openbsc/src/vty_interface_cmds.c b/openbsc/src/vty_interface_cmds.c
index 687ef4be5..9ca9a247f 100644
--- a/openbsc/src/vty_interface_cmds.c
+++ b/openbsc/src/vty_interface_cmds.c
@@ -173,8 +173,8 @@ DEFUN(enable_logging,
 DEFUN(logging_fltr_imsi,
       logging_fltr_imsi_cmd,
       "logging filter imsi IMSI",
-	LOGGING_STR
-      "Print all messages related to a IMSI\n")
+	LOGGING_STR FILTER_STR
+      "Filter log messages by IMSI\n" "IMSI to be used as filter\n")
 {
 	struct telnet_connection *conn;
 
@@ -190,9 +190,11 @@ DEFUN(logging_fltr_imsi,
 
 DEFUN(logging_fltr_all,
       logging_fltr_all_cmd,
-      "logging filter all <0-1>",
-	LOGGING_STR
-      "Print all messages to the console\n")
+      "logging filter all (0|1)",
+	LOGGING_STR FILTER_STR
+	"Do you want to log all messages?\n"
+	"Only print messages matched by other filters\n"
+	"Bypass filter and print all messages\n")
 {
 	struct telnet_connection *conn;
 
@@ -208,8 +210,9 @@ DEFUN(logging_fltr_all,
 
 DEFUN(logging_use_clr,
       logging_use_clr_cmd,
-      "logging color <0-1>",
-	LOGGING_STR
+      "logging color (0|1)",
+	LOGGING_STR "Configure color-printing for log messages\n"
+      "Don't use color for printing messages\n"
       "Use color for printing messages\n")
 {
 	struct telnet_connection *conn;
@@ -226,9 +229,10 @@ DEFUN(logging_use_clr,
 
 DEFUN(logging_prnt_timestamp,
       logging_prnt_timestamp_cmd,
-      "logging timestamp <0-1>",
-	LOGGING_STR
-      "Print the timestamp of each message\n")
+      "logging timestamp (0|1)",
+	LOGGING_STR "Configure log message timestamping\n"
+	"Don't prefix each log message\n"
+	"Prefix each log message with current timestamp\n")
 {
 	struct telnet_connection *conn;