<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13851">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move imsi_hex2oct to Osmocom_Types.ttcn<br><br>This function is required not only for the MSC_Tests, but also for<br>the upcoming Iu related SGSN tests<br><br>Change-Id: Ic23669671ce79151046f2330726bb68542faeb0e<br>---<br>M library/Osmocom_Types.ttcn<br>M msc/BSC_ConnectionHandler.ttcn<br>2 files changed, 19 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/13851/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn</span><br><span>index 90b2758..2a4f68c 100644</span><br><span>--- a/library/Osmocom_Types.ttcn</span><br><span>+++ b/library/Osmocom_Types.ttcn</span><br><span>@@ -133,5 +133,24 @@</span><br><span> return x;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function imsi_hex2oct(hexstring imsi) return octetstring {</span><br><span style="color: hsl(120, 100%, 40%);">+ var hexstring tmp := ''H;</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* swap nibbles and pad with F if insufficient input nibbles */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < lengthof(imsi); i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (i+1 < lengthof(imsi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ tmp := tmp & imsi[i+1];</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ tmp := tmp & 'F'H;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ tmp := tmp & imsi[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ i := i+1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ret := hex2oct(tmp);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> } with { encode "RAW"; variant "FIELDORDER(msb)" }</span><br><span>diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn</span><br><span>index b1a0491..595f402 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -86,25 +86,6 @@</span><br><span> boolean ran_is_geran</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function imsi_hex2oct(hexstring imsi) return octetstring {</span><br><span style="color: hsl(0, 100%, 40%);">- var hexstring tmp := ''H;</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring ret;</span><br><span style="color: hsl(0, 100%, 40%);">- var integer i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* swap nibbles and pad with F if insufficient input nibbles */</span><br><span style="color: hsl(0, 100%, 40%);">- for (i := 0; i < lengthof(imsi); i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (i+1 < lengthof(imsi)) {</span><br><span style="color: hsl(0, 100%, 40%);">- tmp := tmp & imsi[i+1];</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- tmp := tmp & 'F'H;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- tmp := tmp & imsi[i];</span><br><span style="color: hsl(0, 100%, 40%);">- i := i+1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- ret := hex2oct(tmp);</span><br><span style="color: hsl(0, 100%, 40%);">- return ret;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* get a one-octet bitmaks of supported algorithms based on Classmark information */</span><br><span> function f_alg_mask_from_cm(BSSMAP_IE_ClassmarkInformationType2 cm2) return OCT1 {</span><br><span> var BIT8 res := '00000001'B; /* A5/0 always supported */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13851">change 13851</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/13851"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ic23669671ce79151046f2330726bb68542faeb0e </div>
<div style="display:none"> Gerrit-Change-Number: 13851 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>