December 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6976 - freeswitch/trunk/src
by Freeswitch SVN 24 Dec '07

24 Dec '07

Author: mikej Date: Mon Dec 24 18:32:01 2007 New Revision: 6976 Modified: freeswitch/trunk/src/switch_core_session.c Log: whoops. Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Dec 24 18:32:01 2007 @@ -199,16 +199,17 @@ return SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED; } - forwardvar = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE); - if (!switch_strlen_zero(forwardvar)) { - forwardval = atoi(forwardvar) - 1; - } - if (forwardval <= 0) { - return SWITCH_CAUSE_EXCHANGE_ROUTING_ERROR; - } - if (session) { channel = switch_core_session_get_channel(session); + + forwardvar = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE); + if (!switch_strlen_zero(forwardvar)) { + forwardval = atoi(forwardvar) - 1; + } + if (forwardval <= 0) { + return SWITCH_CAUSE_EXCHANGE_ROUTING_ERROR; + } + if (caller_profile) { const char *ecaller_id_name = NULL, *ecaller_id_number = NULL;

1 0

[commit] r6975 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 24 Dec '07

24 Dec '07

Author: mikej Date: Mon Dec 24 14:23:36 2007 New Revision: 6975 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core_session.c Log: MODENDP-60 (reject calls for no remaining forwards in core) 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 Mon Dec 24 14:23:36 2007 @@ -224,6 +224,8 @@ return 504; case SWITCH_CAUSE_ORIGINATOR_CANCEL: return 487; + case SWITCH_CAUSE_EXCHANGE_ROUTING_ERROR: + return 483; default: return 480; } Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Dec 24 14:23:36 2007 @@ -186,51 +186,61 @@ switch_channel_t *channel = NULL; switch_caller_profile_t *outgoing_profile = caller_profile; switch_call_cause_t cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL; + const char *forwardvar; + int forwardval = 70; if ((endpoint_interface = switch_loadable_module_get_endpoint_interface(endpoint_name)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not locate channel type %s\n", endpoint_name); return SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED; } - if (endpoint_interface->io_routines->outgoing_channel) { - if (session) { - channel = switch_core_session_get_channel(session); - if (caller_profile) { - const char *ecaller_id_name = NULL, *ecaller_id_number = NULL; + if (!endpoint_interface->io_routines->outgoing_channel) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not locate outgoing channel interface for %s\n", endpoint_name); + return SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED; + } - ecaller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"); - ecaller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number"); + forwardvar = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE); + if (!switch_strlen_zero(forwardvar)) { + forwardval = atoi(forwardvar) - 1; + } + if (forwardval <= 0) { + return SWITCH_CAUSE_EXCHANGE_ROUTING_ERROR; + } - if (ecaller_id_name || ecaller_id_number) { - outgoing_profile = switch_caller_profile_clone(session, caller_profile); + if (session) { + channel = switch_core_session_get_channel(session); + if (caller_profile) { + const char *ecaller_id_name = NULL, *ecaller_id_number = NULL; - if (ecaller_id_name) { - outgoing_profile->caller_id_name = ecaller_id_name; - } - if (ecaller_id_number) { - outgoing_profile->caller_id_number = ecaller_id_number; - } + ecaller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"); + ecaller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number"); + + if (ecaller_id_name || ecaller_id_number) { + outgoing_profile = switch_caller_profile_clone(session, caller_profile); + + if (ecaller_id_name) { + outgoing_profile->caller_id_name = ecaller_id_name; + } + if (ecaller_id_number) { + outgoing_profile->caller_id_number = ecaller_id_number; } - } - if (!outgoing_profile) { - outgoing_profile = switch_channel_get_caller_profile(channel); } } - - if ((cause = endpoint_interface->io_routines->outgoing_channel(session, outgoing_profile, new_session, pool, flags)) != SWITCH_CAUSE_SUCCESS) { - return cause; + if (!outgoing_profile) { + outgoing_profile = switch_channel_get_caller_profile(channel); } + } - if (session) { - for (ptr = session->event_hooks.outgoing_channel; ptr; ptr = ptr->next) { - if ((status = ptr->outgoing_channel(session, caller_profile, *new_session, flags)) != SWITCH_STATUS_SUCCESS) { - break; - } + if ((cause = endpoint_interface->io_routines->outgoing_channel(session, outgoing_profile, new_session, pool, flags)) != SWITCH_CAUSE_SUCCESS) { + return cause; + } + + if (session) { + for (ptr = session->event_hooks.outgoing_channel; ptr; ptr = ptr->next) { + if ((status = ptr->outgoing_channel(session, caller_profile, *new_session, flags)) != SWITCH_STATUS_SUCCESS) { + break; } } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not locate outgoing channel interface for %s\n", endpoint_name); - return SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED; } switch_assert(*new_session != NULL); @@ -251,6 +261,8 @@ if (channel && peer_channel) { const char *export_vars, *val; switch_codec_t *read_codec = switch_core_session_get_read_codec(session); + const char *max_forwards = switch_core_session_sprintf(session, "%d", forwardval); + switch_channel_set_variable(peer_channel, SWITCH_MAX_FORWARDS_VARIABLE, max_forwards); if (read_codec) { char tmp[80]; @@ -288,16 +300,6 @@ switch_channel_set_variable(peer_channel, SWITCH_B_SDP_VARIABLE, val); } - val = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE); - - if (!switch_strlen_zero(val)) { - int forwardval = atoi(val) - 1; - const char *max_forwards = switch_core_session_sprintf(session, "%d", forwardval); - switch_channel_set_variable(peer_channel, SWITCH_MAX_FORWARDS_VARIABLE, max_forwards); - } else { - switch_channel_set_variable(peer_channel, SWITCH_MAX_FORWARDS_VARIABLE, "70"); - } - if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { switch_channel_set_flag(peer_channel, CF_BYPASS_MEDIA); }

1 0

[commit] r6974 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 24 Dec '07

24 Dec '07

Author: mikej Date: Mon Dec 24 13:52:10 2007 New Revision: 6974 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_core_session.c Log: fix for MODENDP-60 (handle max-forwards across a bridge). Move logic to core to copy and decrement var. 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 Mon Dec 24 13:52:10 2007 @@ -616,10 +616,8 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session) { char *alert_info = NULL; - char *max_forwards = NULL; + const char *max_forwards = NULL; const char *alertbuf; - const char *forwardbuf; - int forwardval; private_object_t *tech_pvt; switch_channel_t *channel = NULL; switch_caller_profile_t *caller_profile; @@ -664,10 +662,7 @@ alert_info = switch_core_session_sprintf(tech_pvt->session, "Alert-Info: %s", alertbuf); } - if ((forwardbuf = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE))) { - forwardval = atoi(forwardbuf) - 1; - max_forwards = switch_core_session_sprintf(tech_pvt->session, "%d", forwardval); - } + max_forwards = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE); if ((status = sofia_glue_tech_choose_port(tech_pvt)) != SWITCH_STATUS_SUCCESS) { return status; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Dec 24 13:52:10 2007 @@ -288,8 +288,14 @@ switch_channel_set_variable(peer_channel, SWITCH_B_SDP_VARIABLE, val); } - if ((val = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE))) { - switch_channel_set_variable(peer_channel, SWITCH_MAX_FORWARDS_VARIABLE, val); + val = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE); + + if (!switch_strlen_zero(val)) { + int forwardval = atoi(val) - 1; + const char *max_forwards = switch_core_session_sprintf(session, "%d", forwardval); + switch_channel_set_variable(peer_channel, SWITCH_MAX_FORWARDS_VARIABLE, max_forwards); + } else { + switch_channel_set_variable(peer_channel, SWITCH_MAX_FORWARDS_VARIABLE, "70"); } if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) {

1 0

[commit] r6973 - freeswitch/trunk/conf/directory
by Freeswitch SVN 24 Dec '07

24 Dec '07

Author: brian Date: Mon Dec 24 13:29:30 2007 New Revision: 6973 Modified: freeswitch/trunk/conf/directory/default.xml Log: remove this option Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Mon Dec 24 13:29:30 2007 @@ -2,7 +2,7 @@  <domain name="$${domain}"> <params> - <param name="dial-string" value="{left_hanging_extension=5900,transfer_fallback_extension=${dialed_user}}sofia/${dialed_domain}/${dialed_user}"/> + <param name="dial-string" value="{transfer_fallback_extension=${dialed_user}}sofia/${dialed_domain}/${dialed_user}"/> </params> <X-PRE-PROCESS cmd="include" data="default/*.xml"/>

1 0

[commit] r6972 - freeswitch/trunk/src
by Freeswitch SVN 24 Dec '07

24 Dec '07

Author: anthm Date: Mon Dec 24 13:27:15 2007 New Revision: 6972 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: update Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Dec 24 13:27:15 2007 @@ -222,8 +222,8 @@ end: switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); - //switch_channel_clear_flag(chan_b, CF_BROADCAST); - //switch_channel_set_flag(chan_b, CF_BREAK); + switch_channel_clear_flag(chan_b, CF_BROADCAST); + switch_channel_set_flag(chan_b, CF_BREAK); switch_core_session_reset(session_a); switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a));

