February 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

11 Feb '09

Author: mikej Date: Wed Feb 11 10:59:44 2009 New Revision: 11821 Log: Tue Jan 13 16:21:44 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sac-su2.m4: check for strnlen(), do not check for strcasestr() 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 Wed Feb 11 10:59:44 2009 @@ -530,6 +530,7 @@ socketpair gethostname gethostbyname getipnodebyname \ poll epoll_create kqueue select if_nameindex \ signal alarm \ + strnlen \ getaddrinfo getnameinfo freeaddrinfo gai_strerror getifaddrs \ getline getdelim getpass]) # getline getdelim getpass are _GNU_SOURCE stuff @@ -548,7 +549,7 @@ [Define to 1 if you have if_nameindex().]) fi -SAC_REPLACE_FUNCS([memmem memccpy memspn memcspn strcasestr strtoull \ +SAC_REPLACE_FUNCS([memmem memccpy memspn memcspn strtoull \ inet_ntop inet_pton poll]) if test $ac_cv_func_signal = yes ; then

1 0

[commit] r11820 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:59:20 2009 New Revision: 11820 Log: Tue Jan 13 16:20:56 CST 2009 Pekka Pessi <first.last(a)nokia.com> * TPTAG_TLS_VERIFY_PEER() added in 1.12.10 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c Wed Feb 11 10:59:20 2009 @@ -291,6 +291,8 @@ * * Use with tport_tbind(), nua_create(), nta_agent_create(), * nta_agent_add_tport(), nth_engine_create(), or initial nth_site_create(). + * + * @NEW_1_12_10. */ tag_typedef_t tptag_tls_verify_peer = UINTTAG_TYPEDEF(tls_verify_peer);

1 0

[commit] r11819 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:57:55 2009 New Revision: 11819 Log: Tue Jan 13 16:20:06 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_localinfo.c: using SU_LOCALINFO_TEST Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c 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 Wed Feb 11 10:57:55 2009 @@ -67,7 +67,11 @@ #include <net/if_types.h> #endif -#if HAVE_GETIFADDRS +#if SU_LOCALINFO_TEST + +#undef USE_LOCALINFO0 + +#elif HAVE_GETIFADDRS #define USE_LOCALINFO0 1 #define localinfo0 bsd_localinfo @@ -81,6 +85,7 @@ static int win_localinfo(su_localinfo_t const *, su_localinfo_t **); #else +/* No localinfo0(), use localinfo4() and localinfo6() */ #undef USE_LOCALINFO0 static int localinfo4(su_localinfo_t const *, su_localinfo_t **); @@ -90,9 +95,13 @@ #endif +static int li_scope4(uint32_t ip4); +static int li_scope6(struct in6_addr const *ip6); + +#if !SU_LOCALINFO_TEST + static int li_name(su_localinfo_t const*, int, su_sockaddr_t const*, char **); static void li_sort(su_localinfo_t *i, su_localinfo_t **rresult); -static int li_scope4(uint32_t ip4); /** @brief Request local address information. * @@ -196,8 +205,13 @@ *hh = *hints; if (hh->li_canonname) hh->li_flags |= LI_CANONNAME; +#if 0 + /* hints->li_ifname is used to select by interface, + li_ifname is returned with LI_IFNAME flag + */ if ((hh->li_flags & LI_IFNAME) && hh->li_ifname == NULL) return ELI_BADHINTS; +#endif } switch (hh->li_family) { @@ -255,6 +269,8 @@ return error; } +#endif + /** Free local address information. * * Free a list of su_localinfo_t structures obtained with su_getlocalinfo() @@ -415,16 +431,17 @@ extern int su_get_local_ip_addr(su_sockaddr_t *su); #endif -#if USE_LOCALINFO0 +#if SU_LOCALINFO_TEST +#elif USE_LOCALINFO0 +/* no localinfo4 */ #elif HAVE_IFCONF #if __APPLE_CC__ /** Build a list of local IPv4 addresses and append it to *rresult. */ static int localinfo4(su_localinfo_t const *hints, su_localinfo_t **rresult) { - su_localinfo_t *tbf = NULL, **lli = &tbf; - su_localinfo_t *li = NULL, *li_first = NULL; + su_localinfo_t *li = NULL; su_sockaddr_t *su; int error = ELI_NOADDRESS; char *canonname = NULL; @@ -453,8 +470,8 @@ } - li = calloc(1, sizeof(su_localinfo_t)); - sa = calloc(1, sizeof(su_sockaddr_t)); + li = calloc(1, (sizeof *li) + (sizeof *sa)); + sa = (void *)(li + 1); error = getsockname(s, (struct sockaddr *) sa, &salen); if (error < 0 && errno == SOCKET_ERROR) { @@ -511,8 +528,7 @@ err: if (canonname) free(canonname); - if (li_first) free(li_first); - su_freelocalinfo(tbf); + if (li) free(li); su_close(s); return error; @@ -772,8 +788,7 @@ li->li_addrlen = su_sockaddr_size(su); li->li_addr = su; li->li_canonname = canonname; - if (hints->li_flags & LI_IFNAME) - li->li_ifname = if_name; + li->li_ifname = if_name; canonname = NULL; li_first = NULL; @@ -917,8 +932,8 @@ #endif -#if USE_LOCALINFO0 || !SU_HAVE_IN6 - +#if USE_LOCALINFO0 || !SU_HAVE_IN6 || SU_LOCALINFO_TEST +/* No localinfo6() */ #elif HAVE_PROC_NET_IF_INET6 /** Build a list of local IPv6 addresses and append it to *return_result. */ static @@ -1128,8 +1143,9 @@ } #endif - -#if HAVE_GETIFADDRS +#if !USE_LOCALINFO0 +/* no localinfo0() or bsd_localinfo() */ +#elif HAVE_GETIFADDRS #include <ifaddrs.h> @@ -1455,6 +1471,7 @@ } #elif HAVE_SIO_ADDRESS_LIST_QUERY + static int localinfo0(su_localinfo_t const *hints, su_localinfo_t **rresult) { @@ -1572,6 +1589,8 @@ } #endif +#if !SU_LOCALINFO_TEST + static int li_name(su_localinfo_t const *hints, int gni_flags, @@ -1639,6 +1658,8 @@ } } +#endif + /**Get local IP address. * * @deprecated

