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

[M] Change in libosmo-abis[master]: TRAU->RTP: add support for TW-TS-001 & TW-TS-002

by falconia

Attention is currently required from: pespin. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37156?usp=email ) Change subject: TRAU->RTP: add support for TW-TS-001 & TW-TS-002 ...................................................................... Patch Set 2: (2 comments) File include/osmocom/trau/trau_rtp.h: https://gerrit.osmocom.org/c/libosmo-abis/+/37156/comment/722404de_af07e3c9 PS1, Line 27: uint8_t rtp_extensions; > Will add in the next patch iteration. Done File src/trau/trau_rtp_conv.c: https://gerrit.osmocom.org/c/libosmo-abis/+/37156/comment/9bce3434_fbad5bf4 PS1, Line 291: crc_bfi = true; > With TW-TS-001 it is now possible to emit BFI-with-data in RTP, just like in TRAU-UL frames. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37156?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7a6d13d406484c01210594bb6d2f0aff7c1341ab Gerrit-Change-Number: 37156 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 17:12:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in libosmo-abis[master]: TRAU->RTP: add support for TW-TS-001 & TW-TS-002

by falconia

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/37156?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: TRAU->RTP: add support for TW-TS-001 & TW-TS-002 ...................................................................... TRAU->RTP: add support for TW-TS-001 & TW-TS-002 The industry standard RTP payload formats of RFC 3551 and RFC 5993 drop valuable metadata from TRAU-UL frames of GSM 08.60 & 08.61, and disallow transport of marked-bad frames. Enhanced RTP transport formats of TW-TS-001 (FR & EFR) and TW-TS-002 (HR) restore these capabilities - however, because these formats are non-standard outside of Osmocom+Themyscira GSM networks, their use can only be optional. Add rtp_extensions member to struct osmo_trau2rtp_state, specifying the mask of RTP extensions to be used, just like we defined for AoIP BSSMAP and Abis-IP RSL, and extend osmo_trau2rtp() to emit these enhanced RTP formats when they are enabled. Related: OS#6448 Depends: I0eccfe5ddcf44f8f20440acb01e2d4870ec0cd91 (libosmocore) Change-Id: I7a6d13d406484c01210594bb6d2f0aff7c1341ab --- M TODO-RELEASE M include/osmocom/trau/trau_rtp.h M src/trau/trau_rtp_conv.c 3 files changed, 136 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/56/37156/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37156?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7a6d13d406484c01210594bb6d2f0aff7c1341ab Gerrit-Change-Number: 37156 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year

1
0
0 0

[S] Change in osmo-ci[master]: OBS: fix python 3.12 compat

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37170?usp=email ) Change subject: OBS: fix python 3.12 compat ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37170?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6430c2c4f75c8408d00305e1a1f0a64600eb086c Gerrit-Change-Number: 37170 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 16:47:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in libosmo-abis[master]: TRAU->RTP: add support for TW-TS-001 & TW-TS-002

by falconia

