- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10009 - in freeswitch/trunk/src: . include
by Freeswitch SVN 14 Oct '08

14 Oct '08

Author: anthm Date: Tue Oct 14 14:03:14 2008 New Revision: 10009 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_ivr_originate.c Log: cleanup Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Oct 14 14:03:14 2008 @@ -1132,6 +1132,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(_In_ switch_core_session_t *session, switch_codec_t *codec); SWITCH_DECLARE(void) switch_core_session_unset_read_codec(_In_ switch_core_session_t *session); +SWITCH_DECLARE(void) switch_core_session_unset_write_codec(_In_ switch_core_session_t *session); /*! \brief Retrieve the read codec from a given session Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Tue Oct 14 14:03:14 2008 @@ -47,6 +47,11 @@ session->real_read_codec = session->read_codec = NULL; } +SWITCH_DECLARE(void) switch_core_session_unset_write_codec(switch_core_session_t *session) +{ + session->real_write_codec = session->write_codec = NULL; +} + SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_session_t *session, switch_codec_t *codec) { @@ -55,16 +60,24 @@ char tmp[30]; if (codec && !codec->implementation) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set INITIALIZED codec!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set UNINITIALIZED codec!\n"); return SWITCH_STATUS_FALSE; } if (!codec || codec == session->real_read_codec) { + if (session->real_read_codec) { - session->read_codec = session->real_read_codec; + if (session->real_read_codec->implementation) { + session->read_codec = session->real_read_codec; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "resetting to uninitilized codec, setting to NULL\n"); + session->read_codec = session->real_read_codec = NULL; + return SWITCH_STATUS_FALSE; + } } else { return SWITCH_STATUS_FALSE; } + } else if (codec) { if (session->read_codec != session->real_read_codec) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot double-set codec!\n"); Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Oct 14 14:03:14 2008 @@ -180,7 +180,6 @@ if (!(session->read_codec && session->read_codec->implementation)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s has no read codec.\n", switch_channel_get_name(session->channel)); - abort(); return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Oct 14 14:03:14 2008 @@ -88,6 +88,14 @@ char buf[10] = SWITCH_BLANK_STRING; char *p, term; + if (collect->session) { + if (switch_core_session_read_lock(collect->session) != SWITCH_STATUS_SUCCESS) { + return NULL; + } + } else { + return NULL; + } + if (!strcasecmp(collect->key, "exec")) { char *data; const switch_application_interface_t *application_interface; @@ -147,7 +155,9 @@ } } } - wbreak: + wbreak: + + switch_core_session_rwunlock(collect->session); return NULL; }

1 0

[commit] r10008 - in freeswitch/trunk: conf/autoload_configs src/mod/languages/mod_lua
by Freeswitch SVN 14 Oct '08

14 Oct '08

Author: mikej Date: Tue Oct 14 13:14:56 2008 New Revision: 10008 Modified: freeswitch/trunk/conf/autoload_configs/lua.conf.xml freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Log: (MODLANG-86) add local script directory support to mod_lua Modified: freeswitch/trunk/conf/autoload_configs/lua.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/lua.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/lua.conf.xml Tue Oct 14 13:14:56 2008 @@ -1,5 +1,20 @@ <configuration name="lua.conf" description="LUA Configuration"> <settings> + +  +  +  + +  +  +  +   Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Tue Oct 14 13:14:56 2008 @@ -257,12 +257,16 @@ { const char *cf = "lua.conf"; switch_xml_t cfg, xml, settings, param; - - if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_stream_handle_t path_stream = {0}; + switch_stream_handle_t cpath_stream = {0}; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); return SWITCH_STATUS_TERM; } + SWITCH_STANDARD_STREAM(path_stream); + SWITCH_STANDARD_STREAM(cpath_stream); if ((settings = switch_xml_child(cfg, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -279,10 +283,58 @@ if (val) { lua_thread(val); } + } else if (!strcmp(var, "module-directory") && !switch_strlen_zero(val)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "lua: appending module directory: '%s'\n", val); + if(cpath_stream.data_len) { + cpath_stream.write_function(&cpath_stream, ";"); + } + cpath_stream.write_function(&cpath_stream, "%s", val); + } else if (!strcmp(var, "script-directory") && !switch_strlen_zero(val)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "lua: appending script directory: '%s'\n", val); + if(path_stream.data_len) { + path_stream.write_function(&path_stream, ";"); + } + path_stream.write_function(&path_stream, "%s", val); } } } + if (cpath_stream.data_len) { + char *lua_cpath = NULL; + if (lua_cpath = getenv("LUA_CPATH")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "lua: appending LUA_CPATH: '%s'\n", lua_cpath); + cpath_stream.write_function(&cpath_stream, ";%s", lua_cpath); + } +#ifdef WIN32 + if (_putenv_s("LUA_CPATH", (char *)cpath_stream.data) != 0) { +#else + if (setenv("LUA_CPATH", (char *)cpath_stream.data, 1) == ENOMEM) { +#endif + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "lua: LUA_CPATH unable to be set, out of memory: '%s'\n", (char *)cpath_stream.data); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "lua: LUA_CPATH set to: '%s'\n", (char *)cpath_stream.data); + } + } + switch_safe_free(cpath_stream.data); + + if (path_stream.data_len) { + char *lua_path = NULL; + if (lua_path = getenv("LUA_PATH")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "lua: appending LUA_PATH: '%s'\n", lua_path); + path_stream.write_function(&path_stream, ";%s", lua_path); + } +#ifdef WIN32 + if (_putenv_s("LUA_PATH", (char *)path_stream.data) != 0) { +#else + if (setenv("LUA_PATH", (char *)path_stream.data, 1) == ENOMEM) { +#endif + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "lua: LUA_PATH unable to be set, out of memory: '%s'\n", (char *)path_stream.data); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "lua: LUA_PATH set to: '%s'\n", (char *)path_stream.data); + } + } + switch_safe_free(path_stream.data); + switch_xml_free(xml); return SWITCH_STATUS_SUCCESS;

1 0

[commit] r10007 - freeswitch/branches/mrene
by Freeswitch SVN 14 Oct '08

14 Oct '08

Author: sphere Date: Tue Oct 14 12:59:02 2008 New Revision: 10007 Added: freeswitch/branches/mrene/ Log:

1 0

[commit] r10006 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by Freeswitch SVN 14 Oct '08

14 Oct '08

Author: mikej Date: Tue Oct 14 12:08:43 2008 New Revision: 10006 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Log: (SFSIP-88) handle leak on windows Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Tue Oct 14 12:08:43 2008 @@ -1019,8 +1019,15 @@ home->suh_blocks = NULL; - if (home->suh_lock) + if (home->suh_lock) { +#ifdef WIN32 + UNLOCK(home); /* we must unlock here or windows leaks handles on the next call because the mutex is locked */ +#endif +/* "In the LinuxThreads implementation, no resources are associated with mutex objects, + thus pthread_mutex_destroy actually does nothing except checking that the mutex is unlocked. " + In the Windows pthread implementation we must free the handles that are allocated */ _su_home_destroy_mutexes(home->suh_lock); + } } home->suh_lock = NULL;

