diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-06-30 07:07:13 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-06-30 07:07:13 -0500 |
| commit | 4c0b26b9e866052612f11e55783bb2d835e5d55f (patch) | |
| tree | 10e33594c0a8ba4aed3ac0ae74afa39e46e2e184 /main | |
| parent | bfa5d38a1b49670f744cc1dc0bb91a1bca26691e (diff) | |
| parent | e4a2ef9e4ef27488609bb01fc55e965cd93a9ad5 (diff) | |
Merge "channel: Remove ignore of answer on non-outgoing channels." into 13
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/main/channel.c b/main/channel.c index fa03f65e6..57523d71a 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3905,11 +3905,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) switch (f->frametype) { case AST_FRAME_CONTROL: if (f->subclass.integer == AST_CONTROL_ANSWER) { - if (!ast_test_flag(ast_channel_flags(chan), AST_FLAG_OUTGOING)) { - 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)) { + if (prestate == AST_STATE_UP && ast_channel_is_bridged(chan)) { ast_debug(1, "Dropping duplicate answer!\n"); ast_frfree(f); f = &ast_null_frame; |