February 2009 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r12306 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: mikej Date: Thu Feb 26 12:41:11 2009 New Revision: 12306 Log: Thu Feb 26 09:47:46 CST 2009 Pekka Pessi <first.last(a)nokia.com> * check_sres_sip.c: more test cases for naptr Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_sres_sip.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am Thu Feb 26 12:41:11 2009 @@ -19,13 +19,15 @@ check_PROGRAMS = torture_sresolv test_sresolv -TESTS = torture_sresolv run_test_sresolv +TESTS = check_PROGRAMS += check_sres_sip TESTS += check_sres_sip check_sres_sip_LDADD = $(LDADD) ${top_builddir}/s2check/libs2.a @CHECK_LIBS@ INCLUDES += -I${top_srcdir}/s2check +TESTS += torture_sresolv run_test_sresolv + CLEANFILES = resolv.conf error.conf named.conf.tmp \ .test_sresolv.api.conf.?????? \ named.run 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 Thu Feb 26 12:41:11 2009 @@ -602,6 +602,72 @@ } END_TEST +START_TEST(found_naptr_nohint) +{ + sres_sip_t *srs; + char const *d; + + s2_dns_default(d = "example.com."); + + s2_dns_record(d, sres_type_naptr, + /* order priority flags services regexp target */ + d, sres_type_naptr, 20, 50, "s", "SIP+D2Z", "", "_sip._tilulilu", + /* priority weight port target */ + "_sip._tilulilu", sres_type_srv, 2, 100, 5060, "sip00", + "sip00", sres_type_a, "12.13.14.15", + NULL); + + srs = sres_sip_new(x->sres, (void *)"sip:example.com", NULL, + 1, 1, + resolver_callback, x->root); + fail_if(srs == NULL); + + while (sres_sip_next_step(srs)) + su_root_step(x->root, 1000); + + fail_unless(sres_sip_results(srs) == NULL); + fail_unless(sres_sip_error(srs) == SRES_SIP_ERR_NO_TPORT); + + sres_sip_unref(srs); +} +END_TEST + +START_TEST(found_bad_naptr) +{ + sres_sip_t *srs; + su_addrinfo_t const *ai; + char const *d; + + s2_dns_default(d = "example.com."); + + s2_dns_record(d, sres_type_naptr, + /* order priority flags services regexp target */ + d, sres_type_naptr, 20, 50, "s", "ZIP+D2T", "", "_zip._tcp", + NULL); + + s2_dns_record(d, sres_type_a, + "", sres_type_a, "11.12.13.14", + NULL); + + srs = sres_sip_new(x->sres, (void *)"sip:example.com", NULL, + 1, 1, + resolver_callback, x->root); + fail_if(srs == NULL); + + while (sres_sip_next_step(srs)) + su_root_run(x->root); + + ai = sres_sip_results(srs); + assert(ai != NULL); + fail_if(ai->ai_protocol != TPPROTO_UDP); + fail_if(!(ai = ai->ai_next)); + fail_if(ai->ai_protocol != TPPROTO_TCP); + fail_if((ai = ai->ai_next)); + + sres_sip_unref(srs); +} +END_TEST + START_TEST(ignore_naptr) { sres_sip_t *srs; @@ -1033,6 +1099,8 @@ tcase_add_test(tc, found_maddr_ip); tcase_add_test(tc, found_a_aaaa); tcase_add_test(tc, found_naptr); + tcase_add_test(tc, found_bad_naptr); + tcase_add_test(tc, found_naptr_nohint); tcase_add_test(tc, found_naptr2); tcase_add_test(tc, found_naptr3); tcase_add_test(tc, found_naptr_with_a);

1 0

[Freeswitch-svn] [commit] r12305 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: mikej Date: Thu Feb 26 12:40:20 2009 New Revision: 12305 Log: Thu Feb 26 09:39:43 CST 2009 Michael Jerris <mike(a)jerris.com> * sres_sip.c: fix warnings 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 Thu Feb 26 12:40:20 2009 @@ -1 +1 @@ -Thu Feb 26 12:38:20 CST 2009 +Thu Feb 26 12:40:06 CST 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 Thu Feb 26 12:40:20 2009 @@ -1535,9 +1535,10 @@ char const *target = srs->srs_target; su_addrinfo_t ai[1]; su_sockaddr_t su[1]; + char buffer[64]; int i; - memset(ai, 0, (sizeof ai)); + memset(ai, 0, (sizeof ai)); (void)buffer; if (host_is_ip4_address(target)) { ai->ai_addr = memset(su, 0, (sizeof su->su_sin)); @@ -1559,7 +1560,6 @@ } } else if (host_is_ip6_reference(target)) { - char buffer[64]; size_t len = strlen(target) - 2; ai->ai_addr = memset(su, 0, (sizeof su->su_sin6));

1 0

[Freeswitch-svn] [commit] r12304 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: mikej Date: Thu Feb 26 12:38:34 2009 New Revision: 12304 Log: Thu Feb 26 09:31:51 CST 2009 Michael Jerris <mike(a)jerris.com> * su_localinfo.c: fix build on non-ipv6 hosts Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 26 12:38:34 2009 @@ -1 +1 @@ -Thu Feb 26 12:36:01 CST 2009 +Thu Feb 26 12:38:20 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c Thu Feb 26 12:38:34 2009 @@ -96,8 +96,7 @@ #endif static int li_scope4(uint32_t ip4); - -#ifdef SU_HAVE_IN6 +#if SU_HAVE_IN6 static int li_scope6(struct in6_addr const *ip6); #endif @@ -632,6 +631,9 @@ struct ifreq ifreq[1]; int scope, if_index, flags = 0, gni_flags = 0; char *if_name; +#if SU_HAVE_IN6 + su_sockaddr_t su2[1]; +#endif #if SA_LEN if (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_addr)) @@ -749,7 +751,6 @@ #if SU_HAVE_IN6 if (su_xtra) { - su_sockaddr_t su2[1]; /* Map IPv4 address to IPv6 address */ memset(su2, 0, sizeof(*su2)); su2->su_family = AF_INET6;

1 0

[Freeswitch-svn] [commit] r12303 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: mikej Date: Thu Feb 26 12:36:35 2009 New Revision: 12303 Log: Thu Feb 26 09:18:43 CST 2009 Michael Jerris <mike(a)jerris.com> * soa.c: fix build on non-ipv6 hosts Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 26 12:36:35 2009 @@ -1 +1 @@ -Thu Feb 26 12:31:34 CST 2009 +Thu Feb 26 12:36:01 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c Thu Feb 26 12:36:35 2009 @@ -2452,34 +2452,31 @@ sdp_connection_t const *mc; if (m->m_rejected) - continue; + continue; for (mc = m->m_connections; mc; mc = mc->c_next) { for (li = res; li; li = li->li_next) { if (!su_casematch(li->li_canonname, mc->c_address)) continue; #if HAVE_SIN6 - if (li->li_family == AF_INET6) { - if (ip6 > ip4) - break; - else if (!li6) - li6 = li; /* Best IP6 address */ - } -#endif - else if (li->li_family == AF_INET) { - if (ip4 > ip6) { - break; - } else if (!li4) { - li4 = li; /* Best IP4 address */ - } - } - } - } + if (li->li_family == AF_INET6) { + if (ip6 > ip4) + break; + else if (!li6) + li6 = li; /* Best IP6 address */ } - - if (li) { - break; +#endif + else if (li->li_family == AF_INET) { + if (ip4 > ip6) + break; + else if (!li4) + li4 = li; /* Best IP4 address */ } + } + } + + if (li) + break; } if (li == NULL && ip4) @@ -2523,20 +2520,20 @@ if (li == NULL) { for (li = res; li; li = li->li_next) { + if (li->li_family == AF_INET) { + if (ip4 >= ip6) + break; + else if (!li4) + li4 = li; /* Best IP4 address */ + } #if HAVE_SIN6 - if (li->li_family == AF_INET6) { + else if (li->li_family == AF_INET6) { if (ip6 >= ip4) break; else if (!li6) li6 = li; /* Best IP6 address */ - } else -#endif - if (li->li_family == AF_INET) { - if (ip4 >= ip6) - break; - else if (!li4) - li4 = li; /* Best IP4 address */ } +#endif } if (li == NULL && ip4)

1 0

[Freeswitch-svn] [commit] r12302 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: mikej Date: Thu Feb 26 12:31:50 2009 New Revision: 12302 Log: Thu Feb 26 09:15:52 CST 2009 Pekka Pessi <first.last(a)nokia.com> * soa.c: fix address matching with user sdp w/out session c= line Ignore-this: 9aa560f8abd799d46e38c2e4ee0ca23c Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 26 12:31:50 2009 @@ -1 +1 @@ -Thu Feb 26 12:23:25 CST 2009 +Thu Feb 26 12:31:34 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c Thu Feb 26 12:31:50 2009 @@ -2454,12 +2454,10 @@ if (m->m_rejected) continue; - if (sdp && sdp->sdp_connection && sdp->sdp_connection->c_address) { - for (mc = m->m_connections; mc; mc = mc->c_next) { - for (li = res; li; li = li->li_next) { - if (!li->li_canonname || !su_casematch(li->li_canonname, sdp->sdp_connection->c_address)) { - continue; - } + for (mc = m->m_connections; mc; mc = mc->c_next) { + for (li = res; li; li = li->li_next) { + if (!su_casematch(li->li_canonname, mc->c_address)) + continue; #if HAVE_SIN6 if (li->li_family == AF_INET6) { if (ip6 > ip4)

1 0

[Freeswitch-svn] [commit] r12301 - freeswitch/trunk/src
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: silik0n Date: Thu Feb 26 12:28:26 2009 New Revision: 12301 Log: whitespace cleanup (tabs not spaces) Modified: freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Thu Feb 26 12:28:26 2009 @@ -99,11 +99,11 @@ #endif #if defined(DARWIN) - struct timespec ts; - ts.tv_sec = t / APR_USEC_PER_SEC; - ts.tv_nsec = (t % APR_USEC_PER_SEC) * 1000; + struct timespec ts; + ts.tv_sec = t / APR_USEC_PER_SEC; + ts.tv_nsec = (t % APR_USEC_PER_SEC) * 1000; - nanosleep(&ts, NULL); + nanosleep(&ts, NULL); sched_yield(); #else apr_sleep(t); @@ -669,12 +669,12 @@ { struct tm xtm = { 0 }; const char *tz_name = tz; - const char *tzdef; + const char *tzdef; time_t timep; if (!thetime) { - thetime = switch_micro_time_now(); - } + thetime = switch_micro_time_now(); + } timep = (thetime) / (int64_t) (1000000); @@ -1648,14 +1648,14 @@ register const struct ttinfo *ttisp; if ( tzstring == NULL ) - tzstring = gmt; + tzstring = gmt; tzptr = (struct state *) malloc(sizeof (struct state)); sp = tzptr; if (tzptr != NULL) { - + memset(tzptr, 0, sizeof(struct state)); (void) tzparse(tzstring, tzptr, FALSE); @@ -1676,7 +1676,7 @@ } ttisp = &sp->ttis[i]; - /* + /* To get (wrong) behavior that's compatible with System V Release 2.0 you'd replace the statement below with t += ttisp->tt_gmtoff;

1 0

[Freeswitch-svn] [commit] r12300 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: brian Date: Thu Feb 26 12:25:27 2009 New Revision: 12300 Log: Thu Feb 26 09:12:40 CST 2009 Michael Jerris <mike(a)jerris.com> * sresolv/Makefile.am: don't override CFLAGS Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am Thu Feb 26 12:25:27 2009 @@ -24,6 +24,7 @@ check_PROGRAMS += check_sres_sip TESTS += check_sres_sip check_sres_sip_LDADD = $(LDADD) ${top_builddir}/s2check/libs2.a @CHECK_LIBS@ +INCLUDES += -I${top_srcdir}/s2check CLEANFILES = resolv.conf error.conf named.conf.tmp \ .test_sresolv.api.conf.?????? \

1 0

[Freeswitch-svn] [commit] r12299 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: brian Date: Thu Feb 26 12:24:05 2009 New Revision: 12299 Log: Tue Feb 3 10:31:33 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_wait.h: added su_root_clone() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 26 12:24:05 2009 @@ -1 +1 @@ -Thu Feb 26 12:22:23 CST 2009 +Thu Feb 26 12:23:25 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h Thu Feb 26 12:24:05 2009 @@ -487,6 +487,9 @@ SOFIAPUBFUN int su_root_set_max_defer(su_root_t *, su_duration_t max_defer); SOFIAPUBFUN su_duration_t su_root_get_max_defer(su_root_t const *self); +SOFIAPUBFUN su_root_t *su_root_clone(su_root_t *root, su_root_magic_t *magic) + __attribute__((__malloc__)); + /* Timers */ SOFIAPUBFUN su_timer_t *su_timer_create(su_task_r const, su_duration_t msec) __attribute__((__malloc__)); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Thu Feb 26 12:24:05 2009 @@ -409,6 +409,48 @@ return su_root_create_with_port(magic, su_port_create()); } +/* Initializer used by su_root_clone() */ +static int +su_root_clone_initializer(su_root_t *root, + su_root_magic_t *magic) +{ + *(su_root_t **)magic = root; + return 0; +} + +/** Create a a new root object sharing port/thread with existing one. + * + * Allocate and initialize the instance of su_root_t. + * + * @param magic pointer to user data + * + * @return A pointer to allocated su_root_t instance, NULL on error. + * + * @NEW_1_12_11 + */ +su_root_t * +su_root_clone(su_root_t *self, su_root_magic_t *magic) +{ + int threading = 0, error; + su_clone_r clone; + su_root_t *cloned = NULL; + + if (self == NULL) + return NULL; + + threading = self->sur_threading, self->sur_threading = 0; + error = su_clone_start(self, clone, + (void *)&cloned, su_root_clone_initializer, NULL); + self->sur_threading = threading; + + if (error) + return NULL; + + su_clone_forget(clone); /* destroyed with su_root_destroy() */ + su_root_set_magic(cloned, magic); + return cloned; +} + /**@internal * * Create a reactor object using given message port.

1 0

[Freeswitch-svn] [commit] r12298 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: brian Date: Thu Feb 26 12:23:05 2009 New Revision: 12298 Log: Tue Feb 3 10:29:44 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_alloc: added su_home_parent() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 26 12:23:05 2009 @@ -1 +1 @@ -Wed Feb 25 13:40:08 CST 2009 +Thu Feb 26 12:22:23 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h Thu Feb 26 12:23:05 2009 @@ -101,6 +101,8 @@ SU_DLL int su_home_has_parent(su_home_t const *home); +SU_DLL su_home_t *su_home_parent(su_home_t const *home); + SU_DLL void su_home_check(su_home_t const *home); SU_DLL int su_home_check_alloc(su_home_t const *home, void const *data); 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 Thu Feb 26 12:23:05 2009 @@ -746,8 +746,21 @@ /** Return true if home is a clone. */ int su_home_has_parent(su_home_t const *home) { - return home && !home->suh_lock && - home->suh_blocks && home->suh_blocks->sub_parent; + return su_home_parent(home) != NULL; +} + +/** Return home's parent home. */ +su_home_t *su_home_parent(su_home_t const *home) +{ + su_home_t *parent = NULL; + + if (home && home->suh_blocks) { + su_block_t *sub = MEMLOCK(home); + parent = sub->sub_parent; + UNLOCK(home); + } + + return parent; } /** Allocate a memory block. @@ -1134,6 +1147,12 @@ for (i = 0; i < n; i++) if (s->sub_nodes[i].sua_data) { su_block_add(d, s->sub_nodes[i].sua_data)[0] = s->sub_nodes[i]; + if (s->sub_nodes[i].sua_home) { + su_home_t *subhome = s->sub_nodes[i].sua_data; + su_block_t *subsub = MEMLOCK(subhome); + subsub->sub_parent = dst; + UNLOCK(subhome); + } } s->sub_used = 0; @@ -1152,8 +1171,21 @@ s = MEMLOCK(src); if (s && s->sub_used) { + n = s->sub_n; + + for (i = 0; i < n; i++) { + if (s->sub_nodes[i].sua_data && s->sub_nodes[i].sua_home) { + su_home_t *subhome = s->sub_nodes[i].sua_data; + su_block_t *subsub = MEMLOCK(subhome); + subsub->sub_parent = dst; + UNLOCK(subhome); + } + } + s->sub_used = 0; memset(s->sub_nodes, 0, s->sub_n * sizeof (s->sub_nodes[0])); + + s->sub_used = 0; } UNLOCK(src); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c Thu Feb 26 12:23:05 2009 @@ -192,6 +192,34 @@ TEST(h1->suh_size, 13); } + /* Test su_home_parent() */ + TEST_1(h0 = su_home_new(sizeof *h0)); + TEST_1(h1 = su_home_clone(h0->home, sizeof *h1)); + TEST_1(h2 = su_home_clone(h1->home, sizeof *h2)); + TEST_1(h3 = su_home_clone(h2->home, sizeof *h3)); + + TEST_P(su_home_parent(h0->home), NULL); + TEST_P(su_home_parent(h1->home), h0); + TEST_P(su_home_parent(h2->home), h1); + TEST_P(su_home_parent(h3->home), h2); + TEST(su_home_move(h0->home, h1->home), 0); + TEST_P(su_home_parent(h2->home), h0); + TEST_P(su_home_parent(h3->home), h2); + TEST(su_home_move(h0->home, h2->home), 0); + TEST_P(su_home_parent(h3->home), h0); + + su_home_move(NULL, h0->home); + + TEST_P(su_home_parent(h0->home), NULL); + TEST_P(su_home_parent(h1->home), NULL); + TEST_P(su_home_parent(h2->home), NULL); + TEST_P(su_home_parent(h3->home), NULL); + + su_home_unref(h0->home); + su_home_unref(h1->home); + su_home_unref(h2->home); + su_home_unref(h3->home); + END(); }

1 0

[Freeswitch-svn] [commit] r12297 - freeswitch/trunk/src
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: brian Date: Thu Feb 26 11:17:35 2009 New Revision: 12297 Log: fix bug that didn't change voice when going menu-top Modified: freeswitch/trunk/src/switch_ivr_menu.c Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Thu Feb 26 11:17:35 2009 @@ -389,7 +389,6 @@ channel = switch_core_session_get_channel(session); - if (!(menu = switch_ivr_menu_find(stack, name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Menu!\n"); switch_goto_status(SWITCH_STATUS_FALSE, end); @@ -443,6 +442,11 @@ char substituted[1024]; char *use_arg = ap->arg; + if(!switch_strlen_zero(menu->tts_engine) && !switch_strlen_zero(menu->tts_voice)) { + switch_channel_set_variable(channel, "tts_engine", menu->tts_engine); + switch_channel_set_variable(channel, "tts_voice", menu->tts_voice); + } + if (ap->re) { switch_regex_t *re = NULL; int ovector[30];

1 0