August 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9253 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 19:58:42 2008 New Revision: 9253 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: tweak 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 Mon Aug 11 19:58:42 2008 @@ -2024,7 +2024,7 @@ if (!strcasecmp(var, "text/plain")) { holder.http = NULL; } - } else { + } else if (holder.http) { stream->write_function(stream, "%s", "Content-Type: text/html\n\n"); }

1 0

[commit] r9252 - freeswitch/trunk/debian
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: cypromis Date: Mon Aug 11 19:44:39 2008 New Revision: 9252 Modified: freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install Log: I should get new glasses ... aain conffiles in debian debuild. Typo, its 99999_enum.xml and not 00000_enum.xml Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Mon Aug 11 19:44:39 2008 @@ -10,7 +10,7 @@ /opt/freeswitch/conf/dialplan/default.xml /opt/freeswitch/conf/dialplan/features.xml /opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml -/opt/freeswitch/conf/dialplan/extensions/00000_enum.xml +/opt/freeswitch/conf/dialplan/extensions/99999_enum.xml /opt/freeswitch/conf/dialplan/extensions/default.xml /opt/freeswitch/conf/sip_profiles/external.xml /opt/freeswitch/conf/sip_profiles/nat.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Mon Aug 11 19:44:39 2008 @@ -46,7 +46,7 @@ opt/freeswitch/conf/dialplan/default.xml opt/freeswitch/conf/dialplan/features.xml opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml -opt/freeswitch/conf/dialplan/extensions/00000_enum.xml +opt/freeswitch/conf/dialplan/extensions/99999_enum.xml opt/freeswitch/conf/dialplan/extensions/default.xml opt/freeswitch/conf/sip_profiles/external.xml opt/freeswitch/conf/sip_profiles/nat.xml

1 0

