diff options
| author | David M. Lee <dlee@digium.com> | 2012-09-13 20:02:56 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2012-09-13 20:02:56 +0000 |
| commit | 192e6a0f7aec9b006b4c24c9cd16cdb2ac96c16c (patch) | |
| tree | 22d71840979f9b7287770e0caca4f5a3fc28d336 /include | |
| parent | fb1d9a90a4e67c832486f35c54dab5b99ef62941 (diff) | |
Fix timeouts for ast_waitfordigit[_full].
ast_waitfordigit_full would simply pass its timeout to ast_waitfor_nandfds,
expecting it to decrement the timeout by however many milliseconds were
waited. This is a problem if it consistently waits less than 1ms. The timeout
will never be decremented, and we wait... FOREVER!
This patch makes ast_waitfordigit_full manage the timeout itself. It maintains
the previously undocumented behavior that negative timeouts wait forever.
(closes issue ASTERISK-20375)
Reported by: Mark Michelson
Tested by: Mark Michelson
Review: https://reviewboard.asterisk.org/r/2109/
........
Merged revisions 373024 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 373025 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 373029 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@373046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 3641a1be2..67e1d4c7c 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1896,7 +1896,7 @@ char *ast_recvtext(struct ast_channel *chan, int timeout); /*! * \brief Waits for a digit * \param c channel to wait for a digit on - * \param ms how many milliseconds to wait + * \param ms how many milliseconds to wait (<0 for indefinite). * \return Returns <0 on error, 0 on no entry, and the digit on success. */ int ast_waitfordigit(struct ast_channel *c, int ms); @@ -1905,7 +1905,7 @@ int ast_waitfordigit(struct ast_channel *c, int ms); * \brief Wait for a digit * Same as ast_waitfordigit() with audio fd for outputting read audio and ctrlfd to monitor for reading. * \param c channel to wait for a digit on - * \param ms how many milliseconds to wait + * \param ms how many milliseconds to wait (<0 for indefinite). * \param audiofd audio file descriptor to write to if audio frames are received * \param ctrlfd control file descriptor to monitor for reading * \return Returns 1 if ctrlfd becomes available |