<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19714">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: Expect CommonID from MSC by default<br><br>As of osmo-msc Change-Id I2552736477663adb250c55728093500e8ae83ebb,<br>osmo-msc is always sending BSSMAP CommonID to the BSC. Let's adjust our<br>test expectation, while allowing the user to start the tests with<br>BSC_ConnectionHandler.mp_expect_common_id := false<br>to get the existing behavior (expect no bSSMAP CommonId) can be<br>restored, e.g. for testing 'latest'.<br><br>Change-Id: I4976d9bb1f07c8ab4ffa02848414f8ddd1bdfd3f<br>Related: OS#2969<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>2 files changed, 23 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn</span><br><span>index cc69a68..053a5f6 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -61,6 +61,10 @@</span><br><span> </span><br><span> import from TCCConversion_Functions { function f_strstr };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+modulepar {</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean mp_expect_common_id := true;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* this component represents a single subscriber connection */</span><br><span> type component BSC_ConnHdlr extends RAN_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT, SGsAP_ConnHdlr {</span><br><span> var BSC_ConnHdlrPars g_pars;</span><br><span>@@ -519,6 +523,17 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_expect_common_id() runs on BSC_ConnHdlr</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_pars.ran_is_geran) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp_expect_common_id) {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.receive(tr_BSSMAP_CommonId(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi)));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function f_mm_common() runs on BSC_ConnHdlr</span><br><span> {</span><br><span> f_mm_auth();</span><br><span>@@ -539,6 +554,7 @@</span><br><span> }</span><br><span> /* FIXME: Send the best available algorithm */</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_common_id();</span><br><span> } else { /* UTRAN */</span><br><span> alt {</span><br><span> [g_pars.net.expect_ciph] BSSAP.receive(tr_RANAP_SecurityModeCmdEnc(uia_algs := ?,</span><br><span>@@ -549,7 +565,7 @@</span><br><span> var IntegrityProtectionAlgorithm uia_chosen := 0; /*standard_UMTS_integrity_algorithm_UIA1*/</span><br><span> var EncryptionAlgorithm uea_chosen := 1; /*standard_UMTS_encryption_algorith_UEA1*/</span><br><span> BSSAP.send(ts_RANAP_SecurityModeCompleteEnc(uia_chosen, uea_chosen));</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi)));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_common_id();</span><br><span> }</span><br><span> [g_pars.net.expect_ciph] BSSAP.receive(tr_RANAP_SecurityModeCmdEnc(?,?,?,?,?)) {</span><br><span> setverdict(fail, "Invalid SecurityModeCommand (ciphering case)");</span><br><span>@@ -560,7 +576,7 @@</span><br><span> key_sts := ?)) {</span><br><span> var IntegrityProtectionAlgorithm uia_chosen := 0; /*standard_UMTS_integrity_algorithm_UIA1;*/</span><br><span> BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen));</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi)));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_common_id();</span><br><span> }</span><br><span> [not g_pars.net.expect_ciph] BSSAP.receive(tr_RANAP_SecurityModeCmd(?,?,?)) {</span><br><span> setverdict(fail, "Invalid SecurityModeCommand (non-ciphering case)");</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 5497c2d..d668616 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -807,6 +807,7 @@</span><br><span> </span><br><span> /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */</span><br><span> f_cl3_or_initial_ue(l3_lu);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_common_id();</span><br><span> </span><br><span> /* Send Early Classmark, just for the fun of it */</span><br><span> BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3));</span><br><span>@@ -926,6 +927,7 @@</span><br><span> BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_ID_Req(CM_ID_TYPE_IMSI)));</span><br><span> BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_MM_ID_Rsp_IMSI(overlong_imsi))); /* test for OS#2864 */</span><br><span> BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_MM_ID_Rsp_IMSI(g_pars.imsi)));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_common_id();</span><br><span> </span><br><span> /* Expect MSC to do UpdateLocation to HLR; respond to it */</span><br><span> GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi));</span><br><span>@@ -3972,6 +3974,7 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_common_id();</span><br><span> </span><br><span> /* Expect LU reject from MSC. */</span><br><span> alt {</span><br><span>@@ -4008,6 +4011,7 @@</span><br><span> /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */</span><br><span> var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi)</span><br><span> f_cl3_or_initial_ue(l3_lu);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_common_id();</span><br><span> </span><br><span> /* Expect LU reject from MSC. */</span><br><span> alt {</span><br><span>@@ -4066,6 +4070,7 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_common_id();</span><br><span> </span><br><span> /* TODO: Verify MSC is using the best cipher available! How? */</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19714">change 19714</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19714"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4976d9bb1f07c8ab4ffa02848414f8ddd1bdfd3f </div>
<div style="display:none"> Gerrit-Change-Number: 19714 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>