1 0

[commit] r10001 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 13 Oct '08

13 Oct '08

Author: mikej Date: Mon Oct 13 18:20:24 2008 New Revision: 10001 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add domain params to be found in user data output 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 Oct 13 18:20:24 2008 @@ -89,11 +89,23 @@ if (var && val && !strcasecmp(var, key)) { stream->write_function(stream, "%s", val); - break; + goto end; } } } + + if ((x_params = switch_xml_child(x_domain, container))) { + for (x_param = switch_xml_child(x_params, elem); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr(x_param, "name"); + const char *val = switch_xml_attr(x_param, "value"); + + if (var && val && !strcasecmp(var, key)) { + stream->write_function(stream, "%s", val); + goto end; + } + } + } } end:

1 0

[commit] r10000 - in freeswitch/trunk: conf/autoload_configs src/mod/formats/mod_shout
by Freeswitch SVN 13 Oct '08

13 Oct '08

Author: anthm Date: Mon Oct 13 17:57:07 2008 New Revision: 10000 Added: freeswitch/trunk/conf/autoload_configs/shout.conf.xml Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: add configuration to mod_shout to resolve some crazyness, also commit #10,000 if I only had a dollar for each one..... Added: freeswitch/trunk/conf/autoload_configs/shout.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/autoload_configs/shout.conf.xml Mon Oct 13 17:57:07 2008 @@ -0,0 +1,8 @@ +<configuration name="shout.conf" description="mod shout config"> + <settings> +  +  +  +  + </settings> +</configuration> Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Mon Oct 13 17:57:07 2008 @@ -47,21 +47,42 @@ static char *supported_formats[SWITCH_MAX_CODECS] = { 0 }; +static struct { + char decoder[256]; + float vol; + uint32_t outscale; +} globals; + mpg123_handle *our_mpg123_new(const char* decoder, int *error) { mpg123_handle *mh; const char *arch = "auto"; int x64 = 0; - - if (sizeof(void *) == 4) { - arch = "i586"; + + if (*globals.decoder || globals.outscale || globals.vol) { + if (*globals.decoder) { + arch = globals.decoder; + } + if ((mh = mpg123_new(arch, NULL))) { + if (globals.outscale) { + mpg123_param(mh, MPG123_OUTSCALE, globals.outscale, 0); + } + if (globals.vol) { + mpg123_volume(mh, globals.vol); + } + } } else { - x64++; - } - if ((mh = mpg123_new(arch, NULL))) { - if (x64) { - mpg123_param(mh, MPG123_OUTSCALE, 8192, 0); + if (sizeof(void *) == 4) { + arch = "i586"; + } else { + x64++; + } + + if ((mh = mpg123_new(arch, NULL))) { + if (x64) { + mpg123_param(mh, MPG123_OUTSCALE, 8192, 0); + } } } @@ -1391,6 +1412,42 @@ return SWITCH_STATUS_SUCCESS; } +static switch_status_t load_config(void) +{ + char *cf = "shout.conf"; + switch_xml_t cfg, xml, settings, param; + + memset(&globals, 0, sizeof(globals)); + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcmp(var, "decoder")) { + switch_set_string(globals.decoder, val); + } else if (!strcmp(var, "volume")) { + globals.vol = atof(val); + } else if (!strcmp(var, "outscale")) { + int tmp = atoi(val); + if (tmp > 0) { + globals.outscale = tmp; + } + } + } + } + + + switch_xml_free(xml); + + return SWITCH_STATUS_SUCCESS; +} + SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load) { switch_api_interface_t *shout_api_interface; @@ -1421,6 +1478,8 @@ SWITCH_ADD_API(shout_api_interface, "telecast", "telecast", telecast_api_function, TELECAST_SYNTAX); + load_config(); + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r9999 - freeswitch/trunk/src
by Freeswitch SVN 13 Oct '08

