June 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Fix incorrect seq_nr expectancies when precondition is used

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37301?usp=email ) Change subject: asterisk: Fix incorrect seq_nr expectancies when precondition is used ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: I have no idea if that's the correct sequence no. to send/expect, but you look like you know what you're doing -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37301?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc91c863912934d48252ad0882d5603c161cd8b6 Gerrit-Change-Number: 37301 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jun 2024 14:28:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: SIP UA: Expect possible Rx of 183 Session Progress

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37302?usp=email ) Change subject: asterisk: SIP UA: Expect possible Rx of 183 Session Progress ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37302?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib1b60e9d6ea931131187b1d0306f7adfc319ed01 Gerrit-Change-Number: 37302 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jun 2024 14:22:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 4 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: E1: support HRv1 codec on both 16k and 8k subslots

by daniel

Attention is currently required from: falconia. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/37299?usp=email ) Change subject: E1: support HRv1 codec on both 16k and 8k subslots ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/37299?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifadbdc68905178c6ffdd673a6fb71c18610c9847 Gerrit-Change-Number: 37299 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Fri, 28 Jun 2024 14:22:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Fix PRACK 200 OK Tx with wrong branch

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37308?usp=email ) Change subject: asterisk: IMS: Fix PRACK 200 OK Tx with wrong branch ...................................................................... asterisk: IMS: Fix PRACK 200 OK Tx with wrong branch PRACK (and also UPDATE) are new transactions, and hence should have a new branch. Update the branch we transmit in the response too. Change-Id: Ia4a23f20ae69ee5facdcff7ae276ab823e860d06 --- M asterisk/IMS_ConnectionHandler.ttcn 1 file changed, 23 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/37308/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 8c4186e..a46d62f 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -1378,7 +1378,7 @@ [] SIP.receive(exp_req) -> value g_rx_sip_req { var template (value) PDU_SIP_Response tx_resp; - var Via via; + var Via invite_via; var template (omit) charstring tx_sdp; var integer invite_seq_nr; var boolean peer_support_precondition := match(g_rx_sip_req.msgHeader.supported.optionsTags, @@ -1386,7 +1386,7 @@ /* Obtain params: */ f_ConnHdlr_parse_initial_SIP_INVITE(g_rx_sip_req); - via := g_rx_sip_req.msgHeader.via; + invite_via := g_rx_sip_req.msgHeader.via; invite_seq_nr := g_pars.subscr.cp.sip_seq_nr; f_ims_validate_register_P_Access_Network_info(g_rx_sip_req, exp_present := true); @@ -1404,7 +1404,7 @@ tx_resp := ts_SIP_Response_Trying(g_pars.subscr.cp.sip_call_id, g_pars.subscr.cp.from_addr, g_pars.subscr.cp.to_addr, - via, + invite_via, g_pars.subscr.cp.sip_seq_nr, "INVITE", allow := omit, @@ -1444,7 +1444,7 @@ tx_resp := ts_SIP_Response_SessionProgress(g_pars.subscr.cp.sip_call_id, g_pars.subscr.cp.from_addr, g_pars.subscr.cp.to_addr, - via, + invite_via, g_pars.subscr.cp.sip_seq_nr, rseq := ts_RSeq(1), body := tx_sdp); @@ -1455,7 +1455,7 @@ g_pars.subscr.cp.sip_call_id, g_pars.subscr.cp.from_addr, g_pars.subscr.cp.to_addr, - f_tr_Via_response(via), + f_tr_Via_response(invite_via), g_pars.subscr.cp.sip_seq_nr + 1, rack := tr_RAck(1, g_pars.subscr.cp.sip_seq_nr, "INVITE"), body := omit); @@ -1468,7 +1468,7 @@ "PRACK", 200, g_pars.subscr.cp.sip_seq_nr + 1, "OK", - via, + g_rx_sip_req.msgHeader.via /* PRACK's new branch */, body := omit); SIP.send(tx_resp); @@ -1477,7 +1477,7 @@ g_pars.subscr.cp.sip_call_id, g_pars.subscr.cp.from_addr, g_pars.subscr.cp.to_addr, - f_tr_Via_response(via), + f_tr_Via_response(invite_via), g_pars.subscr.cp.sip_seq_nr + 2, require := tr_Require(superset("precondition")), body := ?); @@ -1509,7 +1509,7 @@ "UPDATE", 200, g_pars.subscr.cp.sip_seq_nr + 2, "OK", - via, + g_rx_sip_req.msgHeader.via /* UPDATE's new branch */, body := tx_sdp); SIP.send(tx_resp); @@ -1535,7 +1535,7 @@ tx_resp := ts_SIP_Response_Ringing(g_pars.subscr.cp.sip_call_id, g_pars.subscr.cp.from_addr, g_pars.subscr.cp.to_addr, - via, + invite_via, invite_seq_nr); SIP.send(tx_resp); @@ -1548,7 +1548,7 @@ "INVITE", 200, invite_seq_nr, "OK", - via, + invite_via, body := tx_sdp); SIP.send(tx_resp); @@ -1557,7 +1557,7 @@ g_pars.subscr.cp.sip_call_id, g_pars.subscr.cp.from_addr, g_pars.subscr.cp.to_addr, - f_tr_Via_response(via), + f_tr_Via_response(invite_via), invite_seq_nr, *); as_SIP_expect_req(exp_req); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia4a23f20ae69ee5facdcff7ae276ab823e860d06 Gerrit-Change-Number: 37308 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

