May 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8331 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 09 May '08

09 May '08

Author: stkn Date: Fri May 9 12:24:38 2008 New Revision: 8331 Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Log: Should fix the problem reported by pressureman Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Fri May 9 12:24:38 2008 @@ -130,7 +130,7 @@ if (func) { hangup_func_str = strdup(func); - if (arg) { + if (!switch_strlen_zero(arg)) { hangup_func_arg = strdup(arg); } switch_channel_set_private(channel, "CoreSession", this);

1 0

[commit] r8330 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 09 May '08

09 May '08

Author: anthm Date: Fri May 9 11:07:41 2008 New Revision: 8330 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: t Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri May 9 11:07:41 2008 @@ -2155,10 +2155,8 @@ } if (switch_channel_test_flag(channel_a, CF_PROXY_MODE)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer on bypass media not allowed.\n"); - nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), - NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END()); - goto done; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Re-establishing media.\n"); + switch_ivr_media(switch_core_session_get_uuid(session), SMF_REBRIDGE); } from = sip->sip_from;

1 0

[commit] r8329 - freeswitch/trunk/debian
by Freeswitch SVN 09 May '08

09 May '08

Author: brian Date: Fri May 9 09:40:03 2008 New Revision: 8329 Added: freeswitch/trunk/debian/freeswitch-lua.conffiles freeswitch/trunk/debian/freeswitch-lua.install freeswitch/trunk/debian/freeswitch-perl.conffiles freeswitch/trunk/debian/freeswitch-perl.install Log: blah Added: freeswitch/trunk/debian/freeswitch-lua.conffiles ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lua.conffiles Fri May 9 09:40:03 2008 @@ -0,0 +1 @@ +/opt/freeswitch/conf/autoload_configs/lua.conf.xml Added: freeswitch/trunk/debian/freeswitch-lua.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lua.install Fri May 9 09:40:03 2008 @@ -0,0 +1,2 @@ +opt/freeswitch/mod/mod_lua* +opt/freeswitch/conf/autoload_configs/lua.conf.xml Added: freeswitch/trunk/debian/freeswitch-perl.conffiles ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-perl.conffiles Fri May 9 09:40:03 2008 @@ -0,0 +1 @@ +/opt/freeswitch/conf/autoload_configs/perl.conf.xml Added: freeswitch/trunk/debian/freeswitch-perl.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-perl.install Fri May 9 09:40:03 2008 @@ -0,0 +1,3 @@ +opt/freeswitch/perl/* +opt/freeswitch/mod/mod_perl* +opt/freeswitch/conf/autoload_configs/perl.conf.xml

1 0

[commit] r8328 - in freeswitch/trunk/debian: . default
by Freeswitch SVN 09 May '08

09 May '08

Author: brian Date: Fri May 9 09:35:11 2008 New Revision: 8328 Modified: freeswitch/trunk/debian/changelog freeswitch/trunk/debian/control freeswitch/trunk/debian/default/freeswitch freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/rules Log: CtRiX patches for debian Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Fri May 9 09:35:11 2008 @@ -1,6 +1,7 @@ -freeswitch (1.0~8303) unstable; urgency=low +freeswitch (1.0~8327) unstable; urgency=low - * pacchetto + * Adding perl and lua separate packages + * Adding mod_voipcodecs -- root <root(a)fs.navynet.it> Tue, 6 May 2008 09:46:26 +0000 Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Fri May 9 09:35:11 2008 @@ -17,18 +17,34 @@ control the callflow. Homepage: http://www.freeswitch.org/ +Package: freeswitch-dev +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: Development Package for the FreeSwitch open source telephony platform +Homepage: http://www.freeswitch.org/ + + Package: freeswitch-spidermonkey Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: A Javascript engine for freeswitch Homepage: http://www.freeswitch.org/ -Package: freeswitch-dev +Package: freeswitch-perl Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch -Description: Development Package for the FreeSwitch open source telephony platform +Description: A perl engine for freeswitch Homepage: http://www.freeswitch.org/ +Package: freeswitch-lua +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: A lua engine for freeswitch +Homepage: http://www.freeswitch.org/ + + + + Package: freeswitch-codec-passthru-g7231 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch @@ -47,6 +63,9 @@ Description: Pass through g729 Codec support for the FreeSWITCH open source telephony platform Homepage: http://www.freeswitch.org/ + + + Package: freeswitch-lang-en Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Modified: freeswitch/trunk/debian/default/freeswitch ============================================================================== --- freeswitch/trunk/debian/default/freeswitch (original) +++ freeswitch/trunk/debian/default/freeswitch Fri May 9 09:35:11 2008 @@ -3,4 +3,5 @@ # start and stop of freeswitch # Enable initd (let init handle start and stop of freeswitch) + USE_INIT="false" Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Fri May 9 09:35:11 2008 @@ -1,9 +1,14 @@ -/opt/freeswitch/conf/dialplan/public.xml -/opt/freeswitch/conf/dialplan/default.xml /opt/freeswitch/conf/vars.xml /opt/freeswitch/conf/mime.types /opt/freeswitch/conf/web-vm.tpl /opt/freeswitch/conf/tetris.ttml +/opt/freeswitch/conf/fur_elise.ttml +/opt/freeswitch/conf/voicemail.tpl +/opt/freeswitch/conf/freeswitch.xml +/opt/freeswitch/conf/extensions.conf +/opt/freeswitch/conf/dialplan/public.xml +/opt/freeswitch/conf/dialplan/default.xml +/opt/freeswitch/conf/dialplan/features.xml /opt/freeswitch/conf/sip_profiles/external.xml /opt/freeswitch/conf/sip_profiles/nat.xml /opt/freeswitch/conf/sip_profiles/nat/example.xml @@ -33,10 +38,6 @@ /opt/freeswitch/conf/directory/default/1016.xml /opt/freeswitch/conf/directory/default/1012.xml /opt/freeswitch/conf/directory/default.xml -/opt/freeswitch/conf/fur_elise.ttml -/opt/freeswitch/conf/voicemail.tpl -/opt/freeswitch/conf/freeswitch.xml -/opt/freeswitch/conf/extensions.conf /opt/freeswitch/conf/autoload_configs/ivr.conf.xml /opt/freeswitch/conf/autoload_configs/voicemail.conf.xml /opt/freeswitch/conf/autoload_configs/switch.conf.xml @@ -67,7 +68,6 @@ /opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml /opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml /opt/freeswitch/conf/autoload_configs/console.conf.xml -/opt/freeswitch/conf/autoload_configs/perl.conf.xml /opt/freeswitch/conf/jingle_profiles/server.xml /opt/freeswitch/conf/jingle_profiles/client.xml /opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Fri May 9 09:35:11 2008 @@ -2,8 +2,6 @@ opt/freeswitch/bin/freeswitch opt/freeswitch/bin/scripts/* opt/freeswitch/lib/libfreeswitch*.so* -opt/freeswitch/perl/* -opt/freeswitch/mod/mod_perl* opt/freeswitch/mod/mod_shout* opt/freeswitch/mod/mod_console.so* opt/freeswitch/mod/mod_expr.so* @@ -38,13 +36,15 @@ opt/freeswitch/mod/mod_xml_*.so* opt/freeswitch/mod/mod_fsv.so* opt/freeswitch/mod/mod_tone_stream.so* -opt/freeswitch/conf/dialplan/public.xml -opt/freeswitch/conf/dialplan/default.xml -opt/freeswitch/conf/dialplan/extensions opt/freeswitch/conf/vars.xml opt/freeswitch/conf/mime.types opt/freeswitch/conf/web-vm.tpl opt/freeswitch/conf/tetris.ttml +opt/freeswitch/conf/fur_elise.ttml +opt/freeswitch/conf/dialplan/public.xml +opt/freeswitch/conf/dialplan/default.xml +opt/freeswitch/conf/dialplan/features.xml +opt/freeswitch/conf/dialplan/extensions opt/freeswitch/conf/sip_profiles/external.xml opt/freeswitch/conf/sip_profiles/nat.xml opt/freeswitch/conf/sip_profiles/nat/example.xml @@ -74,11 +74,9 @@ opt/freeswitch/conf/directory/default/1016.xml opt/freeswitch/conf/directory/default/1012.xml opt/freeswitch/conf/directory/default.xml -opt/freeswitch/conf/fur_elise.ttml opt/freeswitch/conf/voicemail.tpl opt/freeswitch/conf/freeswitch.xml opt/freeswitch/conf/extensions.conf -opt/freeswitch/conf/autoload_configs/perl.conf.xml opt/freeswitch/conf/autoload_configs/ivr.conf.xml opt/freeswitch/conf/autoload_configs/voicemail.conf.xml opt/freeswitch/conf/autoload_configs/switch.conf.xml Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Fri May 9 09:35:11 2008 @@ -9,16 +9,16 @@ export DEB_DH_INSTALL_SOURCEDIR=debian/tmp export PASSTHRU_CODEC_MODULES=codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr export SPIDERMONKEY_MODULES=languages/mod_spidermonkey languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone -export APPLICATIONS_MODULES=applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail applications/mod_fsv +export APPLICATIONS_MODULES=applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail applications/mod_fsv export ASR_TTS_MODULES=asr_tts/mod_openmrcp -export CODECS_MODULES=codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex mod_voipcodecs +export CODECS_MODULES=codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex codecs/mod_voipcodecs export DIALPLANS_MODULES=dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml export DIRECTORIES_MODULES= export DOTNET_MODULES= export ENDPOINTS_MODULES=endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_woomera ../../libs/openzap/mod_openzap export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket export FORMATS_MODULES=formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream formats/mod_shout -export LANGUAGES_MODULES=languages/mod_perl +export LANGUAGES_MODULES=languages/mod_perl languages/mod_lua export LOGGERS_MODULES=loggers/mod_console loggers/mod_logfile loggers/mod_syslog export SAY_MODULES=say/mod_say_de say/mod_say_en say/mod_say_fr say/mod_say_it export TIMERS_MODULES=

1 0

[commit] r8327 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 09 May '08

09 May '08

Author: stkn Date: Fri May 9 05:08:32 2008 New Revision: 8327 Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Log: Fix segfault if no arg has been specified, there is still some other issue lurking in the code though Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Fri May 9 05:08:32 2008 @@ -130,7 +130,9 @@ if (func) { hangup_func_str = strdup(func); - hangup_func_arg = strdup(arg); + if (arg) { + hangup_func_arg = strdup(arg); + } switch_channel_set_private(channel, "CoreSession", this); hook_state = switch_channel_get_state(channel); switch_core_event_hook_add_state_change(session, lua_hanguphook);

1 0

[commit] r8326 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 09 May '08

09 May '08

Author: anthm Date: Thu May 8 22:34:51 2008 New Revision: 8326 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c Thu May 8 22:34:51 2008 @@ -957,7 +957,11 @@ { int portno = preferredportno; struct sockaddr_in sin; +#ifdef WIN32 socklen_t sinlen; +#else + unsigned int sinlen; +#endif int flags; init_time();

1 0

[commit] r8325 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 09 May '08

09 May '08

Author: mikej Date: Thu May 8 22:24:40 2008 New Revision: 8325 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c Thu May 8 22:24:40 2008 @@ -957,7 +957,7 @@ { int portno = preferredportno; struct sockaddr_in sin; - int sinlen; + socklen_t sinlen; int flags; init_time();

1 0

[commit] r8324 - in freeswitch/trunk: . libs/win32/apr-util src/mod/applications/mod_conference src/mod/endpoints/mod_iax w32/Setup
by Freeswitch SVN 09 May '08

09 May '08

Author: mikej Date: Thu May 8 21:58:44 2008 New Revision: 8324 Removed: freeswitch/trunk/src/mod/endpoints/mod_iax/winiphone.c Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/Freeswitch.sln freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c freeswitch/trunk/src/mod/endpoints/mod_iax/iax2-parser.c freeswitch/trunk/src/mod/endpoints/mod_iax/jitterbuf.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj freeswitch/trunk/w32/Setup/Setup.vdproj Log: updated iax build for msvc Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Thu May 8 21:58:44 2008 @@ -125,9 +125,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sip_profiles", "sip_profiles", "{8E2E8798-8B6F-4A55-8E4F-4E6FDE40ED26}" ProjectSection(SolutionItems) = preProject - conf\sip_profiles\default.xml = conf\sip_profiles\default.xml conf\sip_profiles\nat.xml = conf\sip_profiles\nat.xml - conf\sip_profiles\outbound.xml = conf\sip_profiles\outbound.xml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lang", "lang", "{09455AA9-C243-4F16-A1A1-A016881A2765}" @@ -409,7 +407,6 @@ ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.2008.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}" @@ -541,8 +538,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbc", "libs\codec\ilbc\libilbc.2008.vcproj", "{989BB874-7AF1-44CB-8E5C-CC8113D267E8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiax2", "libs\iax\libiax2.2008.vcproj", "{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdingaling", "libs\libdingaling\libdingaling.2008.vcproj", "{1906D736-08BD-4EE1-924F-B536249B9A54}" ProjectSection(ProjectDependencies) = postProject {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} @@ -1036,12 +1031,6 @@ {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|Win32.ActiveCfg = Release|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|Win32.Build.0 = Release|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|x64.ActiveCfg = Release|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.ActiveCfg = Debug|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.Build.0 = Debug|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|x64.ActiveCfg = Debug|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.ActiveCfg = Release|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.Build.0 = Release|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|x64.ActiveCfg = Release|Win32 {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.ActiveCfg = Debug|Win32 {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.Build.0 = Debug|Win32 {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1502,7 +1491,6 @@ {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {89385C74-5860-4174-9CAF-A39E7C48909C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1906D736-08BD-4EE1-924F-B536249B9A54} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Thu May 8 21:58:44 2008 @@ -15,7 +15,6 @@ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} EndProjectSection EndProject @@ -35,7 +34,6 @@ ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}" @@ -193,8 +191,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbc", "libs\codec\ilbc\libilbc.vcproj", "{989BB874-7AF1-44CB-8E5C-CC8113D267E8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiax2", "libs\iax\libiax2.vcproj", "{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdingaling", "libs\libdingaling\libdingaling.vcproj", "{1906D736-08BD-4EE1-924F-B536249B9A54}" ProjectSection(ProjectDependencies) = postProject {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} @@ -216,15 +212,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "libs\win32\apr\libapr.vcproj", "{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapriconv", "libs\win32\apr-iconv\libapriconv.vcproj", "{101130D1-3EA6-4ED2-B65D-CEB5243A20ED}" - ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.vcproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}" ProjectSection(ProjectDependencies) = postProject {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}" @@ -1046,12 +1036,6 @@ {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|Win32.ActiveCfg = Release|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|Win32.Build.0 = Release|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|x64.ActiveCfg = Release|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.ActiveCfg = Debug|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.Build.0 = Debug|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|x64.ActiveCfg = Debug|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.ActiveCfg = Release|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.Build.0 = Release|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|x64.ActiveCfg = Release|Win32 {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.ActiveCfg = Debug|Win32 {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.Build.0 = Debug|Win32 {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1094,12 +1078,6 @@ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|Win32.ActiveCfg = Release|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|Win32.Build.0 = Release|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x64.ActiveCfg = Release|Win32 - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Debug|Win32.Build.0 = Debug|Win32 - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Debug|x64.ActiveCfg = Debug|Win32 - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Release|Win32.ActiveCfg = Release|Win32 - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Release|Win32.Build.0 = Release|Win32 - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Release|x64.ActiveCfg = Release|Win32 {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.ActiveCfg = Debug|Win32 {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.Build.0 = Debug|Win32 {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1503,7 +1481,6 @@ {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC} {89385C74-5860-4174-9CAF-A39E7C48909C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1906D736-08BD-4EE1-924F-B536249B9A54} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} @@ -1511,7 +1488,6 @@ {1CED5987-A529-46DC-B30F-870D85FF9C94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} Modified: freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj (original) +++ freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj Thu May 8 21:58:44 2008 @@ -230,6 +230,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -239,6 +240,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -252,6 +254,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -261,6 +264,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -274,6 +278,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -283,6 +288,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -296,6 +302,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -305,6 +312,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -318,6 +326,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -327,6 +336,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -340,6 +350,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -349,6 +360,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -362,6 +374,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -371,6 +384,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -384,6 +398,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -393,6 +408,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -406,6 +422,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -415,6 +432,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -428,6 +446,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -437,6 +456,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -450,6 +470,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -459,6 +480,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -472,6 +494,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -481,6 +504,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -494,6 +518,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -503,6 +528,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -520,6 +546,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -529,6 +556,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -542,6 +570,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -551,6 +580,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -564,6 +594,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -573,6 +604,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -634,6 +666,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -643,6 +676,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -656,6 +690,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -665,6 +700,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -678,6 +714,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -687,6 +724,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -700,6 +738,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -709,6 +748,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -726,6 +766,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -735,6 +776,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -748,6 +790,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -757,6 +800,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -770,6 +814,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -779,6 +824,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -792,6 +838,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -801,6 +848,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -818,6 +866,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -827,6 +876,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -844,6 +894,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -853,6 +904,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -870,6 +922,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -879,6 +932,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -892,6 +946,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -901,6 +956,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -914,6 +970,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -923,6 +980,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -940,6 +998,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -949,6 +1008,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -984,6 +1044,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -993,6 +1054,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1006,6 +1068,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1015,6 +1078,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1032,6 +1096,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1041,6 +1106,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1054,6 +1120,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1063,6 +1130,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1076,6 +1144,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1085,6 +1154,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1098,6 +1168,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1107,6 +1178,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1118,14 +1190,62 @@ <File RelativePath="..\..\apr-util\dbm\sdbm\sdbm_pair.h" > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> <File RelativePath="..\..\apr-util\dbm\sdbm\sdbm_private.h" > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> <File RelativePath="..\..\apr-util\dbm\sdbm\sdbm_tune.h" > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> </Filter> <Filter @@ -1136,6 +1256,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1145,6 +1266,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1162,6 +1284,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1171,6 +1294,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1188,6 +1312,7 @@ > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1197,6 +1322,7 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu May 8 21:58:44 2008 @@ -302,6 +302,7 @@ uint32_t resample_out_len; conference_file_node_t *fnode; conference_relationship_t *relationships; + switch_ivr_digit_stream_parser_t *dtmf_parser; switch_ivr_digit_stream_t *digit_stream; switch_speech_handle_t lsh; switch_speech_handle_t *sh; @@ -4195,6 +4196,12 @@ profile_name = "default"; } + if (0) { + member.dtmf_parser = conference->dtmf_parser; + } else { + + } + switch_event_create(&params, SWITCH_EVENT_MESSAGE); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "conf_name", conf_name); @@ -4514,6 +4521,9 @@ switch_buffer_destroy(&member.resample_buffer); switch_buffer_destroy(&member.audio_buffer); switch_buffer_destroy(&member.mux_buffer); + if (member.dtmf_parser != conference->dtmf_parser) { + switch_ivr_digit_stream_parser_destroy(member.dtmf_parser); + } if (conference) { switch_mutex_lock(conference->mutex); Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c Thu May 8 21:58:44 2008 @@ -684,13 +684,13 @@ return 0; if (rem < n) { - ret = (data[byte] << (n - rem)); + ret = (unsigned char)(data[byte] << (n - rem)); ret |= (data[byte + 1] >> (8 - n + rem)); } else { - ret = (data[byte] >> (rem - n)); + ret = (unsigned char)(data[byte] >> (rem - n)); } - return (ret & (0xff >> (8 - n))); + return (unsigned char)(ret & (0xff >> (8 - n))); } static int speex_get_wb_sz_at(unsigned char *data, int len, int bit) @@ -957,7 +957,7 @@ { int portno = preferredportno; struct sockaddr_in sin; - unsigned int sinlen; + int sinlen; int flags; init_time(); @@ -1060,7 +1060,7 @@ int power=-1; /* If it's 128 or smaller, just return it */ if (subclass < IAX_FLAG_SC_LOG) - return subclass; + return (unsigned char)subclass; /* Otherwise find its power */ for (x = 0; x < IAX_MAX_SHIFT; x++) { if (subclass & (1 << x)) { @@ -1071,7 +1071,7 @@ power = x; } } - return power | IAX_FLAG_SC_LOG; + return (unsigned char)(power | IAX_FLAG_SC_LOG); } static int iax_send(struct iax_session *pvt, struct ast_frame *f, time_in_ms_t ts, int seqno, int now, int transfer, int final) @@ -1131,7 +1131,7 @@ return -1; } - fr->callno = pvt->callno; + fr->callno = (unsigned short)pvt->callno; fr->transfer = transfer; fr->final = final; fr->session = pvt; @@ -1145,19 +1145,19 @@ fh = (struct ast_iax2_full_hdr *)(((char *)fr->af.data) - sizeof(struct ast_iax2_full_hdr)); fh->scallno = htons(fr->callno | IAX_FLAG_FULL); fh->ts = htonl((long)(fr->ts)); - fh->oseqno = fr->oseqno; + fh->oseqno = (unsigned char)fr->oseqno; if (transfer) { fh->iseqno = 0; } else - fh->iseqno = fr->iseqno; + fh->iseqno = (unsigned char)fr->iseqno; /* Keep track of the last thing we've acknowledged */ - pvt->aseqno = fr->iseqno; - fh->type = fr->af.frametype & 0xFF; + pvt->aseqno = (unsigned char)fr->iseqno; + fh->type = (char)(fr->af.frametype & 0xFF); fh->csub = compress_subclass(fr->af.subclass); if (transfer) { - fr->dcallno = pvt->transfercallno; + fr->dcallno = (unsigned short)pvt->transfercallno; } else - fr->dcallno = pvt->peercallno; + fr->dcallno = (unsigned short)pvt->peercallno; fh->dcallno = htons(fr->dcallno); fr->datalen = fr->af.datalen + sizeof(struct ast_iax2_full_hdr); fr->data = fh; @@ -1370,11 +1370,11 @@ /* reversed setup */ iax_ie_append_addr(&ied0, IAX_IE_APPARENT_ADDR, &s1->peeraddr); - iax_ie_append_short(&ied0, IAX_IE_CALLNO, s1->peercallno); + iax_ie_append_short(&ied0, IAX_IE_CALLNO, (unsigned short)s1->peercallno); iax_ie_append_int(&ied0, IAX_IE_TRANSFERID, transfer_id); iax_ie_append_addr(&ied1, IAX_IE_APPARENT_ADDR, &s0->peeraddr); - iax_ie_append_short(&ied1, IAX_IE_CALLNO, s0->peercallno); + iax_ie_append_short(&ied1, IAX_IE_CALLNO, (unsigned short)s0->peercallno); iax_ie_append_int(&ied1, IAX_IE_TRANSFERID, transfer_id); s0->transfer = s1->peeraddr; @@ -1460,15 +1460,15 @@ s->transferring = TRANSFER_REL; s0 = s; - s1 = iax_find_session2(s0->transferpeer); + s1 = iax_find_session2((short)s0->transferpeer); if (s1 != NULL && s1->callno == s0->transferpeer && s0->transferring == TRANSFER_REL && s1->transferring == TRANSFER_REL) { - s0_org_peer = s0->peercallno; - s1_org_peer = s1->peercallno; + s0_org_peer = (short)s0->peercallno; + s1_org_peer = (short)s1->peercallno; iax_finish_transfer(s0, s1_org_peer); iax_finish_transfer(s1, s0_org_peer); @@ -1483,7 +1483,7 @@ struct iax_session *s0, *s1; s0 = s; - s1 = iax_find_session2(s0->transferpeer); + s1 = iax_find_session2((short)s0->transferpeer); if (s1 != NULL && s0->transferpeer == s1->callno && s1->transferring) { @@ -1662,12 +1662,12 @@ return -1; } memcpy(&session->peeraddr.sin_addr, hp->h_addr, sizeof(session->peeraddr.sin_addr)); - session->peeraddr.sin_port = htons(portno); + session->peeraddr.sin_port = htons((unsigned short)portno); session->peeraddr.sin_family = AF_INET; strncpy(session->username, peer, sizeof(session->username) - 1); session->refresh = refresh; iax_ie_append_str(&ied, IAX_IE_USERNAME, (unsigned char *) peer); - iax_ie_append_short(&ied, IAX_IE_REFRESH, refresh); + iax_ie_append_short(&ied, IAX_IE_REFRESH, (unsigned short)refresh); res = send_command(session, AST_FRAME_IAX, IAX_COMMAND_REGREQ, 0, ied.buf, ied.pos, -1); return res; } @@ -1854,7 +1854,7 @@ struct iax_ie_data ied; memset(&ied, 0, sizeof(ied)); /* see asterisk chan_iax2.c */ - iax_ie_append_short(&ied, IAX_IE_CALLNO, session->callno); + iax_ie_append_short(&ied, IAX_IE_CALLNO, (unsigned short)session->callno); return send_command(session, AST_FRAME_IAX, IAX_COMMAND_TXREADY, 0, ied.buf, ied.pos, -1); } @@ -1887,7 +1887,7 @@ struct iax_ie_data ied; memset(&ied, 0, sizeof(ied)); iax_ie_append_str(&ied, IAX_IE_USERNAME, (unsigned char *) session->username); - iax_ie_append_short(&ied, IAX_IE_REFRESH, session->refresh); + iax_ie_append_short(&ied, IAX_IE_REFRESH, (unsigned short)session->refresh); if ((methods & IAX_AUTHMETHOD_MD5) && challenge) { MD5Init(&md5); MD5Update(&md5, (const unsigned char *) challenge, (unsigned int)strlen(challenge)); @@ -1931,9 +1931,9 @@ static inline int which_bit(unsigned int i) { - char x; + unsigned char x; for(x = 0; x < 32; x++) { - if ((1 << x) == i) { + if ((unsigned)(1 << x) == i) { return x + 1; } } @@ -1943,7 +1943,7 @@ char iax_pref_codec_add(struct iax_session *session, unsigned int format) { int diff = (int) 'A'; - session->codec_order[session->codec_order_len++] = (which_bit(format)) + diff; + session->codec_order[session->codec_order_len++] = (char)((which_bit(format)) + diff); session->codec_order[session->codec_order_len] = '\0'; return session->codec_order[session->codec_order_len-1]; } @@ -1954,7 +1954,7 @@ int diff = (int) 'A'; size_t x; char old[32]; - char remove = which_bit(format) + diff; + char remove = (char)(which_bit(format) + diff); strncpy(old, session->codec_order, sizeof(old)); session->codec_order_len = 0; @@ -2083,7 +2083,7 @@ return -1; } memcpy(&session->peeraddr.sin_addr, hp->h_addr, sizeof(session->peeraddr.sin_addr)); - session->peeraddr.sin_port = htons(portno); + session->peeraddr.sin_port = htons((unsigned short)portno); session->peeraddr.sin_family = AF_INET; res = send_command(session, AST_FRAME_IAX, IAX_COMMAND_NEW, 0, ied.buf, ied.pos, -1); if (res < 0) @@ -2984,7 +2984,7 @@ struct sockaddr_in sin; sinlen = sizeof(sin); - res = iax_recvfrom(netfd, buf, sizeof(buf), 0, (struct sockaddr *) &sin, &sinlen); + res = iax_recvfrom(netfd, (char *)buf, sizeof(buf), 0, (struct sockaddr *) &sin, &sinlen); if (res < 0) { #ifdef WIN32 @@ -3024,7 +3024,7 @@ } iax_mutex_lock(session_mutex); for( cur=sessions; cur; cur=cur->next ) { - if ((cur->transferring) && (cur->transferid == ies.transferid) && + if ((cur->transferring) && (cur->transferid == (int)ies.transferid) && (cur->callno == dcallno) && (cur->transfercallno == callno)) { /* We're transferring --- * skip address/port checking which would fail while remote peer behind symmetric NAT Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax2-parser.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/iax2-parser.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/iax2-parser.c Thu May 8 21:58:44 2008 @@ -33,7 +33,7 @@ #include "iax2.h" #include "iax2-parser.h" -static int frames = 0; +static int frame_count = 0; static int iframes = 0; static int oframes = 0; @@ -391,7 +391,7 @@ /* Don't mess with mini-frames */ return; } - if (fh->type > (int)sizeof(frames)/(int)sizeof(char *)) { + if (fh->type > ((int)sizeof(frames)/(int)sizeof(char *)) - 1) { snprintf(class2, (int)sizeof(class2), "(%d?)", fh->type); class = class2; } else { @@ -442,7 +442,7 @@ return -1; } ied->buf[ied->pos++] = ie; - ied->buf[ied->pos++] = datalen; + ied->buf[ied->pos++] = (unsigned char)datalen; memcpy(ied->buf + ied->pos, data, datalen); ied->pos += datalen; return 0; @@ -492,19 +492,19 @@ errorf = func; } -int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) +int iax_parse_ies(struct iax_ies *my_ies, unsigned char *data, int datalen) { /* Parse data into information elements */ int len; int ie; char tmp[256]; - memset(ies, 0, (int)sizeof(struct iax_ies)); - ies->msgcount = -1; - ies->firmwarever = -1; - ies->calling_ton = -1; - ies->calling_tns = -1; - ies->calling_pres = -1; - ies->samprate = IAX_RATE_8KHZ; + memset(my_ies, 0, (int)sizeof(struct iax_ies)); + my_ies->msgcount = -1; + my_ies->firmwarever = -1; + my_ies->calling_ton = -1; + my_ies->calling_tns = -1; + my_ies->calling_pres = -1; + my_ies->samprate = IAX_RATE_8KHZ; while(datalen >= 2) { ie = data[0]; len = data[1]; @@ -514,127 +514,127 @@ } switch(ie) { case IAX_IE_CALLED_NUMBER: - ies->called_number = (char *) data + 2; + my_ies->called_number = (char *) data + 2; break; case IAX_IE_CALLING_NUMBER: - ies->calling_number = (char *) data + 2; + my_ies->calling_number = (char *) data + 2; break; case IAX_IE_CALLING_ANI: - ies->calling_ani = (char *) data + 2; + my_ies->calling_ani = (char *) data + 2; break; case IAX_IE_CALLING_NAME: - ies->calling_name = (char *) data + 2; + my_ies->calling_name = (char *) data + 2; break; case IAX_IE_CALLED_CONTEXT: - ies->called_context = (char *) data + 2; + my_ies->called_context = (char *) data + 2; break; case IAX_IE_USERNAME: - ies->username = (char *) data + 2; + my_ies->username = (char *) data + 2; break; case IAX_IE_PASSWORD: - ies->password = (char *) data + 2; + my_ies->password = (char *) data + 2; break; case IAX_IE_CAPABILITY: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expecting capability to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else - ies->capability = ntohl(get_uint32(data + 2)); + my_ies->capability = ntohl(get_uint32(data + 2)); break; case IAX_IE_FORMAT: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expecting format to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else - ies->format = ntohl(get_uint32(data + 2)); + my_ies->format = ntohl(get_uint32(data + 2)); break; case IAX_IE_LANGUAGE: - ies->language = (char *) data + 2; + my_ies->language = (char *) data + 2; break; case IAX_IE_CODEC_PREFS: - ies->codec_prefs = (char *) data + 2; + my_ies->codec_prefs = (char *) data + 2; break; case IAX_IE_VERSION: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting version to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->version = ntohs(get_uint16(data + 2)); + my_ies->version = ntohs(get_uint16(data + 2)); break; case IAX_IE_ADSICPE: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting adsicpe to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->adsicpe = ntohs(get_uint16(data + 2)); + my_ies->adsicpe = ntohs(get_uint16(data + 2)); break; case IAX_IE_SAMPLINGRATE: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting samplingrate to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->samprate = ntohs(get_uint16(data + 2)); + my_ies->samprate = ntohs(get_uint16(data + 2)); break; case IAX_IE_DNID: - ies->dnid = (char *) data + 2; + my_ies->dnid = (char *) data + 2; break; case IAX_IE_RDNIS: - ies->rdnis = (char *) data + 2; + my_ies->rdnis = (char *) data + 2; break; case IAX_IE_AUTHMETHODS: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting authmethods to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->authmethods = ntohs(get_uint16(data + 2)); + my_ies->authmethods = ntohs(get_uint16(data + 2)); break; case IAX_IE_CHALLENGE: - ies->challenge = (char *) data + 2; + my_ies->challenge = (char *) data + 2; break; case IAX_IE_MD5_RESULT: - ies->md5_result = (char *) data + 2; + my_ies->md5_result = (char *) data + 2; break; case IAX_IE_RSA_RESULT: - ies->rsa_result = (char *) data + 2; + my_ies->rsa_result = (char *) data + 2; break; case IAX_IE_APPARENT_ADDR: - ies->apparent_addr = ((struct sockaddr_in *)(data + 2)); + my_ies->apparent_addr = ((struct sockaddr_in *)(data + 2)); break; case IAX_IE_REFRESH: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting refresh to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->refresh = ntohs(get_uint16(data + 2)); + my_ies->refresh = ntohs(get_uint16(data + 2)); break; case IAX_IE_DPSTATUS: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting dpstatus to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->dpstatus = ntohs(get_uint16(data + 2)); + my_ies->dpstatus = ntohs(get_uint16(data + 2)); break; case IAX_IE_CALLNO: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting callno to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->callno = ntohs(get_uint16(data + 2)); + my_ies->callno = ntohs(get_uint16(data + 2)); break; case IAX_IE_CAUSE: - ies->cause = (char *) data + 2; + my_ies->cause = (char *) data + 2; break; case IAX_IE_CAUSECODE: if (len != 1) { snprintf(tmp, (int)sizeof(tmp), "Expecting causecode to be single byte but was %d\n", len); errorf(tmp); } else { - ies->causecode = data[2]; + my_ies->causecode = data[2]; } break; case IAX_IE_IAX_UNKNOWN: if (len == 1) - ies->iax_unknown = data[2]; + my_ies->iax_unknown = data[2]; else { snprintf(tmp, (int)sizeof(tmp), "Expected single byte Unknown command, but was %d long\n", len); errorf(tmp); @@ -645,64 +645,64 @@ snprintf(tmp, (int)sizeof(tmp), "Expecting msgcount to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->msgcount = ntohs(get_uint16(data + 2)); + my_ies->msgcount = ntohs(get_uint16(data + 2)); break; case IAX_IE_AUTOANSWER: - ies->autoanswer = 1; + my_ies->autoanswer = 1; break; case IAX_IE_MUSICONHOLD: - ies->musiconhold = 1; + my_ies->musiconhold = 1; break; case IAX_IE_TRANSFERID: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expecting transferid to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else - ies->transferid = ntohl(get_uint32(data + 2)); + my_ies->transferid = ntohl(get_uint32(data + 2)); break; case IAX_IE_DATETIME: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expecting date/time to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else - ies->datetime = ntohl(get_uint32(data + 2)); + my_ies->datetime = ntohl(get_uint32(data + 2)); break; case IAX_IE_FIRMWAREVER: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting firmwarever to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->firmwarever = ntohs(get_uint16(data + 2)); + my_ies->firmwarever = ntohs(get_uint16(data + 2)); break; case IAX_IE_DEVICETYPE: - ies->devicetype = (char *) data + 2; + my_ies->devicetype = (char *) data + 2; break; case IAX_IE_SERVICEIDENT: - ies->serviceident = (char *) data + 2; + my_ies->serviceident = (char *) data + 2; break; case IAX_IE_FWBLOCKDESC: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expected block desc to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else - ies->fwdesc = ntohl(get_uint32(data + 2)); + my_ies->fwdesc = ntohl(get_uint32(data + 2)); break; case IAX_IE_FWBLOCKDATA: - ies->fwdata = data + 2; - ies->fwdatalen = len; + my_ies->fwdata = data + 2; + my_ies->fwdatalen = (unsigned char)len; break; case IAX_IE_PROVVER: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expected provisioning version to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else { - ies->provverpres = 1; - ies->provver = ntohl(get_uint32(data + 2)); + my_ies->provverpres = 1; + my_ies->provver = ntohl(get_uint32(data + 2)); } break; case IAX_IE_CALLINGPRES: if (len == 1) - ies->calling_pres = data[2]; + my_ies->calling_pres = data[2]; else { snprintf(tmp, (int)sizeof(tmp), "Expected single byte callingpres, but was %d long\n", len); errorf(tmp); @@ -710,7 +710,7 @@ break; case IAX_IE_CALLINGTON: if (len == 1) - ies->calling_ton = data[2]; + my_ies->calling_ton = data[2]; else { snprintf(tmp, (int)sizeof(tmp), "Expected single byte callington, but was %d long\n", len); errorf(tmp); @@ -721,14 +721,14 @@ snprintf(tmp, (int)sizeof(tmp), "Expecting callingtns to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->calling_tns = ntohs(get_uint16(data + 2)); + my_ies->calling_tns = ntohs(get_uint16(data + 2)); break; case IAX_IE_RR_JITTER: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expected jitter rr to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else { - ies->rr_jitter = ntohl(get_uint32(data + 2)); + my_ies->rr_jitter = ntohl(get_uint32(data + 2)); } break; case IAX_IE_RR_LOSS: @@ -736,7 +736,7 @@ snprintf(tmp, (int)sizeof(tmp), "Expected loss rr to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else { - ies->rr_loss = ntohl(get_uint32(data + 2)); + my_ies->rr_loss = ntohl(get_uint32(data + 2)); } break; case IAX_IE_RR_PKTS: @@ -744,7 +744,7 @@ snprintf(tmp, (int)sizeof(tmp), "Expected packets rr to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else { - ies->rr_pkts = ntohl(get_uint32(data + 2)); + my_ies->rr_pkts = ntohl(get_uint32(data + 2)); } break; case IAX_IE_RR_DELAY: @@ -752,7 +752,7 @@ snprintf(tmp, (int)sizeof(tmp), "Expected loss rr to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else { - ies->rr_delay = ntohs(get_uint16(data + 2)); + my_ies->rr_delay = ntohs(get_uint16(data + 2)); } break; case IAX_IE_RR_DROPPED: @@ -760,7 +760,7 @@ snprintf(tmp, (int)sizeof(tmp), "Expected packets rr to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else { - ies->rr_dropped = ntohl(get_uint32(data + 2)); + my_ies->rr_dropped = ntohl(get_uint32(data + 2)); } break; case IAX_IE_RR_OOO: @@ -768,7 +768,7 @@ snprintf(tmp, (int)sizeof(tmp), "Expected packets rr to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else { - ies->rr_ooo = ntohl(get_uint32(data + 2)); + my_ies->rr_ooo = ntohl(get_uint32(data + 2)); } break; default: @@ -810,7 +810,7 @@ if (fr) { fr->direction = direction; fr->retrans = -1; - frames++; + frame_count++; if (fr->direction == DIRECTION_INGRESS) iframes++; else @@ -832,9 +832,9 @@ } fr->direction = 0; free(fr); - frames--; + frame_count--; } -int iax_get_frames(void) { return frames; } +int iax_get_frames(void) { return frame_count; } int iax_get_iframes(void) { return iframes; } int iax_get_oframes(void) { return oframes; } Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/jitterbuf.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/jitterbuf.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/jitterbuf.c Thu May 8 21:58:44 2008 @@ -84,23 +84,20 @@ jitterbuf * jb_new() { - jitterbuf *jb; + jitterbuf *jb = (jitterbuf *)malloc(sizeof(*jb)); - if (!(jb = (jitterbuf *)malloc(sizeof(*jb)))) - return NULL; + if (!jb) return NULL; jb->info.conf.target_extra = JB_TARGET_EXTRA; jb_reset(jb); - jb_dbg2("jb_new() = %x\n", jb); return jb; } void jb_destroy(jitterbuf *jb) { jb_frame *frame; - jb_dbg2("jb_destroy(%x)\n", jb); /* free all the frames on the "free list" */ frame = jb->free; @@ -127,7 +124,7 @@ /* maybe later we can make the history buckets variable size, or something? */ /* drop parameter determines whether we will drop outliers to minimize * delay */ -static int history_put(jitterbuf *jb, time_in_ms_t ts, time_in_ms_t now, long ms) +static int history_put(jitterbuf *jb, time_in_ms_t ts, time_in_ms_t now) { time_in_ms_t delay = now - (ts - jb->info.resync_offset); time_in_ms_t threshold = 2 * jb->info.jitter + jb->info.conf.resync_threshold; @@ -326,16 +323,19 @@ /* returns 1 if frame was inserted into head of queue, 0 otherwise */ static int queue_put(jitterbuf *jb, void *data, const enum jb_frame_type type, long ms, time_in_ms_t ts) { - jb_frame *frame; + jb_frame *frame = jb->free; jb_frame *p; int head = 0; time_in_ms_t resync_ts = ts - jb->info.resync_offset; - if ((frame = jb->free)) { + if (frame) { jb->free = frame->next; - } else if (!(frame = (jb_frame *)malloc(sizeof(*frame)))) { - jb_err("cannot allocate frame\n"); - return 0; + } else { + frame = (jb_frame *)malloc(sizeof(*frame)); + if (!frame) { + jb_err("cannot allocate frame\n"); + return 0; + } } jb->info.frames_cur++; @@ -514,8 +514,6 @@ enum jb_return_code jb_put(jitterbuf *jb, void *data, const enum jb_frame_type type, long ms, time_in_ms_t ts, time_in_ms_t now) { - jb_dbg2("jb_put(%x,%x,%ld,%ld,%ld)\n", jb, data, ms, ts, now); - jb->info.frames_in++; if (type == JB_TYPE_VOICE) { @@ -524,7 +522,7 @@ * sending retransmitted control frames with their awkward * timestamps through */ - if (history_put(jb,ts,now,ms)) + if (history_put(jb,ts,now)) return JB_DROP; } Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj Thu May 8 21:58:44 2008 @@ -40,10 +40,10 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\iax\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;WIN32_TIME_GET_TIME;LIBIAX;NEWJB;_CRT_SECURE_NO_DEPRECATE;DEBUG_SUPPORT" UsePrecompiledHeader="0" - DisableSpecificWarnings="4201" + DisableSpecificWarnings="4201;4200;4100;4127;6246;6053;6031;6262;4706" /> <Tool Name="VCManagedResourceCompilerTool" @@ -105,9 +105,10 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\iax\src"" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;MOD_EXPORTS;LIBIAX;WIN32_TIME_GET_TIME;DEBUG_SUPPORT;NEWJB;_CRT_SECURE_NO_DEPRECATE" UsePrecompiledHeader="0" - DisableSpecificWarnings="4201" + DisableSpecificWarnings="4201;4200;4100;4127;6246;6053;6031;6262;4706" /> <Tool Name="VCManagedResourceCompilerTool" @@ -151,6 +152,26 @@ </References> <Files> <File + RelativePath=".\iax-mutex.c" + > + </File> + <File + RelativePath=".\iax.c" + > + </File> + <File + RelativePath=".\iax2-parser.c" + > + </File> + <File + RelativePath=".\jitterbuf.c" + > + </File> + <File + RelativePath=".\md5.c" + > + </File> + <File RelativePath=".\mod_iax.c" > </File> Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj Thu May 8 21:58:44 2008 @@ -6,6 +6,7 @@ ProjectGUID="{3A5B9131-F20C-4A85-9447-6C1610941CEE}" RootNamespace="mod_iax" Keyword="Win32Proj" + TargetFrameworkVersion="131072" > <Platforms> <Platform @@ -22,16 +23,63 @@ CharacterSet="2" > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\iax\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;WIN32_TIME_GET_TIME;LIBIAX;NEWJB;_CRT_SECURE_NO_DEPRECATE;DEBUG_SUPPORT" UsePrecompiledHeader="0" - DisableSpecificWarnings="4201" + DisableSpecificWarnings="4201;4200;4100;4127;6246;6053;6031;6262;4706" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalLibraryDirectories=""..\..\..\..\libs\iax\$(OutDir)"" + 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 @@ -41,14 +89,62 @@ CharacterSet="2" > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\iax\src"" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;MOD_EXPORTS;LIBIAX;WIN32_TIME_GET_TIME;DEBUG_SUPPORT;NEWJB;_CRT_SECURE_NO_DEPRECATE" UsePrecompiledHeader="0" - DisableSpecificWarnings="4201" + DisableSpecificWarnings="4201;4200;4100;4127;6246;6053;6031;6262;4706" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalLibraryDirectories=""..\..\..\..\libs\iax\$(OutDir)"" + 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> </Configurations> @@ -56,6 +152,26 @@ </References> <Files> <File + RelativePath=".\iax-mutex.c" + > + </File> + <File + RelativePath=".\iax.c" + > + </File> + <File + RelativePath=".\iax2-parser.c" + > + </File> + <File + RelativePath=".\jitterbuf.c" + > + </File> + <File + RelativePath=".\md5.c" + > + </File> + <File RelativePath=".\mod_iax.c" > </File> Modified: freeswitch/trunk/w32/Setup/Setup.vdproj ============================================================================== --- freeswitch/trunk/w32/Setup/Setup.vdproj (original) +++ freeswitch/trunk/w32/Setup/Setup.vdproj Thu May 8 21:58:44 2008 @@ -27,318 +27,6 @@ } "Entry" { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_0772289C2CC6435396616D7A2C407EA2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_BA769056DBAF4259B38F5C3FF7377055" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_A8D70CB0D12C4B3FB2E2E896E9A7C843" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_78F060A241D0428998B42093C467AD36" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_9527B92C45BB45629BDB19ED3C8DC194" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_FBD45C36E901435399634CACA5339597" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_FB1B9FBDC3294F1C96DAC4246C013C22" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_EF14CB99F3414BB689D0CB0E6D6B8AB8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_EC4922AEC1064C90B96EBBDD3104D761" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_EAF4B051F44745ABA9B58038FB93994C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_E763C699DF0948B6984DDEB96A2DFD06" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_E1AA7C5B96DA4A26859D2C7A21E00AB6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_D6F0F5845FAD4707975CE012A33CD607" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_D0BB09AFB8D94B76918F0EE85BCCAD0A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_C105055EE271471A999CE7022E617EB7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_C1036825E1364537B537E542E71F9C0E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_B5542B260CD5493395871EFDE833E438" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_9B19C40442134D69B533E16D0851D99B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_96F8F7DE89C74DC399E8AE55C22B4F15" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_95D01083472B4853AC3F06514558F347" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_8E023477B9DC4126921A556B285B29E5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_8B53F026686B44189676CBC200E641C1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_7B1050643E1E48A3B67B281B4AD43904" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_77550ABD8CC84D66A3B6C3C3C48665A4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_6E5C001E7A314DCEA0A4BF52BF74BCAD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_6DF726E4018A4136BC27E2C6F4B67B9E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_5EDFD5418DD243D1A03D882B83BBBCF1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_3E37631016BC45B2B672FE23257D542B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_3DB5A5EF1E624F999BCEA20250508EEA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_2D9E612823084E3F9E10376A7AC0C476" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_2B80DCCD934745B1BB4F0B31099094D9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_297D0BADB993435092DDB8CDF9F2A3C6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_2814E641538B42EFA83525986A9D5AC1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_1DCA6B2BA0F842FDB5CBA54CF52228F7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_1777CB4B737E4B8481E25A10950B2B5A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_166BDBE308F54EE4881DA68F2A8189F5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_103209E575C54D649DD1472DBB9B5F5D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -393,6 +81,18 @@ } "Entry" { + "MsmKey" = "8:_22F4FC6A582C42A0817BA85C8FEBAA18" + "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_22F4FC6A582C42A0817BA85C8FEBAA18" + "OwnerKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_27E8189E01B6420CB898CC51360C83A3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -519,12 +219,6 @@ } "Entry" { - "MsmKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_4132509BFE93497C8E86E017E5B98F69" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -633,12 +327,6 @@ } "Entry" { - "MsmKey" = "8:_6A4CAD73F43678BF7C05E8FB41042F74" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_6AA8D6AF639F4E6B92D28A7E0D13FD5E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -729,104 +417,98 @@ } "Entry" { - "MsmKey" = "8:_7B1050643E1E48A3B67B281B4AD43904" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7CFCCDD9C6694A0498D7CD6CDD285042" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7E46520FEA2B4DA7A90171E3467C29CA" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7F2A5D1B25FD4B109F5E17402117543A" + "MsmKey" = "8:_7B1050643E1E48A3B67B281B4AD43904" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7FDBEDFAE608481684258301B02CFD1C" - "OwnerKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" + "MsmKey" = "8:_7BBFE2768ACD3A62F3874EF99D16C0B8" + "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7FEA1E60C11343F1A98DC33C512051FA" + "MsmKey" = "8:_7CFCCDD9C6694A0498D7CD6CDD285042" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_80D44DD7FA3C4E3F8D6BB8B4F949F6AF" + "MsmKey" = "8:_7E46520FEA2B4DA7A90171E3467C29CA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_82158C38354740E99D416F1DB58C7E18" + "MsmKey" = "8:_7F2A5D1B25FD4B109F5E17402117543A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_821771D6A597416391F899CD9147F75B" + "MsmKey" = "8:_7FEA1E60C11343F1A98DC33C512051FA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_83131C9ADB7C4E6C88388D820F720BB5" + "MsmKey" = "8:_80D44DD7FA3C4E3F8D6BB8B4F949F6AF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8471500508034D338D599ED5C35F938F" + "MsmKey" = "8:_82158C38354740E99D416F1DB58C7E18" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_860B731FDCC848F79AB8DFD4D03E2A47" + "MsmKey" = "8:_821771D6A597416391F899CD9147F75B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_86D8DF7599FF472096D6826044347537" + "MsmKey" = "8:_83131C9ADB7C4E6C88388D820F720BB5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" - "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" + "MsmKey" = "8:_8471500508034D338D599ED5C35F938F" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" + "MsmKey" = "8:_860B731FDCC848F79AB8DFD4D03E2A47" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" + "MsmKey" = "8:_86D8DF7599FF472096D6826044347537" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -849,14 +531,8 @@ } "Entry" { - "MsmKey" = "8:_90D7F247E8254DE797317F431E3FB010" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_91BA2668F87764F53188E93BC8D363D7" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" + "MsmKey" = "8:_90D7F247E8254DE797317F431E3FB010" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -939,12 +615,6 @@ } "Entry" { - "MsmKey" = "8:_A164EF86C4B57E41C8CE77B48F39DAC7" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A3936A2727E73289F5804D5DA006FD0A" "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" "MsmSig" = "8:_UNDEFINED" @@ -1023,6 +693,12 @@ } "Entry" { + "MsmKey" = "8:_B540FA32E4F6382CF1426D13A0A4E6B7" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_B5542B260CD5493395871EFDE833E438" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1083,6 +759,12 @@ } "Entry" { + "MsmKey" = "8:_BFD1EC957C5DBC08B54E6594C7CC5F91" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_C1036825E1364537B537E542E71F9C0E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1119,12 +801,6 @@ } "Entry" { - "MsmKey" = "8:_CB7CBDD38519056FAA16312EEF6BCAF7" - "OwnerKey" = "8:_BA769056DBAF4259B38F5C3FF7377055" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_CCAC35C9D0644917A28341E382DB6B93" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1167,14 +843,14 @@ } "Entry" { - "MsmKey" = "8:_D7E82DD20D5B47395F635480C8E3A1D3" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" + "MsmKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_DC30A9FB71F9449BAF1F5981E3538D1E" + "OwnerKey" = "8:_22F4FC6A582C42A0817BA85C8FEBAA18" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1191,12 +867,6 @@ } "Entry" { - "MsmKey" = "8:_E1CC91FCF87955D17FC3C0A8E875B690" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_E5C5D9225978484CA7AD0BD78C1222EE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1534,7 +1204,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1273F63008CF585CA0E063E436B4646F" { - "SourcePath" = "8:iphlpapi.dll" + "SourcePath" = "8:IPHLPAPI.DLL" "TargetName" = "8:iphlpapi.dll" "Tag" = "8:" "Folder" = "8:_06036160035041E38F4179E6DB6380C5" @@ -2132,26 +1802,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6A4CAD73F43678BF7C05E8FB41042F74" - { - "SourcePath" = "8:libteletone.dll" - "TargetName" = "8:libteletone.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6AA8D6AF639F4E6B92D28A7E0D13FD5E" { "SourcePath" = "8:..\\..\\conf\\dialplan\\extensions\\sipphone.com.noload" @@ -2372,6 +2022,46 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + { + "SourcePath" = "8:libapr.dll" + "TargetName" = "8:libapr.dll" + "Tag" = "8:" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7BBFE2768ACD3A62F3874EF99D16C0B8" + { + "SourcePath" = "8:FreeSwitch.dll" + "TargetName" = "8:FreeSwitch.dll" + "Tag" = "8:" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7CFCCDD9C6694A0498D7CD6CDD285042" { "SourcePath" = "8:..\\..\\conf\\lang\\de\\de.xml" @@ -2592,26 +2282,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_879085EF680EFDF6242DCB77439EC825" - { - "SourcePath" = "8:libapr.dll" - "TargetName" = "8:libapr.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8FB175B8685A47F7BE75E1A025F65693" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\limit.conf.xml" @@ -2652,26 +2322,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_91BA2668F87764F53188E93BC8D363D7" - { - "SourcePath" = "8:libapriconv.dll" - "TargetName" = "8:libapriconv.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_92F95219F6434CE3A736526946DA2ABB" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\event_socket.conf.xml" @@ -2832,26 +2482,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A164EF86C4B57E41C8CE77B48F39DAC7" - { - "SourcePath" = "8:libaprutil.dll" - "TargetName" = "8:libaprutil.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3936A2727E73289F5804D5DA006FD0A" { "SourcePath" = "8:RPCRT4.dll" @@ -2952,6 +2582,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B540FA32E4F6382CF1426D13A0A4E6B7" + { + "SourcePath" = "8:libteletone.dll" + "TargetName" = "8:libteletone.dll" + "Tag" = "8:" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B5ADB663C7CE49A1A11E895E4EBB4933" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\zeroconf.conf.xml" @@ -3072,12 +2722,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C7E9135AE3874E19809A03F02CCC15C9" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BFD1EC957C5DBC08B54E6594C7CC5F91" { - "SourcePath" = "8:..\\..\\conf\\jingle_profiles\\server.noload" - "TargetName" = "8:server.noload" + "SourcePath" = "8:libaprutil.dll" + "TargetName" = "8:libaprutil.dll" "Tag" = "8:" - "Folder" = "8:_6521C567C8FB4E1389A5CD0BAA719A2E" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -3089,15 +2739,15 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C93A983EC95F4F45AF27F37D674CF86B" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C7E9135AE3874E19809A03F02CCC15C9" { - "SourcePath" = "8:..\\..\\conf\\autoload_configs\\woomera.conf.xml" - "TargetName" = "8:woomera.conf.xml" + "SourcePath" = "8:..\\..\\conf\\jingle_profiles\\server.noload" + "TargetName" = "8:server.noload" "Tag" = "8:" - "Folder" = "8:_B3CE338501E445B593742462EDD46103" + "Folder" = "8:_6521C567C8FB4E1389A5CD0BAA719A2E" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -3112,12 +2762,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CB0CF364674E42A1B928D78A3823CB76" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C93A983EC95F4F45AF27F37D674CF86B" { - "SourcePath" = "8:..\\..\\conf\\directory\\default\\1013.xml" - "TargetName" = "8:1013.xml" + "SourcePath" = "8:..\\..\\conf\\autoload_configs\\woomera.conf.xml" + "TargetName" = "8:woomera.conf.xml" "Tag" = "8:" - "Folder" = "8:_C67316B39FC9471EA6A197EDF9897073" + "Folder" = "8:_B3CE338501E445B593742462EDD46103" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -3132,12 +2782,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CB7CBDD38519056FAA16312EEF6BCAF7" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CB0CF364674E42A1B928D78A3823CB76" { - "SourcePath" = "8:mod_spidermonkey.dll" - "TargetName" = "8:mod_spidermonkey.dll" + "SourcePath" = "8:..\\..\\conf\\directory\\default\\1013.xml" + "TargetName" = "8:1013.xml" "Tag" = "8:" - "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" + "Folder" = "8:_C67316B39FC9471EA6A197EDF9897073" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -3149,7 +2799,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CCAC35C9D0644917A28341E382DB6B93" @@ -3212,26 +2862,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D7E82DD20D5B47395F635480C8E3A1D3" - { - "SourcePath" = "8:FreeSwitch.dll" - "TargetName" = "8:FreeSwitch.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DD54C8F25D0546E199ADB3C4B40EA20B" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\conference.conf.xml" @@ -3252,26 +2882,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E1CC91FCF87955D17FC3C0A8E875B690" - { - "SourcePath" = "8:WLDAP32.dll" - "TargetName" = "8:WLDAP32.dll" - "Tag" = "8:" - "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E5C5D9225978484CA7AD0BD78C1222EE" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\java.conf.xml" @@ -4401,11 +4011,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_0CDD28A9559445CE96186F5FB19F690B" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_22F4FC6A582C42A0817BA85C8FEBAA18" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm" + "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" "Properties" { } @@ -4415,11 +4025,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7FDBEDFAE608481684258301B02CFD1C" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_DC30A9FB71F9449BAF1F5981E3538D1E" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" "Properties" { } @@ -4434,7 +4044,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0772289C2CC6435396616D7A2C407EA2" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_voicemail.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_voicemail.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4462,7 +4072,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_166BDBE308F54EE4881DA68F2A8189F5" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_enum.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_enum.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4490,7 +4100,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1777CB4B737E4B8481E25A10950B2B5A" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_native_file.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_native_file.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4518,7 +4128,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1CFB1AB04E024FC993E0EB4859DF8408" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_dingaling.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_dingaling.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4546,7 +4156,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1DCA6B2BA0F842FDB5CBA54CF52228F7" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_h26x.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_h26x.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4574,7 +4184,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2814E641538B42EFA83525986A9D5AC1" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_ilbc.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_ilbc.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4602,7 +4212,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_28FBC5A60B44423B8A2CC378347483CE" { - "SourcePath" = "8:..\\..\\Debug\\libapr.dll" + "SourcePath" = "8:..\\..\\Release\\libapr.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -4630,7 +4240,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_297D0BADB993435092DDB8CDF9F2A3C6" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_xml_cdr.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_xml_cdr.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4658,7 +4268,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2B80DCCD934745B1BB4F0B31099094D9" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_say_en.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_say_en.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4686,7 +4296,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2D9E612823084E3F9E10376A7AC0C476" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_g723_1.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_g723_1.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4714,7 +4324,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2F2FEC549F02436EB87961BD1B9E5783" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_iax.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_iax.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4742,7 +4352,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_318FCC99E8D143D6B4F9F534E63009B3" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_sndfile.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_sndfile.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4770,7 +4380,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3DB5A5EF1E624F999BCEA20250508EEA" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_fifo.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_fifo.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4798,7 +4408,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3E37631016BC45B2B672FE23257D542B" { - "SourcePath" = "8:..\\..\\Debug\\pthreadVC2.dll" + "SourcePath" = "8:..\\..\\Release\\pthreadVC2.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -4824,37 +4434,9 @@ { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3FBEFE0119944C6781F81104ECEF37CA" - { - "SourcePath" = "8:..\\..\\Debug\\libapriconv.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{101130D1-3EA6-4ED2-B65D-CEB5243A20ED}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4A285D260C3748A4BEFA6E5A9004D128" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4882,7 +4464,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_59CFED0C4EC0492C945E4EBC04FE965F" { - "SourcePath" = "8:..\\..\\Debug\\libaprutil.dll" + "SourcePath" = "8:..\\..\\Release\\libaprutil.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -4910,7 +4492,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5EDFD5418DD243D1A03D882B83BBBCF1" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_esf.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_esf.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4938,7 +4520,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_6DF726E4018A4136BC27E2C6F4B67B9E" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_logfile.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_logfile.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4966,7 +4548,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_6E5C001E7A314DCEA0A4BF52BF74BCAD" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_speex.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_speex.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4994,7 +4576,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_77550ABD8CC84D66A3B6C3C3C48665A4" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_dialplan_asterisk.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_dialplan_asterisk.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5022,7 +4604,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_78F060A241D0428998B42093C467AD36" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_voipcodecs.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_voipcodecs.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5050,7 +4632,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7B1050643E1E48A3B67B281B4AD43904" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_g729.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_g729.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5078,7 +4660,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8B53F026686B44189676CBC200E641C1" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_amr.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_amr.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5106,7 +4688,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8E023477B9DC4126921A556B285B29E5" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_socket.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_socket.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5134,7 +4716,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9527B92C45BB45629BDB19ED3C8DC194" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_fsv.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_fsv.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5162,7 +4744,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_95D01083472B4853AC3F06514558F347" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_teletone.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_teletone.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5190,7 +4772,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_96F8F7DE89C74DC399E8AE55C22B4F15" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_xml_curl.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_xml_curl.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5218,7 +4800,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9B19C40442134D69B533E16D0851D99B" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_odbc.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_odbc.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5246,7 +4828,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A0D5F714A0F94250A1C39603B699AB82" { - "SourcePath" = "8:..\\..\\Debug\\libteletone.dll" + "SourcePath" = "8:..\\..\\Release\\libteletone.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5274,7 +4856,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A8D70CB0D12C4B3FB2E2E896E9A7C843" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_tone_stream.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_tone_stream.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5302,7 +4884,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A944ADCEDF884574A23F7BA5420A6BA1" { - "SourcePath" = "8:..\\..\\libs\\win32\\sqlite\\Debug\\libsqlite.lib" + "SourcePath" = "8:..\\..\\libs\\win32\\sqlite\\Release\\sqlite.lib" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5330,7 +4912,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_conference.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_conference.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5358,7 +4940,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B5542B260CD5493395871EFDE833E438" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_openmrcp.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_openmrcp.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5386,7 +4968,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BA769056DBAF4259B38F5C3FF7377055" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_curl.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_curl.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5414,7 +4996,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BB649A2C1ABE4895859025B09A240323" { - "SourcePath" = "8:..\\..\\libs\\win32\\pcre\\Debug\\libpcre.lib" + "SourcePath" = "8:..\\..\\libs\\win32\\pcre\\Release\\libpcre.lib" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5442,7 +5024,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BB99CEDF341D40F3976B6D5486D9366D" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_limit.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_limit.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5470,7 +5052,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1036825E1364537B537E542E71F9C0E" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_event_socket.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_event_socket.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5498,7 +5080,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C105055EE271471A999CE7022E617EB7" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_commands.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_commands.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5526,7 +5108,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C81AC700C1BC4A55B98DF12C0CBAFD6F" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_dialplan_xml.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_dialplan_xml.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5554,7 +5136,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D0BB09AFB8D94B76918F0EE85BCCAD0A" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_dptools.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_dptools.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5582,7 +5164,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D1269F1E49D442CF8EAC96C23E60325D" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_xml_rpc.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_xml_rpc.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5610,7 +5192,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D2EF447106B24E67907DAED3D39CFBB1" { - "SourcePath" = "8:..\\..\\Debug\\FreeSwitch.dll" + "SourcePath" = "8:..\\..\\Release\\FreeSwitch.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5638,7 +5220,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D6F0F5845FAD4707975CE012A33CD607" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_rss.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_rss.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5666,7 +5248,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D7EC5795A9C645AC8E129C2EE6D461ED" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_event_multicast.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_event_multicast.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5694,7 +5276,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E1AA7C5B96DA4A26859D2C7A21E00AB6" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_core_db.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_core_db.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5722,7 +5304,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E763C699DF0948B6984DDEB96A2DFD06" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_PortAudio.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_PortAudio.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5750,7 +5332,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EAF4B051F44745ABA9B58038FB93994C" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_expr.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_expr.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5778,7 +5360,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EC4922AEC1064C90B96EBBDD3104D761" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_local_stream.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_local_stream.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5806,7 +5388,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EF14CB99F3414BB689D0CB0E6D6B8AB8" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_console.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_console.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5834,7 +5416,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F0B800E719294692A02518CFD8CBAEFF" { - "SourcePath" = "8:..\\..\\Debug\\FreeSwitch.exe" + "SourcePath" = "8:..\\..\\Release\\FreeSwitch.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5862,7 +5444,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FB1B9FBDC3294F1C96DAC4246C013C22" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_woomera.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_woomera.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5890,7 +5472,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FBB0E565B1DE49CE9C827ACAC337AC5B" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_sofia.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_sofia.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5918,7 +5500,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FBD45C36E901435399634CACA5339597" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_cdr_csv.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_cdr_csv.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521"

1 0

[commit] r8323 - in freeswitch/trunk/src/mod/languages: mod_lua mod_perl
by Freeswitch SVN 08 May '08

08 May '08

Author: anthm Date: Thu May 8 19:58:45 2008 New Revision: 8323 Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.h freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Log: add optional arg to hangup hook in perl/lua Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Thu May 8 19:58:45 2008 @@ -3,19 +3,19 @@ Session::Session() : CoreSession() { - cb_function = cb_arg = hangup_func_str = NULL; + cb_function = cb_arg = hangup_func_str = hangup_func_arg = NULL; hh = mark = 0; } Session::Session(char *uuid) : CoreSession(uuid) { - cb_function = cb_arg = hangup_func_str = NULL; + cb_function = cb_arg = hangup_func_str = hangup_func_arg = NULL; hh = mark = 0; } Session::Session(switch_core_session_t *new_session) : CoreSession(new_session) { - cb_function = cb_arg = hangup_func_str = NULL; + cb_function = cb_arg = hangup_func_str = hangup_func_arg = NULL; hh = mark = 0; } static switch_status_t lua_hanguphook(switch_core_session_t *session_hungup); @@ -29,6 +29,7 @@ free(hangup_func_str); } + switch_safe_free(hangup_func_arg); switch_safe_free(cb_function); switch_safe_free(cb_arg); } @@ -89,6 +90,11 @@ lua_getfield(L, LUA_GLOBALSINDEX, (char *)hangup_func_str); lua_pushstring(L, hook_state == CS_HANGUP ? "hangup" : "transfer"); + + if (hangup_func_arg) { + lua_pushstring(L, hangup_func_arg); + } + lua_call(L, 1, 1); err = lua_tostring(L, -1); @@ -115,14 +121,16 @@ } -void Session::setHangupHook(char *func) { +void Session::setHangupHook(char *func, char *arg) { sanity_check_noreturn; switch_safe_free(hangup_func_str); - + switch_safe_free(hangup_func_arg); + if (func) { hangup_func_str = strdup(func); + hangup_func_arg = strdup(arg); switch_channel_set_private(channel, "CoreSession", this); hook_state = switch_channel_get_state(channel); switch_core_event_hook_add_state_change(session, lua_hanguphook); Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h Thu May 8 19:58:45 2008 @@ -29,12 +29,13 @@ virtual switch_status_t run_dtmf_callback(void *input, switch_input_type_t itype); void setInputCallback(char *cbfunc, char *funcargs); - void setHangupHook(char *func); + void setHangupHook(char *func, char *arg = NULL); bool ready(); char *cb_function; char *cb_arg; char *hangup_func_str; + char *hangup_func_arg; void setLUA(lua_State *state); }; Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp Thu May 8 19:58:45 2008 @@ -5365,7 +5365,37 @@ } -static int _wrap_Session_setHangupHook(lua_State* L) { +static int _wrap_Session_setHangupHook__SWIG_0(lua_State* L) { + int SWIG_arg = -1; + Session *arg1 = (Session *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + + SWIG_check_num_args("setHangupHook",3,3) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("setHangupHook",1,"Session *"); + if(!lua_isstring(L,2)) SWIG_fail_arg("setHangupHook",2,"char *"); + if(!lua_isstring(L,3)) SWIG_fail_arg("setHangupHook",3,"char *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_Session,0))){ + SWIG_fail_ptr("Session_setHangupHook",1,SWIGTYPE_p_Session); + } + + arg2 = (char *)lua_tostring(L, 2); + arg3 = (char *)lua_tostring(L, 3); + (arg1)->setHangupHook(arg2,arg3); + SWIG_arg=0; + + return SWIG_arg; + + if(0) SWIG_fail; + +fail: + lua_error(L); + return SWIG_arg; +} + + +static int _wrap_Session_setHangupHook__SWIG_1(lua_State* L) { int SWIG_arg = -1; Session *arg1 = (Session *) 0 ; char *arg2 = (char *) 0 ; @@ -5392,6 +5422,62 @@ } +static int _wrap_Session_setHangupHook(lua_State* L) { + int argc; + int argv[4]={ + 1,2,3,4 + }; + + argc = lua_gettop(L); + if (argc == 2) { + int _v; + { + void *ptr; + if (SWIG_isptrtype(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_Session, 0)) { + _v = 0; + } else { + _v = 1; + } + } + if (_v) { + { + _v = lua_isstring(L,argv[1]); + } + if (_v) { + return _wrap_Session_setHangupHook__SWIG_1(L); + } + } + } + if (argc == 3) { + int _v; + { + void *ptr; + if (SWIG_isptrtype(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_Session, 0)) { + _v = 0; + } else { + _v = 1; + } + } + if (_v) { + { + _v = lua_isstring(L,argv[1]); + } + if (_v) { + { + _v = lua_isstring(L,argv[2]); + } + if (_v) { + return _wrap_Session_setHangupHook__SWIG_0(L); + } + } + } + } + + lua_pushstring(L,"No matching function for overloaded 'Session_setHangupHook'"); + lua_error(L);return 0; +} + + static int _wrap_Session_ready(lua_State* L) { int SWIG_arg = -1; Session *arg1 = (Session *) 0 ; @@ -5597,6 +5683,66 @@ } +static int _wrap_Session_hangup_func_arg_set(lua_State* L) { + int SWIG_arg = -1; + Session *arg1 = (Session *) 0 ; + char *arg2 = (char *) 0 ; + + SWIG_check_num_args("hangup_func_arg",2,2) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("hangup_func_arg",1,"Session *"); + if(!lua_isstring(L,2)) SWIG_fail_arg("hangup_func_arg",2,"char *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_Session,0))){ + SWIG_fail_ptr("Session_hangup_func_arg_set",1,SWIGTYPE_p_Session); + } + + arg2 = (char *)lua_tostring(L, 2); + { + if (arg1->hangup_func_arg) delete [] arg1->hangup_func_arg; + if (arg2) { + arg1->hangup_func_arg = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->hangup_func_arg, (const char *)arg2); + } else { + arg1->hangup_func_arg = 0; + } + } + SWIG_arg=0; + + return SWIG_arg; + + if(0) SWIG_fail; + +fail: + lua_error(L); + return SWIG_arg; +} + + +static int _wrap_Session_hangup_func_arg_get(lua_State* L) { + int SWIG_arg = -1; + Session *arg1 = (Session *) 0 ; + char *result = 0 ; + + SWIG_check_num_args("hangup_func_arg",1,1) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("hangup_func_arg",1,"Session *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_Session,0))){ + SWIG_fail_ptr("Session_hangup_func_arg_get",1,SWIGTYPE_p_Session); + } + + result = (char *) ((arg1)->hangup_func_arg); + SWIG_arg=0; + lua_pushstring(L,(const char*)result); SWIG_arg++; + return SWIG_arg; + + if(0) SWIG_fail; + +fail: + lua_error(L); + return SWIG_arg; +} + + static int _wrap_Session_setLUA(lua_State* L) { int SWIG_arg = -1; Session *arg1 = (Session *) 0 ; @@ -5642,6 +5788,7 @@ { "cb_function", _wrap_Session_cb_function_get, _wrap_Session_cb_function_set}, { "cb_arg", _wrap_Session_cb_arg_get, _wrap_Session_cb_arg_set}, { "hangup_func_str", _wrap_Session_hangup_func_str_get, _wrap_Session_hangup_func_str_set}, + { "hangup_func_arg", _wrap_Session_hangup_func_arg_get, _wrap_Session_hangup_func_arg_set}, {0,0,0} }; static swig_lua_class *swig_Session_bases[] = {0,0}; Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm Thu May 8 19:58:45 2008 @@ -382,6 +382,8 @@ *swig_cb_arg_set = *freeswitchc::Session_cb_arg_set; *swig_hangup_func_str_get = *freeswitchc::Session_hangup_func_str_get; *swig_hangup_func_str_set = *freeswitchc::Session_hangup_func_str_set; +*swig_hangup_func_arg_get = *freeswitchc::Session_hangup_func_arg_get; +*swig_hangup_func_arg_set = *freeswitchc::Session_hangup_func_arg_set; *setPERL = *freeswitchc::Session_setPERL; sub DISOWN { my $self = shift; Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp Thu May 8 19:58:45 2008 @@ -4,7 +4,7 @@ static STRLEN n_a; -#define init_me() cb_function = hangup_func_str = NULL; hh = mark = 0; my_perl = NULL; cb_arg = NULL +#define init_me() cb_function = hangup_func_str = NULL; hangup_func_arg = NULL; hh = mark = 0; my_perl = NULL; cb_arg = NULL Session::Session() : CoreSession() { @@ -26,6 +26,7 @@ switch_safe_free(cb_function); switch_safe_free(cb_arg); switch_safe_free(hangup_func_str); + switch_safe_free(hangup_func_arg); switch_core_event_hook_remove_state_change(session, perl_hanguphook); } @@ -82,7 +83,12 @@ return; } - code = switch_mprintf("%s(%s)", hangup_func_str, hook_state == CS_HANGUP ? "hangup" : "transfer"); + if (hangup_func_arg) { + code = switch_mprintf("%s(%s,%s)", hangup_func_str, hook_state == CS_HANGUP ? "hangup" : "transfer", hangup_func_arg); + } else { + code = switch_mprintf("%s(%s)", hangup_func_str, hook_state == CS_HANGUP ? "hangup" : "transfer"); + } + Perl_eval_pv(my_perl, code, TRUE); free(code); } @@ -105,7 +111,7 @@ } -void Session::setHangupHook(char *func) { +void Session::setHangupHook(char *func, char *arg) { sanity_check_noreturn; @@ -116,6 +122,9 @@ switch_channel_set_private(channel, "CoreSession", this); hook_state = switch_channel_get_state(channel); switch_core_event_hook_add_state_change(session, perl_hanguphook); + if (arg) { + hangup_func_arg = strdup(func); + } } } Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.h (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.h Thu May 8 19:58:45 2008 @@ -36,12 +36,13 @@ virtual switch_status_t run_dtmf_callback(void *input, switch_input_type_t itype); void setInputCallback(char *cbfunc, char *funcargs); - void setHangupHook(char *func); + void setHangupHook(char *func, char *arg=NULL); bool ready(); char *cb_function; char *cb_arg; char *hangup_func_str; + char *hangup_func_arg; void setPERL(PerlInterpreter *pi); }; Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Thu May 8 19:58:45 2008 @@ -6997,7 +6997,56 @@ } -XS(_wrap_Session_setHangupHook) { +XS(_wrap_Session_setHangupHook__SWIG_0) { + { + Session *arg1 = (Session *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 3) || (items > 3)) { + SWIG_croak("Usage: Session_setHangupHook(self,func,arg);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_Session, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Session_setHangupHook" "', argument " "1"" of type '" "Session *""'"); + } + arg1 = reinterpret_cast< Session * >(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Session_setHangupHook" "', argument " "2"" of type '" "char *""'"); + } + arg2 = reinterpret_cast< char * >(buf2); + res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Session_setHangupHook" "', argument " "3"" of type '" "char *""'"); + } + arg3 = reinterpret_cast< char * >(buf3); + (arg1)->setHangupHook(arg2,arg3); + + + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + SWIG_croak_null(); + } +} + + +XS(_wrap_Session_setHangupHook__SWIG_1) { { Session *arg1 = (Session *) 0 ; char *arg2 = (char *) 0 ; @@ -7035,6 +7084,92 @@ } +XS(_wrap_Session_setHangupHook) { + dXSARGS; + + { + unsigned long _index = 0; + SWIG_TypeRank _rank = 0; + if (items == 2) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_Session, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + int res = SWIG_AsCharPtrAndSize(ST(1), 0, NULL, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 1; + if (_rank == _rankm) goto dispatch; + } + } + check_1: + + if (items == 3) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_Session, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + int res = SWIG_AsCharPtrAndSize(ST(1), 0, NULL, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + int res = SWIG_AsCharPtrAndSize(ST(2), 0, NULL, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 2; + if (_rank == _rankm) goto dispatch; + } + } + check_2: + + dispatch: + switch(_index) { + case 1: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_Session_setHangupHook__SWIG_1); return; + case 2: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_Session_setHangupHook__SWIG_0); return; + } + } + + croak("No matching function for overloaded 'Session_setHangupHook'"); + XSRETURN(0); +} + + XS(_wrap_Session_ready) { { Session *arg1 = (Session *) 0 ; @@ -7279,6 +7414,78 @@ } +XS(_wrap_Session_hangup_func_arg_set) { + { + Session *arg1 = (Session *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: Session_hangup_func_arg_set(self,hangup_func_arg);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_Session, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Session_hangup_func_arg_set" "', argument " "1"" of type '" "Session *""'"); + } + arg1 = reinterpret_cast< Session * >(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Session_hangup_func_arg_set" "', argument " "2"" of type '" "char *""'"); + } + arg2 = reinterpret_cast< char * >(buf2); + if (arg1->hangup_func_arg) delete[] arg1->hangup_func_arg; + if (arg2) { + size_t size = strlen(reinterpret_cast< const char * >(arg2)) + 1; + arg1->hangup_func_arg = (char *)reinterpret_cast< char* >(memcpy((new char[size]), reinterpret_cast< const char * >(arg2), sizeof(char)*(size))); + } else { + arg1->hangup_func_arg = 0; + } + + + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + SWIG_croak_null(); + } +} + + +XS(_wrap_Session_hangup_func_arg_get) { + { + Session *arg1 = (Session *) 0 ; + char *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Session_hangup_func_arg_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_Session, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Session_hangup_func_arg_get" "', argument " "1"" of type '" "Session *""'"); + } + arg1 = reinterpret_cast< Session * >(argp1); + result = (char *) ((arg1)->hangup_func_arg); + ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + XS(_wrap_Session_setPERL) { { Session *arg1 = (Session *) 0 ; @@ -7529,6 +7736,8 @@ {"freeswitchc::Session_cb_arg_get", _wrap_Session_cb_arg_get}, {"freeswitchc::Session_hangup_func_str_set", _wrap_Session_hangup_func_str_set}, {"freeswitchc::Session_hangup_func_str_get", _wrap_Session_hangup_func_str_get}, +{"freeswitchc::Session_hangup_func_arg_set", _wrap_Session_hangup_func_arg_set}, +{"freeswitchc::Session_hangup_func_arg_get", _wrap_Session_hangup_func_arg_get}, {"freeswitchc::Session_setPERL", _wrap_Session_setPERL}, {0,0} };

1 0

[commit] r8322 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 08 May '08

08 May '08

Author: anthm Date: Thu May 8 19:35:01 2008 New Revision: 8322 Added: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp - copied, changed from r8321, /freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.c Removed: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.c Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.vcproj Log: make lua work on mac Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj Thu May 8 19:35:01 2008 @@ -270,7 +270,7 @@ > </File> <File - RelativePath=".\mod_lua.c" + RelativePath=".\mod_lua.cpp" > </File> <File Copied: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (from r8321, /freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.c) ============================================================================== --- /freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Thu May 8 19:35:01 2008 @@ -30,11 +30,11 @@ */ #include <switch.h> +SWITCH_BEGIN_EXTERN_C #include "lua.h" #include <lauxlib.h> #include <lualib.h> #include "mod_lua_extra.h" - SWITCH_MODULE_LOAD_FUNCTION(mod_lua_load); SWITCH_MODULE_DEFINITION(mod_lua, mod_lua_load, NULL, NULL); @@ -140,7 +140,7 @@ stream.write_function(&stream, "'%s'%s", argv[x], x == argc-1 ? "" : ", "); } stream.write_function(&stream, " };"); - code = stream.data; + code = (char *)stream.data; } else { code = switch_mprintf("argv = {};"); } @@ -370,6 +370,8 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_END_EXTERN_C + /* For Emacs: * Local Variables: * mode:c Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.vcproj Thu May 8 19:35:01 2008 @@ -270,7 +270,7 @@ > </File> <File - RelativePath=".\mod_lua.c" + RelativePath=".\mod_lua.cpp" > </File> <File

1 0