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

Merged revisions 115333 via svnmerge from

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

........
r115333 | tilghman | 2008-05-05 17:50:31 -0500 (Mon, 05 May 2008) | 7 lines

Separate verbose output from CLI output, by using a preamble.
(closes issue #12402)
 Reported by: Corydon76
 Patches: 
       20080410__no_verbose_in_rx_output.diff.txt uploaded by Corydon76 (license 14)
       20080501__no_verbose_in_rx_output__1.4.diff.txt uploaded by Corydon76 (license 14)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115334 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-05-05 23:00:31 +00:00
parent 276118a776
commit e82b7365b7
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
main/asterisk.c
View File

@@ -1420,6 +1420,12 @@ static void __quit_handler(int num)
static const char *fix_header(char *outbuf, int maxout, const char *s, char *cmp)
{
const char *c;
/* Check for verboser preamble */
if (*s == 127) {
s++;
}
if (!strncmp(s, cmp, strlen(cmp))) {
c = s + strlen(cmp);
term_color(outbuf, cmp, COLOR_GRAY, 0, maxout);
@@ -1928,6 +1934,7 @@ static int ast_el_read_char(EditLine *el, char *cp)
buf[res] = '\0';
/* Write over the CLI prompt */
if (!ast_opt_exec && !lastpos)
write(STDOUT_FILENO, "\r", 1);
write(STDOUT_FILENO, buf, res);
@@ -2425,13 +2432,38 @@ static void ast_remotecontrol(char * data)
ast_el_read_history(filename);
if (ast_opt_exec && data) { /* hack to print output then exit if asterisk -rx is used */
char tempchar;
struct pollfd fds;
fds.fd = ast_consock;
fds.events = POLLIN;
fds.revents = 0;
while (poll(&fds, 1, 100) > 0)
ast_el_read_char(el, &tempchar);
while (poll(&fds, 1, 500) > 0) {
char buf[512] = "", *curline = buf, *nextline;
int not_written = 1;
if (read(ast_consock, buf, sizeof(buf) - 1) < 0) {
break;
}
do {
if ((nextline = strchr(curline, '\n'))) {
nextline++;
} else {
nextline = strchr(curline, '\0');
}
/* Skip verbose lines */
if (*curline != 127) {
not_written = 0;
write(STDOUT_FILENO, curline, nextline - curline + (*nextline == '\0' ? 1 : 0));
}
curline = nextline;
} while (!ast_strlen_zero(curline));
/* No non-verbose output in 500ms */
if (not_written) {
break;
}
}
return;
}
for (;;) {

8
main/logger.c
View File

@@ -1176,8 +1176,12 @@ void ast_verbose(const char *fmt, ...)
ast_localtime(&tv, &tm, NULL);
ast_strftime(date, sizeof(date), dateformat, &tm);
datefmt = alloca(strlen(date) + 3 + strlen(fmt) + 1);
sprintf(datefmt, "[%s] %s", date, fmt);
sprintf(datefmt, "%c[%s] %s", 127, date, fmt);
fmt = datefmt;
} else {
char *tmp = alloca(strlen(fmt) + 2);
sprintf(tmp, "%c%s", 127, fmt);
fmt = tmp;
}
/* Build string */
@@ -1194,7 +1198,7 @@ void ast_verbose(const char *fmt, ...)
strcpy(logmsg->str, buf->str);
ast_log(LOG_VERBOSE, "%s", logmsg->str);
ast_log(LOG_VERBOSE, "%s", logmsg->str + 1);
/* Set type */
logmsg->type = LOGMSG_VERBOSE;