- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12482 - freeswitch/trunk/libs/win32
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: mikej Date: Fri Mar 6 11:40:04 2009 New Revision: 12482 Log: build: download flite from right tarball location (FSBUILD-135) Modified: freeswitch/trunk/libs/win32/Download FLITE.2008.vcproj Modified: freeswitch/trunk/libs/win32/Download FLITE.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download FLITE.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download FLITE.2008.vcproj Fri Mar 6 11:40:04 2009 @@ -76,17 +76,17 @@ <Tool Name="VCCustomBuildTool" Description="Downloading Flite." - CommandLine="if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/flite-1.3.99.tar.gz "$(ProjectDir).."
" + CommandLine="if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\flite-1.3.99" - /> - </FileConfiguration> + /> + </FileConfiguration> <FileConfiguration Name="Release|Win32" > <Tool Name="VCCustomBuildTool" Description="Downloading Flite." - CommandLine="if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/flite-1.3.99.tar.gz "$(ProjectDir).."
" + CommandLine="if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\flite-1.3.99" /> </FileConfiguration>

1 0

[commit] r12480 - in freeswitch/trunk/src: . mod/applications/mod_commands mod/languages/mod_spidermonkey
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: anthm Date: Fri Mar 6 08:12:32 2009 New Revision: 12480 Log: MODAPP-228 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_ivr_play_say.c 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 Fri Mar 6 08:12:32 2009 @@ -777,7 +777,7 @@ if ((proceed = switch_regex_perform(argv[0], argv[1], &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { if (argc > 2) { - len = strlen(argv[0]) * 3; + len = (strlen(argv[0]) + strlen(argv[2]) + 10) * proceed; substituted = malloc(len); switch_assert(substituted); memset(substituted, 0, len); 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 Fri Mar 6 08:12:32 2009 @@ -403,7 +403,7 @@ if (argc > 0) { uint32_t len; subst_string = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - len = (uint32_t) (strlen(pcre_obj->string) + strlen(subst_string) + 10); + len = (uint32_t) (strlen(pcre_obj->string) + strlen(subst_string) + 10) * pcre_obj->proceed; substituted = malloc(len); switch_assert(substituted != NULL); switch_perform_substitution(pcre_obj->re, pcre_obj->proceed, subst_string, pcre_obj->string, substituted, len, pcre_obj->ovector); 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 Fri Mar 6 08:12:32 2009 @@ -247,7 +247,7 @@ char *func = (char *) switch_xml_attr_soft(action, "function"); if (strchr(pattern, '(') && strchr(adata, '$')) { - len = (uint32_t) (strlen(data) + strlen(adata) + 10); + len = (uint32_t) (strlen(data) + strlen(adata) + 10) * proceed; if (!(substituted = malloc(len))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); switch_regex_safe_free(re);

1 0

[commit] r12479 - in freeswitch/trunk/src: . mod/applications/mod_dptools mod/dialplans/mod_dialplan_xml
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: anthm Date: Thu Mar 5 21:54:38 2009 New Revision: 12479 Log: refactor dialplan logging lines and consolidate some logic for bypass_media mode when the a leg has audio in advance Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu Mar 5 21:54:38 2009 @@ -1961,7 +1961,6 @@ switch_core_session_t *peer_session = NULL; unsigned int timelimit = 60; const char *var, *continue_on_fail = NULL, *failure_causes = NULL; - uint8_t no_media_bridge = 0; switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; if (switch_strlen_zero(data)) { @@ -1989,8 +1988,10 @@ switch_ivr_media(switch_core_session_get_uuid(session), SMF_REBRIDGE); switch_channel_set_flag(caller_channel, CF_PROXY_MODE); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already up, delaying proxy mode 'till both legs are up.\n"); - no_media_bridge = 1; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already up, delaying proxy mode 'till both legs are answered.\n"); + switch_channel_set_variable(caller_channel, "bypass_media_after_bridge", "true"); + switch_channel_set_variable(caller_channel, SWITCH_BYPASS_MEDIA_VARIABLE, NULL); + switch_channel_clear_flag(caller_channel, CF_PROXY_MODE); } } } @@ -2032,60 +2033,35 @@ } return; } else { - if (no_media_bridge) { - switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session); - switch_frame_t *read_frame; - /* SIP won't let us redir media until the call has been answered #$^#%& so we will proxy any early media until they do */ - while (switch_channel_ready(caller_channel) && switch_channel_ready(peer_channel) - && !switch_channel_test_flag(peer_channel, CF_ANSWERED)) { - switch_status_t status = switch_core_session_read_frame(peer_session, &read_frame, SWITCH_IO_FLAG_NONE, 0); - uint8_t bad = 1; - - if (SWITCH_READ_ACCEPTABLE(status) - && switch_core_session_write_frame(session, read_frame, SWITCH_IO_FLAG_NONE, 0) == SWITCH_STATUS_SUCCESS) { - bad = 0; - } - if (bad) { - switch_channel_hangup(caller_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - switch_channel_hangup(peer_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - goto end; - } - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirecting media to proxy mode.\n"); - switch_ivr_nomedia(switch_core_session_get_uuid(session), SMF_FORCE); - switch_ivr_nomedia(switch_core_session_get_uuid(peer_session), SMF_FORCE); + + if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE)) { switch_ivr_signal_bridge(session, peer_session); } else { - if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE)) { - switch_ivr_signal_bridge(session, peer_session); + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session); + char *a_key = (char *) switch_channel_get_variable(channel, "bridge_terminate_key"); + char *b_key = (char *) switch_channel_get_variable(peer_channel, "bridge_terminate_key"); + int ok = 0; + switch_input_callback_function_t func = NULL; + + if (a_key) { + a_key = switch_core_session_strdup(session, a_key); + ok++; + } + if (b_key) { + b_key = switch_core_session_strdup(session, b_key); + ok++; + } + if (ok) { + func = bridge_on_dtmf; } else { - switch_channel_t *channel = switch_core_session_get_channel(session); - switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session); - char *a_key = (char *) switch_channel_get_variable(channel, "bridge_terminate_key"); - char *b_key = (char *) switch_channel_get_variable(peer_channel, "bridge_terminate_key"); - int ok = 0; - switch_input_callback_function_t func = NULL; - - if (a_key) { - a_key = switch_core_session_strdup(session, a_key); - ok++; - } - if (b_key) { - b_key = switch_core_session_strdup(session, b_key); - ok++; - } - if (ok) { - func = bridge_on_dtmf; - } else { - a_key = NULL; - b_key = NULL; - } - - switch_ivr_multi_threaded_bridge(session, peer_session, func, a_key, a_key); + a_key = NULL; + b_key = NULL; } + + switch_ivr_multi_threaded_bridge(session, peer_session, func, a_key, a_key); } - end: + if (peer_session) { switch_core_session_rwunlock(peer_session); } Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Thu Mar 5 21:54:38 2009 @@ -97,6 +97,8 @@ do_break_i = BREAK_ALWAYS; } else if (!strcasecmp(do_break_a, "never")) { do_break_i = BREAK_NEVER; + } else { + do_break_a = NULL; } } @@ -114,14 +116,23 @@ if (!field_data) { field_data = ""; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Regex: [%s] %s(%s) =~ /%s/\n", exten_name, field, field_data, expression); - if (!(proceed = switch_regex_perform(field_data, expression, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Regex mismatch\n"); - + + if ((proceed = switch_regex_perform(field_data, expression, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, + "Dialplan: %s Regex (PASS) [%s] %s(%s) =~ /%s/ break=%s\n", + switch_channel_get_name(channel), exten_name, field, field_data, expression, do_break_a ? do_break_a : "on-false"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, + "Dialplan: %s Regex (FAIL) [%s] %s(%s) =~ /%s/ break=%s\n", + switch_channel_get_name(channel), exten_name, field, field_data, expression, do_break_a ? do_break_a : "on-false"); for (xaction = switch_xml_child(xcond, "anti-action"); xaction; xaction = xaction->next) { char *application = (char *) switch_xml_attr_soft(xaction, "application"); char *data = (char *) switch_xml_attr_soft(xaction, "data"); - + + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, + "Dialplan: %s ANTI-Action %s(%s)\n", + switch_channel_get_name(channel), application, data); + if (!*extension) { if ((*extension = switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); @@ -141,6 +152,10 @@ } } assert(re != NULL); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, + "Dialplan: %s Absolute Condition [%s]\n", + switch_channel_get_name(channel), exten_name); } for (xaction = switch_xml_child(xcond, "action"); xaction; xaction = xaction->next) { @@ -178,6 +193,10 @@ } } + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, + "Dialplan: %s Action %s(%s)\n", + switch_channel_get_name(channel), application, app_data); + switch_caller_extension_add_application(session, *extension, application, app_data); switch_safe_free(substituted); } @@ -275,7 +294,16 @@ while (xexten) { int proceed = 0; - char *cont = (char *) switch_xml_attr_soft(xexten, "continue"); + const char *cont = switch_xml_attr(xexten, "continue"); + const char *exten_name = switch_xml_attr(xexten, "name"); + + if (!exten_name) { + exten_name = "UNKNOWN"; + } + + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, + "Dialplan: %s parsing [%s->%s] continue=%s\n", + switch_channel_get_name(channel), caller_profile->context, exten_name, cont ? cont : "false"); proceed = parse_exten(session, caller_profile, xexten, &extension); Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu Mar 5 21:54:38 2009 @@ -1299,10 +1299,13 @@ app = application_interface->interface_name; - if (arg && (expanded = switch_channel_expand_variables(session->channel, arg)) != arg) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Expanded String %s(%s)\n", switch_channel_get_name(session->channel), app, expanded); + if (arg) { + expanded = switch_channel_expand_variables(session->channel, arg); } + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "EXECUTE %s %s(%s)\n", + switch_channel_get_name(session->channel), app, switch_str_nil(expanded)); + if ((var = switch_channel_get_variable(session->channel, "verbose_presence")) && switch_true(var)) { char *myarg = NULL; if (expanded) { @@ -1318,10 +1321,6 @@ } } - if (!arg) { - arg = ""; - } - if (!(var = switch_channel_get_variable(session->channel, SWITCH_DISABLE_APP_LOG_VARIABLE)) || (!(switch_true(var)))) { log = switch_core_session_alloc(session, sizeof(*log)); Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Thu Mar 5 21:54:38 2009 @@ -156,9 +156,6 @@ extension->current_application = extension->current_application->next; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Execute %s(%s)\n", switch_channel_get_name(session->channel), - current_application->application_name, switch_str_nil(current_application->application_data)); - if (switch_core_session_execute_application(session, current_application->application_name, current_application->application_data) != SWITCH_STATUS_SUCCESS) { Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Thu Mar 5 21:54:38 2009 @@ -250,7 +250,8 @@ } #endif - if (loop_count > DEFAULT_LEAD_FRAMES && bypass_media_after_bridge) { + if (loop_count > DEFAULT_LEAD_FRAMES && bypass_media_after_bridge && switch_channel_test_flag(chan_a, CF_ANSWERED) && + switch_channel_test_flag(chan_b, CF_ANSWERED)) { switch_ivr_nomedia(switch_core_session_get_uuid(session_a), SMF_REBRIDGE); bypass_media_after_bridge = 0; }

