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

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

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36950?usp=email ) Change subject: asterisk: Introduce TC_ims_call_mo ...................................................................... asterisk: Introduce TC_ims_call_mo The test validates establishing and hanging up a MO call: SIP-UA -> Asterisk -> IMS-CORE. SYS#6782 Change-Id: I3c6d8c109c392fa6e1036dcb69a7abb90b22fec7 --- M asterisk/Asterisk_Tests.default M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn M asterisk/SIP_ConnectionHandler.ttcn M asterisk/expected-results.xml 5 files changed, 350 insertions(+), 89 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/asterisk/Asterisk_Tests.default b/asterisk/Asterisk_Tests.default index 24c53e3..1de9def 100644 --- a/asterisk/Asterisk_Tests.default +++ b/asterisk/Asterisk_Tests.default @@ -1,5 +1,5 @@ [LOGGING] -FileMask := LOG_ALL | TTCN_MATCHING; +FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; [TESTPORT_PARAMETERS] diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index e7d0616..4ac7eaf 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -65,6 +65,14 @@ const charstring broadcast_sip_extension := "0500"; +/* TODO: need to find correct RES, CK, IK, values for: + * Response: "a19de225d030e6e0ec20f6de5f9dd80d" + * CNonce Value: "9a6460bcc3c84a3eac69455a93b67a77" + */ +const charstring c_auth_res := "a19de225d030e6e0"; +const charstring c_auth_ck := "9a6460bcc3c84a3eac69455a93b67a77"; +const charstring c_auth_ik := "5238297dfcca759bd05d48ff49bc63fa"; + function f_init_ConnHdlrPars(integer idx := 1) runs on test_CT return SIPConnHdlrPars { var template (value) CallPars cp := t_CallPars(mp_local_sip_host, 1234 + 2*idx); var template (value) SIPConnHdlrPars pars := t_Pars(mp_local_sip_host, @@ -163,7 +171,7 @@ function f_start_handler_IMS(ims_void_fn fn, IMS_ConnHdlrPars pars) runs on test_CT return IMS_ConnHdlr { var IMS_ConnHdlr vc_conn; - var charstring id := testcasename() & "-IMS_ConnHdlr-" & pars.user; + var charstring id := testcasename() & "-IMS_ConnHdlr-" & pars.subscr.imsi; vc_conn := IMS_ConnHdlr.create(id) alive; @@ -359,9 +367,43 @@ setverdict(pass); } +private function f_AMI_IMS_register(IMS_ConnHdlrPars pars) runs on test_CT +{ + /* Give some time for IMS_ConnHdlr to register SIP expect. This could be done through IMS_COORD. */ + f_sleep(1.0); + /* Clear events: */ + AMI_CLIENT.clear; + + /* Announce network information, this should usually happen when UE + * becomes attached to network and before IMS APN is set up: */ + f_ami_action_PJSIPAccessNetworkInfo(AMI_CLIENT, mp_volte_ims_outbound_registration, + f_ami_gen_PJSIPAccessNetworkInfo_Info_EUTRAN(pars.subscr.uli_str)); + + /* Trigger registration: */ + f_ami_action_PJSIPRegister(AMI_CLIENT, mp_volte_ims_outbound_registration); + + var charstring rand_str := oct2str(pars.subscr.rand); + var charstring autn_str := oct2str(pars.subscr.autn); + AMI_CLIENT.receive(tr_AMI_Event_AuthRequest(mp_volte_ims_outbound_registration, + rand := pattern @nocase rand_str, + autn := pattern @nocase autn_str)); + + f_ami_action_AuthResponse_RES(AMI_CLIENT, + mp_volte_ims_outbound_registration, + c_auth_res, c_auth_ck, c_auth_ik); + + AMI_CLIENT.receive(tr_AMI_Event_Registry(f_sip_SipAddr_to_str(pars.subscr.local_sip_record), + "sip:" & mp_local_ims_host, + "Registered")); + + /* TODO: test "Action: PJSIPUnregister" */ + + /* TODO: in another test emulating a call, test "Action: DedicatedBearerStatus" */ +} + /* Test SIP registration of local clients */ private function f_TC_ims_registration(charstring id) runs on IMS_ConnHdlr { - f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.registrar_sip_record.addr))); + f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); as_IMS_register(); setverdict(pass); } @@ -372,46 +414,67 @@ pars := f_init_IMS_ConnHdlrPars(); vc_conn := f_start_handler_IMS(refers(f_TC_ims_registration), pars); - /* Give some time for IMS_ConnHdlr to register SIP expect. This could be done through IMS_COORD. */ - f_sleep(1.0); - /* Clear events: */ - AMI_CLIENT.clear; - - /* Announce network information, this should usually happen when UE - * becomes attached to network and before IMS APN is set up: */ - f_ami_action_PJSIPAccessNetworkInfo(AMI_CLIENT, mp_volte_ims_outbound_registration, - f_ami_gen_PJSIPAccessNetworkInfo_Info_EUTRAN(pars.uli_str)); - - /* Trigger registration: */ - f_ami_action_PJSIPRegister(AMI_CLIENT, mp_volte_ims_outbound_registration); - - var charstring rand_str := oct2str(pars.rand); - var charstring autn_str := oct2str(pars.autn); - AMI_CLIENT.receive(tr_AMI_Event_AuthRequest(mp_volte_ims_outbound_registration, - rand := pattern @nocase rand_str, - autn := pattern @nocase autn_str)); - /* TODO: need to find correct RES, CK, IK, values for: - * Response: "a19de225d030e6e0ec20f6de5f9dd80d" - * CNonce Value: "9a6460bcc3c84a3eac69455a93b67a77" - */ - f_ami_action_AuthResponse_RES(AMI_CLIENT, - mp_volte_ims_outbound_registration, - res := "a19de225d030e6e0", - ck := "9a6460bcc3c84a3eac69455a93b67a77", - ik := "5238297dfcca759bd05d48ff49bc63fa"); - - AMI_CLIENT.receive(tr_AMI_Event_Registry(f_sip_SipAddr_to_str(pars.local_sip_record), - "sip:" & mp_local_ims_host, - "Registered")); - - /* TODO: test "Action: PJSIPUnregister" */ - - /* TODO: in another test emulating a call, test "Action: DedicatedBearerStatus" */ + f_AMI_IMS_register(pars); vc_conn.done; f_shutdown(); } +/* Test SIP registration of local clients */ +private function f_TC_ims_call_mo(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); +} +testcase TC_ims_call_mo() 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.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))); + ims_pars.subscr.cp.calling := valueof(ts_SipAddr(ts_HostPort(ims_pars.local_sip_host), + ts_UserInfo(ims_pars.subscr.msisdn))); + ims_pars.subscr.cp.called := valueof(ts_SipAddr(ts_HostPort(ims_pars.local_sip_host), + ts_UserInfo(c_ext_msisdn))); + + vc_conn_ims := f_start_handler_IMS(refers(f_TC_ims_call_mo), 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); + + COORD.send(COORD_CMD_START) to vc_conn_sip; + COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn_sip; + IMS_COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn_ims; + + /* Call on-going */ + f_sleep(1.0); + + COORD.send(COORD_CMD_HANGUP) to vc_conn_sip; + + vc_conn_sip.done; + vc_conn_ims.done; + f_shutdown(); +} + control { execute( TC_internal_registration() ); execute( TC_internal_call_momt() ); @@ -419,6 +482,7 @@ execute( TC_internal_call_all_3registered() ); execute( TC_internal_call_all_4registered() ); execute( TC_ims_registration() ); + execute( TC_ims_call_mo() ); } } diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index a253c9f..3f0c380 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -56,14 +56,10 @@ } type record of IMS_ConnHdlr IMS_ConnHdlrList; -type record IMS_ConnHdlrPars { - float t_guard, - charstring realm, - charstring local_sip_host, - uint16_t local_sip_port, +type record IMS_ConnHdlrSubscrPars { charstring remote_sip_host optional, uint16_t remote_sip_port optional, - charstring user, + charstring imsi, charstring display_name, charstring password, charstring msisdn, @@ -78,16 +74,26 @@ integer ipsec_remote_spi_s optional, uint16_t ipsec_remote_port_c optional, uint16_t ipsec_remote_port_s optional, - SipUrl registrar_sip_req_uri, SipAddr registrar_sip_record, CallidString registrar_sip_call_id, integer registrar_sip_seq_nr, - Via local_via, SipUrl local_sip_url_ext, SipAddr local_sip_record, Contact local_contact, IMS_CallPars cp optional } +type record of IMS_ConnHdlrSubscrPars IMS_ConnHdlrSubscrParsList; + + +type record IMS_ConnHdlrPars { + float t_guard, + charstring realm, + charstring local_sip_host, + uint16_t local_sip_port, + SipUrl registrar_sip_req_uri, + Via local_via, + IMS_ConnHdlrSubscrPars subscr optional +} type record of IMS_ConnHdlrPars IMS_ConnHdlrParsList; type record IMS_CallParsMT { @@ -105,8 +111,8 @@ SipAddr calling optional, SipAddr called optional, - SipAddr from_addr optional, - SipAddr to_addr optional, + From from_addr optional, + To to_addr optional, CallidString sip_call_id, integer sip_seq_nr, @@ -136,22 +142,19 @@ mt := t_IMS_CallParsMT } -template (value) IMS_ConnHdlrPars t_IMS_Pars(charstring local_sip_host, - uint16_t local_sip_port, - charstring user, - charstring display_name := "Anonymous", - charstring password := "secret", - template (omit) IMS_CallPars cp := omit) := { - t_guard := 30.0, - realm := local_sip_host, - local_sip_host := local_sip_host, - local_sip_port := local_sip_port, +template (value) IMS_ConnHdlrSubscrPars t_IMS_SubscrPars(charstring local_sip_host, + uint16_t local_sip_port, + charstring imsi, + charstring msisdn := "90828", + charstring display_name := "Anonymous", + charstring password := "secret", + template (omit) IMS_CallPars cp := omit) := { remote_sip_host := omit, remote_sip_port := omit, - user := user, + imsi := imsi, display_name := f_sip_str_quote(display_name), password := password, - msisdn := "90828", + msisdn := msisdn, uli_str := "2380100010000101", /* The Nonce field is the Base64 encoded version of the RAND value and concatenated with the AUTN: */ rand := '14987631f65f8e3788a0798b6ebcd08e'O, @@ -163,28 +166,39 @@ ipsec_remote_spi_s := omit, ipsec_remote_port_c := omit, ipsec_remote_port_s := omit, - registrar_sip_req_uri := valueof(ts_SipUrlHost(local_sip_host)), registrar_sip_record := ts_SipAddr(ts_HostPort(local_sip_host), - ts_UserInfo(user), + ts_UserInfo(imsi), f_sip_str_quote(display_name)), registrar_sip_call_id := hex2str(f_rnd_hexstring(15)) & "@" & local_sip_host, registrar_sip_seq_nr := f_sip_rand_seq_nr(), - local_via := ts_Via_from(ts_HostPort(local_sip_host, local_sip_port)), local_sip_url_ext := ts_SipUrl(ts_HostPort(local_sip_host, local_sip_port), - ts_UserInfo(user)), + ts_UserInfo(imsi)), local_sip_record := ts_SipAddr(ts_HostPort(local_sip_host), - ts_UserInfo(user)), + ts_UserInfo(imsi)), local_contact := valueof(ts_Contact({ ts_ContactAddress( ts_Addr_Union_SipUrl(ts_SipUrl(ts_HostPort( local_sip_host, local_sip_port), - ts_UserInfo(user))), + ts_UserInfo(imsi))), omit) })), cp := cp } +template (value) IMS_ConnHdlrPars t_IMS_Pars(charstring local_sip_host, + uint16_t local_sip_port, + charstring imsi, + template (omit) IMS_CallPars cp := omit) := { + t_guard := 30.0, + realm := local_sip_host, + local_sip_host := local_sip_host, + local_sip_port := local_sip_port, + registrar_sip_req_uri := valueof(ts_SipUrlHost(local_sip_host)), + local_via := ts_Via_from(ts_HostPort(local_sip_host, local_sip_port)), + subscr := t_IMS_SubscrPars(local_sip_host, local_sip_port, imsi := imsi, cp := cp) +} + private altstep as_Tguard() runs on IMS_ConnHdlr { [] g_Tguard.timeout { setverdict(fail, "Tguard timeout"); @@ -293,7 +307,7 @@ /* exp_present: */ var template (present) P_Access_Network_Info expl_tmpl := - tr_P_Access_Network_Info({ tr_Access_net_spec_EUTRAN(g_pars.uli_str) }); + tr_P_Access_Network_Info({ tr_Access_net_spec_EUTRAN(g_pars.subscr.uli_str) }); if (not ispresent(g_rx_sip_req.msgHeader.p_access_network_info)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, @@ -325,13 +339,13 @@ continue; } par_val := f_sip_param_get_value_present_or_fail(sec_pars, "spi-c"); - g_pars.ipsec_remote_spi_c := str2int(par_val); + g_pars.subscr.ipsec_remote_spi_c := str2int(par_val); par_val := f_sip_param_get_value_present_or_fail(sec_pars, "spi-s"); - g_pars.ipsec_remote_spi_s := str2int(par_val); + g_pars.subscr.ipsec_remote_spi_s := str2int(par_val); par_val := f_sip_param_get_value_present_or_fail(sec_pars, "port-c"); - g_pars.ipsec_remote_port_c := str2int(par_val); + g_pars.subscr.ipsec_remote_port_c := str2int(par_val); par_val := f_sip_param_get_value_present_or_fail(sec_pars, "port-s"); - g_pars.ipsec_remote_port_s := str2int(par_val); + g_pars.subscr.ipsec_remote_port_s := str2int(par_val); found := true; break; } @@ -341,8 +355,8 @@ log2str(g_name & "alg=hmac-sha-1-96 not found: ", security_client)); } - log("ipsec: remote_spi_c=", g_pars.ipsec_remote_spi_c, " remote_spi_s=", g_pars.ipsec_remote_spi_s, - "local_spi_c=", g_pars.ipsec_local_spi_c, " local_spi_s=", g_pars.ipsec_local_spi_s); + log("ipsec: remote_spi_c=", g_pars.subscr.ipsec_remote_spi_c, " remote_spi_s=", g_pars.subscr.ipsec_remote_spi_s, + "local_spi_c=", g_pars.subscr.ipsec_local_spi_c, " local_spi_s=", g_pars.subscr.ipsec_local_spi_s); } private function f_IMS_exec_sync(charstring cmdline, template (present) integer rc := 0) @@ -362,12 +376,12 @@ var charstring cmd := mp_ipsec_setup_script_path & " " & g_pars.local_sip_host & " " & - int2str(g_pars.local_sip_port) & " " & int2str(g_pars.ipsec_local_spi_c) & " " & - int2str(g_pars.local_sip_port) & " " & int2str(g_pars.ipsec_local_spi_s) & " " & - g_pars.remote_sip_host & " " & - int2str(g_pars.ipsec_remote_port_c) & " " & int2str(g_pars.ipsec_remote_spi_c) & " " & - int2str(g_pars.ipsec_remote_port_s) & " " & int2str(g_pars.ipsec_remote_spi_s) & " " & - g_pars.ipsec_auth_key; + int2str(g_pars.local_sip_port) & " " & int2str(g_pars.subscr.ipsec_local_spi_c) & " " & + int2str(g_pars.local_sip_port) & " " & int2str(g_pars.subscr.ipsec_local_spi_s) & " " & + g_pars.subscr.remote_sip_host & " " & + int2str(g_pars.subscr.ipsec_remote_port_c) & " " & int2str(g_pars.subscr.ipsec_remote_spi_c) & " " & + int2str(g_pars.subscr.ipsec_remote_port_s) & " " & int2str(g_pars.subscr.ipsec_remote_spi_s) & " " & + g_pars.subscr.ipsec_auth_key; res := f_IMS_exec_sync(cmd); @@ -381,6 +395,57 @@ */ } +private function f_tr_Via_response(Via via_req) return template (present) Via { + template (present) SemicolonParam_List via_resp_params := ?; + + /*via_resp_params := { + { id := "rport", paramValue := int2str(g_pars.subscr.remote_sip_port.subscr.remote_sip_port) }, + { id := "received", paramValue := g_pars.subscr.remote_sip_host } + }; */ + return tr_Via_from(via_req.viaBody[0].sentBy, + via_req.viaBody[0].sentProtocol.transport, + via_resp_params); +} + +private function f_tr_From(template (value) SipAddr from_req) return template (present) SipAddr { + return tr_SipAddr_from_val(from_req); +} + +private altstep as_SIP_expect_req(template (present) PDU_SIP_Request 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_req; + [fail_others] as_SIP_fail_req(sip_expect_str); + [fail_others] as_SIP_fail_resp(sip_expect_str); +} + +private function f_gen_sdp() runs on IMS_ConnHdlr return charstring { + var charstring sdp := + "v=0\r\n" & + "o=0502 2390 1824 IN IP4 " & g_pars.subscr.cp.local_rtp_addr & "\r\n" & + "s=Talk\r\n" & + "c=IN IP4 " & g_pars.subscr.cp.local_rtp_addr & "\r\n" & + "t=0 0\r\n" & + "a=rtcp-xr:rcvr-rtt=all:10000 stat-summary=loss,dup,jitt,TTL voip-metrics\r\n" & + "a=record:off\r\n" & + "m=audio " & int2str(g_pars.subscr.cp.local_rtp_port) & " RTP/AVP 8 96 97 98 0 18 99 100 101\r\n" & + "a=rtpmap:8 PCMA/8000\r\n" & + "a=rtpmap:96 opus/48000/2\r\n" & + "a=fmtp:96 useinbandfec=1\r\n" & + "a=rtpmap:97 speex/16000\r\n" & + "a=fmtp:97 vbr=on\r\n" & + "a=rtpmap:98 speex/8000\r\n" & + "a=fmtp:98 vbr=on\r\n" & + "a=fmtp:18 annexb=yes\r\n" & + "a=rtpmap:99 telephone-event/48000\r\n" & + "a=rtpmap:100 telephone-event/16000\r\n" & + "a=rtpmap:101 telephone-event/8000\r\n" & + "a=rtcp:" & int2str(g_pars.subscr.cp.local_rtp_port + 1) & "\r\n" & + "a=rtcp-fb:* trr-int 1000\r\n" & + "a=rtcp-fb:* ccm tmmbr\r\n"; + return sdp; +} + /* Peer is calling us, accept it: */ altstep as_IMS_register(boolean exp_update_to_direct_rtp := true, boolean fail_others := true) runs on IMS_ConnHdlr @@ -449,7 +514,13 @@ userAgent := omit); SIP.send(tx_resp); - g_pars.remote_sip_host := valueof(contact.contactBody.contactAddresses[0].addressField.nameAddr.addrSpec.hostPort.host); + var HostPort hp := valueof(contact.contactBody.contactAddresses[0].addressField.nameAddr.addrSpec.hostPort); + g_pars.subscr.remote_sip_host := hp.host; + if (ispresent(hp.portField)) { + g_pars.subscr.remote_sip_port := hp.portField; + } else { + g_pars.subscr.remote_sip_port := 5060; + } f_ims_parse_security_client(g_rx_sip_req.msgHeader.security_client); f_ims_setup_ipsec(); @@ -459,7 +530,7 @@ ts_Param("realm", f_sip_str_quote(g_pars.realm)), ts_Param("qop", f_sip_str_quote("auth")), ts_Param("algorithm", "AKAv1-MD5"), - ts_Param("nonce", f_sip_str_quote(f_nonce_from_rand_autn(g_pars.rand, g_pars.autn))) + ts_Param("nonce", f_sip_str_quote(f_nonce_from_rand_autn(g_pars.subscr.rand, g_pars.subscr.autn))) /* "opaque not needed in IMS "*/ }; wwwAuthenticate := ts_WwwAuthenticate( { ts_Challenge_digestCln(digestCln) } ) @@ -469,8 +540,8 @@ ts_Param("q", "0.1"), ts_Param("prot", "esp"), ts_Param("mod", "trans"), - ts_Param("spi-c", int2str(g_pars.ipsec_local_spi_c)), - ts_Param("spi-s", int2str(g_pars.ipsec_local_spi_s)), + ts_Param("spi-c", int2str(g_pars.subscr.ipsec_local_spi_c)), + ts_Param("spi-s", int2str(g_pars.subscr.ipsec_local_spi_s)), ts_Param("port-c", int2str(g_pars.local_sip_port)), ts_Param("port-s", int2str(g_pars.local_sip_port)), ts_Param("alg", "hmac-sha-1-96"), @@ -499,12 +570,12 @@ /* TODO: Generate expected Authoritzation based on AKAv1-MD5: */ /*authorization := f_sip_digest_gen_Authorization(valueof(wwwAuthenticate), - g_pars.user, g_pars.password, + g_pars.user, g_pars.subscr.password, "REGISTER", - f_sip_SipUrl_to_str(g_pars.registrar_sip_record.addr.nameAddr.addrSpec)) + f_sip_SipUrl_to_str(g_pars.subscr.registrar_sip_record.addr.nameAddr.addrSpec)) */ authorization := f_tr_Authorization_AKAv1MD5(valueof(wwwAuthenticate), - g_pars.user & "@" & g_pars.realm, + g_pars.subscr.imsi & "@" & g_pars.realm, f_sip_SipUrl_to_str(g_pars.registrar_sip_req_uri)); /* TODO: match Authorization from above: */ exp_req := @@ -539,9 +610,9 @@ p_associated_uri := ts_P_Associated_Uri({ ts_P_Assoc_uri_spec(ts_NameAddr(ts_SipUrl(ts_HostPort(g_pars.realm), - ts_UserInfo(g_pars.msisdn), + ts_UserInfo(g_pars.subscr.msisdn), scheme := "sip"))), - ts_P_Assoc_uri_spec(ts_NameAddr(ts_SipUrl(ts_HostPort(g_pars.msisdn), + ts_P_Assoc_uri_spec(ts_NameAddr(ts_SipUrl(ts_HostPort(g_pars.subscr.msisdn), omit, scheme := "tel"))), ts_P_Assoc_uri_spec(g_rx_sip_req.msgHeader.toField.addressField.nameAddr) @@ -568,4 +639,115 @@ } +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); + log("Rx Initial MO INVITE decoded SDP: ", g_pars.subscr.cp.peer_sdp); + + /* Obtain params: */ + g_pars.subscr.cp.sip_call_id := rx_sip_req.msgHeader.callId.callid; + g_pars.subscr.cp.from_addr := rx_sip_req.msgHeader.fromField; + g_pars.subscr.cp.to_addr := rx_sip_req.msgHeader.toField; + g_pars.subscr.cp.to_addr.toParams := f_sip_param_set(g_pars.subscr.cp.to_addr.toParams, "tag", f_sip_rand_tag()); + g_pars.subscr.cp.sip_seq_nr := rx_sip_req.msgHeader.cSeq.seqNumber; +} + +/* Peer is calling us, accept it: */ +altstep as_IMS_mo_call_accept(boolean exp_update_to_direct_rtp := false, + boolean fail_others := true) runs on IMS_ConnHdlr +{ + var template (present) PDU_SIP_Request exp_req := + tr_SIP_INVITE(f_tr_SipUrl_opt_defport(ts_SipUrl_from_Addr_Union(g_pars.subscr.cp.called.addr)), + ?, + ( /* FIXME: We should be sending with MSISDN here, aka 2nd option below, but we receive IMSI (first opt): */ + tr_From(tr_Addr_Union_from_val(g_pars.subscr.local_sip_record.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.remote_sip_port)), + ?, ?); + 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 charstring tx_sdp; + + /* Obtain params: */ + f_ConnHdlr_parse_initial_SIP_INVITE(g_rx_sip_req); + via := g_rx_sip_req.msgHeader.via; + + + /* Tx 180 Ringing */ + 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, + g_pars.subscr.cp.sip_seq_nr); + SIP.send(tx_resp); + + /* Tx 200 OK */ + tx_sdp := f_gen_sdp(); + tx_resp := ts_SIP_Response(g_pars.subscr.cp.sip_call_id, + g_pars.subscr.cp.from_addr, + g_pars.subscr.cp.to_addr, + "INVITE", 200, + g_pars.subscr.cp.sip_seq_nr, + "OK", + via, + body := tx_sdp); + SIP.send(tx_resp); + + /* Wait for ACK */ + exp_req := tr_SIP_ACK(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, + f_tr_Via_response(via), + g_pars.subscr.cp.sip_seq_nr, *); + as_SIP_expect_req(exp_req); + } + [fail_others] as_SIP_fail_resp(sip_expect_str); + [fail_others] as_SIP_fail_req(sip_expect_str); + +} + +/* Call is terminated by peer: */ +altstep as_IMS_exp_call_hangup(template (present) integer exp_seq_nr := ?, boolean fail_others := true) runs on IMS_ConnHdlr +{ + var template (present) PDU_SIP_Request exp_req := + tr_SIP_BYE(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.remote_sip_port)), + exp_seq_nr); + 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 charstring tx_sdp; + var Via via; + + /* Update parameters: */ + g_pars.subscr.cp.sip_seq_nr := g_rx_sip_req.msgHeader.cSeq.seqNumber; + /* "branch" has changed: */ + via := g_rx_sip_req.msgHeader.via; + + /* Tx 200 OK */ + tx_sdp := f_gen_sdp(); + tx_resp := ts_SIP_Response(g_pars.subscr.cp.sip_call_id, + g_pars.subscr.cp.from_addr, + g_pars.subscr.cp.to_addr, + "BYE", 200, + g_pars.subscr.cp.sip_seq_nr, + "OK", + via, + body := tx_sdp); + SIP.send(tx_resp); + } + [fail_others] as_SIP_fail_resp(sip_expect_str); + [fail_others] as_SIP_fail_req(sip_expect_str); +} + } diff --git a/asterisk/SIP_ConnectionHandler.ttcn b/asterisk/SIP_ConnectionHandler.ttcn index 41a29e4..a14dd03 100644 --- a/asterisk/SIP_ConnectionHandler.ttcn +++ b/asterisk/SIP_ConnectionHandler.ttcn @@ -241,7 +241,8 @@ "t=0 0\r\n" & "a=rtcp-xr:rcvr-rtt=all:10000 stat-summary=loss,dup,jitt,TTL voip-metrics\r\n" & "a=record:off\r\n" & - "m=audio " & int2str(g_pars.cp.local_rtp_port) & " RTP/AVP 96 97 98 0 8 18 99 100 101\r\n" & + "m=audio " & int2str(g_pars.cp.local_rtp_port) & " RTP/AVP 8 96 97 98 0 18 99 100 101\r\n" & + "a=rtpmap:8 PCMA/8000\r\n" & "a=rtpmap:96 opus/48000/2\r\n" & "a=fmtp:96 useinbandfec=1\r\n" & "a=rtpmap:97 speex/16000\r\n" & diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index 49f92bf..78c5ee4 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -6,4 +6,5 @@ <testcase classname='Asterisk_Tests' name='TC_internal_call_all_3registered' time='MASKED'/> <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'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36950?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: I3c6d8c109c392fa6e1036dcb69a7abb90b22fec7 Gerrit-Change-Number: 36950 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Allow passing full templates to {tr,ts}_SIP_msgh_std

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36949?usp=email ) Change subject: asterisk: Allow passing full templates to {tr,ts}_SIP_msgh_std ...................................................................... asterisk: Allow passing full templates to {tr,ts}_SIP_msgh_std It may have been a great idea at first to have this SipAddr record unifying several records, and it may be so under certain circumstances, but clearly it's not the case when passing them to generic tr_* templates (like the _std_ one in SIP) which then have to access specific fields of those records. This will crash if for instance a (tr_...(), tr_...()) compound is passed. This is a next step towards getting rid of SipAddress in lower level templates, which the SIP specific enc/dec doesn't understand and creates several kinds of troubles like the one mentioned above. Change-Id: I3a85701822d7b76ec078b1a7c615e5ef50f36902 --- M asterisk/IMS_ConnectionHandler.ttcn M asterisk/SIP_ConnectionHandler.ttcn M library/SIP_Templates.ttcn M sip/SIP_Tests.ttcn 4 files changed, 241 insertions(+), 177 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index a55935a..a253c9f 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -388,8 +388,8 @@ var template (present) PDU_SIP_Request exp_req := tr_SIP_REGISTER(g_pars.registrar_sip_req_uri, ?, - tr_SipAddr(), - tr_SipAddr(), + tr_From(), + tr_To(), tr_Via_from(?), require := tr_Require(superset("sec-agree")), security_client := tr_Security_client(superset(tr_Security_mechanism("ipsec-3gpp", @@ -402,8 +402,8 @@ var Via via; var CallidString sip_call_id; var Contact contact; - var template (value) SipAddr from_addr; - var template (value) SipAddr to_addr; + var template (value) From from_addr; + var template (value) To to_addr; var template (value) CommaParam_List digestCln ; var template (value) WwwAuthenticate wwwAuthenticate; var template (value) P_Associated_Uri p_associated_uri := ts_P_Associated_Uri({}); @@ -418,10 +418,8 @@ sip_call_id := g_rx_sip_req.msgHeader.callId.callid; via := g_rx_sip_req.msgHeader.via; via.viaBody[0].viaParams := f_sip_param_set(via.viaBody[0].viaParams, "rport", "1234"); /* TODO: set remote src port of the REGISTER */ - from_addr := ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.fromField.addressField, - g_rx_sip_req.msgHeader.fromField.fromParams); - to_addr := ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.toField.addressField, - g_rx_sip_req.msgHeader.toField.toParams); + from_addr := g_rx_sip_req.msgHeader.fromField; + to_addr := g_rx_sip_req.msgHeader.toField; sip_seq_nr := g_rx_sip_req.msgHeader.cSeq.seqNumber; contact := g_rx_sip_req.msgHeader.contact; @@ -455,7 +453,7 @@ f_ims_parse_security_client(g_rx_sip_req.msgHeader.security_client); f_ims_setup_ipsec(); - to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); + to_addr.toParams := f_sip_param_set(to_addr.toParams, "tag", f_sip_rand_tag()); digestCln := { ts_Param("realm", f_sip_str_quote(g_pars.realm)), @@ -512,18 +510,16 @@ exp_req := tr_SIP_REGISTER(g_pars.registrar_sip_req_uri, ?, - tr_SipAddr(), - tr_SipAddr(), + tr_From(), + tr_To(), tr_Via_from(?), authorization := authorization); SIP.receive(exp_req) -> value g_rx_sip_req; sip_call_id := g_rx_sip_req.msgHeader.callId.callid; via := g_rx_sip_req.msgHeader.via; - from_addr := ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.fromField.addressField, - g_rx_sip_req.msgHeader.fromField.fromParams); - to_addr := ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.toField.addressField, - g_rx_sip_req.msgHeader.toField.toParams); + from_addr := g_rx_sip_req.msgHeader.fromField; + to_addr := g_rx_sip_req.msgHeader.toField; sip_seq_nr := g_rx_sip_req.msgHeader.cSeq.seqNumber; /* Tx 100 Trying */ @@ -552,7 +548,7 @@ }); /* Tx 200 OK */ - to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); + to_addr.toParams := f_sip_param_set(to_addr.toParams, "tag", f_sip_rand_tag()); tx_resp := ts_SIP_Response(sip_call_id, from_addr, to_addr, diff --git a/asterisk/SIP_ConnectionHandler.ttcn b/asterisk/SIP_ConnectionHandler.ttcn index 9c7cca5..41a29e4 100644 --- a/asterisk/SIP_ConnectionHandler.ttcn +++ b/asterisk/SIP_ConnectionHandler.ttcn @@ -80,8 +80,8 @@ SipAddr calling optional, SipAddr called optional, - SipAddr from_addr optional, - SipAddr to_addr optional, + From from_addr optional, + To to_addr optional, CallidString sip_call_id, integer sip_seq_nr, @@ -263,7 +263,9 @@ var template (present) PDU_SIP_Response exp; var Authorization authorization; var Via via := g_pars.local_via; - var SipAddr from_sipaddr := g_pars.registrar_sip_record; + var From from_addr := valueof(ts_From(g_pars.registrar_sip_record.addr, g_pars.registrar_sip_record.params)); + var To to_addr := valueof(ts_To(g_pars.registrar_sip_record.addr, g_pars.registrar_sip_record.params)); + var template (present) To to_addr_exp := tr_To(tr_Addr_Union_from_val(to_addr.addressField), *); var charstring branch_value; branch_value := f_sip_gen_branch(f_sip_SipAddr_to_str(g_pars.registrar_sip_record), @@ -272,11 +274,11 @@ g_pars.registrar_sip_seq_nr); via.viaBody[0].viaParams := f_sip_param_set(via.viaBody[0].viaParams, "branch", branch_value); - from_sipaddr.params := f_sip_param_set(from_sipaddr.params, "tag", f_sip_rand_tag()); + from_addr.fromParams := f_sip_param_set(from_addr.fromParams, "tag", f_sip_rand_tag()); SIP.send(ts_SIP_REGISTER(g_pars.registrar_sip_req_uri, g_pars.registrar_sip_call_id, - from_sipaddr, - g_pars.registrar_sip_record, + from_addr, + to_addr, via, g_pars.registrar_sip_seq_nr, g_pars.local_contact, @@ -284,8 +286,8 @@ exp := tr_SIP_Response_Unauthorized( g_pars.registrar_sip_call_id, - from_sipaddr, - f_tr_To_response(g_pars.registrar_sip_record), + from_addr, + to_addr_exp, f_tr_Via_response(via), *, tr_WwwAuthenticate({tr_Challenge_digestCln(?)}), @@ -308,8 +310,8 @@ SIP.send(ts_SIP_REGISTER(g_pars.registrar_sip_req_uri, g_pars.registrar_sip_call_id, - from_sipaddr, - g_pars.registrar_sip_record, + from_addr, + to_addr, via, g_pars.registrar_sip_seq_nr, g_pars.local_contact, @@ -319,8 +321,8 @@ /* Wait for OK answer */ exp := tr_SIP_Response( g_pars.registrar_sip_call_id, - from_sipaddr, - f_tr_To_response(g_pars.registrar_sip_record), + from_addr, + to_addr_exp, f_tr_Via_response(via), *, "REGISTER", 200, @@ -336,17 +338,21 @@ { 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; /* RFC 3261 8.1.1.3 From */ - g_pars.cp.from_addr := g_pars.cp.calling; - g_pars.cp.from_addr.params := f_sip_param_set(g_pars.cp.from_addr.params, "tag", f_sip_rand_tag()); - g_pars.cp.to_addr := g_pars.cp.called; - branch_value := f_sip_gen_branch(f_sip_SipAddr_to_str(g_pars.cp.from_addr), - f_sip_SipAddr_to_str(valueof(g_pars.cp.to_addr)), + g_pars.cp.from_addr := valueof(ts_From(g_pars.cp.calling.addr, g_pars.cp.calling.params)); + g_pars.cp.from_addr.fromParams := f_sip_param_set(g_pars.cp.from_addr.fromParams, "tag", f_sip_rand_tag()); + g_pars.cp.to_addr := valueof(ts_To(g_pars.cp.called.addr, g_pars.cp.called.params)); + from_addr_exp := tr_From(tr_Addr_Union_from_val(g_pars.cp.from_addr.addressField), *); + to_addr_exp := tr_To(tr_Addr_Union_from_val(g_pars.cp.to_addr.addressField), *); + branch_value := f_sip_gen_branch(f_sip_Addr_Union_to_str(g_pars.cp.from_addr.addressField), + f_sip_Addr_Union_to_str(valueof(g_pars.cp.to_addr.addressField)), g_pars.cp.sip_call_id, g_pars.cp.sip_seq_nr); via := g_pars.local_via; @@ -365,8 +371,8 @@ /* RFC 3261 22.2: */ exp := tr_SIP_Response_Unauthorized( g_pars.cp.sip_call_id, - f_tr_From(g_pars.cp.from_addr), - f_tr_To_response(g_pars.cp.to_addr), + from_addr_exp, + to_addr_exp, f_tr_Via_response(via), *, tr_WwwAuthenticate({tr_Challenge_digestCln(?)}), @@ -385,16 +391,16 @@ /* Conditionally match and accept 100 Trying. */ exp := tr_SIP_Response_Trying(g_pars.cp.sip_call_id, - g_pars.cp.from_addr, - f_tr_To_response(g_pars.cp.to_addr), + from_addr_exp, + to_addr_exp, f_tr_Via_response(via), g_pars.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.cp.sip_call_id, - g_pars.cp.from_addr, - f_tr_To_response(g_pars.cp.to_addr), + from_addr_exp, + to_addr_exp, f_tr_Via_response(via), g_pars.cp.sip_seq_nr, "INVITE"); d_ringing := activate(as_SIP_ignore_resp(exp)); @@ -402,8 +408,8 @@ /* Wait for OK answer */ exp := tr_SIP_Response( g_pars.cp.sip_call_id, - g_pars.cp.from_addr, - f_tr_To_response(g_pars.cp.to_addr), + from_addr_exp, + to_addr_exp, f_tr_Via_response(via), *, "INVITE", 200, @@ -415,8 +421,7 @@ deactivate(d_ringing); /* Update To with the tags received from peer: */ - g_pars.cp.to_addr := valueof(ts_SipAddr_from_Addr_Union(g_rx_sip_resp.msgHeader.toField.addressField, - g_rx_sip_resp.msgHeader.toField.toParams)); + 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; @@ -437,11 +442,9 @@ /* Obtain params: */ g_pars.cp.sip_call_id := rx_sip_req.msgHeader.callId.callid; - g_pars.cp.from_addr := valueof(ts_SipAddr_from_Addr_Union(rx_sip_req.msgHeader.fromField.addressField, - rx_sip_req.msgHeader.fromField.fromParams)); - g_pars.cp.to_addr := valueof(ts_SipAddr_from_Addr_Union(rx_sip_req.msgHeader.toField.addressField, - rx_sip_req.msgHeader.toField.toParams)); - g_pars.cp.to_addr.params := f_sip_param_set(g_pars.cp.to_addr.params, "tag", f_sip_rand_tag()); + g_pars.cp.from_addr := rx_sip_req.msgHeader.fromField; + g_pars.cp.to_addr := rx_sip_req.msgHeader.toField; + g_pars.cp.to_addr.toParams := f_sip_param_set(g_pars.cp.to_addr.toParams, "tag", f_sip_rand_tag()); g_pars.cp.sip_seq_nr := rx_sip_req.msgHeader.cSeq.seqNumber; } @@ -452,8 +455,8 @@ var template (present) PDU_SIP_Request exp_req := tr_SIP_INVITE(f_tr_SipUrl_opt_defport(g_pars.local_sip_url_ext), ?, - f_tr_From(g_pars.cp.calling), - g_pars.cp.called, + tr_From(tr_Addr_Union_from_val(g_pars.cp.calling.addr), *), + tr_To(tr_Addr_Union_from_val(g_pars.cp.called.addr), *), tr_Via_from(f_tr_HostPort(g_pars.remote_sip_host, g_pars.remote_sip_port)), ?, ?); var charstring sip_expect_str := log2str(exp_req); @@ -518,8 +521,8 @@ var template (present) PDU_SIP_Request exp_req := tr_SIP_INVITE(f_tr_SipUrl_opt_defport(g_pars.local_sip_url_ext), ?, - f_tr_From(g_pars.cp.calling), - g_pars.cp.called, + tr_From(tr_Addr_Union_from_val(g_pars.cp.calling.addr), *), + tr_To(tr_Addr_Union_from_val(g_pars.cp.called.addr), *), tr_Via_from(f_tr_HostPort(g_pars.remote_sip_host, g_pars.remote_sip_port)), ?, ?); var charstring sip_expect_str := log2str(exp_req); @@ -527,7 +530,7 @@ [] SIP.receive(exp_req) -> value g_rx_sip_req { var template (value) PDU_SIP_Response tx_resp; var Via via; - var template (present) SipAddr exp_to_addr; + var template (present) To exp_to_addr; var charstring tx_sdp; /* Obtain params: */ @@ -550,8 +553,7 @@ /* Wait for CANCEL */ /* Cancel may come even before we send Ringing, hence To's "tag" * may not be known by peer, so g_pars.to_addr can't be used here: */ - exp_to_addr := ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.toField.addressField, - g_rx_sip_req.msgHeader.toField.toParams); + exp_to_addr := g_rx_sip_req.msgHeader.toField; exp_req := tr_SIP_CANCEL(f_tr_SipUrl_opt_defport(g_pars.local_sip_url_ext), g_pars.cp.sip_call_id, g_pars.cp.from_addr, @@ -636,8 +638,8 @@ var Via via; var charstring branch_value; - branch_value := f_sip_gen_branch(f_sip_SipAddr_to_str(g_pars.cp.from_addr), - f_sip_SipAddr_to_str(valueof(g_pars.cp.to_addr)), + branch_value := f_sip_gen_branch(f_sip_Addr_Union_to_str(g_pars.cp.from_addr.addressField), + f_sip_Addr_Union_to_str(valueof(g_pars.cp.to_addr.addressField)), g_pars.cp.sip_call_id, g_pars.cp.sip_seq_nr); @@ -657,7 +659,7 @@ exp_resp := tr_SIP_Response( g_pars.cp.sip_call_id, g_pars.cp.from_addr, - f_tr_To_response(g_pars.cp.to_addr), + tr_To(tr_Addr_Union_from_val(g_pars.cp.to_addr.addressField), *), f_tr_Via_response(via), *, "BYE", 200, diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 72a4426..9f45b9f 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -227,6 +227,20 @@ deltaSec := deltaSec } +// [20.20] +template (value) From ts_From(template (value) Addr_Union addressField, + template (omit) SemicolonParam_List fromParams := omit) := { + fieldName := FROM_E, + addressField := addressField, + fromParams := fromParams +} +template (present) From tr_From(template (present) Addr_Union addressField := ?, + template SemicolonParam_List fromParams := *) := { + fieldName := FROM_E, + addressField := addressField, + fromParams := fromParams +} + // [RFC3455 5.4] + 3GPP 24.229 V8.7.0 template (present) Access_net_spec tr_Access_net_spec(template (present) charstring access_type := ?, template SemicolonParam_List access_info := *) := { @@ -296,6 +310,20 @@ optionsTags := optionsTags } +// [20.39] +template (value) To ts_To(template (value) Addr_Union addressField, + template (omit) SemicolonParam_List toParams := omit) := { + fieldName := TO_E, + addressField := addressField, + toParams := toParams +} +template (present) To tr_To(template (present) Addr_Union addressField := ?, + template SemicolonParam_List toParams := *) := { + fieldName := TO_E, + addressField := addressField, + toParams := toParams +} + // [20.41 RFC2616 14.43] template (value) UserAgent ts_UserAgent(template (value) ServerVal_List userAgentBody := {}) := { fieldName := USER_AGENT_E, @@ -347,17 +375,24 @@ return ret; } +function tr_Addr_Union_from_val(template (value) Addr_Union tin) return template (present) Addr_Union { + var template (present) Addr_Union ret := tin; + + if (not ispresent(tin.nameAddr.displayName)) { + ret.nameAddr.displayName := *; + } else if (f_str_tolower(f_sip_str_unquote(tin.nameAddr.displayName)) == "anonymous") { + /* if the user is Anonymous, it may be omitted */ + ret.nameAddr.displayName := tin.nameAddr.displayName ifpresent; + } + + ret.nameAddr.addrSpec := tr_SipUrl_from_val(tin.nameAddr.addrSpec); + + return ret; +} function tr_SipAddr_from_val(template (value) SipAddr tin) return template (present) SipAddr { var template (present) SipAddr ret := tin; - if (not ispresent(tin.addr.nameAddr.displayName)) { - ret.addr.nameAddr.displayName := *; - } else if (f_str_tolower(f_sip_str_unquote(tin.addr.nameAddr.displayName)) == "anonymous") { - /* if the user is Anonymous, it may be omitted */ - ret.addr.nameAddr.displayName := tin.addr.nameAddr.displayName ifpresent; - } - - ret.addr.nameAddr.addrSpec := tr_SipUrl_from_val(tin.addr.nameAddr.addrSpec); + ret.addr := tr_Addr_Union_from_val(tin.addr); if (not ispresent(tin.params)) { ret.params := *; @@ -601,8 +636,8 @@ template (value) MessageHeader ts_SIP_msgHeader_empty := c_SIP_msgHeader_empty; template (value) MessageHeader ts_SIP_msgh_std(template (value) CallidString call_id, - template (value) SipAddr from_addr, - template (value) SipAddr to_addr, + template (value) From from_addr, + template (value) To to_addr, template (omit) Contact contact, template (value) charstring method, template (value) integer seq_nr, @@ -636,22 +671,14 @@ method := method }, expires := expires, - fromField := { - fieldName := FROM_E, - addressField := from_addr.addr, - fromParams := from_addr.params - }, + fromField := from_addr, p_associated_uri := p_associated_uri, require := require, security_client := security_client, security_server := security_server, server := server, supported := supported, - toField := { - fieldName := TO_E, - addressField := to_addr.addr, - toParams := to_addr.params - }, + toField := to_addr, userAgent := userAgent, via := via, wwwAuthenticate := wwwAuthenticate @@ -659,8 +686,8 @@ template (present) MessageHeader tr_SIP_msgh_std(template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, + template From from_addr, + template To to_addr, template Contact contact, template (present) Via via := tr_Via_from(?), template charstring method, @@ -694,22 +721,14 @@ method := method }, expires := expires, - fromField := { - fieldName := FROM_E, - addressField := from_addr.addr, - fromParams := from_addr.params - }, + fromField := from_addr, p_associated_uri := p_associated_uri, require := require, security_client := security_client, security_server := security_server, server := server, supported := supported, - toField := { - fieldName := TO_E, - addressField := to_addr.addr, - toParams := to_addr.params - }, + toField := to_addr, userAgent := userAgent, via := via, wwwAuthenticate := wwwAuthenticate @@ -719,8 +738,8 @@ template (value) PDU_SIP_Request ts_SIP_REGISTER(template (value) SipUrl sip_url_host_port, template (value) CallidString call_id, - template (value) SipAddr from_addr, - template (value) SipAddr to_addr, + template (value) From from_addr, + template (value) To to_addr, template (value) Via via, integer seq_nr, template (omit) Contact contact, @@ -746,8 +765,8 @@ template (present) PDU_SIP_Request tr_SIP_REGISTER(template (present) SipUrl sip_url_host_port := ?, template (present) CallidString call_id := ?, - template (present) SipAddr from_addr := ?, - template (present) SipAddr to_addr := ?, + template (present) From from_addr := ?, + template (present) To to_addr := ?, template (present) Via via := tr_Via_from(f_tr_HostPort_opt_defport(?)), template integer seq_nr := *, template Authorization authorization := *, @@ -771,13 +790,13 @@ template (value) PDU_SIP_Request ts_SIP_INVITE(template (value) CallidString call_id, - template (value) SipAddr from_addr, - template (value) SipAddr to_addr, + template (value) From from_addr, + template (value) To to_addr, template (value) Via via, template (value) Contact contact, integer seq_nr, template (omit) charstring body := omit) := { - requestLine := ts_SIP_ReqLine(INVITE_E, to_addr.addr.nameAddr.addrSpec), + requestLine := ts_SIP_ReqLine(INVITE_E, to_addr.addressField.nameAddr.addrSpec), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, contact, "INVITE", seq_nr, via, @@ -789,8 +808,8 @@ template (present) PDU_SIP_Request tr_SIP_INVITE(template (present) SipUrl uri, template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, + template From from_addr, + template To to_addr, template Via via := tr_Via_from(f_tr_HostPort_opt_defport(?)), template integer seq_nr, template charstring body) := { @@ -803,12 +822,12 @@ template (value) PDU_SIP_Request ts_SIP_BYE(CallidString call_id, - template (value) SipAddr from_addr, - template (value) SipAddr to_addr, + template (value) From from_addr, + template (value) To to_addr, template (value) Via via, integer seq_nr, template (omit) charstring body) := { - requestLine := ts_SIP_ReqLine(BYE_E, to_addr.addr.nameAddr.addrSpec), + requestLine := ts_SIP_ReqLine(BYE_E, to_addr.addressField.nameAddr.addrSpec), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, "BYE", seq_nr, via, content_length := f_ContentLength(body), @@ -820,8 +839,8 @@ template (present) PDU_SIP_Request tr_SIP_BYE(template (present) SipUrl uri, template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, + template From from_addr, + template To to_addr, template Via via, template integer seq_nr, template charstring body := *) := { @@ -835,14 +854,14 @@ template (value) PDU_SIP_Request ts_SIP_ACK(template (value) CallidString call_id, - template (value) SipAddr from_addr, - template (value) SipAddr to_addr, + template (value) From from_addr, + template (value) To to_addr, template (value) Via via, integer seq_nr, template (omit) charstring body) := { - requestLine := ts_SIP_ReqLine(ACK_E, to_addr.addr.nameAddr.addrSpec), + requestLine := ts_SIP_ReqLine(ACK_E, to_addr.addressField.nameAddr.addrSpec), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, - ts_Contact_SipAddr(from_addr), + ts_Contact({ ts_ContactAddress(from_addr.addressField, from_addr.fromParams) }), "ACK", seq_nr, via, content_length := f_ContentLength(body), @@ -853,8 +872,8 @@ template (present) PDU_SIP_Request tr_SIP_ACK(template (present) SipUrl uri, template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, + template From from_addr, + template To to_addr, template Via via, template integer seq_nr, template charstring body) := { @@ -869,8 +888,8 @@ template (present) PDU_SIP_Request tr_SIP_CANCEL(template (present) SipUrl uri, template (present) CallidString call_id, - template (present) SipAddr from_addr, - template (present) SipAddr to_addr, + template (present) From from_addr, + template (present) To to_addr, template (present) Via via, template (present) integer seq_nr, template charstring body := *) := { @@ -884,8 +903,8 @@ template (value) PDU_SIP_Response ts_SIP_Response(template (value) CallidString call_id, - template (value) SipAddr from_addr, - template (value) SipAddr to_addr, + template (value) From from_addr, + template (value) To to_addr, charstring method, integer status_code, integer seq_nr, @@ -916,8 +935,8 @@ template (value) PDU_SIP_Response ts_SIP_Response_Trying( template (value) CallidString call_id, - template (value) SipAddr from_addr, - template (value) SipAddr to_addr, + template (value) From from_addr, + template (value) To to_addr, Via via, integer seq_nr, charstring method := "INVITE", @@ -940,8 +959,8 @@ template (value) PDU_SIP_Response ts_SIP_Response_Ringing( template (value) CallidString call_id, - template (value) SipAddr from_addr, - template (value) SipAddr to_addr, + template (value) From from_addr, + template (value) To to_addr, Via via, integer seq_nr, charstring method := "INVITE", @@ -959,8 +978,8 @@ template (value) PDU_SIP_Response ts_SIP_Response_Unauthorized( template (value) CallidString call_id, - template (value) SipAddr from_addr, - template (value) SipAddr to_addr, + template (value) From from_addr, + template (value) To to_addr, Via via, template (value) WwwAuthenticate wwwAuthenticate, integer seq_nr, @@ -990,8 +1009,8 @@ template (present) PDU_SIP_Response tr_SIP_Response(template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, + template From from_addr, + template To to_addr, template (present) Via via := tr_Via_from(?), template Contact contact, template charstring method, @@ -1011,8 +1030,8 @@ template (present) PDU_SIP_Response tr_SIP_Response_Unauthorized( template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, + template From from_addr, + template To to_addr, template (present) Via via := tr_Via_from(?), template Contact contact := *, template (present) WwwAuthenticate wwwAuthenticate := ?, @@ -1034,8 +1053,8 @@ template (present) PDU_SIP_Response tr_SIP_Response_Trying( template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, + template From from_addr, + template To to_addr, template (present) Via via := tr_Via_from(?), template integer seq_nr := ?, template charstring method := "INVITE", @@ -1054,8 +1073,8 @@ template (present) PDU_SIP_Response tr_SIP_Response_Ringing( template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, + template From from_addr, + template To to_addr, template (present) Via via := tr_Via_from(?), template integer seq_nr := ?, template charstring method := "INVITE", @@ -1474,12 +1493,16 @@ } } -function f_sip_SipAddr_to_str(SipAddr sip_addr) return charstring { - if (ischosen(sip_addr.addr.nameAddr)) { - return f_sip_NameAddr_to_str(sip_addr.addr.nameAddr); +function f_sip_Addr_Union_to_str(Addr_Union addru) return charstring { + if (ischosen(addru.nameAddr)) { + return f_sip_NameAddr_to_str(addru.nameAddr); } else { - return f_sip_SipUrl_to_str(sip_addr.addr.addrSpecUnion); + return f_sip_SipUrl_to_str(addru.addrSpecUnion); } } +function f_sip_SipAddr_to_str(SipAddr sip_addr) return charstring { + return f_sip_Addr_Union_to_str(sip_addr.addr); +} + } diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 84ddcb5..9c376f3 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -231,8 +231,12 @@ /* Establish a mobile terminated call described in 'cp' */ function f_establish_mt(inout CallPars cp) runs on ConnHdlr { - var template SipAddr sip_addr_gsm := tr_SipAddr_from_val(cp.comp.sip_url_gsm); - var template SipAddr sip_addr_ext := tr_SipAddr_from_val(cp.comp.sip_url_ext); + var template (value) From from_addr := ts_From(cp.comp.sip_url_ext.addr, cp.comp.sip_url_ext.params); + var template (value) To to_addr := ts_To(cp.comp.sip_url_gsm.addr, cp.comp.sip_url_gsm.params); + var template (value) Via via := ts_Via_from(cp.comp.sip_url_ext.addr.nameAddr.addrSpec.hostPort); + var template (present) From from_addr_exp := tr_From(tr_Addr_Union_from_val(cp.comp.sip_url_ext.addr), *); + var template (present) To to_addr_exp := tr_To(tr_Addr_Union_from_val(cp.comp.sip_url_gsm.addr), *); + var template (present) Via via_exp := tr_Via_from(f_tr_HostPort_opt_defport(from_addr_exp.addressField.nameAddr.addrSpec.hostPort)); var MNCC_PDU mncc; /* The last SDP that the MSC received via MNCC from osmo-sip-connector */ @@ -266,8 +270,8 @@ f_create_mncc_expect(cp.called); /* OSC <- SIP: A party sends SIP invite for a MT-call into OSC */ - SIP.send(ts_SIP_INVITE(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, - ts_Via_from(cp.comp.sip_url_ext.addr.nameAddr.addrSpec.hostPort), + SIP.send(ts_SIP_INVITE(cp.comp.sip_call_id, from_addr, to_addr, + via, ts_Contact_SipAddr(cp.comp.sip_url_ext), cp.comp.sip_seq_nr, cp.comp.sip_body)); if (cp.mncc_with_sdp) { @@ -276,8 +280,8 @@ } /* OSC -> SIP */ - as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, - tr_Via_from(f_tr_HostPort_opt_defport(sip_addr_ext.addr.nameAddr.addrSpec.hostPort)), + as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, from_addr_exp, to_addr_exp, + via_exp, *, "INVITE", 100, ?, "Trying", *)); @@ -291,8 +295,8 @@ [] SIP.receive { setverdict(fail, "Received unexpected SIP response"); SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, - cp.comp.sip_url_ext, cp.comp.sip_url_gsm, - ts_Via_from(cp.comp.sip_url_ext.addr.nameAddr.addrSpec.hostPort), + from_addr, to_addr, + via, cp.comp.sip_seq_nr, omit)); mtc.stop; } @@ -334,8 +338,8 @@ SIP.clear; /* 180 Ringing should not contain any SDP. */ - as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, - tr_Via_from(f_tr_HostPort_opt_defport(sip_addr_ext.addr.nameAddr.addrSpec.hostPort)), + as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, from_addr_exp, to_addr_exp, + via_exp, *, "INVITE", 180, ?, "Ringing", omit)); @@ -350,8 +354,8 @@ } /* OSC -> SIP: OSC confirms call establishment to SIP side */ - as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, - tr_Via_from(f_tr_HostPort_opt_defport(sip_addr_ext.addr.nameAddr.addrSpec.hostPort)), + as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, from_addr_exp, to_addr_exp, + via_exp, contact := ?, method := "INVITE", status_code := 200, seq_nr := ?, reason := "OK", @@ -359,8 +363,8 @@ /* OSC <- SIP: SIP world acknowledges "200 OK" */ SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, - cp.comp.sip_url_ext, cp.comp.sip_url_gsm, - ts_Via_from(cp.comp.sip_url_ext.addr.nameAddr.addrSpec.hostPort), + from_addr, to_addr, + via, cp.comp.sip_seq_nr, omit)); /* MSC <- OSC: OSC sends SETUP COMPL to MNCC (which triggers CC CONNECT ACK */ MNCC.receive(tr_MNCC_SETUP_COMPL_req(cp.mncc_call_id)) -> value mncc { @@ -372,8 +376,15 @@ function f_establish_mo(inout CallPars cp) runs on ConnHdlr { var MNCC_number dst := valueof(ts_MNCC_number(cp.called, GSM48_TON_UNKNOWN)); var MNCC_number src := valueof(ts_MNCC_number(cp.calling, GSM48_TON_UNKNOWN)); - var template SipAddr sip_addr_gsm := tr_SipAddr_from_val(cp.comp.sip_url_gsm); - var template SipAddr sip_addr_ext := tr_SipAddr_from_val(cp.comp.sip_url_ext); + + var template (value) From from_addr := ts_From(cp.comp.sip_url_gsm.addr, cp.comp.sip_url_gsm.params); + var template (value) To to_addr := ts_To(cp.comp.sip_url_ext.addr, cp.comp.sip_url_ext.params); + var template (value) Via via := ts_Via_from(cp.comp.sip_url_gsm.addr.nameAddr.addrSpec.hostPort); + var template (present) From from_addr_exp := tr_From(tr_Addr_Union_from_val(cp.comp.sip_url_gsm.addr), *); + var template (present) To to_addr_exp := tr_To(tr_Addr_Union_from_val(cp.comp.sip_url_ext.addr), *); + var template (present) Via via_exp := tr_Via_from(f_tr_HostPort_opt_defport(from_addr_exp.addressField.nameAddr.addrSpec.hostPort)); + + var PDU_SIP_Request sip_req; var integer seq_nr; var MNCC_PDU mncc; @@ -436,16 +447,16 @@ * "a=sendrecv;" */ expect_sdp_to_sip := pattern cn_sdp & "*"; } - sip_req := f_SIP_expect_req(tr_SIP_INVITE(sip_addr_ext.addr.nameAddr.addrSpec, ?, - sip_addr_gsm, sip_addr_ext, - tr_Via_from(f_tr_HostPort_opt_defport(sip_addr_gsm.addr.nameAddr.addrSpec.hostPort)), + sip_req := f_SIP_expect_req(tr_SIP_INVITE(to_addr_exp.addressField.nameAddr.addrSpec, ?, + from_addr_exp, to_addr_exp, + via_exp, ?, expect_sdp_to_sip)); - cp.comp.sip_url_gsm.params := sip_req.msgHeader.fromField.fromParams; + from_addr.fromParams := sip_req.msgHeader.fromField.fromParams; cp.comp.sip_call_id := sip_req.msgHeader.callId.callid; seq_nr := sip_req.msgHeader.cSeq.seqNumber; /* OSC <- SIP: Notify call is proceeding */ - SIP.send(ts_SIP_Response(cp.comp.sip_call_id, cp.comp.sip_url_gsm, cp.comp.sip_url_ext, + SIP.send(ts_SIP_Response(cp.comp.sip_call_id, from_addr, to_addr, "INVITE", 100, seq_nr, "Trying", sip_req.msgHeader.via)); /* MSC <- OSC: "100 Trying" translated to MNCC_CALL_PROC_REQ */ MNCC.receive(tr_MNCC_CALL_PROC_req(cp.mncc_call_id)) -> value mncc { @@ -453,7 +464,7 @@ } /* OSC <- SIP: SIP-terminated user is ringing now. 180 Ringing should not contain any SDP. */ - SIP.send(ts_SIP_Response(cp.comp.sip_call_id, cp.comp.sip_url_gsm, cp.comp.sip_url_ext, + SIP.send(ts_SIP_Response(cp.comp.sip_call_id, from_addr, to_addr, "INVITE", 180, seq_nr, "Ringing", sip_req.msgHeader.via, omit)); /* MSC <- OSC: "180 Ringing" translated to MNCC_ALERT_REQ */ @@ -462,7 +473,7 @@ } /* OSC <- SIP: SIP-terminated user has accepted the call */ - SIP.send(ts_SIP_Response(cp.comp.sip_call_id, cp.comp.sip_url_gsm, cp.comp.sip_url_ext, + SIP.send(ts_SIP_Response(cp.comp.sip_call_id, from_addr, to_addr, "INVITE", 200, seq_nr, "OK", sip_req.msgHeader.via, body := cp.comp.sip_body)); @@ -483,32 +494,36 @@ /* MSC -> OSC: CC CONNECT ACK was received from MS */ MNCC.send(ts_MNCC_SETUP_COMPL_ind(cp.mncc_call_id)); /* OSC -> SIP: Acknowledge the call */ - SIP.receive(tr_SIP_ACK(sip_addr_ext.addr.nameAddr.addrSpec, + SIP.receive(tr_SIP_ACK(to_addr_exp.addressField.nameAddr.addrSpec, cp.comp.sip_call_id, - sip_addr_gsm, - sip_addr_ext, - tr_Via_from(f_tr_HostPort_opt_defport(sip_addr_gsm.addr.nameAddr.addrSpec.hostPort)), + from_addr_exp, + to_addr_exp, + via_exp, ?, omit)); } /* Release call from the mobile side */ function f_release_mobile(inout CallPars cp) runs on ConnHdlr { - var template SipAddr sip_addr_gsm := tr_SipAddr_from_val(cp.comp.sip_url_gsm); - var template SipAddr sip_addr_ext := tr_SipAddr_from_val(cp.comp.sip_url_ext); + var template (value) From from_addr := ts_From(cp.comp.sip_url_gsm.addr, cp.comp.sip_url_gsm.params); + var template (value) To to_addr := ts_To(cp.comp.sip_url_ext.addr, cp.comp.sip_url_ext.params); + var template (value) Via via := ts_Via_from(cp.comp.sip_url_gsm.addr.nameAddr.addrSpec.hostPort); + var template (present) From from_addr_exp := tr_From(tr_Addr_Union_from_val(cp.comp.sip_url_gsm.addr), *); + var template (present) To to_addr_exp := tr_To(tr_Addr_Union_from_val(cp.comp.sip_url_ext.addr), *); + var template (present) Via via_exp := tr_Via_from(f_tr_HostPort_opt_defport(from_addr_exp.addressField.nameAddr.addrSpec.hostPort)); var PDU_SIP_Request sip_req; SIP.clear; /* MSC -> OSC: Simulate a CC DISCONNET from the MT user */ MNCC.send(ts_MNCC_DISC_ind(cp.mncc_call_id, ts_MNCC_cause(0))); /* OSC -> SIP: Expect BYE from OSC to SIP side */ - sip_req := f_SIP_expect_req(tr_SIP_BYE(sip_addr_ext.addr.nameAddr.addrSpec, - cp.comp.sip_call_id, sip_addr_gsm, sip_addr_ext, - tr_Via_from(f_tr_HostPort_opt_defport(sip_addr_gsm.addr.nameAddr.addrSpec.hostPort)), + sip_req := f_SIP_expect_req(tr_SIP_BYE(to_addr_exp.addressField.nameAddr.addrSpec, + cp.comp.sip_call_id, from_addr_exp, to_addr_exp, + via_exp, ?, *)); - cp.comp.sip_url_gsm.params := sip_req.msgHeader.fromField.fromParams; + from_addr.fromParams := sip_req.msgHeader.fromField.fromParams; /* OSC <- SIP: Acknowledge the BYE */ - SIP.send(ts_SIP_Response(cp.comp.sip_call_id, cp.comp.sip_url_gsm, cp.comp.sip_url_ext, + SIP.send(ts_SIP_Response(cp.comp.sip_call_id, from_addr, to_addr, "BYE", 200, sip_req.msgHeader.cSeq.seqNumber, "OK", sip_req.msgHeader.via)); /* MSC <- OSC: Send REL_REQ to MSC, triggers CC RELEASE REQ to MS */ @@ -519,19 +534,23 @@ /* Release call from the SIP side */ function f_release_sip(inout CallPars cp) runs on ConnHdlr { - var template SipAddr sip_addr_gsm := tr_SipAddr_from_val(cp.comp.sip_url_gsm); - var template SipAddr sip_addr_ext := tr_SipAddr_from_val(cp.comp.sip_url_ext); + var template (value) From from_addr := ts_From(cp.comp.sip_url_ext.addr, cp.comp.sip_url_ext.params); + var template (value) To to_addr := ts_To(cp.comp.sip_url_gsm.addr, cp.comp.sip_url_gsm.params); + var template (value) Via via := ts_Via_from(cp.comp.sip_url_ext.addr.nameAddr.addrSpec.hostPort); + var template (present) From from_addr_exp := tr_From(tr_Addr_Union_from_val(cp.comp.sip_url_ext.addr), *); + var template (present) To to_addr_exp := tr_To(tr_Addr_Union_from_val(cp.comp.sip_url_gsm.addr), *); + var template (present) Via via_exp := tr_Via_from(f_tr_HostPort_opt_defport(from_addr_exp.addressField.nameAddr.addrSpec.hostPort)); /* OSC <- SIP: SIP-side sends a BYE to OSC */ - SIP.send(ts_SIP_BYE(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, - ts_Via_from(cp.comp.sip_url_ext.addr.nameAddr.addrSpec.hostPort), + SIP.send(ts_SIP_BYE(cp.comp.sip_call_id, from_addr, to_addr, + via, cp.comp.sip_seq_nr, omit)); /* MSC <- OSC: Expect OSC to cause MNCC Disconnect Request */ MNCC.receive(tr_MNCC_DISC_req(cp.mncc_call_id)); /* MSC -> OSC: Indicate GSM side release */ MNCC.send(ts_MNCC_REL_ind(cp.mncc_call_id, ts_MNCC_cause(0))); /* OSC -> SIP: Confirmation to SIP side */ - as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, - tr_Via_from(f_tr_HostPort_opt_defport(sip_addr_ext.addr.nameAddr.addrSpec.hostPort)), + as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, from_addr_exp, to_addr_exp, + via_exp, *, "BYE", 200, cp.comp.sip_seq_nr, "OK", omit)); } @@ -675,8 +694,12 @@ var MNCC_number dst := valueof(ts_MNCC_number(cp.called, GSM48_TON_UNKNOWN)); var MNCC_number src := valueof(ts_MNCC_number(cp.calling, GSM48_TON_UNKNOWN)); - var template SipAddr sip_addr_gsm := tr_SipAddr_from_val(cp.comp.sip_url_gsm); - var template SipAddr sip_addr_ext := tr_SipAddr_from_val(cp.comp.sip_url_ext); + var template (value) From from_addr := ts_From(cp.comp.sip_url_gsm.addr, cp.comp.sip_url_gsm.params); + var template (value) To to_addr := ts_To(cp.comp.sip_url_ext.addr, cp.comp.sip_url_ext.params); + var template (value) Via via := ts_Via_from(cp.comp.sip_url_gsm.addr.nameAddr.addrSpec.hostPort); + var template (present) From from_addr_exp := tr_From(tr_Addr_Union_from_val(cp.comp.sip_url_gsm.addr), *); + var template (present) To to_addr_exp := tr_To(tr_Addr_Union_from_val(cp.comp.sip_url_ext.addr), *); + var template (present) Via via_exp := tr_Via_from(f_tr_HostPort_opt_defport(from_addr_exp.addressField.nameAddr.addrSpec.hostPort)); f_create_sip_expect(cp.comp.sip_url_ext.addr.nameAddr.addrSpec); @@ -700,9 +723,9 @@ timer T := 10.0; T.start; alt { - [] SIP.receive(tr_SIP_INVITE(sip_addr_ext.addr.nameAddr.addrSpec, ?, - sip_addr_gsm, sip_addr_ext, - tr_Via_from(f_tr_HostPort_opt_defport(sip_addr_gsm.addr.nameAddr.addrSpec.hostPort)), + [] SIP.receive(tr_SIP_INVITE(to_addr_exp.addressField.nameAddr.addrSpec, ?, + from_addr_exp, to_addr_exp, + via_exp, ?, ?)) { setverdict(fail, "Received unexpected INVITE"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36949?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: I3a85701822d7b76ec078b1a7c615e5ef50f36902 Gerrit-Change-Number: 36949 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> 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 TC_ims_call_mo

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36950?usp=email ) Change subject: asterisk: Introduce TC_ims_call_mo ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36950?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: I3c6d8c109c392fa6e1036dcb69a7abb90b22fec7 Gerrit-Change-Number: 36950 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Jun 2024 08:29:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Allow passing full templates to {tr,ts}_SIP_msgh_std

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36949?usp=email ) Change subject: asterisk: Allow passing full templates to {tr,ts}_SIP_msgh_std ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36949?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: I3a85701822d7b76ec078b1a7c615e5ef50f36902 Gerrit-Change-Number: 36949 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Jun 2024 08:29:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-ci[master]: jobs/update-osmo*: add lx2-raspbian11build-ansible

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36978?usp=email ) Change subject: jobs/update-osmo*: add lx2-raspbian11build-ansible ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36978?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: I358d040c82915878762b7586e98c32e0d828d9dd Gerrit-Change-Number: 36978 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Jun 2024 08:12:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in libusrp[master]: m4/ax_boost_base.m4: Fix debian multiarch_libsubdir path for armv8l

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/36977?usp=email ) Change subject: m4/ax_boost_base.m4: Fix debian multiarch_libsubdir path for armv8l ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/36977?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I40d8830f22a130c84b6381ea844b75d638f1c279 Gerrit-Change-Number: 36977 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Jun 2024 08:12:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-dev[master]: ccache.opts: find wrapper in debian path too

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email ) Change subject: ccache.opts: find wrapper in debian path too ...................................................................... ccache.opts: find wrapper in debian path too With Debian's packaging, the ccache symlinks are created in /usr/lib/ccache/, not in /usr/lib/ccache/bin/. Tweak ccache.opts to find gcc and g++ in both paths. Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1 --- M ccache.opts M ttcn3/ttcn3.opts 2 files changed, 18 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/ccache.opts b/ccache.opts index 13dca45..46c6d87 100644 --- a/ccache.opts +++ b/ccache.opts @@ -1 +1,2 @@ -ALL CC="/usr/lib/ccache/bin/gcc" CXX="/usr/lib/ccache/bin/g++" +# Find the ccache wrapper in /usr/lib/ccache and /usr/lib/ccache/bin +ALL CC="$(find /usr/lib/ccache -name gcc | head -n1)" CXX="$(find /usr/lib/ccache -name g++ | head -n1)" diff --git a/ttcn3/ttcn3.opts b/ttcn3/ttcn3.opts index bf2f472..7949d16 100644 --- a/ttcn3/ttcn3.opts +++ b/ttcn3/ttcn3.opts @@ -1,2 +1,4 @@ osmo-bts --enable-trx -ALL CC="/usr/lib/ccache/gcc" CXX="/usr/lib/ccache/g++" + +# Find the ccache wrapper in /usr/lib/ccache and /usr/lib/ccache/bin +ALL CC="$(find /usr/lib/ccache -name gcc | head -n1)" CXX="$(find /usr/lib/ccache -name g++ | head -n1)" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1 Gerrit-Change-Number: 36991 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-dev[master]: ccache.opts: find wrapper in debian path too

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email ) Change subject: ccache.opts: find wrapper in debian path too ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1 Gerrit-Change-Number: 36991 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Jun 2024 07:30:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-dev[master]: ccache.opts: find wrapper in debian path too

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email ) Change subject: ccache.opts: find wrapper in debian path too ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: as discussed with Neels, merging osmo-dev patches directly -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1 Gerrit-Change-Number: 36991 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Jun 2024 07:30:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-dev[master]: ccache.opts: find wrapper in debian path too

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email ) Change subject: ccache.opts: find wrapper in debian path too ...................................................................... ccache.opts: find wrapper in debian path too With Debian's packaging, the ccache symlinks are created in /usr/lib/ccache/, not in /usr/lib/ccache/bin/. Tweak ccache.opts to find gcc and g++ in both paths. Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1 --- M ccache.opts M ttcn3/ttcn3.opts 2 files changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/91/36991/1 diff --git a/ccache.opts b/ccache.opts index 13dca45..46c6d87 100644 --- a/ccache.opts +++ b/ccache.opts @@ -1 +1,2 @@ -ALL CC="/usr/lib/ccache/bin/gcc" CXX="/usr/lib/ccache/bin/g++" +# Find the ccache wrapper in /usr/lib/ccache and /usr/lib/ccache/bin +ALL CC="$(find /usr/lib/ccache -name gcc | head -n1)" CXX="$(find /usr/lib/ccache -name g++ | head -n1)" diff --git a/ttcn3/ttcn3.opts b/ttcn3/ttcn3.opts index bf2f472..7949d16 100644 --- a/ttcn3/ttcn3.opts +++ b/ttcn3/ttcn3.opts @@ -1,2 +1,4 @@ osmo-bts --enable-trx -ALL CC="/usr/lib/ccache/gcc" CXX="/usr/lib/ccache/g++" + +# Find the ccache wrapper in /usr/lib/ccache and /usr/lib/ccache/bin +ALL CC="$(find /usr/lib/ccache -name gcc | head -n1)" CXX="$(find /usr/lib/ccache -name g++ | head -n1)" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1 Gerrit-Change-Number: 36991 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2024