June 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13545 - in freeswitch/trunk/libs/spandsp/src: . spandsp
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: mikej Date: Tue Jun 2 09:42:16 2009 New Revision: 13545 Log: use __cdecl calling convention for callback functions Modified: freeswitch/trunk/libs/spandsp/src/fsk.c freeswitch/trunk/libs/spandsp/src/hdlc.c freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h freeswitch/trunk/libs/spandsp/src/tone_generate.c freeswitch/trunk/libs/spandsp/src/v27ter_tx.c freeswitch/trunk/libs/spandsp/src/v29tx.c Modified: freeswitch/trunk/libs/spandsp/src/fsk.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/fsk.c (original) +++ freeswitch/trunk/libs/spandsp/src/fsk.c Tue Jun 2 09:42:16 2009 @@ -169,7 +169,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len) +SPAN_DECLARE_NONSTD(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len) { int sample; int bit; Modified: freeswitch/trunk/libs/spandsp/src/hdlc.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/hdlc.c (original) +++ freeswitch/trunk/libs/spandsp/src/hdlc.c Tue Jun 2 09:42:16 2009 @@ -252,7 +252,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit) +SPAN_DECLARE_NONSTD(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit) { if (new_bit < 0) { @@ -545,7 +545,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) hdlc_tx_get_bit(hdlc_tx_state_t *s) +SPAN_DECLARE_NONSTD(int) hdlc_tx_get_bit(hdlc_tx_state_t *s) { int txbit; Modified: freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c (original) +++ freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c Tue Jun 2 09:42:16 2009 @@ -87,7 +87,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, +SPAN_DECLARE_NONSTD(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, int16_t amp[], int len) { Modified: freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h Tue Jun 2 09:42:16 2009 @@ -175,7 +175,7 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -SPAN_DECLARE(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE_NONSTD(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len); /*! Get the current received signal power. \param s The modem context. Modified: freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h Tue Jun 2 09:42:16 2009 @@ -154,7 +154,7 @@ \param s A pointer to an HDLC receiver context. \param new_bit The bit. */ -SPAN_DECLARE(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit); +SPAN_DECLARE_NONSTD(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit); /*! \brief Put a byte of data to an HDLC receiver. \param s A pointer to an HDLC receiver context. @@ -228,7 +228,7 @@ \param s A pointer to an HDLC transmitter context. \return The next bit for transmission. */ -SPAN_DECLARE(int) hdlc_tx_get_bit(hdlc_tx_state_t *s); +SPAN_DECLARE_NONSTD(int) hdlc_tx_get_bit(hdlc_tx_state_t *s); /*! \brief Get the next byte for transmission. \param s A pointer to an HDLC transmitter context. Modified: freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h Tue Jun 2 09:42:16 2009 @@ -125,7 +125,7 @@ \param len The number of samples to generate. \return The number of samples generated. */ -SPAN_DECLARE(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, +SPAN_DECLARE_NONSTD(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, int16_t amp[], int len); Modified: freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h Tue Jun 2 09:42:16 2009 @@ -88,7 +88,7 @@ int d4, int repeat); -SPAN_DECLARE(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples); +SPAN_DECLARE_NONSTD(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples); SPAN_DECLARE(tone_gen_state_t *) tone_gen_init(tone_gen_state_t *s, tone_gen_descriptor_t *t); Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h Tue Jun 2 09:42:16 2009 @@ -141,7 +141,7 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -SPAN_DECLARE(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE_NONSTD(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h Tue Jun 2 09:42:16 2009 @@ -172,7 +172,7 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -SPAN_DECLARE(int) v29_tx(v29_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE_NONSTD(int) v29_tx(v29_tx_state_t *s, int16_t amp[], int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/tone_generate.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/tone_generate.c (original) +++ freeswitch/trunk/libs/spandsp/src/tone_generate.c Tue Jun 2 09:42:16 2009 @@ -143,7 +143,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples) +SPAN_DECLARE_NONSTD(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples) { int samples; int limit; Modified: freeswitch/trunk/libs/spandsp/src/v27ter_tx.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/v27ter_tx.c (original) +++ freeswitch/trunk/libs/spandsp/src/v27ter_tx.c Tue Jun 2 09:42:16 2009 @@ -244,7 +244,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len) +SPAN_DECLARE_NONSTD(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len) { #if defined(SPANDSP_USE_FIXED_POINT) complexi_t x; Modified: freeswitch/trunk/libs/spandsp/src/v29tx.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/v29tx.c (original) +++ freeswitch/trunk/libs/spandsp/src/v29tx.c Tue Jun 2 09:42:16 2009 @@ -202,7 +202,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) v29_tx(v29_tx_state_t *s, int16_t amp[], int len) +SPAN_DECLARE_NONSTD(int) v29_tx(v29_tx_state_t *s, int16_t amp[], int len) { #if defined(SPANDSP_USE_FIXED_POINT) complexi_t x;

1 0

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

02 Jun '09

Author: mrene Date: Mon Jun 1 19:56:14 2009 New Revision: 13544 Log: mod_sofia: its cuter that way 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:56:14 2009 @@ -3976,15 +3976,15 @@ /* Clean out the host part of any suffix */ if ((p = strchr(h, ':'))) { - *p = 0; + *p = '\0'; } if ((p = strchr(h, ';'))) { - *p = 0; + *p = '\0'; } if ((p = strchr(h, ' '))) { - *p = 0; + *p = '\0'; } *user = u;

1 0

[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