diff options
author | Joshua Colp <jcolp@digium.com> | 2016-11-16 16:55:39 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-11-16 16:55:39 -0600 |
commit | aa1482aed4e837b7d8980899ebe2a3ee07b8149e (patch) | |
tree | 596dd6b30e9f0bbfe1152c62ca8cfabd84942be9 | |
parent | caa207bc4f397466f6f811ecf2f11e99fd5eab1a (diff) | |
parent | ac6051c302d8e5b858e86dd4ed8bb452328858d0 (diff) |
Merge "channel: Fix issues in hangup scenarios caused by frame deferral" into 14
-rw-r--r-- | include/asterisk/channel.h | 13 | ||||
-rw-r--r-- | main/autoservice.c | 1 | ||||
-rw-r--r-- | main/channel.c | 25 |
3 files changed, 32 insertions, 7 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 58d9a0480..9745bc220 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -972,6 +972,11 @@ enum { * frames should be deferred. */ AST_FLAG_DEFER_FRAMES = (1 << 28), + /*! + * The channel is currently deferring hangup frames + * in addition to other frame types. + */ + AST_FLAG_DEFER_HANGUP_FRAMES = (1 << 29), }; /*! \brief ast_bridge_config flags */ @@ -4710,11 +4715,17 @@ struct ast_readq_list *ast_channel_deferred_readq(struct ast_channel *chan); * drop important frames. This function can be called so that important frames * will be deferred, rather than placed in the channel frame queue as normal. * + * Hangups are an interesting frame type. Hangups will always be detectable by + * a reader when a channel is deferring frames. If the defer_hangups parameter + * is non-zero, then the hangup frame will also be duplicated and deferred, so + * that the next reader of the channel will get the hangup frame, too. + * * \pre chan MUST be locked before calling * * \param chan The channel on which frames should be deferred + * \param defer_hangups Defer hangups in addition to other deferrable frames */ -void ast_channel_start_defer_frames(struct ast_channel *chan); +void ast_channel_start_defer_frames(struct ast_channel *chan, int defer_hangups); /*! * \brief Stop deferring deferrable frames on this channel diff --git a/main/autoservice.c b/main/autoservice.c index 1af052d08..a68860d2e 100644 --- a/main/autoservice.c +++ b/main/autoservice.c @@ -217,6 +217,7 @@ int ast_autoservice_start(struct ast_channel *chan) as->orig_end_dtmf_flag = ast_test_flag(ast_channel_flags(chan), AST_FLAG_END_DTMF_ONLY) ? 1 : 0; if (!as->orig_end_dtmf_flag) ast_set_flag(ast_channel_flags(chan), AST_FLAG_END_DTMF_ONLY); + ast_channel_start_defer_frames(chan, 1); ast_channel_unlock(chan); AST_LIST_LOCK(&aslist); diff --git a/main/channel.c b/main/channel.c index eac7b8677..e658c816d 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1064,9 +1064,10 @@ struct ast_channel *__ast_dummy_channel_alloc(const char *file, int line, const return tmp; } -void ast_channel_start_defer_frames(struct ast_channel *chan) +void ast_channel_start_defer_frames(struct ast_channel *chan, int defer_hangups) { ast_set_flag(ast_channel_flags(chan), AST_FLAG_DEFER_FRAMES); + ast_set2_flag(ast_channel_flags(chan), defer_hangups, AST_FLAG_DEFER_HANGUP_FRAMES); } void ast_channel_stop_defer_frames(struct ast_channel *chan) @@ -1555,6 +1556,10 @@ int ast_safe_sleep_conditional(struct ast_channel *chan, int timeout_ms, int (*c silgen = ast_channel_start_silence_generator(chan); } + ast_channel_lock(chan); + ast_channel_start_defer_frames(chan, 0); + ast_channel_unlock(chan); + start = ast_tvnow(); while ((ms = ast_remaining_ms(start, timeout_ms))) { struct ast_frame *dup_f = NULL; @@ -3907,9 +3912,9 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) if (ast_test_flag(ast_channel_flags(chan), AST_FLAG_DEFER_FRAMES)) { AST_LIST_TRAVERSE_SAFE_BEGIN(ast_channel_readq(chan), f, frame_list) { if (ast_is_deferrable_frame(f)) { - if (f->frametype == AST_FRAME_CONTROL && f->subclass.integer == AST_CONTROL_HANGUP) { - struct ast_frame *dup; - + if(f->frametype == AST_FRAME_CONTROL && + (f->subclass.integer == AST_CONTROL_HANGUP || + f->subclass.integer == AST_CONTROL_END_OF_Q)) { /* Hangup is a special case. We want to defer the frame, but we also do not * want to remove it from the frame queue. So rather than just moving the frame * over, we duplicate it and move the copy to the deferred readq. @@ -3919,8 +3924,12 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) * when frame deferral finishes, then whoever calls ast_read() next will also get * the hangup. */ - dup = ast_frdup(f); - AST_LIST_INSERT_TAIL(ast_channel_deferred_readq(chan), dup, frame_list); + if (ast_test_flag(ast_channel_flags(chan), AST_FLAG_DEFER_HANGUP_FRAMES)) { + struct ast_frame *dup; + + dup = ast_frdup(f); + AST_LIST_INSERT_TAIL(ast_channel_deferred_readq(chan), dup, frame_list); + } } else { AST_LIST_INSERT_TAIL(ast_channel_deferred_readq(chan), f, frame_list); AST_LIST_REMOVE_CURRENT(frame_list); @@ -10301,6 +10310,7 @@ int ast_channel_connected_line_macro(struct ast_channel *autoservice_chan, struc ast_party_connected_line_copy(ast_channel_connected(macro_chan), connected); } + ast_channel_start_defer_frames(macro_chan, 0); ast_channel_unlock(macro_chan); retval = ast_app_run_macro(autoservice_chan, macro_chan, macro, macro_args); @@ -10351,6 +10361,7 @@ int ast_channel_redirecting_macro(struct ast_channel *autoservice_chan, struct a ast_party_redirecting_copy(ast_channel_redirecting(macro_chan), redirecting); } + ast_channel_start_defer_frames(macro_chan, 0); ast_channel_unlock(macro_chan); retval = ast_app_run_macro(autoservice_chan, macro_chan, macro, macro_args); @@ -10394,6 +10405,7 @@ int ast_channel_connected_line_sub(struct ast_channel *autoservice_chan, struct ast_party_connected_line_copy(ast_channel_connected(sub_chan), connected); } + ast_channel_start_defer_frames(sub_chan, 0); ast_channel_unlock(sub_chan); retval = ast_app_run_sub(autoservice_chan, sub_chan, sub, sub_args, 0); @@ -10437,6 +10449,7 @@ int ast_channel_redirecting_sub(struct ast_channel *autoservice_chan, struct ast ast_party_redirecting_copy(ast_channel_redirecting(sub_chan), redirecting); } + ast_channel_start_defer_frames(sub_chan, 0); ast_channel_unlock(sub_chan); retval = ast_app_run_sub(autoservice_chan, sub_chan, sub, sub_args, 0); |