fix a bunch of stuff you want this version

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

diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index 19e8d92fd82dc81e3ad9ebfa4ebc188f9d65cf35..6fd2597de19a03d88c029eca610470a0403db640 100644 (file)
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -126,7 +126,6 @@ static switch_status_t kill_function(char *dest, switch_core_session_t *isession
 
        if (dest && (session = switch_core_session_locate(dest))) {
                switch_channel_t *channel = switch_core_session_get_channel(session);
-               switch_core_session_kill_channel(session, SWITCH_SIG_KILL);
                switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
                switch_core_session_rwunlock(session);
                stream->write_function(stream, "OK\n");

diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c
index e13aad94adc7f3eb588546ca66e3b48af00fdcec..462e1f71c3f42bae658949f86225734b5fde13b2 100644 (file)
--- a/src/mod/endpoints/mod_iax/mod_iax.c
+++ b/src/mod/endpoints/mod_iax/mod_iax.c
@@ -952,12 +952,10 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void)
                        
                        if (globals.calls == 0) {
                                waitlen = 10000;
-                       } else if (globals.calls == 1) {
-                               waitlen = 1000;
                        } else if (globals.calls < 10) {
-                               waitlen = 100;
+                               waitlen = 1000;
                        } else {
-                               waitlen = 10;
+                               waitlen = 500;
                        }
 
                        switch_yield(waitlen);

diff --git a/src/switch_channel.c b/src/switch_channel.c
index c40c386b7a6f66f784b72a7dac341adf071d2d4c..85e183d38b7afa340af0b78b304264d635cc0486 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -846,12 +846,14 @@ SWITCH_DECLARE(void) switch_channel_clear_state_handler(switch_channel_t *channe
        for (index = 0; index < SWITCH_MAX_STATE_HANDLERS; index++) {
                channel->state_handlers[index] = NULL;
        }
+
        if (state_handler) {
                for (index = 0; index < i; index++) {
                        channel->state_handlers[index] = new_handlers[i];
                }
        }
 
+       channel->state_handler_index = i;
 }
 
 SWITCH_DECLARE(void) switch_channel_set_caller_extension(switch_channel_t *channel,

diff --git a/src/switch_core.c b/src/switch_core.c
index 5b3676032fb2eabfc338586ff7ad4369d9da3bbb..5519314064feeaef2877603407ec94c1a9f95743 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -2892,9 +2892,6 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
 
                endstate = switch_channel_get_state(session->channel);
 
-               if (endstate >= CS_HANGUP) {
-                       goto done;
-               }
 
                if (midstate == endstate) {
                        switch_thread_cond_wait(session->cond, session->mutex);

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 1d944c4b4922b17edc32ebf3b4ae5628b8e73992..e5f05256aab7dd2d12de8910dd9b847f98211ee8 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -1354,7 +1354,11 @@ static switch_status_t audio_bridge_on_loopback(switch_core_session_t *session)
                switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
        }
        switch_channel_clear_state_handler(channel, &audio_bridge_peer_state_handlers);
-               
+
+       if (!switch_channel_test_flag(channel, CF_TRANSFER)) {
+               switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
+       }
+       
        return SWITCH_STATUS_FALSE;
 }
 
@@ -1406,22 +1410,32 @@ static switch_status_t uuid_bridge_on_transmit(switch_core_session_t *session)
        assert(channel != NULL);
 
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CUSTOM TRANSMIT\n");
+       switch_channel_clear_state_handler(channel, NULL);
+
+       if (!switch_channel_test_flag(channel, CF_ORIGINATOR)) {
+               switch_channel_set_flag(channel, CF_TAGGED);
+               return SWITCH_STATUS_FALSE;
+       }
 
        if ((other_session = switch_channel_get_private(channel, "_uuid_bridge_"))) {
                switch_channel_t *other_channel = switch_core_session_get_channel(other_session);
                switch_channel_state_t state = switch_channel_get_state(other_channel);
+               switch_channel_state_t mystate = switch_channel_get_state(channel);
                switch_event_t *event;
                uint8_t ready_a, ready_b;
                switch_caller_profile_t *profile, *new_profile;
 
+               switch_channel_clear_flag(channel, CF_TRANSFER);
                switch_channel_set_private(channel, "_uuid_bridge_", NULL);
-               while (state <= CS_HANGUP && state != CS_TRANSMIT) {
+
+               while (mystate <= CS_HANGUP && state <= CS_HANGUP && !switch_channel_test_flag(other_channel, CF_TAGGED)) {
                        switch_yield(1000);
                        state = switch_channel_get_state(other_channel);
+                       mystate = switch_channel_get_state(channel);
                }
 
-               switch_channel_clear_flag(channel, CF_TRANSFER);
-               switch_channel_clear_flag(other_channel, CF_TRANSFER);
+               switch_channel_clear_flag(other_channel, CF_TRANSFER|CF_TAGGED);
+
 
                switch_core_session_reset(session);
                switch_core_session_reset(other_session);
@@ -2053,7 +2067,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
                                switch_channel_event_set_data(caller_channel, event);
                                switch_event_fire(&event);
                        }
-               
+
+                       if (switch_channel_get_state(caller_channel) != CS_EXECUTE && !switch_channel_test_flag(caller_channel, CF_TRANSFER)) {
+                               switch_channel_hangup(caller_channel, SWITCH_CAUSE_NORMAL_CLEARING);
+                       }
+
                        this_audio_thread->objs[0] = NULL;
                        this_audio_thread->objs[1] = NULL;
                        this_audio_thread->objs[2] = NULL;
@@ -2063,13 +2081,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
                        switch_mutex_lock(this_audio_thread->mutex);
                        this_audio_thread->running = 0;
                        switch_mutex_unlock(this_audio_thread->mutex);
-
-                       if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && 
-                               switch_channel_get_state(peer_channel) < CS_HANGUP) {
-                               switch_core_session_kill_channel(peer_session, SWITCH_SIG_KILL);
-                               switch_channel_hangup(peer_channel, SWITCH_CAUSE_NORMAL_CLEARING);
-                       }
-
+                       
                        switch_channel_clear_flag(caller_channel, CF_ORIGINATOR);
 
                        if (other_audio_thread->running > 0) {
@@ -2118,8 +2130,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(char *originator_uuid, ch
                         * inturrupt anything they are already doing.
                         * originatee_session will fall asleep and originator_session will bridge to it
                         */
-
+                       
+                       switch_channel_clear_state_handler(originator_channel, NULL);
+                       switch_channel_clear_state_handler(originatee_channel, NULL);
+                       switch_channel_set_flag(originator_channel, CF_ORIGINATOR);
                        switch_channel_add_state_handler(originator_channel, &uuid_bridge_state_handlers);
+                       switch_channel_add_state_handler(originatee_channel, &uuid_bridge_state_handlers);
                        switch_channel_set_private(originator_channel, "_uuid_bridge_", originatee_session);
 
                        /* switch_channel_set_state_flag sets flags you want to be set when the next stat change happens */