kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 47195 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47195 | russell | 2006-11-04 12:59:39 -0500 (Sat, 04 Nov 2006) | 2 lines

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-11-04 18:11:18 +00:00
parent 37e39111c5
commit 9297a1a8f9
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/asterisk.c
View File

@@ -2063,9 +2063,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)");

24
main/cli.c
View File

@@ -178,22 +178,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;
}
@@ -216,32 +216,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) {