make channel hangup with media_timeout cause when rtp timeout occurs

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6095 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 4ecf00b362b29a2aea8e0272061cd14d0112e29c..768c438e0357e070e59133c8f7830547c4d53d57 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -1006,7 +1006,8 @@ typedef enum {
        SWITCH_CAUSE_BLIND_TRANSFER = 600,
        SWITCH_CAUSE_ATTENDED_TRANSFER = 601,
        SWITCH_CAUSE_ALLOTTED_TIMEOUT = 602,
-       SWITCH_CAUSE_USER_CHALLENGE = 603
+       SWITCH_CAUSE_USER_CHALLENGE = 603,
+       SWITCH_CAUSE_MEDIA_TIMEOUT = 604
 } switch_call_cause_t;
 
 typedef enum {

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 36e6002433b94a0e5ebcaeefda8ec6e7bff3aba4..b8401c2b7ffd4a7c91e04c51d2bb7343157de9b6 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -387,7 +387,10 @@ static switch_status_t sofia_read_video_frame(switch_core_session_t *session, sw
 
                        status = switch_rtp_zerocopy_read_frame(tech_pvt->video_rtp_session, &tech_pvt->video_read_frame);
                        if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
-                               return SWITCH_STATUS_FALSE;
+                               if (status == SWITCH_STATUS_TIMEOUT) {
+                                       switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT);
+                               }
+                               return status;
                        }
                        
                        payload = tech_pvt->video_read_frame.payload;
@@ -492,11 +495,12 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
 
                        status = switch_rtp_zerocopy_read_frame(tech_pvt->rtp_session, &tech_pvt->read_frame);
                        if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
-                               return SWITCH_STATUS_FALSE;
+                               if (status == SWITCH_STATUS_TIMEOUT) {
+                                       switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT);
+                               }
+                               return status;
                        }
-
-
-
+                       
                        payload = tech_pvt->read_frame.payload;
 
                        if (switch_rtp_has_dtmf(tech_pvt->rtp_session)) {

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 0a635d550a51c1779f65bf9e202b9166a7d465a1..abd7502f57f8fdd46b8631349635eef4dbf649a4 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -97,6 +97,7 @@ static struct switch_cause_table CAUSE_CHART[] = {
        {"ATTENDED_TRANSFER", SWITCH_CAUSE_ATTENDED_TRANSFER},
        {"ALLOTTED_TIMEOUT", SWITCH_CAUSE_ALLOTTED_TIMEOUT},
        {"USER_CHALLENGE", SWITCH_CAUSE_USER_CHALLENGE},
+       {"MEDIA_TIMEOUT", SWITCH_CAUSE_MEDIA_TIMEOUT},
        {NULL, 0}
 };
 

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index e0c554999c4a938990ef0086287f5de8e35c5f90..d78f0368407a4155127cbd4886f74b5343bd329c 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -906,7 +906,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
                        do_2833(rtp_session);
                        if (!bytes && rtp_session->max_missed_packets) {
                                if (++rtp_session->missed_count >= rtp_session->max_missed_packets) {
-                                       return -1;
+                                       return -2;
                                }
                        }
                        
@@ -1204,7 +1204,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_read(switch_rtp_t *rtp_session, void
 
        if (bytes < 0) {
                *datalen = 0;
-               return SWITCH_STATUS_GENERR;
+               return bytes == -2 ? SWITCH_STATUS_TIMEOUT : SWITCH_STATUS_GENERR;
        } else if (bytes == 0) {
                *datalen = 0;
                return SWITCH_STATUS_BREAK;
@@ -1244,7 +1244,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp
 
        if (bytes < 0) {
                frame->datalen = 0;
-               return SWITCH_STATUS_GENERR;
+               return bytes == -2 ? SWITCH_STATUS_TIMEOUT : SWITCH_STATUS_GENERR;
        } else if (bytes == 0) {
                frame->datalen = 0;
                return SWITCH_STATUS_BREAK;