- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

24 Mar '09

Author: mikej Date: Tue Mar 24 10:39:08 2009 New Revision: 12740 Log: Thu Mar 5 13:09:53 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nta.c: #include <sofia-sip/htable.h> here Ignore-this: bab8054edc65e3defbed6db325e1deba 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_internal.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:39:08 2009 @@ -1 +1 @@ -Tue Mar 24 10:37:37 CDT 2009 +Tue Mar 24 10:38:12 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 Tue Mar 24 10:39:08 2009 @@ -74,6 +74,7 @@ #include <sofia-sip/msg_addr.h> #include <sofia-sip/msg_parser.h> +#include <sofia-sip/htable.h> /* Resolver context type */ #define SRES_CONTEXT_T nta_outgoing_t Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h Tue Mar 24 10:39:08 2009 @@ -47,7 +47,6 @@ #if HAVE_SOFIA_SRESOLV #include <sofia-sip/sresolv.h> #endif -#include <sofia-sip/htable.h> typedef struct nta_compressor nta_compressor_t;

1 0

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

24 Mar '09

Author: mikej Date: Tue Mar 24 10:38:33 2009 New Revision: 12739 Log: Thu Mar 5 13:08:22 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nta.c: nta_leg_tag(leg, NULL) now always returns the tag (old or new) Ignore-this: f5a7d67ed90e2c284f6696d6b5b89326 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 Tue Mar 24 10:38:33 2009 @@ -1 +1 @@ -Tue Mar 24 10:36:48 CDT 2009 +Tue Mar 24 10:37:37 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 Tue Mar 24 10:38:33 2009 @@ -4391,7 +4391,7 @@ /* If there already is a tag, return NULL if it does not match with new one */ if (leg->leg_local->a_tag) { - if (su_casematch(tag, leg->leg_local->a_tag)) + if (tag == NULL || su_casematch(tag, leg->leg_local->a_tag)) return leg->leg_local->a_tag; else return NULL;

1 0

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

24 Mar '09

Author: mikej Date: Tue Mar 24 10:37:43 2009 New Revision: 12738 Log: Thu Mar 5 13:06:59 CST 2009 Pekka Pessi <first.last(a)nokia.com> * run_test_nta: fixed bashism with exec Ignore-this: 6d034eb8fd66f6a903e3219589f62eef Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:37:43 2009 @@ -1 +1 @@ -Tue Mar 24 10:36:05 CDT 2009 +Tue Mar 24 10:36:48 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta Tue Mar 24 10:37:43 2009 @@ -188,7 +188,7 @@ # -g is also very nice option for named named -f -c $namedfile & pid=$! -while ! test -r $pidfile && kill -0 $! +while ! test -r $pidfile && kill -0 $! 2>/dev/null do sleep 1 done @@ -205,12 +205,10 @@ exit $exit else echo "$0: cannot start named (check apparmor/selinux)" - exec ipv6=$ipv6 $VALGRIND ./test_nta "$@" + ipv6=$ipv6 $VALGRIND exec ./test_nta "$@" fi else # not having BIND and portbind - -ipv6=$ipv6 $VALGRIND ./test_nta "$@" -exit $? + ipv6=$ipv6 $VALGRIND exec ./test_nta "$@" fi

1 0

[commit] r12737 - 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:37:01 2009 New Revision: 12737 Log: Thu Mar 5 13:21:25 CST 2009 Pekka Pessi <first.last(a)nokia.com> * check_sres_sip.c: use S2_CASE() Ignore-this: da194ea35fa98a73f3da3b4b5257aa8f Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_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:37:01 2009 @@ -1 +1 @@ -Tue Mar 24 10:35:04 CDT 2009 +Tue Mar 24 10:36:05 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_sres_sip.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_sres_sip.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_sres_sip.c Tue Mar 24 10:37:01 2009 @@ -160,7 +160,7 @@ sres_sip_t *srs; #if 0 - s2_case("1.0", "Check invalid input values", + S2_CASE("1.0", "Check invalid input values", "Detailed explanation for empty test case."); #endif

1 0