- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

[commit] r9243 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: mikej Date: Mon Aug 11 14:28:01 2008 New Revision: 9243 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: mod_sofia Gateway Ping needs to look for return code 501 (SFSIP-78) 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 Aug 11 14:28:01 2008 @@ -1929,7 +1929,7 @@ } if (gateway) { - if (status == 200 || status == 404) { + if (status == 200 || status == 404 || status == 501) { if (gateway->state == REG_STATE_FAILED) { gateway->state = REG_STATE_UNREGED; gateway->retry = 0;

1 0

[commit] r9242 - freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: mikej Date: Mon Aug 11 14:25:03 2008 New Revision: 9242 Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_win.c Log: fix shutdown of socket on mod_xml_rpc (MDXMLINT-30) Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_win.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_win.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_win.c Mon Aug 11 14:25:03 2008 @@ -791,6 +791,10 @@ Actually, this is just a no-op because we don't yet know how to accomplish that. -----------------------------------------------------------------------------*/ + struct socketWin * const socketWinP = chanSwitchP->implP; + + if (!socketWinP->userSuppliedWinsock) + closesocket(socketWinP->winsock); }

1 0

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

11 Aug '08

Author: anthm Date: Mon Aug 11 14:24:07 2008 New Revision: 9241 Modified: freeswitch/trunk/src/switch_time.c Log: move init sooner in timer module Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Aug 11 14:24:07 2008 @@ -309,9 +309,6 @@ switch_time_sync(); - memset(&globals, 0, sizeof(globals)); - switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); - globals.STARTED = globals.RUNNING = 1; switch_mutex_lock(runtime.throttle_mutex); runtime.sps = runtime.sps_total; @@ -430,6 +427,9 @@ switch_timer_interface_t *timer_interface; module_pool = pool; + memset(&globals, 0, sizeof(globals)); + switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); timer_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_TIMER_INTERFACE);

1 0

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

11 Aug '08

Author: mikej Date: Mon Aug 11 13:47:06 2008 New Revision: 9240 Modified: freeswitch/trunk/src/switch_console.c Log: fix a little leak reported by skopii Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Aug 11 13:47:06 2008 @@ -165,7 +165,7 @@ { char *errmsg = NULL; char *r = NULL; - char *sql; + char *sql = NULL; char *exp = NULL; switch_core_db_t *db = switch_core_db_handle(); int full = 0; @@ -179,6 +179,8 @@ free(errmsg); } + switch_safe_free(sql); + if (!r) { sql = switch_mprintf("select command from aliases where alias='%q %q'", cmd, arg); @@ -193,6 +195,7 @@ } } + switch_safe_free(sql); if (r) { if (arg && !full) {

1 0

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

11 Aug '08

Author: anthm Date: Mon Aug 11 12:50:45 2008 New Revision: 9239 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix pool hoarding of mem in js 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 Aug 11 12:50:45 2008 @@ -83,8 +83,8 @@ static JSBool session_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval); static JSBool session_originate(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval); static JSBool session_set_callerdata(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval); -static switch_api_interface_t js_run_interface; -static switch_api_interface_t jsapi_interface; +static switch_api_interface_t *js_run_interface = NULL; +static switch_api_interface_t *jsapi_interface = NULL; static struct { size_t gStackChunkSize; @@ -3559,37 +3559,50 @@ js_parse_and_execute(session, data, NULL); } +struct js_task { + switch_memory_pool_t *pool; + char *code; +}; + static void *SWITCH_THREAD_FUNC js_thread_run(switch_thread_t *thread, void *obj) { - char *input_code = obj; + struct js_task *task = (struct js_task *) obj; + switch_memory_pool_t *pool; - js_parse_and_execute(NULL, input_code, NULL); + js_parse_and_execute(NULL, task->code, NULL); - if (input_code) { - free(input_code); + if ((pool = task->pool)) { + switch_core_destroy_memory_pool(&pool); } return NULL; } -static switch_memory_pool_t *module_pool = NULL; - static void js_thread_launch(const char *text) { switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; + struct js_task *task; + switch_memory_pool_t *pool; - if (!module_pool) { - if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); - return; - } + if (switch_strlen_zero(text)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "missing required input!\n"); + return; } - switch_threadattr_create(&thd_attr, module_pool); + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); + return; + } + + task = switch_core_alloc(pool, sizeof(*task)); + task->pool = pool; + task->code = switch_core_strdup(pool, text); + + switch_threadattr_create(&thd_attr, pool); switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, js_thread_run, strdup(text), module_pool); + switch_thread_create(&thread, thd_attr, js_thread_run, task, pool); } SWITCH_STANDARD_API(jsapi_function) @@ -3606,7 +3619,7 @@ } if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "USAGE: %s\n", jsapi_interface.syntax); + stream->write_function(stream, "USAGE: %s\n", jsapi_interface->syntax); return SWITCH_STATUS_SUCCESS; } @@ -3622,7 +3635,7 @@ SWITCH_STANDARD_API(launch_async) { if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "USAGE: %s\n", js_run_interface.syntax); + stream->write_function(stream, "USAGE: %s\n", js_run_interface->syntax); return SWITCH_STATUS_SUCCESS; } @@ -3654,7 +3667,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load) { - switch_api_interface_t *api_interface; switch_application_interface_t *app_interface; switch_status_t status; @@ -3670,8 +3682,8 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_API(api_interface, "jsrun", "run a script", launch_async, "jsrun <script> [additional_vars [...]]"); - SWITCH_ADD_API(api_interface, "jsapi", "execute an api call", jsapi_function, "jsapi <script> [additional_vars [...]]"); + SWITCH_ADD_API(js_run_interface, "jsrun", "run a script", launch_async, "jsrun <script> [additional_vars [...]]"); + SWITCH_ADD_API(jsapi_interface, "jsapi", "execute an api call", jsapi_function, "jsapi <script> [additional_vars [...]]"); SWITCH_ADD_APP(app_interface, "javascript", "Launch JS ivr", "Run a javascript ivr on a channel", js_dp_function, "<script> [additional_vars [...]]", SAF_SUPPORT_NOMEDIA);

1 0

[commit] r9238 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 12:12:55 2008 New Revision: 9238 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_originate.c Log: add some clarification 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 12:12:55 2008 @@ -1186,7 +1186,8 @@ SWITCH_CAUSE_ALLOTTED_TIMEOUT = 602, SWITCH_CAUSE_USER_CHALLENGE = 603, SWITCH_CAUSE_MEDIA_TIMEOUT = 604, - SWITCH_CAUSE_PICKED_OFF = 605 + SWITCH_CAUSE_PICKED_OFF = 605, + SWITCH_CAUSE_USER_NOT_REGISTERED = 606 } switch_call_cause_t; typedef enum { 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 Aug 11 12:12:55 2008 @@ -1616,8 +1616,8 @@ char *p; sofia_profile_t *profile = NULL; const char *exclude_contact = NULL; - char *reply = ""; - + char *reply = "error/facility_not_subscribed"; + if (!cmd) { stream->write_function(stream, "%s", ""); return SWITCH_STATUS_SUCCESS; @@ -1696,8 +1696,14 @@ if (!switch_strlen_zero(reply) && end_of(reply) == ',') { end_of(reply) = '\0'; } + + if (switch_strlen_zero(reply)) { + reply = "error/user_not_registered"; + } + stream->write_function(stream, "%s", reply); reply = NULL; + switch_safe_free(mystream.data); } } @@ -1960,7 +1966,7 @@ tech_pvt->local_url = switch_core_session_sprintf(nsession, "%s@%s", dest, host); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, host); - cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; + cause = SWITCH_CAUSE_USER_NOT_REGISTERED; goto error; } } else if (!(host = strchr(dest, '@'))) { @@ -1972,7 +1978,7 @@ host = profile_name; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile_name); - cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; + cause = SWITCH_CAUSE_USER_NOT_REGISTERED; goto error; } } else { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Aug 11 12:12:55 2008 @@ -101,6 +101,7 @@ {"USER_CHALLENGE", SWITCH_CAUSE_USER_CHALLENGE}, {"MEDIA_TIMEOUT", SWITCH_CAUSE_MEDIA_TIMEOUT}, {"PICKED_OFF", SWITCH_CAUSE_PICKED_OFF}, + {"USER_NOT_REGISTERED", SWITCH_CAUSE_USER_NOT_REGISTERED}, {NULL, 0} }; 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 12:12:55 2008 @@ -536,10 +536,16 @@ char *loop_data = NULL; uint32_t progress_timelimit_sec = 0; + *bleg = NULL; + + if (!strncasecmp(bridgeto, "error/", 6)) { + *cause = switch_channel_str2cause(bridgeto + 6); + return SWITCH_STATUS_SUCCESS; + } + switch_zmalloc(write_frame.data, SWITCH_RECOMMENDED_BUFFER_SIZE); write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; - *bleg = NULL; odata = strdup(bridgeto); if (!odata) {

1 0

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

11 Aug '08

Author: anthm Date: Mon Aug 11 12:11:50 2008 New Revision: 9237 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: extra blank-string protection Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Aug 11 12:11:50 2008 @@ -2384,7 +2384,9 @@ expanded = NULL; } if (!strncasecmp(file, "say:", 4)) { - status = conference_member_say(member, file + 4, leadin); + if (!switch_strlen_zero(file + 4)) { + status = conference_member_say(member, file + 4, leadin); + } goto done; } if (!switch_is_file_path(file)) { @@ -2393,7 +2395,7 @@ goto done; } file = dfile; - } else { + } else if (!switch_strlen_zero(file)) { status = conference_member_say(member, file, leadin); goto done; } @@ -2721,7 +2723,7 @@ return SWITCH_STATUS_GENERR; switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); - if (member->conference->muted_sound) { + if (!switch_strlen_zero(member->conference->muted_sound)) { conference_member_play_file(member, member->conference->muted_sound, 0); } else { char msg[512]; @@ -2753,7 +2755,7 @@ if (stream != NULL) { stream->write_function(stream, "OK unmute %u\n", member->id); } - if (member->conference->unmuted_sound) { + if (!switch_strlen_zero(member->conference->unmuted_sound)) { conference_member_play_file(member, member->conference->unmuted_sound, 0); } else { char msg[512];

1 0