- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13934 - freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th
by FreeSWITCH SVN 24 Jun '09

24 Jun '09

Author: dome_2k Date: Wed Jun 24 05:22:04 2009 New Revision: 13934 Log: add mod_say_th Added: freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/ freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/Makefile freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/mod_say_th.2008.vcproj freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/mod_say_th.c freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/mod_say_th.vcproj Added: freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/Makefile ============================================================================== --- (empty file) +++ freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/Makefile Wed Jun 24 05:22:04 2009 @@ -0,0 +1,2 @@ +BASE=../../../.. +include $(BASE)/build/modmake.rules Added: freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/mod_say_th.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/mod_say_th.2008.vcproj Wed Jun 24 05:22:04 2009 @@ -0,0 +1,283 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_say_zh" + ProjectGUID="{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}" + RootNamespace="mod_say_zh" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_say_zh.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/mod_say_th.c ============================================================================== --- (empty file) +++ freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/mod_say_th.c Wed Jun 24 05:22:04 2009 @@ -0,0 +1,654 @@ +/* + * Copyright (c) 2007, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthm(a)freeswitch.org> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthm(a)freeswitch.org> + * PeteDao <petekay(a)gmail.com> + * Steve Underwood 0.0.1 <steveu(a)coppice.org> + * Dome Charoenyost <dome(a)tel.co.th> + * + * + * mod_say_th.c -- Say for Thai + * + */ + +#include <switch.h> +#include <math.h> +#include <ctype.h> + +/* SSM_COUNTED means ordinal number + SSM_PRONOUNCED + SSM_ITERATED */ + +SWITCH_MODULE_LOAD_FUNCTION(mod_say_th_load); +SWITCH_MODULE_DEFINITION(mod_say_th, mod_say_th_load, NULL, NULL); + +#define say_num(num, t) { \ + char tmp[80];\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ + if ((tstatus = th_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ + return tstatus;\ + }\ +}\ + +#define say_file(...) {\ + char tmp[80];\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ + if ((tstatus = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ + return tstatus;\ + }\ + if (!switch_channel_ready(switch_core_session_get_channel(session))) {\ + return SWITCH_STATUS_FALSE;\ + }\ +}\ + + +static switch_status_t th_spell(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args) +{ + char *p; + + for (p = tosay; p && *p; p++) { + int a = tolower((int) *p); + if (a >= '0' && a <= '9') { + say_file("digits/%d.wav", a - '0'); + } else { + if (type == SST_NAME_SPELLED) { + say_file("ascii/%d.wav", a); + } else if (type == SST_NAME_PHONETIC) { + say_file("phonetic-ascii/%d.wav", a); + } + } + } + + return SWITCH_STATUS_SUCCESS; +} + +static char *strip_commas(char *in, char *out, switch_size_t len) +{ + char *p = in; + char *q = out; + char *ret = out; + switch_size_t x = 0; + + for ( ; p && *p; p++) { + if ((*p >= '0' && *p <= '9')) { + *q++ = *p; + } else if (*p != ',') { + ret = NULL; + break; + } + + if (++x > len) { + ret = NULL; + break; + } + } + + return ret; +} + +static char *strip_nonnumerics(char *in, char *out, switch_size_t len) +{ + char *p = in; + char *q = out; + char *ret = out; + switch_size_t x = 0; + + /* valid are 0 - 9, period (.), minus (-), and plus (+) - remove all others */ + for (; p && *p; p++) { + if ((*p >= '0' && *p <= '9') || *p == '.' || *p == '-' || *p == '+') { + *q++ = *p; + } + + if (++x > len) { + ret = NULL; + break; + } + } + + return ret; +} + +static switch_status_t th_say_general_count(switch_core_session_t *session, + char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args) +{ + int in; + char sbuf[13] = ""; + char digits[11]; + int i; + + if (!(tosay = strip_commas(tosay, sbuf, sizeof(sbuf))) || strlen(tosay) > 9) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); + return SWITCH_STATUS_GENERR; + } + + in = atoi(tosay); + + if (in != 0) { + snprintf(digits, sizeof(digits), "%10.10d", in); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Say: %s \n",digits); + switch (method) { + case SSM_COUNTED: + say_file("digits/ordinal.wav"); + /* Fall through */ + case SSM_PRONOUNCED: + for (i = 0; i <= 9; i++) + { + switch (i) + { + case 0: + /* Billions column */ + if (digits[i] != '0') + { + if (digits[i] != '1') + say_file("digits/%c.wav", digits[i]); + say_file("digits/10.wav"); + } + break; + case 1: + /* Hundred millions columns */ + if (digits[i] != '0') + say_file("digits/%c.wav", digits[i]); + if (memcmp (digits, "00", 2) != 0) + say_file("digits/100000000.wav"); + break; + case 2: + /* ten Millions column */ + if (digits[i] != '0') + { + say_file("digits/%c.wav", digits[i]); + say_file("digits/10000000.wav"); + } + break; + case 3: + /* Millions column */ + if (digits[i] != '0') + { + say_file("digits/%c.wav", digits[i]); + say_file("digits/1000000.wav"); + } + break; + case 4: + /* Hundred thousands column */ + if (digits[i] != '0') + { + say_file("digits/%c.wav", digits[i]); + if (memcmp (digits + 2, "00000", 4) != 0) + say_file("digits/100000.wav"); + } + + break; + + case 5: + /* Ten thousands column */ + if (digits[i] != '0') + { + say_file("digits/%c.wav", digits[i]); + if (memcmp (digits + 2, "0000", 4) != 0) + say_file("digits/10000.wav"); + } + break; + case 6: + /* Ten millions or thousands column */ + if (digits[i] != '0') + { + say_file("digits/%c.wav", digits[i]); + say_file("digits/1000.wav"); + } + break; + case 7: + /* hundreds column */ + if (digits[i] != '0') + { + say_file("digits/%c.wav", digits[i]); + say_file("digits/100.wav"); + } + break; + case 8: + /* Tens column */ + if (digits[i] != '0') + { + if (digits[i] == '2' + || + memcmp (digits, "00000000", 8) != 0) + { + say_file("digits/20.wav"); + break; + } + if (digits[i] != '1' + || + memcmp (digits, "00000000", 8) != 0) + { + say_file("digits/%c.wav", digits[i]); + } + } + if (digits[8] != '0') + say_file("digits/10.wav"); + break; + case 9: + /* Units column */ + if (digits[9] == '1'){ + if (digits[8] != '0'){ + say_file("digits/ed.wav", digits[i]); + }else{ + say_file("digits/%c.wav", digits[i]); + } + break; + } + if (digits[9] != '0') + say_file("digits/%c.wav", digits[i]); + break; + } + } + break; + case SSM_ITERATED: + { + char *p; + + for (p = tosay; p && *p; p++) { + say_file("digits/%c.wav", *p); + } + } + break; + default: + break; + } + } else { + say_file("digits/0.wav"); + } + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t th_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args) +{ + char *a, *b, *c, *d; + if (!(a = switch_core_session_strdup(session, tosay))) { + return SWITCH_STATUS_FALSE; + } + + if (!(b = strchr(a, '.'))) { + return SWITCH_STATUS_FALSE; + } + + *b++ = '\0'; + + if (!(c = strchr(b, '.'))) { + return SWITCH_STATUS_FALSE; + } + + *c++ = '\0'; + + if (!(d = strchr(c, '.'))) { + return SWITCH_STATUS_FALSE; + } + + *d++ = '\0'; + + say_num(atoi(a), method); + say_file("digits/dot.wav"); + say_num(atoi(b), method); + say_file("digits/dot.wav"); + say_num(atoi(c), method); + say_file("digits/dot.wav"); + say_num(atoi(d), method); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t th_say_time(switch_core_session_t *session, + char *tosay, + switch_say_type_t type, + switch_say_method_t method, + switch_input_args_t *args) +{ + int32_t t; + switch_time_t target = 0; + switch_time_exp_t tm; +#if 0 + switch_time_t this_morning; + switch_time_exp_t tm2; +#endif + uint8_t say_date = 0; + uint8_t say_time = 0; + + if (type == SST_TIME_MEASUREMENT) { + int64_t hours = 0; + int64_t minutes = 0; + int64_t seconds = 0; + int64_t r = 0; + + if (strchr(tosay, ':')) { + char *tme = switch_core_session_strdup(session, tosay); + char *p; + + if ((p = strrchr(tme, ':'))) { + *p++ = '\0'; + seconds = atoi(p); + if ((p = strchr(tme, ':'))) { + *p++ = '\0'; + minutes = atoi(p); + if (tme) { + hours = atoi(tme); + } + } else { + minutes = atoi(tme); + } + } + } else { + if ((seconds = atoi(tosay)) <= 0) { + seconds = (int64_t) switch_epoch_time_now(NULL); + } + + if (seconds >= 60) { + minutes = seconds / 60; + r = seconds % 60; + seconds = r; + } + + if (minutes >= 60) { + hours = minutes / 60; + r = minutes % 60; + minutes = r; + } + } + + if (hours) { + if (hours == 2) { + say_file("time/2s.wav"); + } else { + say_num(hours, SSM_PRONOUNCED); + } + say_file("time/hours.wav"); + } + if (minutes) { + if (minutes == 2) { + say_file("time/2s.wav"); + } else { + say_num(minutes, SSM_PRONOUNCED); + } + say_file("time/minute.wav"); + } else { + if (hours) { + say_file("digits/0.wav"); + say_file("time/minute.wav"); + } + } + + if (seconds) { + if (seconds == 2) { + say_file("time/2s.wav"); + } else { + say_num(hours, SSM_PRONOUNCED); + } + say_file("time/seconds.wav"); + } else { + if (hours || minutes) { + say_file("digits/0.wav"); + say_file("time/second.wav"); + } + } + + return SWITCH_STATUS_SUCCESS; + } + + if ((t = atoi(tosay)) > 0) + target = switch_time_make(t, 0); + else + target = switch_micro_time_now(); + switch_time_exp_lt(&tm, target); + + switch (type) { + case SST_CURRENT_DATE_TIME: + say_date = + say_time = 1; + break; + case SST_CURRENT_DATE: + say_date = 1; + break; + case SST_CURRENT_TIME: + say_time = 1; + break; + default: + break; + } + + if (say_date) { + say_num(tm.tm_year + 1900, SSM_ITERATED); + say_file("time/year.wav"); + say_num(tm.tm_mon + 1, SSM_PRONOUNCED); + say_file("time/month.wav"); + say_num(tm.tm_mday, SSM_PRONOUNCED); + say_file("time/day.wav"); + say_file("time/day-%d.wav", tm.tm_wday); + +#if 0 + tm = *localtime(&then); + + this_morning = switch_micro_time_now(); + switch_time_exp_lt(&tm2, this_morning); + tm2->tm_hour = 0; + tm2->tm_min = 0; + tm2->tm_sec = 0; + this_morning = mktime(tm2); + + if (this_morning <= then && then < (this_morning + 86400L)) + { + say_file("time/today.wav"); + } + else if ((this_morning - 86400L) <= then && then < this_morning) + { + say_file("time/yesterday.wav"); + } + else if ((this_morning + 86400L) <= then && then < (this_morning + 2*86400L)) + { + say_file("time/tomorrow.wav"); + } + else if ((this_morning - 7*86400L) <= then && then < this_morning) + { + say_file("time/day-%d.wav", tm.tm_wday); + } + else + { + if (tm2->tm_year != tm.tm_year) + { + say_num(tm.tm_year + 1900, SSM_ITERATED); + say_file("time/year.wav"); + } + /*endif*/ + if (tm2->tm_year != tm.tm_year + || + tm2->tm_mon != tm.tm_mon) + { + say_num(tm.tm_mon + 1, SSM_PRONOUNCED); + say_file("time/month.wav"); + } + /*endif*/ + /* Always say the day and the day of the week */ + say_num(tm.tm_mday, SSM_PRONOUNCED); + say_file("time/day.wav"); + say_file("time/day-%d.wav", tm.tm_wday); + } +#endif + } + + if (say_time) { + int32_t hour = tm.tm_hour; + + if (hour < 6) { + say_file("time/morning.wav"); + } else if (hour < 12) { + say_file("time/am.wav"); + } else if (tm.tm_hour < 18) { + say_file("time/pm.wav"); + } else { + say_file("time/evening.wav"); + } + if (hour > 12) + hour -= 12; + if (hour == 0) + hour = 12; + + if (hour == 2) { + say_file("time/2s.wav"); + } else { + say_num(hour, SSM_PRONOUNCED); + } + say_file("time/hour.wav"); + if (tm.tm_min == 2) { + say_file("time/2s.wav"); + } else { + say_num(tm.tm_min, SSM_PRONOUNCED); + } + say_file("time/minute.wav"); + } + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t th_say_money(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, + switch_input_args_t *args) +{ + char sbuf[16] = ""; /* enough for 999,999,999,999.99 (w/o the commas or leading $) */ + char *dollars = NULL; + char *cents = NULL; + + if (strlen(tosay) > 15 || !(tosay = strip_nonnumerics(tosay, sbuf, sizeof(sbuf)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); + return SWITCH_STATUS_GENERR; + } + + dollars = sbuf; + + if ((cents = strchr(sbuf, '.'))) { + *cents++ = '\0'; + if (strlen(cents) > 2) { + cents[2] = '\0'; + } + } + + /* If positive sign - skip over" */ + if (sbuf[0] == '+') { + dollars++; + } + + /* If negative say "negative" */ + if (sbuf[0] == '-') { + say_file("currency/negative.wav"); + dollars++; + } + + /* Say dollar amount */ + th_say_general_count(session, dollars, type, method, args); + say_file("currency/dollar.wav"); + + /* Say cents */ + if (cents) { + th_say_general_count(session, cents, type, method, args); + } else { + say_file("digits/0.wav"); + } + say_file("currency/cent.wav"); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t th_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args) +{ + switch_say_callback_t say_cb = NULL; + + switch (type) { + case SST_NUMBER: + case SST_ITEMS: + case SST_PERSONS: + case SST_MESSAGES: + say_cb = th_say_general_count; + break; + case SST_TIME_MEASUREMENT: + case SST_CURRENT_DATE: + case SST_CURRENT_TIME: + case SST_CURRENT_DATE_TIME: + say_cb = th_say_time; + break; + case SST_IP_ADDRESS: + say_cb = th_ip; + break; + case SST_NAME_SPELLED: + case SST_NAME_PHONETIC: + say_cb = th_spell; + break; + case SST_CURRENCY: + say_cb = th_say_money; + break; + default: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown Say type=[%d]\n", type); + break; + } + + if (say_cb) { + return say_cb(session, tosay, type, method, args); + } + + return SWITCH_STATUS_FALSE; +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_say_th_load) +{ + switch_say_interface_t *say_interface; + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + say_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SAY_INTERFACE); + say_interface->interface_name = "th"; + say_interface->say_function = th_say; + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Added: freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/mod_say_th.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/dome_2k/tuxza/src/mod/say/mod_say_th/mod_say_th.vcproj Wed Jun 24 05:22:04 2009 @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="mod_say_zh" + ProjectGUID="{988CACF7-3FCB-4992-BE69-77872AE67DC8}" + RootNamespace="mod_say_zh" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_say_zh.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject>

1 0

[commit] r13933 - freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc
by FreeSWITCH SVN 24 Jun '09

24 Jun '09

Author: ledr Date: Wed Jun 24 03:11:13 2009 New Revision: 13933 Log: got break-to working Modified: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml Modified: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c ============================================================================== --- freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c (original) +++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Wed Jun 24 03:11:13 2009 @@ -124,6 +124,7 @@ switch_xml_t xml_out; int *off; switch_event_t *params; + int rowcount; } xml_odbc_query_helper_t; @@ -133,6 +134,8 @@ switch_xml_t xml_in_tmp; int i; + qh->rowcount++; + for (i = 0; i < argc; i++) { switch_event_del_header(qh->params, columnName[i]); switch_event_add_header_string(qh->params, SWITCH_STACK_BOTTOM, columnName[i], argv[i]); @@ -154,7 +157,7 @@ xml_odbc_query_helper_t query_helper; - if (!strcasecmp(xml_in->name, "xml-odbc-do")) { + if (!strcasecmp(xml_in->name, "xml-odbc-do")) { char *name = NULL; char *value = NULL, *new_value = NULL; char *empty_result_break_to = NULL; @@ -165,30 +168,47 @@ empty_result_break_to = (char *) switch_xml_attr_soft(xml_in, "on-empty-result-break-to"); no_template_break_to = (char *) switch_xml_attr_soft(xml_in, "on-no-template-break-to"); - if (!switch_strlen_zero(value)) { - new_value = switch_event_expand_headers(params, value); - if (!strcasecmp(name, "break-to")) { // WHAT TO DO WITH FURTHER RENDERING LOWER ON THE STACK ?!?!?! - xml_out = NULL; - off = 0; // <- ? - if (xml_odbc_render_template(new_value, params, xml_out, off) == SWITCH_STATUS_FALSE) { - if (!switch_strlen_zero(no_template_break_to)) { - xml_odbc_render_template(no_template_break_to, params, xml_out, off); - } - } - } else if (!strcasecmp(name, "query")) { - query_helper.xml_in = xml_in; - query_helper.xml_out = xml_out; - query_helper.off = off; - query_helper.params = params; - - if (switch_odbc_handle_callback_exec(globals.master_odbc, new_value, xml_odbc_query_callback, &query_helper) == SWITCH_ODBC_SUCCESS) { - // nothing - } else if (!switch_strlen_zero(empty_result_break_to)) { // if zero rows returned then switch_odbc_handle_callback_exec != SWITCH_ODBC_SUCCESS ??? - xml_out = NULL; - off = 0; // <- ? - xml_odbc_render_template(empty_result_break_to, params, xml_out, off); + if (switch_strlen_zero(name)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do because no name attribute is given\n"); + goto done; + } + + if (switch_strlen_zero(value)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no value attr is given\n", name); + goto done; + } + + new_value = switch_event_expand_headers(params, value); + + if (!strcasecmp(name, "break-to")) { +// if (xml_odbc_render_template(new_value, params, xml_out, off) == SWITCH_STATUS_FALSE) { +// if (!switch_strlen_zero(no_template_break_to)) { +/* have a look at this again, not too happy about this next_template_name thing.. */ + switch_event_del_header(params, "next_template_name"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "next_template_name", value); + return SWITCH_STATUS_FALSE; +// } +// } + } else if (!strcasecmp(name, "query")) { + query_helper.xml_in = xml_in; + query_helper.xml_out = xml_out; + query_helper.off = off; + query_helper.params = params; + query_helper.rowcount = 0; + + if (switch_odbc_handle_callback_exec(globals.master_odbc, new_value, xml_odbc_query_callback, &query_helper) != SWITCH_ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error running this query: [%s]\n", new_value); + } else { + if (!switch_strlen_zero(empty_result_break_to) && query_helper.rowcount == 0) { +/* have a look at this again, not too happy about this next_template_name thing.. */ + switch_event_del_header(params, "next_template_name"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "next_template_name", empty_result_break_to); + return SWITCH_STATUS_FALSE; } } + + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring unknown xml-odbc-do name=[%s]\n", name); } } else { @@ -211,11 +231,14 @@ /* copy all children and render them */ for (xml_in_tmp = xml_in->child; xml_in_tmp; xml_in_tmp = xml_in_tmp->ordered) { - xml_odbc_render_tag(xml_in_tmp, params, xml_out, off); + if (xml_odbc_render_tag(xml_in_tmp, params, xml_out, off) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } } } + done: return SWITCH_STATUS_SUCCESS; } @@ -223,17 +246,31 @@ static switch_status_t xml_odbc_render_template(char *template_name, switch_event_t *params, switch_xml_t xml_out, int *off) { switch_xml_t template_tag = NULL, sub_tag = NULL; + char *next_template_name = NULL; + + if ((template_tag = switch_xml_find_child(globals.templates_tag, "template", "name", template_name))) { + for (sub_tag = template_tag->child; sub_tag; sub_tag = sub_tag->ordered) { + if (xml_odbc_render_tag(sub_tag, params, xml_out, off) != SWITCH_STATUS_SUCCESS) { + } - for (template_tag = switch_xml_child(globals.templates_tag, "template"); template_tag; template_tag = template_tag->next) { - char *template_tag_name = (char*) switch_xml_attr_soft(template_tag, "name"); - if (!strcmp(template_tag_name, template_name)) { - for (sub_tag = template_tag->child; sub_tag; sub_tag = sub_tag->ordered) { - xml_odbc_render_tag(sub_tag, params, xml_out, off); - return SWITCH_STATUS_SUCCESS; + if ((next_template_name = switch_event_get_header(params, "next_template_name"))) { + goto rewind; } + } + goto done; } - return SWITCH_STATUS_FALSE; + + next_template_name = "not_found"; + + rewind: +/* have a look at this again, not too happy about this next_template_name thing.. */ + switch_event_del_header(params, "next_template_name"); + xml_out->name = ""; + xml_odbc_render_template(next_template_name, params, xml_out, off); + + done: + return SWITCH_STATUS_SUCCESS; } @@ -249,7 +286,6 @@ xml_odbc_query_type_t query_type; - int off = 0, ret = 1; if (!binding) { Modified: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml (original) +++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml Wed Jun 24 03:11:13 2009 @@ -10,9 +10,6 @@ <binding name="directory"> <param name="odbc-dsn" value="freeswitch:freeswitch:secret"/> <param name="template" value="directory"/> -  -  -  </binding>  + <document type="freeswitch/xml"> <configuration name="${section}"> <settings> <xml-odbc-do name="query" value=" @@ -60,45 +57,6 @@ </document> </template> - <template name="testsql">  - <document type="freeswitch/xml"> - <xml-odbc-do name="query" value="SELECT name, value FROM dir_user_params WHERE dir_user_id='1';"> - <param name="${name}" value="${value}"/> - </xml-odbc-do> - </document> - </template> - - <template name="someuser">  - <document type="freeswitch/xml"> - <section name="directory"> - <domain name="${domain}"> - <params> - <param name="some_domain_param" value="some_domain_value"/> - </params> - <variables> - </variables> - <groups> - <group name="default"> - <users> - <user id="someuser" mailbox="leon(a)toyos.nl" cidr="" number-alias="0031320227470"> - <params> - <param name="password" value="secret"/> - </params> - <variables> - <variable name="accountcode" value="1234"/> - </variables> - </user> - </users> - </group> - <group name="prepay"> - <user id="someuser" type="pointer"/> - </group> - </groups> - </domain> - </section> - </document> - </template> - <X-PRE-PROCESS cmd="include" data="xml_odbc_templates/*.xml"/> </templates>

1 0

[commit] r13932 - in freeswitch/branches/dome_2k: trunk tuxza
by FreeSWITCH SVN 24 Jun '09

24 Jun '09

Author: dome_2k Date: Wed Jun 24 01:44:14 2009 New Revision: 13932 Log: prepare tuxza branche Added: freeswitch/branches/dome_2k/tuxza/ - copied from r13931, /freeswitch/branches/dome_2k/trunk/ Removed: freeswitch/branches/dome_2k/trunk/

1 0

[commit] r13931 - freeswitch/branches/dome_2k/trunk
by FreeSWITCH SVN 24 Jun '09

24 Jun '09

Author: dome_2k Date: Wed Jun 24 01:32:02 2009 New Revision: 13931 Log: copy code from trunk Added: freeswitch/branches/dome_2k/trunk/ - copied from r13930, /freeswitch/trunk/

1 0

[commit] r13930 - in freeswitch/branches/dome_2k: . conf docs libs src w32
by FreeSWITCH SVN 24 Jun '09

24 Jun '09

Author: dome_2k Date: Wed Jun 24 01:29:50 2009 New Revision: 13930 Log: remove all Removed: freeswitch/branches/dome_2k/AUTHORS freeswitch/branches/dome_2k/COPYING freeswitch/branches/dome_2k/ChangeLog freeswitch/branches/dome_2k/INSTALL freeswitch/branches/dome_2k/Makefile.am freeswitch/branches/dome_2k/Makefile.in freeswitch/branches/dome_2k/NEWS freeswitch/branches/dome_2k/README freeswitch/branches/dome_2k/TODO freeswitch/branches/dome_2k/aclocal.m4 freeswitch/branches/dome_2k/build.sh freeswitch/branches/dome_2k/buildlib.sh freeswitch/branches/dome_2k/checkversion.sh freeswitch/branches/dome_2k/compile freeswitch/branches/dome_2k/conf/ freeswitch/branches/dome_2k/config.guess freeswitch/branches/dome_2k/config.h.in freeswitch/branches/dome_2k/config.sub freeswitch/branches/dome_2k/configure freeswitch/branches/dome_2k/configure.in freeswitch/branches/dome_2k/configure.scan freeswitch/branches/dome_2k/depcomp freeswitch/branches/dome_2k/docs/ freeswitch/branches/dome_2k/generic_mod.mk freeswitch/branches/dome_2k/indent_options.sh freeswitch/branches/dome_2k/install-sh freeswitch/branches/dome_2k/libs/ freeswitch/branches/dome_2k/ltmain.sh freeswitch/branches/dome_2k/missing freeswitch/branches/dome_2k/mkinstalldirs freeswitch/branches/dome_2k/modmake.sh freeswitch/branches/dome_2k/modules.conf freeswitch/branches/dome_2k/modules.conf.in freeswitch/branches/dome_2k/src/ freeswitch/branches/dome_2k/w32/

1 0

[commit] r13929 - freeswitch/trunk/support-d
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: intralanman Date: Tue Jun 23 18:45:00 2009 New Revision: 13929 Log: i'll have a side of emacs hold the window please Modified: freeswitch/trunk/support-d/.bashrc Modified: freeswitch/trunk/support-d/.bashrc ============================================================================== --- freeswitch/trunk/support-d/.bashrc (original) +++ freeswitch/trunk/support-d/.bashrc Tue Jun 23 18:45:00 2009 @@ -30,4 +30,5 @@ alias fstop='top -p `cat /usr/local/freeswitch/log/freeswitch.pid`' alias fsgdb='gdb /usr/local/freeswitch/bin/freeswitch `cat /usr/local/freeswitch/log/freeswitch.pid`' alias fscore='gdb /usr/local/freeswitch/bin/freeswitch `ls -rt core.* | tail -n1`' +alias emacs='emacs -nw' # End of file

1 0

[commit] r13928 - freeswitch/trunk/docs
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: mcollins Date: Tue Jun 23 18:43:36 2009 New Revision: 13928 Log: Update ChangeLog through r13927 Modified: freeswitch/trunk/docs/ChangeLog Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Tue Jun 23 18:43:36 2009 @@ -70,6 +70,9 @@ build: fix jobserver unavailable bug in make -j (r:13623/FSBUILD-6) build: clean/uninstall disabled modules as well (r:13716/FSBUILD-85) build: fix msvc pcre build for pcre 7.9 (r:13729) + build: trivial build fix (FSBUILD-174/r:13877) + build: fix automake warnings about underquoted definitions in apr macros (FSBUILD-175/r:13882) + build: make libtool version detection more portable (r:13926) config: default config, calling own extension no longer goes to voicemail (r:12596) config: default config, 1000-1019 uses $${default_password} instead of hard-coded 1234 (FSCONFIG-5/r:12838) config: tweak the configs to bind siptrace on and off to F10 and F11 (r:12938) @@ -87,6 +90,8 @@ config: tweaks to codecs in default config (r:13485) config: Add example of sending SAS from b-leg to display on a-leg's phone (r:13500) config: commit config options for new auto nat (r:13595) + config: Remove use_profile from default dialplan, move to vars.xml, default value is 'internal' + config: clean up configs and put wan.auto in by default commented out (r:13907) core: fix suncc visibility support in libteletone (r:12154-12157) core: fix crash on FS shutdown with "..." (FSCORE-297/r:12173,12361,12402) core: add separate mutex for state related methods (r:12191) @@ -213,6 +218,11 @@ core: Export swtich_inet_ntop so modules can use it (r:13738) core: record_sample_rate variable influences the rate record app will use (r:13767,13768,13769) core: init buffer in lead out on speak (r:13787) + core: add local_var_clobber variable for {} to set if [] vars should clobber {} vars (default false) (r:13842) + core: Fix switch_odbc_handle_callback_exec_detailed to handle floating point database columns properly (FSCORE-384/r:13866) + core: set sound path in say app (r:13904) + core: add wan.auto acl (r:13905) + core: Fix ACL nat.auto (FSCORE-385/r:13925) docs: Fix filename references in phrase_en.xml (r:12976) docs: Update phrase_en.xml to include v1.0.8 sound prompts (r:13041) docs: Updates to phrase_es.xml (r:13067) @@ -220,6 +230,7 @@ docs: switch_core.h doxygen update (r:13181) docs: Add ZRTP phrases to phrase_en.xml (r:13488,13489,13490) docs: Add Stephane Alnet's French translations to phrase_fr.xml (r:13624) + docs: Add AGL3.0 for zrtp (r:13848) formats: add mod_portaudio_stream to get audio from any dev (MODFORM-25/r:12178) fs_cli: fix solaris build (r:12160) ivr: make tts-engine and tts-voice valid attributes on the menu xml (r:12278) @@ -271,6 +282,7 @@ libsofiasip: fix re-register after 423 w/ Min-Expires (r:13619/SFSIP-143) libsofiasip: use addres, id, and version from user sdp if they exist (r:13621) libsofiasip: handle mid-line comments in resolv.conf patch from Lee Verberne (SFSIP-152/r:13749) + libsofiasip: fix CNAME record resolve failure (SFSIP-129/r:13915) libspandsp: update to snapshot 20090308 (r:12514) libspandsp: update to snapshot spandsp-20090421 (r:13086) libspandsp: update to snapshot spandsp-20090427 (r:13177) @@ -280,6 +292,7 @@ libteletone: update api visibility macros for windows libtiff: add libtiff, v3.8.2 libxmlrpc: add select to read socket in abyss so we can timeout (r:13107) + libxmlrpc: fix segfault (MODAPP-293/r:13906) mod_cidlookup: add new module, mod_cidlookup (r:12990) mod_cidlookup: switch to using CURL instead of mod_http (r:12992) mod_cidlookup: add config file (r:12994) @@ -358,6 +371,7 @@ mod_fifo: don't do wrapup when agent is in nowait mode or call has ended (r:13094) mod_fifo: don't call all members on on-hook mode and round robin based on next_avail (MODAPP-272/r:13240,13242) mod_fifo: abandon outbound calls when they are not needed, place queue name in the caller id (r:13240) + mod_fifo: add "fifo_destroy_after_use" variable to allow quick destruction of one-time use FIFO queues (MODAPP-287/r:13897) mod_file_string: add new module, allows for playing ! delimited lists of sound files (r:13182) mod_flite: three new voices - rms, awb (male), slt (female) (r:12166) mod_flite: mod_flite_shutdown not called/used (MODASRTTS-15/r:13270) @@ -395,6 +409,7 @@ mod_memcache: unbind the reloadxml event handler on shutdown (r:12954) mod_memcache: Fix C99 error, move var declaration out of the "for()" statement (no -std=c99?) (r:12959) mod_memcache: cleanup xml config handling (r:13050,13051) + mod_memcache: fix compile failure (MODAPP-292/r:13883) mod_nibblebill: mod_nibblebill question: DB Error while updating cash (MODAPP-229/r:12907) mod_nibblebill: Updated mod_nibblebill to work properly w/ postgres fields (r:13031) mod_nibblebill: Added feature mod_nibblebill to check balance and transfer the caller to an alternate dialplan context & extension if they deplete their funds. (r:13432) @@ -414,6 +429,7 @@ mod_perl: Libtool build fix for mod_perl: use LIBTOOL_LIB_EXTEN to make libtool-2.2 happy and CXXLINK since we are linking a C++ lib (r:13080) mod_pocketsphinx: Revamp mod_pocketsphinx to use jsgf format (r:12224) mod_pocketsphinx: now you can specify the dictionary to use in the config file (r:13747) + mod_pocketsphinx: add language weight (r:13910) mod_portaudio: fix audio issue in portaudio (r:12669) mod_python: fix core dump when using startup script (MODLANG-106/r:12648) mod_python: fix python failing during loading startup modules (MODLANG-105/r:12658) @@ -429,20 +445,20 @@ mod_say_ru: change dollars and cents to rubles and kopecks (r:13025) mod_say_ru: add ru_ip (r:13026) mod_say_ru: Update phrase_ru.xml to include v1.0.8 sound prompts (r:13044,13045) + mod_shell_stream: Initial commit (r:13851) mod_shout: Fix race conditions; fix stutter when first 64k is drained from shoutcast stream (r:13218) + mod_shout: bring media back so telecast of a no-media call will work. (MODFORM-28/r:13895) mod_skel: add more example code and info (r:12459) mod_skypiax: move to trunk (r:12167) mod_skypiax: fix hang on invalid mod_skypiax.conf.xml (MODSKYPIAX-21/r:12320-12322,12343) mod_skypiax: modified configs/startskype.sh to specify which unix user will start the Skype client instance (r:12937) mod_skypiax: fixed assignment before declaration on Windows VC++ (r:12956) mod_skypiax: great startup speedup in Windows (using only one Broadcast sendmessage for each interface hunting) (r:13083) - skypiax: when repeatedly you try to connect to non-existing Skype account in a short period, the Skype client send you back the two halves of the message 'ERROR 92 CALL: Unrecognised identity' inverted in a way that breaks the flux of the API messages. Maybe an anti-spam feature? Anyway, let's try to work around it and restore sanity with a 1 second delay (r:13663) - skypiax: the Skype client sends us BOTH inband and out_of_band DTMFs, no way to shut the inbands. Let's intercept the out_of_bands ONLY if we are not bridged (eg: IVR, so not to waste CPU in detecting inband), but not propagate the out_of_band DTMFs if we are bridged (inband ones will be propagated) (r:13664) + mod_skypiax: when repeatedly you try to connect to non-existing Skype account in a short period, the Skype client send you back the two halves of the message 'ERROR 92 CALL: Unrecognised identity' inverted in a way that breaks the flux of the API messages. Maybe an anti-spam feature? Anyway, let's try to work around it and restore sanity with a 1 second delay (r:13663) + mod_skypiax: the Skype client sends us BOTH inband and out_of_band DTMFs, no way to shut the inbands. Let's intercept the out_of_bands ONLY if we are not bridged (eg: IVR, so not to waste CPU in detecting inband), but not propagate the out_of_band DTMFs if we are bridged (inband ones will be propagated) (r:13664) skypiax: now it manages the REMOTEHOLD status, when the remote party puts the call on-hold (r:13667) - mod_spidermonkey: fix segfaults on dtmf callback (FSCORE-327/r:12577) - mod_spidermonkey: fix error loading mod_spidermonkey due to missing PR_* symbols (r:12934,12939) - mod_spidermonkey: add destroy method to js (r:13016) - mod_spidermonkey: Let session.destroy() take the cause as a string too (r:13020) + mod_skypiax: removed FARMING ifdefs (r:13810) + mod_sndfile: fix off by one error (MODFORM-29/r:13890) mod_sofia: allow you to set invite, to and from params independently (r:12287) mod_sofia: allow add params to a contact that isn't a gateway (r:12289) mod_sofia: add sip_route_uri var to set proxy route (r:12408) @@ -510,6 +526,16 @@ mod_sofia: increase compat on NDLB-to-in-200-contact to handle NAT (r:13759) mod_sofia: fix segfault (FSCORE-382/r:13774) mod_sofia: Fix multicast replication of sofia registrations (r:13786) + mod_sofia: don't put params in chan names on sofia urls (r:13841) + mod_sofia: Fix mod_sofia is not looking fs_path for correct url if endpoint is behind NAT or proxy (MODENDP-221/r:13865) + mod_sofia: Move sip-allow-multiple-registrations and similar variables from variables to params (MODENDP-222/r:13875) + mod_sofia: fix segfault on refer with no content-type or body (SFSIP-153/r:13889) + mod_sofia: fix segfault on reinvite on nomedia call when using uuid_media (r:13894) + mod_sofia: use the register proxy for the R-URI on register when register-proxy is set (MODSOFIA-12/r:13911) + mod_spidermonkey: fix segfaults on dtmf callback (FSCORE-327/r:12577) + mod_spidermonkey: fix error loading mod_spidermonkey due to missing PR_* symbols (r:12934,12939) + mod_spidermonkey: add destroy method to js (r:13016) + mod_spidermonkey: Let session.destroy() take the cause as a string too (r:13020) mod_spy: add new module, mod_spy (MODAPP-260/r:13035,13036) mod_syslog: Keep the indent string in memory (LOGGER-1/r:12852) mod_t38gateway: Introduction of the skeleton of a media bug implementing a T.38 gateway, so the @@ -528,8 +554,18 @@ mod_voicemail: rework vm_boxcount api and add an optional profile parameter (r:13283) mod_voicemail: add voicemail disk quota (MODAPP-173/r:13314) mod_voicemail: abolish mailbox attribute in users and use number-alias attribute instead (MODAPP-218/r:13377,13378,13379,13380,13381) + mod_voicemail: Implement new config parser (r:13878,13879) + mod_voicemail: Implement reload in non-blocking way (r:13884) mod_unimrcp: add to trunk (r:13788,13789,13790,13791) + mod_unimrcp: make mod_unimrcp compile with gcc 4.3 (MODUNIMRCP-1/r:13833) + mod_unimrcp: mrcp_profile for unimrcpserver 0.6.0 (MODASRTTS-18/r:13835) + mod_unimrcp: use paths referenced to the project file dir (r:13840) + mod_unimrcp: Added LPCM (16-bit linear PCM) codec, which is used internally in host order; while L16 is RFC3551 defined 16-bit linear PCM codec in network order. (r:13859) mod_xml_curl: fix data fetch (MODXMLINT-48/r:12586) + mod_xml_rpc: xmlrpc fails to check security restrictions (MDXMLINT-53/r:13912) + scripts: Add -days option to set expiration time of certificates in gentls_cert (r:13825) + scripts: Add zrtp enrollment script, we do auto enrollment and verification (r:13843) + scripts: Add AT&T System 25 PBX style call pickup (FSSCRIPTS-16/FSSCRIPTS-17/r:13896) support: Add print_list gdb macro (r:12687)

1 0

[commit] r13927 - freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: crienzo Date: Tue Jun 23 18:28:09 2009 New Revision: 13927 Log: use inline: for inline grammars. local files are now handled like mod_pocketsphinx Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c Tue Jun 23 18:28:09 2009 @@ -149,6 +149,7 @@ #define BUILTIN_ID "builtin:" #define SESSION_ID "session:" #define HTTP_ID "http://" +#define INLINE_ID "inline:" static int text_starts_with(const char *text, const char *match); /** @@ -2449,7 +2450,7 @@ switch_size_t grammar_file_size = 0, to_read = 0; grammar_type_t type = GRAMMAR_TYPE_UNKNOWN; const char *lname = switch_strlen_zero(name) ? "grammar" : name; - + char *filename = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) grammar = %s, name = %s\n", schannel->name, grammar, name); if (switch_strlen_zero(grammar)) { @@ -2463,45 +2464,48 @@ goto done; } - /* check for local file grammar or URI grammar */ + /* figure out what type of grammar this is */ if (text_starts_with(grammar, HTTP_ID) || text_starts_with(grammar, SESSION_ID) || text_starts_with(grammar, BUILTIN_ID)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Grammar is URI\n", schannel->name); type = GRAMMAR_TYPE_URI; grammar_data = grammar; - } else if (switch_is_file_path(grammar)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Grammar is inside file\n", schannel->name); + } else if (text_starts_with(grammar, INLINE_ID)) { + grammar_data = grammar + strlen(INLINE_ID); + } else { /* grammar points to file containing the grammar text. We assume the MRCP server can't get to this file * so read the data from the file and cache it */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Grammar is inside file\n", schannel->name); + if (switch_is_file_path(grammar)) { + filename = switch_mprintf("%s.gram", grammar); + } else { + filename = switch_mprintf("%s%s%s.gram", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, grammar); + } grammar_data = NULL; - - if (switch_file_open(&grammar_file, grammar, SWITCH_FOPEN_READ, 0, schannel->memory_pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Could not read grammar file: %s\n", schannel->name, grammar); + if (switch_file_open(&grammar_file, filename, SWITCH_FOPEN_READ, 0, schannel->memory_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Could not read grammar file: %s\n", schannel->name, filename); status = SWITCH_STATUS_FALSE; goto done; } grammar_file_size = switch_file_get_size(grammar_file); if (grammar_file_size == 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Grammar file is empty: %s\n", schannel->name, grammar); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Grammar file is empty: %s\n", schannel->name, filename); status = SWITCH_STATUS_FALSE; goto done; } grammar_file_data = (char *)switch_core_alloc(schannel->memory_pool, grammar_file_size + 1); to_read = grammar_file_size; if (switch_file_read(grammar_file, grammar_file_data, &to_read) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Grammar file read error: %s\n", schannel->name, grammar); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Grammar file read error: %s\n", schannel->name, filename); status = SWITCH_STATUS_FALSE; goto done; } if (to_read != grammar_file_size) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Could not read entire grammar file: %s\n", schannel->name, grammar); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Could not read entire grammar file: %s\n", schannel->name, filename); status = SWITCH_STATUS_FALSE; goto done; } grammar_file_data[to_read] = '\0'; grammar_data = grammar_file_data; - } else { - /* assume inline grammar */ - grammar_data = grammar; } /* determine content type of file grammar or inline grammar */ @@ -2532,6 +2536,7 @@ done: + switch_safe_free(filename); if (grammar_file) { switch_file_close(grammar_file); }

1 0

[commit] r13926 - freeswitch/trunk
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: mikej Date: Tue Jun 23 17:32:06 2009 New Revision: 13926 Log: make libtool version detection more portable Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Jun 23 17:32:06 2009 @@ -129,9 +129,9 @@ # AC_MSG_CHECKING([libtool major version]) libtool="${switch_builddir}/libtool" -LIBTOOL_MAJOR_VERSION="`$libtool --version 2>/dev/null| sed -e 's/([[^)]]*)//g;s/^[[^0-9]]*//;s/[[- ]].*//g;q'| awk -F . '{print $1}'`" +LIBTOOL_MAJOR_VERSION="`$libtool --version 2>/dev/null| sed -e 's/([[^)]]*)//g;s/^[[^0-9]]*//;s/[[- ]].*//g;q'| awk 'BEGIN { FS = "." } { print $1 }' `" if test -z "$LIBTOOL_MAJOR_VERSION" ; then - LIBTOOL_MAJOR_VERSION="`sed -n -e '/^VERSION/{s/^.*=\"\?$[[0-9]]\+$\..\+/\1/;p}' ${switch_srcdir}/build/config/ltmain.sh`" + LIBTOOL_MAJOR_VERSION="`sed -n -e '/^VERSION/{s/^.*=\"\?$[[0-9]]\+$\..\+/\1/;p;}' ${switch_srcdir}/build/config/ltmain.sh`" fi if test -z "$LIBTOOL_MAJOR_VERSION" ; then AC_MSG_ERROR([Failed to detect your libtool version, please open a bug report on http://jira.freeswitch.org/]

1 0

[commit] r13925 - freeswitch/trunk/src
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: anthm Date: Tue Jun 23 16:41:22 2009 New Revision: 13925 Log: FSCORE-385 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 Tue Jun 23 16:41:22 2009 @@ -871,7 +871,6 @@ int mask = 0; char guess_mask[16] = ""; char *tmp_name; - int ip_tmp = 0; struct in_addr in; switch_find_local_ip(guess_ip, sizeof(guess_ip), &mask, AF_INET); @@ -912,6 +911,10 @@ tmp_name = "nat.auto"; switch_network_list_create(&rfc_list, tmp_name, SWITCH_FALSE, IP_LIST.pool); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Created ip list %s default (deny)\n", tmp_name); + if (switch_network_list_add_host_mask(rfc_list, guess_ip, guess_mask, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, + "Adding %s/%s (deny) to list %s\n", guess_ip, guess_mask, tmp_name); + } switch_network_list_add_cidr(rfc_list, "10.0.0.0/8", SWITCH_TRUE); switch_network_list_add_cidr(rfc_list, "172.16.0.0/12", SWITCH_TRUE); switch_network_list_add_cidr(rfc_list, "192.168.0.0/16", SWITCH_TRUE); @@ -933,16 +936,6 @@ } switch_core_hash_insert(IP_LIST.hash, tmp_name, list); - switch_inet_pton(AF_INET, guess_ip, &ip_tmp); - ip_tmp = htonl(ip_tmp); - tmp_name = "nat.auto"; - - if (switch_network_list_validate_ip_token(rfc_list, ip_tmp, NULL)) { - switch_network_list_add_host_mask(rfc_list, guess_ip, guess_mask, SWITCH_FALSE); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, - "Adding %s/%s (deny) to list %s\n", guess_ip, guess_mask, tmp_name); - } - if ((xml = switch_xml_open_cfg("acl.conf", &cfg, NULL))) { if ((x_lists = switch_xml_child(cfg, "network-lists"))) {

1 0