Author: stkn Date: Fri Dec 14 11:55:00 2007 New Revision: 6789 Modified: freeswitch/branches/stkn/sofia-exp/trunk/ (props changed) freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.2008.sln freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.sln freeswitch/branches/stkn/sofia-exp/trunk/Makefile.am freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/cdr_csv.conf.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/console.conf.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/sofia.conf.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1000.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1001.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1002.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1003.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1004.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1005.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1006.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1007.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1008.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1009.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1010.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1011.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1012.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1013.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1014.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1015.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1016.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1017.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1018.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1019.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/brian.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/lang/en/vm/sounds.xml freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g726/libg726.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g7xx/libg7xx.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/gsm/libgsm.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/ilbc/libilbc.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/curl/lib/config.h.in freeswitch/branches/stkn/sofia-exp/trunk/libs/iax/libiax2.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/libdingaling/libdingaling.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/libteletone/libteletone.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/srtp/libsrtp.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr-util/ (props changed) freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/howl/libmDNSResponder.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/libsndfile/libsndfile.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sqlite/sqlite.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/udns/libudns.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/xmlrpc-c/lib/abyss/src/data.c freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_bitpack.h freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_ivr.h freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_module_interfaces.h freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_types.h freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_channel.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_state_machine.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_rtp.c freeswitch/branches/stkn/sofia-exp/trunk/w32/Console/FreeSwitchConsole.2008.vcproj Log: Merge changes from trunk Modified: freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.2008.sln (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.2008.sln Fri Dec 14 11:55:00 2007 @@ -526,8 +526,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.2008.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}" ProjectSection(ProjectDependencies) = postProject - {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F} @@ -553,8 +553,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod\event_handlers\mod_event_socket\mod_event_socket.2008.vcproj", "{05515420-16DE-4E63-BE73-85BE85BA5142}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgsm", "libs\codec\gsm\libgsm.2008.vcproj", "{8FD2E297-4096-47E5-9258-C48FF1841523}" @@ -713,8 +713,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.2008.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" ProjectSection(ProjectDependencies) = postProject - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.2008.vcproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}" @@ -727,9 +727,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.2008.vcproj", "{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}" ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_amr", "src\mod\codecs\mod_amr\mod_amr.2008.vcproj", "{8DEB383C-4091-4F42-A56F-C9E46D552D79}" @@ -763,9 +763,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtspcore", "libs\openmrcp\rtspcore\rtspcore.2008.vcproj", "{EB751DC4-87BD-4766-B78D-DFB64BA9F988}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpmediaframe", "libs\openmrcp\module\mrcpmediaframe\mrcpmediaframe.2008.vcproj", "{9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}" @@ -780,8 +780,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "libs\openmrcp\module\mrcpsofiasip\mrcpsofiasip.2008.vcproj", "{819C7242-6184-46FE-BC7B-C7E25C0581EE}" ProjectSection(ProjectDependencies) = postProject - {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2agent", "libs\openmrcp\module\mrcpv2agent\mrcpv2agent.2008.vcproj", "{FB64EA08-3BC0-48AE-BE4B-74F1024B756E}" @@ -791,27 +791,26 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmrcpclient", "libs\openmrcp\platform\openmrcpclient\libopenmrcpclient.2008.vcproj", "{A407B661-D7DC-4E30-B268-FFF3296C35E6}" ProjectSection(ProjectDependencies) = postProject - {CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {CF78E84D-8456-44F2-8197-0E0E88D30A3C} - {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE} - {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} = {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} + {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE} + {CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {CF78E84D-8456-44F2-8197-0E0E88D30A3C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_openmrcp", "src\mod\asr_tts\mod_openmrcp\mod_openmrcp.2008.vcproj", "{E7116F50-2B10-472F-92BD-C8667AA9C1AE}" ProjectSection(ProjectDependencies) = postProject - {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey_socket\mod_spidermonkey_socket.2008.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.2008.vcproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}" Modified: freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.sln ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.sln (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.sln Fri Dec 14 11:55:00 2007 @@ -3,20 +3,20 @@ # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" ProjectSection(ProjectDependencies) = postProject - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} - {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {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} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} + {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g729", "src\mod\codecs\mod_g729\mod_g729.vcproj", "{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}" @@ -26,15 +26,15 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsm", "src\mod\codecs\mod_gsm\mod_gsm.vcproj", "{4926323F-4EA8-4B7D-A3D3-65488725988F}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711", "src\mod\codecs\mod_g711\mod_g711.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}" @@ -44,16 +44,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoints\mod_iax\mod_iax.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}" 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} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_l16", "src\mod\codecs\mod_l16\mod_l16.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}" @@ -63,14 +63,14 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_speex", "src\mod\codecs\mod_speex\mod_speex.vcproj", "{5580D60E-0F77-4716-9CD4-B8E5986FA375}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomera", "src\mod\endpoints\mod_woomera\mod_woomera.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}" @@ -91,8 +91,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.vcproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FreeSwitchSetup", "w32\Setup\Setup.vdproj", "{B17FFBE6-A942-4056-8346-B624FB5D995B}" @@ -106,22 +106,22 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_directory", "src\mod\dialplans\mod_dialplan_directory\mod_dialplan_directory.vcproj", "{A27CCA23-1541-4337-81A4-F0A6413078A0}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_zeroconf", "src\mod\event_handlers\mod_zeroconf\mod_zeroconf.vcproj", "{C7705DC4-2088-493E-AF8D-65BC6D65C125}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\mod\event_handlers\mod_event_multicast\mod_event_multicast.vcproj", "{784113EF-44D9-4949-835D-7065D3C7AD08}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.vcproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}" @@ -130,10 +130,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}" @@ -145,22 +145,22 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.vcproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dingaling", "src\mod\endpoints\mod_dingaling\mod_dingaling.vcproj", "{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}" ProjectSection(ProjectDependencies) = postProject - {1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_commands", "src\mod\applications\mod_commands\mod_commands.vcproj", "{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Loggers", "Loggers", "{A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}" @@ -174,35 +174,35 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}" ProjectSection(ProjectDependencies) = postProject - {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_conference", "src\mod\applications\mod_conference\mod_conference.vcproj", "{C24FB505-05D7-4319-8485-7540B44C8603}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\applications\mod_dptools\mod_dptools.vcproj", "{B5881A85-FE70-4F64-8607-2CAAE52669C6}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod\event_handlers\mod_event_socket\mod_event_socket.vcproj", "{05515420-16DE-4E63-BE73-85BE85BA5142}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}" @@ -215,8 +215,8 @@ 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} {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsrtp", "libs\srtp\libsrtp.vcproj", "{EEF031CB-FED8-451E-A471-91EC8D4F6750}" @@ -241,8 +241,8 @@ 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} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}" @@ -260,8 +260,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder static library", "libs\win32\howl\libmDNSResponder.vcproj", "{49C34584-B6DA-448F-83CF-27584DC9FC90}" ProjectSection(ProjectDependencies) = postProject - {5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75} {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} + {5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "libs\win32\libsndfile\libsndfile.vcproj", "{3D0370CA-BED2-4657-A475-32375CBCB6E4}" @@ -281,34 +281,34 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}" ProjectSection(ProjectDependencies) = postProject - {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg726", "libs\codec\g726\libg726.vcproj", "{5A6A281A-AA50-470A-8305-202BDA1CD1BF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g726", "src\mod\codecs\mod_g726\mod_g726.vcproj", "{486369EB-F150-4B56-BCC8-77B9E18FF5F5}" ProjectSection(ProjectDependencies) = postProject - {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {5A6A281A-AA50-470A-8305-202BDA1CD1BF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {5A6A281A-AA50-470A-8305-202BDA1CD1BF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7xx", "libs\codec\g7xx\libg7xx.vcproj", "{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g722", "src\mod\codecs\mod_g722\mod_g722.vcproj", "{D42518CC-7475-454D-B392-0E132C07D761}" ProjectSection(ProjectDependencies) = postProject - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}" ProjectSection(ProjectDependencies) = postProject - {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.vcproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}" @@ -320,70 +320,70 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codecs\mod_g723_1\mod_g723_1.vcproj", "{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.vcproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey_core_db\mod_spidermonkey_core_db.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}" ProjectSection(ProjectDependencies) = postProject - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey_teletone\mod_spidermonkey_teletone.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}" ProjectSection(ProjectDependencies) = postProject - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.vcproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.vcproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey_odbc\mod_spidermonkey_odbc.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}" ProjectSection(ProjectDependencies) = postProject - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" ProjectSection(ProjectDependencies) = postProject - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "say", "say", "{6CD61A1D-797C-470A-BE08-8C31B68BB336}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.vcproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\portaudio\build\msvc\portaudio.vcproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.vcproj", "{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_amr", "src\mod\codecs\mod_amr\mod_amr.vcproj", "{8DEB383C-4091-4F42-A56F-C9E46D552D79}" @@ -456,16 +456,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpcore", "libs\openmrcp\mrcpcore\mrcpcore.vcproj", "{829A9309-3B94-43C0-846B-7EC9D6D35F8B}" ProjectSection(ProjectDependencies) = postProject - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {AA91F0AC-6562-435E-814C-5C94689FEFA2} = {AA91F0AC-6562-435E-814C-5C94689FEFA2} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtspcore", "libs\openmrcp\rtspcore\rtspcore.vcproj", "{EB751DC4-87BD-4766-B78D-DFB64BA9F988}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpmediaframe", "libs\openmrcp\module\mrcpmediaframe\mrcpmediaframe.vcproj", "{9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}" @@ -482,8 +482,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "libs\openmrcp\module\mrcpsofiasip\mrcpsofiasip.vcproj", "{819C7242-6184-46FE-BC7B-C7E25C0581EE}" ProjectSection(ProjectDependencies) = postProject - {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2agent", "libs\openmrcp\module\mrcpv2agent\mrcpv2agent.vcproj", "{FB64EA08-3BC0-48AE-BE4B-74F1024B756E}" @@ -493,27 +493,26 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmrcpclient", "libs\openmrcp\platform\openmrcpclient\libopenmrcpclient.vcproj", "{A407B661-D7DC-4E30-B268-FFF3296C35E6}" ProjectSection(ProjectDependencies) = postProject - {CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {CF78E84D-8456-44F2-8197-0E0E88D30A3C} - {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE} - {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} = {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} + {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE} + {CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {CF78E84D-8456-44F2-8197-0E0E88D30A3C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_openmrcp", "src\mod\asr_tts\mod_openmrcp\mod_openmrcp.vcproj", "{E7116F50-2B10-472F-92BD-C8667AA9C1AE}" ProjectSection(ProjectDependencies) = postProject - {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey_socket\mod_spidermonkey_socket.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.vcproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}" Modified: freeswitch/branches/stkn/sofia-exp/trunk/Makefile.am ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/Makefile.am (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/Makefile.am Fri Dec 14 11:55:00 2007 @@ -297,6 +297,9 @@ megaclean: eclean modclean rm -f `find ./libs -name \*.la` +libclean: + @for file in `ls ./libs`; do pushd "./libs/"$$file; make clean; popd; done + modules.conf: if test -f $@; then touch $@; else cp build/modules.conf.in $@ ;fi Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/cdr_csv.conf.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/cdr_csv.conf.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/cdr_csv.conf.xml Fri Dec 14 11:55:00 2007 @@ -6,6 +6,7 @@ <param name="rotate-on-hup" value="true"/> </settings> <templates> + <template name="sql">INSERT INTO cdr VALUES ("${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}");</template> <template name="example">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}"</template> <template name="asterisk">"${accountcode}","${caller_id_number}","${destination_number}","${context}","${caller_id}","${channel_name}","${bridge_channel}","${last_app}","${last_arg}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${amaflags}","${uuid}","${userfield}"</template> </templates> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/console.conf.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/console.conf.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/console.conf.xml Fri Dec 14 11:55:00 2007 @@ -6,7 +6,7 @@ name can be a file name, function name or 'all' value is one or more of debug,info,notice,warning,err,crit,alert,all --> - <map name="all" value="info,notice,warning,err,crit,alert"/> + <map name="all" value="debug,info,notice,warning,err,crit,alert"/> </mappings> <settings> <!-- comment or set to false for no color logging --> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/sofia.conf.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/sofia.conf.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/sofia.conf.xml Fri Dec 14 11:55:00 2007 @@ -1,4 +1,8 @@ <configuration name="sofia.conf" description="sofia Endpoint"> + <global_settings> + <param name="log-level" value="0"/> + </global_settings> + <profiles> <X-PRE-PROCESS cmd="include" data="../sip_profiles/*.xml"/> </profiles> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml Fri Dec 14 11:55:00 2007 @@ -56,14 +56,6 @@ </condition> </extension> - <extension name="add-group"> - <condition field="destination_number" expression="^81(\d{2})$"> - <action application="answer"/> - <action application="group" data="insert:$1:${sofia_contact(${sip_from_user}@${domain})}"/> - <action application="gentones" data="%(1000, 0, 640)"/> - </condition> - </extension> - <extension name="del-group"> <condition field="destination_number" expression="^80(\d{2})$"> <action application="answer"/> @@ -72,6 +64,14 @@ </condition> </extension> + <extension name="add-group"> + <condition field="destination_number" expression="^81(\d{2})$"> + <action application="answer"/> + <action application="group" data="insert:$1:${sofia_contact(${sip_from_user}@${domain})}"/> + <action application="gentones" data="%(1000, 0, 640)"/> + </condition> + </extension> + <extension name="call-group-simo"> <condition field="destination_number" expression="^82(\d{2})$"> <action application="bridge" data="${group(call:$1)}"/> @@ -85,6 +85,15 @@ </condition> </extension> + <extension name="extension-intercom"> + <condition field="destination_number" expression="^8(10[01][0-9])$"> + <action application="set" data="dialed_ext=$1"/> + <action application="set" data="sip_h_Call-Info=<sip:$${local_ip_v4}>;answer-after=0"/> + <action application="set" data="sip_auto_answer=true"/> + <action application="set" data="export_vars=sip_h_Call-Info,sip_auto_answer"/> + <action application="bridge" data="USER/${dialed_ext}@$${domain}"/> + </condition> + </extension> <!-- if the calling party is the called party, go to their VM @@ -99,6 +108,8 @@ </condition> <condition field="destination_number" expression="^${caller_id_number}$"> <action application="set" data="voicemail_authorized=${sip_authorized}"/> + <action application="answer"/> + <action application="sleep" data="1000"/> <action application="voicemail" data="check default $${domain} ${dialed_ext}"/> <anti-action application="set" data="call_timeout=30000"/> <anti-action application="set" data="hangup_after_bridge=true"/> @@ -106,6 +117,8 @@ <anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/> <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/> <anti-action application="bridge" data="USER/${dialed_ext}@$${domain}"/> + <anti-action application="answer"/> + <anti-action application="sleep" data="1000"/> <anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/> </condition> </extension> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1000.xml Fri Dec 14 11:55:00 2007 @@ -8,6 +8,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Brian West"/> + <variable name="effective_caller_id_number" value="1000"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1001.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1001"/> + <variable name="effective_caller_id_number" value="1001"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1002.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1002"/> + <variable name="effective_caller_id_number" value="1002"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1003.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1003"/> + <variable name="effective_caller_id_number" value="1003"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1004.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1004"/> + <variable name="effective_caller_id_number" value="1004"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1005.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1005"/> + <variable name="effective_caller_id_number" value="1005"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1006.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1006"/> + <variable name="effective_caller_id_number" value="1006"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1007.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1007"/> + <variable name="effective_caller_id_number" value="1007"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1008.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1008"/> + <variable name="effective_caller_id_number" value="1008"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1009.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1009"/> + <variable name="effective_caller_id_number" value="1009"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1010.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1010"/> + <variable name="effective_caller_id_number" value="1010"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1011.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1011"/> + <variable name="effective_caller_id_number" value="1011"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1012.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1012"/> + <variable name="effective_caller_id_number" value="1012"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1013.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1013"/> + <variable name="effective_caller_id_number" value="1013"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1014.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1014"/> + <variable name="effective_caller_id_number" value="1014"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1015.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1015"/> + <variable name="effective_caller_id_number" value="1015"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1016.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1016"/> + <variable name="effective_caller_id_number" value="1016"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1017.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1017"/> + <variable name="effective_caller_id_number" value="1017"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1018.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1018"/> + <variable name="effective_caller_id_number" value="1018"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1019.xml Fri Dec 14 11:55:00 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1019"/> + <variable name="effective_caller_id_number" value="1019"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/brian.xml Fri Dec 14 11:55:00 2007 @@ -50,6 +50,8 @@ <variables> <!--all variables here will be set on all inbound calls that originate from this user --> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Brian West"/> + <variable name="effective_caller_id_number" value="1000"/> <!-- limit the max number of outgoing calls for this user --> <!--<variable name="max_calls" value="2"/>--> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/lang/en/vm/sounds.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/lang/en/vm/sounds.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/lang/en/vm/sounds.xml Fri Dec 14 11:55:00 2007 @@ -54,7 +54,7 @@ <match> <action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="say" data="1" method="pronounced" type="items"/> - <action function="play-file" data="voicemail/vm-$2.wav"/> + <action function="play-file" data="voicemail/vm-new.wav"/> <action function="play-file" data="voicemail/vm-message.wav"/> <action function="play-file" data="voicemail/vm-in_folder.wav"/> </match> @@ -147,23 +147,23 @@ </macro> <macro name="voicemail_listen_file_check"> - <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> + <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> <match> - <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$1" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$2" method="pronounced" type="name_spelled"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-save_recording.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$3" method="pronounced" type="name_spelled"/> + <action function="say" data="$2" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-delete_recording.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$4" method="pronounced" type="name_spelled"/> + <action function="say" data="$3" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-forward_to_email.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="say" data="$4" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-return_call.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$5" method="pronounced" type="name_spelled"/> </match> </input> </macro> @@ -200,23 +200,6 @@ </input> </macro> - <macro name="marked-urgent"> - <input pattern="^(.*)$"> - <match> - <action function="play-file" data="voicemail/vm-urgent.wav"/> - <action function="play-file" data="voicemail/vm-message.wav"/> - </match> - </input> - </macro> - - <macro name="saved"> - <input pattern="^(.*)$"> - <match> - <action function="play-file" data="voicemail/vm-saved.wav"/> - </match> - </input> - </macro> - <macro name="voicemail_greeting_selected"> <input pattern="^(.*)$"> <match> @@ -269,20 +252,38 @@ </match> </input> </macro> - - <macro name="voicemail_ack"> - <input pattern="^(.*)$"> + <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded --> + <macro name="voicemail_ack"> + <input pattern="^(deleted)$"> + <match> + <action function="play-file" data="voicemail/vm-message.wav"/> + <action function="play-file" data="voicemail/vm-$1.wav"/> + </match> + </input> + <input pattern="^(saved)$"> <match> <action function="play-file" data="voicemail/vm-message.wav"/> <action function="play-file" data="voicemail/vm-$1.wav"/> </match> </input> + <input pattern="^(emailed)$"> + <match> + <action function="play-file" data="voicemail/vm-message.wav"/> + <action function="play-file" data="voicemail/vm-saved.wav"/> + </match> + </input> + <input pattern="^(marked-urgent)$"> + <match> + <action function="play-file" data="voicemail/vm-message.wav"/> + <action function="play-file" data="voicemail/vm-saved.wav"/> + </match> + </input> </macro> <macro name="voicemail_say_date"> <input pattern="^(.*)$"> <match> - <action function="say" data="$strftime($1|%A, %B %d %Y, %I %M %p)" method="pronounced" type="current_date_time"/> + <action function="say" data="$1" method="pronounced" type="current_date_time"/> </match> </input> </macro> Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g726/libg726.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g726/libg726.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g726/libg726.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -48,7 +48,6 @@ UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -109,7 +108,6 @@ UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g7xx/libg7xx.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g7xx/libg7xx.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g7xx/libg7xx.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -49,7 +49,6 @@ UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -110,7 +109,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/gsm/libgsm.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/gsm/libgsm.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/gsm/libgsm.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -48,7 +48,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" DisableSpecificWarnings="4131;4100" /> @@ -110,7 +109,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" DisableSpecificWarnings="4131;4100" /> Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/ilbc/libilbc.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/ilbc/libilbc.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/ilbc/libilbc.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -47,7 +47,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -107,7 +106,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/curl/lib/config.h.in ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/curl/lib/config.h.in (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/curl/lib/config.h.in Fri Dec 14 11:55:00 2007 @@ -621,16 +621,16 @@ /* Define to the function return type for send. */ #undef SEND_TYPE_RETV -/* The size of `curl_off_t', as computed by sizeof. */ +/* The size of a `curl_off_t', as computed by sizeof. */ #undef SIZEOF_CURL_OFF_T -/* The size of `long', as computed by sizeof. */ +/* The size of a `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of `size_t', as computed by sizeof. */ +/* The size of a `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of `time_t', as computed by sizeof. */ +/* The size of a `time_t', as computed by sizeof. */ #undef SIZEOF_TIME_T /* Define to 1 if you have the ANSI C header files. */ @@ -685,7 +685,7 @@ /* type to use in place of in_addr_t if not defined */ #undef in_addr_t -/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t /* type to use in place of socklen_t if not defined */ Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/iax/libiax2.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/iax/libiax2.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/iax/libiax2.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -48,7 +48,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -108,7 +107,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/libdingaling/libdingaling.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/libdingaling/libdingaling.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/libdingaling/libdingaling.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -48,7 +48,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" DisableSpecificWarnings="4100;4706" /> @@ -110,7 +109,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" DisableSpecificWarnings="4100" /> @@ -174,7 +172,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" - Detect64BitPortabilityProblems="true" DebugInformationFormat="4" DisableSpecificWarnings="4100" /> @@ -251,7 +248,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" DisableSpecificWarnings="4100" /> Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/libteletone/libteletone.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/libteletone/libteletone.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/libteletone/libteletone.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -49,7 +49,6 @@ UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool @@ -66,7 +65,6 @@ ModuleDefinitionFile="$(InputDir)teletone.def" OptimizeReferences="1" EnableCOMDATFolding="1" - OptimizeForWindows98="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" ImportLibrary="$(IntDir)/$(TargetName).lib" @@ -124,7 +122,6 @@ UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/srtp/libsrtp.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/srtp/libsrtp.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/srtp/libsrtp.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -55,7 +55,6 @@ UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -123,7 +122,6 @@ UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -194,7 +192,6 @@ UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool @@ -276,7 +273,6 @@ UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/howl/libmDNSResponder.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/howl/libmDNSResponder.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/howl/libmDNSResponder.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -48,7 +48,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="0" - Detect64BitPortabilityProblems="true" DebugInformationFormat="4" CallingConvention="2" /> @@ -115,7 +114,6 @@ EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="0" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CallingConvention="2" /> Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/libsndfile/libsndfile.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/libsndfile/libsndfile.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/libsndfile/libsndfile.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -49,7 +49,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="1" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="1" /> @@ -112,7 +111,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="1" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="1" /> Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -49,7 +49,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool @@ -125,7 +124,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -56,7 +56,6 @@ WarningLevel="4" WarnAsError="true" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -135,7 +134,6 @@ WarningLevel="4" WarnAsError="true" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sqlite/sqlite.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sqlite/sqlite.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sqlite/sqlite.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -49,7 +49,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="0" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -111,7 +110,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="0" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -177,7 +175,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="0" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -254,7 +251,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="0" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/udns/libudns.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/udns/libudns.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/udns/libudns.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -47,7 +47,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -108,7 +107,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/xmlrpc-c/lib/abyss/src/data.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/xmlrpc-c/lib/abyss/src/data.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/xmlrpc-c/lib/abyss/src/data.c Fri Dec 14 11:55:00 2007 @@ -42,6 +42,7 @@ #include "token.h" +#define safe_free(it) if (it) {free(it);it=NULL;} /********************************************************************* ** List *********************************************************************/ @@ -69,10 +70,10 @@ if (sl->autofree) { unsigned int i; for (i = sl->size; i > 0; --i) - free(sl->item[i-1]); + safe_free(sl->item[i-1]); } - free(sl->item); + safe_free(sl->item); } sl->item = NULL; sl->size = 0; @@ -87,7 +88,7 @@ if (sl->item) { unsigned int i; for (i = sl->size; i > 0; --i) - free(sl->item[i-1]); + safe_free(sl->item[i-1]); } } @@ -215,7 +216,7 @@ /* ************** Implement the static buffers ***/ } else - free(buf->data); + safe_free(buf->data); buf->size=0; buf->staticid=0; @@ -348,11 +349,11 @@ if (t->size) for (i=t->size;i>0;i--) { - free(t->item[i-1].name); - free(t->item[i-1].value); + safe_free(t->item[i-1].name); + safe_free(t->item[i-1].value); }; - free(t->item); + safe_free(t->item); } TableInit(t); @@ -382,12 +383,12 @@ if (TableFindIndex(t,name,&i)) { - free(t->item[i].value); + safe_free(t->item[i].value); if (value) t->item[i].value=strdup(value); else { - free(t->item[i].name); + safe_free(t->item[i].name); if (--t->size>0) t->item[i]=t->item[t->size]; }; @@ -521,7 +522,7 @@ while (pz) { npz=pz->next; - free(pz); + safe_free(pz); pz=npz; }; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_bitpack.h Fri Dec 14 11:55:00 2007 @@ -99,12 +99,14 @@ pack->bits_cur = pack->over; if (pack->mode == SWITCH_BITPACK_MODE_RFC3551) { + switch_assert(pack->over <= 8); this_byte &= SWITCH_BITPACKED_MASKS[pack->over]; this_byte <<= pack->under; *pack->cur |= this_byte; pack->cur++; } else { switch_byte_t mask = SWITCH_BITS_PER_BYTE - pack->over; + switch_assert(mask < 8); /* if pack->over this will allways be true */ this_byte &= SWITCH_REVERSE_BITPACKED_MASKS[mask]; this_byte >>= mask; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_ivr.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_ivr.h Fri Dec 14 11:55:00 2007 @@ -719,6 +719,7 @@ switch_input_args_t *args); SWITCH_DECLARE(void) switch_ivr_delay_echo(switch_core_session_t *session, uint32_t delay_ms); SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid); +SWITCH_DECLARE(void) switch_ivr_park_session(switch_core_session_t *session); /** @} */ Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_module_interfaces.h Fri Dec 14 11:55:00 2007 @@ -53,6 +53,7 @@ SWITCH_SHN_ON_HANGUP, SWITCH_SHN_ON_LOOPBACK, SWITCH_SHN_ON_TRANSMIT, + SWITCH_SHN_ON_PARK, SWITCH_SHN_ON_HOLD, SWITCH_SHN_ON_HIBERNATE, SWITCH_SHN_ON_RESET @@ -71,6 +72,8 @@ switch_state_handler_t on_loopback; /*! executed when the state changes to transmit */ switch_state_handler_t on_transmit; + /*! executed when the state changes to park */ + switch_state_handler_t on_park; /*! executed when the state changes to hold */ switch_state_handler_t on_hold; /*! executed when the state changes to hibernate */ Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_types.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_types.h Fri Dec 14 11:55:00 2007 @@ -560,6 +560,7 @@ CS_TRANSMIT - Channel is in a passive transmit state CS_EXECUTE - Channel is executing it's dialplan CS_LOOPBACK - Channel is in loopback +CS_PARK - Channel is parked CS_HOLD - Channel is on hold CS_HIBERNATE - Channel is in a sleep state CS_RESET - Channel is in a reset state @@ -574,6 +575,7 @@ CS_TRANSMIT, CS_EXECUTE, CS_LOOPBACK, + CS_PARK, CS_HOLD, CS_HIBERNATE, CS_RESET, Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Dec 14 11:55:00 2007 @@ -685,6 +685,29 @@ return SWITCH_STATUS_SUCCESS; } + +#define PARK_SYNTAX "<uuid>" +SWITCH_STANDARD_API(park_function) +{ + switch_core_session_t *ksession = NULL; + + if (session) { + return SWITCH_STATUS_FALSE; + } + + if (!cmd) { + stream->write_function(stream, "-USAGE: %s\n", PARK_SYNTAX); + } else if ((ksession = switch_core_session_locate(cmd))) { + switch_ivr_park_session(ksession); + switch_core_session_rwunlock(ksession); + stream->write_function(stream, "+OK\n"); + } else { + stream->write_function(stream, "-ERR No Such Channel!\n"); + } + + return SWITCH_STATUS_SUCCESS; +} + #define TRANSFER_SYNTAX "<uuid> [-bleg|-both] <dest-exten> [<dialplan>] [<context>]" SWITCH_STANDARD_API(transfer_function) { @@ -1994,11 +2017,14 @@ SWITCH_ADD_API(commands_api_interface, "originate", "Originate a Call", originate_function, ORIGINATE_SYNTAX); SWITCH_ADD_API(commands_api_interface, "tone_detect", "Start Tone Detection on a channel", tone_detect_session_function, TONE_DETECT_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "killchan", "Kill Channel", kill_function, KILL_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "killchan", "Kill Channel (depricated)", kill_function, KILL_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_kill", "Kill Channel", kill_function, KILL_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_park", "Park Channel", park_function, PARK_SYNTAX); SWITCH_ADD_API(commands_api_interface, "reloadxml", "Reload XML", reload_function, ""); SWITCH_ADD_API(commands_api_interface, "unload", "Unload Module", unload_function, LOAD_SYNTAX); SWITCH_ADD_API(commands_api_interface, "load", "Load Module", load_function, LOAD_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "transfer", "Transfer Module", transfer_function, TRANSFER_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "transfer", "Transfer (depricated)", transfer_function, TRANSFER_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_transfer", "Transfer a session", transfer_function, TRANSFER_SYNTAX); SWITCH_ADD_API(commands_api_interface, "pause", "Pause", pause_function, PAUSE_SYNTAX); SWITCH_ADD_API(commands_api_interface, "break", "Break", break_function, BREAK_SYNTAX); SWITCH_ADD_API(commands_api_interface, "show", "Show", show_function, SHOW_SYNTAX); @@ -2008,11 +2034,17 @@ SWITCH_ADD_API(commands_api_interface, "uuid_getvar", "uuid_getvar", uuid_getvar_function, GETVAR_SYNTAX); SWITCH_ADD_API(commands_api_interface, "global_setvar", "global_setvar", global_setvar_function, GLOBAL_SETVAR_SYNTAX); SWITCH_ADD_API(commands_api_interface, "global_getvar", "global_getvar", global_getvar_function, GLOBAL_GETVAR_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "session_displace", "session displace", session_displace_function, "<uuid> [start|stop] <path> [<limit>] [mux]"); - SWITCH_ADD_API(commands_api_interface, "session_record", "session record", session_record_function, SESS_REC_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "broadcast", "broadcast", uuid_broadcast_function, BROADCAST_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "hold", "hold", uuid_hold_function, HOLD_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "media", "media", uuid_media_function, MEDIA_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "session_displace", "session displace (depricated)", + session_displace_function, "<uuid> [start|stop] <path> [<limit>] [mux]"); + SWITCH_ADD_API(commands_api_interface, "uuid_displace", "session displace", session_displace_function, "<uuid> [start|stop] <path> [<limit>] [mux]"); + SWITCH_ADD_API(commands_api_interface, "session_record", "session record (depricated)", session_record_function, SESS_REC_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_record", "session record", session_record_function, SESS_REC_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "broadcast", "broadcast (depricated)", uuid_broadcast_function, BROADCAST_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_broadcast", "broadcast", uuid_broadcast_function, BROADCAST_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "hold", "hold (depricated)", uuid_hold_function, HOLD_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_hold", "hold", uuid_hold_function, HOLD_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "media", "media (depricated)", uuid_media_function, MEDIA_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid media", "media", uuid_media_function, MEDIA_SYNTAX); SWITCH_ADD_API(commands_api_interface, "fsctl", "control messages", ctl_function, CTL_SYNTAX); SWITCH_ADD_API(commands_api_interface, "help", "Show help for all the api commands", help_function, ""); SWITCH_ADD_API(commands_api_interface, "version", "Show version of the switch", version_function, ""); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri Dec 14 11:55:00 2007 @@ -1027,6 +1027,12 @@ } +SWITCH_STANDARD_APP(park_state_function) +{ + switch_ivr_park_session(session); + +} + /********************************************************************************/ /* Playback/Record Functions */ /********************************************************************************/ @@ -1637,7 +1643,8 @@ SWITCH_ADD_APP(app_interface, "fax_detect", "Detect faxes", "Detect fax send tone", fax_detect_session_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "tone_detect", "Detect tones", "Detect tones", tone_detect_session_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "echo", "Echo", "Perform an echo test against the calling channel", echo_function, "", SAF_NONE); - SWITCH_ADD_APP(app_interface, "park", NULL, NULL, park_function, NULL, SAF_NONE); + SWITCH_ADD_APP(app_interface, "park", "Park", "Park", park_function, "", SAF_NONE); + SWITCH_ADD_APP(app_interface, "park_state", "Park State", "Park State", park_state_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "gentones", "Generate Tones", "Generate tones to the channel", gentones_function, "<tgml_script>[|<loops>]", SAF_NONE); SWITCH_ADD_APP(app_interface, "playback", "Playback File", "Playback a file to the channel", playback_function, "<path>", SAF_NONE); SWITCH_ADD_APP(app_interface, "stop_record_session", "Stop Record Session", STOP_SESS_REC_DESC, stop_record_session_function, "<path>", SAF_NONE); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Dec 14 11:55:00 2007 @@ -1361,6 +1361,8 @@ listen_callback_t cbt; char sql[256]; int cur_message, total_messages; + switch_event_t *event; + message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); memset(&cbt, 0, sizeof(cbt)); @@ -1402,6 +1404,26 @@ switch_snprintf(sql, sizeof(sql), "delete from voicemail_data where user='%s' and domain='%s' and flags='delete'", myid, domain_name); vm_execute_sql(profile, sql, profile->mutex); vm_check_state = VM_CHECK_FOLDER_SUMMARY; + + + message_count(profile, id, domain_name, myfolder, &total_new_messages, &total_saved_messages, + &total_new_urgent_messages, &total_saved_urgent_messages); + + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { + char *mwi_id; + const char *yn = "no"; + if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + yn = "yes"; + } + mwi_id = switch_mprintf("%s@%s", myid, domain_name); + switch_assert(mwi_id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "%s", yn); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", mwi_id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", + total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); + switch_event_fire(&event); + switch_safe_free(mwi_id); + } } break; case VM_CHECK_CONFIG: @@ -1907,8 +1929,12 @@ &total_new_urgent_messages, &total_saved_urgent_messages); if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { + const char *yn = "no"; + if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + yn = "yes"; + } mwi_id = switch_mprintf("%s@%s", id, domain_name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "yes"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "%s", yn); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", mwi_id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); @@ -2152,7 +2178,7 @@ id = strdup(account); } assert(id); - + if ((domain = strchr(id, '@'))) { *domain++ = '\0'; for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { @@ -2163,7 +2189,11 @@ &total_new_urgent_messages, &total_saved_urgent_messages); if (total_new_messages || total_saved_messages) { if (switch_event_create(&new_event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "yes"); + const char *yn = "no"; + if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + yn = "yes"; + } + switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "%s", yn); switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", account); switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Fri Dec 14 11:55:00 2007 @@ -185,7 +185,7 @@ char *pattern = NULL; char *pri = NULL; char *app = NULL; - char *arg = NULL; + char *argument = NULL; char *expression = NULL, expression_buf[1024] = ""; char substituted[2048] = ""; char *field_data = caller_profile->destination_number; @@ -206,7 +206,7 @@ if (!strcasecmp(var, "exten")) { char *p; - if ((p = strchr(pattern, '/'))) { + if (pattern && (p = strchr(pattern, '/'))) { *p++ = '\0'; cid = pattern; pattern = p; @@ -224,7 +224,7 @@ } } - if (*pattern == '_' || *pattern == '~') { + if (pattern && (*pattern == '_' || *pattern == '~')) { if (*pattern == '_') { pattern++; if (switch_ast2regex(pattern, expression_buf, sizeof(expression_buf))) { @@ -242,7 +242,7 @@ continue; } } else { - if (strcasecmp(pattern, field_data)) { + if (pattern && strcasecmp(pattern, field_data)) { continue; } } @@ -260,24 +260,24 @@ pri = argv[1]; app = argv[2]; - if ((arg = strchr(app, '('))) { + if ((argument = strchr(app, '('))) { char *p; - *arg++ = '\0'; - p = strrchr(arg, ')'); + *argument++ = '\0'; + p = strrchr(argument, ')'); if (p) { *p = '\0'; } - } else if ((arg = strchr(app, ','))) { - *arg++ = '\0'; + } else if ((argument = strchr(app, ','))) { + *argument++ = '\0'; } - if (!arg) { - arg = ""; + if (!argument) { + argument = ""; } if (strchr(expression, '(')) { - switch_perform_substitution(re, proceed, arg, field_data, substituted, sizeof(substituted), ovector); - arg = substituted; + switch_perform_substitution(re, proceed, argument, field_data, substituted, sizeof(substituted), ovector); + argument = substituted; } switch_regex_safe_free(re); @@ -288,7 +288,7 @@ } } - switch_caller_extension_add_application(session, extension, app, arg); + switch_caller_extension_add_application(session, extension, app, argument); } switch_safe_free(field_expanded); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj Fri Dec 14 11:55:00 2007 @@ -22,17 +22,65 @@ CharacterSet="2" > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\tport"" PreprocessorDefinitions="LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" UsePrecompiledHeader="0" DisableSpecificWarnings="4201" /> <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\win32\pthread"" /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" @@ -41,17 +89,65 @@ CharacterSet="2" > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\tport"" PreprocessorDefinitions="LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" UsePrecompiledHeader="0" DisableSpecificWarnings="4201" /> <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\win32\pthread"" /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Dec 14 11:55:00 2007 @@ -295,6 +295,7 @@ char *exp_str = switch_event_get_header(event, "orig-expires"); char *rpid = switch_event_get_header(event, "orig-rpid"); char *call_id = switch_event_get_header(event, "orig-call-id"); + char *user_agent = switch_event_get_header(event, "user-agent"); long expires = (long) time(NULL) + atol(exp_str); char *profile_name = switch_event_get_header(event, "orig-profile-name"); sofia_profile_t *profile = NULL; @@ -317,8 +318,8 @@ sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); switch_safe_free(sql); - sql = switch_mprintf("insert into sip_registrations values ('%q', '%q','%q','%q','Regestered', '%q', %ld)", - call_id, from_user, from_host, contact_str, rpid, expires); + sql = switch_mprintf("insert into sip_registrations values ('%q', '%q','%q','%q','Regestered', '%q', %ld, '%q')", + call_id, from_user, from_host, contact_str, rpid, expires, user_agent); if (sql) { sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); @@ -401,6 +402,7 @@ TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW("SUBSCRIBE")), TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ENABLEMESSAGE(1)), TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence")), + TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("dialog")), TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence.winfo")), TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("message-summary")), SIPTAG_SUPPORTED_STR("100rel, precondition, timer"), SIPTAG_USER_AGENT_STR(profile->user_agent), TAG_END()); @@ -1696,15 +1698,19 @@ switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; uint32_t timeout = 60; char *tuuid_str; + const char *port = refer_to->r_url->url_port; + if (switch_strlen_zero(port)) { + port = "5060"; + } channel = switch_core_session_get_channel(a_session); - + exten = switch_mprintf("sofia/%s/%s@%s:%s", profile->name, refer_to->r_url->url_user, refer_to->r_url->url_host, - refer_to->r_url->url_port); - + port); + switch_channel_set_variable(channel, SOFIA_REPLACES_HEADER, rep); if (switch_ivr_originate(a_session, Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Dec 14 11:55:00 2007 @@ -1878,7 +1878,8 @@ " contact VARCHAR(1024),\n" " status VARCHAR(255),\n" " rpid VARCHAR(255),\n" - " expires INTEGER" + " expires INTEGER,\n" + " user_agent VARCHAR(255)\n" ");\n"; char sub_sql[] = @@ -1893,7 +1894,9 @@ " call_id VARCHAR(255),\n" " full_from VARCHAR(255),\n" " full_via VARCHAR(255),\n" - " expires INTEGER" + " expires INTEGER,\n" + " user_agent VARCHAR(255),\n" + " accept VARCHAR(255)\n" ");\n"; @@ -1915,12 +1918,12 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", profile->odbc_dsn); - if (switch_odbc_handle_exec(profile->master_odbc, "select sip_user from sip_registrations", NULL) != SWITCH_ODBC_SUCCESS) { + if (switch_odbc_handle_exec(profile->master_odbc, "select sip_user,user_agent from sip_registrations", NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_registrations", NULL); switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL); } - if (switch_odbc_handle_exec(profile->master_odbc, "delete from sip_subscriptions where sip_user != ''", NULL) != SWITCH_ODBC_SUCCESS) { + if (switch_odbc_handle_exec(profile->master_odbc, "delete from sip_subscriptions where sip_user != '' or accept != ''", NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_subscriptions", NULL); switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL); } @@ -1937,8 +1940,8 @@ return 0; } - switch_core_db_test_reactive(profile->master_db, "select sip_user from sip_registrations", "DROP TABLE sip_registrations", reg_sql); - switch_core_db_test_reactive(profile->master_db, "delete from sip_subscriptions where sip_user != ''", "DROP TABLE sip_subscriptions", sub_sql); + switch_core_db_test_reactive(profile->master_db, "select sip_user,user_agent from sip_registrations", "DROP TABLE sip_registrations", reg_sql); + switch_core_db_test_reactive(profile->master_db, "delete from sip_subscriptions where sip_user != '' or accept != ''", "DROP TABLE sip_subscriptions", sub_sql); switch_core_db_test_reactive(profile->master_db, "select * from sip_authentication", "DROP TABLE sip_authentication", auth_sql); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Fri Dec 14 11:55:00 2007 @@ -35,6 +35,7 @@ #include "mod_sofia.h" static int sofia_presence_mwi_callback(void *pArg, int argc, char **argv, char **columnNames); +static int sofia_presence_mwi_callback2(void *pArg, int argc, char **argv, char **columnNames); static int sofia_presence_sub_reg_callback(void *pArg, int argc, char **argv, char **columnNames); static int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char **columnNames); static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char **columnNames); @@ -182,7 +183,8 @@ sofia_profile_t *profile = NULL; switch_stream_handle_t stream = { 0 }; switch_event_header_t *hp; - + int count = 0; + switch_assert(event != NULL); if (!(account = switch_event_get_header(event, "mwi-message-account"))) { @@ -224,7 +226,7 @@ sql = switch_mprintf("select *,'%q' from sip_subscriptions where event='message-summary' and sub_to_user='%q' and sub_to_host='%q'", stream.data, user, host); - switch_safe_free(stream.data); + switch_assert (sql != NULL); sofia_glue_execute_sql_callback(profile, @@ -232,9 +234,31 @@ profile->ireg_mutex, sql, sofia_presence_mwi_callback, - profile); + &count); switch_safe_free(sql); + + + if (!count) { + sql = switch_mprintf("select *,'%q' from sip_registrations where sip_user='%q' and sip_host='%q'", + stream.data, user, host); + + + + switch_assert (sql != NULL); + sofia_glue_execute_sql_callback(profile, + SWITCH_FALSE, + profile->ireg_mutex, + sql, + sofia_presence_mwi_callback2, + profile); + + switch_safe_free(sql); + } + + + switch_safe_free(stream.data); + switch_safe_free(dup_account); if (profile) { sofia_glue_release_profile(profile); @@ -508,9 +532,9 @@ sofia_profile_t *profile = (sofia_profile_t *) pArg; char *pl; char *id, *note; - uint32_t in = atoi(argv[11]); - char *status = argv[12]; - char *rpid = argv[13]; + uint32_t in = atoi(argv[13]); + char *status = argv[14]; + char *rpid = argv[15]; char *proto = argv[0]; char *user = argv[1]; @@ -616,13 +640,14 @@ //char *full_from = argv[8]; //char *full_via = argv[9]; char *expires = argv[10]; - char *body = argv[11]; + char *body = argv[13]; char *exp; sofia_profile_t *profile = NULL; char *id = NULL; nua_handle_t *nh; int expire_sec = atoi(expires); - + int *total = (int *) pArg; + if (!(profile = sofia_glue_find_profile(sub_to_host))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", sub_to_host); return 0; @@ -643,12 +668,53 @@ nua_notify(nh, SIPTAG_SUBSCRIPTION_STATE_STR(exp), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), SIPTAG_PAYLOAD_STR(body), TAG_END()); - + switch_safe_free(id); switch_safe_free(exp); sofia_glue_release_profile(profile); + (*total)++; + return 0; +} + + + +static int sofia_presence_mwi_callback2(void *pArg, int argc, char **argv, char **columnNames) +{ + char *sub_to_user = argv[1]; + char *sub_to_host = argv[2]; + char *event = "message-summary"; + char *body = argv[7]; + sofia_profile_t *profile = NULL; + char *id = NULL; + nua_handle_t *nh; + char *contact; + + if (!(profile = sofia_glue_find_profile(sub_to_host))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", sub_to_host); + return 0; + } + + id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); + + contact = sofia_glue_get_url_from_contact(argv[3], 0); + + nh = nua_handle(profile->nua, NULL, + NUTAG_URL(contact), + SIPTAG_FROM_STR(id), + SIPTAG_TO_STR(id), + SIPTAG_CONTACT_STR(profile->url), + TAG_END()); + + nua_notify(nh, + NUTAG_NEWSUB(1), + SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), SIPTAG_PAYLOAD_STR(body), TAG_END()); + + switch_safe_free(id); + + sofia_glue_release_profile(profile); + return 0; } @@ -672,6 +738,8 @@ char *to_str = NULL; char *full_from = NULL; char *full_via = NULL; + char *full_agent = NULL; + char *full_accept = NULL; char *sstr; const char *display = "\"user\""; switch_event_t *sevent; @@ -800,8 +868,11 @@ sstr = switch_mprintf("terminated"); switch_core_hash_delete(profile->sub_hash, call_id); } else { - sql = switch_mprintf("insert into sip_subscriptions values ('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld)", - proto, from_user, from_host, to_user, to_host, event, contact_str, call_id, full_from, full_via, exp); + full_agent = sip_header_as_string(profile->home, (void *) sip->sip_user_agent); + full_accept = sip_header_as_string(profile->home, (void *) sip->sip_accept); + sql = switch_mprintf("insert into sip_subscriptions values ('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld,'%q','%q')", + proto, from_user, from_host, to_user, to_host, event, + contact_str, call_id, full_from, full_via, exp, full_agent, full_accept); switch_assert(sql != NULL); sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); @@ -820,7 +891,9 @@ SIPTAG_CONTACT_STR(contact_str), TAG_END()); - nua_notify(nh, SIPTAG_EVENT_STR(event), TAG_END()); + nua_notify(nh, SIPTAG_SUBSCRIPTION_STATE_STR(sstr), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/octet-stream"), + SIPTAG_PAYLOAD_STR("Come to ClueCon http://www.cluecon.com\n\n"), + TAG_END()); switch_safe_free(sstr); @@ -846,6 +919,12 @@ if (full_via) { su_free(profile->home, full_via); } + if (full_agent) { + su_free(profile->home, full_agent); + } + if (full_accept) { + su_free(profile->home, full_accept); + } switch_safe_free(d_user); switch_safe_free(to_str); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Dec 14 11:55:00 2007 @@ -176,12 +176,13 @@ if (argc >= 3) { if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_EXPIRE) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", argv[0]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "call-id", "%s", argv[1]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "user", "%s", argv[2]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "host", "%s", argv[3]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "contact", "%s", argv[4]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%s", argv[5]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", argv[6]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "call-id", "%s", argv[0]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "user", "%s", argv[1]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "host", "%s", argv[2]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "contact", "%s", argv[3]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%s", argv[4]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "user-agent", "%s", argv[5]); switch_event_fire(&s_event); } } @@ -210,9 +211,9 @@ #endif if (now) { - switch_snprintf(sql, sizeof(sql), "select '%s',* from sip_registrations where expires > 0 and expires <= %ld", profile->name, (long) now); + switch_snprintf(sql, sizeof(sql), "select *,'%s' from sip_registrations where expires > 0 and expires <= %ld", profile->name, (long) now); } else { - switch_snprintf(sql, sizeof(sql), "select '%s',* from sip_registrations where expires > 0", profile->name); + switch_snprintf(sql, sizeof(sql), "select *,'%s' from sip_registrations where expires > 0", profile->name); } switch_mutex_lock(profile->ireg_mutex); @@ -477,6 +478,11 @@ if (exptime) { + const char *agent = "dunno"; + + if (sip->sip_user_agent) { + agent = sip->sip_user_agent->g_string; + } if (sofia_test_pflag(profile, PFLAG_MULTIREG)) { sql = switch_mprintf("delete from sip_registrations where call_id='%q'", call_id); @@ -487,8 +493,9 @@ sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); switch_safe_free(sql); - sql = switch_mprintf("insert into sip_registrations values ('%q', '%q','%q','%q','%q', '%q', %ld)", call_id, - to_user, to_host, contact_str, cd ? "Registered(NATHACK)" : "Registered", rpid, (long) time(NULL) + (long) exptime * 2); + sql = switch_mprintf("insert into sip_registrations values ('%q', '%q','%q','%q','%q', '%q', %ld, '%q')", call_id, + to_user, to_host, contact_str, cd ? "Registered(NATHACK)" : "Registered", + rpid, (long) time(NULL) + (long) exptime * 2, agent); if (sql) { @@ -591,6 +598,10 @@ new_contact = switch_mprintf("%s;expires=%ld", contact_str, (long)exptime); nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT_STR(new_contact), NUTAG_WITH_THIS(nua), TAG_END()); switch_safe_free(new_contact); + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", to_user, to_host); + switch_event_fire(&event); + } } else { nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(contact), NUTAG_WITH_THIS(nua), TAG_END()); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Fri Dec 14 11:55:00 2007 @@ -31,7 +31,7 @@ */ #include <switch.h> /* for apr_pstrcat */ - +#define DEFAULT_PREBUFFER_SIZE 1024 * 16 SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load); SWITCH_MODULE_DEFINITION(mod_local_stream, mod_local_stream_load, NULL, NULL); @@ -62,10 +62,11 @@ uint8_t channels; int rate; int interval; - int samples; + switch_size_t samples; uint32_t prebuf; char *timer_name; local_stream_context_t *context_list; + int total; switch_dir_t *dir_handle; switch_mutex_t *mutex; switch_memory_pool_t *pool; @@ -80,13 +81,18 @@ char file_buf[128] = "", path_buf[512] = ""; switch_timer_t timer = {0}; int fd = -1; + switch_buffer_t *audio_buffer; + switch_byte_t *dist_buf; + switch_size_t used; + - if (switch_core_timer_init(&timer, source->timer_name, source->interval, source->samples, source->pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't start timer.\n"); - return NULL; + if (!source->prebuf) { + source->prebuf = DEFAULT_PREBUFFER_SIZE; } - + switch_buffer_create_dynamic(&audio_buffer, 1024, source->prebuf + 10, 0); + dist_buf = switch_core_alloc(source->pool, source->prebuf + 10); + while(RUNNING) { const char *fname; @@ -144,7 +150,16 @@ continue; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Playing %s\n", fname); + source->rate = fh.samplerate; + source->samples = switch_bytes_per_frame(fh.native_rate, source->interval); + + if (switch_core_timer_init(&timer, source->timer_name, source->interval, source->samples, source->pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't start timer.\n"); + return NULL; + } + + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Playing %s rate: %d\n", fname, source->rate); while (RUNNING) { switch_core_timer_next(&timer); @@ -154,16 +169,26 @@ switch_core_file_close(&fh); break; } - - switch_mutex_lock(source->mutex); - for (cp = source->context_list; cp; cp = cp->next) { - switch_mutex_lock(cp->audio_mutex); - switch_buffer_write(cp->audio_buffer, abuf, olen * 2); - switch_mutex_unlock(cp->audio_mutex); + + switch_buffer_write(audio_buffer, abuf, olen * 2); + used = switch_buffer_inuse(audio_buffer); + + if (used >= source->prebuf || (source->total && used > source->samples * 2)) { + used = switch_buffer_read(audio_buffer, dist_buf, source->samples * 2); + if (source->total) { + switch_mutex_lock(source->mutex); + for (cp = source->context_list; cp; cp = cp->next) { + switch_mutex_lock(cp->audio_mutex); + switch_buffer_write(cp->audio_buffer, dist_buf, used); + switch_mutex_unlock(cp->audio_mutex); + } + switch_mutex_unlock(source->mutex); + } } - switch_mutex_unlock(source->mutex); } + switch_core_timer_destroy(&timer); + } switch_dir_close(source->dir_handle); @@ -238,6 +263,7 @@ switch_mutex_lock(source->mutex); context->next = source->context_list; source->context_list = context; + source->total++; switch_mutex_unlock(source->mutex); end: @@ -261,6 +287,7 @@ } last = cp; } + context->source->total--; switch_mutex_unlock(context->source->mutex); switch_buffer_destroy(&context->audio_buffer); @@ -274,23 +301,45 @@ static switch_status_t local_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len) { + local_stream_context_t *context = handle->private_info; + switch_size_t bytes = 0; + size_t need = *len * 2; + + switch_mutex_lock(context->audio_mutex); + if ((bytes = switch_buffer_read(context->audio_buffer, data, need))) { + *len = bytes / 2; + } else { + if (need > 2560) { + need = 2560; + } + memset(data, 255, need); + *len = need / 2; + } + switch_mutex_unlock(context->audio_mutex); + handle->sample_count += *len; + return SWITCH_STATUS_SUCCESS; +#if 0 local_stream_context_t *context = handle->private_info; switch_size_t bytes = 0; size_t need = *len * 2; + switch_mutex_lock(context->audio_mutex); if ((bytes = switch_buffer_read(context->audio_buffer, data, need))) { *len = bytes / 2; } else { - if (need > 2560) { - need = 2560; + if (need > context->source->samples * 2) { + need = context->source->samples * 2; } - memset(data, 255, need); - *len = need / 2; + + memset(data, 0, need); + *len = need / 2; } switch_mutex_unlock(context->audio_mutex); + handle->sample_count += *len; return SWITCH_STATUS_SUCCESS; +#endif } static switch_status_t local_stream_file_write(switch_file_handle_t *handle, void *data, size_t *len) @@ -351,7 +400,7 @@ source->interval = 20; source->channels = 1; source->timer_name = "soft"; - + source->prebuf = DEFAULT_PREBUFFER_SIZE; for (param = switch_xml_child(directory, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -53,7 +53,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=""..\..\..\..\libs\win32\js\debug\js32.lib" "..\..\..\..\libs\win32\apr\debug\libapr-1.lib" "..\..\..\..\w32\library\debug\freeswitchcore.lib" "..\..\..\..\libs\win32\debug\libetpan.lib" "..\mod_spidermonkey\debug\mod_spidermonkey.lib"" AdditionalLibraryDirectories="" RandomizedBaseAddress="1" DataExecutionPrevention="0" Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj Fri Dec 14 11:55:00 2007 @@ -43,7 +43,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=""..\..\..\..\libs\win32\js\debug\js32.lib" "..\..\..\..\libs\win32\apr\debug\libapr-1.lib" "..\..\..\..\w32\library\debug\freeswitchcore.lib" "..\..\..\..\libs\win32\debug\libetpan.lib" "..\mod_spidermonkey\debug\mod_spidermonkey.lib"" AdditionalLibraryDirectories="" /> </Configuration> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Fri Dec 14 11:55:00 2007 @@ -110,6 +110,9 @@ struct curl_slist *slist = NULL; long httpRes = 0; struct curl_slist *headers = NULL; + char hostname[256] = ""; + + gethostname(hostname, sizeof(hostname)); if (!binding) { return NULL; @@ -125,7 +128,8 @@ return xml; } - if (!(data = switch_mprintf("section=%s&tag_name=%s&key_name=%s&key_value=%s%s%s", + if (!(data = switch_mprintf("hostname=%s§ion=%s&tag_name=%s&key_name=%s&key_value=%s%s%s", + hostname, section, tag_name ? tag_name : "", key_name ? key_name : "", Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_channel.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_channel.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_channel.c Fri Dec 14 11:55:00 2007 @@ -553,6 +553,7 @@ "CS_TRANSMIT", "CS_EXECUTE", "CS_LOOPBACK", + "CS_PARK", "CS_HOLD", "CS_HIBERNATE", "CS_RESET", @@ -666,6 +667,7 @@ case CS_TRANSMIT: case CS_RING: case CS_EXECUTE: + case CS_PARK: case CS_HOLD: case CS_HIBERNATE: case CS_RESET: @@ -680,6 +682,7 @@ case CS_TRANSMIT: case CS_RING: case CS_EXECUTE: + case CS_PARK: case CS_HOLD: case CS_HIBERNATE: case CS_RESET: @@ -694,6 +697,7 @@ case CS_LOOPBACK: case CS_RING: case CS_EXECUTE: + case CS_PARK: case CS_HOLD: case CS_HIBERNATE: case CS_RESET: @@ -703,6 +707,21 @@ } break; + case CS_PARK: + switch (state) { + case CS_LOOPBACK: + case CS_RING: + case CS_EXECUTE: + case CS_TRANSMIT: + case CS_HIBERNATE: + case CS_RESET: + case CS_HOLD: + ok++; + default: + break; + } + break; + case CS_HOLD: switch (state) { case CS_LOOPBACK: @@ -711,6 +730,7 @@ case CS_TRANSMIT: case CS_HIBERNATE: case CS_RESET: + case CS_PARK: ok++; default: break; @@ -723,6 +743,7 @@ case CS_RING: case CS_EXECUTE: case CS_TRANSMIT: + case CS_PARK: case CS_HOLD: case CS_RESET: ok++; @@ -737,6 +758,7 @@ case CS_LOOPBACK: case CS_EXECUTE: case CS_TRANSMIT: + case CS_PARK: case CS_HOLD: case CS_HIBERNATE: case CS_RESET: @@ -751,6 +773,7 @@ case CS_LOOPBACK: case CS_TRANSMIT: case CS_RING: + case CS_PARK: case CS_HOLD: case CS_HIBERNATE: case CS_RESET: Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c Fri Dec 14 11:55:00 2007 @@ -95,7 +95,7 @@ fh->native_rate = rate; } - if (fh->samplerate != rate) { + if (fh->samplerate && rate && fh->samplerate != rate) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Sample rate doesn't match\n"); if ((flags & SWITCH_FILE_FLAG_READ)) { fh->samplerate = rate; @@ -130,7 +130,7 @@ fh->native_rate, orig_len * 10, fh->samplerate, - orig_len * 10, + (uint32_t)orig_len * 10, fh->memory_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n"); return SWITCH_STATUS_GENERR; @@ -180,7 +180,7 @@ fh->native_rate, orig_len * 10, fh->samplerate, - orig_len * 10, + (uint32_t)orig_len * 10, fh->memory_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n"); return SWITCH_STATUS_GENERR; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_state_machine.c Fri Dec 14 11:55:00 2007 @@ -205,6 +205,15 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard TRANSMIT\n"); } +static void switch_core_standard_on_park(switch_core_session_t *session) +{ + switch_assert(session != NULL); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard PARK\n"); + switch_channel_clear_flag(session->channel, CF_TRANSFER); + switch_core_session_reset(session); + switch_ivr_park(session, NULL); +} + static void switch_core_standard_on_hold(switch_core_session_t *session) { switch_assert(session != NULL); @@ -419,6 +428,9 @@ case CS_TRANSMIT: /* send/recieve data to/from another channel */ STATE_MACRO(transmit, "TRANSMIT"); break; + case CS_PARK: /* wait in limbo */ + STATE_MACRO(park, "PARK"); + break; case CS_HOLD: /* wait in limbo */ STATE_MACRO(hold, "HOLD"); break; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr.c Fri Dec 14 11:55:00 2007 @@ -1494,6 +1494,13 @@ return SWITCH_STATUS_FALSE; } +SWITCH_DECLARE(void) switch_ivr_park_session(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_set_state_flag(channel, CF_TRANSFER); + switch_channel_set_state(channel, CS_PARK); +} + SWITCH_DECLARE(void) switch_ivr_delay_echo(switch_core_session_t *session, uint32_t delay_ms) { stfu_instance_t *jb; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_rtp.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_rtp.c Fri Dec 14 11:55:00 2007 @@ -310,7 +310,7 @@ return END_PORT; } -static void release_port(const char *host, int port) +static void release_port(const char *host, switch_port_t port) { switch_core_port_allocator_t *alloc = NULL; @@ -335,8 +335,7 @@ alloc = switch_core_hash_find(alloc_hash, ip); if (!alloc) { if (switch_core_port_allocator_new(START_PORT, END_PORT, SPF_EVEN, &alloc) != SWITCH_STATUS_SUCCESS) { - port = 0; - goto end; + abort(); } switch_core_hash_insert(alloc_hash, ip, alloc); @@ -346,7 +345,6 @@ port = 0; } - end: switch_mutex_unlock(port_lock); return port; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/w32/Console/FreeSwitchConsole.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/w32/Console/FreeSwitchConsole.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/w32/Console/FreeSwitchConsole.2008.vcproj Fri Dec 14 11:55:00 2007 @@ -51,7 +51,6 @@ UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -129,7 +128,6 @@ UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool