2009/1/19 Paulo Pizarro <paulo.piza...@gmail.com>
>
>
> 2009/1/16 Paulo Pizarro <paulo.piza...@gmail.com>
>
>>
>>
>> 2009/1/16 Pekka Pessi <ppe...@gmail.com>:
>> > 2009/1/16 Paulo Pizarro <paulo.piza...@gmail.com>:
>> >>>>> 17.1.1.3: ... The To header field in the ACK MUST equal the To
>> header
>> >>>>> field in the
>> >>>>> response being acknowledged, and therefore will usually differ from
>> >>>>> the To header field in the original request by the addition of the
>> >>>>> tag parameter.
>> >>>>
>> >>>> This refers to ACK to 3XX/4XX/5XX/6XX? Looks like we have a bug
>> there,
>> >>>> I've pushed the fix to darcs.
>> >>
>> >> Not only, but to the 2xx response too. All next requests (ACK/BYE/etc)
>> >> within this dialog must have the same TO header that this final
>> >> response. This is done for backwards compatibility with RFC 2543 for
>> >> dialog identification. According with the third paragraph in 12.2.1.1.
>> >
>> > I think 12.2.1.1. talks about original request, not about final
>> > response to initial request? 12.1.2 talsk about setting remote URI
>> > from To header field; however, it does not say whether to use To
>> > header field from response or from request. 12.1.1.1 then mentions
>> > that for 2543-compatibility To header field from original request
>> > should be used.
>>
>> I agree with you that the TO header field from original request should be
>> used...
>> Maybe I am not understanding correctly the ETSI tests. What do you think?
>>
>> SIP_CC_OE_CE_V_017
>> Ref: RFC 3261 [1] sections 12.2.1.1, 13.2.2.4, figure 5 and 17.1.1.3.
>> Purpose: Ensure that the IUT when an INVITE client transaction is in the
>> Calling state, on receipt of a
>> Success (200 OK) response sends an ACK request with the To header
>> set *to the same value as in
>> the received final response*.
>>
>> SIP_CC_OE_CR_V_001
>> Ref: RFC 3261 [1] sections 12.2.1.1 and 15.
>> Purpose: Ensure that the IUT, once a dialog has been established, to
>> release it sends a BYE request with a
>> *To header set to the same value as in the last received final
>> response*.
>>
>> SIP_CC_OE_CR_V_002
>> Ref: RFC 3261 [1] sections 12.2.1.1 and 15.
>> Purpose: Ensure that the IUT, once a dialog has been established with a
>> final response in which the TAG in
>> the To header was omitted, to release it sends a BYE request *with
>> an identical To header without
>> TAG value*.
>>
>>
>>
>> >
>> >>>>> - SIP_CC_OE_CE_V_041:
>> >>>>>
>> >>>>> A second final response 2XX with a different Record-Route in the
>> same
>> >>>>> INVITE transaction should change the Route header of the resent ACK.
>> >>>>> Sofia ignores the second Record-Route header and re sends the ACK
>> >>>>> exactly as the first one.
>> >>>>
>> >>>> I think the second paragraph in 13.2.2.4 refers to early dialogs; the
>> >>>> route set should not change after first 2XX to that dialog. (The
>> >>>> wording says otherwise, however.)
>> >>>
>> >>> I agree with you, it's right that the route set should not change
>> >>> after first 2xx to that dialog.
>> >>> A second final response 2XX with a different Record-Route in the same
>> >>> INVITE transaction only makes sense in the fork scenarios.
>> >>> I made a new test with a fork scenario, and sofia did not sent the
>> >>> second ACK with the new route set for the new dialog. It seems like
>> >>> the hairy fork bug :)
>> >>>
>> >>> So, Is it possible to help you to fix this fork bug? Or it is not
>> >>> advisable ... :)
>> >
>> > We need more rigorous testing, having those ETSI cases as check test
>> > cases (see check_nua.c) would make me confident. Of course, if you are
>> > not afraid sharp shards of fragile C code, you can have a peek inside
>> > NUA internals...
>> >
>>
>
> I created the ETSI check test for the fork case.
> What do you think?
>
In the patch one more ETSI test: SIP_CC_OE_CE_TI_008
>
>
> Thanks.
>
>
>>
>> > --
>> > Pekka.Pessi mail at nokia.com
>> >
>>
>>
>
diff -rN old-sofia-sip/libsofia-sip-ua/nua/check_etsi.c new-sofia-sip/libsofia-sip-ua/nua/check_etsi.c
0a1,272
> /*
> * This file is part of the Sofia-SIP package
> *
> * Copyright (C) 2008 Nokia Corporation.
> *
> * Contact: Pekka Pessi <pekka.pe...@nokia.com>
> *
> * This library is free software; you can redistribute it and/or
> * modify it under the terms of the GNU Lesser General Public License
> * as published by the Free Software Foundation; either version 2.1 of
> * the License, or (at your option) any later version.
> *
> * This library is distributed in the hope that it will be useful, but
> * WITHOUT ANY WARRANTY; without even the implied warranty of
> * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> * Lesser General Public License for more details.
> *
> * You should have received a copy of the GNU Lesser General Public
> * License along with this library; if not, write to the Free Software
> * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
> * 02110-1301 USA
> *
> */
>
> /*...@cfile check_session.c
> *
> * @brief NUA module tests for SIP session handling
> *
> * @author Pekka Pessi <pekka.pe...@nokia.com>
> *
> * @copyright (C) 2008 Nokia Corporation.
> */
>
> #include "config.h"
>
> #include "check_nua.h"
>
> #include "test_s2.h"
>
> #include <sofia-sip/sip_status.h>
> #include <sofia-sip/sip_header.h>
> #include <sofia-sip/soa.h>
> #include <sofia-sip/su_tagarg.h>
> #include <sofia-sip/su_string.h>
> #include <sofia-sip/su_tag_io.h>
>
> #include <stdlib.h>
> #include <string.h>
> #include <assert.h>
>
> /* ====================================================================== */
>
> static nua_t *nua;
> static soa_session_t *soa = NULL;
> static struct dialog *d1 = NULL;
> static struct dialog *d2 = NULL;
>
> #define CRLF "\r\n"
>
> static void etsi_setup(void)
> {
> nua = s2_nua_setup("ETSI",
> NUTAG_OUTBOUND("no-options-keepalive, no-validate"),
> TAG_END());
>
> soa = soa_create(NULL, s2->root, NULL);
>
> fail_if(!soa);
>
> soa_set_params(soa,
> SOATAG_USER_SDP_STR("m=audio 5008 RTP/AVP 8 0" CRLF
> "m=video 5010 RTP/AVP 34" CRLF),
> TAG_END());
>
> d1 = su_home_new(sizeof *d1); fail_if(!d1);
> d2 = su_home_new(sizeof *d2); fail_if(!d2);
> }
>
> static void etsi_teardown(void)
> {
> s2_teardown_started("ETSI");
>
> mark_point();
>
> nua_shutdown(nua);
> fail_unless(s2_check_event(nua_r_shutdown, 200));
>
> s2_nua_teardown();
> }
>
> static void save_sdp_to_soa(struct message *message)
> {
> sip_payload_t *pl;
> char const *body;
> isize_t bodylen;
>
> fail_if(!message);
>
> fail_if(!message->sip->sip_content_length);
> fail_if(!message->sip->sip_content_type);
> fail_if(strcmp(message->sip->sip_content_type->c_type,
> "application/sdp"));
>
> fail_if(!message->sip->sip_payload);
> pl = message->sip->sip_payload;
> body = pl->pl_data, bodylen = pl->pl_len;
>
> fail_if(soa_set_remote_sdp(soa, NULL, body, (issize_t)bodylen) < 0);
> }
>
> static void process_offer(struct message *message)
> {
> save_sdp_to_soa(message);
> fail_if(soa_generate_answer(soa, NULL) < 0);
> }
>
> static void
> respond_with_sdp(struct message *request,
> struct dialog *dialog,
> int status, char const *phrase,
> tag_type_t tag, tag_value_t value, ...)
> {
> ta_list ta;
>
> char const *body;
> isize_t bodylen;
>
> fail_if(soa_get_local_sdp(soa, NULL, &body, &bodylen) != 1);
>
> ta_start(ta, tag, value);
> s2_respond_to(request, dialog, status, phrase,
> SIPTAG_CONTENT_TYPE_STR("application/sdp"),
> SIPTAG_PAYLOAD_STR(body),
> SIPTAG_CONTENT_DISPOSITION_STR("session"),
> ta_tags(ta));
> ta_end(ta);
> }
>
> static struct message *
> invite_sent_by_nua(nua_handle_t *nh,
> tag_type_t tag, tag_value_t value, ...)
> {
> ta_list ta;
> ta_start(ta, tag, value);
> nua_invite(nh, SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"),
> ta_tags(ta));
> ta_end(ta);
>
> fail_unless(s2_check_callstate(nua_callstate_calling));
>
> return s2_wait_for_request(SIP_METHOD_INVITE);
> }
>
> static void
> bye_by_nua(struct dialog *dialog, nua_handle_t *nh,
> tag_type_t tag, tag_value_t value, ...)
> {
> ta_list ta;
> struct message *bye;
>
> ta_start(ta, tag, value);
> nua_bye(nh, ta_tags(ta));
> ta_end(ta);
>
> bye = s2_wait_for_request(SIP_METHOD_BYE);
> fail_if(!bye);
> s2_respond_to(bye, dialog, SIP_200_OK, TAG_END());
> s2_free_message(bye);
> fail_unless(s2_check_event(nua_r_bye, 200));
> fail_unless(s2_check_callstate(nua_callstate_terminated));
> }
>
> /* ====================================================================== */
> /* 6 - ETSI cases */
>
> /* 6.1 Call Control - Originating Endpoint - Call Establishment */
>
> START_TEST(SIP_CC_OE_CE_V_019)
> {
> nua_handle_t *nh;
> struct message *invite;
>
> s2_case("6.1.1", "SIP_CC_OE_CE_V_019",
> "Ensure that the IUT when an INVITE client transaction "
> "is in the Calling state, on receipt of Success (200 OK) "
> "responses differing only on the tag in the To header, "
> "sends an ACK request with a To header identical to the "
> "received one for each received Success (200 OK) responses.");
>
> nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
>
> invite = invite_sent_by_nua(nh, TAG_END());
>
> process_offer(invite);
>
> respond_with_sdp(invite, d1, SIP_200_OK, TAG_END());
>
> fail_unless(s2_check_event(nua_r_invite, 200));
> fail_unless(s2_check_callstate(nua_callstate_ready));
> fail_unless(s2_check_request(SIP_METHOD_ACK));
>
> respond_with_sdp(invite, d2, SIP_200_OK, TAG_END());
> s2_free_message(invite);
>
> fail_unless(s2_check_event(nua_i_fork, 200));
> fail_unless(s2_check_callstate(nua_callstate_ready));
> fail_unless(s2_check_request(SIP_METHOD_ACK));
>
> bye_by_nua(d1, nh, TAG_END());
>
> nua_handle_destroy(nh);
> }
> END_TEST
>
>
> START_TEST(SIP_CC_OE_CE_TI_008)
> {
> nua_handle_t *nh;
> struct message *invite;
>
> s2_case("6.1.2", "SIP_CC_OE_CE_TI_008",
> "If an unreliable transport is used, ensure that the IUT, "
> "when an INVITE client transaction is in the Completed state, "
> "on receipt of final responses that matches the transaction, "
> "still answer with an ACK request until timer D set to at "
> "least 32 second expires.");
>
> nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END());
>
> invite = invite_sent_by_nua(nh, TAG_END());
>
> process_offer(invite);
>
> respond_with_sdp(invite, d1, SIP_200_OK, TAG_END());
>
> fail_unless(s2_check_event(nua_r_invite, 200));
> fail_unless(s2_check_callstate(nua_callstate_ready));
> fail_unless(s2_check_request(SIP_METHOD_ACK));
>
> respond_with_sdp(invite, d1, SIP_200_OK, TAG_END());
> fail_unless(s2_check_request(SIP_METHOD_ACK));
>
> s2_fast_forward(32);
>
> respond_with_sdp(invite, d1, SIP_200_OK, TAG_END());
> s2_free_message(invite);
> fail_if(s2_check_request_timeout(SIP_METHOD_ACK, 500));
>
> bye_by_nua(d1, nh, TAG_END());
>
> nua_handle_destroy(nh);
> }
> END_TEST
>
> TCase *sip_cc_oe_ce_tcase(void)
> {
> TCase *tc = tcase_create("6.1 - ETSI CC OE - Call Establishment");
> tcase_add_checked_fixture(tc, etsi_setup, etsi_teardown);
> {
> tcase_add_test(tc, SIP_CC_OE_CE_TI_008);
> tcase_add_test(tc, SIP_CC_OE_CE_V_019);
> }
> return tc;
> }
>
> /* ====================================================================== */
>
> void check_etsi_cases(Suite *suite)
> {
> suite_add_tcase(suite, sip_cc_oe_ce_tcase());
> }
>
diff -rN old-sofia-sip/libsofia-sip-ua/nua/check_nua.c new-sofia-sip/libsofia-sip-ua/nua/check_nua.c
113a114
> check_etsi_cases(suite);
diff -rN old-sofia-sip/libsofia-sip-ua/nua/check_nua.h new-sofia-sip/libsofia-sip-ua/nua/check_nua.h
12a13
> void check_etsi_cases(Suite *suite);
diff -rN old-sofia-sip/libsofia-sip-ua/nua/Makefile.am new-sofia-sip/libsofia-sip-ua/nua/Makefile.am
47a48
> check_etsi.c \
diff -rN old-sofia-sip/libsofia-sip-ua/nua/test_s2.c new-sofia-sip/libsofia-sip-ua/nua/test_s2.c
360c360
< s2_wait_for_request(sip_method_t method, char const *name)
---
> s2_wait_for_request_timeout(sip_method_t method, char const *name, int timeout)
362a363
> int t = timeout;
376a378,379
> if (timeout != -1 && ((t -= 100) <= 0))
> break;
381a385,390
> struct message *
> s2_wait_for_request(sip_method_t method, char const *name)
> {
> return s2_wait_for_request_timeout(method, name, -1);
> }
>
389a399,406
> int
> s2_check_request_timeout(sip_method_t method, char const *name, int timeout)
> {
> struct message *m = s2_wait_for_request_timeout(method, name, timeout);
> s2_free_message(m);
> return m != NULL;
> }
>
diff -rN old-sofia-sip/libsofia-sip-ua/nua/test_s2.h new-sofia-sip/libsofia-sip-ua/nua/test_s2.h
146a147
> struct message *s2_wait_for_request_timeout(sip_method_t method, char const *name, int timeout);
147a149
> int s2_check_request_timeout(sip_method_t method, char const *name, int timeout);
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Sofia-sip-devel mailing list
Sofia-sip-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sofia-sip-devel