Attention is currently required from: pespin. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37156?usp=email ) Change subject: TRAU->RTP: add support for TW-TS-001 & TW-TS-002 ...................................................................... Patch Set 1: (2 comments) File include/osmocom/trau/trau_rtp.h: https://gerrit.osmocom.org/c/libosmo-abis/+/37156/comment/34b9213b_f1df7414 PS1, Line 27: uint8_t rtp_extensions; > missing entry in TODO-RELEASE file stating ABI change. Will add in the next patch iteration. File src/trau/trau_rtp_conv.c: https://gerrit.osmocom.org/c/libosmo-abis/+/37156/comment/e58b258c_38ed80dc PS1, Line 291: crc_bfi = true; > why is all the code path logic changing here? now if it's considered a bgi, then all the computation […] With TW-TS-001 it is now possible to emit BFI-with-data in RTP, just like in TRAU-UL frames. In the case of EFR, if the CRC is good but C12 is set (BTS emitted BFI marker, rather than transmission errors on Abis), we emit BFI-with-data in RTP: the whole point of TW-TS-001, aside from preserving TAF bit. Now the question is: if the TRAU-UL frame came in with CRC errors, should we also emit BFI-with-data, or emit a No_Data frame? TW-TS-001 allows either option: see Annex C in the spec. However, when I wrote TW-TS-002 spec for HR codec, I specified (section 6.2.3) that bad CRC-3 in the TRAU frame shall result in No_Data output. Hence thinking about it now, I'll make the EFR case consistent. I also just noticed that my code is currently plain-broken here in that I don't actually set the BFI bit in the TEH octet - will fix. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37156?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7a6d13d406484c01210594bb6d2f0aff7c1341ab Gerrit-Change-Number: 37156 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 16:34:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Expect protected server port in Via

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37126?usp=email ) Change subject: asterisk: IMS: Expect protected server port in Via ...................................................................... asterisk: IMS: Expect protected server port in Via Related: SYS#6964 Change-Id: I56778507bb2c21d95feece0f814f4dc4977d2b0b --- M asterisk/IMS_ConnectionHandler.ttcn 1 file changed, 14 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 1eae16d..c7eb84c 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -595,7 +595,7 @@ ?, tr_From(), tr_To(), - tr_Via_from(f_tr_HostPort(g_pars.subscr.remote_sip_host, g_pars.subscr.ipsec_remote_port_c)), + tr_Via_from(f_tr_HostPort(g_pars.subscr.remote_sip_host, g_pars.subscr.ipsec_remote_port_s)), authorization := authorization); SIP.receive(exp_req) -> value g_rx_sip_req; @@ -662,7 +662,7 @@ ?, tr_From(), tr_To(), - tr_Via_from(f_tr_HostPort(g_pars.subscr.remote_sip_host, g_pars.subscr.ipsec_remote_port_c)), + tr_Via_from(f_tr_HostPort(g_pars.subscr.remote_sip_host, g_pars.subscr.ipsec_remote_port_s)), expires := tr_Expires(int2str(0)), require := tr_Require(superset("sec-agree")), security_client := tr_Security_client(superset(tr_Security_mechanism("ipsec-3gpp", @@ -765,7 +765,7 @@ ?, 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_c)), + tr_Via_from(f_tr_HostPort(g_pars.subscr.remote_sip_host, g_pars.subscr.ipsec_remote_port_s)), ?, ?); var charstring sip_expect_str := log2str(exp_req); @@ -823,7 +823,7 @@ 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_c)), + tr_Via_from(f_tr_HostPort(g_pars.subscr.remote_sip_host, g_pars.subscr.ipsec_remote_port_s)), exp_seq_nr); var charstring sip_expect_str := log2str(exp_req); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37126?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: I56778507bb2c21d95feece0f814f4dc4977d2b0b Gerrit-Change-Number: 37126 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_ims_call_mt

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37127?usp=email ) Change subject: asterisk: Introduce test TC_ims_call_mt ...................................................................... asterisk: Introduce test TC_ims_call_mt This test validates scenario where a call for Asterisk from IMS Core comes in, Asterisk forwards it to the only local SIP UA registered, the call becomes established and then finally IMS Core hangs up after one second. Change-Id: I2af846f92b6ebca21d1286f5137cb004b6284ddf --- M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn M asterisk/SIP_ConnectionHandler.ttcn M asterisk/expected-results.xml 4 files changed, 240 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index c4cad38..75c51e1 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -225,11 +225,13 @@ return; } - as_SIP_mt_call_accept(); + as_SIP_mt_call_accept(exp_update_to_direct_rtp := g_pars.cp.exp_update_to_direct_rtp); COORD.send(COORD_CMD_CALL_ESTABLISHED); - /* Once MO hangs up, Asterisk updates us to point RTP to it: */ - as_SIP_exp_call_update(g_pars.cp.sip_seq_nr + 1); + if (g_pars.cp.exp_update_to_direct_rtp) { + /* Once MO hangs up, Asterisk updates us to point RTP to it: */ + as_SIP_exp_call_update(g_pars.cp.sip_seq_nr + 1); + } as_SIP_exp_call_hangup(g_pars.cp.sip_seq_nr + 1); setverdict(pass); @@ -491,6 +493,74 @@ f_shutdown(); } +/* Test SIP registration of local clients */ +private function f_TC_ims_call_mt(charstring id) runs on IMS_ConnHdlr { + f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); + as_IMS_register(); + COORD.send(IMS_COORD_CMD_REGISTERED); + setverdict(pass); + + COORD.receive(IMS_COORD_CMD_START); + f_IMS_mt_call_setup(); + setverdict(pass); + COORD.send(IMS_COORD_CMD_CALL_ESTABLISHED); + + COORD.receive(IMS_COORD_CMD_HANGUP); + f_IMS_do_call_hangup(); + setverdict(pass); + + as_IMS_unregister(); +} +testcase TC_ims_call_mt() runs on test_CT { + var SIPConnHdlrPars sip_pars; + var IMS_ConnHdlrPars ims_pars; + var SIPConnHdlr vc_conn_sip; + var IMS_ConnHdlr vc_conn_ims; + const charstring c_ext_msisdn := "90829"; + + f_init(); + + sip_pars := f_init_ConnHdlrPars(idx := 1); + ims_pars := f_init_IMS_ConnHdlrPars(); + + sip_pars.cp.exp_update_to_direct_rtp := false; + sip_pars.cp.calling := valueof(ts_SipAddr(ts_HostPort(sip_pars.remote_sip_host), + ts_UserInfo(c_ext_msisdn))); + sip_pars.cp.called := sip_pars.local_sip_record; + ims_pars.subscr.cp.calling := valueof(ts_SipAddr(ts_HostPort(ims_pars.realm), + ts_UserInfo(c_ext_msisdn))); + ims_pars.subscr.cp.called := valueof(ts_SipAddr(ts_HostPort(ims_pars.realm), + ts_UserInfo(ims_pars.subscr.msisdn))); + + vc_conn_ims := f_start_handler_IMS(refers(f_TC_ims_call_mt), ims_pars); + vc_conn_sip := f_start_handler(refers(f_TC_internal_call_mt), sip_pars); + + COORD.receive(COORD_CMD_REGISTERED) from vc_conn_sip; + + f_AMI_IMS_register(ims_pars); + IMS_COORD.receive(IMS_COORD_CMD_REGISTERED) from vc_conn_ims; + + IMS_COORD.send(IMS_COORD_CMD_START) to vc_conn_ims; + IMS_COORD.receive(IMS_COORD_CMD_CALL_ESTABLISHED) from vc_conn_ims; + COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn_sip; + + /* TODO: "Action: DedicatedBearerStatus" */ + + /* Call on-going */ + f_sleep(1.0); + + IMS_COORD.send(IMS_COORD_CMD_HANGUP) to vc_conn_ims; + + /* Trigger unregistration: */ + f_sleep(1.0); + AMI_CLIENT.clear; + f_AMI_IMS_unregister(ims_pars); + + vc_conn_sip.done; + vc_conn_ims.done; + f_shutdown(); +} + control { execute( TC_internal_registration() ); execute( TC_internal_call_momt() ); @@ -499,6 +569,7 @@ execute( TC_internal_call_all_4registered() ); execute( TC_ims_registration() ); execute( TC_ims_call_mo() ); + execute( TC_ims_call_mt() ); } } diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index c7eb84c..3c3a51b 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -43,7 +43,10 @@ inout charstring; } with { extension "internal" }; -const charstring IMS_COORD_CMD_REGISTERED := "COORD_CMD_REGISTERED"; +const charstring IMS_COORD_CMD_REGISTERED := "IMS_COORD_CMD_REGISTERED"; +const charstring IMS_COORD_CMD_START := "IMS_COORD_CMD_START"; +const charstring IMS_COORD_CMD_CALL_ESTABLISHED := "IMS_COORD_CMD_CALL_ESTABLISHED"; +const charstring IMS_COORD_CMD_HANGUP := "IMS_COORD_CMD_HANGUP"; type component IMS_ConnHdlr extends SIP_ConnHdlr { var charstring g_name; @@ -87,7 +90,7 @@ integer registrar_sip_seq_nr, SipUrl local_sip_url_ext, SipAddr local_sip_record, - Contact local_contact, + Contact registered_contact optional, P_Associated_Uri p_associated_uri, IMS_CallPars cp optional } @@ -190,14 +193,7 @@ ts_UserInfo(imsi)), local_sip_record := ts_SipAddr(ts_HostPort(domain), ts_UserInfo(imsi)), - local_contact := valueof(ts_Contact({ - ts_ContactAddress( - ts_Addr_Union_SipUrl(ts_SipUrl(ts_HostPort( - domain, - local_sip_port), - ts_UserInfo(imsi))), - omit) - })), + registered_contact := omit, p_associated_uri := ts_P_Associated_Uri({}), cp := cp } @@ -253,6 +249,22 @@ } } +altstep as_SIP_expect_resp(template (present) PDU_SIP_Response sip_expect, boolean fail_others := true) runs on IMS_ConnHdlr +{ + var charstring sip_expect_str := log2str(sip_expect); + [] SIP.receive(sip_expect) -> value g_rx_sip_resp; + [fail_others] as_SIP_fail_resp(sip_expect_str); + [fail_others] as_SIP_fail_req(sip_expect_str); +} + +altstep as_SIP_ignore_resp(template PDU_SIP_Response sip_expect := ?) runs on IMS_ConnHdlr +{ + [] SIP.receive(sip_expect) -> value g_rx_sip_resp { + log("Ignoring ", g_rx_sip_resp); + repeat; + } +} + private function f_nonce_from_rand_autn(octetstring rand, octetstring autn) return charstring { var octetstring concat := rand & autn; var charstring nonce := enc_MIME_Base64(concat); @@ -510,6 +522,7 @@ contact := g_rx_sip_req.msgHeader.contact; f_ims_validate_register_contact(contact); + g_pars.subscr.registered_contact := contact; /* Validate P-Access-Network-Info: rfc7315 6.4: * "3GPP will use the P-Access-Network-Info header field to @@ -722,6 +735,7 @@ for (var integer i := 0; i < lengthof(contact.contactBody.contactAddresses); i := i + 1) { contact.contactBody.contactAddresses[i].contactParams := valueof({ ts_Param("expires", "0") }); } + g_pars.subscr.registered_contact := omit; /* Tx 200 OK */ to_addr.toParams := f_sip_param_set(to_addr.toParams, "tag", f_sip_rand_tag()); tx_resp := ts_SIP_Response(sip_call_id, @@ -743,6 +757,130 @@ [fail_others] as_SIP_fail_req(sip_expect_str); } +function f_IMS_mt_call_setup() runs on IMS_ConnHdlr +{ + var template (value) PDU_SIP_Request req; + var template (present) PDU_SIP_Response exp; + var template (present) From from_addr_exp; + var template (present) To to_addr_exp; + var Via via; + var charstring tx_sdp := f_gen_sdp(); + var default d_trying, d_ringing; + var charstring branch_value; + var Contact calling_contact; + + /* RFC 3261 8.1.1.3 From */ + g_pars.subscr.cp.from_addr := valueof(ts_From(g_pars.subscr.cp.calling.addr, g_pars.subscr.cp.calling.params)); + g_pars.subscr.cp.from_addr.fromParams := f_sip_param_set(g_pars.subscr.cp.from_addr.fromParams, "tag", f_sip_rand_tag()); + g_pars.subscr.cp.to_addr := valueof(ts_To(g_pars.subscr.cp.called.addr, g_pars.subscr.cp.called.params)); + from_addr_exp := tr_From(tr_Addr_Union_from_val(g_pars.subscr.cp.from_addr.addressField), *); + to_addr_exp := tr_To(tr_Addr_Union_from_val(g_pars.subscr.cp.to_addr.addressField), *); + branch_value := f_sip_gen_branch(f_sip_Addr_Union_to_str(g_pars.subscr.cp.from_addr.addressField), + f_sip_Addr_Union_to_str(valueof(g_pars.subscr.cp.to_addr.addressField)), + g_pars.subscr.cp.sip_call_id, + g_pars.subscr.cp.sip_seq_nr); + via := g_pars.local_via; + via.viaBody[0].viaParams := f_sip_param_set(via.viaBody[0].viaParams, "branch", branch_value); + + calling_contact := valueof(ts_Contact({ + ts_ContactAddress(g_pars.subscr.cp.calling.addr, omit) + })); + + 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, + body := tx_sdp); + + SIP.send(req); + + /* Conditionally match and accept 100 Trying. */ + exp := tr_SIP_Response_Trying(g_pars.subscr.cp.sip_call_id, + from_addr_exp, + to_addr_exp, + f_tr_Via_response(via), + g_pars.subscr.cp.sip_seq_nr, "INVITE"); + d_trying := activate(as_SIP_ignore_resp(exp)); + + /* Conditionally match and accept 180 Ringing */ + exp := tr_SIP_Response_Ringing(g_pars.subscr.cp.sip_call_id, + from_addr_exp, + to_addr_exp, + f_tr_Via_response(via), + g_pars.subscr.cp.sip_seq_nr, "INVITE"); + d_ringing := activate(as_SIP_ignore_resp(exp)); + + /* Wait for OK answer */ + exp := tr_SIP_Response( + g_pars.subscr.cp.sip_call_id, + from_addr_exp, + to_addr_exp, + f_tr_Via_response(via), + *, + "INVITE", 200, + g_pars.subscr.cp.sip_seq_nr, "OK", + body := ?); + as_SIP_expect_resp(exp, fail_others := false); + + deactivate(d_trying); + deactivate(d_ringing); + + /* Update To with the tags received from peer: */ + g_pars.subscr.cp.to_addr := g_rx_sip_resp.msgHeader.toField; + + /* Transmit ACK */ + g_pars.subscr.cp.sip_seq_nr := g_pars.subscr.cp.sip_seq_nr + 1; + req := ts_SIP_ACK(g_pars.subscr.cp.sip_call_id, + g_pars.subscr.cp.from_addr, + g_pars.subscr.cp.to_addr, + via, + g_pars.subscr.cp.sip_seq_nr, + omit); + SIP.send(req); + g_pars.subscr.cp.sip_seq_nr := g_pars.subscr.cp.sip_seq_nr + 1; +} + +/* Tx BYE: */ +function f_IMS_do_call_hangup() runs on IMS_ConnHdlr +{ + var template (value) PDU_SIP_Request req; + var template (present) PDU_SIP_Response exp_resp; + var Via via; + var charstring branch_value; + + branch_value := f_sip_gen_branch(f_sip_Addr_Union_to_str(g_pars.subscr.cp.from_addr.addressField), + f_sip_Addr_Union_to_str(valueof(g_pars.subscr.cp.to_addr.addressField)), + g_pars.subscr.cp.sip_call_id, + g_pars.subscr.cp.sip_seq_nr); + + via := g_pars.local_via; + via.viaBody[0].viaParams := f_sip_param_set(via.viaBody[0].viaParams, "branch", branch_value); + + /* Transmit ACK */ + req := ts_SIP_BYE(g_pars.subscr.cp.sip_call_id, + g_pars.subscr.cp.from_addr, + g_pars.subscr.cp.to_addr, + via, + g_pars.subscr.cp.sip_seq_nr, + omit); + SIP.send(req); + + /* Wait for OK answer */ + exp_resp := tr_SIP_Response( + g_pars.subscr.cp.sip_call_id, + g_pars.subscr.cp.from_addr, + tr_To(tr_Addr_Union_from_val(g_pars.subscr.cp.to_addr.addressField), *), + f_tr_Via_response(via), + *, + "BYE", 200, + g_pars.subscr.cp.sip_seq_nr, "OK"); + as_SIP_expect_resp(exp_resp); + + g_pars.subscr.cp.sip_seq_nr := g_pars.subscr.cp.sip_seq_nr + 1; +} + private function f_ConnHdlr_parse_initial_SIP_INVITE(PDU_SIP_Request rx_sip_req) runs on IMS_ConnHdlr { f_SDP_decodeMessage(rx_sip_req.messageBody, g_pars.subscr.cp.peer_sdp); diff --git a/asterisk/SIP_ConnectionHandler.ttcn b/asterisk/SIP_ConnectionHandler.ttcn index cd50be6..05f872f 100644 --- a/asterisk/SIP_ConnectionHandler.ttcn +++ b/asterisk/SIP_ConnectionHandler.ttcn @@ -90,6 +90,8 @@ charstring local_rtp_addr, uint16_t local_rtp_port, + /* Whether to expect Asterisk to re-INVITE to make RTP flow directly to peer. */ + boolean exp_update_to_direct_rtp, SDP_Message peer_sdp optional, CallParsMT mt } @@ -107,6 +109,7 @@ sip_body := omit, local_rtp_addr := local_rtp_addr, local_rtp_port := local_rtp_port, + exp_update_to_direct_rtp := true, peer_sdp := omit, mt := t_CallParsMT } diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index 78c5ee4..44d6c01 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -7,4 +7,5 @@ <testcase classname='Asterisk_Tests' name='TC_internal_call_all_4registered' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_registration' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_ims_call_mt' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37127?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: I2af846f92b6ebca21d1286f5137cb004b6284ddf Gerrit-Change-Number: 37127 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Fix wrong IP address arg creating IMS_CallPars

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37124?usp=email ) Change subject: asterisk: Fix wrong IP address arg creating IMS_CallPars ...................................................................... asterisk: Fix wrong IP address arg creating IMS_CallPars This field is not yet really used because we are not doing any RTP so far, so the previous error was harmless. We are at most sending it in the SDP. Change-Id: Iac0c240d785131954c4d8a2df90655e2a5ec3666 --- M asterisk/Asterisk_Tests.ttcn 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index a96e66a..c4cad38 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -79,7 +79,7 @@ } function f_init_IMS_ConnHdlrPars(integer idx := 1) runs on test_CT return IMS_ConnHdlrPars { - var template (value) IMS_CallPars cp := t_IMS_CallPars(mp_local_sip_host, 1234 + 2*idx); + var template (value) IMS_CallPars cp := t_IMS_CallPars(mp_local_ims_host, 1234 + 2*idx); var template (value) IMS_ConnHdlrPars pars := t_IMS_Pars(mp_local_ims_host, mp_local_ims_port, mp_ims_domain, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37124?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: Iac0c240d785131954c4d8a2df90655e2a5ec3666 Gerrit-Change-Number: 37124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Validate Expires=600000 in REGISTER as per specs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37121?usp=email ) Change subject: asterisk: IMS: Validate Expires=600000 in REGISTER as per specs ...................................................................... asterisk: IMS: Validate Expires=600000 in REGISTER as per specs Change-Id: Ibf2e3ff36d0c7cc84d25328ffdf87a6cedc8a37b --- M asterisk/IMS_ConnectionHandler.ttcn 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index c06df15..7819e62 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -34,6 +34,7 @@ charstring mp_ipsec_setup_script_path := "./IMS_ipsec_setup.sh"; } +const integer c_def_expires := 600000; /* 3GPP TS 24.229 5.1.1.2.1 e) */ const char c_sip_server_name := "osmo-ttcn3-hacks/0.23"; @@ -476,6 +477,7 @@ tr_From(), tr_To(), tr_Via_from(?), + expires := tr_Expires(int2str(c_def_expires)), require := tr_Require(superset("sec-agree")), security_client := tr_Security_client(superset(tr_Security_mechanism("ipsec-3gpp", superset(tr_Param("alg","hmac-sha-1-96"))))), @@ -519,8 +521,6 @@ */ f_ims_validate_register_P_Access_Network_info(g_rx_sip_req, exp_present := false); - /* TODO: Validate "Expires" is 600000 */ - /* Tx 100 Tyring */ tx_resp := ts_SIP_Response_Trying(sip_call_id, from_addr, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37121?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: Ibf2e3ff36d0c7cc84d25328ffdf87a6cedc8a37b Gerrit-Change-Number: 37121 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Validate P-Access-Network-Info in rx INVITE

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37123?usp=email ) Change subject: asterisk: IMS: Validate P-Access-Network-Info in rx INVITE ...................................................................... asterisk: IMS: Validate P-Access-Network-Info in rx INVITE Change-Id: Ie4c4c4e11abbaae81f934675c569b09433a5eb15 --- M asterisk/IMS_ConnectionHandler.ttcn 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 7819e62..1eae16d 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -697,9 +697,15 @@ contact := g_rx_sip_req.msgHeader.contact; f_ims_validate_register_contact(contact); - /* Validate P-Access-Network-Info: */ + /* Validate P-Access-Network-Info: 3GPP TS 24.229 5.1.2A.1.1 + * "If available to the UE (as defined in the access technology specific annexes for each access technology), the UE shall + * insert a P-Access-Network-Info header field into any request for a dialog, any subsequent request (except CANCEL + * requests) or response (except CANCEL responses) within a dialog or any request for a standalone method (see + * subclause 7.2A.4). Insertion of the P-Access-Network-Info header field into the ACK request is optional." + */ f_ims_validate_register_P_Access_Network_info(g_rx_sip_req, exp_present := true); + /* Tx 100 Tyring */ tx_resp := ts_SIP_Response_Trying(sip_call_id, from_addr, @@ -772,6 +778,8 @@ f_ConnHdlr_parse_initial_SIP_INVITE(g_rx_sip_req); via := g_rx_sip_req.msgHeader.via; + f_ims_validate_register_P_Access_Network_info(g_rx_sip_req, exp_present := true); + /* Tx 180 Ringing */ tx_resp := ts_SIP_Response_Ringing(g_pars.subscr.cp.sip_call_id, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37123?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: Ie4c4c4e11abbaae81f934675c569b09433a5eb15 Gerrit-Change-Number: 37123 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_ims_call_mt

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37127?usp=email ) Change subject: asterisk: Introduce test TC_ims_call_mt ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37127?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: I2af846f92b6ebca21d1286f5137cb004b6284ddf Gerrit-Change-Number: 37127 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 15:51:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2024