March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12750 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:45:45 2009 New Revision: 12750 Log: Wed Mar 11 11:51:43 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sres_sip.c: silence VC warnings Ignore-this: dd9d4b774716430cdf429ed86664b109 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:45:45 2009 @@ -1 +1 @@ -Tue Mar 24 10:44:15 CDT 2009 +Tue Mar 24 10:44:50 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c Tue Mar 24 10:45:45 2009 @@ -1440,8 +1440,8 @@ memset(ai, 0, (sizeof ai)); ai->ai_protocol = stp->stp_number; - ai->ai_addr = memset(su, 0, (sizeof su->su_sin6)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin6); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin6)); + su->su_len = (sizeof su->su_sin6); su->su_family = ai->ai_family = AF_INET6; su->su_port = htons(step->sp_port); @@ -1477,8 +1477,8 @@ memset(ai, 0, (sizeof ai)); ai->ai_protocol = stp->stp_number; - ai->ai_addr = memset(su, 0, (sizeof su->su_sin)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin)); + su->su_len = (sizeof su->su_sin); su->su_family = ai->ai_family = AF_INET; su->su_port = htons(step->sp_port); @@ -1541,8 +1541,8 @@ memset(ai, 0, (sizeof ai)); (void)buffer; if (host_is_ip4_address(target)) { - ai->ai_addr = memset(su, 0, (sizeof su->su_sin)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin)); + su->su_len = (sizeof su->su_sin); if (su_inet_pton(su->su_family = ai->ai_family = AF_INET, target, &su->su_sin.sin_addr) <= 0) { srs->srs_error = SRES_SIP_ERR_BAD_URI; @@ -1551,8 +1551,8 @@ } #if SU_HAVE_IN6 else if (host_is_ip6_address(target)) { - ai->ai_addr = memset(su, 0, (sizeof su->su_sin6)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin6); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin6)); + su->su_len = (sizeof su->su_sin6); if (su_inet_pton(su->su_family = ai->ai_family = AF_INET6, target, &su->su_sin6.sin6_addr) <= 0) { srs->srs_error = SRES_SIP_ERR_BAD_URI; @@ -1562,8 +1562,8 @@ else if (host_is_ip6_reference(target)) { size_t len = strlen(target) - 2; - ai->ai_addr = memset(su, 0, (sizeof su->su_sin6)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin6); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin6)); + su->su_len = (sizeof su->su_sin6); if (len >= sizeof buffer || !memcpy(buffer, target + 1, len) ||

1 0