12 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Fix events in between unregistration procedure

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37307?usp=email ) Change subject: asterisk: Fix events in between unregistration procedure ...................................................................... asterisk: Fix events in between unregistration procedure Change-Id: I3c9cffa1756a87334e609e85a32509ed11f026c1 --- M asterisk/Asterisk_Tests.ttcn 1 file changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/37307/1 diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index b7981eb..463f7cd 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -429,9 +429,11 @@ private function f_AMI_IMS_unregister(IMS_ConnHdlrPars pars) runs on test_CT { f_ami_action_PJSIPUnregister(AMI_CLIENT, mp_volte_ims_outbound_registration); - AMI_CLIENT.receive(tr_AMI_Event_Registry(f_sip_SipAddr_to_str(pars.subscr.local_sip_record), - "sip:" & mp_ims_domain, - "Unregistered")); + var template (present) AMI_Msg msg_expect := + tr_AMI_Event_Registry(f_sip_SipAddr_to_str(pars.subscr.local_sip_record), + "sip:" & mp_ims_domain, + "Unregistered"); + f_ami_wait_rx_msg(AMI_CLIENT, msg_expect, fail_others := false); } /* Test IMS registration of VoLTE UE */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37307?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3c9cffa1756a87334e609e85a32509ed11f026c1 Gerrit-Change-Number: 37307 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

12 months

1
0
0 0

[S] Change in ...osmo-s1gw[master]: contrib/jenkins.sh: also run Dialyzer

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37306?usp=email ) Change subject: contrib/jenkins.sh: also run Dialyzer ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37306?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Id9fe11e9eb36d7ed468288094095a6d38b2d1d49 Gerrit-Change-Number: 37306 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Jun 2024 18:18:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

12 months

1
0
0 0

[S] Change in ...osmo-s1gw[master]: contrib/jenkins.sh: also run Dialyzer

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37306?usp=email ) Change subject: contrib/jenkins.sh: also run Dialyzer ...................................................................... contrib/jenkins.sh: also run Dialyzer Dialyzer is a static code analyzer for Erlang, see: https://www.erlang.org/docs/23/man/dialyzer.html Change-Id: Id9fe11e9eb36d7ed468288094095a6d38b2d1d49 --- M Makefile M contrib/jenkins.sh 2 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/06/37306/1 diff --git a/Makefile b/Makefile index 6d3ded2..2a14fe7 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,9 @@ check: $(GEN_FILES) rebar3 eunit +analyze: $(GEN_FILES) + rebar3 dialyzer + clean: # Avoid running rebar3 clean if _build doesn't exist, since it would try # to fetch deps from the Internet and that may not be avaialble when in diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index df99a89..c738791 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -3,3 +3,4 @@ make clean make make check +make analyze -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37306?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Id9fe11e9eb36d7ed468288094095a6d38b2d1d49 Gerrit-Change-Number: 37306 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

