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

Merge "res_agi: Prevent run_agi from eating frames it shouldn't" into 13

Browse Source
This commit is contained in:
zuul
2016-04-25 11:49:18 -05:00
committed by Gerrit Code Review
parent 13ee3402ed eb7c581806
commit a8f8e3c340
1 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
res/res_agi.c
View File

@@ -3736,6 +3736,24 @@ static enum agi_result agi_handle_command(struct ast_channel *chan, AGI *agi, ch
return AGI_RESULT_SUCCESS;
}
AST_LIST_HEAD_NOLOCK(deferred_frames, ast_frame);
static void queue_deferred_frames(struct deferred_frames *deferred_frames,
struct ast_channel *chan)
{
struct ast_frame *f;
if (!AST_LIST_EMPTY(deferred_frames)) {
ast_channel_lock(chan);
while ((f = AST_LIST_REMOVE_HEAD(deferred_frames, frame_list))) {
ast_queue_frame_head(chan, f);
ast_frfree(f);
}
ast_channel_unlock(chan);
}
}
static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi, int pid, int *status, int dead, int argc, char *argv[])
{
struct ast_channel *c;
@@ -3754,6 +3772,9 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi
const char *sighup_str;
const char *exit_on_hangup_str;
int exit_on_hangup;
struct deferred_frames deferred_frames;
AST_LIST_HEAD_INIT_NOLOCK(&deferred_frames);
ast_channel_lock(chan);
sighup_str = pbx_builtin_getvar_helper(chan, "AGISIGHUP");
@@ -3815,8 +3836,20 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi
/* Write, ignoring errors */
if (write(agi->audio, f->data.ptr, f->datalen) < 0) {
}
ast_frfree(f);
} else if (ast_is_deferrable_frame(f)) {
struct ast_frame *dup_f;
if ((dup_f = ast_frisolate(f))) {
AST_LIST_INSERT_HEAD(&deferred_frames, dup_f, frame_list);
}
if (dup_f != f) {
ast_frfree(f);
}
} else {
ast_frfree(f);
}
ast_frfree(f);
}
} else if (outfd > -1) {
size_t len = sizeof(buf);
@@ -3864,6 +3897,8 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi
buf[buflen - 1] = '\0';
}
queue_deferred_frames(&deferred_frames, chan);
if (agidebug)
ast_verbose("<%s>AGI Rx << %s\n", ast_channel_name(chan), buf);
cmd_status = agi_handle_command(chan, agi, buf, dead);
@@ -3885,6 +3920,9 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi
}
}
}
queue_deferred_frames(&deferred_frames, chan);
if (agi->speech) {
ast_speech_destroy(agi->speech);
}