Merged revisions 85533 via svnmerge from
[asterisk/asterisk.git] / main / asterisk.c
index 6e9ccb7..ab8b069 100644 (file)
@@ -857,16 +857,18 @@ int ast_safe_system(const char *s)
 /*!
  * \brief mute or unmute a console from logging
  */
-void ast_console_toggle_mute(int fd) {
+void ast_console_toggle_mute(int fd, int silent) {
        int x;
        for (x = 0;x < AST_MAX_CONNECTS; x++) {
                if (fd == consoles[x].fd) {
                        if (consoles[x].mute) {
                                consoles[x].mute = 0;
-                               ast_cli(fd, "Console is not muted anymore.\n");
+                               if (!silent)
+                                       ast_cli(fd, "Console is not muted anymore.\n");
                        } else {
                                consoles[x].mute = 1;
-                               ast_cli(fd, "Console is muted.\n");
+                               if (!silent)
+                                       ast_cli(fd, "Console is muted.\n");
                        }
                        return;
                }
@@ -1022,7 +1024,7 @@ static void *listener(void *unused)
                                        flags = fcntl(consoles[x].p[1], F_GETFL);
                                        fcntl(consoles[x].p[1], F_SETFL, flags | O_NONBLOCK);
                                        consoles[x].fd = s;
-                                       consoles[x].mute = ast_opt_mute;
+                                       consoles[x].mute = 1; /* Default is muted, we will un-mute if necessary */
                                        if (ast_pthread_create_detached_background(&consoles[x].t, NULL, netconsole, &consoles[x])) {
                                                ast_log(LOG_ERROR, "Unable to spawn thread to handle connection: %s\n", strerror(errno));
                                                close(consoles[x].p[0]);
@@ -2281,13 +2283,15 @@ static void ast_remotecontrol(char * data)
                pid = atoi(cpid);
        else
                pid = -1;
-       snprintf(tmp, sizeof(tmp), "core set verbose atleast %d", option_verbose);
-       fdprint(ast_consock, tmp);
-       snprintf(tmp, sizeof(tmp), "core set debug atleast %d", option_debug);
-       fdprint(ast_consock, tmp);
-       if (ast_opt_mute) {
-               ast_copy_string(tmp, "log and verbose output currently muted ('logger unmute' to unmute)", sizeof(tmp));
+       if (!data) {
+               snprintf(tmp, sizeof(tmp), "core set verbose atleast %d", option_verbose);
                fdprint(ast_consock, tmp);
+               snprintf(tmp, sizeof(tmp), "core set debug atleast %d", option_debug);
+               fdprint(ast_consock, tmp);
+               if (!ast_opt_mute)
+                       fdprint(ast_consock, "logger mute silent");
+               else 
+                       printf("log and verbose output currently muted ('logger mute' to unmute)\n");
        }
        ast_verbose("Connected to Asterisk %s currently running on %s (pid = %d)\n", version, hostname, pid);
        remotehostname = hostname;