12 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: WIP: asterisk: Introduce test TC_ims_call_mo_session_timer

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37305?usp=email ) Change subject: WIP: asterisk: Introduce test TC_ims_call_mo_session_timer ...................................................................... WIP: asterisk: Introduce test TC_ims_call_mo_session_timer Related: SYS#6987 Change-Id: Ia628c602df2f85b4e58a085353776e6c11914bcd --- M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn M asterisk/expected-results.xml 3 files changed, 105 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/37305/1 diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index b7981eb..33d802d 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -654,34 +654,8 @@ f_shutdown(); } -/* Test IMS MO call emulating an MT which doesn't support precondition */ -private function f_TC_ims_call_mo_IMS_ConnHdlr(charstring id) runs on IMS_ConnHdlr { - f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); - if (ispresent(g_pars.subscr.cp.called)) { - f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.cp.called.addr))); - } - as_IMS_register(); - setverdict(pass); - as_IMS_mo_call_accept(); - setverdict(pass); - COORD.send(COORD_CMD_CALL_ESTABLISHED); - as_IMS_exp_call_hangup(g_pars.subscr.cp.sip_seq_nr + 1); - setverdict(pass); - as_IMS_unregister(); -} -private function f_TC_ims_call_mo(boolean use_precondition_ext) runs on test_CT { - var SIPConnHdlrPars sip_pars; - var IMS_ConnHdlrPars ims_pars; - var SIPConnHdlr vc_conn_sip; - var IMS_ConnHdlr vc_conn_ims; - var AMI_Msg ami_msg; +private function f_ims_call_mo_configure(inout SIPConnHdlrPars sip_pars, inout IMS_ConnHdlrPars ims_pars) runs on test_CT { const charstring c_ext_msisdn := "90829"; - - f_init(); - - sip_pars := f_init_ConnHdlrPars(idx := 1); - ims_pars := f_init_IMS_ConnHdlrPars(); - sip_pars.cp.calling := sip_pars.registrar_sip_record; sip_pars.cp.called := valueof(ts_SipAddr(ts_HostPort(sip_pars.remote_sip_host), ts_UserInfo(c_ext_msisdn))); @@ -689,16 +663,10 @@ ts_UserInfo(ims_pars.subscr.msisdn))); ims_pars.subscr.cp.called := valueof(ts_SipAddr(ts_HostPort(ims_pars.realm), ts_UserInfo(c_ext_msisdn))); - ims_pars.subscr.cp.support_precondition_ext := use_precondition_ext; - ims_pars.subscr.cp.require_precondition_ext := use_precondition_ext; - ims_pars.subscr.cp.mo.tx_coord_cmd_invite_trying := true; +} - vc_conn_ims := f_start_handler_IMS(refers(f_TC_ims_call_mo_IMS_ConnHdlr), ims_pars); - vc_conn_sip := f_start_handler(refers(f_TC_internal_call_mo), sip_pars); - - COORD.receive(COORD_CMD_REGISTERED) from vc_conn_sip; - - f_AMI_IMS_register(ims_pars); +private function f_ims_call_mo_establish(inout SIPConnHdlr vc_conn_sip, inout IMS_ConnHdlr vc_conn_ims) runs on test_CT { + var AMI_Msg ami_msg; COORD.send(COORD_CMD_START) to vc_conn_sip; @@ -712,8 +680,91 @@ COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn_sip; IMS_COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn_ims; +} + +/* Test IMS MO call emulating an MT which doesn't support precondition */ +private function f_TC_ims_call_mo_IMS_ConnHdlr(charstring id) runs on IMS_ConnHdlr { + f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); + if (ispresent(g_pars.subscr.cp.called)) { + f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.cp.called.addr))); + } + as_IMS_register(); + setverdict(pass); + as_IMS_mo_call_accept(); + setverdict(pass); + COORD.send(COORD_CMD_CALL_ESTABLISHED); + if (g_pars.subscr.cp.mo.support_timer_session_expires > 0) { + /* TODO: recceive(tr_INVITE()) ? + signal something */ + timer Trefresh; + Trefresh.start(int2float(g_pars.subscr.cp.mo.support_timer_session_expires)); + alt { /* RFC4028 section 7.4. It can be either INVITE or UPDATE: */ + [] SIP.receive(tr_SIP_INVITE(f_tr_SipUrl_opt_defport(ts_SipUrl_from_Addr_Union(g_pars.subscr.cp.called.addr)), + ?, + tr_From(tr_Addr_Union_from_val(g_pars.subscr.cp.calling.addr), *), + tr_To(tr_Addr_Union_from_val(g_pars.subscr.cp.called.addr), *), + tr_Via_from(f_tr_HostPort(g_pars.subscr.remote_sip_host, g_pars.subscr.ipsec_remote_port_s)), + ?, + supported := tr_Supported(superset("timer")), + body := ?)) -> value g_rx_sip_req; + [] SIP.receive(tr_SIP_UPDATE(f_tr_SipUrl_opt_defport(ts_SipUrl_from_Addr_Union(g_pars.subscr.cp.called.addr)), + g_pars.subscr.cp.sip_call_id, + g_pars.subscr.cp.from_addr, + g_pars.subscr.cp.to_addr, + tr_Via_from(f_tr_HostPort(g_pars.subscr.remote_sip_host, g_pars.subscr.ipsec_remote_port_s)), + ?, + body := ?)) -> value g_rx_sip_req; + [] Trefresh.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(g_name & ": Timeout waiting for Session Refresh")); + } + } + Trefresh.stop; + /* TODO: send 200 OK response*/ + /* Sleep to make sure response arrives to the peer */ + f_sleep(1.0); + COORD.send(IMS_COORD_CMD_CALL_SESSION_REFRESH); + } + as_IMS_exp_call_hangup(g_pars.subscr.cp.sip_seq_nr + 1); + setverdict(pass); + as_IMS_unregister(); +} + +private function f_TC_ims_call_mo(boolean use_precondition_ext, boolean use_session_timer) runs on test_CT { + var SIPConnHdlrPars sip_pars; + var IMS_ConnHdlrPars ims_pars; + var SIPConnHdlr vc_conn_sip; + var IMS_ConnHdlr vc_conn_ims; + + f_init(); + + sip_pars := f_init_ConnHdlrPars(idx := 1); + ims_pars := f_init_IMS_ConnHdlrPars(); + + f_ims_call_mo_configure(sip_pars, ims_pars); + ims_pars.subscr.cp.support_precondition_ext := use_precondition_ext; + ims_pars.subscr.cp.require_precondition_ext := use_precondition_ext; + ims_pars.subscr.cp.mo.tx_coord_cmd_invite_trying := true; + ims_pars.subscr.cp.mo.support_timer_enable := use_session_timer; + if (use_session_timer) { + sip_pars.t_guard := 120.0; + ims_pars.t_guard := 120.0; + ims_pars.subscr.cp.mo.support_timer_exp_min_se := 90; + ims_pars.subscr.cp.mo.support_timer_session_expires := 90; + + } + + vc_conn_ims := f_start_handler_IMS(refers(f_TC_ims_call_mo_IMS_ConnHdlr), ims_pars); + vc_conn_sip := f_start_handler(refers(f_TC_internal_call_mo), sip_pars); + + COORD.receive(COORD_CMD_REGISTERED) from vc_conn_sip; + + f_AMI_IMS_register(ims_pars); + + f_ims_call_mo_establish(vc_conn_sip, vc_conn_ims); /* Call on-going */ + if (use_session_timer) { + IMS_COORD.receive(IMS_COORD_CMD_CALL_SESSION_REFRESH); + } f_sleep(1.0); COORD.send(COORD_CMD_HANGUP) to vc_conn_sip; @@ -728,10 +779,13 @@ f_shutdown(); } testcase TC_ims_call_mo() runs on test_CT { - f_TC_ims_call_mo(true); + f_TC_ims_call_mo(true, false); +} +testcase TC_ims_call_mo_session_timer() runs on test_CT { + f_TC_ims_call_mo(true, true); } testcase TC_ims_call_mo_noprecondition() runs on test_CT { - f_TC_ims_call_mo(false); + f_TC_ims_call_mo(false, false); } /* Test SIP registration of local clients */ @@ -837,6 +891,7 @@ execute( TC_ims_registration_423_interval_too_brief() ); execute( TC_ims_reregistration() ); execute( TC_ims_call_mo() ); + execute( TC_ims_call_mo_session_timer() ); execute( TC_ims_call_mo_noprecondition() ); execute( TC_ims_call_mt() ); execute( TC_ims_call_mt_noprecondition() ); diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 1f9c083..cb473fc 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -49,6 +49,7 @@ const charstring IMS_COORD_CMD_HANGUP := "IMS_COORD_CMD_HANGUP"; const charstring IMS_COORD_CMD_CALL_TRYING := "IMS_COORD_CMD_CALL_TRYING"; const charstring IMS_COORD_CMD_CALL_SESSION_PROGRESS := "IMS_COORD_CMD_CALL_SESSION_PROGRESS"; +const charstring IMS_COORD_CMD_CALL_SESSION_REFRESH := "IMS_COORD_CMD_CALL_SESSION_REFRESH"; type component IMS_ConnHdlr extends SIP_ConnHdlr { var charstring g_name; diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index 26c2fa4..179ee70 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -15,6 +15,7 @@ <testcase classname='Asterisk_Tests' name='TC_ims_registration_423_interval_too_brief' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_reregistration' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_session_timer' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_noprecondition' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mt' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mt_noprecondition' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37305?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia628c602df2f85b4e58a085353776e6c11914bcd Gerrit-Change-Number: 37305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