1 0

[commit] r11818 - freeswitch/trunk/libs/sofia-sip/rules
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:57:36 2009 New Revision: 11818 Log: add missing file Added: freeswitch/trunk/libs/sofia-sip/rules/silent.am Added: freeswitch/trunk/libs/sofia-sip/rules/silent.am ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/rules/silent.am Wed Feb 11 10:57:36 2009 @@ -0,0 +1,49 @@ +# Silent compilation w/ Automake 1.9 or 1.10 +# ---------------------------------------------------------- + +# Automake 1.9.6 is not clever enough to override suffix rules within if +# if SOFIA_COMPILE_SILENT + +SOFIA_SILENT=@ + +LIBTOOL_FLAGS = --silent + +# From Automake 1.9.6 - +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(LIBTOOL_FLAGS) \ + $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) + +LINK = ${SOFIA_SILENT}test ${SOFIA_SILENT} != @ || echo ' LINK $@'; \ + $(LIBTOOL) --tag=CC --mode=link $(LIBTOOL_FLAGS) \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + +# Rules from depend2.am (GENERIC = TRUE, SUBDIROBJ = FALSE, %FASTDEP% = am_fastdepCC) silenced. +.c.o: + @test ${SOFIA_SILENT} != @ || echo ' COMPILE $@' +if am__fastdepCC + ${SOFIA_SILENT}if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +else +if AMDEP + ${SOFIA_SILENT}source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + ${SOFIA_SILENT}DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +endif + ${SOFIA_SILENT}$(COMPILE) -c -o $@ $< +endif + +.c.lo: + @test ${SOFIA_SILENT} != @ || echo ' LTCOMPILE $@' +if am__fastdepCC + ${SOFIA_SILENT}if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +else +if AMDEP + ${SOFIA_SILENT}source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + ${SOFIA_SILENT}DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +endif + ${SOFIA_SILENT}$(LTCOMPILE) -c -o $@ $< +endif + +# endif

1 0

