<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13619">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Ensure BcdMccMnc is encoded as 24.008 10.5.5.15<br><br>PCU is using BcdMccMnc as it's encoded as 24.008.<br>But SGSN code is using it as it would be byte by byte<br>sorted.<br><br>Fixes: OS#3878<br>Change-Id: Ie8f67f16f18e4c5090bc5a4c46a866a7e7e00206<br>---<br>M library/L3_Common.ttcn<br>M library/Osmocom_Gb_Types.ttcn<br>M sgsn/SGSN_Tests.ttcn<br>3 files changed, 9 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/L3_Common.ttcn b/library/L3_Common.ttcn</span><br><span>index 57db6b3..01f0a34 100644</span><br><span>--- a/library/L3_Common.ttcn</span><br><span>+++ b/library/L3_Common.ttcn</span><br><span>@@ -106,9 +106,9 @@</span><br><span> rai.mccDigit1</span><br><span> & rai.mccDigit2</span><br><span> & rai.mccDigit3</span><br><span style="color: hsl(120, 100%, 40%);">+ & rai.mncDigit3</span><br><span> & rai.mncDigit1</span><br><span style="color: hsl(0, 100%, 40%);">- & rai.mncDigit2</span><br><span style="color: hsl(0, 100%, 40%);">- & rai.mncDigit3;</span><br><span style="color: hsl(120, 100%, 40%);">+ & rai.mncDigit2;</span><br><span> return plmn;</span><br><span> }</span><br><span> </span><br><span>diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn</span><br><span>index 95d3028..55a2816 100644</span><br><span>--- a/library/Osmocom_Gb_Types.ttcn</span><br><span>+++ b/library/Osmocom_Gb_Types.ttcn</span><br><span>@@ -868,8 +868,8 @@</span><br><span> ret.mccDigit2 := cid.ra_id.lai.mcc_mnc[1];</span><br><span> ret.mccDigit3 := cid.ra_id.lai.mcc_mnc[2];</span><br><span> ret.mncDigit3 := cid.ra_id.lai.mcc_mnc[3];</span><br><span style="color: hsl(0, 100%, 40%);">- ret.mncDigit2 := cid.ra_id.lai.mcc_mnc[5];</span><br><span> ret.mncDigit1 := cid.ra_id.lai.mcc_mnc[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ ret.mncDigit2 := cid.ra_id.lai.mcc_mnc[5];</span><br><span> }</span><br><span> if (isvalue(cid.ra_id.lai.lac)) {</span><br><span> ret.lac := f_oct_or_wc(cid.ra_id.lai.lac, 2);</span><br><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index 8b639e6..74cdece 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -137,15 +137,16 @@</span><br><span> };</span><br><span> </span><br><span> private function f_cellid_to_RAI(in BssgpCellId cell_id) return RoutingAreaIdentificationV {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* mcc_mnc is encoded as of 24.008 10.5.5.15 */</span><br><span> var BcdMccMnc mcc_mnc := cell_id.ra_id.lai.mcc_mnc;</span><br><span> </span><br><span> var RoutingAreaIdentificationV ret := {</span><br><span> mccDigit1 := mcc_mnc[0],</span><br><span> mccDigit2 := mcc_mnc[1],</span><br><span> mccDigit3 := mcc_mnc[2],</span><br><span style="color: hsl(0, 100%, 40%);">- mncDigit3 := mcc_mnc[5],</span><br><span style="color: hsl(0, 100%, 40%);">- mncDigit1 := mcc_mnc[3],</span><br><span style="color: hsl(0, 100%, 40%);">- mncDigit2 := mcc_mnc[4],</span><br><span style="color: hsl(120, 100%, 40%);">+ mncDigit3 := mcc_mnc[3],</span><br><span style="color: hsl(120, 100%, 40%);">+ mncDigit1 := mcc_mnc[4],</span><br><span style="color: hsl(120, 100%, 40%);">+ mncDigit2 := mcc_mnc[5],</span><br><span> lac := int2oct(cell_id.ra_id.lai.lac, 16),</span><br><span> rac := int2oct(cell_id.ra_id.rac, 8)</span><br><span> }</span><br><span>@@ -225,7 +226,8 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_init(BcdMccMnc mcc_mnc := '26242F'H) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+/* mcc_mnc is 24.008 10.5.5.15 encoded. 262 42 */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_init(BcdMccMnc mcc_mnc := '262F42'H) runs on test_CT {</span><br><span> if (g_initialized == true) {</span><br><span> return;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13619">change 13619</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/13619"/><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: Ie8f67f16f18e4c5090bc5a4c46a866a7e7e00206 </div>
<div style="display:none"> Gerrit-Change-Number: 13619 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>