channel: Fix issues in hangup scenarios caused by frame deferral

ASTERISK-26343

Change-Id: I06dbf7366e26028251964143454a77d017bb61c8
(cherry picked from commit 0be46aaf6b8b9eb5b0160ec591cdc2c6e1802a6d)
(cherry picked from commit 7263a17ca046923c245296a3cee21df0e4bd499a)
(cherry picked from commit ebf8d94eb2f0d14b824ee6243789870325583624)

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index cf8c5447b87263cc71167e3afbdc6b2f3c65bbbc..a962a5f295c6b93d0a3a2f1f6ae80578b4416051 100644 (file)
--- 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 */
@@ -4680,11 +4685,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 1af052d08891af58be61ba3d31178534add70fc3..a68860d2e3224f8085fa3a53354c66681598d074 100644 (file)
--- 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 f00f222c98571e9c535c5658f50c01603573968c..52e0a2ce42652638b4ab2b1106b931d2a3e5431f 100644 (file)
--- 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);
@@ -10261,6 +10270,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);
@@ -10311,6 +10321,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);
@@ -10354,6 +10365,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);
@@ -10397,6 +10409,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);