diff options
| -rw-r--r-- | include/asterisk/channel.h | 13 | ||||
| -rw-r--r-- | main/autoservice.c | 2 | ||||
| -rw-r--r-- | main/channel.c | 27 |
3 files changed, 29 insertions, 13 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 300196648..5c73c777e 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 */ @@ -4720,11 +4725,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 c8a59a639..c3f24276c 100644 --- a/main/autoservice.c +++ b/main/autoservice.c @@ -162,7 +162,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); + 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 917ed329d..bd5f35172 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1062,9 +1062,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) @@ -1551,7 +1552,7 @@ int ast_safe_sleep_conditional(struct ast_channel *chan, int timeout_ms, int (*c } ast_channel_lock(chan); - ast_channel_start_defer_frames(chan); + ast_channel_start_defer_frames(chan, 0); ast_channel_unlock(chan); start = ast_tvnow(); @@ -3884,9 +3885,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. @@ -3896,8 +3897,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); @@ -10302,7 +10307,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); + 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); @@ -10358,7 +10363,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); + 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); @@ -10407,7 +10412,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); + 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); @@ -10456,7 +10461,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); + 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); |