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

[S] Change in osmo-hnbgw[master]: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej()

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email ) Change subject: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() ...................................................................... Patch Set 1: (2 comments) File src/osmo-hnbgw/hnbgw_hnbap.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15467): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481/comment/bb3602e0_8403a509 PS1, Line 277: (const char *)ue_id->choice.iMSI.buf, code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15467): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481/comment/61055a53_2ce82423 PS1, Line 277: (const char *)ue_id->choice.iMSI.buf, please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b Gerrit-Change-Number: 36481 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 27 Mar 2024 20:47:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej()

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email ) Change subject: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() ...................................................................... HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/81/36481/1 diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 6d3c8e0..28b9abd 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -270,6 +270,14 @@ ue_id->choice.pTMSIRAI.rAI.rAC.size); break; + case HNBAP_UE_Identity_PR_iMSI: + LOGHNB(hnb, DHNBAP, LOGL_DEBUG, "REJ UE_Id IMSI %s\n", + osmo_hexdump_nospc(ue_id->choice.iMSI.buf, ue_id->choice.iMSI.size)); + OCTET_STRING_fromBuf(&reject.uE_Identity.choice.iMSI, + (const char *)ue_id->choice.iMSI.buf, + ue_id->choice.iMSI.size); + break; + default: LOGHNB(hnb, DHNBAP, LOGL_ERROR, "Cannot compose UE Register Reject:" " unsupported UE ID (present=%d)\n", ue_id->present); @@ -311,6 +319,9 @@ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_OCTET_STRING, &reject.uE_Identity.choice.pTMSIRAI.rAI.rAC); break; + case HNBAP_UE_Identity_PR_iMSI: + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_OCTET_STRING, + &reject.uE_Identity.choice.iMSI); default: /* should never happen after above switch() */ -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b Gerrit-Change-Number: 36481 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in osmo-hnbgw[master]: HNBAP: Make sure to respond with correct "reject"

by laforge

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36478?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: HNBAP: Make sure to respond with correct "reject" ...................................................................... HNBAP: Make sure to respond with correct "reject" If we receive a procedure (like UE-REGISTER) in a state where it's not permitted (e.g. HNB not registered), we should send a UE-REGISTER-REJ with proper cause value, rather than not sending any response at all. Change-Id: I300db368a3d1d2fb5967f69f2ed4ac90ecf85e75 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 62 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/78/36478/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36478?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I300db368a3d1d2fb5967f69f2ed4ac90ecf85e75 Gerrit-Change-Number: 36478 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