1 0

[commit] r12478 - in freeswitch/trunk: libs/iksemel/build libs/iksemel/src src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: anthm Date: Thu Mar 5 20:06:32 2009 New Revision: 12478 Log: LIBDING-11 use svn update; make iks-reconf; make current Modified: freeswitch/trunk/libs/iksemel/build/libgnutls.m4 freeswitch/trunk/libs/iksemel/src/stream.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Modified: freeswitch/trunk/libs/iksemel/build/libgnutls.m4 ============================================================================== --- freeswitch/trunk/libs/iksemel/build/libgnutls.m4 (original) +++ freeswitch/trunk/libs/iksemel/build/libgnutls.m4 Thu Mar 5 20:06:32 2009 @@ -31,7 +31,7 @@ no_libgnutls=yes else LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` - LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` + LIBGNUTLS_LIBS="`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` -lpthread" libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` Modified: freeswitch/trunk/libs/iksemel/src/stream.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/stream.c (original) +++ freeswitch/trunk/libs/iksemel/src/stream.c Thu Mar 5 20:06:32 2009 @@ -4,6 +4,14 @@ ** modify it under the terms of GNU Lesser General Public License. */ +#include "config.h" +#ifdef HAVE_GNUTLS +#define _XOPEN_SOURCE 500 +#define _GNU_SOURCE +#include <pthread.h> +#endif + + #include "common.h" #include "iksemel.h" @@ -37,14 +45,17 @@ }; #ifdef HAVE_GNUTLS +static pthread_mutex_t tls_send_mutex; +static pthread_mutex_t tls_recv_mutex; static size_t tls_push (iksparser *prs, const char *buffer, size_t len) { struct stream_data *data = iks_user_data (prs); int ret; - + pthread_mutex_lock(&tls_send_mutex); ret = data->trans->send (data->sock, buffer, len); + pthread_mutex_unlock(&tls_send_mutex); if (ret) return (size_t) -1; return len; } @@ -54,8 +65,9 @@ { struct stream_data *data = iks_user_data (prs); int ret; - + pthread_mutex_lock(&tls_recv_mutex); ret = data->trans->recv (data->sock, buffer, len, -1); + pthread_mutex_unlock(&tls_recv_mutex); if (ret == -1) return (size_t) -1; return ret; } @@ -584,6 +596,43 @@ return 0; #endif } +#ifdef HAVE_GNUTLS + + +int +iks_init(void) +{ + int ok = 0; + pthread_mutexattr_t attr; + + if (pthread_mutexattr_init(&attr)) + return -1; + + if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE)) + ok = -1; + + if (ok == 0 && pthread_mutex_init(&tls_send_mutex, &attr)) + ok = -1; + + if (ok == 0 && pthread_mutex_init(&tls_recv_mutex, &attr)) { + pthread_mutex_destroy(&tls_send_mutex); + ok = -1; + } + + + pthread_mutexattr_destroy(&attr); + + return ok; + +} +#else +int +iks_init(void) +{ + return 0; +} +#endif + int iks_start_tls (iksparser *prs) Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Mar 5 20:06:32 2009 @@ -2495,9 +2495,10 @@ } from = ffrom; } - - - switch_core_chat_send(proto, MDL_CHAT_PROTO, from, to, subject, switch_str_nil(msg), NULL, hint); + + if (strcasecmp(proto, MDL_CHAT_PROTO)) { /* yes no ! on purpose */ + switch_core_chat_send(proto, MDL_CHAT_PROTO, from, to, subject, switch_str_nil(msg), NULL, hint); + } switch_safe_free(pproto); switch_safe_free(ffrom);

1 0

[commit] r12477 - freeswitch/trunk/libs/win32/flite
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: mikej Date: Thu Mar 5 18:44:49 2009 New Revision: 12477 Log: updated windows projects for flite (FSBUILD-128/FSBUILD-133) Modified: freeswitch/trunk/libs/win32/flite/flite.2008.vcproj Modified: freeswitch/trunk/libs/win32/flite/flite.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/flite/flite.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/flite/flite.2008.vcproj Thu Mar 5 18:44:49 2009 @@ -44,12 +44,13 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""..\..\flite-1.3.99\include";"..\..\flite-1.3.99\lang\usenglish";"..\..\flite-1.3.99\lang\cmulex"" - PreprocessorDefinitions="CST_AUDIO_WINCE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" - WarningLevel="0" + WarningLevel="4" DebugInformationFormat="4" + DisableSpecificWarnings="4100;4057;4706" /> <Tool Name="VCManagedResourceCompilerTool" @@ -80,12 +81,11 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -101,18 +101,19 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" + Optimization="0" AdditionalIncludeDirectories=""..\..\flite-1.3.99\include";"..\..\flite-1.3.99\lang\usenglish";"..\..\flite-1.3.99\lang\cmulex"" - PreprocessorDefinitions="CST_AUDIO_WINCE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" WarningLevel="0" DebugInformationFormat="3" + DisableSpecificWarnings="4100;4057;4706" /> <Tool Name="VCManagedResourceCompilerTool" @@ -143,11 +144,12 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -163,18 +165,19 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=""..\..\flite-1.3.99\include";"..\..\flite-1.3.99\lang\usenglish";"..\..\flite-1.3.99\lang\cmulex"" - PreprocessorDefinitions="CST_AUDIO_WINCE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" WarningLevel="0" DebugInformationFormat="3" + DisableSpecificWarnings="4100;4057;4706" /> <Tool Name="VCManagedResourceCompilerTool" @@ -233,12 +236,13 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=""..\..\flite-1.3.99\include";"..\..\flite-1.3.99\lang\usenglish";"..\..\flite-1.3.99\lang\cmulex"" - PreprocessorDefinitions="CST_AUDIO_WINCE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="0" DebugInformationFormat="3" + DisableSpecificWarnings="4100;4057;4706" /> <Tool Name="VCManagedResourceCompilerTool" @@ -282,6 +286,14 @@ > </File> <File + RelativePath="..\..\flite-1.3.99\src\audio\au_none.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\src\audio\au_streaming.c" + > + </File> + <File RelativePath="..\..\flite-1.3.99\src\audio\au_wince.c" > </File> @@ -314,6 +326,10 @@ > </File> <File + RelativePath="..\..\flite-1.3.99\lang\cmulex\cmu_postlex.c" + > + </File> + <File RelativePath="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb.c" > <FileConfiguration @@ -325,7 +341,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Debug|x64" > <Tool Name="VCCLCompilerTool" @@ -333,7 +349,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -374,26 +390,6 @@ > </File> <File - RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\cmu_us_kal16.c" - > - </File> - <File - RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\cmu_us_kal16_diphone.c" - > - </File> - <File - RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\cmu_us_kal16_lpc.c" - > - </File> - <File - RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\cmu_us_kal16_res.c" - > - </File> - <File - RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\cmu_us_kal16_residx.c" - > - </File> - <File RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_diphone.c" > </File> @@ -422,6 +418,10 @@ > </File> <File + RelativePath="..\..\flite-1.3.99\src\cg\cst_cg.c" + > + </File> + <File RelativePath="..\..\flite-1.3.99\src\wavesynth\cst_clunits.c" > </File> @@ -446,6 +446,10 @@ > </File> <File + RelativePath="..\..\flite-1.3.99\src\synth\cst_ffeatures.c" + > + </File> + <File RelativePath="..\..\flite-1.3.99\src\utils\cst_file_stdio.c" > </File> @@ -470,6 +474,14 @@ > </File> <File + RelativePath="..\..\flite-1.3.99\src\cg\cst_mlpg.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\src\cg\cst_mlsa.c" + > + </File> + <File RelativePath="..\..\flite-1.3.99\src\utils\cst_mmap_win32.c" > </File> @@ -498,10 +510,6 @@ > </File> <File - RelativePath="..\..\flite-1.3.99\src\wavesynth\cst_sigprFP.c" - > - </File> - <File RelativePath="..\..\flite-1.3.99\src\utils\cst_socket.c" > </File> @@ -558,6 +566,10 @@ > </File> <File + RelativePath="..\..\flite-1.3.99\src\cg\cst_vc.c" + > + </File> + <File RelativePath="..\..\flite-1.3.99\src\stats\cst_viterbi.c" > </File> @@ -646,10 +658,6 @@ > </File> <File - RelativePath="..\..\flite-1.3.99\lang\usenglish\us_postlex.c" - > - </File> - <File RelativePath="..\..\flite-1.3.99\lang\usenglish\us_text.c" > </File> @@ -688,6 +696,10 @@ > </File> <File + RelativePath="..\..\flite-1.3.99\include\cst_cg.h" + > + </File> + <File RelativePath="..\..\flite-1.3.99\include\cst_clunits.h" > </File> @@ -736,6 +748,14 @@ > </File> <File + RelativePath="..\..\flite-1.3.99\src\cg\cst_mlpg.h" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\src\cg\cst_mlsa.h" + > + </File> + <File RelativePath="..\..\flite-1.3.99\include\cst_phoneset.h" > </File> @@ -804,6 +824,10 @@ > </File> <File + RelativePath="..\..\flite-1.3.99\src\cg\cst_vc.h" + > + </File> + <File RelativePath="..\..\flite-1.3.99\include\cst_viterbi.h" > </File> @@ -864,11 +888,11 @@ > </File> <File - RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\voxdefs.h" + RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\voxdefs.h" > </File> <File - RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\voxdefs.h" + RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\voxdefs.h" > </File> </Filter> @@ -878,6 +902,150 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > </Filter> + <Filter + Name="sltvoice" + > + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.h" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.h" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_mcep_trees.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_mcep_trees.h" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_params.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_phonestate.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\voxdefs.h" + > + </File> + </Filter> + <Filter + Name="awbvoice" + > + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.h" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_mcep_trees.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_mcep_trees.h" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_params.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_phonestate.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\voxdefs.h" + > + </File> + </Filter> + <Filter + Name="rmsvoice" + > + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.h" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.h" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_mcep_trees.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_mcep_trees.h" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_params.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_phonestate.c" + > + </File> + <File + RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\voxdefs.h" + > + </File> + </Filter> </Files> <Globals> </Globals>

1 0

[commit] r12476 - freeswitch/trunk/src/mod/asr_tts/mod_flite
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: brian Date: Thu Mar 5 18:40:34 2009 New Revision: 12476 Log: fix a few issues new tarball is up please remove it from libs and redownload Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Thu Mar 5 18:40:34 2009 @@ -5,7 +5,7 @@ $(FLITE_LIBDIR)/libflite_cmu_us_kal.a \ $(FLITE_LIBDIR)/libflite_cmu_us_rms.a \ $(FLITE_LIBDIR)/libflite_cmu_us_slt.a \ - $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm -lasound + $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm LOCAL_CFLAGS=-I$(switch_srcdir)/libs/$(FLITE)/include LOCAL_LIBADD=$(FLITE_A) @@ -17,7 +17,7 @@ $(GETLIB) $(FLITE)-latest.tar.gz $(FLITE_DIR)/Makefile: $(FLITE_DIR) - cd $(FLITE_DIR) && CFLAGS="-fPIC" ./configure + cd $(FLITE_DIR) && ./configure --without-audio --with-pic --disable-shared $(TOUCH_TARGET) $(FLITE_A): $(FLITE_DIR) $(FLITE_DIR)/Makefile

1 0

[commit] r12475 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: andrew Date: Thu Mar 5 15:54:16 2009 New Revision: 12475 Log: Rework how spawned outbound pids communicate their pid back to the outbound call process, try to improve some memory management Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c Thu Mar 5 15:54:16 2009 @@ -131,7 +131,6 @@ ei_x_buff buf; ei_x_new(&buf); ei_x_encode_list_header(&buf, 1); - ei_init_ref(ec, ref); ei_x_encode_ref(&buf, ref); ei_x_encode_empty_list(&buf); Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Thu Mar 5 15:54:16 2009 @@ -700,7 +700,8 @@ static switch_status_t handle_ref_tuple(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf) { erlang_ref ref; - erlang_pid *pid2, *pid = switch_core_alloc(listener->pool, sizeof(erlang_pid)); + erlang_pid *pid;/* = switch_core_alloc(listener->pool, sizeof(erlang_pid));*/ + void *p; char hash[100]; int arity; @@ -711,6 +712,14 @@ return SWITCH_STATUS_FALSE; } + if (!(pid = malloc(sizeof(erlang_pid)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error\n"); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "badmem"); + return SWITCH_STATUS_SUCCESS; + } + if (ei_decode_pid(buf->buff, &buf->index, pid)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid pid in a reference/pid tuple\n"); return SWITCH_STATUS_FALSE; @@ -720,19 +729,36 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hashed ref to %s\n", hash); - if ((pid2 = (erlang_pid *) switch_core_hash_find(listener->spawn_pid_hash, hash))) { - if (pid2 == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found unfilled slot for %s\n", hash); + if ((p = switch_core_hash_find(listener->spawn_pid_hash, hash))) { + if (p == &globals.TIMEOUT) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handler for %s timed out\n", hash); + switch_core_hash_delete(listener->spawn_pid_hash, hash); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "timeout"); + } else if (p == &globals.WAITING) { + /* update the key to point at a pid */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found waiting slot for %s\n", hash); + switch_core_hash_delete(listener->spawn_pid_hash, hash); + switch_core_hash_insert(listener->spawn_pid_hash, hash, pid); + return SWITCH_STATUS_FALSE; /*no reply */ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found filled slot for %s\n", hash); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "duplicate_response"); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No slot for %s\n", hash); - switch_core_hash_insert(listener->spawn_pid_hash, hash, pid); + /* nothin in the hash */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Empty slot for %s\n", hash); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "invalid_ref"); } - /* no reply */ - return SWITCH_STATUS_FALSE; + free(pid); /* don't need it */ + + return SWITCH_STATUS_SUCCESS; } @@ -758,8 +784,7 @@ break; case ERL_REFERENCE_EXT : case ERL_NEW_REFERENCE_EXT : - handle_ref_tuple(listener, msg, buf, rbuf); - return 0; + ret = handle_ref_tuple(listener, msg, buf, rbuf); default : switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WEEEEEEEE %d\n", type); /* some other kind of erlang term */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Thu Mar 5 15:54:16 2009 @@ -413,7 +413,12 @@ if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) /* XXX no unicode or character codes > 255 */ return NULL; - char *xmlstr = switch_core_alloc(ptr->listener->pool, size + 1); + char *xmlstr; + + if (!(xmlstr = malloc(size + 1))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error\n"); + return NULL; + } ei_decode_string_or_binary(rep->buff, &rep->index, size, xmlstr); @@ -431,7 +436,7 @@ /*switch_safe_free(rep->buff);*/ /*switch_safe_free(rep);*/ - /*switch_safe_free(xmlstr);*/ + free(xmlstr); return xml; } @@ -811,7 +816,6 @@ switch_mutex_unlock(globals.listener_mutex); switch_core_hash_init(&listener->fetch_reply_hash, listener->pool); - switch_core_hash_init(&listener->spawn_pid_hash, listener->pool); switch_assert(listener != NULL); @@ -1071,6 +1075,7 @@ else { char hash[100]; int i = 0; + void *p = NULL; session_element->session = session; erlang_pid *pid; erlang_ref ref; @@ -1081,12 +1086,16 @@ /* attach the session to the listener */ add_session_elem_to_listener(listener,session_element); + ei_init_ref(listener->ec, &ref); + ei_hash_ref(&ref, hash); + /* insert the waiting marker */ + switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.WAITING); + if (!strcmp(function, "!")) { /* send a message to request a pid */ ei_x_buff rbuf; ei_x_new_with_version(&rbuf); - ei_init_ref(listener->ec, &ref); ei_x_encode_tuple_header(&rbuf, 3); ei_x_encode_atom(&rbuf, "new_pid"); ei_x_encode_ref(&rbuf, &ref); @@ -1107,23 +1116,27 @@ */ } - ei_hash_ref(&ref, hash); - - while (!(pid = (erlang_pid *) switch_core_hash_find(listener->spawn_pid_hash, hash))) { + /* loop until either we timeout or we get a value that's not the waiting marker */ + while (!(p = switch_core_hash_find(listener->spawn_pid_hash, hash)) || p == &globals.WAITING) { if (i > 50) { /* half a second timeout */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for outbound pid\n"); switch_core_session_rwunlock(session); remove_session_elem_from_listener(listener,session_element); + switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.TIMEOUT); /* TODO lock this? */ return NULL; } i++; switch_yield(10000); /* 10ms */ } + switch_core_hash_delete(listener->spawn_pid_hash, hash); + + pid = (erlang_pid *) p; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got pid!\n"); session_element->process.type = ERLANG_PID; memcpy(&session_element->process.pid, pid, sizeof(erlang_pid)); + free(pid); /* malloced in handle_ref_tuple */ switch_set_flag(session_element, LFLAG_SESSION_ALIVE); switch_clear_flag(session_element, LFLAG_OUTBOUND_INIT); switch_clear_flag(session_element, LFLAG_WAITING_FOR_PID); @@ -1222,6 +1235,7 @@ } if (module && function) { + switch_core_hash_init(&listener->spawn_pid_hash, listener->pool); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating new spawned session for listener\n"); session_element=attach_call_to_spawned_process(listener, module, function, session); } else { Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Thu Mar 5 15:54:16 2009 @@ -136,6 +136,8 @@ unsigned int reference0; unsigned int reference1; unsigned int reference2; + char TIMEOUT; /* marker for a timed out request */ + char WAITING; /* marker for a request waiting for a response */ switch_mutex_t *ref_mutex; }; typedef struct globals_struct globals_t;

1 0

[commit] r12474 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Thu Mar 5 15:39:21 2009 New Revision: 12474 Log: generic parses fixes Modified: freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Thu Mar 5 15:39:21 2009 @@ -40,7 +40,8 @@ switch_size_t count = 0; if (!*event) { - switch_event_create(event, SWITCH_EVENT_REQUEST_PARAMS); + /* SWITCH_EVENT_CLONE will not insert any generic event headers */ + switch_event_create(event, SWITCH_EVENT_CLONE); switch_assert(*event); } @@ -74,13 +75,17 @@ SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, int reload, switch_xml_config_item_t *instructions) { switch_xml_config_item_t *item; - int file_count = 0, matched_count = 0; + int matched_count = 0; for (item = instructions; item->key; item++) { const char *value = switch_event_get_header(event, item->key); switch_bool_t changed = SWITCH_FALSE; switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function; + if (value) { + matched_count++; + } + if (reload && !switch_test_flag(item, CONFIG_RELOADABLE)) { continue; } @@ -283,14 +288,14 @@ callback(item, (reload ? CONFIG_RELOAD : CONFIG_LOAD), changed); } } - - if (file_count > matched_count) { + + if (count != matched_count) { /* User made a mistake, find it */ switch_event_header_t *header; for (header = event->headers; header; header = header->next) { switch_bool_t found = SWITCH_FALSE; for (item = instructions; item->key; item++) { - if (strcasecmp(header->name, item->key)) { + if (!strcasecmp(header->name, item->key)) { found = SWITCH_TRUE; break; } @@ -298,7 +303,7 @@ if (!found) { /* Tell the user */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Configuration parameter [%s] is unfortunately not valid, you might want to double-check that.\n", header->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Configuration parameter [%s] is unfortunately not valid, you might want to double-check that.\n", header->name); } } }

1 0

[commit] r12473 - freeswitch/trunk/src/mod/loggers/mod_console
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Thu Mar 5 15:38:32 2009 New Revision: 12473 Log: Add docs and complete to mod_console Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Thu Mar 5 15:38:32 2009 @@ -328,8 +328,9 @@ /* 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, "console", "Console", console_api_function, ""); - + SWITCH_ADD_API(api_interface, "console", "Console", console_api_function, "loglevel [level]|colorize [on|off]"); + switch_console_set_complete("add console loglevel"); + switch_console_set_complete("add console colorize"); /* setup my logger function */ switch_log_bind_logger(switch_console_logger, SWITCH_LOG_DEBUG, SWITCH_TRUE);

1 0

[commit] r12472 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: brian Date: Thu Mar 5 15:34:13 2009 New Revision: 12472 Log: add sessions since start up to heartbeat event Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Mar 5 15:34:13 2009 @@ -75,6 +75,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Count", "%u", switch_core_session_count()); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Per-Sec", "%u", runtime.sps); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Since-Startup", "%" SWITCH_SIZE_T_FMT, switch_core_session_id() - 1); switch_event_fire(&event); } }

1 0