November 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6175 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 07 Nov '07

07 Nov '07

Author: anthm Date: Wed Nov 7 13:41:25 2007 New Revision: 6175 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: add missing xml free Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Wed Nov 7 13:41:25 2007 @@ -332,6 +332,9 @@ switch_thread_create(&thread, thd_attr, read_stream_thread, source, source->pool); } + + switch_xml_free(xml); + }

1 0

[commit] r6174 - freeswitch/trunk/src
by Freeswitch SVN 07 Nov '07

07 Nov '07

Author: anthm Date: Wed Nov 7 13:34:56 2007 New Revision: 6174 Modified: freeswitch/trunk/src/switch_channel.c Log: add more nested var tricks Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Nov 7 13:34:56 2007 @@ -1382,7 +1382,7 @@ if (vtype == 1) { char *expanded = NULL; - + if ((expanded = switch_channel_expand_variables(channel, (char *)vname)) == vname) { expanded = NULL; } else { @@ -1397,7 +1397,13 @@ SWITCH_STANDARD_STREAM(stream); if (stream.data) { - + char *expanded_vname = NULL; + + if ((expanded_vname = switch_channel_expand_variables(channel, (char *)vname)) == vname) { + expanded_vname = NULL; + } else { + vname = expanded_vname; + } if ((expanded = switch_channel_expand_variables(channel, vval)) == vval) { expanded = NULL; @@ -1413,6 +1419,7 @@ } switch_safe_free(expanded); + switch_safe_free(expanded_vname); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");

1 0

[commit] r6173 - freeswitch/trunk/src
by Freeswitch SVN 07 Nov '07

07 Nov '07

Author: anthm Date: Wed Nov 7 13:28:33 2007 New Revision: 6173 Modified: freeswitch/trunk/src/switch_channel.c Log: add more nested var tricks Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Nov 7 13:28:33 2007 @@ -1381,14 +1381,23 @@ } if (vtype == 1) { + char *expanded = NULL; + + if ((expanded = switch_channel_expand_variables(channel, (char *)vname)) == vname) { + expanded = NULL; + } else { + vname = expanded; + } sub_val = switch_channel_get_variable(channel, vname); + switch_safe_free(expanded); } else { switch_stream_handle_t stream = { 0 }; + char *expanded = NULL; SWITCH_STANDARD_STREAM(stream); if (stream.data) { - char *expanded = NULL; + if ((expanded = switch_channel_expand_variables(channel, vval)) == vval) { expanded = NULL;

1 0

[commit] r6172 - in freeswitch/trunk/src: . mod/formats/mod_shout
by Freeswitch SVN 07 Nov '07

07 Nov '07

Author: anthm Date: Tue Nov 6 21:14:57 2007 New Revision: 6172 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c freeswitch/trunk/src/switch_channel.c Log: fix nested brackets 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 Tue Nov 6 21:14:57 2007 @@ -37,9 +37,9 @@ #include <lame.h> #include <curl/curl.h> -#define OUTSCALE 8192 -#define MP3_SCACHE 16384 -#define MP3_DCACHE 8192 +#define OUTSCALE 8192 * 2 +#define MP3_SCACHE 16384 * 2 +#define MP3_DCACHE 8192 *2 SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Nov 6 21:14:57 2007 @@ -1355,6 +1355,15 @@ *e++ = '\0'; break; } + + if (br > 0) { + if (e != s && *e == '{') { + br++; + } else if (br > 1 && *e == '}') { + br--; + } + } + e++; } p = e; @@ -1380,7 +1389,7 @@ if (stream.data) { char *expanded = NULL; - + if ((expanded = switch_channel_expand_variables(channel, vval)) == vval) { expanded = NULL; } else {

1 0

[commit] r6171 - freeswitch/trunk/src
by Freeswitch SVN 07 Nov '07

07 Nov '07

Author: anthm Date: Tue Nov 6 20:33:31 2007 New Revision: 6171 Modified: freeswitch/trunk/src/switch_channel.c Log: doh Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Nov 6 20:33:31 2007 @@ -1390,10 +1390,12 @@ if (switch_api_execute(vname, vval, channel->session, &stream) == SWITCH_STATUS_SUCCESS) { func_val = stream.data; sub_val = func_val; + } else { + free(stream.data); } switch_safe_free(expanded); - free(stream.data); + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); free(data);

1 0

[commit] r6170 - freeswitch/trunk/ssh_keys
by Freeswitch SVN 07 Nov '07

07 Nov '07

Author: anthm Date: Tue Nov 6 20:18:39 2007 New Revision: 6170 Added: freeswitch/trunk/ssh_keys/ freeswitch/trunk/ssh_keys/shinzon.pub Log: add a keys dir Added: freeswitch/trunk/ssh_keys/shinzon.pub ============================================================================== --- (empty file) +++ freeswitch/trunk/ssh_keys/shinzon.pub Tue Nov 6 20:18:39 2007 @@ -0,0 +1 @@ +ssh-dss AAAAB3NzaC1kc3MAAACBAN5bSW/qC1n6pq2GXZ5JS6b6M6batv8rE/E8JcYlB3z/Ut2bfriQrgGT+RfO+nxJjbSgLohZp6fxppRnLC0fCheBZHq0XZqbpaDqKfppxYjUTqOk5NwfjsjhTvcRH7kCsKrPUDaWFuermLeM5LxM9xfc17WiHuAxjLuP8ztAaCsFAAAAFQC93iyYvzsNdBNOTnznO9mWN1XUAwAAAIEAqwqcScVI8VJOrTlTVi2tG8XAPc0mjhWrZ4Y7laRcPjeLuRpbeOQvGqsPtq4K1EAM6cleZkE5S6mCTf5rnTmev/VX11rk/GMJma7GdcKXW08Cz+dPhyNy7pmFi5uYKo9jG2smk6LVksCcpNeeCHKESePSQ0NE3drJoki+/8E7g3IAAACABW2tP88srlxpHjcmqd2HSjpFWcpzm49DWFdIqlWek3oBZsW5ImoCH2SfdZ7LEWXIvJRutOWwKahXjyOw08UkSzRPq3/lmU4fVZHgbo72TQNmXUOEOR0de7McrlJX3nOl2bu9TK4/b1inCWPnTYWyyrUjesuISKBiYflL4oryeKo= anthm@shinzon

1 0

[commit] r6169 - freeswitch/trunk/src
by Freeswitch SVN 07 Nov '07

07 Nov '07

Author: anthm Date: Tue Nov 6 19:00:51 2007 New Revision: 6169 Modified: freeswitch/trunk/src/switch_channel.c Log: recurse variable expansion in api variables Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Nov 6 19:00:51 2007 @@ -1379,12 +1379,21 @@ SWITCH_STANDARD_STREAM(stream); if (stream.data) { + char *expanded = NULL; + + if ((expanded = switch_channel_expand_variables(channel, vval)) == vval) { + expanded = NULL; + } else { + vval = expanded; + } + if (switch_api_execute(vname, vval, channel->session, &stream) == SWITCH_STATUS_SUCCESS) { func_val = stream.data; sub_val = func_val; - } else { - free(stream.data); } + + switch_safe_free(expanded); + free(stream.data); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); free(data);

1 0

[commit] r6168 - in freeswitch/trunk: conf src/mod/endpoints/mod_sofia
by Freeswitch SVN 06 Nov '07

06 Nov '07

Author: anthm Date: Tue Nov 6 17:34:20 2007 New Revision: 6168 Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: remove unused param Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Tue Nov 6 17:34:20 2007 @@ -51,7 +51,6 @@ <param name="dialplan" value="XML,enum"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> - <param name="codec-ms" value="20"/> <param name="use-rtp-timer" value="true"/> <param name="rtp-timer-name" value="soft"/> <param name="rtp-ip" value="$${local_ip_v4}"/> Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Nov 6 17:34:20 2007 @@ -231,7 +231,6 @@ int sip_port; char *codec_string; int running; - int codec_ms; int dtmf_duration; unsigned int flags; unsigned int pflags; 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 Tue Nov 6 17:34:20 2007 @@ -808,7 +808,7 @@ switch_thread_rwlock_create(&profile->rwlock, profile->pool); switch_mutex_init(&profile->flag_mutex, SWITCH_MUTEX_NESTED, profile->pool); profile->dtmf_duration = 100; - profile->codec_ms = 20; + for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -970,8 +970,6 @@ profile->max_calls = atoi(val); } else if (!strcasecmp(var, "codec-prefs")) { profile->codec_string = switch_core_strdup(profile->pool, val); - } else if (!strcasecmp(var, "codec-ms")) { - profile->codec_ms = atoi(val); } else if (!strcasecmp(var, "dtmf-duration")) { int dur = atoi(val); if (dur > 10 && dur < 8000) {

1 0

[commit] r6167 - freeswitch/trunk/src
by Freeswitch SVN 06 Nov '07

06 Nov '07

Author: anthm Date: Tue Nov 6 17:19:49 2007 New Revision: 6167 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: add default prefix for realitive paths with no prefix defined 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 Tue Nov 6 17:19:49 2007 @@ -674,6 +674,10 @@ return SWITCH_STATUS_FALSE; } + if (!prefix) { + prefix = SWITCH_GLOBAL_dirs.base_dir; + } + if (!strstr(file, SWITCH_URL_SEPARATOR)) { if (!switch_is_file_path(file)) { file = switch_core_session_sprintf(session, "%s%s%s", prefix, SWITCH_PATH_SEPARATOR, file);

1 0

[commit] r6166 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 06 Nov '07

06 Nov '07

Author: anthm Date: Tue Nov 6 09:43:27 2007 New Revision: 6166 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: add trixter Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Tue Nov 6 09:43:27 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Bret McDanel <trixter AT 0xdecafbad.com> * Justin Cassidy <xachenant(a)hotmail.com> * * mod_xml_curl.c -- CURL XML Gateway

1 0