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

* Add missing channel lock to handle_cli_agi_add_cmd().

Browse Source 
* Flush any Async AGI commands left over from earlier Async AGI control of
the call.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@313615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2011-04-13 17:18:49 +00:00
parent b183d64131
commit f6c540157f
1 changed files with 7 additions and 0 deletions
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; return CLI_FAILURE;
} }
ast_channel_lock(chan);
if (add_agi_cmd(chan, a->argv[3], (a->argc > 4 ? a->argv[4] : ""))) { 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_log(LOG_WARNING, "failed to add AGI command to queue of channel %s\n", chan->name);
ast_channel_unlock(chan); 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; 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 /* this pipe allows us to create a "fake" AGI struct to use
the AGI commands */ the AGI commands */
res = pipe(fds); res = pipe(fds);