- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13540 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: mikej Date: Mon Jun 1 17:50:03 2009 New Revision: 13540 Log: Tue May 19 12:03:18 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tport_tls.c: removed global tls_ex_data_idx, using static one Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon Jun 1 17:50:03 2009 @@ -1 +1 @@ -Mon Jun 1 17:49:04 CDT 2009 +Mon Jun 1 17:49:52 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Mon Jun 1 17:50:03 2009 @@ -90,7 +90,7 @@ #include "tport_tls.h" char const tls_version[] = OPENSSL_VERSION_TEXT; -int tls_ex_data_idx = -1; /* see SSL_get_ex_new_index(3ssl) */ +static int tls_ex_data_idx = -1; /* see SSL_get_ex_new_index(3ssl) */ static void tls_init_once(void)

1 0

[commit] r13539 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: mikej Date: Mon Jun 1 17:49:18 2009 New Revision: 13539 Log: Thu May 14 13:01:25 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nta.c: sanity checks for fork()ed cases Ignore-this: f384a65929393f36012f433292a73a91 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon Jun 1 17:49:18 2009 @@ -1 +1 @@ -Tue May 26 17:22:34 CDT 2009 +Mon Jun 1 17:49:04 CDT 2009 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 Mon Jun 1 17:49:18 2009 @@ -8881,11 +8881,7 @@ orq = original->orq_forks; original->orq_forks = orq->orq_forks; - //assert(orq->orq_forking == original); - - if (orq->orq_forking != original) { - break; - } + assert(orq->orq_forking == original); SU_DEBUG_5(("nta: timer %s fired, %s %s (%u);tag=%s\n", "D", "terminate", orq->orq_method_name, orq->orq_cseq->cs_seq,

1 0

[commit] r13538 - freeswitch/trunk/w32/Library
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: mikej Date: Mon Jun 1 16:29:58 2009 New Revision: 13538 Log: build: fix msvc 64 bit build regression from upnp build (FSBUILD-167) Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Mon Jun 1 16:29:58 2009 @@ -850,6 +850,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -871,6 +872,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -896,6 +898,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -917,6 +920,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -942,6 +946,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -963,6 +968,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -988,6 +994,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127;4389;4706" /> </FileConfiguration> @@ -1009,6 +1016,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127;4389;4706" /> </FileConfiguration> @@ -1034,6 +1042,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -1055,6 +1064,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -1080,6 +1090,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -1101,6 +1112,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -1126,6 +1138,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -1147,6 +1160,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -1172,6 +1186,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -1193,6 +1208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -1218,6 +1234,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -1239,6 +1256,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4127" /> </FileConfiguration> @@ -1266,6 +1284,7 @@ > <Tool Name="VCCLCompilerTool" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100" /> </FileConfiguration> @@ -1285,6 +1304,7 @@ > <Tool Name="VCCLCompilerTool" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100" /> </FileConfiguration> @@ -1308,6 +1328,7 @@ > <Tool Name="VCCLCompilerTool" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100" /> </FileConfiguration> @@ -1327,6 +1348,7 @@ > <Tool Name="VCCLCompilerTool" + UsePrecompiledHeader="0" DisableSpecificWarnings="4100" /> </FileConfiguration>

1 0