[S] Change in osmo-iuh[master]: hnbap_common: Make error message more verbose (which type failed)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36480?usp=email ) Change subject: hnbap_common: Make error message more verbose (which type failed) ...................................................................... hnbap_common: Make error message more verbose (which type failed) Change-Id: I3d263a2a50afbe1a2a99e52b16e983e0aae22edf --- M src/hnbap_common.c 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/80/36480/1 diff --git a/src/hnbap_common.c b/src/hnbap_common.c index 10a29fa..c7678fb 100644 --- a/src/hnbap_common.c +++ b/src/hnbap_common.c @@ -152,7 +152,7 @@ pdu.choice.initiatingMessage.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr); if (rc < 0) { - LOGP(DHNBAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DHNBAP, LOGL_ERROR, "%s: Error in ANY_fromType_aper (%s)\n", __func__, td->name); return NULL; } @@ -179,7 +179,7 @@ pdu.choice.successfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DHNBAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DHNBAP, LOGL_ERROR, "%s: Error in ANY_fromType_aper (%s)\n", __func__, td->name); return NULL; } @@ -206,7 +206,7 @@ pdu.choice.unsuccessfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DHNBAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DHNBAP, LOGL_ERROR, "%s: Error in ANY_fromType_aper (%s)\n", __func__, td->name); return NULL; } @@ -234,7 +234,7 @@ rc = ANY_fromType_aper(&buff->value, type, sptr); if (rc < 0) { - LOGP(DHNBAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DHNBAP, LOGL_ERROR, "%s: Error in ANY_fromType_aper(%s)\n", __func__, type->name); FREEMEM(buff); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36480?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3d263a2a50afbe1a2a99e52b16e983e0aae22edf Gerrit-Change-Number: 36480 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: as_{iu_release,clear_cmd}_compl_disc: remove no-op timer arguments

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36471?usp=email ) Change subject: msc: as_{iu_release,clear_cmd}_compl_disc: remove no-op timer arguments ...................................................................... msc: as_{iu_release,clear_cmd}_compl_disc: remove no-op timer arguments Change-Id: I1d3dcf4399dccd353702e4d6c53fe8e26e16ea9b --- M library/RAN_Emulation.ttcnpp M msc/BSC_ConnectionHandler.ttcn 2 files changed, 13 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 25727f3..5b2f190 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -1552,7 +1552,7 @@ #ifdef RAN_EMULATION_RANAP /* expect a IuReleaseCommand; Confirm that; expect SCCP-level N-DISCONNET.ind */ -altstep as_iu_release_compl_disc(float t := 5.0) runs on RAN_ConnHdlr { +altstep as_iu_release_compl_disc() runs on RAN_ConnHdlr { var RANAP_PDU ranap; [] BSSAP.receive(tr_RANAP_IuReleaseCommand(?)) { BSSAP.send(ts_RANAP_IuReleaseComplete); diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index b3d915c..0a30114 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1967,7 +1967,7 @@ } /* expect a clear command */ -altstep as_clear_cmd_compl_disc(float t := 5.0) runs on BSC_ConnHdlr { +altstep as_clear_cmd_compl_disc() runs on BSC_ConnHdlr { var PDU_BSSAP bssap; [] BSSAP.receive(tr_BSSMAP_ClearCommand) { BSSAP.send(ts_BSSMAP_ClearComplete); @@ -1992,8 +1992,8 @@ T.start; alt { - [g_pars.ran_is_geran] as_clear_cmd_compl_disc(t) { } - [not g_pars.ran_is_geran] as_iu_release_compl_disc(t) { } + [g_pars.ran_is_geran] as_clear_cmd_compl_disc() { } + [not g_pars.ran_is_geran] as_iu_release_compl_disc() { } [] T.timeout { setverdict(fail, "Timeout waiting for ClearCommand/Release"); mtc.stop; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36471?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: I1d3dcf4399dccd353702e4d6c53fe8e26e16ea9b Gerrit-Change-Number: 36471 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: fix f_tc_mt_crcx_ran_reject(): properly handle Iu-ReleaseCommand

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36470?usp=email ) Change subject: msc: fix f_tc_mt_crcx_ran_reject(): properly handle Iu-ReleaseCommand ...................................................................... msc: fix f_tc_mt_crcx_ran_reject(): properly handle Iu-ReleaseCommand Previous commit [1] uncovers a problem in f_tc_mt_crcx_ran_reject(): this function uses as_clear_cmd_compl_disc(), which is expecting A-interface (GERAN) specific BSSMAP Clear Command. The Iu-interface (UTRAN) specific RANAP Iu-ReleaseCommand is not handled at all. The testcase was passing so far due to a bug in as_optional_cc_rel(), which would unblock the alt-statemtnt on receipt of CC RELEASE, so that we would never respond to RANAP Iu-ReleaseCommand. Let's derive a new altstep from f_expect_clear() and use it. Change-Id: Idd679bbf720a56a76cf37ab414b1e6d90e53278b Related: [1] I0143b4d33b1ebe4cce99c09018540524c4626eec --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 36 insertions(+), 10 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 0a30114..be12fae 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1966,7 +1966,7 @@ setverdict(pass); } -/* expect a clear command */ +/* expect a clear command (for GERAN only!) */ altstep as_clear_cmd_compl_disc() runs on BSC_ConnHdlr { var PDU_BSSAP bssap; [] BSSAP.receive(tr_BSSMAP_ClearCommand) { @@ -1987,23 +1987,28 @@ } } +/* expect a BSSMAP Clear Command (for GERAN) or an Iu-ReleaseCommand (for UTRAN) */ +altstep as_expect_clear() runs on BSC_ConnHdlr { + [g_pars.ran_is_geran] as_clear_cmd_compl_disc(); + [not g_pars.ran_is_geran] as_iu_release_compl_disc(); +} + function f_expect_clear(float t := 5.0, boolean verify_vlr_cell_id := true) runs on BSC_ConnHdlr { timer T := t; T.start; alt { - [g_pars.ran_is_geran] as_clear_cmd_compl_disc() { } - [not g_pars.ran_is_geran] as_iu_release_compl_disc() { } + [] as_expect_clear() { + if (verify_vlr_cell_id) { + /* Now the conn is gone, but the VLR reflects the cell ID */ + f_verify_vty_lac_ci(); + } + } [] T.timeout { setverdict(fail, "Timeout waiting for ClearCommand/Release"); mtc.stop; } } - - if (verify_vlr_cell_id) { - /* Now the conn is gone, but the VLR reflects the cell ID */ - f_verify_vty_lac_ci(); - } } function f_create_bssmap_exp_n_connect(integer targetPointCode) runs on BSC_ConnHdlr { diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 7e8f467..101d632 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1752,8 +1752,8 @@ repeat; } [] MGCP.receive { repeat; } - [] as_clear_cmd_compl_disc(); - [] as_optional_cc_rel(cpars); + [] as_optional_cc_rel(cpars); /* repeats internally */ + [] as_expect_clear() { setverdict(pass); } } } testcase TC_mt_crcx_ran_reject() runs on MTC_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36470?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: Idd679bbf720a56a76cf37ab414b1e6d90e53278b Gerrit-Change-Number: 36470 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: use as_expect_clear() in f_tc_mt_t310()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36472?usp=email ) Change subject: msc: use as_expect_clear() in f_tc_mt_t310() ...................................................................... msc: use as_expect_clear() in f_tc_mt_t310() This testcase is not Iu-compatible yet, but let's make life a bit easier for those trying to make it such in the future. Change-Id: I8185153502d31163fcb4c718690ee0f1cc912f5b --- M msc/MSC_Tests.ttcn 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 101d632..52a5c2f 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1850,7 +1850,7 @@ // FIXME: f_create_mgcp_delete_ep(cpars.mgcp_ep); repeat; } - [] as_clear_cmd_compl_disc(); + [] as_expect_clear() { setverdict(pass); } } } testcase TC_mt_t310() runs on MTC_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36472?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: I8185153502d31163fcb4c718690ee0f1cc912f5b Gerrit-Change-Number: 36472 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: fix missing 'repeat' in as_optional_cc_rel()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36469?usp=email ) Change subject: msc: fix missing 'repeat' in as_optional_cc_rel() ...................................................................... msc: fix missing 'repeat' in as_optional_cc_rel() We do activate() this altstep in several testcases, so that it's kinda "running in background". In reality, the defaults in TTCN-3 are just a syntax suggar, and the following code: ``` var default foo := activate(as_foo_bar()); alt { [] PORT1.receive(tr_Msg1) { repeat; } [] PORT1.receive(tr_Msg2) { setverdict(pass); } } PORT2.receive(tr_Msg3); ``` actually evaluates to: ``` alt { [] PORT1.receive(tr_Msg1) { repeat; } [] PORT1.receive(tr_Msg2) { setverdict(pass); } [] as_foo_bar(); } alt { [] PORT2.receive(tr_Msg3); [] as_foo_bar(); } ``` If as_foo_bar() contains no 'repeat' statement, then whenever it triggers it would efficiently cancel (unblock) the current alt statement, resulting in weird behavior due to messages not being dequeued from ports as expected. And this is exactly what we saw happening in OS#6414. Change-Id: I0143b4d33b1ebe4cce99c09018540524c4626eec Related: OS#6414 --- M msc/MSC_Tests.ttcn 1 file changed, 45 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 2b5af7c..7e8f467 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -187,6 +187,7 @@ } BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_REL_COMPL(cpars.transaction_id, tid_remote))); } + repeat; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36469?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: I0143b4d33b1ebe4cce99c09018540524c4626eec Gerrit-Change-Number: 36469 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: cosmetic: fix formatting in altsteps

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36468?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: msc: cosmetic: fix formatting in altsteps ...................................................................... msc: cosmetic: fix formatting in altsteps Change-Id: I14afa9aa076396d48043000e350885384bde4c81 --- M msc/MSC_Tests.ttcn 1 file changed, 27 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index f99f93c..2b5af7c 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -180,14 +180,14 @@ private altstep as_optional_cc_rel(CallParameters cpars, boolean respond := false) runs on BSC_ConnHdlr { [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_RELEASE(cpars.transaction_id))) { - if (respond) { - var BIT1 tid_remote := '1'B; - if (cpars.mo_call) { - tid_remote := '0'B; - } - BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_REL_COMPL(cpars.transaction_id, tid_remote))); + if (respond) { + var BIT1 tid_remote := '1'B; + if (cpars.mo_call) { + tid_remote := '0'B; } + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_REL_COMPL(cpars.transaction_id, tid_remote))); } + } } function f_init_smpp(charstring id) runs on MTC_CT { @@ -5731,18 +5731,18 @@ private altstep as_mgcp_ack_all_mdcx(CallParameters cpars) runs on BSC_ConnHdlr { var MgcpCommand mgcp_cmd; [] MGCP.receive(tr_MDCX) -> value mgcp_cmd { - var charstring conn_id; - f_mgcp_find_param_entry(mgcp_cmd.params, "I", conn_id); - var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip, - hex2str(cpars.mgcp_call_id), "42", - cpars.mgw_conn_2.mgw_rtp_port, - { int2str(cpars.rtp_payload_type) }, - { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type, - cpars.rtp_sdp_format)), - valueof(ts_SDP_ptime(20)) })); - MGCP.send(ts_MDCX_ACK(mgcp_cmd.line.trans_id, str2hex(conn_id), sdp)); - repeat; - } + var charstring conn_id; + f_mgcp_find_param_entry(mgcp_cmd.params, "I", conn_id); + var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip, + hex2str(cpars.mgcp_call_id), "42", + cpars.mgw_conn_2.mgw_rtp_port, + { int2str(cpars.rtp_payload_type) }, + { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type, + cpars.rtp_sdp_format)), + valueof(ts_SDP_ptime(20)) })); + MGCP.send(ts_MDCX_ACK(mgcp_cmd.line.trans_id, str2hex(conn_id), sdp)); + repeat; + } } private altstep as_mgcp_ack_all_dlcx(CallParameters cpars) runs on BSC_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36468?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: I14afa9aa076396d48043000e350885384bde4c81 Gerrit-Change-Number: 36468 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: fix f_tc_ho_inter_bsc0(): properly patch n_sd

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36467?usp=email ) Change subject: msc: fix f_tc_ho_inter_bsc0(): properly patch n_sd ...................................................................... msc: fix f_tc_ho_inter_bsc0(): properly patch n_sd Assuming n_sd should be 3 is only valid for non-A5 testcases, in which we are *not* doing ciphering and authentication. For the A5 testcases (TC_ho_inter_bsc_a5_*), this assumption is incorrect and osmo-msc is definitely not happy about that: Duplicate DTAP: bin=0, expected n_sd == 0, got 3 (ran_msg.c:159) Dropping duplicate message ... (msc_a.c:1363) Why and how the A5 testcases passed so far? It was a pure luck, which sailed away when we started executing ttcn3-msc-test with io_uring. The A5 testcases were passing thanks to the as_optional_cc_rel() that gets activate()d in background before calling f_call_hangup(). This altstep does not have the 'repeat' statement, and as a side effect it may cancel any normal alt-statements and even standalone receive() statements. In the successful scenario, it would cancel (unblock) the following receive operation in f_call_hangup(): MNCC.receive(tr_MNCC_REL_ind(cpars.mncc_callref)); log("f_call_hangup 2: rx MNCC REL ind"); BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_REL_COMPL(cpars.transaction_id))); // ^^^^^^^^^^ as_optional_cc_rel() triggers here and cancels this one which is a pure luck because our CC RELEASE was sent with incorrect sequence number and got dropped, so osmo-msc would never send us CC RELEASE COMPLETE. It would instead send us CC RELEASE due to expire of T306, and the as_optional_cc_rel() would kick in handling this message and responding with CC RELEASE COMPLETE. In the failing scenario though (when running with io_uring), that same altstep running in backround may trigger *earlier* and unblock another standalone receive() statement: MNCC.receive(tr_MNCC_REL_ind(cpars.mncc_callref)); // ^^^^^^^^^ as_optional_cc_rel() triggers here and cancels this one log("f_call_hangup 2: rx MNCC REL ind"); BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_REL_COMPL(cpars.transaction_id))); so that we will be stuck waiting for CC RELEASE COMPLETE until the Tguard expires. This patch fixes n_sd patching, so that our CC RELEASE message is handled properly and the call gets released as expected, without requiring as_optional_cc_rel() to kick in. The missing 'repeat' is to be added to as_optional_cc_rel() in a follow-up patch. Change-Id: Iddde391eade716ca5c6c48cb631450ddb543e0d4 Related: OS#6414 --- M msc/MSC_Tests.ttcn 1 file changed, 65 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 9db18d3..f99f93c 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -5778,6 +5778,10 @@ f_perform_lu(); f_mo_call_establish(cpars); + /* Remember the last n_sd (sequence number), + * we will need it when the other BSS hands over back to us. */ + var N_Sd_Array last_n_sd := f_bssmap_last_n_sd(); + f_sleep(1.0); var default ack_mdcx := activate(as_mgcp_ack_all_mdcx(cpars)); @@ -5854,13 +5858,11 @@ deactivate(ack_mdcx); - var default ccrel := activate(as_optional_cc_rel(cpars, true)); - - /* blatant cheating */ - var N_Sd_Array last_n_sd := f_bssmap_last_n_sd(); - last_n_sd[0] := 3; + /* Use the n_sd (sequence number) we stored before the first handover. + * Otherwise the MSC may treat our DTAP messages as duplicates and discard them. */ f_bssmap_continue_after_n_sd(last_n_sd); + var default ccrel := activate(as_optional_cc_rel(cpars, true)); f_call_hangup(cpars, true); f_sleep(1.0); deactivate(ccrel); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36467?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: Iddde391eade716ca5c6c48cb631450ddb543e0d4 Gerrit-Change-Number: 36467 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024