- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9050 - freeswitch/trunk/src
by Freeswitch SVN 16 Jul '08

16 Jul '08

Author: brian Date: Wed Jul 16 09:35:42 2008 New Revision: 9050 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: tweak Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Wed Jul 16 09:35:42 2008 @@ -127,6 +127,7 @@ switch_file_handle_t fh; int mux; int loop; + char *file; } displace_helper_t; static switch_bool_t write_displace_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) @@ -182,6 +183,12 @@ uint32_t pos = 0; switch_core_file_seek(&dh->fh, &pos, 0, SEEK_SET); } else { + switch_core_session_t *session = switch_core_media_bug_get_session(bug); + switch_channel_t *channel; + + if (session && (channel = switch_core_session_get_channel(session))) { + switch_channel_set_private(channel, dh->file, NULL); + } return SWITCH_FALSE; } } @@ -249,6 +256,12 @@ uint32_t pos = 0; switch_core_file_seek(&dh->fh, &pos, 0, SEEK_SET); } else { + switch_core_session_t *session = switch_core_media_bug_get_session(bug); + switch_channel_t *channel; + + if (session && (channel = switch_core_session_get_channel(session))) { + switch_channel_set_private(channel, dh->file, NULL); + } return SWITCH_FALSE; } } @@ -302,6 +315,7 @@ dh->fh.channels = read_codec->implementation->number_of_channels; dh->fh.samplerate = read_codec->implementation->actual_samples_per_second; + dh->file = switch_core_session_strdup(session, file); if (switch_core_file_open(&dh->fh, file,

1 0

[commit] r9049 - in freeswitch/trunk/src/mod/languages: mod_lua mod_perl
by Freeswitch SVN 16 Jul '08

16 Jul '08

Author: anthm Date: Wed Jul 16 02:23:35 2008 New Revision: 9049 Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp Log: handle failed originate a little more gracefully (MODLANG-70) Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Wed Jul 16 02:23:35 2008 @@ -50,9 +50,13 @@ void Session::setLUA(lua_State * state) { - L = state; - lua_setglobal(L, uuid); - lua_getfield(L, LUA_GLOBALSINDEX, uuid); + if (uuid) { + L = state; + lua_setglobal(L, uuid); + lua_getfield(L, LUA_GLOBALSINDEX, uuid); + } else { + //did we fail to make a session? + } } lua_State *Session::getLUA() Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp Wed Jul 16 02:23:35 2008 @@ -16,25 +16,33 @@ Session::Session(char *uuid):CoreSession(uuid) { init_me(); - suuid = switch_core_session_sprintf(session, "main::uuid_%s\n", switch_core_session_get_uuid(session)); - for (char *p = suuid; p && *p; p++) { - if (*p == '-') { - *p = '_'; - } - if (*p == '\n') { - *p = '\0'; + if (session) { + suuid = switch_core_session_sprintf(session, "main::uuid_%s\n", switch_core_session_get_uuid(session)); + for (char *p = suuid; p && *p; p++) { + if (*p == '-') { + *p = '_'; + } + if (*p == '\n') { + *p = '\0'; + } } + } else { + //handle failure } } Session::Session(switch_core_session_t *new_session):CoreSession(new_session) { init_me(); - suuid = switch_core_session_sprintf(session, "main::uuid_%s\n", switch_core_session_get_uuid(session)); - for (char *p = suuid; p && *p; p++) { - if (*p == '-') { - *p = '_'; + if (session) { + suuid = switch_core_session_sprintf(session, "main::uuid_%s\n", switch_core_session_get_uuid(session)); + for (char *p = suuid; p && *p; p++) { + if (*p == '-') { + *p = '_'; + } } + } else { + //handle failure } } static switch_status_t perl_hanguphook(switch_core_session_t *session_hungup);

1 0

[commit] r9048 - freeswitch/trunk/src
by Freeswitch SVN 16 Jul '08

16 Jul '08

Author: mikej Date: Wed Jul 16 00:48:01 2008 New Revision: 9048 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: tweak Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed Jul 16 00:48:01 2008 @@ -1278,8 +1278,8 @@ break; } - write_frame.samples = olen; - write_frame.datalen = olen * sizeof(int16_t); + write_frame.samples = (uint32_t)olen; + write_frame.datalen = (uint32_t)(olen * sizeof(int16_t)); if ((status = switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0)) != SWITCH_STATUS_SUCCESS) { break; }

1 0

[commit] r9047 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: brian Date: Tue Jul 15 18:22:49 2008 New Revision: 9047 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: mod_pocketsphinx fix Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Tue Jul 15 18:22:49 2008 @@ -408,7 +408,7 @@ /* Set defaults */ globals.thresh = 400; globals.silence_hits = 35; - globals.listen_hits = 5; + globals.listen_hits = 1; globals.auto_reload = 1; if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {

1 0

[commit] r9046 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: brian Date: Tue Jul 15 16:35:32 2008 New Revision: 9046 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: small tweak Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Tue Jul 15 16:35:32 2008 @@ -261,17 +261,6 @@ if (switch_test_flag(ah, SWITCH_ASR_FLAG_CLOSED)) return SWITCH_STATUS_BREAK; if (!switch_test_flag(ps, PSFLAG_HAS_TEXT) && switch_test_flag(ps, PSFLAG_READY)) { - /* only feed ps_process_raw when we are listening */ - if (ps->listening) { - switch_mutex_lock(ps->flag_mutex); - rv = ps_process_raw(ps->ps, (int16 *)data, len / 2 , FALSE, FALSE); - switch_mutex_unlock(ps->flag_mutex); - } - - if (rv < 0) { - return SWITCH_STATUS_FALSE; - } - if (stop_detect(ps, (int16_t *)data, len / 2)) { char const *hyp; @@ -294,6 +283,17 @@ } switch_mutex_unlock(ps->flag_mutex); } + + /* only feed ps_process_raw when we are listening */ + if (ps->listening) { + switch_mutex_lock(ps->flag_mutex); + rv = ps_process_raw(ps->ps, (int16 *)data, len / 2 , FALSE, FALSE); + switch_mutex_unlock(ps->flag_mutex); + } + + if (rv < 0) { + return SWITCH_STATUS_FALSE; + } } return SWITCH_STATUS_SUCCESS;

1 0

[commit] r9045 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: anthm Date: Tue Jul 15 15:41:56 2008 New Revision: 9045 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: update 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 Tue Jul 15 15:41:56 2008 @@ -1148,11 +1148,10 @@ return SWITCH_STATUS_FALSE; } - if (check_hangup_hook(jss, &cb_state->ret) == JS_TRUE) { + if (check_hangup_hook(jss, NULL) == JS_TRUE) { JS_ResumeRequest(cb_state->cx, cb_state->saveDepth); JS_CallFunction(cb_state->cx, cb_state->obj, cb_state->function, argc, argv, &cb_state->ret); cb_state->saveDepth = JS_SuspendRequest(cb_state->cx); - check_hangup_hook(jss, &cb_state->ret); jss->stack_depth--; } @@ -1483,12 +1482,12 @@ if (check_hangup_hook(jss, NULL) != JS_TRUE) { return JS_FALSE; + } switch_ivr_collect_digits_callback(jss->session, &args, to); check_hangup_hook(jss, &ret); JS_ResumeRequest(cx, cb_state.saveDepth); - *rval = cb_state.ret; return ret;

1 0

[commit] r9044 - freeswitch/trunk/src
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: anthm Date: Tue Jul 15 15:14:15 2008 New Revision: 9044 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: fix Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Jul 15 15:14:15 2008 @@ -1401,7 +1401,9 @@ switch_buffer_destroy(&ringback.audio_buffer); } - switch_core_session_reset(session, SWITCH_FALSE); + if (session) { + switch_core_session_reset(session, SWITCH_FALSE); + } if (write_codec.implementation) { switch_core_codec_destroy(&write_codec);

1 0

[commit] r9043 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: mikej Date: Tue Jul 15 14:09:16 2008 New Revision: 9043 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: add fifo_consumer_exit_key variable (MODAPP-100) Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Tue Jul 15 14:09:16 2008 @@ -65,8 +65,15 @@ switch_dtmf_t *dtmf = (switch_dtmf_t *) input; switch_channel_t *bchan = switch_core_session_get_channel(bleg); switch_channel_t *channel = switch_core_session_get_channel(session); + + const char *consumer_exit_key = switch_channel_get_variable(channel, "fifo_consumer_exit_key"); + if (switch_channel_test_flag(switch_core_session_get_channel(session), CF_ORIGINATOR)) { - if (dtmf->digit == '*') { + if ( consumer_exit_key && dtmf->digit == *consumer_exit_key ) { + switch_channel_hangup(bchan, SWITCH_CAUSE_NORMAL_CLEARING); + return SWITCH_STATUS_BREAK; + } + else if ( !consumer_exit_key && dtmf->digit == '*' ) { switch_channel_hangup(bchan, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_BREAK; } else if (dtmf->digit == '0') {

1 0

[commit] r9042 - in freeswitch/trunk/src: include mod/endpoints/mod_sofia
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: mikej Date: Tue Jul 15 14:04:17 2008 New Revision: 9042 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: Disable multiple registrations on a per-device basis (MODENDP-117) Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Jul 15 14:04:17 2008 @@ -104,6 +104,22 @@ !strcasecmp(expr, "active") ||\ !strcasecmp(expr, "allow") ||\ atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE + +/*! + \brief Evaluate the falsefullness of a string expression + \param expr a string expression + \return true or false +*/ +#define switch_false(expr)\ +(expr && ( !strcasecmp(expr, "no") ||\ +!strcasecmp(expr, "off") ||\ +!strcasecmp(expr, "false") ||\ +!strcasecmp(expr, "disabled") ||\ +!strcasecmp(expr, "inactive") ||\ +!strcasecmp(expr, "disallow") ||\ +!atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE + + /*! \brief find local ip of the box \param buf the buffer to write the ip adress found into Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Tue Jul 15 14:04:17 2008 @@ -413,6 +413,7 @@ const char *to_host = NULL; char contact_str[1024] = ""; int nat_hack = 0; + uint8_t multi_reg = 0, avoid_multi_reg = 0; //char buf[512]; uint8_t stale = 0, forbidden = 0; auth_res_t auth_res; @@ -564,6 +565,12 @@ if (exptime && v_event && *v_event) { char *exp_var; + char *allow_multireg = NULL; + + allow_multireg = switch_event_get_header(*v_event, "sip-allow-multiple-registrations"); + if ( allow_multireg && switch_false(allow_multireg) ) { + avoid_multi_reg = 1; + } register_gateway = switch_event_get_header(*v_event, "sip-register-gateway"); @@ -643,6 +650,16 @@ call_id = sip->sip_call_id->i_id; //sip_header_as_string(profile->home, (void *) sip->sip_call_id); switch_assert(call_id); + /* Does this profile supports multiple registrations ? */ + multi_reg = ( sofia_test_pflag(profile, PFLAG_MULTIREG) ) ? 1 : 0; + + if ( multi_reg && avoid_multi_reg ) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "Disabling multiple registrations on a per-user basis for %s@%s\n", + switch_str_nil(to_user), switch_str_nil(to_host) ); + multi_reg = 0; + } + if (exptime) { const char *agent = "dunno"; @@ -650,7 +667,7 @@ agent = sip->sip_user_agent->g_string; } - if (sofia_test_pflag(profile, PFLAG_MULTIREG)) { + if (multi_reg) { sql = switch_mprintf("delete from sip_registrations where call_id='%q'", call_id); } else { sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q'", to_user, to_host); @@ -695,7 +712,7 @@ switch_event_fire(&event); } } else { - if (sofia_test_pflag(profile, PFLAG_MULTIREG)) { + if (multi_reg) { char *icontact, *p; icontact = sofia_glue_get_url_from_contact(contact_str, 1); if ((p = strchr(icontact, ';'))) {

1 0

[commit] r9041 - freeswitch/trunk/src/mod/loggers/mod_console
by Freeswitch SVN 15 Jul '08

15 Jul '08

Author: brian Date: Tue Jul 15 13:54:13 2008 New Revision: 9041 Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Log: tweak 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 Tue Jul 15 13:54:13 2008 @@ -78,7 +78,7 @@ } if (!strcasecmp(var, "all")) { - all_level |= m; + all_level = m | switch_log_str2mask("console"); return; }

1 0