13 Oct '08

Author: anthm Date: Mon Oct 13 17:17:10 2008 New Revision: 9999 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: update Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Oct 13 17:17:10 2008 @@ -868,7 +868,11 @@ 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); + if (caller_channel) { + switch_ivr_sleep(session, sleep_ms, NULL); + } else { + switch_yield(sleep_ms * 1000); + } } p = pipe_names[r]; @@ -1339,7 +1343,6 @@ switch_size_t mlen, olen; unsigned int pos = 0; - if (ringback.asis) { mlen = write_frame.codec->implementation->encoded_bytes_per_frame; } else {

1 0

[commit] r9997 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 13 Oct '08

13 Oct '08

Author: anthm Date: Mon Oct 13 15:26:28 2008 New Revision: 9997 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add more profile shutdown code to compensate for bug in sofia lib on nua_destroy 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 Oct 13 15:26:28 2008 @@ -1633,7 +1633,7 @@ } if (!strcasecmp(argv[1], "stop") || !strcasecmp(argv[1], "restart")) { - int rsec = 3; + int rsec = 10; int diff = (int) (switch_timestamp(NULL) - profile->started); int remain = rsec - diff; if (diff < rsec) { 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 Oct 13 15:26:28 2008 @@ -635,6 +635,14 @@ su_root_step(profile->s_root, 1000); } + sofia_clear_pflag_locked(profile, PFLAG_RUNNING); + + switch_core_session_hupall_matching_var("sofia_profile_name", profile->name, SWITCH_CAUSE_MANAGER_REQUEST); + while (profile->inuse) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Waiting for %d session(s)\n", profile->inuse); + su_root_step(profile->s_root, 1000); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write lock %s\n", profile->name); switch_thread_rwlock_wrlock(profile->rwlock); sofia_reg_unregister(profile); 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 Oct 13 15:26:28 2008 @@ -2708,6 +2708,19 @@ for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, &var, NULL, &val); if ((pptr = (sofia_profile_t *) val)) { + int rsec = 10; + int diff = (int) (switch_timestamp(NULL) - pptr->started); + int remain = rsec - diff; + if (sofia_test_pflag(pptr, PFLAG_RESPAWN) || !sofia_test_pflag(pptr, PFLAG_RUNNING)) { + continue; + } + + if (diff < rsec) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Profile %s must be up for at least %d seconds to stop/restart.\nPlease wait %d second%s\n", + pptr->name, rsec, remain, remain == 1 ? "" : "s"); + continue; + } sofia_set_pflag_locked(pptr, PFLAG_RESPAWN); sofia_clear_pflag_locked(pptr, PFLAG_RUNNING); }

1 0

[commit] r9996 - freeswitch/trunk/src
by Freeswitch SVN 13 Oct '08

13 Oct '08

Author: anthm Date: Mon Oct 13 15:25:52 2008 New Revision: 9996 Modified: freeswitch/trunk/src/switch_xml.c Log: fix race in xml reloader Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Oct 13 15:25:52 2008 @@ -142,8 +142,7 @@ static switch_thread_rwlock_t *RWLOCK = NULL; static switch_thread_rwlock_t *B_RWLOCK = NULL; static switch_mutex_t *XML_LOCK = NULL; -static switch_mutex_t *XML_COUNT_LOCK = NULL; -static uint32_t lock_count = 0; + struct xml_section_t { const char *name; @@ -1524,9 +1523,6 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_root(void) { - switch_mutex_lock(XML_COUNT_LOCK); - lock_count++; - switch_mutex_unlock(XML_COUNT_LOCK); switch_thread_rwlock_rdlock(RWLOCK); return MAIN_XML_ROOT; } @@ -1637,7 +1633,6 @@ *err = "Success"; switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); - switch_mutex_init(&XML_COUNT_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); switch_thread_rwlock_create(&RWLOCK, XML_MEMORY_POOL); switch_thread_rwlock_create(&B_RWLOCK, XML_MEMORY_POOL); @@ -1926,19 +1921,12 @@ char **a, *s; - if (!xml) + if (!xml) { return; - - if (switch_test_flag(xml, SWITCH_XML_ROOT)) { - switch_mutex_lock(XML_COUNT_LOCK); - if (lock_count > 0) { - switch_thread_rwlock_unlock(RWLOCK); - lock_count--; - } - switch_mutex_unlock(XML_COUNT_LOCK); } if (xml == MAIN_XML_ROOT) { + switch_thread_rwlock_unlock(RWLOCK); return; }

1 0

[commit] r9995 - freeswitch/trunk/src
by Freeswitch SVN 13 Oct '08

13 Oct '08

Author: mikej Date: Mon Oct 13 12:13:41 2008 New Revision: 9995 Modified: freeswitch/trunk/src/switch_cpp.cpp Log: don't allocate pool we don't use. Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Oct 13 12:13:41 2008 @@ -893,7 +893,6 @@ SWITCH_DECLARE(int) CoreSession::originate(CoreSession *a_leg_session, char *dest, int timeout) { - switch_memory_pool_t *pool = NULL; switch_core_session_t *aleg_core_session = NULL; switch_call_cause_t cause; @@ -911,11 +910,6 @@ // use the 'a leg session' to do the thread swapping stuff. if (a_leg_session) a_leg_session->begin_allow_threads(); - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); - goto failed; - } - if (switch_ivr_originate(aleg_core_session, &session, &cause,

1 0