- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12309 - freeswitch/trunk/libs/sofia-sip/m4
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: mikej Date: Thu Feb 26 12:44:49 2009 New Revision: 12309 Log: resync file to darcs Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 ============================================================================== --- freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 (original) +++ freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Thu Feb 26 12:44:49 2009 @@ -526,7 +526,7 @@ AC_FUNC_ALLOCA -AC_CHECK_FUNCS([gettimeofday strerror random tcsetattr initstate flock \ +AC_CHECK_FUNCS([gettimeofday strerror random initstate tcsetattr flock \ socketpair gethostname gethostbyname getipnodebyname \ poll epoll_create kqueue select if_nameindex \ signal alarm \

1 0

[commit] r12308 - freeswitch/trunk/libs/sofia-sip/open_c/group
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: mikej Date: Thu Feb 26 12:43:04 2009 New Revision: 12308 Log: Thu Feb 26 11:05:33 CST 2009 Pekka Pessi <first.last(a)nokia.com> * open_c: added sres_sip.[hc] Ignore-this: 61c5ac3ce4149b23ff98faedb412cec7 Modified: freeswitch/trunk/libs/sofia-sip/open_c/group/bld.inf freeswitch/trunk/libs/sofia-sip/open_c/group/libsofia-sip-ua.mmp Modified: freeswitch/trunk/libs/sofia-sip/open_c/group/bld.inf ============================================================================== --- freeswitch/trunk/libs/sofia-sip/open_c/group/bld.inf (original) +++ freeswitch/trunk/libs/sofia-sip/open_c/group/bld.inf Thu Feb 26 12:43:04 2009 @@ -74,6 +74,7 @@ ../../libsofia-sip-ua/soa/sofia-sip/soa_session.h \epoc32\include\osextensions\sofia-sip\soa_session.h ../../libsofia-sip-ua/soa/sofia-sip/soa_tag.h \epoc32\include\osextensions\sofia-sip\soa_tag.h ../../libsofia-sip-ua/sresolv/sofia-sip/sresolv.h \epoc32\include\osextensions\sofia-sip\sresolv.h +../../libsofia-sip-ua/sresolv/sofia-sip/sres_sip.h \epoc32\include\osextensions\sofia-sip\sres_sip.h ../../libsofia-sip-ua/sresolv/sofia-resolv/sres.h \epoc32\include\osextensions\sofia-resolv/sres.h ../../libsofia-sip-ua/sresolv/sofia-resolv/sres_async.h \epoc32\include\osextensions\sofia-resolv/sres_async.h ../../libsofia-sip-ua/sresolv/sofia-resolv/sres_cache.h \epoc32\include\osextensions\sofia-resolv/sres_cache.h Modified: freeswitch/trunk/libs/sofia-sip/open_c/group/libsofia-sip-ua.mmp ============================================================================== --- freeswitch/trunk/libs/sofia-sip/open_c/group/libsofia-sip-ua.mmp (original) +++ freeswitch/trunk/libs/sofia-sip/open_c/group/libsofia-sip-ua.mmp Thu Feb 26 12:43:04 2009 @@ -222,6 +222,7 @@ SOURCE sres_cache.c SOURCE sres_blocking.c SOURCE sresolv.c +SOURCE sres_sip.c SOURCEPATH ..\..\libsofia-sip-ua\stun

1 0

[commit] r12307 - in freeswitch/trunk/libs/sofia-sip/win32: libsofia-sip-ua libsofia-sip-ua-static
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: mikej Date: Thu Feb 26 12:42:31 2009 New Revision: 12307 Log: Thu Feb 26 11:04:18 CST 2009 Pekka Pessi <first.last(a)nokia.com> * win32: added sres_sip.[hc] Modified: freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.dsp freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.vcproj freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.vcproj Modified: freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.dsp ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.dsp (original) +++ freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.dsp Thu Feb 26 12:42:31 2009 @@ -515,6 +515,10 @@ SOURCE="..\..\libsofia-sip-ua\sresolv\sresolv.c" # End Source File +# Begin Source File + +SOURCE="..\..\libsofia-sip-ua\sresolv\sres_sip.c" +# End Source File # End Group # Begin Group "nea" @@ -1247,6 +1251,10 @@ SOURCE="..\..\libsofia-sip-ua\sresolv\sofia-sip\sresolv.h" # End Source File +# Begin Source File + +SOURCE="..\..\libsofia-sip-ua\sresolv\sofia-sip\sres_sip.h" +# End Source File # End Group # Begin Group "nea headers" Modified: freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.vcproj ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.vcproj (original) +++ freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.vcproj Thu Feb 26 12:42:31 2009 @@ -2269,6 +2269,28 @@ </FileConfiguration> </File> <File + RelativePath="..\..\libsofia-sip-ua\sresolv\sres_sip.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\libsofia-sip-ua\sresolv\sresolv.c" > <FileConfiguration @@ -4251,6 +4273,11 @@ RelativePath="..\..\libsofia-sip-ua\sresolv\sofia-sip\sresolv.h" > </File> + </File> + <File + RelativePath="..\..\libsofia-sip-ua\sresolv\sofia-sip\sres_sip.h" + > + </File> </Filter> <Filter Name="nea headers" Modified: freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp (original) +++ freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp Thu Feb 26 12:42:31 2009 @@ -531,6 +531,10 @@ SOURCE="..\..\libsofia-sip-ua\sresolv\sresolv.c" # End Source File +# Begin Source File + +SOURCE="..\..\libsofia-sip-ua\sresolv\sres_sip.c" +# End Source File # End Group # Begin Group "nea" @@ -1259,6 +1263,10 @@ SOURCE="..\..\libsofia-sip-ua\sresolv\sofia-sip\sresolv.h" # End Source File +# Begin Source File + +SOURCE="..\..\libsofia-sip-ua\sresolv\sofia-sip\sres_sip.h" +# End Source File # End Group # Begin Group "nea headers" Modified: freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.vcproj ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.vcproj (original) +++ freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.vcproj Thu Feb 26 12:42:31 2009 @@ -2298,6 +2298,28 @@ </FileConfiguration> </File> <File + RelativePath="..\..\libsofia-sip-ua\sresolv\sres_sip.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\libsofia-sip-ua\sresolv\sresolv.c" > <FileConfiguration @@ -4280,6 +4302,11 @@ RelativePath="..\..\libsofia-sip-ua\sresolv\sofia-sip\sresolv.h" > </File> + </File> + <File + RelativePath="..\..\libsofia-sip-ua\sresolv\sofia-sip\sres_sip.h" + > + </File> </Filter> <Filter Name="nea headers"

1 0

[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

[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

[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

[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

[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

[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

[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