kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 07:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "channel: Remove ignore of answer on non-outgoing channels."

Browse Source
This commit is contained in:
Matt Jordan
2015-06-30 07:07:09 -05:00
committed by Gerrit Code Review
parent 598a5f0d15 8d6cf667dc
commit 3cd53bd3bc
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/channel.c
View File

@@ -3905,11 +3905,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
switch (f->frametype) { switch (f->frametype) {
case AST_FRAME_CONTROL: case AST_FRAME_CONTROL:
if (f->subclass.integer == AST_CONTROL_ANSWER) { if (f->subclass.integer == AST_CONTROL_ANSWER) {
if (!ast_test_flag(ast_channel_flags(chan), AST_FLAG_OUTGOING)) { if (prestate == AST_STATE_UP && ast_channel_is_bridged(chan)) {
ast_debug(1, "Ignoring answer on an inbound call!\n");
ast_frfree(f);
f = &ast_null_frame;
} else if (prestate == AST_STATE_UP && ast_channel_is_bridged(chan)) {
ast_debug(1, "Dropping duplicate answer!\n"); ast_debug(1, "Dropping duplicate answer!\n");
ast_frfree(f); ast_frfree(f);
f = &ast_null_frame; f = &ast_null_frame;