<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12422">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MSC_ConnectionHandler: Optionally check MM Info<br><br>The MM Info message is an optional message that is set to the MS usually<br>after the location update. It contains the full network name and time<br>information. At the moment the presence of this message is not checked<br>or expected since sending of MM-Info is explicitly disabled in the<br>osmo-msc configu.<br><br>This patch adds an optional check of MM Info that is disabled by<br>default.<br><br>Change-Id: I431f50c2ff3536f87f0c7c3caf23b7a38d501904<br>Related: OS#3615<br>---<br>M library/L3_Templates.ttcn<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>3 files changed, 38 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn</span><br><span>index 3918f3d..3978498 100644</span><br><span>--- a/library/L3_Templates.ttcn</span><br><span>+++ b/library/L3_Templates.ttcn</span><br><span>@@ -2972,6 +2972,26 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template PDU_ML3_NW_MS tr_ML3_MT_MM_Info := {</span><br><span style="color: hsl(120, 100%, 40%);">+ discriminator := '0101'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ tiOrSkip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ skipIndicator := '0000'B</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ msgs := {</span><br><span style="color: hsl(120, 100%, 40%);">+ mm := {</span><br><span style="color: hsl(120, 100%, 40%);">+ mMInformation := {</span><br><span style="color: hsl(120, 100%, 40%);">+ messageType := '110010'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsd := '00'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ fullNetworkName := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ shortNetworkName := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ localtimeZone := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ univTime := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ lSAIdentity := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ networkDST := *</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 style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> </span><br><span> </span><br><span>diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn</span><br><span>index 1b31f75..bf83dd3 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -69,7 +69,8 @@</span><br><span> boolean send_early_cm,</span><br><span> charstring ipa_ctrl_ip,</span><br><span> integer ipa_ctrl_port,</span><br><span style="color: hsl(0, 100%, 40%);">- boolean ipa_ctrl_enable</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean ipa_ctrl_enable,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean mm_info</span><br><span> };</span><br><span> </span><br><span> /* get a one-octet bitmaks of supported algorithms based on Classmark information */</span><br><span>@@ -315,6 +316,12 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_expect_mm_info() runs on BSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_pars.mm_info == true) {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_Info));</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_perform_lu()</span><br><span> runs on BSC_ConnHdlr {</span><br><span> var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi)</span><br><span>@@ -363,6 +370,10 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Wait for MM-Information (if enabled) */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_mm_info();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* FIXME: there could be pending SMS or other common procedures by the MSC, let's ignore them */</span><br><span> BSSAP.receive(tr_BSSMAP_ClearCommand);</span><br><span> BSSAP.send(ts_BSSMAP_ClearComplete);</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index d121b63..0ac61bc 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -95,6 +95,7 @@</span><br><span> integer mp_msc_vty_port := 4254;</span><br><span> </span><br><span> /* local parameters of emulated HLR */</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean mp_mm_info := false;</span><br><span> charstring mp_hlr_ip := "127.0.0.1";</span><br><span> integer mp_hlr_port := 4222;</span><br><span> charstring mp_mgw_ip := "127.0.0.1";</span><br><span>@@ -457,7 +458,8 @@</span><br><span> send_early_cm := true,</span><br><span> ipa_ctrl_ip := mp_msc_ip,</span><br><span> ipa_ctrl_port := mp_msc_ctrl_port,</span><br><span style="color: hsl(0, 100%, 40%);">- ipa_ctrl_enable := true</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_ctrl_enable := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_info := mp_mm_info</span><br><span> };</span><br><span> return pars;</span><br><span> }</span><br><span>@@ -855,6 +857,9 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Wait for MM-Information (if enabled) */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_mm_info();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* wait for normal teardown */</span><br><span> f_expect_clear();</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12422">change 12422</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/12422"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I431f50c2ff3536f87f0c7c3caf23b7a38d501904 </div>
<div style="display:none"> Gerrit-Change-Number: 12422 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>