Don't ask me why, but waitfordigit will immediately return a 1 on my system, unless the outfd is initialized to -1 before calling the nandfds func

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Steve Murphy 18 years ago
parent 94b1dda1fa
commit 4f98b05cd5

@ -6079,6 +6079,7 @@ static void *ss_thread(void *data)
ast_hangup(chan); ast_hangup(chan);
return NULL; return NULL;
} else if (res) { } else if (res) {
ast_debug(1,"waitfordigit returned '%c' (%d), timeout = %d\n", res, res, timeout);
exten[len++]=res; exten[len++]=res;
exten[len] = '\0'; exten[len] = '\0';
} }

@ -1991,12 +1991,14 @@ int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd)
if (ast_test_flag(c, AST_FLAG_ZOMBIE) || ast_check_hangup(c)) if (ast_test_flag(c, AST_FLAG_ZOMBIE) || ast_check_hangup(c))
return -1; return -1;
/* Wait for a digit, no more than ms milliseconds total. */ /* Wait for a digit, no more than ms milliseconds total. */
while (ms) { while (ms) {
struct ast_channel *rchan; struct ast_channel *rchan;
int outfd; int outfd=-1;
errno = 0; errno = 0;
rchan = ast_waitfor_nandfds(&c, 1, &cmdfd, (cmdfd > -1) ? 1 : 0, NULL, &outfd, &ms); rchan = ast_waitfor_nandfds(&c, 1, &cmdfd, (cmdfd > -1) ? 1 : 0, NULL, &outfd, &ms);
if (!rchan && outfd < 0 && ms) { if (!rchan && outfd < 0 && ms) {
if (errno == 0 || errno == EINTR) if (errno == 0 || errno == EINTR)
continue; continue;
@ -2004,6 +2006,7 @@ int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd)
return -1; return -1;
} else if (outfd > -1) { } else if (outfd > -1) {
/* The FD we were watching has something waiting */ /* The FD we were watching has something waiting */
ast_log(LOG_WARNING, "The FD we were waiting for has something waiting. Waitfordigit returning numeric 1\n");
return 1; return 1;
} else if (rchan) { } else if (rchan) {
int res; int res;

Loading…
Cancel
Save