May 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13372 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by FreeSWITCH SVN 18 May '09

18 May '09

Author: mikej Date: Mon May 18 09:02:38 2009 New Revision: 13372 Log: JANITOR-1 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Mon May 18 09:02:38 2009 @@ -45,11 +45,11 @@ $(DESTDIR)$(PREFIX)/grammar/model/communicator: $(GETLIB) $(SPHINXMODEL).tar.gz mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/communicator - mv $(BASE)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(PREFIX)/grammar/model/communicator + cp -drp $(BASE)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(PREFIX)/grammar/model/communicator $(DESTDIR)$(PREFIX)/grammar/model/wsj1: mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/wsj1 - mv $(POCKETSPHINX_DIR)/model/hmm/wsj1/* $(DESTDIR)$(PREFIX)/grammar/model/wsj1 + cp -drp $(POCKETSPHINX_DIR)/model/hmm/wsj1/* $(DESTDIR)$(PREFIX)/grammar/model/wsj1 dictionary: @cp -f $(POCKETSPHINX_DIR)/model/lm/cmudict.0.6d $(DESTDIR)$(PREFIX)/grammar/default.dic

1 0

[commit] r13371 - freeswitch/trunk/src/mod/formats/mod_file_string
by FreeSWITCH SVN 15 May '09

15 May '09

Author: anthm Date: Fri May 15 17:16:41 2009 New Revision: 13371 Log: copy flags too Modified: freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.c Modified: freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.c (original) +++ freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.c Fri May 15 17:16:41 2009 @@ -87,7 +87,8 @@ handle->seekable = context->fh.seekable; handle->speed = context->fh.speed; handle->interval = context->fh.interval; - + handle->flags = context->fh.flags; + if (context->index == 0) { context->samples = (handle->samplerate / 1000) * 250; }

1 0

[commit] r13370 - in freeswitch/trunk: . src/mod/formats/mod_file_string
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 17:05:59 2009 New Revision: 13370 Log: fix mod_file_string dependencies on windows Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/src/mod/formats/mod_file_string/ (props changed) Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Fri May 15 17:05:59 2009 @@ -1014,6 +1014,9 @@ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_file_string", "src\mod\formats\mod_file_string\mod_file_string.2008.vcproj", "{70564D74-199A-4452-9C60-19ED5F242F0D}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution

1 0

[commit] r13369 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 16:21:06 2009 New Revision: 13369 Log: silence solaris warning from missing braces (SFSIP-132) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c Fri May 15 16:21:06 2009 @@ -84,7 +84,11 @@ #include <pthread.h> +#if defined(__sun) +static pthread_once_t once = { PTHREAD_ONCE_INIT }; +#else static pthread_once_t once = PTHREAD_ONCE_INIT; +#endif static int done_once = 1; static pthread_key_t state_key;

1 0

[commit] r13368 - freeswitch/trunk/debian
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 16:15:49 2009 New Revision: 13368 Log: build: add new files to debian package build (FSBUILD-148) Modified: freeswitch/trunk/debian/freeswitch-dev.install freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install Modified: freeswitch/trunk/debian/freeswitch-dev.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-dev.install (original) +++ freeswitch/trunk/debian/freeswitch-dev.install Fri May 15 16:15:49 2009 @@ -1,5 +1,6 @@ opt/freeswitch/lib/*.a opt/freeswitch/lib/*.la +opt/freeswitch/lib/pkgconfig/spandsp.pc opt/freeswitch/mod/*.a opt/freeswitch/mod/*.la -opt/freeswitch/include/*.h +opt/freeswitch/include/* Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Fri May 15 16:15:49 2009 @@ -6,15 +6,22 @@ /opt/freeswitch/conf/voicemail.tpl /opt/freeswitch/conf/freeswitch.xml /opt/freeswitch/conf/extensions.conf +/opt/freeswitch/conf/zt.conf +/opt/freeswitch/conf/tones.conf +/opt/freeswitch/conf/pika.conf +/opt/freeswitch/conf/notify-voicemail.tpl +/opt/freeswitch/conf/m3ua.conf /opt/freeswitch/conf/dialplan/public.xml /opt/freeswitch/conf/dialplan/default.xml /opt/freeswitch/conf/dialplan/features.xml /opt/freeswitch/conf/dialplan/default/00_pizza_demo.xml +/opt/freeswitch/conf/dialplan/default/01_example.com.xml /opt/freeswitch/conf/dialplan/default/99999_enum.xml /opt/freeswitch/conf/dialplan/public/00_inbound_did.xml /opt/freeswitch/conf/sip_profiles/external.xml /opt/freeswitch/conf/sip_profiles/internal/example.xml /opt/freeswitch/conf/sip_profiles/internal.xml +/opt/freeswitch/conf/sip_profiles/internal-ipv6.xml /opt/freeswitch/conf/sip_profiles/external/example.xml /opt/freeswitch/conf/directory/default/1007.xml /opt/freeswitch/conf/directory/default/1001.xml @@ -38,9 +45,10 @@ /opt/freeswitch/conf/directory/default/1006.xml /opt/freeswitch/conf/directory/default/1016.xml /opt/freeswitch/conf/directory/default/1012.xml +/opt/freeswitch/conf/directory/default/example.com.xml /opt/freeswitch/conf/directory/default.xml /opt/freeswitch/conf/autoload_configs/ivr.conf.xml -opt/freeswitch/conf/autoload_configs/shout.conf.xml +/opt/freeswitch/conf/autoload_configs/shout.conf.xml /opt/freeswitch/conf/autoload_configs/voicemail.conf.xml /opt/freeswitch/conf/autoload_configs/switch.conf.xml /opt/freeswitch/conf/autoload_configs/syslog.conf.xml @@ -70,5 +78,12 @@ /opt/freeswitch/conf/autoload_configs/console.conf.xml /opt/freeswitch/conf/autoload_configs/timezones.conf.xml /opt/freeswitch/conf/autoload_configs/fax.conf.xml +/opt/freeswitch/conf/autoload_configs/acl.conf.xml +/opt/freeswitch/conf/autoload_configs/lcr.conf.xml +/opt/freeswitch/conf/autoload_configs/opal.conf.xml +/opt/freeswitch/conf/autoload_configs/easyroute.conf.xml +/opt/freeswitch/conf/autoload_configs/memcache.conf.xml +/opt/freeswitch/conf/autoload_configs/unicall.conf.xml +/opt/freeswitch/conf/autoload_configs/python.conf.xml /opt/freeswitch/conf/jingle_profiles/server.xml /opt/freeswitch/conf/jingle_profiles/client.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Fri May 15 16:15:49 2009 @@ -1,6 +1,9 @@ opt/freeswitch/htdocs/* opt/freeswitch/bin/freeswitch opt/freeswitch/bin/fs_cli +opt/freeswitch/bin/gentls_cert +opt/freeswitch/bin/fsxs +opt/freeswitch/bin/fs_ivrd opt/freeswitch/bin/scripts/* opt/freeswitch/lib/libfreeswitch*.so* opt/freeswitch/lib/libopenzap*.so* @@ -25,7 +28,7 @@ opt/freeswitch/mod/mod_enum.so* opt/freeswitch/mod/mod_fifo.so* opt/freeswitch/mod/mod_voipcodecs.so* -opt/freeswutch/mod/mod_speex.so* +opt/freeswitch/mod/mod_speex.so* opt/freeswitch/mod/mod_dialplan*.so* opt/freeswitch/mod/mod_dingaling.so* opt/freeswitch/mod/mod_iax.so* @@ -35,7 +38,8 @@ opt/freeswitch/mod/ozmod_analog_em.so* opt/freeswitch/mod/ozmod_analog.so* opt/freeswitch/mod/ozmod_isdn.so* -opt/freeswitch/mod/ozmod_ss7_boost.so +opt/freeswitch/mod/ozmod_skel.so* +opt/freeswitch/mod/ozmod_ss7_boost.so* opt/freeswitch/mod/ozmod_wanpipe.so* opt/freeswitch/mod/ozmod_zt.so* opt/freeswitch/mod/mod_event_*.so* @@ -54,15 +58,22 @@ opt/freeswitch/conf/fur_elise.ttml opt/freeswitch/conf/openzap.conf opt/freeswitch/conf/wanpipe.conf +opt/freeswitch/conf/zt.conf +opt/freeswitch/conf/tones.conf +opt/freeswitch/conf/pika.conf +opt/freeswitch/conf/notify-voicemail.tpl +opt/freeswitch/conf/m3ua.conf opt/freeswitch/conf/dialplan/public.xml opt/freeswitch/conf/dialplan/default.xml opt/freeswitch/conf/dialplan/features.xml opt/freeswitch/conf/dialplan/default/00_pizza_demo.xml +opt/freeswitch/conf/dialplan/default/01_example.com.xml opt/freeswitch/conf/dialplan/default/99999_enum.xml opt/freeswitch/conf/dialplan/public/00_inbound_did.xml opt/freeswitch/conf/sip_profiles/external.xml opt/freeswitch/conf/sip_profiles/internal/example.xml opt/freeswitch/conf/sip_profiles/internal.xml +opt/freeswitch/conf/sip_profiles/internal-ipv6.xml opt/freeswitch/conf/sip_profiles/external/example.xml opt/freeswitch/conf/directory/default/1007.xml opt/freeswitch/conf/directory/default/1001.xml @@ -86,6 +97,7 @@ opt/freeswitch/conf/directory/default/1006.xml opt/freeswitch/conf/directory/default/1016.xml opt/freeswitch/conf/directory/default/1012.xml +opt/freeswitch/conf/directory/default/example.com.xml opt/freeswitch/conf/directory/default.xml opt/freeswitch/conf/voicemail.tpl opt/freeswitch/conf/freeswitch.xml @@ -123,5 +135,12 @@ opt/freeswitch/conf/autoload_configs/timezones.conf.xml opt/freeswitch/conf/autoload_configs/fax.conf.xml opt/freeswitch/conf/autoload_configs/fifo.conf.xml +opt/freeswitch/conf/autoload_configs/acl.conf.xml +opt/freeswitch/conf/autoload_configs/lcr.conf.xml +opt/freeswitch/conf/autoload_configs/opal.conf.xml +opt/freeswitch/conf/autoload_configs/easyroute.conf.xml +opt/freeswitch/conf/autoload_configs/memcache.conf.xml +opt/freeswitch/conf/autoload_configs/unicall.conf.xml +opt/freeswitch/conf/autoload_configs/python.conf.xml opt/freeswitch/conf/jingle_profiles/server.xml opt/freeswitch/conf/jingle_profiles/client.xml

1 0

[commit] r13367 - in freeswitch/trunk: . libs/esl src/mod/asr_tts/mod_flite src/mod/formats/mod_file_string
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 16:10:48 2009 New Revision: 13367 Log: Add mod_file_string to build + misc cleaning and correction (FSBUILD-158) Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/libs/esl/fs_cli.2008.vcproj freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.2008.vcproj Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Fri May 15 16:10:48 2009 @@ -1013,6 +1013,8 @@ {1F0A8A77-E661-418F-BB92-82172AE43803} = {1F0A8A77-E661-418F-BB92-82172AE43803} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_file_string", "src\mod\formats\mod_file_string\mod_file_string.2008.vcproj", "{70564D74-199A-4452-9C60-19ED5F242F0D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution All|Win32 = All|Win32 @@ -2458,6 +2460,17 @@ {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|x64.ActiveCfg = Debug|Win32 {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|Win32.ActiveCfg = Release|Win32 {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|x64.ActiveCfg = Release|Win32 + {70564D74-199A-4452-9C60-19ED5F242F0D}.All|Win32.ActiveCfg = Release|x64 + {70564D74-199A-4452-9C60-19ED5F242F0D}.All|x64.ActiveCfg = Release|x64 + {70564D74-199A-4452-9C60-19ED5F242F0D}.All|x64.Build.0 = Release|x64 + {70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|Win32.ActiveCfg = Debug|Win32 + {70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|Win32.Build.0 = Debug|Win32 + {70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|x64.ActiveCfg = Debug|x64 + {70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|x64.Build.0 = Debug|x64 + {70564D74-199A-4452-9C60-19ED5F242F0D}.Release|Win32.ActiveCfg = Release|Win32 + {70564D74-199A-4452-9C60-19ED5F242F0D}.Release|Win32.Build.0 = Release|Win32 + {70564D74-199A-4452-9C60-19ED5F242F0D}.Release|x64.ActiveCfg = Release|x64 + {70564D74-199A-4452-9C60-19ED5F242F0D}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2507,6 +2520,7 @@ {2CA40887-1622-46A1-A7F9-17FD7E7E545B} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {38FE0559-9910-43A8-9E45-3E5004C27692} = {A5A27244-AD24-46E5-B01B-840CD296C91D} + {70564D74-199A-4452-9C60-19ED5F242F0D} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {1A1FF289-4FD6-4285-A422-D31DD67A4723} = {CBD81696-EFB4-4D2F-8451-1B8DAA86155A} {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000} Modified: freeswitch/trunk/libs/esl/fs_cli.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.2008.vcproj (original) +++ freeswitch/trunk/libs/esl/fs_cli.2008.vcproj Fri May 15 16:10:48 2009 @@ -103,7 +103,7 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" @@ -152,7 +152,6 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib" - OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/fs_cli.exe" LinkIncremental="1" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" @@ -311,7 +310,6 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib" - OutputFile="$(SolutionDir)$(ConfigurationName)/fs_cli.exe" LinkIncremental="1" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj Fri May 15 16:10:48 2009 @@ -57,9 +57,8 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="flite.lib" LinkIncremental="2" - AdditionalLibraryDirectories="$(SolutionDir)Debug" + AdditionalLibraryDirectories="" RandomizedBaseAddress="1" DataExecutionPrevention="0" /> @@ -124,10 +123,9 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="flite.lib" OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll" LinkIncremental="2" - AdditionalLibraryDirectories="$(SolutionDir)Debug" + AdditionalLibraryDirectories="" RandomizedBaseAddress="1" DataExecutionPrevention="0" TargetMachine="17" Modified: freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.2008.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.2008.vcproj Fri May 15 16:10:48 2009 @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="9.00" Name="mod_file_string" - ProjectGUID="{2CA40887-1622-46A1-A7F9-17FD7E7E545B}" + ProjectGUID="{70564D74-199A-4452-9C60-19ED5F242F0D}" RootNamespace="mod_file_string" Keyword="Win32Proj" TargetFrameworkVersion="131072"

1 0

[commit] r13366 - in freeswitch/trunk: src src/include w32/Library
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 16:07:18 2009 New Revision: 13366 Log: cleanup msvc code analysis warnings Modified: freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/switch_utils.c freeswitch/trunk/src/switch_xml.c freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Fri May 15 16:07:18 2009 @@ -240,7 +240,7 @@ ///\brief returns a new empty switch_xml structure with the given root tag name ///\param name the name of the new root tag -SWITCH_DECLARE(switch_xml_t) switch_xml_new(_In_z_ const char *name); +SWITCH_DECLARE(switch_xml_t) switch_xml_new(_In_opt_z_ const char *name); ///\brief wrapper for switch_xml_new() that strdup()s name ///\param name the name of the root Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri May 15 16:07:18 2009 @@ -83,6 +83,8 @@ switch_frame_t *new_frame; new_frame = malloc(sizeof(*new_frame)); + + switch_assert(new_frame); *new_frame = *orig; switch_set_flag(new_frame, SFF_DYNAMIC); Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Fri May 15 16:07:18 2009 @@ -391,17 +391,17 @@ if (!xml || !xml->attr) return NULL; - while (xml->attr[i] && strcmp(attr, xml->attr[i])) + while (xml->attr[i] && attr && strcmp(attr, xml->attr[i])) i += 2; if (xml->attr[i]) return xml->attr[i + 1]; /* found attribute */ while (root->xml.parent) root = (switch_xml_root_t) root->xml.parent; /* root tag */ - for (i = 0; root->attr[i] && strcmp(xml->name, root->attr[i][0]); i++); + for (i = 0; root->attr[i] && xml->name && strcmp(xml->name, root->attr[i][0]); i++); if (!root->attr[i]) return NULL; /* no matching default attributes */ - while (root->attr[i][j] && strcmp(attr, root->attr[i][j])) + while (root->attr[i][j] && attr && strcmp(attr, root->attr[i][j])) j += 3; return (root->attr[i][j]) ? root->attr[i][j + 1] : NULL; /* found default */ } @@ -2140,6 +2140,7 @@ char *r, *s; switch_mutex_lock(XML_GEN_LOCK); s = (char *)malloc(SWITCH_XML_BUFSIZE); + switch_assert(s); r = switch_xml_toxml_buf(xml, s, SWITCH_XML_BUFSIZE, 0, prn_header); switch_mutex_unlock(XML_GEN_LOCK); return r; @@ -2251,6 +2252,9 @@ /*switch_xml_free(xml->ordered);*/ if (!xml->parent) { /* free root tag allocations */ +#if (_MSC_VER >= 1400) // VC8+ + __analysis_assume(sizeof(root->ent) > 44); /* tail recursion confuses code analysis */ +#endif for (i = 10; root->ent[i]; i += 2) /* 0 - 9 are default entities (<>&"') */ if ((s = root->ent[i + 1]) < root->s || s > root->e) free(s); Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Fri May 15 16:07:18 2009 @@ -713,6 +713,22 @@ <File RelativePath="..\..\src\switch_ivr_originate.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/analyze:stacksize17000" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/analyze:stacksize17000" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\switch_ivr_play_say.c"

1 0

[commit] r13365 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 15 May '09

15 May '09

Author: intralanman Date: Fri May 15 15:03:17 2009 New Revision: 13365 Log: MODAPP-279 Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Fri May 15 15:03:17 2009 @@ -230,17 +230,26 @@ char *cid = NULL; orig_destination_number = destination_number = switch_core_strdup(pool, dialed_number); - + tstrip = ((cur_route->digit_len - cur_route->tstrip) + 1); lstrip = cur_route->lstrip; - if (strlen(destination_number) > tstrip && cur_route->tstrip > 0) { - destination_number[tstrip] = '\0'; - } - if (strlen(destination_number) > lstrip && cur_route->lstrip > 0) { - destination_number += lstrip; - } - + if (cur_route->tstrip > 0) { + if (strlen(destination_number) > tstrip) { + destination_number[tstrip] = '\0'; + } + else { + destination_number[0] = '\0'; + } + } + if (cur_route->lstrip > 0) { + if (strlen(destination_number) > lstrip) { + destination_number += lstrip; + } + else { + destination_number[0] = '\0'; + } + } codec = ""; if (!switch_strlen_zero(cur_route->codec)) { codec = switch_core_sprintf(pool, ",absolute_codec_string=%s", cur_route->codec);

1 0

[commit] r13364 - freeswitch/trunk/w32/Library
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 14:40:23 2009 New Revision: 13364 Log: remove broken code analysis test Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Fri May 15 14:40:23 2009 @@ -30,7 +30,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="echo Testing for Code Analysis support
echo ; > "$(OutDir)\TestAnalysis.c
cl /analyze /nologo /c "$(OutDir)\TestAnalysis.c" | findstr D9040
if ERRORLEVEL 0 set EnablePREfast="false" else set EnablePREfast="true"
exit 0
" + CommandLine="" /> <Tool Name="VCCustomBuildTool" @@ -122,7 +122,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="echo Testing for Code Analysis support
echo ; > "$(OutDir)\TestAnalysis.c
cl /analyze /nologo /c "$(OutDir)\TestAnalysis.c" | findstr D9040
if ERRORLEVEL 0 set EnablePREfast="false" else set EnablePREfast="true"
exit 0
" + CommandLine="" /> <Tool Name="VCCustomBuildTool" @@ -153,6 +153,7 @@ WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="" + EnablePREfast="false" /> <Tool Name="VCManagedResourceCompilerTool" @@ -214,7 +215,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="echo Testing for Code Analysis support
echo ; > "$(OutDir)\TestAnalysis.c
cl /analyze /nologo /c "$(OutDir)\TestAnalysis.c" | findstr D9040
if ERRORLEVEL 0 set EnablePREfast="false" else set EnablePREfast="true"
exit 0
" + CommandLine="" /> <Tool Name="VCCustomBuildTool" @@ -241,6 +242,7 @@ WarningLevel="4" WarnAsError="true" DebugInformationFormat="3" + EnablePREfast="false" /> <Tool Name="VCManagedResourceCompilerTool" @@ -301,7 +303,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="echo Testing for Code Analysis support
echo ; > "$(OutDir)\TestAnalysis.c
cl /analyze /nologo /c "$(OutDir)\TestAnalysis.c" | findstr D9040
if ERRORLEVEL 0 set EnablePREfast="false" else set EnablePREfast="true"
exit 0
" + CommandLine="" /> <Tool Name="VCCustomBuildTool" @@ -329,6 +331,7 @@ WarningLevel="4" WarnAsError="false" DebugInformationFormat="3" + EnablePREfast="false" /> <Tool Name="VCManagedResourceCompilerTool"

1 0

[commit] r13363 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 14:36:43 2009 New Revision: 13363 Log: Allow to send the flush/reboot all the registration of a domain (MODENDP-187) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri May 15 14:36:43 2009 @@ -484,23 +484,33 @@ void sofia_reg_expire_call_id(sofia_profile_t *profile, const char *call_id, int reboot) { char sql[1024]; + char sqlextra[1024] = ""; char *psql = sql; - char *user = strdup(call_id); - char *host = NULL; + char *dup = strdup(call_id); + char *host = NULL, *user = NULL; - switch_assert(user); + switch_assert(dup); - if ((host = strchr(user, '@'))) { + if ((host = strchr(dup, '@'))) { *host++ = '\0'; + user = dup; + } else { + host = dup; } - + if (!host) { host = "none"; } + if (switch_strlen_zero(user)) { + switch_snprintf(sqlextra, sizeof(sqlextra), " or (sip_host='%s')", host); + } else { + switch_snprintf(sqlextra, sizeof(sqlextra), " or (sip_user='%s' and sip_host='%s')", user, host); + } + switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name" - ",%d from sip_registrations where call_id='%s' or (sip_user='%s' and sip_host='%s')", - reboot, call_id, user, host); + ",%d from sip_registrations where call_id='%s' %s", + reboot, call_id, sqlextra); switch_mutex_lock(profile->ireg_mutex); sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_reg_del_callback, profile); @@ -510,7 +520,7 @@ call_id, user, host); sofia_glue_execute_sql(profile, &psql, SWITCH_FALSE); - switch_safe_free(user); + switch_safe_free(dup); }

1 0