12 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Support validating Session-Expires and Min_SE during I...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37304?usp=email ) Change subject: asterisk: IMS: Support validating Session-Expires and Min_SE during INVITE ...................................................................... asterisk: IMS: Support validating Session-Expires and Min_SE during INVITE Change-Id: Ie0d19243578f6a5e2962216a869694f7df7ea9cd --- M asterisk/IMS_ConnectionHandler.ttcn 1 file changed, 85 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/37304/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 8c4186e..1f9c083 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -119,18 +119,32 @@ type record IMS_CallParsMO { /* Whether to COORD.send(IMS_COORD_CMD_CALL_TRYING) when receiving an INVITE from UE. */ - boolean tx_coord_cmd_invite_trying + boolean tx_coord_cmd_invite_trying, + /* Whether to announce "Support: timer" and Session-Expires header */ + boolean support_timer_enable, + integer support_timer_session_expires, + integer support_timer_exp_min_se } template (value) IMS_CallParsMO t_IMS_CallParsMO := { - tx_coord_cmd_invite_trying := false + tx_coord_cmd_invite_trying := false, + support_timer_enable := false, + support_timer_session_expires := 0, + support_timer_exp_min_se := 0 } type record IMS_CallParsMT { /* Whether to COORD.send(IMS_COORD_CMD_CALL_SESSION_PROGRESS) when receiving an 183 Session Progress from UE. */ - boolean tx_coord_cmd_session_progress + boolean tx_coord_cmd_session_progress, + /* Whether to announce "Support: timer" and Session-Expires header */ + boolean support_timer_enable, + integer support_timer_session_expires, + integer support_timer_min_se } template (value) IMS_CallParsMT t_IMS_CallParsMT := { - tx_coord_cmd_session_progress := false + tx_coord_cmd_session_progress := false, + support_timer_enable := false, + support_timer_session_expires := 0, + support_timer_min_se := 90 } type record IMS_CallPars { @@ -1104,7 +1118,10 @@ var template (present) To to_addr_exp; var Via via; var template (omit) Require require := omit; + var template (omit) Min_SE min_SE := omit; + var template (omit) Session_expires session_expires := omit; var template (omit) Supported supported := omit; + var OptionTag_List supported_list := {}; var charstring tx_sdp; var default d_trying, d_ringing; var charstring branch_value; @@ -1130,19 +1147,33 @@ if (g_pars.subscr.cp.support_precondition_ext) { /* indicate the support for "reliable provisional response" * and "preconditions mechanism" */ - supported := ts_Supported({ "100rel", "precondition" }); + supported_list := supported_list & { "100rel", "precondition" }; tx_sdp := f_gen_sdp(IMS_GEN_SDP_MO_INVITE); } else { /* Don't add any preconditions to SDP: */ tx_sdp := f_gen_sdp(IMS_GEN_SDP_None); } + if (g_pars.subscr.cp.mt.support_timer_enable) { + supported_list := supported_list & { "timer" }; + if (g_pars.subscr.cp.mt.support_timer_session_expires > 0) { + session_expires := ts_Session_expires(int2str(g_pars.subscr.cp.mt.support_timer_session_expires)); + min_SE := ts_Min_SE(int2str(g_pars.subscr.cp.mt.support_timer_min_se)); + } + } + + if (lengthof(supported_list) > 0) { + supported := ts_Supported(supported_list); + } + req := ts_SIP_INVITE(g_pars.subscr.cp.sip_call_id, g_pars.subscr.cp.from_addr, g_pars.subscr.cp.to_addr, via, calling_contact, g_pars.subscr.cp.sip_seq_nr, + min_SE := min_SE, + session_expires := session_expires, supported := supported, body := tx_sdp); @@ -1373,12 +1404,19 @@ tr_From(tr_Addr_Union_from_val(g_pars.subscr.cp.calling.addr), *), tr_To(tr_Addr_Union_from_val(g_pars.subscr.cp.called.addr), *), tr_Via_from(f_tr_HostPort(g_pars.subscr.remote_sip_host, g_pars.subscr.ipsec_remote_port_s)), - ?, ?); + ?, + supported := tr_Supported(superset("timer")), + body := ?); var charstring sip_expect_str := log2str(exp_req); [] SIP.receive(exp_req) -> value g_rx_sip_req { var template (value) PDU_SIP_Response tx_resp; var Via via; + var template (omit) Require require := omit; + var template (omit) Session_expires session_expires := omit; + var template (omit) Supported supported := omit; + var OptionTag_List supported_list := {}; + var OptionTag_List require_list := {}; var template (omit) charstring tx_sdp; var integer invite_seq_nr; var boolean peer_support_precondition := match(g_rx_sip_req.msgHeader.supported.optionsTags, @@ -1394,6 +1432,19 @@ f_ims_validate_INVITE_Contact(g_rx_sip_req.msgHeader.contact); f_ims_validate_INVITE_SDP(g_pars.subscr.cp.peer_sdp); + if (g_pars.subscr.cp.mo.support_timer_exp_min_se > 0) { + if (not ispresent(g_rx_sip_req.msgHeader.min_SE)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Missing 'Min_SE' header in INVITE: ", g_rx_sip_req)); + } + if (str2int(g_rx_sip_req.msgHeader.min_SE.deltaSec) != g_pars.subscr.cp.mo.support_timer_exp_min_se) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received unexpected Min_SE := ", + g_rx_sip_req.msgHeader.min_SE.deltaSec, + "\nvs exp := ", g_pars.subscr.cp.mo.support_timer_exp_min_se)); + } + } + if (g_pars.subscr.cp.require_precondition_ext and not peer_support_precondition) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(g_name & ": Missing '100rel,precondition' in INVITE Supported header: ", @@ -1541,6 +1592,22 @@ /* Tx 200 OK */ + if (g_pars.subscr.cp.mo.support_timer_enable) { + supported_list := supported_list & { "timer" }; + require_list := require_list & { "timer" }; + if (g_pars.subscr.cp.mo.support_timer_session_expires > 0) { + session_expires := ts_Session_expires(int2str(g_pars.subscr.cp.mo.support_timer_session_expires), + {ts_Param("refresher", "uac")}); + } + } + + if (lengthof(supported_list) > 0) { + supported := ts_Supported(supported_list); + } + if (lengthof(require_list) > 0) { + require := ts_Require(require_list); + } + tx_sdp := f_gen_sdp(); tx_resp := ts_SIP_Response(g_pars.subscr.cp.sip_call_id, g_pars.subscr.cp.from_addr, @@ -1549,6 +1616,9 @@ invite_seq_nr, "OK", via, + require := require, + session_expires := session_expires, + supported := supported, body := tx_sdp); SIP.send(tx_resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37304?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie0d19243578f6a5e2962216a869694f7df7ea9cd Gerrit-Change-Number: 37304 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

12 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: SIP UA: Fix seq_nr transmitting ACK for MO call

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37303?usp=email ) Change subject: asterisk: SIP UA: Fix seq_nr transmitting ACK for MO call ...................................................................... asterisk: SIP UA: Fix seq_nr transmitting ACK for MO call RFC 3261 17.1.1.3: "The CSeq header field in the ACK MUST contain the same value for the sequence number as was present in the original request" Change-Id: I3d584d234b11ef9d21f203fbf18d63a5602775f0 --- M asterisk/SIP_ConnectionHandler.ttcn 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/37303/1 diff --git a/asterisk/SIP_ConnectionHandler.ttcn b/asterisk/SIP_ConnectionHandler.ttcn index 696be8a..52290fd 100644 --- a/asterisk/SIP_ConnectionHandler.ttcn +++ b/asterisk/SIP_ConnectionHandler.ttcn @@ -482,7 +482,6 @@ g_pars.cp.to_addr := g_rx_sip_resp.msgHeader.toField; /* Transmit ACK */ - g_pars.cp.sip_seq_nr := g_pars.cp.sip_seq_nr + 1; req := ts_SIP_ACK(g_pars.cp.sip_call_id, g_pars.cp.from_addr, g_pars.cp.to_addr, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37303?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3d584d234b11ef9d21f203fbf18d63a5602775f0 Gerrit-Change-Number: 37303 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

12 months

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2024