- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3889 - in freeswitch/trunk: . libs/win32/sofia src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Jan '07

02 Jan '07

Author: mikej Date: Tue Jan 2 10:20:18 2007 New Revision: 3889 Modified: freeswitch/trunk/Freeswitch.sln freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj Log: update windows build to use in tree sofia-sip Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Tue Jan 2 10:20:18 2007 @@ -445,13 +445,10 @@ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SOFIA", "libs\win32\Download SOFIA.vcproj", "{8B2CE7D1-77EF-45ED-927D-82147805440B}" -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} - {8B2CE7D1-77EF-45ED-927D-82147805440B} = {8B2CE7D1-77EF-45ED-927D-82147805440B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.vcproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}" @@ -830,10 +827,6 @@ {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Debug|Win32.Build.0 = Debug|Win32 {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Release|Win32.ActiveCfg = Release|Win32 {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Release|Win32.Build.0 = Release|Win32 - {8B2CE7D1-77EF-45ED-927D-82147805440B}.Debug|Win32.ActiveCfg = Debug|Win32 - {8B2CE7D1-77EF-45ED-927D-82147805440B}.Debug|Win32.Build.0 = Debug|Win32 - {8B2CE7D1-77EF-45ED-927D-82147805440B}.Release|Win32.ActiveCfg = Release|Win32 - {8B2CE7D1-77EF-45ED-927D-82147805440B}.Release|Win32.Build.0 = Release|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.ActiveCfg = Debug|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.Build.0 = Debug|Win32 {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Release|Win32.ActiveCfg = Release|Win32 @@ -977,7 +970,6 @@ {AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} {985135DA-BBE1-42D2-8A85-1F7DF0609B3D} = {C120A020-773F-4EA3-923F-B67AF28B750D} {5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {8B2CE7D1-77EF-45ED-927D-82147805440B} = {C120A020-773F-4EA3-923F-B67AF28B750D} {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D} {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} EndGlobalSection Modified: freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj (original) +++ freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj Tue Jan 2 10:20:18 2007 @@ -26,7 +26,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\sofia-sip-1.12.4\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://svn.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip-1.12.4\win32\"
cd /D "$(ProjectDir)..\..\sofia-sip-1.12.4\win32\"
"autogen.cmd"
" + CommandLine="if not exist "$(ProjectDir)..\..\sofia-sip\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://svn.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip\win32\"
cd /D "$(ProjectDir)..\..\sofia-sip\win32\"
"autogen.cmd"
" /> <Tool Name="VCCustomBuildTool" @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""..\..\sofia-sip-1.12.4\win32";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\su";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\ipt";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\sresolv";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\bnf";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\url";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\http";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\nth";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\nea";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\sdp";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\soa";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\stun";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." + AdditionalIncludeDirectories=""..\..\sofia-sip\win32";"..\..\sofia-sip\libsofia-sip-ua\su";"..\..\sofia-sip\libsofia-sip-ua\ipt";"..\..\sofia-sip\libsofia-sip-ua\sresolv";"..\..\sofia-sip\libsofia-sip-ua\bnf";"..\..\sofia-sip\libsofia-sip-ua\url";"..\..\sofia-sip\libsofia-sip-ua\msg";"..\..\sofia-sip\libsofia-sip-ua\sip";"..\..\sofia-sip\libsofia-sip-ua\nta";"..\..\sofia-sip\libsofia-sip-ua\nua";"..\..\sofia-sip\libsofia-sip-ua\iptsec";"..\..\sofia-sip\libsofia-sip-ua\http";"..\..\sofia-sip\libsofia-sip-ua\nth";"..\..\sofia-sip\libsofia-sip-ua\nea";"..\..\sofia-sip\libsofia-sip-ua\sdp";"..\..\sofia-sip\libsofia-sip-ua\soa";"..\..\sofia-sip\libsofia-sip-ua\stun";"..\..\sofia-sip\libsofia-sip-ua\tport";"..\..\sofia-sip\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -104,7 +104,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\sofia-sip-1.12.4\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://svn.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip-1.12.4\win32\"
cd /D "$(ProjectDir)..\..\sofia-sip-1.12.4\win32\"
"autogen.cmd"
" + CommandLine="if not exist "$(ProjectDir)..\..\sofia-sip\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://svn.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip\win32\"
cd /D "$(ProjectDir)..\..\sofia-sip\win32\"
"autogen.cmd"
" /> <Tool Name="VCCustomBuildTool" @@ -122,7 +122,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""..\..\sofia-sip-1.12.4\win32";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\su";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\ipt";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\sresolv";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\bnf";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\url";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\http";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\nth";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\nea";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\sdp";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\soa";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\stun";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport";"..\..\sofia-sip-1.12.4\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." + AdditionalIncludeDirectories=""..\..\sofia-sip\win32";"..\..\sofia-sip\libsofia-sip-ua\su";"..\..\sofia-sip\libsofia-sip-ua\ipt";"..\..\sofia-sip\libsofia-sip-ua\sresolv";"..\..\sofia-sip\libsofia-sip-ua\bnf";"..\..\sofia-sip\libsofia-sip-ua\url";"..\..\sofia-sip\libsofia-sip-ua\msg";"..\..\sofia-sip\libsofia-sip-ua\sip";"..\..\sofia-sip\libsofia-sip-ua\nta";"..\..\sofia-sip\libsofia-sip-ua\nua";"..\..\sofia-sip\libsofia-sip-ua\iptsec";"..\..\sofia-sip\libsofia-sip-ua\http";"..\..\sofia-sip\libsofia-sip-ua\nth";"..\..\sofia-sip\libsofia-sip-ua\nea";"..\..\sofia-sip\libsofia-sip-ua\sdp";"..\..\sofia-sip\libsofia-sip-ua\soa";"..\..\sofia-sip\libsofia-sip-ua\stun";"..\..\sofia-sip\libsofia-sip-ua\tport";"..\..\sofia-sip\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB" StringPooling="true" RuntimeLibrary="2" @@ -182,247 +182,247 @@ Name="su" Filter="su*.c" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\inet_ntop.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\inet_pton.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_addrinfo.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_alloc.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_alloc_lock.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_bm.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_default_log.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_errno.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_global_log.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_localinfo.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_log.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_md5.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_os_nw.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_port.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_root.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_sprintf.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_strdup.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_strlst.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_tag_io.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_taglist.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_time.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_time0.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_timer.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_uniqueid.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_vector.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_wait.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\inet_ntop.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\inet_pton.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_addrinfo.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_alloc.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_alloc_lock.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_bm.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_default_log.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_errno.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_global_log.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_localinfo.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_log.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_md5.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_os_nw.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_port.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_root.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_sprintf.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_strdup.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_strlst.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_tag_io.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_taglist.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_time.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_time0.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_timer.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_uniqueid.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_vector.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_wait.c"></File> </Filter> <Filter Name="ipt" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\ipt\base64.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\ipt\rc4.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\ipt\string0.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\ipt\token64.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\base64.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\rc4.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\string0.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\token64.c"></File> </Filter> <Filter Name="url" Filter="url*.c" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\url\url.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\url\url_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\url\url_tag_ref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\url\url.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\url\url_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\url\url_tag_ref.c"></File> </Filter> <Filter Name="features" Filter="features*.c" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\features\features.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\features\features.c"></File> </Filter> <Filter Name="bnf" Filter="bnf*.c" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\bnf\bnf.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\bnf\bnf.c"></File> </Filter> <Filter Name="msg" Filter="msg*.c" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_auth.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_basic.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_date.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_generic.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_header_copy.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_header_make.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_mclass.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_mime.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_mime_table.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_parser.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_parser_util.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_auth.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_basic.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_date.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_generic.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_header_copy.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_header_make.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_mclass.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_mime.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_mime_table.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_parser.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_parser_util.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_tag.c"></File> </Filter> <Filter Name="clib replacement" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\memcspn.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\memmem.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\memspn.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\strcasestr.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\strtoull.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\memcspn.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\memmem.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\memspn.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\strcasestr.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\strtoull.c"></File> </Filter> <Filter Name="sip" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_basic.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_caller_prefs.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_event.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_extra.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_feature.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_header.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_mime.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_parser.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_parser_table.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_prack.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_pref_util.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_reason.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_refer.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_security.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_session.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_status.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_tag_class.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_tag_ref.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_time.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_util.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_basic.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_caller_prefs.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_event.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_extra.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_feature.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_header.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_mime.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_parser.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_parser_table.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_prack.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_pref_util.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_reason.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_refer.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_security.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_session.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_status.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_tag_class.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_tag_ref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_time.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_util.c"></File> </Filter> <Filter Name="http" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\http_basic.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\http_extra.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\http_header.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\http_parser.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\http_parser_table.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\http_status.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\http_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\http_tag_class.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\http_tag_ref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_basic.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_extra.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_header.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_parser.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_parser_table.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_status.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_tag_class.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_tag_ref.c"></File> </Filter> <Filter Name="nth" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nth\nth_client.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nth\nth_server.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nth\nth_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nth\nth_tag_ref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nth\nth_client.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nth\nth_server.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nth\nth_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nth\nth_tag_ref.c"></File> </Filter> <Filter Name="sresolv" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sresolv\sres.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sresolv\sres_blocking.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sresolv\sres_cache.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sresolv\sresolv.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sres.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sres_blocking.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sres_cache.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sresolv.c"></File> </Filter> <Filter Name="nea" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nea\nea.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nea\nea_debug.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nea\nea_event.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nea\nea_server.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nea\nea_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nea\nea_tag_ref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea_debug.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea_event.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea_server.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea_tag_ref.c"></File> </Filter> <Filter Name="iptsec" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\auth_client.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\auth_common.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\auth_digest.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\auth_module.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\auth_module_http.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\auth_module_sip.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\auth_plugin.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\auth_plugin_delayed.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\auth_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\auth_tag_ref.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\iptsec_debug.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_client.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_common.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_digest.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_module.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_module_http.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_module_sip.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_plugin.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_plugin_delayed.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_tag_ref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\iptsec_debug.c"></File> </Filter> <Filter Name="stun" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\stun\stun.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\stun\stun_common.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\stun\stun_dns.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\stun\stun_internal.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\stun\stun_mini.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\stun\stun_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\stun\stun_tag_ref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun_common.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun_dns.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun_internal.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun_mini.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun_tag_ref.c"></File> </Filter> <Filter Name="nua" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_common.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_dialog.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_dialog.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_event_server.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_extension.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_message.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_notifier.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_options.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_params.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_params.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_publish.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_register.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_registrar.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_session.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_stack.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_stack.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_subnotref.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\nua_tag_ref.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\outbound.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_common.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_dialog.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_dialog.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_event_server.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_extension.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_message.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_notifier.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_options.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_params.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_params.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_publish.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_register.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_registrar.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_session.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_stack.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_stack.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_subnotref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_tag_ref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\outbound.c"></File> </Filter> <Filter Name="nta" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\nta.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\nta_check.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\nta_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\nta_tag_ref.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\sl_read_payload.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\sl_utils_log.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\sl_utils_print.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\nta.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\nta_check.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\nta_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\nta_tag_ref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sl_read_payload.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sl_utils_log.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sl_utils_print.c"></File> </Filter> <Filter Name="tport" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\tport.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\tport_internal.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\tport_logging.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\tport_stub_sigcomp.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\tport_stub_stun.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\tport_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\tport_tag_ref.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\tport_type_connect.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\tport_type_tcp.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\tport_type_udp.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_internal.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_logging.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_stub_sigcomp.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_stub_stun.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_tag_ref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_type_connect.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_type_tcp.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_type_udp.c"></File> </Filter> <Filter Name="sdp" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sdp\sdp.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sdp\sdp_parse.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sdp\sdp_print.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sdp\sdp_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sdp\sdp_tag_ref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sdp.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sdp_parse.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sdp_print.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sdp_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sdp_tag_ref.c"></File> </Filter> <Filter Name="soa" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\soa\soa.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\soa\sofia-sip\soa_session.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\soa\soa_static.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\soa\soa_tag.c"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\soa\soa_tag_ref.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\soa.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\sofia-sip\soa_session.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\soa_static.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\soa_tag.c"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\soa_tag_ref.c"></File> </Filter> </Filter> <Filter @@ -433,194 +433,194 @@ Name="su headers" Filter="su*.h" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\htable.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\htable2.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\rbtree.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_addrinfo.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_alloc.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_alloc_stat.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_bm.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_config.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_debug.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_errno.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_localinfo.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_log.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_md5.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_module_debug.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_os_nw.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\su_port.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_source.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_strlst.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_tag.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_tag_class.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_tag_inline.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_tag_io.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_tagarg.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_time.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_types.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_uniqueid.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_vector.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\su_wait.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\su\sofia-sip\tstdef.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\htable.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\htable2.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\rbtree.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_addrinfo.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_alloc.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_alloc_stat.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_bm.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_config.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_debug.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_errno.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_localinfo.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_log.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_md5.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_module_debug.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_os_nw.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_port.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_source.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_strlst.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_tag.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_tag_class.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_tag_inline.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_tag_io.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_tagarg.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_time.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_types.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_uniqueid.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_vector.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_wait.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\tstdef.h"></File> </Filter> <Filter Name="win32 headers" > <File RelativePath="..\config.h"></File> - <File RelativePath="..\sofia-sip-1.12.4\su_configure.h"></File> + <File RelativePath="..\sofia-sip\su_configure.h"></File> <File RelativePath="..\unistd.h"></File> </Filter> <Filter Name="ipt headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\ipt\sofia-sip\base64.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\ipt\sofia-sip\rc4.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\ipt\sofia-sip\string0.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\ipt\sofia-sip\token64.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\sofia-sip\base64.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\sofia-sip\rc4.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\sofia-sip\string0.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\sofia-sip\token64.h"></File> </Filter> <Filter Name="url headers" Filter="url*.h" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\url\sofia-sip\url.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\url\sofia-sip\url_tag.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\url\sofia-sip\url_tag_class.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\url\sofia-sip\url.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\url\sofia-sip\url_tag.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\url\sofia-sip\url_tag_class.h"></File> </Filter> <Filter Name="features headers" Filter="features*.h" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\features\sofia-sip\sofia_features.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\features\sofia-sip\sofia_features.h"></File> </Filter> <Filter Name="bnf headers" Filter="bnf*.h" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\bnf\sofia-sip\bnf.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\bnf\sofia-sip\hostdomain.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\bnf\sofia-sip\bnf.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\bnf\sofia-sip\hostdomain.h"></File> </Filter> <Filter Name="msg headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg_addr.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_bnf.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg_buffer.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg_date.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg_header.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\msg_internal.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg_mclass.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg_mclass_hash.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg_mime.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg_mime_protos.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg_parser.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg_protos.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg_tag_class.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\msg\sofia-sip\msg_types.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_addr.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_bnf.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_buffer.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_date.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_header.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_internal.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_mclass.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_mclass_hash.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_mime.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_mime_protos.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_parser.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_protos.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_tag_class.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_types.h"></File> </Filter> <Filter Name="sip headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sofia-sip\sip.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_extensions.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sofia-sip\sip_hclasses.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sofia-sip\sip_header.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sip_internal.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sofia-sip\sip_parser.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sofia-sip\sip_protos.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sofia-sip\sip_status.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sofia-sip\sip_tag.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sofia-sip\sip_tag_class.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sip\sofia-sip\sip_util.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_extensions.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_hclasses.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_header.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_internal.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_parser.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_protos.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_status.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_tag.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_tag_class.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_util.h"></File> </Filter> <Filter Name="http headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\sofia-sip\http.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\sofia-sip\http_hclasses.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\sofia-sip\http_header.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\sofia-sip\http_parser.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\sofia-sip\http_protos.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\sofia-sip\http_status.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\sofia-sip\http_tag.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\http\sofia-sip\http_tag_class.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_hclasses.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_header.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_parser.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_protos.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_status.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_tag.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_tag_class.h"></File> </Filter> <Filter Name="nth headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nth\sofia-sip\nth.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nth\sofia-sip\nth_tag.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nth\sofia-sip\nth.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nth\sofia-sip\nth_tag.h"></File> </Filter> <Filter Name="sresolv headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sresolv\sofia-resolv\sres.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sresolv\sofia-resolv\sres_async.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sresolv\sofia-resolv\sres_cache.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sresolv\sofia-resolv\sres_record.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sresolv\sofia-sip\sresolv.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sofia-resolv\sres.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sofia-resolv\sres_async.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sofia-resolv\sres_cache.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sofia-resolv\sres_record.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sofia-sip\sresolv.h"></File> </Filter> <Filter Name="nea headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nea\sofia-sip\nea.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nea\nea_debug.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nea\sofia-sip\nea_tag.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\sofia-sip\nea.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea_debug.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\sofia-sip\nea_tag.h"></File> </Filter> <Filter Name="iptsec headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\sofia-sip\auth_client.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\sofia-sip\auth_digest.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\sofia-sip\auth_module.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\sofia-sip\auth_ntlm.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\sofia-sip\auth_plugin.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\iptsec\iptsec_debug.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\sofia-sip\auth_client.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\sofia-sip\auth_digest.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\sofia-sip\auth_module.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\sofia-sip\auth_ntlm.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\sofia-sip\auth_plugin.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\iptsec_debug.h"></File> </Filter> <Filter Name="stun headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\stun\sofia-sip\stun.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\stun\sofia-sip\stun_common.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\stun\sofia-sip\stun_tag.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\sofia-sip\stun.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\sofia-sip\stun_common.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\sofia-sip\stun_tag.h"></File> </Filter> <Filter Name="nua headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\sofia-sip\nua.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nua\sofia-sip\nua_tag.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\sofia-sip\nua.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\sofia-sip\nua_tag.h"></File> </Filter> <Filter Name="nta headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\sofia-sip\nta.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\nta_internal.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\sofia-sip\nta_stateless.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\sofia-sip\nta_tag.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\sofia-sip\nta_tport.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\nta\sofia-sip\sl_utils.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sofia-sip\nta.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\nta_internal.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sofia-sip\nta_stateless.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sofia-sip\nta_tag.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sofia-sip\nta_tport.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sofia-sip\sl_utils.h"></File> </Filter> <Filter Name="tport headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\sofia-sip\tport.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\sofia-sip\tport_plugins.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\sofia-sip\tport_tag.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\tport\tport_tls.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\sofia-sip\tport.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\sofia-sip\tport_plugins.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\sofia-sip\tport_tag.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_tls.h"></File> </Filter> <Filter Name="sdp headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sdp\sofia-sip\sdp.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\sdp\sofia-sip\sdp_tag.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sofia-sip\sdp.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sofia-sip\sdp_tag.h"></File> </Filter> <Filter Name="soa headers" > - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\soa\sofia-sip\soa.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\soa\sofia-sip\soa_add.h"></File> - <File RelativePath="..\..\sofia-sip-1.12.4\libsofia-sip-ua\soa\sofia-sip\soa_tag.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\sofia-sip\soa.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\sofia-sip\soa_add.h"></File> + <File RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\sofia-sip\soa_tag.h"></File> </Filter> </Filter> </Files> Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj Tue Jan 2 10:20:18 2007 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\win32";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\bnf"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(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"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -126,7 +126,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\win32";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.4\libsofia-sip-ua\bnf"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(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"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" RuntimeLibrary="2" UsePrecompiledHeader="0"

1 0

[commit] r3888 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua libsofia-sip-ua-glib/su-glib libsofia-sip-ua/nta libsofia-sip-ua/sip libsofia-sip-ua/su libsofia-sip-ua/tport libsofia-sip-ua/tport/sofia-sip m4
by Freeswitch SVN 02 Jan '07

02 Jan '07

Author: mikej Date: Tue Jan 2 10:11:55 2007 New Revision: 3888 Added: freeswitch/trunk/libs/sofia-sip/configure.gnu freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/test_date.c Removed: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/date_test.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/run_date_test Modified: freeswitch/trunk/libs/sofia-sip/AUTHORS freeswitch/trunk/libs/sofia-sip/RELEASE freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_log.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/tport_tag.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 Log: update to latest darcs sofia Modified: freeswitch/trunk/libs/sofia-sip/AUTHORS ============================================================================== --- freeswitch/trunk/libs/sofia-sip/AUTHORS (original) +++ freeswitch/trunk/libs/sofia-sip/AUTHORS Tue Jan 2 10:11:55 2007 @@ -5,17 +5,30 @@ Martti Mela <martti.mela -at nokia -dot com> Kai Vehmanen <kai.vehmanen -at nokia -dot com> -Contributors (in alphabetical order) ------------------------------------- +Contributors (in alphabetical order, surname first) +--------------------------------------------------- -Chan, Tat -Haataja, Mikko -Jacobs, Remeres -Jalava, Teemu +Chan, Tat <first.surname(a)nokia.com> +Ciarkowski, Andrzej <wp-voigtkampff -at users -dot sourceforge -dot net> +Haataja, Mikko <first.surname(a)nokia.com> +Jacobs, Remeres <first.surname(a)nokia.com> +Jalava, Teemu <first.surname(a)nokia.com> Jerris, Michael <mike -at jerris -dot com> +Legostayev Denis <legostayev -at neic -dot nsk -dot su> Prado, Dimitri E. <dprado -at e3c -dot com -dot br> -Puustinen, Ismo -Rinne-Rahkola, Pasi -Saari, Mika -Selin, Jari -Urpalainen, Jari +Puolakka, Petteri <first.surname(a)nokia.com> +Puustinen, Ismo <first.surname(a)nokia.com> +Rinne-Rahkola, Pasi <first.surname(a)nokia.com> +Saari, Mika <first.surname(a)nokia.com> +Selin, Jari <first.surname(a)nokia.com> +Underwood, Steve <steveu -at coppice -dot org> +Urpalainen, Jari <first.surname(a)nokia.com> +Whittaker, Colin <colinw -at occamnetworks -dot com> +Zabaluev, Mikhail <first.surname(a)nokia.com> + + +Note: for details on who did what, see the version control + system change history, and release notes for past releases at + http://sofia-sip.sourceforge.net/relnotes/ + + \ No newline at end of file Modified: freeswitch/trunk/libs/sofia-sip/RELEASE ============================================================================== --- freeswitch/trunk/libs/sofia-sip/RELEASE (original) +++ freeswitch/trunk/libs/sofia-sip/RELEASE Tue Jan 2 10:11:55 2007 @@ -55,6 +55,7 @@ - **template**: First Surname (patch to nua/soa/msg) - Petteri Puolakka (patch to stun) +- Mikhail Zabluev (patch to su-glib mainloop integration) See the AUTHORS file in the distribution package. @@ -94,3 +95,8 @@ Roman Filonenko. - Bug in zero-padding STUN messages with a message integrity attribute. Patch by Petteri Puolakka. +- Fixed a severe problem with timer accuracy, when sofia-sip timers + where used under glib's mainloop. +- Improved glib mainloop integration to avoid warnings about already + active mainloop context, and potentially other issue. Patch by + Mikhail Zabaluev. Closes sf.net item #1606786. Added: freeswitch/trunk/libs/sofia-sip/configure.gnu ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/configure.gnu Tue Jan 2 10:11:55 2007 @@ -0,0 +1,2 @@ +#! /bin/sh +./configure $@ --with-pic --with-glib=no Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am Tue Jan 2 10:11:55 2007 @@ -19,12 +19,12 @@ noinst_LTLIBRARIES = libsu-glib.la -check_PROGRAMS = su_source_test +check_PROGRAMS = su_source_test torture_su_glib_timer # ---------------------------------------------------------------------- # Tests -TESTS = su_source_test +TESTS = su_source_test torture_su_glib_timer # ---------------------------------------------------------------------- # Rules for building the targets Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c Tue Jan 2 10:11:55 2007 @@ -319,34 +319,28 @@ enter; - if (self->sup_head) + if (self->sup_head) { + *return_tout = 0; return TRUE; - - *return_tout = -1; + } if (self->sup_timers) { su_time_t now; GTimeVal gtimeval; su_duration_t tout; - tout = SU_DURATION_MAX; - g_source_get_current_time(gs, &gtimeval); - now.tv_sec = gtimeval.tv_sec + 2208988800UL; now.tv_usec = gtimeval.tv_usec; tout = su_timer_next_expires(self->sup_timers, now); - if (tout == 0) - return TRUE; - - if ((gint)tout < 0 || tout > (su_duration_t)G_MAXINT) - tout = -1; + *return_tout = (tout < 0 || tout > (su_duration_t)G_MAXINT)? + -1 : (gint)tout; - *return_tout = (gint)tout; + return (tout == 0); } - + return FALSE; } @@ -995,30 +989,30 @@ gmc = g_source_get_context(self->sup_source); if (gmc && g_main_context_acquire(gmc)) { + GPollFD *fds = NULL; + gint fds_size = 0; + gint fds_wait; gint priority = G_MAXINT; - if (g_main_context_prepare(gmc, &priority)) { - g_main_context_dispatch(gmc); - } else { - gint timeout = tout > G_MAXINT ? G_MAXINT : tout; - gint i, n = 0; - GPollFD *fds = NULL; - - priority = G_MAXINT; - - n = g_main_context_query(gmc, priority, &timeout, fds, n); - if (n > 0) { - fds = g_alloca(n * (sizeof *fds)); - n = g_main_context_query(gmc, priority, &timeout, fds, n); - } + gint src_tout = -1; - if (tout < timeout) - timeout = tout; + g_main_context_prepare(gmc, &priority); - i = su_wait((su_wait_t *)fds, n, timeout); - - if (g_main_context_check(gmc, priority, fds, n)) - g_main_context_dispatch(gmc); + fds_wait = g_main_context_query(gmc, priority, &src_tout, NULL, 0); + while (fds_wait > fds_size) { + fds = g_alloca(fds_wait * sizeof(fds[0])); + fds_size = fds_wait; + fds_wait = g_main_context_query(gmc, priority, &src_tout, fds, fds_size); } + + if (src_tout >= 0 && tout > (su_duration_t)src_tout) + tout = src_tout; + + su_wait((su_wait_t *)fds, fds_wait, tout); + + g_main_context_check(gmc, priority, fds, fds_wait); + + g_main_context_dispatch(gmc); + g_main_context_release(gmc); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am Tue Jan 2 10:11:55 2007 @@ -90,7 +90,7 @@ for d in $(DIST_SUBDIRS); do \ test -r $$d/Doxyfile \ && pushd $$d > /dev/null \ - && echo running ${DOXYGEN} in second time in $$d \ + && echo running ${DOXYGEN} second time in $$d \ && ${DOXYGEN} 2>&1 \ | egrep -v -i -e 'Warning: Unsupported (xml/)?html tag' \ ; popd > /dev/null ; \ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Jan 2 10:11:55 2007 @@ -3074,13 +3074,6 @@ if (!sip->sip_max_forwards) sip_add_dup(msg, sip, (sip_header_t *)leg->leg_agent->sa_max_forwards); - if (!sip->sip_call_id) { - if (leg->leg_id) - sip->sip_call_id = sip_call_id_dup(home, leg->leg_id); - else - sip->sip_call_id = sip_call_id_create(home, NULL); - } - if (!sip->sip_from) sip->sip_from = sip_from_dup(home, leg->leg_local); else if (leg->leg_local && leg->leg_local->a_tag && @@ -3113,7 +3106,10 @@ method = sip->sip_request->rq_method; method_name = sip->sip_request->rq_method_name; - if (method == sip_method_ack || method == sip_method_cancel) + if (!leg->leg_id && !sip->sip_call_id && sip->sip_cseq) + seq = sip->sip_cseq->cs_seq; + else if (method == sip_method_ack || method == sip_method_cancel) + /* Dangerous - we may do PRACK/UPDATE meanwhile */ seq = sip->sip_cseq ? sip->sip_cseq->cs_seq : leg->leg_seq; else if (leg->leg_seq) seq = ++leg->leg_seq; @@ -3122,6 +3118,13 @@ else seq = leg->leg_seq = (sip_now() >> 1) & 0x7ffffff; + if (!sip->sip_call_id) { + if (leg->leg_id) + sip->sip_call_id = sip_call_id_dup(home, leg->leg_id); + else + sip->sip_call_id = sip_call_id_create(home, NULL); + } + if ((!sip->sip_cseq || seq != sip->sip_cseq->cs_seq || method != sip->sip_cseq->cs_method || @@ -9718,6 +9721,9 @@ * @param magic * @param to_tag * @param rseq + * + * @bug Fix the memory leak - either one of the requests is left unreleased + * for ever. */ nta_outgoing_t *nta_outgoing_tagged(nta_outgoing_t *orq, nta_response_f *callback, @@ -9757,8 +9763,8 @@ tagged->orq_to = to; tagged->orq_tport = tport_ref(orq->orq_tport); - tagged->orq_request = (msg_t *)msg_ref_create(orq->orq_request); - tagged->orq_response = NULL; + tagged->orq_request = msg_ref_create(orq->orq_request); + tagged->orq_response = msg_ref_create(orq->orq_response); tagged->orq_cancel = NULL; tagged->orq_pending = tport_pend(orq->orq_tport, Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_log.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_log.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_log.c Tue Jan 2 10:11:55 2007 @@ -138,7 +138,7 @@ a->a_params = NULL; if (!a->a_display) a->a_display = ""; - return sl_header_log(log, level, fmt, (sip_header_t *)a); + sl_header_log(log, level, fmt, (sip_header_t *)a); } /**Log a @To header. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am Tue Jan 2 10:11:55 2007 @@ -17,7 +17,7 @@ noinst_LTLIBRARIES = libsip.la check_PROGRAMS = torture_sip \ - test_sip_msg validator date_test + test_sip_msg validator test_date # ---------------------------------------------------------------------- # Rules for building the targets @@ -59,7 +59,7 @@ torture_sip_LDFLAGS = -static test_sip_msg_LDFLAGS = -static -date_test_LDFLAGS = -static +test_date_LDFLAGS = -static # ---------------------------------------------------------------------- # Install and distribution rules @@ -93,9 +93,9 @@ # ---------------------------------------------------------------------- # Tests -#TESTS = torture_sip run_test_sip_msg run_date_test +#TESTS = torture_sip run_test_sip_msg run_test_date -#dist_noinst_SCRIPTS = run_test_sip_msg run_date_test +#dist_noinst_SCRIPTS = run_test_sip_msg run_test_date # ---------------------------------------------------------------------- # Sofia specific rules Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/test_date.c ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/test_date.c Tue Jan 2 10:11:55 2007 @@ -0,0 +1,116 @@ +/* + * This file is part of the Sofia-SIP package + * + * Copyright (C) 2005 Nokia Corporation. + * + * Contact: Pekka Pessi <pekka.pessi(a)nokia.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +/**@internal + * + * @CFILE test_date.c + * + * Tester for SIP date parser + * + * @author Pekka Pessi <Pekka.Pessi(a)nokia.com>. + * + * @date Wed Mar 21 19:12:13 2001 ppessi + */ + +#include <stdio.h> +#include <sofia-sip/string0.h> +#include <stddef.h> +#include <stdlib.h> + +#include <sofia-sip/sip.h> +#include <sofia-sip/sip_header.h> +#include <sofia-sip/msg_date.h> + +void usage(void) +{ + fprintf(stderr, + "usage: test_date [SIP-date] " + "[YYYYy][DDd][HHh][MMm][SS[s]]\n"); + exit(1); +} + +int main(int ac, char *av[]) +{ + int i; + sip_time_t t, delta, t2; + char const *s; + int verbatim = 0, retval = 0; + + t = ((31 + 27) * 24) * 60 * 60; + delta = (365 * 24 + 6) * 60 * 60; + + if (str0cmp(av[1], "-v") == 0) + verbatim = 1, av++; + + if ((s = av[1])) { + if (msg_date_d(&s, &t) < 0) { + fprintf(stderr, "test_date: %s is not valid time\n", s); + exit(1); + } + + if ((s = av[2])) { + for (delta = 0; *s; ) { + t2 = 0; + msg_delta_d(&s, &t2); + + switch (*s++) { + case 'y': delta += t2 * (365 * 24 + 6) * 60 * 60; break; + case 'd': delta += t2 * 24 * 60 * 60; break; + case 'h': delta += t2 * 60 * 60; break; + case 'm': delta += t2 * 60; break; + case '\0': --s; /* FALLTHROUGH */ + case 's': delta += t2; break; + default: + fprintf(stderr, "test_date: %s is not valid time offset\n" , av[2]); + usage(); + break; + } + } + } + } + + for (i = 0; i < 20; i++) { + char buf[80]; + + msg_date_e(buf, sizeof(buf), t); + + if (verbatim) + printf("%08lx is %s\n", t, buf); + + s = buf, t2 = 0; + if (msg_date_d(&s, &t2) < 0) { + fprintf(stderr, "test_date: decoding %s failed\n", buf); + retval = 1; + break; + } + else if (t2 != t) { + fprintf(stderr, "test_date: %lu != %lu\n", t, t2); + retval = 1; + break; + } + t += delta; + } + + return retval; +} Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am Tue Jan 2 10:11:55 2007 @@ -1,7 +1,12 @@ # common Makefile targets for libsofia-sip-ua modules # --------------------------------------------------- -AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) +AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE) + +# Use with --enable-ndebug +if NDEBUG +AM_CFLAGS += -DNDEBUG +endif built-sources: $(BUILT_SOURCES) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c Tue Jan 2 10:11:55 2007 @@ -58,6 +58,10 @@ #include <sofia-sip/su_tag_inline.h> #include <sofia-sip/su_tagarg.h> +#ifndef HAVE_STRTOULL +unsigned longlong strtoull(const char *, char **, int); +#endif + /**@defgroup su_tag Tag Item Lists * * Object-oriented tag routines for Sofia utility library. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c Tue Jan 2 10:11:55 2007 @@ -165,17 +165,16 @@ /** Time difference in milliseconds. * - * Calculates the duration from t2 to t1 in milliseconds. + * Calculates the duration from t2 to t1 in milliseconds. * * @param t1 after time * @param t2 before time * - * @return - * The duration in milliseconds between the two times. If the difference - * is bigger than @c SU_DURATION_MAX, the function su_duration() returns - * @c SU_DURATION_MAX instead. If the difference is smaller than @c - * -SU_DURATION_MAX, the function su_duration() returns @c - * -SU_DURATION_MAX. + * @return The duration in milliseconds between the two times. + * If the difference is bigger than #SU_DURATION_MAX, return #SU_DURATION_MAX + * instead. + * If the difference is smaller than -#SU_DURATION_MAX, return + * -#SU_DURATION_MAX. */ su_duration_t su_duration(su_time_t const t1, su_time_t const t2) { Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile Tue Jan 2 10:11:55 2007 @@ -7,7 +7,10 @@ TAGFILES += \ ../docs/su.doxytags=../su \ - ../docs/msg.doxytags=../msg + ../docs/msg.doxytags=../msg \ + ../docs/nth.doxytags=../nth \ + ../docs/nta.doxytags=../nta \ + ../docs/nua.doxytags=../nua \ GENERATE_TAGFILE = ../docs/tport.doxytags Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/tport_tag.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/tport_tag.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/tport_tag.h Tue Jan 2 10:11:55 2007 @@ -51,28 +51,46 @@ TPORT_DLL extern tag_typedef_t tptag_any; TPORT_DLL extern tag_typedef_t tptag_ident; -/** Ident transport connection (true by default). */ +/**Identify a transport interface. + * + * Use with tport_tbind(), tport_tsend(), nua_create(), nta_agent_create(), + * nta_agent_add_tport(), nta_outgoing_tcreate(), nta_outgoing_mcreate(), + * nth_engine_create(), nth_client_tcreate(), or initial nth_site_create(). + */ #define TPTAG_IDENT(x) tptag_ident, tag_str_v((x)) TPORT_DLL extern tag_typedef_t tptag_ident_ref; #define TPTAG_IDENT_REF(x) tptag_ident_ref, tag_str_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_reuse; -/** Allow reusing transport connection (true by default). */ +/** Allow reusing transport connection (true by default). + * + * Use with tport_tcreate(), tport_tbind(), tport_set_params(), + * tport_tsend(), nua_create(), nta_agent_create(), nta_agent_add_tport(), + * nta_outgoing_tcreate(), nta_outgoing_mcreate(), nth_engine_create(), + * nth_client_tcreate(), or initial nth_site_create(). + */ #define TPTAG_REUSE(x) tptag_reuse, tag_bool_v((x)) TPORT_DLL extern tag_typedef_t tptag_reuse_ref; #define TPTAG_REUSE_REF(x) tptag_reuse_ref, tag_bool_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_fresh; -/** Create new connection (but allow reusing new one). */ +/** Create new connection (but allow other messages to reuse the new one). + * + * Use with tport_tsend(), nta_outgoing_tcreate(), nta_outgoing_mcreate(), + * or nth_client_tcreate(). + */ #define TPTAG_FRESH(x) tptag_fresh, tag_bool_v((x)) TPORT_DLL extern tag_typedef_t tptag_fresh_ref; #define TPTAG_FRESH_REF(x) tptag_fresh_ref, tag_bool_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_server; -/** Bind server sockets (true by default, disable with TPTAG_SERVER(0)). */ +/** Bind server sockets (true by default, disable with TPTAG_SERVER(0)). + * + * Use with tport_tbind(). + */ #define TPTAG_SERVER(x) tptag_server, tag_bool_v((x)) TPORT_DLL extern tag_typedef_t tptag_server_ref; @@ -93,58 +111,99 @@ } tport_pri_type_t; TPORT_DLL extern tag_typedef_t tptag_public; -/** Use a transport reaching to public Internet. */ +/** Use a transport reaching to public Internet. + * + * Use with tport_tbind(), nua_create(), nta_agent_create(), + * nta_agent_add_tport(), nth_engine_create(), or initial nth_site_create(). + */ #define TPTAG_PUBLIC(x) tptag_public, tag_int_v((x)) TPORT_DLL extern tag_typedef_t tptag_public_ref; #define TPTAG_PUBLIC_REF(x) tptag_public_ref, tag_int_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_mtu; -/** Specify MTU. */ +/** Specify MTU. + * + * Use with tport_tcreate(), tport_tbind(), tport_set_params(), + * tport_tsend(), nua_create(), nta_agent_create(), nta_agent_add_tport(), + * nta_outgoing_tcreate(), nta_outgoing_mcreate(), nth_engine_create(), + * nth_client_tcreate(), or initial nth_site_create(). + */ #define TPTAG_MTU(x) tptag_mtu, tag_usize_v((x)) TPORT_DLL extern tag_typedef_t tptag_mtu_ref; #define TPTAG_MTU_REF(x) tptag_mtu_ref, tag_usize_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_connect; -/** Specify that tport must always use connections. */ +/** Specify that tport must always use connections (even with UDP). + * + * @note Unimplemented (?). + * + * Use with tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(), + * nta_agent_create(), nta_agent_add_tport(), nth_engine_create(), or + * initial nth_site_create(). + */ #define TPTAG_CONNECT(x) tptag_connect, tag_bool_v((x)) TPORT_DLL extern tag_typedef_t tptag_connect_ref; #define TPTAG_CONNECT_REF(x) tptag_connect_ref, tag_bool_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_queuesize; -/** Specify the number of messages that can be queued per connection. */ +/** Specify the number of messages that can be queued per connection. + * + * Use with tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(), + * nta_agent_create(), nta_agent_add_tport(), nth_engine_create(), or + * initial nth_site_create(). + */ #define TPTAG_QUEUESIZE(x) tptag_queuesize, tag_uint_v((x)) TPORT_DLL extern tag_typedef_t tptag_queuesize_ref; #define TPTAG_QUEUESIZE_REF(x) tptag_queuesize_ref, tag_uint_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_sdwn_error; -/** If true, half close of a connection by remote is considered as an error. */ +/** If true, half close of a connection by remote is considered as an error. + * + * Use with tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(), + * nta_agent_create(), nta_agent_add_tport(), nth_engine_create(), or + * initial nth_site_create(). + */ #define TPTAG_SDWN_ERROR(x) tptag_sdwn_error, tag_bool_v((x)) TPORT_DLL extern tag_typedef_t tptag_sdwn_error_ref; #define TPTAG_SDWN_ERROR_REF(x) tptag_sdwn_error_ref, tag_bool_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_sdwn_after; -/** Half-close (shutdown(c, 1) after sending the message. */ +/** Half-close (shutdown(c, 1)) after sending the message. + * + * Use with tport_tsend(), nta_outgoing_tcreate(), nta_outgoing_mcreate(), + * or nth_client_tcreate(). + */ #define TPTAG_SDWN_AFTER(x) tptag_sdwn_after, tag_bool_v((x)) TPORT_DLL extern tag_typedef_t tptag_sdwn_after_ref; #define TPTAG_SDWN_AFTER_REF(x) tptag_sdwn_after_ref, tag_bool_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_close_after; -/** Close of a connection after sending the message. */ +/** Close of a connection after sending the message. + * + * Use with tport_tsend(), nta_outgoing_tcreate(), nta_outgoing_mcreate(), + * or nth_client_tcreate(). + */ #define TPTAG_CLOSE_AFTER(x) tptag_close_after, tag_bool_v((x)) TPORT_DLL extern tag_typedef_t tptag_close_after_ref; #define TPTAG_CLOSE_AFTER_REF(x) tptag_close_after_ref, tag_bool_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_idle; -/** How long transports may be idle (value in milliseconds). +/** How long transports may be idle (value in milliseconds). + * * If 0, zap immediately, * if UINT_MAX, leave them there (default value for now). + * + * @par Use With + * tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(), + * nta_agent_create(), nta_agent_add_tport(), nth_engine_create(), or + * initial nth_site_create(). */ #define TPTAG_IDLE(x) tptag_idle, tag_uint_v((x)) @@ -156,6 +215,10 @@ * * If UINT_MAX, leave the incomplete messages there for ever. * Default value for now is UINT_MAX. + * + * Use with tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(), + * nta_agent_create(), nta_agent_add_tport(), nth_engine_create(), or + * initial nth_site_create(). */ #define TPTAG_TIMEOUT(x) tptag_timeout, tag_uint_v((x)) @@ -163,11 +226,15 @@ #define TPTAG_TIMEOUT_REF(x) tptag_timeout_ref, tag_uint_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_sigcomp_lifetime; -/**Default SigComp lifetime. +/**Default SigComp lifetime in seconds. * - * If UINT_MAX, keep SigComp compartments around for ever. + * If value is UINT_MAX, keep SigComp compartments around for ever. * * @note Experimental. + * + * Use with tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(), + * nta_agent_create(), nta_agent_add_tport(), nth_engine_create(), or + * initial nth_site_create(). */ #define TPTAG_SIGCOMP_LIFETIME(x) tptag_sigcomp_lifetime, tag_uint_v((x)) @@ -176,7 +243,10 @@ tptag_sigcomp_lifetime_ref, tag_uint_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_compartment; -/** Pointer to SigComp compartment. */ +/** Pointer to SigComp compartment. + * + * @note Not used. + */ #define TPTAG_COMPARTMENT(x) tptag_compartment, tag_ptr_v((x)) TPORT_DLL extern tag_typedef_t tptag_compartment_ref; @@ -185,6 +255,9 @@ TPORT_DLL extern tag_typedef_t tptag_certificate; /** Path to the public key certificate directory. + * + * Use with tport_tbind(), nua_create(), nta_agent_create(), + * nta_agent_add_tport(), nth_engine_create(), or initial nth_site_create(). */ #define TPTAG_CERTIFICATE(x) tptag_certificate, tag_str_v((x)) @@ -193,43 +266,80 @@ TPORT_DLL extern tag_typedef_t tptag_tls_version; /** Sets the TLS version (version 0 implies SSL2/SSL3). + * + * Use with tport_tbind(), nua_create(), nta_agent_create(), + * nta_agent_add_tport(), nth_engine_create(), or initial nth_site_create(). */ #define TPTAG_TLS_VERSION(x) tptag_tls_version, tag_uint_v((x)) TPORT_DLL extern tag_typedef_t tptag_tls_version_ref; #define TPTAG_TLS_VERSION_REF(x) tptag_tls_version_ref, tag_uint_vr(&(x)) +#if 0 TPORT_DLL extern tag_typedef_t tptag_trusted; -/** Mark transport as trusted. */ +/** Mark transport as trusted. + * + * @note Not implemented. +*/ #define TPTAG_TRUSTED(x) tptag_trusted, tag_bool_v((x)) TPORT_DLL extern tag_typedef_t tptag_trusted_ref; #define TPTAG_TRUSTED_REF(x) tptag_trusted_ref, tag_bool_vr(&(x)) +#endif TPORT_DLL extern tag_typedef_t tptag_debug_drop; -/** Sets the drop propability for (0..1000) incoming/outgoing packets. */ +/** Sets the drop propability for (0..1000) incoming/outgoing packets. + * + * This is a parameter suitable for debugging only. + * + * Use with tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(), + * nta_agent_create(), nta_agent_add_tport(), nth_engine_create(), or + * initial nth_site_create(). + */ #define TPTAG_DEBUG_DROP(x) tptag_debug_drop, tag_uint_v((x)) TPORT_DLL extern tag_typedef_t tptag_debug_drop_ref; #define TPTAG_DEBUG_DROP_REF(x) tptag_debug_drop_ref, tag_uint_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_udp_rmem; -/** Sets the maximum receive buffer in bytes for primary UDP socket. */ +/** Sets the maximum receive buffer in bytes for primary UDP socket. + * + * This is a parameter suitable for tuning. + * + * Use with tport_tbind(), nua_create(), nta_agent_create(), + * nta_agent_add_tport(), nth_engine_create(), or initial nth_site_create(). + */ #define TPTAG_UDP_RMEM(x) tptag_udp_rmem, tag_uint_v((x)) TPORT_DLL extern tag_typedef_t tptag_udp_rmem_ref; #define TPTAG_UDP_RMEM_REF(x) tptag_udp_rmem_ref, tag_uint_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_udp_wmem; -/** Sets the maximum send buffer in bytes for primary UDP socket. */ +/** Sets the maximum send buffer in bytes for primary UDP socket. + * + * This is a parameter suitable for tuning. + * + * Use with tport_tbind(), nua_create(), nta_agent_create(), + * nta_agent_add_tport(), nth_engine_create(), or initial nth_site_create(). + */ #define TPTAG_UDP_WMEM(x) tptag_udp_wmem, tag_uint_v((x)) TPORT_DLL extern tag_typedef_t tptag_udp_wmem_ref; #define TPTAG_UDP_WMEM_REF(x) tptag_udp_wmem_ref, tag_uint_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_thrpsize; -/** Determines the number of threads in the pool receiving, uncompressing, +/**Determines the number of threads in the pool. + * + * The thread pools can have multiple threads receiving, uncompressing, * parsing, compressing, and sending messages. + * + * This is a parameter suitable for tuning. + * + * @note Thread pools are currently broken. + * + * Use with tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(), + * nta_agent_create(), nta_agent_add_tport(), nth_engine_create(), or + * initial nth_site_create(). */ #define TPTAG_THRPSIZE(x) tptag_thrpsize, tag_uint_v((x)) @@ -237,7 +347,13 @@ #define TPTAG_THRPSIZE_REF(x) tptag_thrpsize_ref, tag_uint_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_thrprqsize; -/** Length of per-thread receive queue (as messages) +/** Length of per-thread receive queue (as messages). + * + * This is a parameter suitable for tuning. + * + * Use with tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(), + * nta_agent_create(), nta_agent_add_tport(), nth_engine_create(), or + * initial nth_site_create(). */ #define TPTAG_THRPRQSIZE(x) tptag_thrprqsize, tag_uint_v((x)) @@ -245,26 +361,66 @@ #define TPTAG_THRPRQSIZE_REF(x) tptag_thrprqsize_ref, tag_uint_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_http_connect; -/** Specify that tport can use HTTP connect method. */ +/** Specify that tport can use HTTP connect method. + * + * Use with tport_tbind(), nua_create(), nta_agent_create(), + * nta_agent_add_tport(), nth_engine_create(), or initial nth_site_create(). + */ #define TPTAG_HTTP_CONNECT(x) tptag_http_connect, tag_str_v((x)) TPORT_DLL extern tag_typedef_t tptag_http_connect_ref; #define TPTAG_HTTP_CONNECT_REF(x) tptag_http_connect_ref, tag_str_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_stun_server; -/** Enable STUN server. */ +/** Enable STUN server. + * + * Use with tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(), + * nta_agent_create(), nta_agent_add_tport(), nth_engine_create(), or + * initial nth_site_create(). + */ #define TPTAG_STUN_SERVER(x) tptag_stun_server, tag_bool_v((x)) TPORT_DLL extern tag_typedef_t tptag_stun_server_ref; #define TPTAG_STUN_SERVER_REF(x) tptag_stun_server_ref, tag_bool_vr(&(x)) TPORT_DLL extern tag_typedef_t tptag_tos; -/** Sets the IP TOS for the socket. */ +/** Sets the IP TOS for the socket. + * + * Use with tport_tcreate(), tport_tbind(), tport_set_params(), nua_create(), + * nta_agent_create(), nta_agent_add_tport(), nth_engine_create(), or + * initial nth_site_create(). + */ #define TPTAG_TOS(x) tptag_tos, tag_int_v((x)) TPORT_DLL extern tag_typedef_t tptag_tos_ref; #define TPTAG_TOS_REF(x) tptag_tos_ref, tag_int_vr(&(x)) +TPORT_DLL extern tag_typedef_t tptag_log; +/** If set, print out parsed or sent messages at transport layer. + * + * Use with tport_tcreate(), nua_create(), nta_agent_create(), + * nth_engine_create(), or initial nth_site_create(). + * + * @sa #TPORT_DUMP, TPTAG_DUMP() + */ +#define TPTAG_LOG(x) tptag_log, tag_bool_v((x)) + +TPORT_DLL extern tag_typedef_t tptag_log_ref; +#define TPTAG_LOG_REF(x) tptag_log_ref, tag_bool_vr(&(x)) + +TPORT_DLL extern tag_typedef_t tptag_dump; +/** Filename for dumping unparsed messages from transport. + * + * Use with tport_tcreate(), nta_agent_create(), nua_create(), + * nth_engine_create(), or initial nth_site_create(). + * + * @sa #TPORT_DUMP, TPTAG_LOG(). + */ +#define TPTAG_DUMP(x) tptag_dump, tag_str_v((x)) + +TPORT_DLL extern tag_typedef_t tptag_dump_ref; +#define TPTAG_DUMP_REF(x) tptag_dump_ref, tag_str_vr(&(x)) + SOFIA_END_DECLS #endif /* !defined TPORT_TAG_H */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Tue Jan 2 10:11:55 2007 @@ -286,7 +286,7 @@ } /** Test if transport connection has been established. @NEW_1_12_5 */ -inline int tport_is_connected(tport_t const *self) +int tport_is_connected(tport_t const *self) { return self->tp_is_connected; } @@ -308,7 +308,7 @@ { if (tos >= 0 && ai->ai_family == AF_INET && - setsockopt(socket, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0) { + setsockopt(socket, IPPROTO_IP, IP_TOS, (const void*)&tos, sizeof(tos)) < 0) { SU_DEBUG_3(("tport: setsockopt(IP_TOS): %s\n", su_strerror(su_errno()))); } @@ -427,7 +427,12 @@ /** Name for "any" transport. @internal */ static char const tpn_any[] = "*"; -/** Create the master transport. */ +/** Create the master transport. + * + * @TAGS + * TPTAG_LOG(), TPTAG_DUMP(), tags used with tport_set_params(), especially + * TPTAG_QUEUESIZE(). + */ tport_t *tport_tcreate(tp_stack_t *stack, tp_stack_class_t const *tpac, su_root_t *root, @@ -1128,6 +1133,12 @@ * * @param self pointer to a transport object * @param tag,value,... list of tags + * + * @TAGS + * TPTAG_MTU(), TPTAG_QUEUESIZE(), TPTAG_IDLE(), TPTAG_TIMEOUT(), + * TPTAG_DEBUG_DROP(), TPTAG_THRPSIZE(), TPTAG_THRPRQSIZE(), + * TPTAG_SIGCOMP_LIFETIME(), TPTAG_CONNECT(), TPTAG_SDWN_ERROR(), + * TPTAG_REUSE(), TPTAG_STUN_SERVER(), and TPTAG_TOS(). */ int tport_set_params(tport_t *self, tag_type_t tag, tag_value_t value, ...) @@ -1138,8 +1149,6 @@ int connect, sdwn_error, reusable, stun_server; - struct sigcomp_compartment *cc = NONE; - if (self == NULL) return su_seterrno(EINVAL); @@ -1164,7 +1173,6 @@ TPTAG_CONNECT_REF(connect), TPTAG_SDWN_ERROR_REF(sdwn_error), TPTAG_REUSE_REF(reusable), - TPTAG_COMPARTMENT_REF(cc), TPTAG_STUN_SERVER_REF(stun_server), TPTAG_TOS_REF(tpp->tpp_tos), TAG_END()); @@ -1324,6 +1332,11 @@ * @param tpn desired transport address * @param transports list of protocol names supported by stack * @param tag,value,... tagged argument list + * + * @TAGS + * TPTAG_SERVER(), TPTAG_PUBLIC(), TPTAG_IDENT(), TPTAG_HTTP_CONNECT(), + * TPTAG_CERTIFICATE(), TPTAG_TLS_VERSION(), and tags used with + * tport_set_params(), especially TPTAG_QUEUESIZE(). */ int tport_tbind(tport_t *self, tp_name_t const *tpn, @@ -2940,6 +2953,7 @@ * * @TAGS * TPTAG_MTU(), TPTAG_REUSE(), TPTAG_CLOSE_AFTER(), TPTAG_SDWN_AFTER(), + * TPTAG_FRESH(), TPTAG_COMPARTMENT(). */ tport_t *tport_tsend(tport_t *self, msg_t *msg, @@ -4526,5 +4540,3 @@ return buf; } - -/* ---------------------------------------------------------------------- */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c Tue Jan 2 10:11:55 2007 @@ -90,14 +90,24 @@ /** Initialize logging. */ void tport_open_log(tport_master_t *mr, tagi_t *tags) { - char const *log; - - mr->mr_log = - getenv("MSG_STREAM_LOG") != NULL || - getenv("TPORT_LOG") != NULL - ? MSG_DO_EXTRACT_COPY : 0; - - if ((log = getenv("TPORT_DUMP")) || (log = getenv("MSG_DUMP"))) { + char const *log = NULL; + int log_msg = 0; + + tl_gets(tags, TPTAG_LOG_REF(log_msg), TAG_END()); + + if (getenv("MSG_STREAM_LOG") != NULL || getenv("TPORT_LOG") != NULL) + log_msg = 1; + + mr->mr_log = log_msg ? MSG_DO_EXTRACT_COPY : 0; + + tl_gets(tags, TPTAG_DUMP_REF(log), TAG_END()); + + if (getenv("MSG_DUMP")) + log = getenv("MSG_DUMP"); + if (getenv("TPORT_DUMP")) + log = getenv("TPORT_DUMP"); + + if (log) { time_t now; if (strcmp(log, "-")) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c Tue Jan 2 10:11:55 2007 @@ -78,3 +78,6 @@ tag_typedef_t tptag_http_connect = STRTAG_TYPEDEF(http_connect); tag_typedef_t tptag_stun_server = BOOLTAG_TYPEDEF(stun_server); tag_typedef_t tptag_tos = INTTAG_TYPEDEF(tos); +tag_typedef_t tptag_log = INTTAG_TYPEDEF(log); +tag_typedef_t tptag_dump = STRTAG_TYPEDEF(dump); + Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c Tue Jan 2 10:11:55 2007 @@ -54,7 +54,7 @@ #elif HAVE_FUNCTION #define __func__ __FUNCTION__ #else -char const __func__[] = "tport_type_tcp"; +static char const __func__[] = "tport_type_tcp"; #endif /* ---------------------------------------------------------------------- */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Tue Jan 2 10:11:55 2007 @@ -58,6 +58,13 @@ tagi_t const *tags, char const **return_culprit); +#if HAVE_FUNC +#elif HAVE_FUNCTION +#define __func__ __FUNCTION__ +#else +static char const __func__[] = "tport_type_udp"; +#endif + tport_vtable_t const tport_udp_client_vtable = { "udp", tport_type_client, @@ -215,7 +222,7 @@ int tport_recv_dgram(tport_t *self) { msg_t *msg; - ssize_t n, veclen; + ssize_t n, veclen, N; su_addrinfo_t *ai; su_sockaddr_t *from; socklen_t fromlen; @@ -232,8 +239,21 @@ assert(self->tp_msg == NULL); - veclen = tport_recv_iovec(self, &self->tp_msg, iovec, 65536, 1); - if (veclen < 0) +#if nomore + /* We used to resize the buffer, but it fragments the memory */ + N = 65535; +#else + N = (ssize_t)su_getmsgsize(self->tp_socket); + if (N == -1) { + int err = su_errno(); + SU_DEBUG_1(("%s(%p): su_getmsgsize(): %s (%d)\n", __func__, self, + su_strerror(err), err)); + return -1; + } +#endif + + veclen = tport_recv_iovec(self, &self->tp_msg, iovec, N, 1); + if (veclen == -1) return -1; msg = self->tp_msg; Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 ============================================================================== --- freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 (original) +++ freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 Tue Jan 2 10:11:55 2007 @@ -133,7 +133,7 @@ if test X$enable_coverage != Xno ; then case "${CC-cc}" in *gcc*) - SOFIA_CFLAGS="$SOFIA_CFLAGS -fprofile-arcs -ftest-coverage" + AC_SUBST([SOFIA_COVERAGE], ["-fprofile-arcs -ftest-coverage"]) ;; *) AC_MSG_ERROR([--enable-coverage requires gcc]) esac @@ -344,7 +344,6 @@ [ --enable-ndebug compile with NDEBUG (disabled)], , enable_ndebug=no) AM_CONDITIONAL(NDEBUG, test x$enable_ndebug = yes) -SOFIA_CFLAGS="$SOFIA_CFLAGS -DNDEBUG" ]) dnl ======================================================================

1 0

[commit] r3887 - freeswitch/trunk/libs/sofia-sip/win32
by Freeswitch SVN 02 Jan '07

02 Jan '07

Author: mikej Date: Tue Jan 2 09:24:19 2007 New Revision: 3887 Modified: freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd Log: fix windows generation of header file Modified: freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd (original) +++ freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd Tue Jan 2 09:24:19 2007 @@ -48,6 +48,8 @@ @set PR2=../libsofia-sip-ua/sip/sofia-sip/sip_hclasses.h @set PR3=../libsofia-sip-ua/sip/sofia-sip/sip_protos.h @set PR4=../libsofia-sip-ua/sip/sofia-sip/sip_tag.h +@set PR5=../libsofia-sip-ua/sip/sofia-sip/sip_extra.h +@set SIPEXTRA=../libsofia-sip-ua/sip/sip_extra_headers.txt @set PT=../libsofia-sip-ua/sip/sip_parser_table.c %MSG_AWK% module=sip PR=%PR% %IN% < NUL @@ -58,6 +60,8 @@ %CHECK% %MSG_AWK% module=sip PR=%PR4% %IN% < NUL %CHECK% +%MSG_AWK% module=sip PR=%PR5% TEMPLATE1=%PR2%.in TEMPLATE2=%PR3%.in TEMPLATE=%PR5%.in NO_FIRST=1 NO_LAST=1 < NUL %SIPEXTRA% +%CHECK% %MSG_AWK% module=sip MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^ FLAGFILE=../libsofia-sip-ua/sip/sip_bad_mask ^

1 0

[commit] r3886 - in freeswitch/branches/knhor/trunk/src: . include mod/endpoints/mod_dingaling
by Freeswitch SVN 02 Jan '07

02 Jan '07

Author: knhor Date: Mon Jan 1 19:40:28 2007 New Revision: 3886 Modified: freeswitch/branches/knhor/trunk/src/include/switch_types.h freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/knhor/trunk/src/switch_event.c Log: add "subscribe" and "unsubscribe" event generation for conference targets Modified: freeswitch/branches/knhor/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_types.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_types.h Mon Jan 1 19:40:28 2007 @@ -724,6 +724,8 @@ SWITCH_EVENT_PRESENCE_IN - Presence in SWITCH_EVENT_PRESENCE_OUT - Presence out SWITCH_EVENT_PRESENCE_PROBE - Presence probe + SWITCH_EVENT_PRESENCE_SUBSCRIBE - Presence subscribe + SWITCH_EVENT_PRESENCE_UNSUBSCRIBE - Presnece unsubscribe SWITCH_EVENT_CODEC - Codec Change SWITCH_EVENT_BACKGROUND_JOB - Background Job SWITCH_EVENT_DETECTED_SPEECH - Detected Speech @@ -762,6 +764,8 @@ SWITCH_EVENT_PRESENCE_IN, SWITCH_EVENT_PRESENCE_OUT, SWITCH_EVENT_PRESENCE_PROBE, + SWITCH_EVENT_PRESENCE_SUBSCRIBE, + SWITCH_EVENT_PRESENCE_UNSUBSCRIBE, SWITCH_EVENT_ROSTER, SWITCH_EVENT_CODEC, SWITCH_EVENT_BACKGROUND_JOB, Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Jan 1 19:40:28 2007 @@ -193,6 +193,7 @@ static int sin_callback(void *pArg, int argc, char **argv, char **columnNames); #define is_special(s) (s && (strstr(s, "ext+") || strstr(s, "user+"))) +#define is_conference(s) (s && (strstr(s, "conf+"))) static char *translate_rpid(char *in, char *ext) { @@ -2145,19 +2146,29 @@ case LDL_SIGNAL_VCARD: do_vcard(handle, to, from, subject); break; + case LDL_SIGNAL_UNSUBSCRIBE: if ((sql = switch_mprintf("delete from subscriptions where sub_from='%q' and sub_to='%q';", from, to))) { execute_sql(profile->dbname, sql, profile->mutex); switch_core_db_free(sql); } - + if (is_conference(to)) { + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_UNSUBSCRIBE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "unsubscribe"); + switch_event_fire(&event); + } + } break; case LDL_SIGNAL_SUBSCRIBE: if ((sql = switch_mprintf("delete from subscriptions where sub_from='%q' and sub_to='%q';\n" - "insert into subscriptions values('%q','%q','%q','%q');\n", from, to, from, to, msg, subject))) { + "insert into subscriptions values('%q','%q','%q','%q');\n", from, to, from, to, msg, subject))) { execute_sql(profile->dbname, sql, profile->mutex); switch_core_db_free(sql); } @@ -2166,19 +2177,18 @@ ldl_handle_send_presence(profile->handle, to, from, NULL, NULL, "Click To Call"); } -#if 0 - if (is_special(to)) { - if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { + if (is_conference(to)) { + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_SUBSCRIBE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", to); - //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "unknown"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Click To Call"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "subscribe"); switch_event_fire(&event); } } -#endif break; + case LDL_SIGNAL_ROSTER: if (switch_event_create(&event, SWITCH_EVENT_ROSTER) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); @@ -2186,19 +2196,22 @@ switch_event_fire(&event); } break; + case LDL_SIGNAL_PRESENCE_PROBE: if (is_special(to)) { - ldl_handle_send_presence(profile->handle, to, from, NULL, NULL, "Click To Call"); - } else { + ldl_handle_send_presence(profile->handle, to, from, NULL, NULL, "Click To Call"); + } else { if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_PROBE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "probe"); switch_event_fire(&event); } - } - break; + } + break; + case LDL_SIGNAL_PRESENCE_IN: if ((sql = switch_mprintf("update subscriptions set show='%q', status='%q' where sub_from='%q'", msg, subject, from))) { @@ -2212,6 +2225,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", msg); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", subject); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "in"); switch_event_fire(&event); } @@ -2243,9 +2257,11 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "out"); switch_event_fire(&event); } break; + default: break; } Modified: freeswitch/branches/knhor/trunk/src/switch_event.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_event.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_event.c Mon Jan 1 19:40:28 2007 @@ -126,6 +126,8 @@ "PRESENCE_IN", "PRESENCE_OUT", "PRESENCE_PROBE", + "PRESENCE_SUBSCRIBE", + "PRESENCE_UNSUBSCRIBE", "ROSTER", "CODEC", "BACKGROUND_JOB",

1 0

[commit] r3885 - freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql
by Freeswitch SVN 01 Jan '07

01 Jan '07

Author: outcast Date: Mon Jan 1 16:26:05 2007 New Revision: 3885 Modified: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c Log: corrected if statement to check if mysql_xml is null. Also added a check for the section type. Modified: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c ============================================================================== --- freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c (original) +++ freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c Mon Jan 1 16:26:05 2007 @@ -79,38 +79,41 @@ return NULL; } - snprintf(mysql_query, sizeof(mysql_query), "SELECT data FROM xml_templates WHERE section = \"%s\" and name = \"%s\"", mysql_section, mysql_key_value); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Built query: %s\nSize: %d\n", mysql_query, sizeof(mysql_query)); + if(!(strcmp(mysql_section, "configuration"))) { + snprintf(mysql_query, sizeof(mysql_query), "SELECT data FROM xml_templates WHERE section = \"%s\" and name = \"%s\"", mysql_section, mysql_key_value); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Built query: %s\nSize: %d\n", mysql_query, sizeof(mysql_query)); - if(mysql_real_query(&globals.mysql, mysql_query, strlen(mysql_query)) == 0){ + if(mysql_real_query(&globals.mysql, mysql_query, strlen(mysql_query)) == 0){ - result = mysql_store_result(&globals.mysql); - if(result){ + result = mysql_store_result(&globals.mysql); + if(result){ - if(mysql_num_fields(result) == 1) { - if(!(row = mysql_fetch_row(result))) { + if(mysql_num_fields(result) == 1) { + if(!(row = mysql_fetch_row(result))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database returned an empty result\n"); - return NULL; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database returned an empty result\n"); + return NULL; + } else { + + mysql_xml = strdup(row[0]); + } } else { - mysql_xml = strdup(row[0]); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Incorrect amount of fields retrived please check MySQL query.\n"); + return NULL; } } else { - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Incorrect amount of fields retrived please check MySQL query.\n"); - return NULL; - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No records found for %s in database\n", mysql_key_value); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No records found for %s in database\n", mysql_key_value); + return NULL; + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Mysql Error: %s\n", mysql_error(&globals.mysql)); return NULL; - } + } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Mysql Error: %s\n", mysql_error(&globals.mysql)); - return NULL; - } - - if(mysql_query == NULL) { + return NULL; + } + if(mysql_xml == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database returned a null value\n"); return NULL; }

