Merged revisions 107960 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r107960 | tilghman | 2008-03-12 00:46:39 -0500 (Wed, 12 Mar 2008) | 4 lines

Revert several changes from revision 102525, as the changes were not
compatible, and, in fact, introduced regressions.
(Closes issue #12190)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107961 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-03-12 05:47:37 +00:00
parent 4206a8f4f6
commit 02519b9df1
3 changed files with 11 additions and 10 deletions

View File

@@ -165,13 +165,14 @@ static void run_ras(struct ast_channel *chan, char *args)
if (res < 0) {
ast_log(LOG_WARNING, "wait4 returned %d: %s\n", res, strerror(errno));
}
if (WIFEXITED(status))
if (WIFEXITED(status)) {
ast_verb(3, "RAS on %s terminated with status %d\n", chan->name, WEXITSTATUS(status));
else if (WIFSIGNALED(status))
ast_verb(3, "RAS on %s terminated with signal %d\n", chan->name, WTERMSIG(status));
else
ast_verbose(VERBOSE_PREFIX_3 "RAS on %s terminated weirdly.\n", chan->name);
} else if (WIFSIGNALED(status)) {
ast_verb(3, "RAS on %s terminated with signal %d\n",
chan->name, WTERMSIG(status));
} else {
ast_verb(3, "RAS on %s terminated weirdly.\n", chan->name);
}
/* Throw back into audio mode */
x = 1;
ioctl(chan->fds[0], ZT_AUDIOMODE, &x);