September 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-msc[master]: SMS over GSUP: set source_name in GSUP reply messages

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/34518?usp=email ) Change subject: SMS over GSUP: set source_name in GSUP reply messages ...................................................................... SMS over GSUP: set source_name in GSUP reply messages For MO-forwardSM and MT-forwardSM request messages, OsmoHLR applies routing based on the SMSC address for MO or based on the IMSI for MT. However, reply messages following these requests are routed passively based on the destination_name IE. This passive message routing path requires the source_name IE to be set as well - implement this source_name setting. Related: OS#6135 Change-Id: I0b7f4760bdce8a38d43d3860086c6dfb7b390701 --- M include/osmocom/msc/gsup_client_mux.h M src/libmsc/gsm_04_11_gsup.c M src/libmsc/gsup_client_mux.c 3 files changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/18/34518/1 diff --git a/include/osmocom/msc/gsup_client_mux.h b/include/osmocom/msc/gsup_client_mux.h index 07f17c2..2bc9ddf 100644 --- a/include/osmocom/msc/gsup_client_mux.h +++ b/include/osmocom/msc/gsup_client_mux.h @@ -28,6 +28,7 @@ struct ipaccess_unit *ipa_dev); int gsup_client_mux_tx(struct gsup_client_mux *gcm, const struct osmo_gsup_message *gsup_msg); +void gsup_client_mux_tx_set_source(struct gsup_client_mux *gcm, struct osmo_gsup_message *gsup_msg); void gsup_client_mux_tx_error_reply(struct gsup_client_mux *gcm, const struct osmo_gsup_message *gsup_orig, enum gsm48_gmm_cause cause); diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index 6225c6c..d1c2f27 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -201,6 +201,7 @@ /* Ensure routing through OsmoHLR to the MT-sending SMSC */ gsup_msg.destination_name = trans->sms.gsup_source_name; gsup_msg.destination_name_len = trans->sms.gsup_source_name_len; + gsup_client_mux_tx_set_source(trans->net->gcm, &gsup_msg); return gsup_client_mux_tx(trans->net->gcm, &gsup_msg); } @@ -222,6 +223,7 @@ /* Ensure routing through OsmoHLR to the MT-sending SMSC */ gsup_msg.destination_name = trans->sms.gsup_source_name; gsup_msg.destination_name_len = trans->sms.gsup_source_name_len; + gsup_client_mux_tx_set_source(trans->net->gcm, &gsup_msg); /* SM-RP-Cause value */ gsup_msg.sm_rp_cause = &cause; diff --git a/src/libmsc/gsup_client_mux.c b/src/libmsc/gsup_client_mux.c index 9a0dc16..2635142 100644 --- a/src/libmsc/gsup_client_mux.c +++ b/src/libmsc/gsup_client_mux.c @@ -136,6 +136,25 @@ return osmo_gsup_client_send(gcm->gsup_client, msg); } +/* Set GSUP source_name to our local IPA name */ +void gsup_client_mux_tx_set_source(struct gsup_client_mux *gcm, + struct osmo_gsup_message *gsup_msg) +{ + const char *local_msc_name; + + if (!gcm) + return; + if (!gcm->gsup_client) + return; + if (!gcm->gsup_client->ipa_dev) + return; + local_msc_name = gcm->gsup_client->ipa_dev->serno; + if (!local_msc_name) + return; + gsup_msg->source_name = (const uint8_t *) local_msc_name; + gsup_msg->source_name_len = strlen(local_msc_name) + 1; +} + /* Transmit GSUP error in response to original message */ void gsup_client_mux_tx_error_reply(struct gsup_client_mux *gcm, const struct osmo_gsup_message *gsup_orig, enum gsm48_gmm_cause cause) @@ -158,6 +177,7 @@ }; OSMO_STRLCPY_ARRAY(gsup_reply.imsi, gsup_orig->imsi); + gsup_client_mux_tx_set_source(gcm, &gsup_reply); /* For SS/USSD, it's important to keep both session state and ID IEs */ if (gsup_orig->session_state != OSMO_GSUP_SESSION_STATE_NONE) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34518?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0b7f4760bdce8a38d43d3860086c6dfb7b390701 Gerrit-Change-Number: 34518 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in libosmocore[master]: APDU parsing support for GlobalPlatform GET RESPONSE

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34419?usp=email ) Change subject: APDU parsing support for GlobalPlatform GET RESPONSE ...................................................................... APDU parsing support for GlobalPlatform GET RESPONSE This patch adds GET RESPONSE support for GlobalPlatform command. Android is using this to get the response data on SGP.22 eUICCs. simtrace2-cardem-pcsc is failing otherwise e.g. on an xingtera camera with Android. Change-Id: I5ae3165f172f9c949550ee4a07fe70e91f1a037c --- M src/sim/class_tables.c 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/sim/class_tables.c b/src/sim/class_tables.c index 9c51387..724c077 100644 --- a/src/sim/class_tables.c +++ b/src/sim/class_tables.c @@ -222,6 +222,7 @@ [0xE8] = 4, /* LOAD */ [0xD8] = 4, /* PUT KEY */ [0xF0] = 3, /* SET STATUS */ + [0xC0] = 2, /* GET RESPONSE */ }; static const struct osim_cla_ins_case uicc_ins_case[] = { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34419?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5ae3165f172f9c949550ee4a07fe70e91f1a037c Gerrit-Change-Number: 34419 Gerrit-PatchSet: 2 Gerrit-Owner: k_o_ <wider.stand(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in libosmocore[master]: APDU parsing support for GlobalPlatform GET RESPONSE

by laforge

Attention is currently required from: dexter, k_o_. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34419?usp=email ) Change subject: APDU parsing support for GlobalPlatform GET RESPONSE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34419?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5ae3165f172f9c949550ee4a07fe70e91f1a037c Gerrit-Change-Number: 34419 Gerrit-PatchSet: 1 Gerrit-Owner: k_o_ <wider.stand(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: k_o_ <wider.stand(a)gmx.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sun, 24 Sep 2023 17:48:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: make mncc_with_sdp := true the default

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34418?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: sip: make mncc_with_sdp := true the default ...................................................................... sip: make mncc_with_sdp := true the default A preceding patch has added mncc_with_sdp, defaulting to false. So far just two new tests use mncc_with_sdp := true, but operation without SDP is now merely the legacy compatibility mode, and I would rather nudge new tests towards mncc_with_sdp := true. So switch the default to mncc_with_sdp := true. Change-Id: Ic9871917c57a9ab81b2fff0af7f569b09015910c --- M sip/SIP_Tests.ttcn 1 file changed, 25 insertions(+), 8 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 1904c6a..208cc01 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -82,7 +82,7 @@ integer sip_seq_nr } -private template (value) CallPars t_CallPars(boolean is_mo, boolean mncc_with_sdp := false) := { +private template (value) CallPars t_CallPars(boolean is_mo, boolean mncc_with_sdp := true) := { is_mo := is_mo, calling := "12345", called := "98766", @@ -543,7 +543,7 @@ var ConnHdlr vc_conn; f_init(); pars := valueof(t_Pars); - pars.g_cp := valueof(t_CallPars(false)); + pars.g_cp := valueof(t_CallPars(false, false)); vc_conn := f_start_handler(refers(f_TC_mt_success_rel_gsm), pars); vc_conn.done; } @@ -552,7 +552,7 @@ var ConnHdlr vc_conn; f_init(); pars := valueof(t_Pars); - pars.g_cp := valueof(t_CallPars(false)); + pars.g_cp := valueof(t_CallPars(false, false)); pars.g_cp.sip_rtp_addr := "::1"; pars.g_cp.cn_rtp_addr := "::2"; vc_conn := f_start_handler(refers(f_TC_mt_success_rel_gsm), pars); @@ -580,7 +580,7 @@ var ConnHdlr vc_conn; f_init(); pars := valueof(t_Pars); - pars.g_cp := valueof(t_CallPars(false)); + pars.g_cp := valueof(t_CallPars(false, false)); vc_conn := f_start_handler(refers(f_TC_mt_success_rel_sip), pars); vc_conn.done; } @@ -607,7 +607,7 @@ var ConnHdlr vc_conn; f_init(); pars := valueof(t_Pars); - pars.g_cp := valueof(t_CallPars(true)); + pars.g_cp := valueof(t_CallPars(true, false)); vc_conn := f_start_handler(refers(f_TC_mo_success_rel_gsm), pars); vc_conn.done; } @@ -616,7 +616,7 @@ var ConnHdlr vc_conn; f_init(); pars := valueof(t_Pars); - pars.g_cp := valueof(t_CallPars(true)); + pars.g_cp := valueof(t_CallPars(true, false)); pars.g_cp.sip_rtp_addr := "::1"; pars.g_cp.cn_rtp_addr := "::2"; vc_conn := f_start_handler(refers(f_TC_mo_success_rel_gsm), pars); @@ -644,7 +644,7 @@ var ConnHdlr vc_conn; f_init(); pars := valueof(t_Pars); - pars.g_cp := valueof(t_CallPars(is_mo := true)); + pars.g_cp := valueof(t_CallPars(is_mo := true, mncc_with_sdp := false)); vc_conn := f_start_handler(refers(f_TC_mo_success_rel_sip), pars); vc_conn.done; } @@ -699,7 +699,7 @@ var ConnHdlr vc_conn; f_init(); pars := valueof(t_Pars); - pars.g_cp := valueof(t_CallPars(is_mo := true)); + pars.g_cp := valueof(t_CallPars(is_mo := true, mncc_with_sdp := false)); vc_conn := f_start_handler(refers(f_TC_mo_setup_disc_late_rtp), pars); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34418?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: Ic9871917c57a9ab81b2fff0af7f569b09015910c Gerrit-Change-Number: 34418 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(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, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: test SDP forwarding via MNCC

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417?usp=email ) Change subject: sip: test SDP forwarding via MNCC ...................................................................... sip: test SDP forwarding via MNCC Add CallPars.mncc_with_sdp: when true, the call establishing functions f_establish_{mo,mt} now send valid SDP via MNCC, and validate that the SDP received on MNCC and SIP are as expected. Keep all current tests unchanged with mncc_with_sdp := false: they will continue to test the case without SDP (for legacy compatibility). These tests will still pass on the 'latest' builds. Add two new tests for mncc_with_sdp := true: TC_mt_with_sdp and TC_mo_with_sdp. These new tests will fail on our 'latest' builds until the SDP forwarding feature in osmo-sip-connector is released. Related: osmo-sip-connector I3df5d06f38ee2d122706a9ebffde7db4f2bd6bae Change-Id: Ib2ae8449e673f5027f01d428d3718c006f76d93e --- M sip/SIP_Tests.ttcn 1 file changed, 213 insertions(+), 18 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 67e7818..1904c6a 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -66,7 +66,12 @@ charstring sip_rtp_addr, uint16_t sip_rtp_port, charstring cn_rtp_addr, - uint16_t cn_rtp_port + uint16_t cn_rtp_port, + + /* Send SDP to MNCC, and expect to receive SDP from MNCC. mncc_with_sdp := false tests legacy compatibility to + * the time when we did not include SDP in MNCC messages. mncc_with_sdp := true expects SDP to pass through the + * SUT osmo-sip-connector unchanged. */ + boolean mncc_with_sdp } type record CallParsComputed { @@ -77,7 +82,7 @@ integer sip_seq_nr } -private template (value) CallPars t_CallPars(boolean is_mo) := { +private template (value) CallPars t_CallPars(boolean is_mo, boolean mncc_with_sdp := false) := { is_mo := is_mo, calling := "12345", called := "98766", @@ -87,7 +92,8 @@ sip_rtp_addr := "1.2.3.4", sip_rtp_port := 1234, cn_rtp_addr := "5.6.7.8", - cn_rtp_port := 5678 + cn_rtp_port := 5678, + mncc_with_sdp := mncc_with_sdp } private function f_CallPars_compute(inout CallPars cp) { @@ -210,18 +216,75 @@ return rx; } +/* Update 'last_sdp', and match with expectation of what the current SDP should be. + * Useful to ensure that MNCC or SIP send and possibly resend only the expected SDP. + * last_sdp keeps the last non-empty rx_sdp, across multiple check_sdp() invocations. + * rx_sdp is the SDP charstring just received. If it is nonempty, update last_sdp to rx_sdp. + * After updating last_sdp as appropriate, match last_sdp with expect_sdp. */ +private function check_sdp(inout charstring last_sdp, + charstring rx_sdp, + template charstring expect_sdp) +{ + /* If there is new SDP, store it. */ + if (lengthof(rx_sdp) > 0) { + if (last_sdp != rx_sdp) { + log("SDP update from ", last_sdp, " to ", rx_sdp); + } + + /* If MNCC sent SDP data, remember it as the last valid SDP */ + last_sdp := rx_sdp; + } + /* Validate expectations of the SDP data */ + if (not match(last_sdp, expect_sdp)) { + log("FAIL: expected SDP ", expect_sdp, " but got ", last_sdp); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected SDP"); + } +} + /* 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 MNCC_PDU mncc; + /* The last SDP that the MSC received via MNCC from osmo-sip-connector */ + var charstring sdp_to_msc := ""; + /* At first, allow any empty and nonempty SDP. As the test progresses, this may expect specific SDP instead. */ + var template charstring expect_sdp_to_msc := *; + + /* If cp.mncc_with_sdp == true, expect SDP forwarding like this: + * + * SDP1: SIP agent's RTP and codec info + * SDP2: osmo-msc's RTP and codec info + * + * MNCC osmo-sip-connector SIP + * |<--SDP1----- SIP Invite + * |-----------> SIP (Invite) Trying + * <--SDP1-------| MNCC SETUP req + * ------------->| MNCC CALL CONF ind + * <-------------| MNCC RTP CREATE (SDP optional, still unchanged from SDP1) + * -------SDP2-->| MNCC RTP CREATE + * ------------->| MNCC ALERT ind + * |--------------> SIP (Invite) Ringing + * (MT picks up) | + * ------------->| MNCC SETUP CNF + * <-------------| MNCC RTP CONNECT (SDP optional, still unchanged from SDP1) + * |--------SDP2--> SIP (Invite) OK + * |<-------------- SIP ACK + * <-------------| MNCC SETUP COMPL (SDP optional, still unchanged from SDP1) + */ + /* Ask MNCC_Emulation to "expect" a call to the given called number */ 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, cp.comp.sip_seq_nr, cp.comp.sip_body)); + if (cp.mncc_with_sdp) { + /* We just sent SDP via SIP, now expect the same SDP in MNCC to the MSC */ + expect_sdp_to_msc := cp.comp.sip_body; + } + /* OSC -> SIP */ as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, "INVITE", 100, ?, "Trying", *)); @@ -229,7 +292,9 @@ alt { /* MSC <- OSC: OSC generates MNCC_SETUP_REQ from INVITE */ [] MNCC.receive(tr_MNCC_SETUP_req) -> value mncc { - cp.mncc_call_id := mncc.u.signal.callref; + cp.mncc_call_id := mncc.u.signal.callref; + /* Expect the SDP sent via SIP to arrive in MNCC */ + check_sdp(sdp_to_msc, mncc.u.signal.sdp, expect_sdp_to_msc); } [] SIP.receive { setverdict(fail, "Received unexpected SIP response"); @@ -242,38 +307,65 @@ /* MSC -> OSC: After MS sends CALL CONF in response to SETUP */ MNCC.send(ts_MNCC_CALL_CONF_ind(cp.mncc_call_id)); /* MSC <- OSC: OSC asks MSC to create RTP socket */ - MNCC.receive(tr_MNCC_RTP_CREATE(cp.mncc_call_id)); + MNCC.receive(tr_MNCC_RTP_CREATE(cp.mncc_call_id)) -> value mncc { + check_sdp(sdp_to_msc, mncc.u.rtp.sdp, expect_sdp_to_msc); + } + + /* MSC -> OSC: SDP that the MSC will send via MNCC */ + var charstring cn_sdp := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & + f_mgcp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & + "\r\nt=0 0\r\nm=audio " & int2str(cp.cn_rtp_port) & + " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; + /* OSC -> SIP: what SDP to expect in SIP from osmo-sip-connector */ + var template charstring expect_sdp_to_sip := pattern "*" & cp.cn_rtp_addr & "*"; + mncc := valueof(ts_MNCC_RTP_CREATE(cp.mncc_call_id)); mncc.u.rtp.is_ipv6 := f_addr_is_ipv6(cp.cn_rtp_addr); mncc.u.rtp.ip := f_addrstr2addr(cp.cn_rtp_addr); mncc.u.rtp.rtp_port := cp.cn_rtp_port; + if (cp.mncc_with_sdp) { + /* MSC -> OSC: tell OSC our RTP info in SDP form */ + mncc.u.rtp.sdp := cn_sdp; + /* OSC -> SIP: and expect it unchanged on SIP later, but allow osmo-sip-connector to append an + * "a=sendrecv;" */ + expect_sdp_to_sip := pattern cn_sdp & "*"; + } MNCC.send(mncc); /* MSC -> OSC: After MS is ringing and sent CC ALERTING */ MNCC.send(ts_MNCC_ALERT_ind(cp.mncc_call_id)); + + /* Now expect SIP response "Ringing" back to MO, containing the same SDP information as in the MNCC RTP CREATE + * sent to OSC above */ 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, *, - "INVITE", 180, ?, "Ringing", *)); + "INVITE", 180, ?, "Ringing", omit)); /* MSC -> OSC: After MT user has picked up and sent CC CONNECT */ MNCC.send(ts_MNCC_SETUP_CNF(cp.mncc_call_id)); SIP.clear; /* MSC <- OSC: OSC asks MSC to connect its RTP stream to remote end */ - MNCC.receive(tr_MNCC_RTP_CONNECT(cp.mncc_call_id, f_addrstr2addr(cp.sip_rtp_addr), cp.sip_rtp_port)); + MNCC.receive(tr_MNCC_RTP_CONNECT(cp.mncc_call_id, f_addrstr2addr(cp.sip_rtp_addr), cp.sip_rtp_port)) + -> value mncc { + check_sdp(sdp_to_msc, mncc.u.rtp.sdp, expect_sdp_to_msc); + } /* 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, contact_addr := ?, method := "INVITE", status_code := 200, seq_nr := ?, reason := "OK", - body := pattern "*" & cp.cn_rtp_addr & "*")); + body := expect_sdp_to_sip)); /* 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, 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)); + MNCC.receive(tr_MNCC_SETUP_COMPL_req(cp.mncc_call_id)) -> value mncc { + check_sdp(sdp_to_msc, mncc.u.signal.sdp, expect_sdp_to_msc); + } } /* Establish a mobile originated call described in 'cp' */ @@ -284,15 +376,53 @@ var template SipAddr sip_addr_ext := tr_SipAddr_from_val(cp.comp.sip_url_ext); var PDU_SIP_Request sip_req; var integer seq_nr; + var MNCC_PDU mncc; + + /* The last SDP that the MSC received via MNCC from osmo-sip-connector */ + var charstring sdp_to_msc := ""; + /* At first, allow any empty and nonempty SDP. As the test progresses, this may expect specific SDP instead. */ + var template charstring expect_sdp_to_msc := *; + + /* If cp.mncc_with_sdp == true, expect SDP forwarding like this: + * + * SDP1: osmo-msc's RTP and codec info + * SDP2: SIP agent's RTP and codec info + * + * MNCC osmo-sip-connector SIP + * -------SDP1-->| MNCC SETUP ind + * <-------------| MNCC RTP CREATE (?) + * |-----SDP1--> SIP Invite + * |<----------- SIP (Invite) Trying + * <-------------| MNCC CALL PROC req + * |<----------- SIP (Invite) Ringing + * <-------------| MNCC ALERT req + * | (MT picks up) + * |<--SDP2----- SIP (Invite) OK + * <--SDP2-------| MNCC RTP CONNECT (SDP optional, still unchanged from SDP2) + * <-------------| MNCC SETUP rsp (SDP optional, still unchanged from SDP2) + * ------------->| MNCC SETUP COMPL ind (SDP optional, still unchanged from SDP1) + * |------------> SIP ACK + */ + + var charstring cn_sdp := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & + f_mgcp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & + "\r\nt=0 0\r\nm=audio " & int2str(cp.cn_rtp_port) & + " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_create_sip_expect(cp.comp.sip_url_ext.addr.nameAddr.addrSpec); /* MSC -> OSC: MSC sends SETUP.ind after CC SETUP was received from MS */ - MNCC.send(ts_MNCC_SETUP_ind(cp.mncc_call_id, dst, src, "262420123456789")); + mncc := valueof(ts_MNCC_SETUP_ind(cp.mncc_call_id, dst, src, "262420123456789")); + if (cp.mncc_with_sdp) { + mncc.u.signal.sdp := cn_sdp; + } + MNCC.send(mncc); + /* MSC <- OSC: Create GSM side RTP socket */ MNCC.receive(tr_MNCC_RTP_CREATE(cp.mncc_call_id)) { - var MNCC_PDU mncc := valueof(ts_MNCC_RTP_CREATE(cp.mncc_call_id)); + mncc := valueof(ts_MNCC_RTP_CREATE(cp.mncc_call_id)); mncc.u.rtp.payload_msg_type := oct2int('0300'O); + /* FIXME: makes no sense to send cp.cn_rtp_addr back to the cn. */ mncc.u.rtp.is_ipv6 := f_addr_is_ipv6(cp.cn_rtp_addr); mncc.u.rtp.ip := f_addrstr2addr(cp.cn_rtp_addr); mncc.u.rtp.rtp_port := cp.cn_rtp_port; @@ -300,7 +430,13 @@ } /* OSC -> SIP: Send INVITE with GSM side IP/Port in SDP */ - sip_req := f_SIP_expect_req(tr_SIP_INVITE(?, sip_addr_gsm, sip_addr_ext, ?, ?)); + var template charstring expect_sdp_to_sip := ?; + if (cp.mncc_with_sdp) { + /* Expect the same SDP as sent to osmo-sip-connector in MNCC, and allow osmo-sip-connector to append an + * "a=sendrecv;" */ + expect_sdp_to_sip := pattern cn_sdp & "*"; + } + sip_req := f_SIP_expect_req(tr_SIP_INVITE(?, sip_addr_gsm, sip_addr_ext, ?, expect_sdp_to_sip)); cp.comp.sip_url_gsm.params := sip_req.msgHeader.fromField.fromParams; cp.comp.sip_call_id := sip_req.msgHeader.callId.callid; seq_nr := sip_req.msgHeader.cSeq.seqNumber; @@ -309,22 +445,37 @@ SIP.send(ts_SIP_Response(cp.comp.sip_call_id, cp.comp.sip_url_gsm, cp.comp.sip_url_ext, "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)); + MNCC.receive(tr_MNCC_CALL_PROC_req(cp.mncc_call_id)) -> value mncc { + check_sdp(sdp_to_msc, mncc.u.signal.sdp, ""); + } - /* OSC <- SIP: SIP-terminated user is ringing now */ + /* 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, - "INVITE", 180, seq_nr, "Ringing", sip_req.msgHeader.via)); + "INVITE", 180, seq_nr, "Ringing", sip_req.msgHeader.via, omit)); /* MSC <- OSC: "180 Ringing" translated to MNCC_ALERT_REQ */ - MNCC.receive(tr_MNCC_ALERT_req(cp.mncc_call_id)) {} + MNCC.receive(tr_MNCC_ALERT_req(cp.mncc_call_id)) -> value mncc { + check_sdp(sdp_to_msc, mncc.u.signal.sdp, expect_sdp_to_msc); + } /* 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, "INVITE", 200, seq_nr, "OK", sip_req.msgHeader.via, cp.comp.sip_body)); - MNCC.receive(tr_MNCC_RTP_CONNECT(cp.mncc_call_id)); + + if (cp.mncc_with_sdp) { + /* If we expect SDP forwarding, from now on expect MNCC to reflect the SDP that we just sent on SIP. */ + expect_sdp_to_msc := cp.comp.sip_body; + } + /* If we don't expect SDP forwarding, just keep expect_sdp_to_msc := *. */ + + MNCC.receive(tr_MNCC_RTP_CONNECT(cp.mncc_call_id)) -> value mncc { + check_sdp(sdp_to_msc, mncc.u.rtp.sdp, expect_sdp_to_msc); + } /* MSC <- OSC: "200 OK" translated to MNCC_SETUP_RSP */ - MNCC.receive(tr_MNCC_SETUP_rsp(cp.mncc_call_id)); + MNCC.receive(tr_MNCC_SETUP_rsp(cp.mncc_call_id)) -> value mncc { + check_sdp(sdp_to_msc, mncc.u.signal.sdp, expect_sdp_to_msc); + } /* MSC -> OSC: CC CONNECT ACK was received from MS */ MNCC.send(ts_MNCC_SETUP_COMPL_ind(cp.mncc_call_id)); @@ -553,6 +704,26 @@ vc_conn.done; } +testcase TC_mt_with_sdp() runs on test_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init(); + pars := valueof(t_Pars); + pars.g_cp := valueof(t_CallPars(is_mo := false, mncc_with_sdp := true)); + vc_conn := f_start_handler(refers(f_TC_mt_success_rel_gsm), pars); + vc_conn.done; +} + +testcase TC_mo_with_sdp() runs on test_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init(); + pars := valueof(t_Pars); + pars.g_cp := valueof(t_CallPars(is_mo := true, mncc_with_sdp := true)); + vc_conn := f_start_handler(refers(f_TC_mo_success_rel_sip), pars); + vc_conn.done; +} + control { execute( TC_mt_success_rel_gsm() ); execute( TC_mt_success_rel_gsm_ipv6() ); @@ -561,6 +732,8 @@ execute( TC_mo_success_rel_gsm_ipv6() ); execute( TC_mo_success_rel_sip() ); execute( TC_mo_setup_disc_late_rtp() ); + execute( TC_mt_with_sdp() ); + execute( TC_mo_with_sdp() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417?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: Ib2ae8449e673f5027f01d428d3718c006f76d93e Gerrit-Change-Number: 34417 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: test SDP forwarding via MNCC

by laforge

Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417?usp=email ) Change subject: sip: test SDP forwarding via MNCC ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417?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: Ib2ae8449e673f5027f01d428d3718c006f76d93e Gerrit-Change-Number: 34417 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 24 Sep 2023 17:47:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-msc[master]: ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33967?usp=email ) Change subject: ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling ...................................................................... ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling Change-Id: I5e4891091c2ce56d4fd4a7f5f67156a94ade852d Related: OS#4854 --- M src/libmsc/msc_vgcs.c 1 file changed, 10 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index f3867fe..772a9e3 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -2508,14 +2508,6 @@ LOG_CELL(cell, LOGL_NOTICE, "Received VGCS/VBS ASSIGNMENT FAILURE from BSS.\n"); channel_fail: bss = cell->bss; - /* Remove cell. */ - tx_ran_msg = (struct ran_msg){ - .msg_type = RAN_MSG_CLEAR_COMMAND, - .clear_command = { - .gsm0808_cause = GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC, - }, - }; - ran_encode_and_send(fi, &tx_ran_msg, cell->conn, false); cell_clear(cell, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); /* Notify BSS FSM about channel failure. */ if (bss) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33967?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5e4891091c2ce56d4fd4a7f5f67156a94ade852d Gerrit-Change-Number: 33967 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in osmo-sgsn[master]: sgsn_rim: forward message based on RIM ROUTING ADDRESS

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/34122?usp=email ) Change subject: sgsn_rim: forward message based on RIM ROUTING ADDRESS ...................................................................... sgsn_rim: forward message based on RIM ROUTING ADDRESS At the moment we parse the RAN TRANSPARENT CONTAINER to look at the destination RIM ROUTING INFORMATION. This is not correct. The SGSN should not decode the RAN TRANSPARENT CONTAINER and use the RIM ROUTING ADDRESS / RIM ROUTING ADDRESS DISCRIMINATOR IE to make the routing decision. Related: OS#6095 Depends: libosmocore.git Ibca1f08906c4ffeecdae80d4e91c6c7b05fe4f8a Change-Id: Ifd2b915ed2f05130cff8ee77714b82005c17de3d --- M include/osmocom/sgsn/sgsn_rim.h M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_rim.c 3 files changed, 83 insertions(+), 14 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/sgsn_rim.h b/include/osmocom/sgsn/sgsn_rim.h index f43b09a..fc87b46 100644 --- a/include/osmocom/sgsn/sgsn_rim.h +++ b/include/osmocom/sgsn/sgsn_rim.h @@ -3,4 +3,4 @@ struct sgsn_mme_ctx; int sgsn_rim_rx_from_gb(struct osmo_bssgp_prim *bp, struct msgb *msg); -int sgsn_rim_rx_from_gtp(struct bssgp_ran_information_pdu *pdu); +int sgsn_rim_rx_from_gtp(struct msgb *msg, struct bssgp_rim_routing_info *rim_routing_address); diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 156f730..0b6da62 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -695,9 +695,46 @@ LOGMME(mme, DGTP, LOGL_INFO, "Rx GTP RAN Information Relay\n"); + int rc; unsigned int len = 0; - struct msgb *msg = msgb_alloc(4096, "gtpcv1_ran_info"); - struct bssgp_ran_information_pdu pdu; + struct msgb *msg = bssgp_msgb_alloc(); + + uint8_t rim_ra_encoded[256]; + unsigned int rim_ra_encoded_len = 0; + struct bssgp_rim_routing_info rim_ra; + + unsigned int rim_ra_discr_encoded_len = 0; + uint8_t rim_ra_discr; + + /* Read RIM Routing Address Discriminator (optional) */ + rc = gtpie_gettlv(ie, GTPIE_RIM_RA_DISCR, 0, &rim_ra_discr_encoded_len, &rim_ra_discr, + sizeof(rim_ra_discr)); + if (rc || rim_ra_discr_encoded_len <= 0) { + LOGMME(mme, DGTP, LOGL_NOTICE, "Rx GTP RAN Information Relay: No RIM Routing Address Discriminator IE found!\n"); + + /* It is not an error when the RIM ROUTING ADDRESS DISCRIMINATOR IE is missing. The RIM ROUTING ADDRESS + * DISCRIMINATOR IE is an optional IE. When it is missing, the RIM Routing Address shall be processed + * as an RNC address ("0001") See also: 3GPP TS 29.060 */ + rim_ra_discr = BSSGP_RIM_ROUTING_INFO_UTRAN; + } + + /* Read RIM Routing Address (optional) */ + rc = gtpie_gettlv(ie, GTPIE_RIM_ROUT_ADDR, 0, &rim_ra_encoded_len, rim_ra_encoded, sizeof(rim_ra_encoded)); + if (rc || rim_ra_encoded_len <= 0) { + LOGMME(mme, DGTP, LOGL_ERROR, "Rx GTP RAN Information Relay: No RIM Routing Address IE found!\n"); + + /* TODO: The (usually included) RIM ROUTING ADDRESS field is an optional field. However, we cannot + * proceed without a destination address. A possible way to fix this would be a default route that + * can be configured via the VTY. */ + goto ret_error; + } else { + rc = bssgp_parse_rim_ra(&rim_ra, rim_ra_encoded, rim_ra_encoded_len, rim_ra_discr); + if (rc < 0) { + LOGMME(mme, DGTP, LOGL_ERROR, + "Rx GTP RAN Information Relay: Failed parsing RIM Routing Address/RIM Routing Address Discriminator IE!\n"); + goto ret_error; + } + } if (gtpie_gettlv(ie, GTPIE_RAN_T_CONTAIN, 0, &len, msgb_data(msg), 4096) || len <= 0) { LOGMME(mme, DGTP, LOGL_ERROR, "Rx GTP RAN Information Relay: No Transparent Container IE found!\n"); @@ -706,13 +743,8 @@ msgb_put(msg, len); msgb_bssgph(msg) = msg->data; msgb_nsei(msg) = 0; - if (bssgp_parse_rim_pdu(&pdu, msg) < 0) { - LOGMME(mme, DGTP, LOGL_ERROR, "Rx GTP RAN Information Relay: Failed parsing Transparent Container IE!\n"); - goto ret_error; - } - msgb_free(msg); - return sgsn_rim_rx_from_gtp(&pdu); + return sgsn_rim_rx_from_gtp(msg, &rim_ra); ret_error: msgb_free(msg); diff --git a/src/sgsn/sgsn_rim.c b/src/sgsn/sgsn_rim.c index c6f8dcd..40e1f90 100644 --- a/src/sgsn/sgsn_rim.c +++ b/src/sgsn/sgsn_rim.c @@ -33,6 +33,23 @@ return bssgp_tx_rim(pdu, bvc_ctx->nsei); } +static int sgsn_bssgp_fwd_rim_to_geran_encoded(struct msgb *msg, struct bssgp_rim_routing_info *rim_routing_address) +{ + struct bssgp_bvc_ctx *bvc_ctx; + OSMO_ASSERT(rim_routing_address->discr == BSSGP_RIM_ROUTING_INFO_GERAN); + + /* Resolve RIM ROUTING ADDRESS to a BVC context */ + bvc_ctx = btsctx_by_raid_cid(&rim_routing_address->geran.raid, rim_routing_address->geran.cid); + if (!bvc_ctx) { + LOGP(DRIM, LOGL_ERROR, "Unable to find NSEI for destination cell %s\n", + bssgp_rim_ri_name(rim_routing_address)); + return -EINVAL; + } + + /* Forward PDU to the NSEI of the resolved BVC context */ + return bssgp_tx_rim_encoded(msg, bvc_ctx->nsei); +} + static int sgsn_bssgp_fwd_rim_to_eutran(const struct bssgp_ran_information_pdu *pdu) { struct sgsn_mme_ctx *mme; @@ -91,17 +108,20 @@ } /* Receive a RIM PDU from GTPv1C (EUTRAN) */ -int sgsn_rim_rx_from_gtp(struct bssgp_ran_information_pdu *pdu) +int sgsn_rim_rx_from_gtp(struct msgb *msg, struct bssgp_rim_routing_info *rim_routing_address) { - if (pdu->routing_info_dest.discr != BSSGP_RIM_ROUTING_INFO_GERAN) { + /* TODO: In this code path, we currently only support RIM message forwarding to GERAN (BSSGP). However, it + * technically also be possible to route a message back to GTP (BSSGP_RIM_ROUTING_INFO_EUTRAN) or to + * IuPS (BSSGP_RIM_ROUTING_INFO_UTRAN) */ + if (rim_routing_address->discr != BSSGP_RIM_ROUTING_INFO_GERAN) { LOGP(DRIM, LOGL_ERROR, "Rx GTP RAN Information Relay: Expected dst %s, got %s\n", bssgp_rim_routing_info_discr_str(BSSGP_RIM_ROUTING_INFO_GERAN), - bssgp_rim_routing_info_discr_str(pdu->routing_info_dest.discr)); + bssgp_rim_routing_info_discr_str(rim_routing_address->discr)); return -EINVAL; } LOGP(DRIM, LOGL_INFO, "Rx GTP RAN Information Relay for dest cell %s\n", - bssgp_rim_ri_name(&pdu->routing_info_dest)); + bssgp_rim_ri_name(rim_routing_address)); - return sgsn_bssgp_fwd_rim_to_geran(pdu); + return sgsn_bssgp_fwd_rim_to_geran_encoded(msg, rim_routing_address); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34122?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd2b915ed2f05130cff8ee77714b82005c17de3d Gerrit-Change-Number: 34122 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(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, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests: fix BSSGP in TC_ta_idle_dl_tbf_ass

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34506?usp=email ) Change subject: PCU_Tests: fix BSSGP in TC_ta_idle_dl_tbf_ass ...................................................................... PCU_Tests: fix BSSGP in TC_ta_idle_dl_tbf_ass When we send BSSGP DL UD, we should include an IMSI, since we are expecting the paging request to appear on the PCH Related: OS#5927 Change-Id: If62c2c7db9717cd08116374ee6ca939211bdf01e --- M pcu/PCU_Tests.ttcn 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index a6d3559..ba27e58 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -592,7 +592,7 @@ /* SGSN sends some DL data, PCU will initiate Packet Downlink * Assignment on CCCH (PCH). We don't care about the payload. */ - BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, f_rnd_octstring(10))); + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, f_rnd_octstring(10), imsi := ts_BSSGP_IMSI(ms.imsi))); f_ms_exp_dl_tbf_ass_ccch(ms); /* Make sure that Timing Advance is 0 (the actual value is not known yet). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34506?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: If62c2c7db9717cd08116374ee6ca939211bdf01e Gerrit-Change-Number: 34506 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(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, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests: make sure ts_BSSGP_DL_UD includes IMSI

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34507?usp=email ) Change subject: PCU_Tests: make sure ts_BSSGP_DL_UD includes IMSI ...................................................................... PCU_Tests: make sure ts_BSSGP_DL_UD includes IMSI Whenever we send a ts_BSSGP_DL_UD via BSSGP and we expect the downlink assignment on the paging channel by calling f_ms_exp_dl_tbf_ass_ccch(ms), then we should make sure that ts_BSSGP_IMSI actually contains an IMSI (paging group) Related: OS#5927 Change-Id: I356d93edd03c7e7564bde88d34effcf1b1967621 --- M pcu/PCU_Tests.ttcn 1 file changed, 22 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index ba27e58..012a0be 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -479,7 +479,7 @@ /* New data arrives, PCU should page the MS since no TBF active exists: */ /* Send some more data, it will never reach the MS */ - BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, imsi := ts_BSSGP_IMSI(ms.imsi))); f_ms_exp_dl_tbf_ass_ccch(ms); f_shutdown(__BFILE__, __LINE__, final := true); @@ -1785,7 +1785,7 @@ f_sleep(int2float(info_ind.t3191)); /* The TBF should be freed now, so new data should trigger an Assignment: */ - BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data2)); + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data2, imsi := ts_BSSGP_IMSI(ms.imsi))); f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ @@ -1860,7 +1860,7 @@ f_sleep(int2float(info_ind.t3191)); /* The TBF should be freed now, so new data should trigger an Assignment: */ - BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data2)); + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data2, imsi := ts_BSSGP_IMSI(ms.imsi))); f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ @@ -3128,10 +3128,10 @@ for (var integer i := 0; i < 10; i := i + 1) { BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi_other, imsi := ts_BSSGP_IMSI(ms.imsi))); } - BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi2)); - BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi7)); - BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi8)); - BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi1)); + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi2, imsi := ts_BSSGP_IMSI(ms.imsi))); + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi7, imsi := ts_BSSGP_IMSI(ms.imsi))); + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi8, imsi := ts_BSSGP_IMSI(ms.imsi))); + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi1, imsi := ts_BSSGP_IMSI(ms.imsi))); f_ms_exp_dl_tbf_ass_ccch(ms); /* Wait timer X2002 and DL block is available after CCCH IMM ASS */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34507?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: I356d93edd03c7e7564bde88d34effcf1b1967621 Gerrit-Change-Number: 34507 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(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, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023