[commit] r11817 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:56:57 2009 New Revision: 11817 Log: Tue Jan 13 15:19:59 CST 2009 Pekka Pessi <first.last(a)nokia.com> * check_session.c: added a test case for sending re-INVITE w/o offer Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Wed Feb 11 10:56:57 2009 @@ -1605,6 +1605,43 @@ } END_TEST +START_TEST(call_2_6_4) +{ + nua_handle_t *nh; + struct message *invite, *ack; + + s2_case("2.6.4", "re-INVITEs w/o SDP", + "NUA sends re-INVITE w/o SDP, " + "receives SDP w/ offer, " + "sends ACK w/ answer, " + "sends BYE."); + + /* Bug reported by Liu Yang 2009-01-11 */ + nh = invite_to_nua(TAG_END()); + + nua_invite(nh, SIPTAG_PAYLOAD_STR(""), TAG_END()); + fail_unless(s2_check_callstate(nua_callstate_calling)); + invite = s2_wait_for_request(SIP_METHOD_INVITE); + fail_if(!invite); + fail_if(invite->sip->sip_content_type); + soa_generate_offer(soa, 1, NULL); + respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); + s2_free_message(invite); + + ack = s2_wait_for_request(SIP_METHOD_ACK); + fail_if(!ack); + process_answer(ack); + s2_free_message(ack); + + fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless(s2_check_callstate(nua_callstate_ready)); + + bye_by_nua(nh, TAG_END()); + + nua_handle_destroy(nh); +} +END_TEST + TCase *reinvite_tcase(void) { TCase *tc = tcase_create("2.6 - re-INVITEs"); @@ -1614,6 +1651,7 @@ tcase_add_test(tc, call_2_6_1); tcase_add_test(tc, call_2_6_2); tcase_add_test(tc, call_2_6_3); + tcase_add_test(tc, call_2_6_4); } return tc; }

1 0

