dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 313615 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r313615 | rmudgett | 2011-04-13 12:18:49 -0500 (Wed, 13 Apr 2011) | 5 lines
  
  * Add missing channel lock to handle_cli_agi_add_cmd().
  
  * Flush any Async AGI commands left over from earlier Async AGI control of
  the call.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@313629 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rmudgett 2011-04-13 17:21:50 +00:00
parent 3de0f5e8b2
commit f5d7b06ff4
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_agi.c
View File

@ -1115,6 +1115,8 @@ static char *handle_cli_agi_add_cmd(struct ast_cli_entry *e, int cmd, struct ast
return CLI_FAILURE;
}
ast_channel_lock(chan);
if (add_agi_cmd(chan, a->argv[3], (a->argc > 4 ? a->argv[4] : ""))) {
ast_log(LOG_WARNING, "failed to add AGI command to queue of channel %s\n", chan->name);
ast_channel_unlock(chan);
@ -1221,6 +1223,11 @@ static enum agi_result launch_asyncagi(struct ast_channel *chan, char *argv[], i
return AGI_RESULT_FAILURE;
}
/* Flush any stale commands. */
while ((cmd = get_agi_cmd(chan))) {
free_agi_cmd(cmd);
}
/* this pipe allows us to create a "fake" AGI struct to use
the AGI commands */
res = pipe(fds);