1 0

[commit] r6971 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Dec '07

24 Dec '07

Author: anthm Date: Mon Dec 24 13:26:39 2007 New Revision: 6971 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update 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 Mon Dec 24 13:26:39 2007 @@ -84,7 +84,7 @@ tech_pvt->read_frame.buflen = SWITCH_RTP_MAX_BUF_LEN; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA INIT\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA INIT\n", switch_channel_get_name(channel)); if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { sofia_glue_tech_absorb_sdp(tech_pvt); } @@ -112,7 +112,47 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA RING\n"); + switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA RING\n", switch_channel_get_name(channel)); + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t sofia_on_reset(switch_core_session_t *session) +{ + switch_channel_t *channel = NULL; + private_object_t *tech_pvt = NULL; + + channel = switch_core_session_get_channel(session); + switch_assert(channel != NULL); + + tech_pvt = (private_object_t *) switch_core_session_get_private(session); + switch_assert(tech_pvt != NULL); + + switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA RESET\n", switch_channel_get_name(channel)); + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t sofia_on_hibernate(switch_core_session_t *session) +{ + switch_channel_t *channel = NULL; + private_object_t *tech_pvt = NULL; + + channel = switch_core_session_get_channel(session); + switch_assert(channel != NULL); + + tech_pvt = (private_object_t *) switch_core_session_get_private(session); + switch_assert(tech_pvt != NULL); + + switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA HIBERNATE\n", switch_channel_get_name(channel)); return SWITCH_STATUS_SUCCESS; } @@ -128,7 +168,8 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA EXECUTE\n"); + switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA EXECUTE\n", switch_channel_get_name(channel)); return SWITCH_STATUS_SUCCESS; } @@ -206,7 +247,10 @@ switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); } - if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { + cause = switch_channel_get_cause(channel); + +#if 0 + if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) && cause != SWITCH_CAUSE_ATTENDED_TRANSFER) { const char *buuid; switch_core_session_t *bsession; switch_channel_t *bchannel; @@ -232,8 +276,8 @@ switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); } - - cause = switch_channel_get_cause(channel); +#endif + sip_cause = hangup_cause_to_sip(cause); sofia_glue_deactivate_rtp(tech_pvt); @@ -1495,7 +1539,10 @@ /*.on_execute */ sofia_on_execute, /*.on_hangup */ sofia_on_hangup, /*.on_loopback */ sofia_on_loopback, - /*.on_transmit */ sofia_on_transmit + /*.on_transmit */ sofia_on_transmit, + /*.on_hold */ NULL, + /*.on_hibernate*/ sofia_on_hibernate, + /*.on_reset*/ sofia_on_reset }; static switch_status_t sofia_manage(char *relative_oid, switch_management_action_t action, char *data, switch_size_t datalen) 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 Mon Dec 24 13:26:39 2007 @@ -1462,6 +1462,7 @@ if (br_b) { switch_ivr_uuid_bridge(br_a, br_b); switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER"); + switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); switch_channel_hangup(channel, SWITCH_CAUSE_ATTENDED_TRANSFER); } else { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER_ERROR"); @@ -1763,6 +1764,7 @@ nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), TAG_END()); + switch_clear_flag_locked(b_tech_pvt, TFLAG_SIP_HOLD); switch_channel_hangup(channel_b, SWITCH_CAUSE_ATTENDED_TRANSFER); } else { if (!br_a && !br_b) { @@ -1786,8 +1788,11 @@ t_session = switch_core_session_locate(br_a); hup_channel = channel_b; } else { + private_object_t *h_tech_pvt = (private_object_t *) switch_core_session_get_private(b_session); t_session = switch_core_session_locate(br_b); hup_channel = channel_a; + switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + switch_clear_flag_locked(h_tech_pvt, TFLAG_SIP_HOLD); switch_channel_hangup(channel_b, SWITCH_CAUSE_ATTENDED_TRANSFER); } @@ -1936,9 +1941,10 @@ struct private_object *tech_pvt = NULL; switch_channel_t *channel = NULL; /* placeholder for string searching */ - char *signal_ptr; + const char *signal_ptr; const char *rec_header; - + switch_dtmf_t dtmf = { 0, SWITCH_DEFAULT_DTMF_DURATION }; + if (session) { /* Get the channel */ channel = switch_core_session_get_channel(session); @@ -1952,55 +1958,47 @@ /* Barf if we didn't get it */ switch_assert(tech_pvt != NULL); + if (sip && sip->sip_content_type && sip->sip_content_type->c_type && sip->sip_content_type->c_subtype && + sip->sip_payload && sip->sip_payload->pl_data) { + if (!strcasecmp(sip->sip_content_type->c_type, "dtmf") && !strcasecmp(sip->sip_content_type->c_subtype, "relay")) { + /* Try and find signal information in the payload */ + if ((signal_ptr = switch_stristr("Signal=", sip->sip_payload->pl_data))) { + /* move signal_ptr where we need it (right past Signal=) */ + signal_ptr = signal_ptr + 7; + dtmf.digit = *signal_ptr; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad signal\n"); + goto fail; + } - if (sip && sip->sip_payload && sip->sip_payload->pl_data) { - switch_dtmf_t dtmf = { 0, SWITCH_DEFAULT_DTMF_DURATION }; - - /* Try and find signal information in the payload */ - if ((signal_ptr = strstr(sip->sip_payload->pl_data, "Signal="))) { - /* move signal_ptr where we need it (right past Signal=) */ - signal_ptr = signal_ptr + 7; + if ((signal_ptr = switch_stristr("Duration=", sip->sip_payload->pl_data))) { + int tmp; + signal_ptr += 8; + if ((tmp = atoi(signal_ptr)) < 0) { + tmp = SWITCH_DEFAULT_DTMF_DURATION; + } + dtmf.duration = tmp; + } + } else if (!strcasecmp(sip->sip_content_type->c_type, "application") && !strcasecmp(sip->sip_content_type->c_subtype, "dtmf")) { + dtmf.digit = *sip->sip_payload->pl_data; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad signal\n"); - return; - } - - /* unknown info type */ - if (!signal_ptr) { - sip_from_t const *from = sip->sip_from; - - /* print in the logs if something comes through we don't understand */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Unknown INFO Recieved: %s%s" URL_PRINT_FORMAT "[%s]\n", - from->a_display ? from->a_display : "", - from->a_display ? " " : "", - URL_PRINT_ARGS(from->a_url), - sip->sip_payload->pl_data); - /* Send 415 Unsupported Media response */ - nua_respond(nh, SIP_415_UNSUPPORTED_MEDIA, NUTAG_WITH_THIS(nua), TAG_END()); - return; - } - - - dtmf.digit = *signal_ptr; - if ((signal_ptr = strstr(sip->sip_payload->pl_data, "Duration="))) { - int tmp; - signal_ptr += 8; - if ((tmp = atoi(signal_ptr)) < 0) { - tmp = SWITCH_DEFAULT_DTMF_DURATION; - } - dtmf.duration = tmp; + goto fail; } + + if (dtmf.digit) { + /* queue it up */ + switch_channel_queue_dtmf(channel, &dtmf); - /* queue it up */ - switch_channel_queue_dtmf(channel, &dtmf); - - /* print debug info */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "INFO DTMF(%c)\n", dtmf.digit); + /* print debug info */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "INFO DTMF(%c)\n", dtmf.digit); - /* Send 200 OK response */ - nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); + /* Send 200 OK response */ + nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); - return; + return; + } else { + goto fail; + } } if ((rec_header = sofia_glue_get_unknown_header(sip, "record"))) { @@ -2037,6 +2035,13 @@ } } + + return; + + fail: + + nua_respond(nh, 488, "Unsupported Request", NUTAG_WITH_THIS(nua), TAG_END()); + }