[commit] r11816 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:56:33 2009 New Revision: 11816 Log: Tue Jan 13 15:19:02 CST 2009 Pekka Pessi <first.last(a)nokia.com> * check_session.c: renamed test case 2.3.3 as 2.6.3 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Wed Feb 11 10:56:33 2009 @@ -48,10 +48,11 @@ #include <assert.h> /* define XXX as 1 in order to see all failing test cases */ +#ifndef XXX #define XXX (0) +#endif /* ====================================================================== */ -/* Call cases */ static nua_t *nua; static soa_session_t *soa = NULL; @@ -1005,6 +1006,7 @@ /* ---------------------------------------------------------------------- */ /* 2.3 - Session timers */ +/* Wait for invite from NUA */ static void invite_timer_round(nua_handle_t *nh, char const *session_expires) { @@ -1077,70 +1079,6 @@ } END_TEST -START_TEST(call_2_3_3) -{ - nua_handle_t *nh; - struct message *response; - - s2_case("2.3.3", "Handling re-INVITE without SDP gracefully", - "NUA receives INVITE, " - "re-INVITE without SDP (w/o NUTAG_REFRESH_WITHOUT_SDP(), " - "re-INVITE without SDP (using NUTAG_REFRESH_WITHOUT_SDP(), " - "sends BYE."); - - nh = invite_to_nua( - TAG_END()); - - s2_request_to(dialog, SIP_METHOD_INVITE, NULL, - SIPTAG_USER_AGENT_STR("evil (evil) evil"), - TAG_END()); - - nua_respond(nh, SIP_200_OK, TAG_END()); - - fail_unless(s2_check_callstate(nua_callstate_completed)); - - response = s2_wait_for_response(200, SIP_METHOD_INVITE); - - fail_if(!response); - s2_update_dialog(dialog, response); - fail_if(!response->sip->sip_content_type); - s2_free_message(response); - - fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); - - fail_unless(s2_check_event(nua_i_ack, 200)); - fail_unless(s2_check_callstate(nua_callstate_ready)); - - s2_fast_forward(10); - - nua_set_hparams(nh, NUTAG_REFRESH_WITHOUT_SDP(1), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); - - s2_request_to(dialog, SIP_METHOD_INVITE, NULL, - SIPTAG_USER_AGENT_STR("evil (evil) evil"), - TAG_END()); - - nua_respond(nh, SIP_200_OK, TAG_END()); - - fail_unless(s2_check_callstate(nua_callstate_completed)); - - response = s2_wait_for_response(200, SIP_METHOD_INVITE); - - fail_if(!response); - s2_update_dialog(dialog, response); - fail_if(response->sip->sip_content_type); - s2_free_message(response); - - fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); - - fail_unless(s2_check_event(nua_i_ack, 200)); - fail_unless(s2_check_callstate(nua_callstate_ready)); - - bye_by_nua(nh, TAG_END()); - - nua_handle_destroy(nh); -} -END_TEST TCase *session_timer_tcase(void) @@ -1150,7 +1088,6 @@ { tcase_add_test(tc, call_2_3_1); tcase_add_test(tc, call_2_3_2); - tcase_add_test(tc, call_2_3_3); } return tc; } @@ -1603,15 +1540,80 @@ } END_TEST +START_TEST(call_2_6_3) +{ + nua_handle_t *nh; + struct message *response; + + s2_case("2.6.3", "Handling re-INVITE without SDP gracefully", + "NUA receives INVITE, " + "re-INVITE without SDP (w/o NUTAG_REFRESH_WITHOUT_SDP(), " + "re-INVITE without SDP (using NUTAG_REFRESH_WITHOUT_SDP(), " + "sends BYE."); + + nh = invite_to_nua( + TAG_END()); + + s2_request_to(dialog, SIP_METHOD_INVITE, NULL, + SIPTAG_USER_AGENT_STR("evil (evil) evil"), + TAG_END()); + + nua_respond(nh, SIP_200_OK, TAG_END()); + + fail_unless(s2_check_callstate(nua_callstate_completed)); + + response = s2_wait_for_response(200, SIP_METHOD_INVITE); + + fail_if(!response); + s2_update_dialog(dialog, response); + fail_if(!response->sip->sip_content_type); + s2_free_message(response); + + fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); + + fail_unless(s2_check_event(nua_i_ack, 200)); + fail_unless(s2_check_callstate(nua_callstate_ready)); + + s2_fast_forward(10); + + nua_set_hparams(nh, NUTAG_REFRESH_WITHOUT_SDP(1), TAG_END()); + fail_unless(s2_check_event(nua_r_set_params, 200)); + + s2_request_to(dialog, SIP_METHOD_INVITE, NULL, + SIPTAG_USER_AGENT_STR("evil (evil) evil"), + TAG_END()); + + nua_respond(nh, SIP_200_OK, TAG_END()); + + fail_unless(s2_check_callstate(nua_callstate_completed)); + + response = s2_wait_for_response(200, SIP_METHOD_INVITE); + + fail_if(!response); + s2_update_dialog(dialog, response); + fail_if(response->sip->sip_content_type); + s2_free_message(response); + + fail_if(s2_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); + + fail_unless(s2_check_event(nua_i_ack, 200)); + fail_unless(s2_check_callstate(nua_callstate_ready)); + + bye_by_nua(nh, TAG_END()); + + nua_handle_destroy(nh); +} +END_TEST -TCase *invite_glare_tcase(void) +TCase *reinvite_tcase(void) { - TCase *tc = tcase_create("2.6 - INVITE glare"); + TCase *tc = tcase_create("2.6 - re-INVITEs"); tcase_add_checked_fixture(tc, call_setup, call_teardown); { tcase_add_test(tc, call_2_6_1); tcase_add_test(tc, call_2_6_2); + tcase_add_test(tc, call_2_6_3); } return tc; } @@ -3040,7 +3042,7 @@ suite_add_tcase(suite, session_timer_tcase()); suite_add_tcase(suite, invite_100rel_tcase()); suite_add_tcase(suite, invite_precondition_tcase()); - suite_add_tcase(suite, invite_glare_tcase()); + suite_add_tcase(suite, reinvite_tcase()); suite_add_tcase(suite, invite_error_tcase()); suite_add_tcase(suite, termination_tcase()); suite_add_tcase(suite, destroy_tcase());

1 0

