dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Handle timing file descriptor properly with agents 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1409 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2003-08-23 02:11:44 +00:00
parent 9664c9e891
commit 8cc1311826
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/app_queue.c
View File

@ -817,7 +817,6 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri
res2 = ast_autoservice_start(qe->chan);
if (!res2)
res2 = ast_streamfile(peer, announce, peer->language);
/* XXX Need a function to wait on *both* streams XXX */
if (!res2)
res2 = ast_waitstream(peer, "");
res2 |= ast_autoservice_stop(qe->chan);

1
channel.c
View File

@ -1542,7 +1542,6 @@ struct ast_channel *ast_request(char *type, int format, void *data)
if (chan->requester)
c = chan->requester(type, capabilities, data);
if (c) {
// ast_device_state_changed(c->name);
if (c->_state == AST_STATE_DOWN) {
manager_event(EVENT_FLAG_CALL, "Newchannel",
"Channel: %s\r\n"

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;