1 0

[commit] r6970 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 24 Dec '07

24 Dec '07

Author: achaloyan Date: Mon Dec 24 13:18:34 2007 New Revision: 6970 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: not to add mrcp profile to profile_hash, if it failed to run Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Dec 24 13:18:34 2007 @@ -836,8 +836,13 @@ /* add profile */ if (!switch_core_hash_find(openmrcp_module.profile_hash, mrcp_profile->name)) { - switch_core_hash_insert(openmrcp_module.profile_hash, mrcp_profile->name, mrcp_profile); - openmrcp_profile_run(mrcp_profile); + if(openmrcp_profile_run(mrcp_profile) == SWITCH_STATUS_SUCCESS) { + switch_core_hash_insert(openmrcp_module.profile_hash, mrcp_profile->name, mrcp_profile); + } + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "profile with the name [%s] already exists\n", mrcp_profile->name); } } }

1 0

[commit] r6969 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 24 Dec '07

24 Dec '07

Author: anthm Date: Mon Dec 24 11:05:53 2007 New Revision: 6969 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix MODAPP-61 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Dec 24 11:05:53 2007 @@ -981,7 +981,7 @@ static switch_status_t js_common_callback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) { - char *dtmf = NULL; + char dtmf[2] = ""; switch_event_t *event = NULL; struct input_callback_state *cb_state = buf; struct js_session *jss = cb_state->session_state;

1 0

[commit] r6965 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 24 Dec '07

24 Dec '07

Author: trixter Date: Sun Dec 23 19:32:50 2007 New Revision: 6965 Modified: freeswitch/trunk/scripts/contrib/trixter/disa.js Log: added new optional transfer/bridge instead of always one Modified: freeswitch/trunk/scripts/contrib/trixter/disa.js ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/disa.js (original) +++ freeswitch/trunk/scripts/contrib/trixter/disa.js Sun Dec 23 19:32:50 2007 @@ -33,6 +33,9 @@ var numterm = "#"; // terminator for destination number var numwait = 5000; // ms for them to enter the destination number +/* these are used only if we bridge and not transfer */ +var newSession = false; // set to true to make a new session and bridge + // set to false to use 'transfer' instead var dialprefix = "sofia/default/"; // prefix for outbound calls var dialpostfix = "@somehost.tld"; // postfix for outbound calls, set to "" if not needed var timeout = 60; // outbound calling timeout in seconds @@ -191,18 +194,21 @@ destnum = removeChr(destnum,numterm); if(destnum.length>0) { - var Bleg = new Session(); + if(newSession == false) { + session.execute("transfer",destnum); + } else { + var Bleg = new Session(); - if(typeof CLID_name != "undefined") { - Bleg.setCallerData("caller_id_name",CLID_name); - } - if(typeof CLID_num != "undefined") { - Bleg.setCallerData("caller_id_number",CLID_num); - } + if(typeof CLID_name != "undefined") { + Bleg.setCallerData("caller_id_name",CLID_name); + } + if(typeof CLID_num != "undefined") { + Bleg.setCallerData("caller_id_number",CLID_num); + } - session.execute("transfer",destnum); - // Bleg.originate(session,dialprefix+destnum+dialpostfix,timeout); - bridge(session,Bleg); + Bleg.originate(session,dialprefix+destnum+dialpostfix,timeout); + bridge(session,Bleg); + } } exit();

1 0

[commit] r6964 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 23 Dec '07

23 Dec '07

Author: brian Date: Sat Dec 22 20:53:53 2007 New Revision: 6964 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: tls off by default Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Sat Dec 22 20:53:53 2007 @@ -46,7 +46,7 @@   - <param name="tls" value="true"/> + <param name="tls" value="false"/>  <param name="tls-bind-params" value="transport=tls"/>

1 0