[commit] r9251 - freeswitch/trunk/debian
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: cypromis Date: Mon Aug 11 19:20:01 2008 New Revision: 9251 Modified: freeswitch/trunk/debian/freeswitch.install Log: hmmm conffiles of course need to go into the package as well .... Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Mon Aug 11 19:20:01 2008 @@ -45,8 +45,9 @@ opt/freeswitch/conf/dialplan/public.xml opt/freeswitch/conf/dialplan/default.xml opt/freeswitch/conf/dialplan/features.xml -opt/freeswitch/conf/dialplan/extensions -opt/freeswitch/conf/dialplan/extensions/*.xml +opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml +opt/freeswitch/conf/dialplan/extensions/00000_enum.xml +opt/freeswitch/conf/dialplan/extensions/default.xml opt/freeswitch/conf/sip_profiles/external.xml opt/freeswitch/conf/sip_profiles/nat.xml opt/freeswitch/conf/sip_profiles/nat/example.xml

1 0

[commit] r9250 - freeswitch/trunk/debian
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: cypromis Date: Mon Aug 11 18:22:25 2008 New Revision: 9250 Modified: freeswitch/trunk/debian/freeswitch.conffiles Log: FSBUILD-68 Files missing from debian conffiles script Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Mon Aug 11 18:22:25 2008 @@ -9,6 +9,9 @@ /opt/freeswitch/conf/dialplan/public.xml /opt/freeswitch/conf/dialplan/default.xml /opt/freeswitch/conf/dialplan/features.xml +/opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml +/opt/freeswitch/conf/dialplan/extensions/00000_enum.xml +/opt/freeswitch/conf/dialplan/extensions/default.xml /opt/freeswitch/conf/sip_profiles/external.xml /opt/freeswitch/conf/sip_profiles/nat.xml /opt/freeswitch/conf/sip_profiles/nat/example.xml

1 0

[commit] r9249 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: brian Date: Mon Aug 11 18:20:35 2008 New Revision: 9249 Modified: freeswitch/trunk/conf/directory/default/brian.xml Log: no dot in this thanks bsnipes Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Mon Aug 11 18:20:35 2008 @@ -79,7 +79,7 @@    -  +  </variables> <vcard>

1 0

[commit] r9248 - in freeswitch/trunk/src: . include
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 17:27:20 2008 New Revision: 9248 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_originate.c Log: fix for MODAPP-122 Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Aug 11 17:27:20 2008 @@ -181,7 +181,9 @@ typedef enum { SOF_NONE = 0, SOF_NOBLOCK = (1 << 0), - SOF_FORKED_DIAL = (1 << 1) + SOF_FORKED_DIAL = (1 << 1), + SOF_NO_EFFECTIVE_CID_NUM = (1 << 2), + SOF_NO_EFFECTIVE_CID_NAME = (1 << 3) } switch_originate_flag_enum_t; typedef uint32_t switch_originate_flag_t; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Aug 11 17:27:20 2008 @@ -270,9 +270,14 @@ if (caller_profile) { const char *ecaller_id_name = NULL, *ecaller_id_number = NULL; + + if (!(flags & SOF_NO_EFFECTIVE_CID_NAME)) { + ecaller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"); + } - 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 (!(flags & SOF_NO_EFFECTIVE_CID_NUM)) { + 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); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Aug 11 17:27:20 2008 @@ -506,7 +506,7 @@ const char *cid_num_override, switch_caller_profile_t *caller_profile_override, switch_originate_flag_t flags) { - switch_originate_flag_t myflags = SOF_NONE; + switch_originate_flag_t dftflags = SOF_NONE, myflags = dftflags; char *pipe_names[MAX_PEERS] = { 0 }; char *data = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -538,6 +538,7 @@ uint8_t ring_ready = 0; char *loop_data = NULL; uint32_t progress_timelimit_sec = 0; + const char *cid_tmp; *bleg = NULL; @@ -742,18 +743,34 @@ } } + if ((cid_tmp = switch_event_get_header(var_event, "origination_caller_id_name"))) { + cid_name_override = cid_tmp; + } + if (cid_name_override) { switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_caller_id_name", cid_name_override); } else { cid_name_override = switch_event_get_header(var_event, "origination_caller_id_name"); } + if ((cid_tmp = switch_event_get_header(var_event, "origination_caller_id_number"))) { + cid_num_override = cid_tmp; + } + if (cid_num_override) { switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_caller_id_number", cid_num_override); } else { cid_num_override = switch_event_get_header(var_event, "origination_caller_id_number"); } + if (cid_num_override) { + dftflags |= SOF_NO_EFFECTIVE_CID_NUM; + } + + if (cid_name_override) { + dftflags |= SOF_NO_EFFECTIVE_CID_NAME; + } + if (!progress_timelimit_sec) { progress_timelimit_sec = timelimit_sec; } @@ -793,7 +810,8 @@ to = 0; sent_ring = 0; progress = 0; - + myflags = dftflags; + if (try > 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Originate attempt %d/%d in %d ms\n", try + 1, retries, sleep_ms); switch_yield(sleep_ms * 1000); @@ -915,6 +933,7 @@ strncpy(tmp, var_begin, strlen(var_begin)); } new_profile->caller_id_number = switch_core_strdup(new_profile->pool, tmp); + myflags |= SOF_NO_EFFECTIVE_CID_NUM; } if (vdata && (var_begin = switch_stristr("origination_caller_id_name=", vdata))) { @@ -927,8 +946,10 @@ strncpy(tmp, var_begin, strlen(var_begin)); } new_profile->caller_id_name = switch_core_strdup(new_profile->pool, tmp); + myflags |= SOF_NO_EFFECTIVE_CID_NAME; } + if ((reason = switch_core_session_outgoing_channel(session, var_event, chan_type, new_profile, &new_session, &pool, myflags)) != SWITCH_CAUSE_SUCCESS) {

1 0

[commit] r9247 - freeswitch/trunk/src
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 16:43:19 2008 New Revision: 9247 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_event.c Log: doh Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Aug 11 16:43:19 2008 @@ -1633,7 +1633,7 @@ nv = 0; olen = strlen(in) + 1; indup = strdup(in); - endof_indup = end_of_p(indup); + endof_indup = end_of_p(indup) + 1; if ((data = malloc(olen))) { memset(data, 0, olen); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Aug 11 16:43:19 2008 @@ -1219,7 +1219,7 @@ nv = 0; olen = strlen(in) + 1; indup = strdup(in); - endof_indup = end_of_p(indup); + endof_indup = end_of_p(indup) + 1; if ((data = malloc(olen))) { memset(data, 0, olen);

1 0

[commit] r9246 - in freeswitch/trunk/src: . include
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 16:41:18 2008 New Revision: 9246 Modified: freeswitch/trunk/src/include/switch_resample.h freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_resample.c Log: fix resampled file in ringback issue from mailing list Modified: freeswitch/trunk/src/include/switch_resample.h ============================================================================== --- freeswitch/trunk/src/include/switch_resample.h (original) +++ freeswitch/trunk/src/include/switch_resample.h Mon Aug 11 16:41:18 2008 @@ -60,6 +60,7 @@ int to_rate; /*! the factor to resample by (from / to) */ double factor; + double rfactor; /*! a pointer to store a float buffer for data to be resampled */ float *from; /*! the size of the from buffer used */ Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Aug 11 16:41:18 2008 @@ -420,6 +420,9 @@ } olen = mlen; + if (ringback.fh->resampler) { + olen *= ringback.fh->resampler->rfactor; + } switch_core_file_read(ringback.fh, write_frame.data, &olen); if (olen == 0) { @@ -1200,6 +1203,10 @@ } olen = mlen; + if (ringback.fh->resampler) { + olen *= ringback.fh->resampler->rfactor; + } + switch_core_file_read(ringback.fh, write_frame.data, &olen); if (olen == 0) { Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Mon Aug 11 16:41:18 2008 @@ -72,6 +72,7 @@ lto_rate = (double) resampler->to_rate; lfrom_rate = (double) resampler->from_rate; resampler->factor = (lto_rate / lfrom_rate); + resampler->rfactor = (lfrom_rate / lto_rate); resampler->resampler = resample_open(QUALITY, resampler->factor, resampler->factor); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Activate Resampler %d->%d %f\n", resampler->from_rate, resampler->to_rate,

1 0

[commit] r9245 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 15:21:21 2008 New Revision: 9245 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Log: fix MODLANG-75 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Mon Aug 11 15:21:21 2008 @@ -178,6 +178,8 @@ } else { tf = JS_FALSE; } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database handle is not initialized!\n"); } *rval = BOOLEAN_TO_JSVAL(tf); @@ -196,7 +198,7 @@ goto done; } - if (switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { + if (!odbc_obj || switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n"); goto done; } @@ -229,7 +231,7 @@ goto done; } - if (switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { + if (!odbc_obj || switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n"); goto done; } @@ -261,7 +263,7 @@ SQLSMALLINT rows = 0; - if (switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { + if (!odbc_obj || switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n"); goto done; } @@ -285,7 +287,7 @@ int result = 0; JSBool tf = JS_FALSE; - if (switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { + if (!odbc_obj || switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n"); goto done; } @@ -353,7 +355,7 @@ odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj); JSBool tf = JS_FALSE; - if (switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { + if (!odbc_obj || switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n"); goto done; } @@ -414,12 +416,35 @@ return JS_TRUE; } + +static JSBool odbc_disconnect(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj); + + if (!odbc_obj) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database handle is not initialized!\n"); + goto done; + } + + if (switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n"); + goto done; + } + + switch_odbc_handle_disconnect(odbc_obj->handle); + + done: + + return JS_TRUE; +} + enum odbc_tinyid { odbc_NAME }; static JSFunctionSpec odbc_methods[] = { {"connect", odbc_connect, 1}, + {"disconnect", odbc_disconnect, 1}, {"exec", odbc_exec, 1}, {"query", odbc_exec, 1}, {"execute", odbc_execute, 1},

1 0

[commit] r9244 - in freeswitch/trunk/src/mod/languages: mod_lua mod_perl
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 14:47:30 2008 New Revision: 9244 Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp Log: tweak for MODLANG-77 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 Mon Aug 11 14:47:30 2008 @@ -50,16 +50,21 @@ void Session::setLUA(lua_State * state) { - sanity_check_noreturn; - L = state; - if (uuid) { + + if (session && allocated && uuid) { lua_setglobal(L, uuid); lua_getfield(L, LUA_GLOBALSINDEX, uuid); } } +void Session::originate(CoreSession *a_leg_session, char *dest, int timeout) +{ + CoreSession::originate(a_leg_session, dest, timeout); + setLUA(L); +} + lua_State *Session::getLUA() { if (!L) { Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h Mon Aug 11 14:47:30 2008 @@ -32,6 +32,7 @@ void setInputCallback(char *cbfunc, char *funcargs = NULL); void setHangupHook(char *func, char *arg = NULL); bool ready(); + void originate(CoreSession *a_leg_session, char *dest, int timeout); char *cb_function; char *cb_arg; Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp Mon Aug 11 14:47:30 2008 @@ -7264,6 +7264,43 @@ } +static int _wrap_Session_originate(lua_State* L) { + int SWIG_arg = -1; + LUA::Session *arg1 = (LUA::Session *) 0 ; + CoreSession *arg2 = (CoreSession *) 0 ; + char *arg3 = (char *) 0 ; + int arg4 ; + + SWIG_check_num_args("originate",4,4) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("originate",1,"LUA::Session *"); + if(!SWIG_isptrtype(L,2)) SWIG_fail_arg("originate",2,"CoreSession *"); + if(!lua_isstring(L,3)) SWIG_fail_arg("originate",3,"char *"); + if(!lua_isnumber(L,4)) SWIG_fail_arg("originate",4,"int"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_LUA__Session,0))){ + SWIG_fail_ptr("Session_originate",1,SWIGTYPE_p_LUA__Session); + } + + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,2,(void**)&arg2,SWIGTYPE_p_CoreSession,0))){ + SWIG_fail_ptr("Session_originate",2,SWIGTYPE_p_CoreSession); + } + + arg3 = (char *)lua_tostring(L, 3); + arg4 = (int)lua_tonumber(L, 4); + (arg1)->originate(arg2,arg3,arg4); + SWIG_arg=0; + + return SWIG_arg; + + if(0) SWIG_fail; + +fail: + lua_error(L); + return SWIG_arg; +} + + static int _wrap_Session_cb_function_set(lua_State* L) { int SWIG_arg = -1; LUA::Session *arg1 = (LUA::Session *) 0 ; @@ -7542,6 +7579,7 @@ {"setInputCallback", _wrap_Session_setInputCallback}, {"setHangupHook", _wrap_Session_setHangupHook}, {"ready", _wrap_Session_ready}, + {"originate", _wrap_Session_originate}, {"setLUA", _wrap_Session_setLUA}, {0,0} }; 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 Mon Aug 11 14:47:30 2008 @@ -72,7 +72,7 @@ void Session::setPERL(PerlInterpreter * pi) { - sanity_check_noreturn; + my_perl = pi; }

1 0