skypiax: timing on closing audio, mutexing TFLAG_BREAK

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

diff --git a/src/mod/endpoints/mod_skypiax/mod_skypiax.c b/src/mod/endpoints/mod_skypiax/mod_skypiax.c
index 6adb2e1dd20f648479cb2682151ce40606802458..927d02797b943051880236d8acb6b5558dcdb5a3 100644 (file)
--- a/src/mod/endpoints/mod_skypiax/mod_skypiax.c
+++ b/src/mod/endpoints/mod_skypiax/mod_skypiax.c
@@ -599,7 +599,7 @@ static switch_status_t channel_kill_channel(switch_core_session_t *session, int
        switch (sig) {
        case SWITCH_SIG_KILL:
                DEBUGA_SKYPE("%s CHANNEL got SWITCH_SIG_KILL\n", SKYPIAX_P_LOG, switch_channel_get_name(channel));
-               //switch_mutex_lock(tech_pvt->flag_mutex);
+               switch_mutex_lock(tech_pvt->flag_mutex);
                switch_clear_flag(tech_pvt, TFLAG_IO);
                switch_clear_flag(tech_pvt, TFLAG_VOICE);
                switch_set_flag(tech_pvt, TFLAG_HANGUP);
@@ -615,14 +615,14 @@ static switch_status_t channel_kill_channel(switch_core_session_t *session, int
                        ERRORA("FYI %s CHANNEL in %d state got SWITCH_SIG_KILL\n", SKYPIAX_P_LOG, switch_channel_get_name(channel), switch_channel_get_state(channel));
                        channel_on_hangup(session);
                }
-               //switch_mutex_unlock(tech_pvt->flag_mutex);
+               switch_mutex_unlock(tech_pvt->flag_mutex);
                break;
        case SWITCH_SIG_BREAK:
                DEBUGA_SKYPE("%s CHANNEL got SWITCH_SIG_BREAK\n", SKYPIAX_P_LOG, switch_channel_get_name(channel));
                //switch_set_flag(tech_pvt, TFLAG_BREAK);
-               //switch_mutex_lock(tech_pvt->flag_mutex);
+               switch_mutex_lock(tech_pvt->flag_mutex);
                switch_set_flag(tech_pvt, TFLAG_BREAK);
-               //switch_mutex_unlock(tech_pvt->flag_mutex);
+               switch_mutex_unlock(tech_pvt->flag_mutex);
                break;
        default:
                break;

diff --git a/src/mod/endpoints/mod_skypiax/skypiax_protocol.c b/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
index 52ede88af670d501c92ff8a6179df744c889e174..2c199279f000dd8cf590a22a043536393ac3594b 100644 (file)
--- a/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
+++ b/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
@@ -909,14 +909,14 @@ void *skypiax_do_tcp_srv_thread_func(void *obj)
                                len = skypiax_pipe_write(tech_pvt->audiopipe_cli[1], kill_cli_buff, kill_cli_size);
 
                                tech_pvt->flag_audio_cli = 1;   //let's send some frame in the pipes, so both tcp_cli and tcp_srv will have an occasion to die
-                               skypiax_sleep(200);
+                               skypiax_sleep(2000);
                                tech_pvt->flag_audio_srv = 1;   //let's send some frame in the pipes, so both tcp_cli and tcp_srv will have an occasion to die
-                               skypiax_sleep(200);
+                               skypiax_sleep(2000);
                                tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
                                tech_pvt->flag_audio_cli = 1;   //let's send some frame in the pipes, so both tcp_cli and tcp_srv will have an occasion to die
-                               skypiax_sleep(200);
+                               skypiax_sleep(2000);
                                tech_pvt->flag_audio_srv = 1;   //let's send some frame in the pipes, so both tcp_cli and tcp_srv will have an occasion to die
-                               skypiax_sleep(200);
+                               skypiax_sleep(2000);
                                DEBUGA_SKYPE("Skype incoming audio GONE\n", SKYPIAX_P_LOG);
                                skypiax_close_socket(fd);
                        }