Merge "channel: Fix issues in hangup scenarios caused by frame deferral"
This commit is contained in:
commit
97b2ba472d
|
@ -972,6 +972,11 @@ enum {
|
||||||
* frames should be deferred.
|
* frames should be deferred.
|
||||||
*/
|
*/
|
||||||
AST_FLAG_DEFER_FRAMES = (1 << 28),
|
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 */
|
/*! \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
|
* 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.
|
* 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
|
* \pre chan MUST be locked before calling
|
||||||
*
|
*
|
||||||
* \param chan The channel on which frames should be deferred
|
* \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
|
* \brief Stop deferring deferrable frames on this channel
|
||||||
|
|
|
@ -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;
|
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)
|
if (!as->orig_end_dtmf_flag)
|
||||||
ast_set_flag(ast_channel_flags(chan), AST_FLAG_END_DTMF_ONLY);
|
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_channel_unlock(chan);
|
||||||
|
|
||||||
AST_LIST_LOCK(&aslist);
|
AST_LIST_LOCK(&aslist);
|
||||||
|
|
|
@ -1062,9 +1062,10 @@ struct ast_channel *__ast_dummy_channel_alloc(const char *file, int line, const
|
||||||
return tmp;
|
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_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)
|
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_lock(chan);
|
||||||
ast_channel_start_defer_frames(chan);
|
ast_channel_start_defer_frames(chan, 0);
|
||||||
ast_channel_unlock(chan);
|
ast_channel_unlock(chan);
|
||||||
|
|
||||||
start = ast_tvnow();
|
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)) {
|
if (ast_test_flag(ast_channel_flags(chan), AST_FLAG_DEFER_FRAMES)) {
|
||||||
AST_LIST_TRAVERSE_SAFE_BEGIN(ast_channel_readq(chan), f, frame_list) {
|
AST_LIST_TRAVERSE_SAFE_BEGIN(ast_channel_readq(chan), f, frame_list) {
|
||||||
if (ast_is_deferrable_frame(f)) {
|
if (ast_is_deferrable_frame(f)) {
|
||||||
if (f->frametype == AST_FRAME_CONTROL && f->subclass.integer == AST_CONTROL_HANGUP) {
|
if(f->frametype == AST_FRAME_CONTROL &&
|
||||||
struct ast_frame *dup;
|
(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
|
/* 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
|
* 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.
|
* 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
|
* when frame deferral finishes, then whoever calls ast_read() next will also get
|
||||||
* the hangup.
|
* the hangup.
|
||||||
*/
|
*/
|
||||||
dup = ast_frdup(f);
|
if (ast_test_flag(ast_channel_flags(chan), AST_FLAG_DEFER_HANGUP_FRAMES)) {
|
||||||
AST_LIST_INSERT_TAIL(ast_channel_deferred_readq(chan), dup, frame_list);
|
struct ast_frame *dup;
|
||||||
|
|
||||||
|
dup = ast_frdup(f);
|
||||||
|
AST_LIST_INSERT_TAIL(ast_channel_deferred_readq(chan), dup, frame_list);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
AST_LIST_INSERT_TAIL(ast_channel_deferred_readq(chan), f, frame_list);
|
AST_LIST_INSERT_TAIL(ast_channel_deferred_readq(chan), f, frame_list);
|
||||||
AST_LIST_REMOVE_CURRENT(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_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);
|
ast_channel_unlock(macro_chan);
|
||||||
|
|
||||||
retval = ast_app_run_macro(autoservice_chan, macro_chan, macro, macro_args);
|
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_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);
|
ast_channel_unlock(macro_chan);
|
||||||
|
|
||||||
retval = ast_app_run_macro(autoservice_chan, macro_chan, macro, macro_args);
|
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_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);
|
ast_channel_unlock(sub_chan);
|
||||||
|
|
||||||
retval = ast_app_run_sub(autoservice_chan, sub_chan, sub, sub_args, 0);
|
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_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);
|
ast_channel_unlock(sub_chan);
|
||||||
|
|
||||||
retval = ast_app_run_sub(autoservice_chan, sub_chan, sub, sub_args, 0);
|
retval = ast_app_run_sub(autoservice_chan, sub_chan, sub, sub_args, 0);
|
||||||
|
|
Loading…
Reference in New Issue