partial rollback of ec6754262863475136c6a53b012eb7b0bb62d7ba to fix skinny breakage

diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c
index f5c01481d4d155209bfc3aa40938e3f0c84f444e..6845ab2070b289b28fcefd0beae4756901df2df2 100644 (file)
--- a/src/mod/endpoints/mod_skinny/mod_skinny.c
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.c
@@ -1051,39 +1051,26 @@ switch_status_t channel_receive_message(switch_core_session_t *session, switch_c
        private_t *tech_pvt = switch_core_session_get_private(session);
 
        switch (msg->message_id) {
-       case SWITCH_MESSAGE_INDICATE_ANSWER:
-               switch_clear_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
-               return channel_answer_channel(session);
-               
-       case SWITCH_MESSAGE_INDICATE_DISPLAY:
-               skinny_session_send_call_info_all(session);
-               break;
-
-       case SWITCH_MESSAGE_INDICATE_PROGRESS:
-               if (!switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) {
-                       /* early media */
-                       switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
+               case SWITCH_MESSAGE_INDICATE_ANSWER:
+                       switch_clear_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
                        return channel_answer_channel(session);
-               }
-               break;
-               
-       case SWITCH_MESSAGE_INDICATE_BRIDGE:
-               if (switch_rtp_ready(tech_pvt->rtp_session)) {
-                       rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_STICK);
-               }
-               break;
-       case SWITCH_MESSAGE_INDICATE_UNBRIDGE:
-               if (switch_rtp_ready(tech_pvt->rtp_session)) {
-                       rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_UNSTICK);
-               }
-               break;
-               
-       default:
-               break;
-                       
-       }
 
-       return SWITCH_STATUS_SUCCESS;
+               case SWITCH_MESSAGE_INDICATE_DISPLAY:
+                       skinny_session_send_call_info_all(session);
+                       return SWITCH_STATUS_SUCCESS;
+
+               case SWITCH_MESSAGE_INDICATE_PROGRESS:
+                       if (!switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) {
+                               /* early media */
+                               switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
+                               return channel_answer_channel(session);
+                       }
+                       return SWITCH_STATUS_SUCCESS;
+
+               default:
+                       return SWITCH_STATUS_SUCCESS;
+
+       }
 
 }
 

diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c
index 0cbde82e47842af65d845203909aeb868528edfa..c3c8f9029b0f0ea027b1f41f5a81551ad37a12f3 100644 (file)
--- a/src/mod/endpoints/mod_skinny/skinny_server.c
+++ b/src/mod/endpoints/mod_skinny/skinny_server.c
@@ -1734,10 +1734,6 @@ switch_status_t skinny_handle_open_receive_channel_ack_message(listener_t *liste
                struct in_addr addr;
                switch_rtp_flag_t flags[SWITCH_RTP_FLAG_INVALID] = {0};
 
-               flags[SWITCH_RTP_FLAG_DATAWAIT]++;
-               flags[SWITCH_RTP_FLAG_AUTOADJ]++;
-               flags[SWITCH_RTP_FLAG_RAW_WRITE]++;
-
                tech_pvt = switch_core_session_get_private(session);
                channel = switch_core_session_get_channel(session);