[commit] r13537 - freeswitch/trunk/libs/libnatpmp
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: mikej Date: Mon Jun 1 14:23:53 2009 New Revision: 13537 Log: fix windows build a different way Modified: freeswitch/trunk/libs/libnatpmp/natpmp.c Modified: freeswitch/trunk/libs/libnatpmp/natpmp.c ============================================================================== --- freeswitch/trunk/libs/libnatpmp/natpmp.c (original) +++ freeswitch/trunk/libs/libnatpmp/natpmp.c Mon Jun 1 14:23:53 2009 @@ -183,7 +183,7 @@ int n; if(!p) return NATPMP_ERR_INVALIDARGS; - n = recvfrom(p->s, buf, sizeof(buf), 0, + n = recvfrom(p->s, (char *)buf, sizeof(buf), 0, (struct sockaddr *)&addr, &addrlen); if(n<0) switch(errno) {

1 0

[commit] r13536 - freeswitch/trunk/libs/libnatpmp
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: brian Date: Mon Jun 1 14:20:45 2009 New Revision: 13536 Log: tweak for linux Modified: freeswitch/trunk/libs/libnatpmp/natpmp.c Modified: freeswitch/trunk/libs/libnatpmp/natpmp.c ============================================================================== --- freeswitch/trunk/libs/libnatpmp/natpmp.c (original) +++ freeswitch/trunk/libs/libnatpmp/natpmp.c Mon Jun 1 14:20:45 2009 @@ -177,7 +177,7 @@ int readnatpmpresponse(natpmp_t * p, natpmpresp_t * response) { - char buf[16]; + unsigned char buf[16]; struct sockaddr_in addr; socklen_t addrlen = sizeof(addr); int n;

1 0

[commit] r13535 - freeswitch/trunk/w32/Library
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: mikej Date: Mon Jun 1 14:15:34 2009 New Revision: 13535 Log: add upnp to windows build Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Mon Jun 1 14:15:34 2009 @@ -48,7 +48,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -141,7 +141,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -233,7 +233,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC" RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="switch.h" @@ -322,7 +322,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC" RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="switch.h" @@ -743,6 +743,42 @@ > </File> <File + RelativePath="..\..\src\switch_nat.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + DisableSpecificWarnings="4389;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + DisableSpecificWarnings="4389;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + DisableSpecificWarnings="4389;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + DisableSpecificWarnings="4389;4127" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\src\switch_odbc.c" > </File> @@ -786,6 +822,516 @@ RelativePath="..\..\src\switch_xml_config.c" > </File> + <Filter + Name="miniupnpc" + > + <File + RelativePath="..\..\libs\miniupnpc\declspec.h" + > + </File> + <File + RelativePath="..\..\libs\miniupnpc\igd_desc_parse.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\minisoap.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\minissdpc.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\miniupnpc.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127;4389;4706" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127;4389;4706" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127;4389;4706" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127;4389;4706" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\miniwget.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\minixml.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\upnpcommands.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\upnperrors.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\upnpreplyparse.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="natpmp" + > + <File + RelativePath="..\..\libs\libnatpmp\getgateway.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + DisableSpecificWarnings="4100" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + DisableSpecificWarnings="4100" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\libnatpmp\natpmp.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + DisableSpecificWarnings="4100" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + DisableSpecificWarnings="4100" + /> + </FileConfiguration> + </File> + </Filter> </Filter> <Filter Name="Header Files" Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Mon Jun 1 14:15:34 2009 @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -136,7 +136,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC" RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="switch.h" @@ -445,6 +445,26 @@ > </File> <File + RelativePath="..\..\src\switch_nat.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + DisableSpecificWarnings="4389;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + DisableSpecificWarnings="4389;4127" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\src\switch_odbc.c" > </File> @@ -508,6 +528,322 @@ RelativePath="..\..\src\switch_xml_config.c" > </File> + <Filter + Name="miniupnpc" + > + <File + RelativePath="..\..\libs\miniupnpc\declspec.h" + > + </File> + <File + RelativePath="..\..\libs\miniupnpc\igd_desc_parse.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\minisoap.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\minissdpc.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\miniupnpc.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127;4389;4706" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127;4389;4706" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\miniwget.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\minixml.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\upnpcommands.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\upnperrors.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\miniupnpc\upnpreplyparse.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100;4127" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="natpmp" + > + <File + RelativePath="..\..\libs\libnatpmp\getgateway.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\libnatpmp\natpmp.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + DisableSpecificWarnings="4100" + /> + </FileConfiguration> + </File> + </Filter> </Filter> <Filter Name="Header Files"

1 0

[commit] r13534 - in freeswitch/trunk/libs: libnatpmp miniupnpc
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: mikej Date: Mon Jun 1 14:03:26 2009 New Revision: 13534 Log: msvc build fixes for libnatpmp and miniupnpc Modified: freeswitch/trunk/libs/libnatpmp/getgateway.c freeswitch/trunk/libs/libnatpmp/getgateway.h freeswitch/trunk/libs/libnatpmp/natpmp.c freeswitch/trunk/libs/libnatpmp/natpmp.h freeswitch/trunk/libs/libnatpmp/wingettimeofday.c freeswitch/trunk/libs/miniupnpc/codelength.h freeswitch/trunk/libs/miniupnpc/minissdpc.c Modified: freeswitch/trunk/libs/libnatpmp/getgateway.c ============================================================================== --- freeswitch/trunk/libs/libnatpmp/getgateway.c (original) +++ freeswitch/trunk/libs/libnatpmp/getgateway.c Mon Jun 1 14:03:26 2009 @@ -18,7 +18,9 @@ #ifndef WIN32 #include <netinet/in.h> #endif +#ifndef _MSC_VER #include <sys/param.h> +#endif /* There is no portable method to get the default route gateway. * So below are three differents functions implementing this. * Parsing /proc/net/route is for linux. @@ -271,10 +273,10 @@ DWORD numSubKeys = 0; TCHAR keyName[MAX_KEY_LENGTH]; DWORD keyNameLength = MAX_KEY_LENGTH; - TCHAR keyValue[MAX_VALUE_LENGTH]; + BYTE keyValue[MAX_VALUE_LENGTH]; DWORD keyValueLength = MAX_VALUE_LENGTH; DWORD keyValueType = REG_SZ; - TCHAR gatewayValue[MAX_VALUE_LENGTH]; + BYTE gatewayValue[MAX_VALUE_LENGTH]; DWORD gatewayValueLength = MAX_VALUE_LENGTH; DWORD gatewayValueType = REG_MULTI_SZ; int done = 0; @@ -369,7 +371,7 @@ { //printf("keyValue: %s\n", keyValue); - if(RegOpenKeyEx(interfacesKey, keyValue, 0, KEY_READ, &interfaceKey) == ERROR_SUCCESS) + if(RegOpenKeyEx(interfacesKey, (char *)keyValue, 0, KEY_READ, &interfaceKey) == ERROR_SUCCESS) { gatewayValueLength = MAX_VALUE_LENGTH; if(ERROR_SUCCESS == RegQueryValueEx(interfaceKey, // Open registry key @@ -413,7 +415,7 @@ if(done) { - *addr = inet_addr(gatewayValue); + *addr = inet_addr((char *)gatewayValue); return 0; } Modified: freeswitch/trunk/libs/libnatpmp/getgateway.h ============================================================================== --- freeswitch/trunk/libs/libnatpmp/getgateway.h (original) +++ freeswitch/trunk/libs/libnatpmp/getgateway.h Mon Jun 1 14:03:26 2009 @@ -17,7 +17,11 @@ #define __GETGATEWAY_H__ #ifdef WIN32 +#ifdef _MSC_VER +typedef unsigned __int32 uint32_t; +#else #include <stdint.h> +#endif #define in_addr_t uint32_t #endif #include "declspec.h" Modified: freeswitch/trunk/libs/libnatpmp/natpmp.c ============================================================================== --- freeswitch/trunk/libs/libnatpmp/natpmp.c (original) +++ freeswitch/trunk/libs/libnatpmp/natpmp.c Mon Jun 1 14:03:26 2009 @@ -16,13 +16,28 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include <string.h> #include <time.h> +#ifndef _MSC_VER #include <sys/time.h> +#endif #ifdef WIN32 #include <winsock2.h> #include <Ws2tcpip.h> #include <io.h> #define EWOULDBLOCK WSAEWOULDBLOCK #define ECONNREFUSED WSAECONNREFUSED + +static int gettimeofday(struct timeval* p, void* tz /* IGNORED */) { + union { + long long ns100; /*time since 1 Jan 1601 in 100ns units */ + FILETIME ft; + } _now; + + GetSystemTimeAsFileTime( &(_now.ft) ); + p->tv_usec=(long)((_now.ns100 / 10LL) % 1000000LL ); + p->tv_sec= (long)((_now.ns100-(116444736000000000LL))/10000000LL); + return 0; +} + #else #include <errno.h> #include <unistd.h> @@ -150,7 +165,7 @@ if(!p || (protocol!=NATPMP_PROTOCOL_TCP && protocol!=NATPMP_PROTOCOL_UDP)) return NATPMP_ERR_INVALIDARGS; p->pending_request[0] = 0; - p->pending_request[1] = protocol; + p->pending_request[1] = (char)protocol; p->pending_request[2] = 0; p->pending_request[3] = 0; *((uint16_t *)(p->pending_request + 4)) = htons(privateport); @@ -162,7 +177,7 @@ int readnatpmpresponse(natpmp_t * p, natpmpresp_t * response) { - unsigned char buf[16]; + char buf[16]; struct sockaddr_in addr; socklen_t addrlen = sizeof(addr); int n; Modified: freeswitch/trunk/libs/libnatpmp/natpmp.h ============================================================================== --- freeswitch/trunk/libs/libnatpmp/natpmp.h (original) +++ freeswitch/trunk/libs/libnatpmp/natpmp.h Mon Jun 1 14:03:26 2009 @@ -21,10 +21,17 @@ #define NATPMP_PORT (5351) #include <time.h> +#ifndef _MSC_VER #include <sys/time.h> +#endif #ifdef WIN32 #include <winsock2.h> +#ifdef _MSC_VER +typedef unsigned __int32 uint32_t; +typedef unsigned __int16 uint16_t; +#else #include <stdint.h> +#endif #define in_addr_t uint32_t #include "declspec.h" #else @@ -36,7 +43,7 @@ int s; /* socket */ in_addr_t gateway; /* default gateway (IPv4) */ int has_pending_request; - unsigned char pending_request[12]; + char pending_request[12]; int pending_request_len; int try_number; struct timeval retry_time; Modified: freeswitch/trunk/libs/libnatpmp/wingettimeofday.c ============================================================================== --- freeswitch/trunk/libs/libnatpmp/wingettimeofday.c (original) +++ freeswitch/trunk/libs/libnatpmp/wingettimeofday.c Mon Jun 1 14:03:26 2009 @@ -1,25 +0,0 @@ -#ifdef WIN32 -#include <sys/time.h> - -typedef struct _FILETIME { - unsigned long dwLowDateTime; - unsigned long dwHighDateTime; -} FILETIME; - -void __stdcall GetSystemTimeAsFileTime(FILETIME*); - -//void gettimeofday(struct timeval* p, void* tz /* IGNORED */); - -void gettimeofday(struct timeval* p, void* tz /* IGNORED */) { - union { - long long ns100; /*time since 1 Jan 1601 in 100ns units */ - FILETIME ft; - } _now; - - GetSystemTimeAsFileTime( &(_now.ft) ); - p->tv_usec=(long)((_now.ns100 / 10LL) % 1000000LL ); - p->tv_sec= (long)((_now.ns100-(116444736000000000LL))/10000000LL); - return; -} -#endif - Modified: freeswitch/trunk/libs/miniupnpc/codelength.h ============================================================================== --- freeswitch/trunk/libs/miniupnpc/codelength.h (original) +++ freeswitch/trunk/libs/miniupnpc/codelength.h Mon Jun 1 14:03:26 2009 @@ -14,11 +14,11 @@ do { n = (n << 7) | (*p & 0x7f); } \ while(*(p++)&0x80); -#define CODELENGTH(n, p) if(n>=268435456) *(p++) = (n >> 28) | 0x80; \ - if(n>=2097152) *(p++) = (n >> 21) | 0x80; \ - if(n>=16384) *(p++) = (n >> 14) | 0x80; \ - if(n>=128) *(p++) = (n >> 7) | 0x80; \ - *(p++) = n & 0x7f; +#define CODELENGTH(n, p) if(n>=268435456) *(p++) = (unsigned char)((n >> 28) | 0x80); \ + if(n>=2097152) *(p++) = (unsigned char)((n >> 21) | 0x80); \ + if(n>=16384) *(p++) = (unsigned char)((n >> 14) | 0x80); \ + if(n>=128) *(p++) = (unsigned char)((n >> 7) | 0x80); \ + *(p++) = (unsigned char)(n & 0x7f); #endif Modified: freeswitch/trunk/libs/miniupnpc/minissdpc.c ============================================================================== --- freeswitch/trunk/libs/miniupnpc/minissdpc.c (original) +++ freeswitch/trunk/libs/miniupnpc/minissdpc.c Mon Jun 1 14:03:26 2009 @@ -8,7 +8,15 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#ifdef _MSC_VER +#include <io.h> +typedef intptr_t ssize_t; +#define read _read +#define write _write +#define close _close +#else #include <unistd.h> +#endif #include <sys/types.h> #ifdef WIN32 #include <winsock2.h> @@ -27,6 +35,10 @@ struct UPNPDev * getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath) { +#ifdef _MSC_VER + /* sockaddr_un not supported on msvc*/ + return NULL; +#else struct UPNPDev * tmp; struct UPNPDev * devlist = NULL; unsigned char buffer[2048]; @@ -105,5 +117,6 @@ } close(s); return devlist; +#endif }

1 0

[commit] r13533 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: mikej Date: Mon Jun 1 13:51:19 2009 New Revision: 13533 Log: msvc build fix Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Jun 1 13:51:19 2009 @@ -70,12 +70,12 @@ } if (argv[0] && switch_stristr("add", argv[0])) { - if (switch_nat_add_mapping(atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { + if (switch_nat_add_mapping((switch_port_t)atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "true"); goto ok; } } else if (argv[0] && switch_stristr("del", argv[0])) { - if (switch_nat_del_mapping(atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { + if (switch_nat_del_mapping((switch_port_t)atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "true"); goto ok; }

1 0

[commit] r13532 - freeswitch/trunk/src
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: brian Date: Mon Jun 1 13:28:19 2009 New Revision: 13532 Log: moving init up so we have it in pre process vars Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jun 1 13:28:19 2009 @@ -1128,8 +1128,6 @@ runtime.flags = flags; runtime.sps_total = 30; - - switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET); switch_core_set_variable("local_ip_v4", guess_ip); switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET6); @@ -1139,6 +1137,8 @@ switch_event_init(runtime.memory_pool); + switch_nat_init(runtime.memory_pool); + if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) { apr_terminate(); return SWITCH_STATUS_MEMERR; @@ -1161,7 +1161,6 @@ switch_scheduler_task_thread_start(); switch_rtp_init(runtime.memory_pool); - switch_nat_init(runtime.memory_pool); runtime.running = 1;

1 0

[commit] r13531 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: brian Date: Mon Jun 1 13:24:54 2009 New Revision: 13531 Log: adding nat_map api Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Jun 1 13:24:54 2009 @@ -44,6 +44,53 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_commands_shutdown); SWITCH_MODULE_DEFINITION(mod_commands, mod_commands_load, mod_commands_shutdown, NULL); +SWITCH_STANDARD_API(nat_map_function) +{ + int argc; + char *mydata = NULL, *argv[4]; + switch_nat_ip_proto_t proto = SWITCH_NAT_UDP; + + if (!cmd) { + goto error; + } + + mydata = strdup(cmd); + switch_assert(mydata); + + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + + if (argc < 3) { + goto error; + } + + if (argv[2] && switch_stristr("tcp", argv[2])) { + proto = SWITCH_NAT_TCP; + } else if (argv[2] && switch_stristr("udp", argv[2])) { + proto = SWITCH_NAT_UDP; + } + + if (argv[0] && switch_stristr("add", argv[0])) { + if (switch_nat_add_mapping(atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "true"); + goto ok; + } + } else if (argv[0] && switch_stristr("del", argv[0])) { + if (switch_nat_del_mapping(atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "true"); + goto ok; + } + } + + error: + + stream->write_function(stream, "false"); + + ok: + + switch_safe_free(mydata); + + return SWITCH_STATUS_SUCCESS; +} SWITCH_STANDARD_API(time_test_function) { @@ -3483,6 +3530,7 @@ SWITCH_ADD_API(commands_api_interface, "stun", "stun", stun_function, "<stun_server>[:port]"); SWITCH_ADD_API(commands_api_interface, "system", "Execute a system command", system_function, SYSTEM_SYNTAX); SWITCH_ADD_API(commands_api_interface, "time_test", "time_test", time_test_function, "<mss>"); + SWITCH_ADD_API(commands_api_interface, "nat_map", "nat_map", nat_map_function, "[add|del] <port> [tcp|udp]"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_NOUNLOAD;

1 0