From df81c56d1365a5d81d8c46aa4235ae7737d2dcc1 Mon Sep 17 00:00:00 2001 From: markster Date: Mon, 30 Jan 2006 03:13:33 +0000 Subject: Merge Rizzo's waitfor update (bug #4584) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8877 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_agent.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'channels/chan_agent.c') diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 89e21ef43..3299aa02e 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -233,10 +233,10 @@ static AST_LIST_HEAD_STATIC(agents, agent_pvt); /**< Holds the list of agents (l int x; \ if (p->chan) { \ for (x=0;xfds[x] = p->chan->fds[x]; \ } \ - ast->fds[AST_MAX_FDS - 3] = p->chan->fds[AST_MAX_FDS - 2]; \ + ast->fds[AST_AGENT_FD] = p->chan->fds[AST_TIMING_FD]; \ } \ } while(0) @@ -445,10 +445,7 @@ static struct ast_frame *agent_read(struct ast_channel *ast) CHECK_FORMATS(ast, p); if (p->chan) { ast_copy_flags(p->chan, ast, AST_FLAG_EXCEPTION); - if (ast->fdno == AST_MAX_FDS - 3) - p->chan->fdno = AST_MAX_FDS - 2; - else - p->chan->fdno = ast->fdno; + p->chan->fdno = (ast->fdno == AST_AGENT_FD) ? AST_TIMING_FD : ast->fdno; f = ast_read(p->chan); } else f = &null_frame; -- cgit v1.2.3