From: Russell Bryant <russell@russellbryant.com>
Date: Sat, 4 Nov 2006 17:59:39 +0000 (+0000)
Subject: Really fix the "core set debug" and "core set verbose" CLI commands.
X-Git-Tag: 1.4.0-beta4~198
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=789234df2d0dbc32df8ecb2a9f760ac7817d15b7;p=thirdparty%2Fasterisk.git

Really fix the "core set debug" and "core set verbose" CLI commands.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@47195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/asterisk.c b/main/asterisk.c
index 22ee7e9abb..4ca646a558 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2142,9 +2142,9 @@ static void ast_remotecontrol(char * data)
 		pid = atoi(cpid);
 	else
 		pid = -1;
-	snprintf(tmp, sizeof(tmp), "core verbose atleast %d", option_verbose);
+	snprintf(tmp, sizeof(tmp), "core set verbose atleast %d", option_verbose);
 	fdprint(ast_consock, tmp);
-	snprintf(tmp, sizeof(tmp), "core debug atleast %d", option_debug);
+	snprintf(tmp, sizeof(tmp), "core set debug atleast %d", option_debug);
 	fdprint(ast_consock, tmp);
 	if (ast_opt_mute) {
 		snprintf(tmp, sizeof(tmp), "log and verbose output currently muted ('logger unmute' to unmute)");
diff --git a/main/cli.c b/main/cli.c
index e8f4d3b165..64ee53bea6 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -205,22 +205,22 @@ static int handle_verbose(int fd, int argc, char *argv[])
 	int newlevel;
 	int atleast = 0;
 
-	if ((argc < 3) || (argc > 4))
+	if ((argc < 4) || (argc > 5))
 		return RESULT_SHOWUSAGE;
 
 	if (!strcasecmp(argv[3], "atleast"))
 		atleast = 1;
 
 	if (!atleast) {
-		if (argc > 3)
+		if (argc > 4)
 			return RESULT_SHOWUSAGE;
 
-		option_verbose = atoi(argv[2]);
+		option_verbose = atoi(argv[3]);
 	} else {
-		if (argc < 4)
+		if (argc < 5)
 			return RESULT_SHOWUSAGE;
 
-		newlevel = atoi(argv[3]);
+		newlevel = atoi(argv[4]);
 		if (newlevel > option_verbose)
 			option_verbose = newlevel;
         }
@@ -270,32 +270,32 @@ static int handle_debug(int fd, int argc, char *argv[])
 	int atleast = 0;
 	char *filename = '\0';
 
-	if ((argc < 3) || (argc > 5))
+	if ((argc < 4) || (argc > 6))
 		return RESULT_SHOWUSAGE;
 
 	if (!strcasecmp(argv[3], "atleast"))
 		atleast = 1;
 
 	if (!atleast) {
-		if (argc > 4)
+		if (argc > 5)
 			return RESULT_SHOWUSAGE;
 
-		if (sscanf(argv[2], "%d", &newlevel) != 1)
+		if (sscanf(argv[3], "%d", &newlevel) != 1)
 			return RESULT_SHOWUSAGE;
 
-		if (argc == 3) {
+		if (argc == 4) {
 			debug_filename[0] = '\0';
 		} else {
-			filename = argv[3];
+			filename = argv[4];
 			ast_copy_string(debug_filename, filename, sizeof(debug_filename));
 		}
 
 		option_debug = newlevel;
 	} else {
-		if (argc < 4)
+		if (argc < 5 || argc > 6)
 			return RESULT_SHOWUSAGE;
 
-		if (sscanf(argv[3], "%d", &newlevel) != 1)
+		if (sscanf(argv[4], "%d", &newlevel) != 1)
 			return RESULT_SHOWUSAGE;
 
 		if (argc == 4) {