1 0

[commit] r3884 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 01 Jan '07

01 Jan '07

Author: knhor Date: Mon Jan 1 14:33:36 2007 New Revision: 3884 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: instead of requiring a profile name for the conference, use the profile "default" for not specified Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Jan 1 14:33:36 2007 @@ -3094,13 +3094,12 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - char *profile_name = strchr(argv[0],'@'); assert(conference != NULL); assert(stream != NULL); /* if we have a conference name with a profile name, and at least one member to transfer */ - if (argc >= 2 && !switch_strlen_zero(argv[0]) && !switch_strlen_zero(profile_name)) { + if (argc >= 2 && !switch_strlen_zero(argv[0])) { int x; for (x = 1; x<argc; x++) { @@ -3122,6 +3121,7 @@ switch_memory_pool_t *pool = NULL; conf_xml_cfg_t xml_cfg = {0}; char *conf_name; + char *profile_name; /* Setup a memory pool to use. */ if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { @@ -3133,13 +3133,15 @@ if ((profile_name = strchr(conf_name, '@'))) { *profile_name++ = '\0'; + } else { + profile_name = "default"; + } /* get the xml config sections */ if (conference_get_xml_sections(profile_name, &xml_cfg) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); goto done; } - } /* Create the conference object. */ new_conference = conference_new(conf_name, &xml_cfg, pool); @@ -3243,7 +3245,7 @@ {"say", (api_cmd_fn_t)&conf_api_sub_say, CONF_API_SUB_ARGS_AS_ONE, "<confname> say <text>"}, {"saymember", (api_cmd_fn_t)&conf_api_sub_saymember, CONF_API_SUB_ARGS_AS_ONE, "<confname> saymember <member_id> <text>"}, {"stop", (api_cmd_fn_t)&conf_api_sub_stop, CONF_API_SUB_MEMBER_TARGET, "<confname> stop <[current|all|last]> [<member_id>]"}, - {"transfer", (api_cmd_fn_t)&conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name@conference_profile_name> <member id> [...<member id>]"}, + {"transfer", (api_cmd_fn_t)&conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name[@conference_profile_name]> <member id> [...<member id>]"}, {"undeaf", (api_cmd_fn_t)&conf_api_sub_undeaf, CONF_API_SUB_MEMBER_TARGET, "<confname> undeaf <[member_id|all]|last>"}, {"unlock", (api_cmd_fn_t)&conf_api_sub_unlock, CONF_API_SUB_ARGS_SPLIT, "<confname> unlock"}, {"unmute", (api_cmd_fn_t)&conf_api_sub_unmute, CONF_API_SUB_MEMBER_TARGET, "<confname> unmute <[member_id|all]|last>"}, @@ -3686,13 +3688,15 @@ /* is there profile specification ? */ if ((profile_name = strchr(conf_name, '@'))) { *profile_name++ = '\0'; + } else { + profile_name = "default"; + } /* get the xml config sections */ if (conference_get_xml_sections(profile_name, &xml_cfg) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); - goto done; - } - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); + goto done; + } /* if this is a bridging call, and it's not a duplicate, build a */ /* conference object, and skip pin handling, and locked checking */

