FS-9916: [mod_spandsp] OB fax calls go zombie #resolve

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 6245918fa662b0f892bbbb4104ac1d243ef3a079..3b3cc9af721bc0c28db006eee330aee1fcd6053c 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1098,8 +1098,6 @@ static switch_status_t sofia_write_video_frame(switch_core_session_t *session, s
 static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
 {
        private_object_t *tech_pvt = switch_core_session_get_private(session);
-       switch_channel_t *channel = switch_core_session_get_channel(session);
-       uint32_t sanity = 1000;
        switch_status_t status = SWITCH_STATUS_FALSE;
 
        switch_assert(tech_pvt != NULL);
@@ -1113,18 +1111,10 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
                return SWITCH_STATUS_FALSE;
        }
 
-       while (!(switch_core_media_ready(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO))){// && !switch_channel_test_flag(channel, CF_REQ_MEDIA))) {
-               switch_ivr_parse_all_messages(tech_pvt->session);
-
-               if (--sanity && switch_channel_up(channel)) {
-                       switch_yield(10000);
-               } else {
-                       switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_RECOVERY_ON_TIMER_EXPIRE);
-                       return SWITCH_STATUS_GENERR;
-               }
+       if (!(switch_core_media_ready(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO))){
+               return SWITCH_STATUS_INUSE;
        }
 
-
        sofia_set_flag_locked(tech_pvt, TFLAG_READING);
 
        if (sofia_test_flag(tech_pvt, TFLAG_HUP) || sofia_test_flag(tech_pvt, TFLAG_BYE)) {
@@ -1146,14 +1136,26 @@ static switch_status_t sofia_write_frame(switch_core_session_t *session, switch_
 
        switch_assert(tech_pvt != NULL);
 
-       while (!(switch_core_media_ready(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO) && !switch_channel_test_flag(channel, CF_REQ_MEDIA))) {
-               if (switch_channel_ready(channel)) {
-                       switch_yield(10000);
+
+       if (!switch_core_media_ready(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO)) {
+               if (switch_channel_up_nosig(channel)) {
+                       return SWITCH_STATUS_SUCCESS;
                } else {
                        return SWITCH_STATUS_GENERR;
                }
        }
 
+       if (switch_channel_test_flag(channel, CF_REQ_MEDIA)) {
+               if (++tech_pvt->req_media_counter > 2000) {
+                       switch_channel_clear_flag(channel, CF_REQ_MEDIA);
+                       switch_channel_hangup(channel, SWITCH_CAUSE_RECOVERY_ON_TIMER_EXPIRE);
+                       return SWITCH_STATUS_FALSE;
+               } else {
+                       return SWITCH_STATUS_SUCCESS;
+               }
+       } else {
+               tech_pvt->req_media_counter = 0;
+       }
 
        if (sofia_test_flag(tech_pvt, TFLAG_HUP)) {
                return SWITCH_STATUS_FALSE;

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index 34040912c178f51b9766cb52c7902d72ac336831..a66fc92420a9a451fd6994d17597413fad9dc3a2 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -855,6 +855,7 @@ struct private_object {
        uint32_t sent_invites;
        uint32_t recv_invites;
        uint8_t sent_last_invite;
+       uint32_t req_media_counter;
 };