[commit] r11815 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua libsofia-sip-ua-glib rules
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:56:03 2009 New Revision: 11815 Log: Tue Jan 13 10:10:10 CST 2009 Pekka Pessi <first.last(a)nokia.com> * rules/silent.am: silence. at last. Modified: freeswitch/trunk/libs/sofia-sip/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am freeswitch/trunk/libs/sofia-sip/rules/sofia.am Modified: freeswitch/trunk/libs/sofia-sip/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/Makefile.am Wed Feb 11 10:56:03 2009 @@ -7,8 +7,8 @@ AUTOMAKE_OPTIONS = foreign 1.7 -SUBDIRS = libsofia-sip-ua $(GLIB_SUBDIRS) utils packages tests -DIST_SUBDIRS = libsofia-sip-ua libsofia-sip-ua-glib utils packages \ +SUBDIRS = s2check libsofia-sip-ua $(GLIB_SUBDIRS) utils packages tests +DIST_SUBDIRS = s2check libsofia-sip-ua libsofia-sip-ua-glib utils packages \ tests win32 open_c # note: when glib devel files are not available, make should not @@ -66,6 +66,9 @@ PHONY = built-sources clean-built-sources valcheck doxygen manpages +# s2check depends on generated headers within libsofia-sip-ua +all check: built-sources + if HAVE_LCOV include $(top_srcdir)/rules/lcov.am Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am Wed Feb 11 10:56:03 2009 @@ -50,6 +50,8 @@ include $(top_srcdir)/rules/lcov.am endif +include $(top_srcdir)/rules/silent.am + .PHONY = $(PHONY) CLEANFILES = docs/*.doxytags Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am Wed Feb 11 10:56:03 2009 @@ -107,4 +107,6 @@ include $(top_srcdir)/rules/lcov.am endif +include $(top_srcdir)/rules/silent.am + .PHONY: $(PHONY) Modified: freeswitch/trunk/libs/sofia-sip/rules/sofia.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/rules/sofia.am (original) +++ freeswitch/trunk/libs/sofia-sip/rules/sofia.am Wed Feb 11 10:56:03 2009 @@ -68,3 +68,5 @@ if HAVE_LCOV include $(top_srcdir)/rules/lcov.am endif + +include $(top_srcdir)/rules/silent.am

1 0

[commit] r11814 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:55:27 2009 New Revision: 11814 Log: Tue Jan 13 15:03:25 CST 2009 Pekka Pessi <first.last(a)nokia.com> * torture_bnf.c: added some host_is_domain() cases Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/torture_bnf.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/torture_bnf.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/torture_bnf.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/torture_bnf.c Wed Feb 11 10:55:27 2009 @@ -320,6 +320,11 @@ TEST(host_has_domain_invalid("valid."), 0); TEST(host_has_domain_invalid("1-.invalid."), 0); + TEST(host_is_domain("127.0.0.1"), 0); + TEST(host_is_domain("3.com"), 1); + TEST(host_is_domain("127.0.0.com"), 1); + TEST(host_is_domain("actra.0.1"), 0); + /* Invalid IP4 address (extra leading zeros) */ TEST_1(!host_cmp("127.0.0.1", "127.0.0.01")); /* Invalid reference (extra leading zeros) */

1 0

[commit] r11813 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:55:11 2009 New Revision: 11813 Log: Tue Jan 13 14:59:50 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: send answer in ACK if offer was sent in 200 OK to re-INVITE Thanks for Liu Yang for reporting the problem. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 10:55:11 2009 @@ -1 +1 @@ -Wed Feb 11 10:54:37 CST 2009 +Wed Feb 11 10:55:01 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Wed Feb 11 10:55:11 2009 @@ -1294,7 +1294,7 @@ while (sip->sip_supported) sip_header_remove(msg, sip, (sip_header_t*)sip->sip_supported); - if (ss == NULL || ss->ss_state >= nua_callstate_ready) + if (ss == NULL || ss->ss_state > nua_callstate_ready) ; else if (cr->cr_offer_recv && !cr->cr_answer_sent) { if (nh->nh_soa == NULL) { @@ -1312,7 +1312,7 @@ } } - if (ss == NULL || ss->ss_state >= nua_callstate_ready || reason) + if (ss == NULL || ss->ss_state > nua_callstate_ready || reason) ; else if (nh->nh_soa && soa_is_complete(nh->nh_soa)) { /* signal SOA that O/A round(s) is (are) complete */

1 0

[commit] r11812 - in freeswitch/trunk/libs/sofia-sip: . utils
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:54:44 2009 New Revision: 11812 Log: Mon Jan 12 08:29:14 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sip-dig.c: using su_casenmatch() to match NAPTR service Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 10:54:44 2009 @@ -1 +1 @@ -Wed Feb 11 10:54:13 CST 2009 +Wed Feb 11 10:54:37 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c (original) +++ freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c Wed Feb 11 10:54:44 2009 @@ -533,7 +533,7 @@ continue; if (!su_casematch(na->na_flags, "s") && !su_casematch(na->na_flags, "a")) continue; - if (dig->sips && !su_casematch(na->na_services, "SIPS+", 5)) + if (dig->sips && !su_casenmatch(na->na_services, "SIPS+", 5)) continue; tp = transport_by_service(dig->tports, na->na_services);

1 0