kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle timing file descriptor properly with agents

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1409 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-08-23 02:11:44 +00:00
parent 6b8998b8ec
commit 1f628fe5f9
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
channels/chan_agent.c
View File

@@ -128,11 +128,18 @@ static struct agent_pvt {
} \
} while(0)
/* Cleanup moves all the relevant FD's from the 2nd to the first, but retains things
properly for a timingfd XXX This might need more work if agents were logged in as agents or other
totally impractical combinations XXX */
#define CLEANUP(ast, p) do { \
int x; \
if (p->chan) { \
for (x=0;x<AST_MAX_FDS;x++) \
ast->fds[x] = p->chan->fds[x]; \
for (x=0;x<AST_MAX_FDS;x++) {\
if (x != AST_MAX_FDS - 2) \
ast->fds[x] = p->chan->fds[x]; \
} \
ast->fds[AST_MAX_FDS - 3] = p->chan->fds[AST_MAX_FDS - 2]; \
} \
} while(0)
@@ -247,7 +254,10 @@ static struct ast_frame *agent_read(struct ast_channel *ast)
CHECK_FORMATS(ast, p);
if (p->chan) {
p->chan->exception = ast->exception;
p->chan->fdno = ast->fdno;
if (ast->fdno == AST_MAX_FDS - 3)
p->chan->fdno = AST_MAX_FDS - 2;
else
p->chan->fdno = ast->fdno;
f = ast_read(p->chan);
} else
f = &null_frame;