aboutsummaryrefslogtreecommitdiffstats
path: root/main/cli.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-13 05:53:19 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-13 05:53:19 +0000
commitac808d6bde47ded2e36eb4af4380d5cad8547488 (patch)
tree51ee6d917d6469412efe549d68ab306ae38002de /main/cli.c
parent07fe72da0e1e81f51e47f65e9f6cc8ad6fad7c46 (diff)
Merged revisions 85533 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r85533 | russell | 2007-10-13 01:48:10 -0400 (Sat, 13 Oct 2007) | 12 lines Fix an issue with console verbosity when running asterisk -rx to execute a command and retrieve its output. The issue was that there was no way for the main Asterisk process to know that the remote console was connecting in the -rx mode. The way that James has fixed this is to have all remote consoles muted by default. Then, regular remote consoles automatically execute a CLI command to unmute themselves when they first start up. (closes issue #10847) Reported by: atis Patches: asterisk-consolemute.diff.txt uploaded by jamesgolovich (license 176) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@85534 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/cli.c')
-rw-r--r--main/cli.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/main/cli.c b/main/cli.c
index da4c25fe3..3a08eae7c 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -371,9 +371,14 @@ static char *handle_logger_mute(struct ast_cli_entry *e, int cmd, struct ast_cli
return NULL;
}
- if (a->argc != 2)
+ if (a->argc < 2 || a->argc > 3)
return CLI_SHOWUSAGE;
- ast_console_toggle_mute(a->fd);
+
+ if (a->argc == 3 && !strcasecmp(argv[2], "silent"))
+ ast_console_toggle_mute(a->fd, 1);
+ else
+ ast_console_toggle_mute(a->fd, 0);
+
return CLI_SUCCESS;
}