November 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6179 - freeswitch/trunk/src/mod/endpoints/mod_alsa
by Freeswitch SVN 07 Nov '07

07 Nov '07

Author: anthm Date: Wed Nov 7 16:00:09 2007 New Revision: 6179 Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Log: fix mod_alsa const stuff Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Wed Nov 7 16:00:09 2007 @@ -170,7 +170,7 @@ switch_time_t last; int waitsec = globals.ring_interval * 1000000; switch_file_handle_t fh = { 0 }; - char *val, *ring_file = NULL, *hold_file = NULL; + const char *val, *ring_file = NULL, *hold_file = NULL; int16_t abuf[2048]; tech_pvt = switch_core_session_get_private(session); @@ -802,7 +802,7 @@ if (outbound_profile) { char name[128]; - char *id = !switch_strlen_zero(outbound_profile->caller_id_number) ? outbound_profile->caller_id_number : "na"; + const char *id = !switch_strlen_zero(outbound_profile->caller_id_number) ? outbound_profile->caller_id_number : "na"; snprintf(name, sizeof(name), "Alsa/%s", id); switch_channel_set_name(channel, name); @@ -1409,8 +1409,8 @@ { private_t *tp; int x = 0; - char *cid_name = "n/a"; - char *cid_num = "n/a"; + const char *cid_name = "n/a"; + const char *cid_num = "n/a"; switch_mutex_lock(globals.pvt_lock); for (tp = globals.call_list; tp; tp = tp->next) {

1 0

[commit] r6178 - freeswitch/trunk/src/mod/applications/mod_rss
by Freeswitch SVN 07 Nov '07

07 Nov '07

Author: anthm Date: Wed Nov 7 15:12:26 2007 New Revision: 6178 Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Log: parse chan vars in rss.conf Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Wed Nov 7 15:12:26 2007 @@ -198,14 +198,31 @@ if ((feeds = switch_xml_child(cfg, "feeds"))) { for (feed = switch_xml_child(feeds, "feed"); feed; feed = feed->next) { char *name = (char *) switch_xml_attr_soft(feed, "name"); + char *expanded = NULL; + char *idx = feed->txt; + + if ((expanded = switch_channel_expand_variables(channel, idx)) == idx) { + expanded = NULL; + } else { + idx = expanded; + } if (!name) { name = "Error No Name."; } + feed_list[feed_index] = switch_core_session_strdup(session, idx); + switch_safe_free(expanded); + + if ((expanded = switch_channel_expand_variables(channel, name)) == name) { + expanded = NULL; + } else { + name = expanded; + } feed_names[feed_index] = switch_core_session_strdup(session, name); - feed_list[feed_index] = switch_core_session_strdup(session, feed->txt); + switch_safe_free(expanded); feed_index++; + } }

1 0

[commit] r6177 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Nov '07

07 Nov '07

Author: anthm Date: Wed Nov 7 14:39:24 2007 New Revision: 6177 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add flush_inbound_reg 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 Wed Nov 7 14:39:24 2007 @@ -1182,6 +1182,12 @@ return SWITCH_STATUS_SUCCESS; } + if (!strcasecmp(argv[1], "flush_inbound_reg")) { + sofia_reg_check_expire(profile, 0); + stream->write_function(stream, "+OK\n"); + goto done; + } + if (!strcasecmp(argv[1], "register")) { char *gname = argv[2]; sofia_gateway_t *gateway_ptr; @@ -1263,8 +1269,12 @@ stream->write_function(stream, "restarting: %s", profile->name); } } + goto done; } + stream->write_function(stream, "-ERR Unknown command!\n"); + + done: if (profile) {

1 0

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

07 Nov '07

Author: anthm Date: Wed Nov 7 13:50:34 2007 New Revision: 6176 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: fix MDXMLINT-16 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 Nov 7 13:50:34 2007 @@ -166,15 +166,11 @@ } if (!(tts_engine = (char *) switch_xml_attr(language, "tts-engine"))) { - if (!(tts_engine = (char *) switch_xml_attr(language, "tts_engine"))) { - tts_engine = switch_channel_get_variable(channel, tts_engine); - } + tts_engine = (char *) switch_xml_attr(language, "tts_engine"); } if (!(tts_voice = (char *) switch_xml_attr(language, "tts-voice"))) { - if (!(tts_voice = (char *) switch_xml_attr(language, "tts_voice"))) { - tts_voice = switch_channel_get_variable(channel, tts_voice); - } + tts_voice = (char *) switch_xml_attr(language, "tts_voice"); } if (sound_path) {

1 0

[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