Fix a calculation error I had made in the poll. The poll

would reset to 500 ms every time a non-voice frame
was received. The total time we poll should be 500 ms, so
now we save the amount of time left after the poll returned
and use that as our argument for the next call to poll

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

diff --git a/main/channel.c b/main/channel.c
index 2ab138279b34afd08d116d59d2c2a6f8bd3b848e..f23ccc5c45fc1f19a71e99858a4936870f26c9ce 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -1679,17 +1679,20 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
                        ast_safe_sleep(chan, delay);
                else {
                        struct ast_frame *f;
+                       int ms = ANSWER_WAIT_MS;
                        while (1) {
                                /* 500 ms was the original delay here, so now
                                 * we cap our waiting at 500 ms
                                 */
-                               res = ast_waitfor(chan, ANSWER_WAIT_MS);
-                               if (res < 0) {
+                               ms = ast_waitfor(chan, ms);
+                               if (ms < 0) {
                                        ast_log(LOG_WARNING, "Error condition occurred when polling channel %s for a voice frame: %s\n", chan->name, strerror(errno));
+                                       res = -1;
                                        break;
                                }
-                               if (res == 0) {
+                               if (ms == 0) {
                                        ast_debug(2, "Didn't receive a voice frame from %s within %d ms of answering. Continuing anyway\n", chan->name, ANSWER_WAIT_MS);
+                                       res = 0;
                                        break;
                                }
                                f = ast_read(chan);