[commit] r12749 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:45:13 2009 New Revision: 12749 Log: Wed Mar 11 11:50:44 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * msg_mime.c: explicit cast when assigning to mp_len Ignore-this: ca5b8291eb84d8b166ab7f659bcf69f8 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:45:13 2009 @@ -1 +1 @@ -Tue Mar 24 10:43:39 CDT 2009 +Tue Mar 24 10:44:15 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c Tue Mar 24 10:45:13 2009 @@ -513,7 +513,7 @@ for (mp = all; mp; mp = mp->mp_next) { mp->mp_data = boundary; - mp->mp_len = blen; + mp->mp_len = (unsigned)blen; /* XXX */ assert(mp->mp_payload || mp->mp_separator); @@ -613,7 +613,8 @@ for (; mp; mp = mp->mp_next) { if (mp->mp_data == NULL) { - mp->mp_data = boundary, mp->mp_len = blen; + mp->mp_data = boundary; + mp->mp_len = (unsigned)blen; /* XXX */ } else { if (mp->mp_len < 3) return -1;

1 0

[commit] r12748 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:44:33 2009 New Revision: 12748 Log: Wed Mar 11 11:58:14 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sofia-sip/su_config.h: include extern in SOFIAPUBVAR Ignore-this: 7cccd45776e8452a8e404aaf01eaeadf Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:44:33 2009 @@ -1 +1 @@ -Tue Mar 24 10:43:08 CDT 2009 +Tue Mar 24 10:43:39 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h Tue Mar 24 10:44:33 2009 @@ -84,7 +84,7 @@ #undef SOFIAPUBVAR #if defined(IN_LIBSOFIA_SIP_UA) #define SOFIAPUBFUN __declspec(dllexport) - #define SOFIAPUBVAR __declspec(dllexport) + #define SOFIAPUBVAR __declspec(dllexport) extern #else #define SOFIAPUBFUN __declspec(dllimport) #define SOFIAPUBVAR __declspec(dllimport) extern @@ -104,7 +104,7 @@ #undef SOFIAPUBVAR #if defined(IN_LIBSOFIA_SIP_UA) #define SOFIAPUBFUN __declspec(dllexport) - #define SOFIAPUBVAR __declspec(dllexport) extern + #define SOFIAPUBVAR __declspec(dllexport) extern #else #define SOFIAPUBFUN __declspec(dllimport) #define SOFIAPUBVAR __declspec(dllimport)

1 0

[commit] r12747 - in freeswitch/trunk/libs/sofia-sip: . s2check
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:44:04 2009 New Revision: 12747 Log: Wed Mar 11 09:50:20 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * s2check: added exit77.c to EXTRA_DIST Ignore-this: ae3403c0bd1b4596c24bc7304916fa85 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:44:04 2009 @@ -1 +1 @@ -Tue Mar 24 10:42:34 CDT 2009 +Tue Mar 24 10:43:08 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am Tue Mar 24 10:44:04 2009 @@ -28,7 +28,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = +EXTRA_DIST = exit77.c # ---------------------------------------------------------------------- # Tests

1 0

[commit] r12746 - in freeswitch/trunk/libs/sofia-sip: . s2check
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:43:28 2009 New Revision: 12746 Log: Wed Mar 11 09:49:37 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * s2base.c: use struct timeval with gettimeofday() Ignore-this: 1ca4ea3c958573a1fa845d8b66b7d6ad Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/s2base.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:43:28 2009 @@ -1 +1 @@ -Tue Mar 24 10:41:57 CDT 2009 +Tue Mar 24 10:42:34 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2base.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2base.c (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.c Tue Mar 24 10:43:28 2009 @@ -74,7 +74,7 @@ static double now(void) { - struct timespec tv; + struct timeval tv; gettimeofday(&tv, NULL);

1 0

[commit] r12745 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:42:53 2009 New Revision: 12745 Log: Mon Mar 9 12:44:03 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * su_alloc: shorten race on _su_deinit() Ignore-this: 6d4e6edb434a96e66c9bb018a201a3c6 Make home object unusable earlier during denitialization. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:42:53 2009 @@ -1 +1 @@ -Tue Mar 24 10:41:20 CDT 2009 +Tue Mar 24 10:41:57 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Tue Mar 24 10:42:53 2009 @@ -993,6 +993,9 @@ if (home->suh_blocks) { size_t i; su_block_t *b; + void *suh_lock = home->suh_lock; + + home->suh_lock = NULL; if (home->suh_blocks->sub_destructor) { void (*destructor)(void *) = home->suh_blocks->sub_destructor; @@ -1034,11 +1037,7 @@ home->suh_blocks = NULL; - if (home->suh_lock) { - void *suh_lock = home->suh_lock; - - home->suh_lock = NULL; - + if (suh_lock) { /* Unlock, or risk assert() or leak handles on Windows */ _su_home_unlocker(suh_lock); _su_home_destroy_mutexes(suh_lock);

1 0

[commit] r12744 - in freeswitch/trunk/libs/sofia-sip: . packages
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:42:16 2009 New Revision: 12744 Log: Mon Mar 9 12:42:48 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * packages/sofia-sip-ua.pc.in: silenced warning from configure Ignore-this: dcf6a0fed627e267f5128af5508bcb8f Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-ua.pc.in Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:42:16 2009 @@ -1 +1 @@ -Tue Mar 24 10:40:43 CDT 2009 +Tue Mar 24 10:41:20 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-ua.pc.in ============================================================================== --- freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-ua.pc.in (original) +++ freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-ua.pc.in Tue Mar 24 10:42:16 2009 @@ -4,6 +4,7 @@ libexecdir=@libexecdir@ includedir=@includedir@ include_sofiadir=@include_sofiadir@ +datarootdir=@datarootdir@ sofiaawkdir=@datadir@/@PACKAGE@ Name: sofia-sip-ua

1 0

[commit] r12743 - in freeswitch/trunk/libs/sofia-sip: . tests
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:41:38 2009 New Revision: 12743 Log: Mon Mar 9 12:42:00 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * test_nua_api.c: nua_i_none is no more unknown Ignore-this: b7232be3e3956337161266c1814ddd37 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/tests/test_nua_api.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:41:38 2009 @@ -1 +1 @@ -Tue Mar 24 10:40:08 CDT 2009 +Tue Mar 24 10:40:43 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/tests/test_nua_api.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_nua_api.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_nua_api.c Tue Mar 24 10:41:38 2009 @@ -94,7 +94,7 @@ TEST_1(!nua_handle_has_registrations(NULL)); TEST_1(!nua_handle_remote(NULL)); TEST_1(!nua_handle_local(NULL)); - TEST_S(nua_event_name(-1), "NUA_UNKNOWN"); + TEST_S(nua_event_name(-111), "NUA_UNKNOWN"); TEST_VOID(nua_register(NULL, TAG_END())); TEST_VOID(nua_unregister(NULL, TAG_END())); TEST_VOID(nua_invite(NULL, TAG_END()));

1 0

[commit] r12742 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:41:03 2009 New Revision: 12742 Log: Mon Mar 9 12:32:13 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua: added nua_i_none to nua_event_name() Ignore-this: 5d262decadfc28b82ab7292330e20530 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_common.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:41:03 2009 @@ -1 +1 @@ -Tue Mar 24 10:39:35 CDT 2009 +Tue Mar 24 10:40:08 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_common.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_common.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_common.c Tue Mar 24 10:41:03 2009 @@ -309,6 +309,8 @@ char const *nua_event_name(nua_event_t event) { switch (event) { + case nua_i_none: return "nua_i_none"; + case nua_i_error: return "nua_i_error"; case nua_i_invite: return "nua_i_invite"; case nua_i_cancel: return "nua_i_cancel";

1 0

[commit] r12741 - in freeswitch/trunk/libs/sofia-sip: . s2check
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:40:31 2009 New Revision: 12741 Log: Thu Mar 5 13:20:53 CST 2009 Pekka Pessi <first.last(a)nokia.com> * s2util.h, s2time.c: added s2_timed_logger() Ignore-this: 504e7e5c1201b0b2d5c345c31d5d4b71 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/s2time.c freeswitch/trunk/libs/sofia-sip/s2check/s2util.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:40:31 2009 @@ -1 +1 @@ -Tue Mar 24 10:38:12 CDT 2009 +Tue Mar 24 10:39:35 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2time.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2time.c (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2time.c Tue Mar 24 10:40:31 2009 @@ -26,6 +26,9 @@ #include "s2util.h" +#include <string.h> +#include <stdio.h> + /* -- Delay scenarios --------------------------------------------------- */ static unsigned long time_offset; @@ -49,3 +52,23 @@ su_root_step(root, 0); } +void +s2_timed_logger(void *stream, char const *fmt, va_list ap) +{ + char buffer[4096]; + su_time_t now = su_now(); + size_t prefix, wrote; + int n; + + snprintf(buffer, sizeof buffer, + "%02u:%02u:%02u.%06lu[+%lu] ", + (unsigned)(now.tv_sec / 3600 % 24), + (unsigned)(now.tv_sec / 60 % 60), + (unsigned)(now.tv_sec % 60), + now.tv_usec, + time_offset); + prefix = strlen(buffer); + n = vsnprintf(buffer + prefix, (sizeof buffer) - prefix, fmt, ap); + if (n > 0) + wrote = fwrite(buffer, prefix + n, 1, stream); +} Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2util.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2util.h (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2util.h Tue Mar 24 10:40:31 2009 @@ -34,10 +34,12 @@ */ #include <sofia-sip/su_wait.h> +#include <stdarg.h> SOFIA_BEGIN_DECLS void s2_fast_forward(unsigned long seconds, su_root_t *root); +void s2_timed_logger(void *stream, char const *fmt, va_list ap); SOFIA_END_DECLS

1 0