[Freeswitch-svn] [commit] r2752 - in freeswitch/trunk/src: . mod/applications/mod_commands mod/endpoints/mod_iax
Freeswitch SVN
anthm at freeswitch.org
Tue Sep 19 11:33:02 EDT 2006
Author: anthm
Date: Tue Sep 19 11:33:02 2006
New Revision: 2752
Modified:
freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c
freeswitch/trunk/src/switch_channel.c
freeswitch/trunk/src/switch_core.c
freeswitch/trunk/src/switch_ivr.c
Log:
fix a bunch of stuff you want this version
Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Sep 19 11:33:02 2006
@@ -126,7 +126,6 @@
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");
Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue Sep 19 11:33:02 2006
@@ -952,12 +952,10 @@
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);
Modified: freeswitch/trunk/src/switch_channel.c
==============================================================================
--- freeswitch/trunk/src/switch_channel.c (original)
+++ freeswitch/trunk/src/switch_channel.c Tue Sep 19 11:33:02 2006
@@ -846,12 +846,14 @@
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,
Modified: freeswitch/trunk/src/switch_core.c
==============================================================================
--- freeswitch/trunk/src/switch_core.c (original)
+++ freeswitch/trunk/src/switch_core.c Tue Sep 19 11:33:02 2006
@@ -2892,9 +2892,6 @@
endstate = switch_channel_get_state(session->channel);
- if (endstate >= CS_HANGUP) {
- goto done;
- }
if (midstate == endstate) {
switch_thread_cond_wait(session->cond, session->mutex);
Modified: freeswitch/trunk/src/switch_ivr.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr.c (original)
+++ freeswitch/trunk/src/switch_ivr.c Tue Sep 19 11:33:02 2006
@@ -1354,7 +1354,11 @@
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,23 +1410,33 @@
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_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_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 @@
* 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 */
More information about the Freeswitch-svn
mailing list