Merged revisions 7433,7435 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Mon, 12 Dec 2005 17:31:45 +0000 (17:31 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Mon, 12 Dec 2005 17:31:45 +0000 (17:31 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7433 | tilghman | 2005-12-12 11:19:29 -0600 (Mon, 12 Dec 2005) | 2 lines

Typo

........
r7435 | kpfleming | 2005-12-12 11:30:59 -0600 (Mon, 12 Dec 2005) | 2 lines

set all the child file descriptors to non-blocking so that we don't hang if the child fails to send a newline-terminated command or error message

........

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

apps/app_externalivr.c

index 54b730b..ad27c16 100644 (file)
@@ -345,8 +345,6 @@ static int app_exec(struct ast_channel *chan, void *data)
                        goto exit;
                }
 
-               setvbuf(child_events, NULL, _IONBF, 0);
-
                if (!(child_commands = fdopen(child_commands_fd, "r"))) {
                        ast_chan_log(LOG_WARNING, chan, "Could not open stream for child commands\n");
                        goto exit;
@@ -357,6 +355,10 @@ static int app_exec(struct ast_channel *chan, void *data)
                        goto exit;
                }
 
+               setvbuf(child_events, NULL, _IONBF, 0);
+               setvbuf(child_commands, NULL, _IONBF, 0);
+               setvbuf(child_errors, NULL, _IONBF, 0);
+
                res = 0;
 
                while (1) {