From 457dbc1b4f83917848e0ebeb7b6546dc2d8b6b63 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 21 May 2008 18:20:11 +0000 Subject: [PATCH] Merged revisions 117507 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r117507 | russell | 2008-05-21 13:19:34 -0500 (Wed, 21 May 2008) | 7 lines 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/trunk@117508 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/asterisk.c | 3 +++ pbx/pbx_gtkconsole.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/main/asterisk.c b/main/asterisk.c index c8a4b2655e..58497fe0df 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -964,6 +964,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 5e47ac6681..a12e139bbd 100644 --- a/pbx/pbx_gtkconsole.c +++ b/pbx/pbx_gtkconsole.c @@ -132,6 +132,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);