1 0

[commit] r3883 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 01 Jan '07

01 Jan '07

Author: knhor Date: Mon Jan 1 11:14:46 2007 New Revision: 3883 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: require a profile name when transfering members to another conference. fix conference presence for transfered members Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Jan 1 11:14:46 2007 @@ -3094,11 +3094,13 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; + char *profile_name = strchr(argv[0],'@'); assert(conference != NULL); assert(stream != NULL); - if (argc >= 2 && !switch_strlen_zero(argv[0])) { + /* if we have a conference name with a profile name, and at least one member to transfer */ + if (argc >= 2 && !switch_strlen_zero(argv[0]) && !switch_strlen_zero(profile_name)) { int x; for (x = 1; x<argc; x++) { @@ -3120,7 +3122,6 @@ switch_memory_pool_t *pool = NULL; conf_xml_cfg_t xml_cfg = {0}; char *conf_name; - char *profile_name; /* Setup a memory pool to use. */ if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { @@ -3242,7 +3243,7 @@ {"say", (api_cmd_fn_t)&conf_api_sub_say, CONF_API_SUB_ARGS_AS_ONE, "<confname> say <text>"}, {"saymember", (api_cmd_fn_t)&conf_api_sub_saymember, CONF_API_SUB_ARGS_AS_ONE, "<confname> saymember <member_id> <text>"}, {"stop", (api_cmd_fn_t)&conf_api_sub_stop, CONF_API_SUB_MEMBER_TARGET, "<confname> stop <[current|all|last]> [<member_id>]"}, - {"transfer", (api_cmd_fn_t)&conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name> <member id> [...<member id>]"}, + {"transfer", (api_cmd_fn_t)&conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name@conference_profile_name> <member id> [...<member id>]"}, {"undeaf", (api_cmd_fn_t)&conf_api_sub_undeaf, CONF_API_SUB_MEMBER_TARGET, "<confname> undeaf <[member_id|all]|last>"}, {"unlock", (api_cmd_fn_t)&conf_api_sub_unlock, CONF_API_SUB_ARGS_SPLIT, "<confname> unlock"}, {"unmute", (api_cmd_fn_t)&conf_api_sub_unmute, CONF_API_SUB_MEMBER_TARGET, "<confname> unmute <[member_id|all]|last>"}, @@ -4123,7 +4124,23 @@ conf_api_dispatch(conference, &stream, argc, argv, (const char *)body); } #endif - } + } else if (perm != NULL) { + char *p = strdup(perm); + + if (p != NULL) { + char *str = p; + + while(*p) { + if(*p == '|') { + *p = '\n'; + } + p++; + } + stream.write_function(&stream, "valid commands are;%s", str); + + free(str); + } + } } else { stream.write_function(&stream, "No parameters specified.\nTry 'help'\n"); } @@ -4180,6 +4197,8 @@ char *commands = (char *) switch_xml_attr(xml_kvp, "commands"); if (!switch_strlen_zero(name) && !switch_strlen_zero(commands)) { + // "commands" MUST be validated against the conf_api_sub_commands[] table + // and any invalid commands MUST be removed before being inserted in the hash switch_core_hash_insert(conference->chat_permissions_map, name, commands); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "chat-permissions %s=%s\n",name,commands); count ++; @@ -4460,7 +4479,8 @@ if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); +// switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); // i think this is wrong + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", to); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); switch_event_fire(&event);

1 0

[commit] r3882 - freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql
by Freeswitch SVN 01 Jan '07

01 Jan '07

Author: outcast Date: Mon Jan 1 04:33:18 2007 New Revision: 3882 Modified: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c Log: Giving credit where credit is due!!!!! Modified: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c ============================================================================== --- freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c (original) +++ freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c Mon Jan 1 04:33:18 2007 @@ -28,7 +28,7 @@ * * mod_xml_mysql.c -- CURL XML Gateway * - * Based on mod_xml_curl by Michael Jerris <mike(a)jerris.com> + * Based on mod_xml_curl by Anthony Minessale II <anthmct(a)yahoo.com> */

1 0

[commit] r3881 - freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql
by Freeswitch SVN 01 Jan '07

01 Jan '07

Author: outcast Date: Mon Jan 1 04:28:22 2007 New Revision: 3881 Added: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/ freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/Makefile freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/README freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c Log: new mod_xml_mysql module. Just testing some stuff. I will have better version soon. Added: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/Makefile ============================================================================== --- (empty file) +++ freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/Makefile Mon Jan 1 04:28:22 2007 @@ -0,0 +1,20 @@ +FLAGS += $(shell mysql_config --include) +LDFLAGS += $(shell mysql_config --libs) + +all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) + +depends: + + + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c + $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o + $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) + + +clean: + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.so *~ + +install: + cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod Added: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/README ============================================================================== --- (empty file) +++ freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/README Mon Jan 1 04:28:22 2007 @@ -0,0 +1,10 @@ +mod_xml_mysql +----- + + +This is an experimental module that I have written to load Freeswitch's configuration from a MySQL database. It may seem a bit crude. This is my first module for Freeswitch and the first time I have used the MySQL API. I would highly recommend not to use this in production. The database schema currently is not included due to the fact it is lame. I will come up with a better database schema and version of the module hopfully by mid-Jan. If you have any quesitons please email me. + + +Outcast aka James Jones <james(a)virtualrealmsoftware.com> + + Added: freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c ============================================================================== --- (empty file) +++ freeswitch/branches/outcast/src/mod/xml_int/mod_xml_mysql/mod_xml_mysql.c Mon Jan 1 04:28:22 2007 @@ -0,0 +1,219 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Outcast aka James Jones <james(a)virtualrealmsoftware.com> + * Michael Jerris <mike(a)jerris.com> + * + * mod_xml_mysql.c -- CURL XML Gateway + * + * Based on mod_xml_curl by Michael Jerris <mike(a)jerris.com> + */ + + +#include <switch.h> +#include <mysql/mysql.h> + +static const char modname[] = "mod_xml_mysql"; + + +static struct { + char *dbname; + char *bindings; + char *dbuser; + char *dbpass; + char *dbhost; + char *debug; + MYSQL mysql; +} globals; + +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dbname, globals.dbname); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_bindings, globals.bindings); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dbuser, globals.dbuser); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dbpass, globals.dbpass); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dbhost, globals.dbhost); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_debug, globals.debug); + + +static switch_xml_t xml_mysql_fetch(char *section, + char *tag_name, + char *key_name, + char *key_value, + char *params) +{ + char *mysql_section = NULL; + char *mysql_tag_name = NULL; + char *mysql_key_name = NULL; + char *mysql_key_value = NULL; + char *mysql_params = NULL; + char *mysql_xml = NULL; + char mysql_query[1000]; + switch_xml_t xml = NULL; + MYSQL_RES *result; + MYSQL_ROW row; + + if (!((mysql_section = section) && (mysql_tag_name = tag_name) && (mysql_key_name = key_name) && (mysql_key_value = key_value))) { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + return NULL; + } + + snprintf(mysql_query, sizeof(mysql_query), "SELECT data FROM xml_templates WHERE section = \"%s\" and name = \"%s\"", mysql_section, mysql_key_value); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Built query: %s\nSize: %d\n", mysql_query, sizeof(mysql_query)); + + if(mysql_real_query(&globals.mysql, mysql_query, strlen(mysql_query)) == 0){ + + result = mysql_store_result(&globals.mysql); + if(result){ + + if(mysql_num_fields(result) == 1) { + if(!(row = mysql_fetch_row(result))) { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database returned an empty result\n"); + return NULL; + } else { + + mysql_xml = strdup(row[0]); + } + } else { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Incorrect amount of fields retrived please check MySQL query.\n"); + return NULL; + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No records found for %s in database\n", mysql_key_value); + return NULL; + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Mysql Error: %s\n", mysql_error(&globals.mysql)); + return NULL; + } + + if(mysql_query == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database returned a null value\n"); + return NULL; + } + + if (!(xml = switch_xml_parse_str(mysql_xml, strlen(mysql_xml)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); + } + mysql_free_result(result); + return xml; +} + + +static switch_loadable_module_interface_t xml_mysql_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ NULL, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL +}; + +static switch_status_t do_config(void) +{ + char *cf = "xml_mysql.conf"; + switch_xml_t cfg, xml, settings, param; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "dbname")) { + char *bindings = (char *) switch_xml_attr_soft(param, "bindings"); + set_global_bindings(bindings); + set_global_dbname(val); + } else if (!strcasecmp(var, "dbhost")) { + set_global_dbhost(val); + } else if (!strcasecmp(var, "dbuser")) { + set_global_dbuser(val); + } else if (!strcasecmp(var, "dbpass")) { + set_global_dbpass(val); + } else if (!strcasecmp(var, "dbdebug")) { + set_global_debug(val); + } + } + } + + switch_xml_free(xml); + + return globals.dbname ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; +} + + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +{ + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &xml_mysql_module_interface; + + if (do_config() == SWITCH_STATUS_SUCCESS) { + if(mysql_init(&globals.mysql)==NULL) { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to iniate MySQL Connection\n"); + return SWITCH_STATUS_FALSE; + } + + if (!mysql_real_connect(&globals.mysql,globals.dbhost, globals.dbuser, globals.dbpass, globals.dbname,0,NULL,0)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to connect to Database: %s @ %s\n", globals.dbname, globals.dbhost); + return SWITCH_STATUS_FALSE; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding MySQL Fetch Function [%s] [%s]\n", + globals.dbname, globals.bindings ? globals.bindings : "all"); + switch_xml_bind_search_function(xml_mysql_fetch, switch_xml_parse_section_string(globals.bindings)); + } else { + return SWITCH_STATUS_FALSE; + } + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +{ + mysql_close(&globals.mysql); + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r3880 - freeswitch/branches/enterux_solutions
by Freeswitch SVN 31 Dec '06

31 Dec '06

Author: sphere Date: Sun Dec 31 17:01:46 2006 New Revision: 3880 Added: freeswitch/branches/enterux_solutions/ Log: Creating empty folder for enterux_solutions

1 0