- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13543 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: mrene Date: Mon Jun 1 19:54:38 2009 New Revision: 13543 Log: mod_sofia: Rewrite sofia_glue_get_user_host Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Mon Jun 1 19:54:38 2009 @@ -3961,20 +3961,30 @@ *user = NULL; *host = NULL; - if (!strncasecmp(u, "sip:", 4)) { - u += 4; - } - + /* First isolate the host part from the user part */ if ((h = strchr(u, '@'))) { *h++ = '\0'; } else { return 0; } - p = h + strlen(h) - 1; + /* Clean out the user part of its protocol prefix (if any) */ + if ((p = strchr(u, ':'))) { + *p++ = '\0'; + u = p; + } - if (p && (*p == ':' || *p == ';' || *p == ' ')) { - *p = '\0'; + /* Clean out the host part of any suffix */ + if ((p = strchr(h, ':'))) { + *p = 0; + } + + if ((p = strchr(h, ';'))) { + *p = 0; + } + + if ((p = strchr(h, ' '))) { + *p = 0; } *user = u;

1 0

[commit] r13542 - 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:51:27 2009 New Revision: 13542 Log: Thu May 14 13:05:11 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nta_outgoing_tcreate(): log offending tag 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:51:27 2009 @@ -1 +1 @@ -Mon Jun 1 17:50:41 CDT 2009 +Mon Jun 1 17:51:14 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:51:27 2009 @@ -7196,6 +7196,7 @@ sip_t *sip; nta_outgoing_t *orq = NULL; ta_list ta; + tagi_t const *tagi; if (leg == NULL) return NULL; @@ -7209,8 +7210,15 @@ ta_start(ta, tag, value); - if (sip_add_tl(msg, sip, ta_tags(ta)) < 0) - ; + tagi = ta_args(ta); + + if (sip_add_tagis(msg, sip, &tagi) < 0) { + if (tagi && tagi->t_tag) { + tag_type_t t = tagi->t_tag; + SU_DEBUG_5(("%s(): bad tag %s::%s\n", __func__, + t->tt_ns ? t->tt_ns : "", t->tt_name ? t->tt_name : "")); + } + } else if (route_url == NULL && leg->leg_route && leg->leg_loose_route && !(route_url = (url_string_t *)leg->leg_route->r_url))

1 0

[commit] r13541 - 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:50:59 2009 New Revision: 13541 Log: Thu May 14 09:05:13 CDT 2009 Aleksander Morgado <aleksander(a)es.gnu.org> * extra_100 parameter at transaction level Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.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:59 2009 @@ -1 +1 @@ -Mon Jun 1 17:49:52 CDT 2009 +Mon Jun 1 17:50:41 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:50:59 2009 @@ -440,6 +440,7 @@ unsigned irq_reliable_tp:1; /**< Transport is reliable */ unsigned irq_sigcomp_zap:1; /**< Reset SigComp */ unsigned irq_must_100rel:1; /**< 100rel is required */ + unsigned irq_extra_100:1; /**< 100 Trying should be sent */ unsigned irq_tag_set:1; /**< Tag is not from request */ unsigned :0; @@ -5274,6 +5275,7 @@ } irq->irq_branch = sip->sip_via->v_branch; irq->irq_reliable_tp = tport_is_reliable(tport); + irq->irq_extra_100 = 1; /* Sending extra 100 trying true by default */ if (sip->sip_timestamp) irq->irq_timestamp = sip_timestamp_copy(home, sip->sip_timestamp); @@ -6016,8 +6018,9 @@ sip->sip_request->rq_method_name, irq->irq_status)); incoming_retransmit_reply(irq, tport); } - else if (irq->irq_agent->sa_extra_100) { - /* Answer automatically with 100 Trying */ + else if (irq->irq_agent->sa_extra_100 && + irq->irq_extra_100) { + /* Agent and Irq configured to answer automatically with 100 Trying */ if (irq->irq_method == sip_method_invite || /* * Send 100 trying to non-invite if at least half of T2 has expired @@ -6184,11 +6187,11 @@ /**Set server transaction parameters. * - * Sets the server transaction parameters. The parameters determine the way + * Sets the server transaction parameters. Among others, parameters determine the way * the SigComp compression is handled. * * @TAGS - * NTATAG_COMP(), and NTATAG_SIGCOMP_CLOSE(). + * NTATAG_COMP(), NTATAG_SIGCOMP_CLOSE() and NTATAG_EXTRA_100(). * * @retval number of set parameters when succesful * @retval -1 upon an error @@ -6234,6 +6237,9 @@ else if (tptag_compartment == tt) cc = (void *)t->t_value, retval++; + + else if (ntatag_extra_100 == tt) + irq->irq_extra_100 = t->t_value != 0, retval++; } if (cc != NONE) { @@ -6848,9 +6854,16 @@ } else { /* Timer N1 */ - SU_DEBUG_5(("nta: timer N1 fired, sending %u %s\n", SIP_100_TRYING)); incoming_reset_timer(irq); - nta_incoming_treply(irq, SIP_100_TRYING, TAG_END()); + + if(irq->irq_extra_100) { + SU_DEBUG_5(("nta: timer N1 fired, sending %u %s\n", SIP_100_TRYING)); + nta_incoming_treply(irq, SIP_100_TRYING, TAG_END()); + } + else { + SU_DEBUG_5(("nta: timer N1 fired, but avoided sending %u %s\n", + SIP_100_TRYING)); + } } } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c Mon Jun 1 17:50:59 2009 @@ -967,9 +967,17 @@ * to a request within half of the SIP T2 (the default value for T2 is 4000 * milliseconds, so the extra <i>100 Trying</i> would be sent after 2 seconds). * + * At agent level, this option applies to retransmissions of both non-INVITE + * and INVITE transactions. + * + * At incoming request level, this option can disable sending the 100 Trying for + * both retransmissions (if set at agent level) and N1 firings, for just a given + * incoming request. + * * @par Used with * nua_create(), nua_set_params(), - * nta_agent_create(), nta_agent_set_params() + * nta_agent_create(), nta_agent_set_params(), + * nta_incoming_set_params() * * @par Parameter type * boolean: true (non-zero or non-NULL pointer) @@ -979,9 +987,12 @@ * - true - send extra 100 Trying if application does not respond * - false - do not send 100 Trying * - * @par Default Value + * @par Default Value at Agent level * - 0 (false, do not respond with 100 Trying to retransmissions) - + * + * @par Default Value at incoming transaction level + * - 1 (true, respond with 100 Trying to retransmissions and when N1 fired) + * * @sa @RFC4320, NTATAG_PASS_408(), NTATAG_TIMEOUT_408() */ tag_typedef_t ntatag_extra_100 = BOOLTAG_TYPEDEF(extra_100);

1 0

[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