February 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[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

[commit] r11811 - in 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:54:20 2009 New Revision: 11811 Log: Mon Jan 12 08:27:07 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_port.c: added #include <sofia-sip/su_string.h> Making poll mechanism name matching case-insensitive. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.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:20 2009 @@ -1 +1 @@ -Wed Feb 11 10:53:44 CST 2009 +Wed Feb 11 10:54:13 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c Wed Feb 11 10:54:20 2009 @@ -44,8 +44,8 @@ #define su_port_s su_virtual_port_s #include "su_port.h" +#include <sofia-sip/su_string.h> -#include <string.h> #include <stdlib.h> /** Create the default su_port_t implementation. */ @@ -115,25 +115,25 @@ if (name == NULL) ; #if HAVE_EPOLL - else if (strcmp(name, "epoll") == 0) { + else if (su_casematch(name, "epoll")) { create = su_epoll_port_create; start = su_epoll_clone_start; } #endif #if HAVE_KQUEUE - else if (strcmp(name, "kqueue") == 0) { + else if (su_casematch(name, "kqueue")) { create = su_kqueue_port_create; start = su_kqueue_clone_start; } #endif #if HAVE_SYS_DEVPOLL_H - else if (strcmp(name, "devpoll") == 0) { + else if (su_casematch(name, "devpoll")) { create = su_devpoll_port_create; start = su_devpoll_clone_start; } #endif #if HAVE_POLL_PORT - else if (strcmp(name, "poll") == 0) { + else if (su_casematch(name, "poll")) { create = su_poll_port_create; start = su_poll_clone_start; } @@ -144,7 +144,7 @@ start = su_wsaevent_clone_start; } #elif HAVE_SELECT - else if (strcmp(name, "select") == 0) { + else if (su_casematch(name, "select")) { create = su_select_port_create; start = su_select_clone_start; }

1 0

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

11 Feb '09

Author: mikej Date: Wed Feb 11 10:53:49 2009 New Revision: 11810 Log: Fri Jan 9 14:51:02 CST 2009 Pekka Pessi <first.last(a)nokia.com> * auth_client.c: auc_has_authorization() is happy if one scheme is supported If there was multiple challenges with different authentication schemes, auc_has_authorization() required that all were supported (and used) before authentication could proceed. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/test_auth_digest.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:53:49 2009 @@ -1 +1 @@ -Wed Feb 11 10:53:10 CST 2009 +Wed Feb 11 10:53:44 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c Wed Feb 11 10:53:49 2009 @@ -81,6 +81,8 @@ static int ca_clear_credentials(auth_client_t *ca); +static int ca_has_authorization(auth_client_t const *ca); + /** Initialize authenticators. * @@ -175,8 +177,10 @@ ca->ca_credential_class != credential_class) return 0; - if (!ca->ca_auc) + if (!ca->ca_auc) { + ca->ca_credential_class = credential_class; return 1; + } if (ca->ca_auc->auc_challenge) stale = ca->ca_auc->auc_challenge(ca, ch); @@ -536,22 +540,43 @@ */ int auc_has_authorization(auth_client_t **auc_list) { - auth_client_t const *ca; + auth_client_t const *ca, *other; if (auc_list == NULL) return 0; - /* Make sure every challenge has credentials */ for (ca = *auc_list; ca; ca = ca->ca_next) { - if (!ca->ca_user || !ca->ca_pass || !ca->ca_credential_class) - return 0; - if (AUTH_CLIENT_IS_EXTENDED(ca) && ca->ca_clear) - return 0; + if (!ca_has_authorization(ca)) { + /* + * Check if we have another challenge with same realm but different + * scheme + */ + for (other = *auc_list; other; other = ca->ca_next) { + if (ca == other) + continue; + if (ca->ca_credential_class == other->ca_credential_class && + su_strcmp(ca->ca_realm, other->ca_realm) == 0 && + ca_has_authorization(other)) + break; + } + + if (!other) + return 0; + } } return 1; } +static int +ca_has_authorization(auth_client_t const *ca) +{ + return ca->ca_credential_class && + ca->ca_auc && + ca->ca_user && ca->ca_pass && + !(AUTH_CLIENT_IS_EXTENDED(ca) && ca->ca_clear); +} + /**Authorize a request. * * The function auc_authorization() is used to add correct authentication @@ -603,6 +628,8 @@ if (!ca->ca_auc) continue; + if (!ca_has_authorization(ca)) + continue; if (ca->ca_auc->auc_authorize(ca, home, method, url, body, &h) < 0) return -1; @@ -653,6 +680,8 @@ if (!ca->ca_auc) continue; + if (!ca_has_authorization(ca)) + continue; if (ca->ca_auc->auc_authorize(ca, home, method, url, body, &h) < 0) return -1; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/test_auth_digest.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/test_auth_digest.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/test_auth_digest.c Wed Feb 11 10:53:49 2009 @@ -1093,6 +1093,29 @@ auth_mod_destroy(am); deinit_as(as); aucs = NULL; + /* Test client with two challenges */ + au = sip_www_authenticate_make( + NULL, + "Digest realm=\"test-realm\", " + "nonce=\"dcd98b7102dd2f0e8b11d0f600bfb0c093\", " + "opaque=\"5ccc069c403ebaf9f0171e9517f40e41\""); + au->au_next = sip_www_authenticate_make( + NULL, + "Not-Digest realm=\"test-realm\", " + "zip=\"dcd98b7102dd2f0e8b11d0f600bfb0c093\", " + "zap=\"5ccc069c403ebaf9f0171e9517f40e41\""); + + TEST_1(auc_challenge(&aucs, home, (msg_auth_t *)au, + sip_authorization_class) >= 1); + TEST_1(auc_all_credentials(&aucs, "Digest", "\"test-realm\"", + "user", "pass")); + msg_header_remove(m2, (void *)sip, (void *)sip->sip_authorization); + TEST(auc_authorization(&aucs, m2, (msg_pub_t*)sip, rq->rq_method_name, + (url_t *)"sip:surf3@ims3.so.noklab.net", + sip->sip_payload), 1); + TEST_1(sip->sip_authorization); + aucs = NULL; + /* Test asynchronous operation */ aucs = NULL; TEST_1(am = auth_mod_create(root,

1 0

[commit] r11809 - in 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:53:18 2009 New Revision: 11809 Log: Fri Jan 9 13:51:56 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_string.c: it is A. Not a Z. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_string.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:53:18 2009 @@ -1 +1 @@ -Wed Feb 11 10:52:32 CST 2009 +Wed Feb 11 10:53:10 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_string.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_string.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_string.c Wed Feb 11 10:53:18 2009 @@ -56,7 +56,7 @@ if ('A' <= lcn && lcn <= 'Z') lcn += 'a' - 'A'; else if ('a' <= ucn && ucn <= 'z') - ucn -= 'a' - 'Z'; + ucn -= 'a' - 'A'; if (lcn == 0) return (char *)haystack;

1 0

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

11 Feb '09

Author: mikej Date: Wed Feb 11 10:52:40 2009 New Revision: 11808 Log: Fri Jan 9 13:26:53 CST 2009 Paulo Pizarro <paulo DOT pizarro AT gmail DOT com> * nta.c: do not restart timer E when provisional response is received According to the (informational) RFC 4321 section 1.2 Timer E is not altered during the transition to Proceeding. 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 Wed Feb 11 10:52:40 2009 @@ -1 +1 @@ -Wed Feb 11 10:52:05 CST 2009 +Wed Feb 11 10:52:32 CST 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 Wed Feb 11 10:52:40 2009 @@ -9027,10 +9027,14 @@ if (status < 200) { /* @RFC3261 17.1.2.1: * retransmissions continue for unreliable transports, - * but at an interval of T2 - */ - if (!orq->orq_reliable) - outgoing_set_timer(orq, sa->sa_t2); + * but at an interval of T2. + * + * @RFC4321 1.2: + * Note that Timer E is not altered during the transition + * to Proceeding. + */ + if (!orq->orq_reliable) + orq->orq_interval = sa->sa_t2; } else if (!outgoing_complete(orq)) { if (orq->orq_sigcomp_zap && orq->orq_tport && orq->orq_cc)

1 0

[commit] r11807 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: rupa Date: Wed Feb 11 10:52:29 2009 New Revision: 11807 Log: add support for pre_order on the profile, cleanup show profiles command Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Wed Feb 11 10:52:29 2009 @@ -107,6 +107,7 @@ char *name; uint16_t id; char *order_by; + char *pre_order; char *custom_sql; }; typedef struct profile_obj profile_t; @@ -402,7 +403,10 @@ if(profile->id > 0) { sql_stream.write_function(&sql_stream, "AND lcr_profile=%d ", profile->id); } - sql_stream.write_function(&sql_stream, "ORDER BY digits DESC%s", profile->order_by); + sql_stream.write_function(&sql_stream, "ORDER BY %s%s digits DESC%s", + profile->pre_order, + switch_strlen_zero(profile->pre_order)? "" : ",", + profile->order_by); if(db_random) { sql_stream.write_function(&sql_stream, ", %s", db_random); } @@ -482,37 +486,51 @@ memset(profile, 0, sizeof(profile_t)); profile->name = "global_default"; profile->order_by = ", rate"; + profile->pre_order = ""; globals.default_profile = profile; switch_core_hash_init(&globals.profile_hash, globals.pool); if((x_profiles = switch_xml_child(cfg, "profiles"))) { for (x_profile = switch_xml_child(x_profiles, "profile"); x_profile; x_profile = x_profile->next) { char *name = (char *) switch_xml_attr_soft(x_profile, "name"); + char *comma = ", "; switch_stream_handle_t order_by = { 0 }; + switch_stream_handle_t pre_order = { 0 }; + switch_stream_handle_t *thisorder = NULL; char *id_s = NULL; char *custom_sql = NULL; int argc, x = 0; char *argv[4] = { 0 }; SWITCH_STANDARD_STREAM(order_by); + SWITCH_STANDARD_STREAM(pre_order); + for (param = switch_xml_child(x_profile, "param"); param; param = param->next) { char *var, *val; var = (char *) switch_xml_attr_soft(param, "name"); val = (char *) switch_xml_attr_soft(param, "value"); - if (!strcasecmp(var, "order_by") && !switch_strlen_zero(val)) { + if ((!strcasecmp(var, "order_by") || !strcasecmp(var, "pre_order")) && !switch_strlen_zero(val)) { + if(!strcasecmp(var, "order_by")) { + thisorder = &order_by; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hit var of order_by\n"); + } else if(!strcasecmp(var, "pre_order")) { + thisorder = &pre_order; + comma = ""; /* don't want leading comma */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hit var of pre_order\n"); + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "param val is %s\n", val); if ((argc = switch_separate_string(val, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { for (x=0; x<argc; x++) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "arg #%d/%d is %s\n", x, argc, argv[x]); if(!switch_strlen_zero(argv[x])) { if (!strcasecmp(argv[x], "quality")) { - order_by.write_function(&order_by, ", quality DESC"); + thisorder->write_function(thisorder, "%s quality DESC", comma); } else if(!strcasecmp(argv[x], "reliability")) { - order_by.write_function(&order_by, ", reliability DESC"); + thisorder->write_function(thisorder, "%s reliability DESC", comma); } else { - order_by.write_function(&order_by, ", %s", argv[x]); + thisorder->write_function(thisorder, "%s %s", comma, argv[x]); } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "arg #%d is empty\n", x); @@ -520,11 +538,11 @@ } } else { if (!strcasecmp(val, "quality")) { - order_by.write_function(&order_by, ", quality DESC"); + thisorder->write_function(thisorder, "%s quality DESC", comma); } else if(!strcasecmp(val, "reliability")) { - order_by.write_function(&order_by, ", reliability DESC"); + thisorder->write_function(thisorder, "%s reliability DESC", comma); } else { - order_by.write_function(&order_by, ", %s", val); + thisorder->write_function(thisorder, "%s %s", comma, val); } } } else if (!strcasecmp(var, "id") && !switch_strlen_zero(val)) { @@ -547,6 +565,13 @@ /* default to rate */ profile->order_by = ", rate"; } + if(!switch_strlen_zero((char *)pre_order.data)) { + profile->pre_order = switch_core_strdup(globals.pool, (char *)pre_order.data); + } else { + /* default to rate */ + profile->order_by = ", rate"; + } + if(!switch_strlen_zero(id_s)) { profile->id = (uint16_t)atoi(id_s); } @@ -565,6 +590,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loaded lcr profile %s.\n", profile->name); } switch_safe_free(order_by.data); + switch_safe_free(pre_order.data); } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No lcr profiles defined.\n"); @@ -821,9 +847,13 @@ profile = (profile_t *) val; stream->write_function(stream, "Name:\t\t%s\n", profile->name); - stream->write_function(stream, "ID:\t\t%d\n", profile->id); - stream->write_function(stream, "order by:\t%s\n", profile->order_by); - if(!switch_strlen_zero(profile->custom_sql)) { + if(switch_strlen_zero(profile->custom_sql)) { + stream->write_function(stream, "ID:\t\t%d\n", profile->id); + stream->write_function(stream, "order by:\t%s\n", profile->order_by); + if(!switch_strlen_zero(profile->pre_order)) { + stream->write_function(stream, "pre_order:\t%s\n", profile->pre_order); + } + } else { stream->write_function(stream, "custom sql:\t%s\n", profile->custom_sql); } stream->write_function(stream, "\n");

1 0