[Freeswitch-svn] [commit] r5178 - freeswitch/trunk/src
Freeswitch SVN
anthm at freeswitch.org
Mon May 14 16:38:18 EDT 2007
Author: anthm
Date: Mon May 14 16:38:18 2007
New Revision: 5178
Modified:
freeswitch/trunk/src/switch_ivr.c
freeswitch/trunk/src/switch_ivr_async.c
freeswitch/trunk/src/switch_ivr_bridge.c
Log:
update
Modified: freeswitch/trunk/src/switch_ivr.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr.c (original)
+++ freeswitch/trunk/src/switch_ivr.c Mon May 14 16:38:18 2007
@@ -272,15 +272,13 @@
unsigned long CMD_NOMEDIA = switch_hashfunc_default("nomedia", &hlen);
unsigned long CMD_UNICAST = switch_hashfunc_default("unicast", &hlen);
char *lead_frames = switch_event_get_header(event, "lead-frames");
- switch_status_t status = SWITCH_STATUS_SUCCESS;
-
+
assert(channel != NULL);
assert(event != NULL);
if (switch_strlen_zero(cmd)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Command!\n");
- status = SWITCH_STATUS_FALSE;
- goto done;
+ return SWITCH_STATUS_FALSE;
}
hlen = (switch_size_t) strlen(cmd);
@@ -291,11 +289,12 @@
if (lead_frames) {
switch_frame_t *read_frame;
int frame_count = atoi(lead_frames);
-
+ switch_status_t status;
+
while(frame_count > 0) {
status = switch_core_session_read_frame(session, &read_frame, -1, 0);
if (!SWITCH_READ_ACCEPTABLE(status)) {
- goto done;
+ return status;
}
if (!switch_test_flag(read_frame, SFF_CNG)) {
frame_count--;
@@ -366,33 +365,12 @@
switch_channel_hangup(channel, cause);
} else if (cmd_hash == CMD_NOMEDIA) {
char *uuid = switch_event_get_header(event, "nomedia-uuid");
- char *waitfor = switch_event_get_header(event, "wait-for");
- if (waitfor) {
- switch_core_session_t *w_session;
-
- if ((w_session = switch_core_session_locate(waitfor))) {
- switch_channel_t *w_channel = switch_core_session_get_channel(w_session);
- int sanity = 0;
-
- while(switch_channel_test_flag(w_channel, CF_WAIT_FOR_ME)) {
- switch_yield(1000);
- if (++sanity > 10000) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Timeout waiting for channel %s\n", switch_channel_get_name(w_channel));
- switch_channel_clear_flag(w_channel, CF_WAIT_FOR_ME);
- break;
- }
- }
- switch_core_session_rwunlock(w_session);
- }
-
- }
switch_ivr_nomedia(uuid, SMF_REBRIDGE);
}
- done:
+
switch_channel_clear_flag(channel, CF_EVENT_PARSE);
- switch_channel_clear_flag(channel, CF_WAIT_FOR_ME);
- return status;
+ return SWITCH_STATUS_SUCCESS;
}
@@ -798,6 +776,7 @@
switch_core_session_message_t msg = { 0 };
switch_status_t status = SWITCH_STATUS_GENERR;
uint8_t swap = 0;
+ switch_event_t *event;
msg.message_id = SWITCH_MESSAGE_INDICATE_NOMEDIA;
msg.from = __FILE__;
@@ -812,12 +791,23 @@
}
if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) {
+ while (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) {
+ switch_ivr_parse_event(session, event);
+ switch_event_destroy(&event);
+ }
+
switch_channel_set_flag(channel, CF_BYPASS_MEDIA);
switch_core_session_receive_message(session, &msg);
if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) &&
(other_session = switch_core_session_locate(other_uuid))) {
other_channel = switch_core_session_get_channel(other_session);
assert(other_channel != NULL);
+
+ while (switch_core_session_dequeue_private_event(other_session, &event) == SWITCH_STATUS_SUCCESS) {
+ switch_ivr_parse_event(other_session, event);
+ switch_event_destroy(&event);
+ }
+
switch_core_session_receive_message(other_session, &msg);
switch_channel_clear_state_handler(other_channel, NULL);
Modified: freeswitch/trunk/src/switch_ivr_async.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_async.c (original)
+++ freeswitch/trunk/src/switch_ivr_async.c Mon May 14 16:38:18 2007
@@ -775,10 +775,10 @@
char *p;
master = session;
-
+
channel = switch_core_session_get_channel(session);
assert(channel != NULL);
-
+
if ((nomedia = switch_channel_test_flag(channel, CF_BYPASS_MEDIA))) {
switch_ivr_media(uuid, SMF_REBRIDGE);
}
@@ -796,9 +796,8 @@
}
}
- if ((flags & SMF_ECHO_BLEG) && (other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))
+ if ((flags & SMF_ECHO_BLEG) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE))
&& (other_session = switch_core_session_locate(other_uuid))) {
-
if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "execute");
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-name", "%s", app);
@@ -807,13 +806,12 @@
if ((flags & SMF_LOOP)) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1);
}
+
switch_core_session_queue_private_event(other_session, &event);
}
-
- master = other_session;
switch_core_session_rwunlock(other_session);
-
+ master = other_session;
other_session = NULL;
}
@@ -835,17 +833,6 @@
if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "nomedia");
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "nomedia-uuid", "%s", uuid);
- if ((flags & SMF_ECHO_BLEG) && (flags & SMF_ECHO_ALEG)) {
- switch_channel_t *channel = switch_core_session_get_channel(master);
- char *bto = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE);
- if ((other_session = switch_core_session_locate(bto))) {
- switch_channel_t *other_channel = switch_core_session_get_channel(other_session);
- switch_channel_set_flag(other_channel, CF_WAIT_FOR_ME);
- switch_event_add_header(event, SWITCH_STACK_BOTTOM, "wait-for", "%s", bto);
- switch_core_session_rwunlock(other_session);
- }
- }
-
switch_core_session_queue_private_event(master, &event);
}
}
Modified: freeswitch/trunk/src/switch_ivr_bridge.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_bridge.c (original)
+++ freeswitch/trunk/src/switch_ivr_bridge.c Mon May 14 16:38:18 2007
@@ -96,11 +96,6 @@
break;
}
- if (switch_channel_test_flag(chan_a, CF_SUSPEND) || switch_channel_test_flag(chan_b, CF_SUSPEND)) {
- switch_yield(100000);
- continue;
- }
-
if (switch_core_session_dequeue_private_event(session_a, &event) == SWITCH_STATUS_SUCCESS) {
switch_channel_set_flag(chan_b, CF_SUSPEND);
msg.string_arg = data->b_uuid;
@@ -114,6 +109,10 @@
switch_event_destroy(&event);
}
+ if (switch_channel_test_flag(chan_a, CF_SUSPEND) || switch_channel_test_flag(chan_b, CF_SUSPEND)) {
+ switch_yield(100000);
+ continue;
+ }
/* if 1 channel has DTMF pass it to the other */
if (switch_channel_has_dtmf(chan_a)) {
More information about the Freeswitch-svn
mailing list