February 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7716 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa
by Freeswitch SVN 21 Feb '08

21 Feb '08

Author: mikej Date: Wed Feb 20 23:27:04 2008 New Revision: 7716 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Log: work around bugs in merging remote sdp, we already handle this in our code anyways. We need to add a tag for this. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Wed Feb 20 23:27:04 2008 @@ -1174,7 +1174,7 @@ *local0 = *local, local = local0; SU_DEBUG_7(("soa_static(%p, %s): %s\n", (void *)ss, by, "upgrade with remote description")); - soa_sdp_upgrade(ss, tmphome, local, user, remote, &u2s, &s2u); + soa_sdp_upgrade(ss, tmphome, local, user, NULL, &u2s, &s2u); } break; case process_answer:

1 0

[commit] r7715 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 21 Feb '08

21 Feb '08

Author: anthm Date: Wed Feb 20 21:27:27 2008 New Revision: 7715 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_ivr_originate.c Log: have we seen the last of the Michael Myers Bug(tm)? Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Feb 20 21:27:27 2008 @@ -1789,11 +1789,6 @@ } } - if (!match && greedy) { - skip++; - continue; - } - if (!match && near_match) { const switch_codec_implementation_t *search[1]; char *prefs[1]; @@ -1816,6 +1811,11 @@ match = 1; } + if (!match && greedy) { + skip++; + continue; + } + if (mimp) { char tmp[50]; tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *) map->rm_encoding); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Feb 20 21:27:27 2008 @@ -1161,6 +1161,10 @@ done: *cause = SWITCH_CAUSE_UNALLOCATED; + if (caller_channel && !switch_channel_ready(caller_channel)) { + status = SWITCH_STATUS_FALSE; + } + if (status == SWITCH_STATUS_SUCCESS) { if (caller_channel) { switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted");

1 0

[commit] r7714 - freeswitch/trunk/build
by Freeswitch SVN 20 Feb '08

20 Feb '08

Author: anthm Date: Wed Feb 20 17:25:31 2008 New Revision: 7714 Modified: freeswitch/trunk/build/Makefile Log: add Modified: freeswitch/trunk/build/Makefile ============================================================================== --- freeswitch/trunk/build/Makefile (original) +++ freeswitch/trunk/build/Makefile Wed Feb 20 17:25:31 2008 @@ -33,6 +33,7 @@ @echo " + ---------------------------------- +" @echo " + http://www.freeswitch.org +" @echo " + http://wiki.freeswitch.org +" + @echo " + http://jira.freeswitch.org +" @echo " + http://lists.freeswitch.org +" @echo " + +" @echo " + irc.freenode.net / #freeswitch +"

1 0

[commit] r7713 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 20 Feb '08

20 Feb '08

Author: mikej Date: Wed Feb 20 16:31:15 2008 New Revision: 7713 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: ken, try this. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Feb 20 16:31:15 2008 @@ -954,7 +954,16 @@ TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_END()); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding with %d %s\n", code, reason); - nua_respond(tech_pvt->nh, code, reason, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); + + if (!switch_strlen_zero(((char *)msg->pointer_arg))) { + nua_respond(tech_pvt->nh, code, reason, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + SOATAG_USER_SDP_STR(msg->pointer_arg), + SOATAG_AUDIO_AUX("cn telephone-event"), + NUTAG_INCLUDE_EXTRA_SDP(1), + TAG_END()); + } else { + nua_respond(tech_pvt->nh, code, reason, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); + } } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Feb 20 16:31:15 2008 @@ -1327,14 +1327,20 @@ switch_clear_flag_locked(tech_pvt, TFLAG_SENT_UPDATE); if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { + const char *r_sdp = NULL; switch_core_session_message_t msg = { 0 }; - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Passing %d %s to other leg\n", status, phrase); + tl_gets(tags, SOATAG_REMOTE_SDP_STR_REF(r_sdp), TAG_END()); msg.message_id = SWITCH_MESSAGE_INDICATE_RESPOND; msg.from = __FILE__; msg.numeric_arg = status; msg.string_arg = switch_core_session_strdup(other_session, phrase); + if (r_sdp) { + msg.pointer_arg = switch_core_session_strdup(other_session, r_sdp); + msg.pointer_arg_size = strlen(r_sdp); + } switch_core_session_receive_message(other_session, &msg); switch_core_session_rwunlock(other_session); }

1 0

