1) Don't print the verbose marker in front of every message from ast_verbose()

   being sent to remote consoles.

2) Fix pbx_gtkconsole to filter out the verbose marker.

(related to issue #12702)

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

diff --git a/main/asterisk.c b/main/asterisk.c
index ef6c64de67d75d6074540b309a9feec820a1a750..eb4d79d1a68d74ba7148a35f8f0a88b69f6772e8 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -906,6 +906,9 @@ void ast_console_puts(const char *string)
 
 static void network_verboser(const char *s)
 {
+       if (*s == 127) {
+               s++;
+       }
        ast_network_puts_mutable(s);
 }
 

diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c
index 4a4c3ba45ee0cd52928caddedf9935b68fb1385d..75f1c8f10838fc66f4868a23b7957c973893c0a1 100644 (file)
--- a/pbx/pbx_gtkconsole.c
+++ b/pbx/pbx_gtkconsole.c
@@ -139,6 +139,10 @@ static void __verboser(const char *_stuff)
 
 static void verboser(const char *stuff) 
 {
+       if (*stuff == 127) {
+               stuff++;
+       }
+
        ast_mutex_lock(&verb_lock);
        /* Lock appropriately if we're really being called in verbose mode */
        __verboser(stuff);