[commit] r7712 - freeswitch/trunk/src
by Freeswitch SVN 20 Feb '08

20 Feb '08

Author: anthm Date: Wed Feb 20 15:26:07 2008 New Revision: 7712 Modified: freeswitch/trunk/src/switch_time.c Log: doh Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Wed Feb 20 15:26:07 2008 @@ -56,7 +56,7 @@ SWITCH_MODULE_LOAD_FUNCTION(softtimer_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown); SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime); -SWITCH_MODULE_DEFINITION(softtimer, softtimer_load, softtimer_shutdown, softtimer_runtime); +SWITCH_MODULE_DEFINITION(CORE_SOFTTIMER_MODULE, softtimer_load, softtimer_shutdown, softtimer_runtime); #define MAX_ELEMENTS 360 #define IDLE_SPEED 100

1 0

[commit] r7711 - freeswitch/trunk/src/mod/loggers/mod_console
by Freeswitch SVN 20 Feb '08

20 Feb '08

Author: anthm Date: Wed Feb 20 15:15:45 2008 New Revision: 7711 Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Log: update Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Wed Feb 20 15:15:45 2008 @@ -62,7 +62,7 @@ static switch_hash_t *log_hash = NULL; static uint32_t all_level = 0; static int32_t hard_log_level = SWITCH_LOG_DEBUG; -static int32_t failed_write = 0; +//static int32_t failed_write = 0; static void del_mapping(char *var) { switch_core_hash_insert(log_hash, var, NULL); @@ -235,8 +235,8 @@ int aok = can_write(handle, 10000); if (!aok) { - hard_log_level = 0; - failed_write++; + //hard_log_level = 0; + //failed_write++; return SWITCH_STATUS_SUCCESS; } #endif

1 0

[commit] r7710 - freeswitch/trunk/src/mod/applications/mod_fsv
by Freeswitch SVN 20 Feb '08

20 Feb '08

Author: mikej Date: Wed Feb 20 15:07:19 2008 New Revision: 7710 Modified: freeswitch/trunk/src/mod/applications/mod_fsv/ (props changed) freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c Log: tweak Modified: freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c Wed Feb 20 15:07:19 2008 @@ -78,12 +78,12 @@ switch_mutex_lock(eh->mutex); - if (write(eh->fd, &bytes, sizeof(bytes)) != sizeof(bytes)) { + if (write(eh->fd, &bytes, sizeof(bytes)) != (int)sizeof(bytes)) { switch_mutex_unlock(eh->mutex); break; } - if (write(eh->fd, read_frame->packet, read_frame->packetlen) != read_frame->packetlen) { + if (write(eh->fd, read_frame->packet, read_frame->packetlen) != (int)read_frame->packetlen) { switch_mutex_unlock(eh->mutex); break; } @@ -186,7 +186,7 @@ break; } - if (write(fd, read_frame->data, read_frame->datalen) != read_frame->datalen) { + if (write(fd, read_frame->data, read_frame->datalen) != (int)read_frame->datalen) { if (mutex) { switch_mutex_unlock(mutex); } @@ -303,16 +303,16 @@ } if (bytes & VID_BIT) { - switch_rtp_hdr_t *h = vid_frame.packet; + switch_rtp_hdr_t *hdr = vid_frame.packet; bytes &= ~VID_BIT; - if ((vid_frame.packetlen = read(fd, vid_frame.packet, bytes)) != bytes) { + if ((vid_frame.packetlen = read(fd, vid_frame.packet, bytes)) != (uint32_t)bytes) { break; } - ts = ntohl(h->ts); + ts = ntohl(hdr->ts); if (pt) { - h->pt = pt; + hdr->pt = pt; } if (switch_channel_test_flag(channel, CF_VIDEO)) { switch_core_session_write_video_frame(session, &vid_frame, -1, 0); @@ -322,7 +322,7 @@ } last = ts; } else { - if (bytes > write_frame.buflen) { + if (bytes > (int)write_frame.buflen) { bytes = write_frame.buflen; } if ((write_frame.datalen = read(fd, write_frame.data, bytes)) <= 0) {

1 0

[commit] r7709 - freeswitch/trunk/src/mod/codecs/mod_voipcodecs
by Freeswitch SVN 20 Feb '08

20 Feb '08

Author: mikej Date: Wed Feb 20 14:24:55 2008 New Revision: 7709 Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj Log: whoops Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj Wed Feb 20 14:24:55 2008 @@ -17,7 +17,7 @@ <Configurations> <Configuration Name="Debug|Win32" - ConfigurationType="4" + ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" > @@ -51,12 +51,15 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLibrarianTool" + Name="VCLinkerTool" /> <Tool Name="VCALinkTool" /> <Tool + Name="VCManifestTool" + /> + <Tool Name="VCXDCMakeTool" /> <Tool @@ -66,12 +69,18 @@ Name="VCFxCopTool" /> <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" - ConfigurationType="4" + ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" > @@ -105,12 +114,15 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLibrarianTool" + Name="VCLinkerTool" /> <Tool Name="VCALinkTool" /> <Tool + Name="VCManifestTool" + /> + <Tool Name="VCXDCMakeTool" /> <Tool @@ -120,6 +132,12 @@ Name="VCFxCopTool" /> <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" /> </Configuration>

1 0

[commit] r7708 - freeswitch/trunk/src
by Freeswitch SVN 20 Feb '08

20 Feb '08

Author: anthm Date: Wed Feb 20 12:11:37 2008 New Revision: 7708 Modified: freeswitch/trunk/src/switch_loadable_module.c freeswitch/trunk/src/switch_pcm.c Log: change naming convention of internal mods Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Wed Feb 20 12:11:37 2008 @@ -977,8 +977,8 @@ switch_core_hash_init(&loadable_modules.dialplan_hash, loadable_modules.pool); switch_mutex_init(&loadable_modules.mutex, SWITCH_MUTEX_NESTED, loadable_modules.pool); - switch_loadable_module_load_module("", "softtimer", SWITCH_FALSE, &err); - switch_loadable_module_load_module("", "PCM", SWITCH_FALSE, &err); + switch_loadable_module_load_module("", "CORE_SOFTTIMER_MODULE", SWITCH_FALSE, &err); + switch_loadable_module_load_module("", "CORE_PCM_MODULE", SWITCH_FALSE, &err); if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_xml_t mods, ld; Modified: freeswitch/trunk/src/switch_pcm.c ============================================================================== --- freeswitch/trunk/src/switch_pcm.c (original) +++ freeswitch/trunk/src/switch_pcm.c Wed Feb 20 12:11:37 2008 @@ -37,8 +37,8 @@ #undef SWITCH_MOD_DECLARE_DATA #define SWITCH_MOD_DECLARE_DATA __declspec(dllexport) #endif -SWITCH_MODULE_LOAD_FUNCTION(mod_l16_load); -SWITCH_MODULE_DEFINITION(mod_l16, mod_l16_load, NULL, NULL); +SWITCH_MODULE_LOAD_FUNCTION(core_pcm_load); +SWITCH_MODULE_DEFINITION(CORE_PCM_MODULE, core_pcm_load, NULL, NULL); static switch_status_t switch_raw_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) { @@ -258,7 +258,7 @@ } -SWITCH_MODULE_LOAD_FUNCTION(mod_l16_load) +SWITCH_MODULE_LOAD_FUNCTION(core_pcm_load) { switch_codec_interface_t *codec_interface; int mpf = 10000, spf = 80, bpf = 160, ebpf = 160, bps = 128000, rate = 8000, counta, countb;

1 0

[commit] r7707 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 20 Feb '08

20 Feb '08

Author: anthm Date: Tue Feb 19 22:57:01 2008 New Revision: 7707 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_originate.c Log: better handling of negotiation errs Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Feb 19 22:57:01 2008 @@ -354,7 +354,7 @@ sofia_glue_tech_prepare_codecs(tech_pvt); if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); - nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + //nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); return SWITCH_STATUS_FALSE; } } @@ -967,7 +967,7 @@ } break; case SWITCH_MESSAGE_INDICATE_ANSWER: - sofia_answer_channel(session); + return sofia_answer_channel(session); break; case SWITCH_MESSAGE_INDICATE_PROGRESS: { @@ -975,7 +975,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Asked to send early media by %s\n", msg->from); - + /* Transmit 183 Progress with SDP */ if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { const char *sdp = NULL; @@ -985,13 +985,15 @@ } else { if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); + if (!switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); + tech_pvt->num_codecs = 0; sofia_glue_tech_prepare_codecs(tech_pvt); if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); - nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + //nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); return SWITCH_STATUS_FALSE; } } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Feb 19 22:57:01 2008 @@ -1390,9 +1390,11 @@ msg.message_id = SWITCH_MESSAGE_INDICATE_PROGRESS; msg.from = channel->name; status = switch_core_session_receive_message(channel->session, &msg); - + if (status == SWITCH_STATUS_SUCCESS) { - status = switch_channel_perform_mark_pre_answered(channel, file, func, line); + switch_channel_perform_mark_pre_answered(channel, file, func, line); + } else { + switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); } return status; @@ -1423,6 +1425,8 @@ if (status == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Ring Ready %s!\n", channel->name); + } else { + switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); } return status; @@ -1487,17 +1491,17 @@ return SWITCH_STATUS_SUCCESS; } - msg.message_id = SWITCH_MESSAGE_INDICATE_ANSWER; msg.from = channel->name; status = switch_core_session_receive_message(channel->session, &msg); if (status == SWITCH_STATUS_SUCCESS) { - return switch_channel_perform_mark_answered(channel, file, func, line); + switch_channel_perform_mark_answered(channel, file, func, line); + } else { + switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); } - return SWITCH_STATUS_FALSE; - + return status; } #define resize(l) {\ Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue Feb 19 22:57:01 2008 @@ -209,10 +209,16 @@ if (!ans_a && originator) { if (!ans_b && switch_channel_test_flag(chan_b, CF_ANSWERED)) { - switch_channel_answer(chan_a); + if (switch_channel_answer(chan_a) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(chan_a)); + break; + } ans_a++; } else if (!pre_b && switch_channel_test_flag(chan_b, CF_EARLY_MEDIA)) { - switch_channel_pre_answer(chan_a); + if (switch_channel_pre_answer(chan_a) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(chan_a)); + break; + } pre_b++; } if (!pre_b) { @@ -605,6 +611,8 @@ int stream_id = 0; switch_status_t status = SWITCH_STATUS_SUCCESS; switch_channel_state_t state; + switch_event_t *event; + int br = 0; switch_channel_set_flag(caller_channel, CF_ORIGINATOR); switch_channel_clear_flag(caller_channel, CF_TRANSFER); @@ -630,7 +638,6 @@ if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA) || switch_channel_test_flag(peer_channel, CF_RING_READY)) { - switch_event_t *event; switch_core_session_message_t msg = { 0 }; const switch_application_interface_t *application_interface; const char *app, *data; @@ -640,8 +647,9 @@ if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_BRIDGE) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(caller_channel, event); switch_event_fire(&event); + br = 1; } - + if (switch_core_session_read_lock(peer_session) == SWITCH_STATUS_SUCCESS) { switch_channel_set_variable(caller_channel, SWITCH_BRIDGE_VARIABLE, switch_core_session_get_uuid(peer_session)); switch_channel_set_variable(peer_channel, SWITCH_BRIDGE_VARIABLE, switch_core_session_get_uuid(session)); @@ -713,11 +721,6 @@ switch_channel_set_state(peer_channel, CS_LOOPBACK); audio_bridge_thread(NULL, (void *) a_leg); - if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(caller_channel, event); - switch_event_fire(&event); - } - switch_channel_clear_flag(caller_channel, CF_ORIGINATOR); //make sure this doesnt break anything @@ -747,6 +750,11 @@ done: + if (br && switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(caller_channel, event); + switch_event_fire(&event); + } + state = switch_channel_get_state(caller_channel); if (!switch_channel_test_flag(caller_channel, CF_TRANSFER)) { Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Feb 19 22:57:01 2008 @@ -908,7 +908,10 @@ if (ringback_data && !switch_channel_test_flag(caller_channel, CF_ANSWERED) && !switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) { - switch_channel_pre_answer(caller_channel); + if ((status = switch_channel_pre_answer(caller_channel)) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(caller_channel)); + goto done; + } } if (session && (read_codec = switch_core_session_get_read_codec(session)) && @@ -1132,9 +1135,16 @@ if (caller_channel) { if (switch_channel_test_flag(peer_channel, CF_ANSWERED)) { - switch_channel_answer(caller_channel); + status = switch_channel_answer(caller_channel); } else if (switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { - switch_channel_pre_answer(caller_channel); + status = switch_channel_pre_answer(caller_channel); + } else { + status = SWITCH_STATUS_SUCCESS; + } + + if (status != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(caller_channel)); + switch_channel_hangup(peer_channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); } }

1 0