<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11486">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;">SGsAP: Switch over to osmocom branch/repo to avoid bugs in official one<br><br>The VLR and MME name are octetstring with dns-style labels and not<br>character strings.<br><br>Change-Id: I31a8ea04ef508beba9014aac5479693c47b7b956<br>---<br>M deps/Makefile<br>M library/SGsAP_Templates.ttcn<br>2 files changed, 20 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/deps/Makefile b/deps/Makefile</span><br><span>index a1ac595..7cf9300 100644</span><br><span>--- a/deps/Makefile</span><br><span>+++ b/deps/Makefile</span><br><span>@@ -40,11 +40,11 @@</span><br><span> titan.ProtocolModules.LLC_v7.1.0 \</span><br><span> titan.ProtocolModules.MobileL3_v13.4.0 \</span><br><span> titan.ProtocolModules.NS_v7.3.0 \</span><br><span style="color: hsl(0, 100%, 40%);">- titan.ProtocolModules.SGsAP_13.2.0 \</span><br><span> titan.ProtocolModules.SNDCP_v7.0.0 \</span><br><span> titan.ProtocolEmulations.SCCP</span><br><span> </span><br><span> OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \</span><br><span style="color: hsl(120, 100%, 40%);">+ titan.ProtocolModules.SGsAP_13.2.0 \</span><br><span> titan.TestPorts.MTP3asp \</span><br><span> titan.ProtocolEmulations.M3UA</span><br><span> </span><br><span>@@ -78,7 +78,7 @@</span><br><span> titan.ProtocolModules.RTP_commit= R.5.A</span><br><span> titan.ProtocolModules.ROSE_commit= R.1.C</span><br><span> titan.ProtocolModules.SCTP_commit= R.2.A</span><br><span style="color: hsl(0, 100%, 40%);">-titan.ProtocolModules.SGsAP_13.2.0_commit= R.1.B</span><br><span style="color: hsl(120, 100%, 40%);">+titan.ProtocolModules.SGsAP_13.2.0_commit= 520dc48dd41ee15c9fd77e71d2ea7a05c58770b9</span><br><span> titan.ProtocolModules.SDP_commit= R.14.A</span><br><span> titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69</span><br><span> titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A</span><br><span>diff --git a/library/SGsAP_Templates.ttcn b/library/SGsAP_Templates.ttcn</span><br><span>index aac045e..9526080 100644</span><br><span>--- a/library/SGsAP_Templates.ttcn</span><br><span>+++ b/library/SGsAP_Templates.ttcn</span><br><span>@@ -174,12 +174,12 @@</span><br><span> </span><br><span> </span><br><span> /* 9.4.13 */</span><br><span style="color: hsl(0, 100%, 40%);">-template (value) MME_Name ts_SGsAP_IE_MmeName(template (value) charstring name) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) MME_Name ts_SGsAP_IE_MmeName(template (value) octetstring name) := {</span><br><span> iEI := '00001001'B,</span><br><span> lengthIndicator := lengthof(valueof(name)),</span><br><span> name := name</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-template MME_Name tr_SGsAP_IE_MmeName(template charstring name) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template MME_Name tr_SGsAP_IE_MmeName(template octetstring name) := {</span><br><span> iEI := '00001001'B,</span><br><span> lengthIndicator := ?,</span><br><span> name := name</span><br><span>@@ -303,12 +303,12 @@</span><br><span> </span><br><span> </span><br><span> /* 9.4.22 */</span><br><span style="color: hsl(0, 100%, 40%);">-template (value) VLR_Name ts_SGsAP_IE_VlrName(template (value) charstring name) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) VLR_Name ts_SGsAP_IE_VlrName(template (value) octetstring name) := {</span><br><span> iEI := '00000010'B,</span><br><span> lengthIndicator := lengthof(name),</span><br><span> name := name</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-template VLR_Name tr_SGsAP_IE_VlrName(template charstring name) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template VLR_Name tr_SGsAP_IE_VlrName(template octetstring name) := {</span><br><span> iEI := '00000010'B,</span><br><span> lengthIndicator := ?,</span><br><span> name := name</span><br><span>@@ -397,7 +397,7 @@</span><br><span> </span><br><span> /* 8.6 */</span><br><span> template (value) PDU_SGsAP ts_SGsAP_EPS_DETACH_IND(hexstring imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) charstring mme_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) octetstring mme_name,</span><br><span> template (value) IMSI_detachFromEPS_serviceType det_serv_typ) := {</span><br><span> sGsAP_EPS_DETACH_INDICATION:= {</span><br><span> messageType := '00010001'B,</span><br><span>@@ -407,7 +407,7 @@</span><br><span> }</span><br><span> }</span><br><span> template PDU_SGsAP tr_SGsAP_EPS_DETACH_IND(template hexstring imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- template charstring mme_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ template octetstring mme_name,</span><br><span> template IMSI_detachFromEPS_serviceType det_serv_typ) := {</span><br><span> sGsAP_EPS_DETACH_INDICATION:= {</span><br><span> messageType := '00010001'B,</span><br><span>@@ -433,7 +433,7 @@</span><br><span> </span><br><span> /* 8.8 */</span><br><span> template (value) PDU_SGsAP ts_SGsAP_IMSI_DETACH_IND(hexstring imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) charstring mme_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) octetstring mme_name,</span><br><span> template (value) IMSI_detachFromNonEPS_serviceType det_serv_typ) := {</span><br><span> sGsAP_IMSI_DETACH_INDICATION := {</span><br><span> messageType := '00010011'B,</span><br><span>@@ -443,7 +443,7 @@</span><br><span> }</span><br><span> }</span><br><span> template PDU_SGsAP tr_SGsAP_IMSI_DETACH_IND(template hexstring imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- template charstring mme_name := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template octetstring mme_name := ?,</span><br><span> template IMSI_detachFromNonEPS_serviceType det_serv_typ := ?) := {</span><br><span> sGsAP_IMSI_DETACH_INDICATION := {</span><br><span> messageType := '00010011'B,</span><br><span>@@ -498,7 +498,7 @@</span><br><span> </span><br><span> /* 8.11 */</span><br><span> template (value) PDU_SGsAP ts_SGsAP_LU_REQ(hexstring imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) charstring mme_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) octetstring mme_name,</span><br><span> template (value) EPS_location_update_type eps_lu_type,</span><br><span> template (value) LocationAreaIdValue new_lai) := {</span><br><span> sGsAP_LOCATION_UPDATE_REQUEST := {</span><br><span>@@ -517,7 +517,7 @@</span><br><span> }</span><br><span> }</span><br><span> template PDU_SGsAP tr_SGsAP_LU_REQ(template hexstring imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- template charstring mme_name := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template octetstring mme_name := ?,</span><br><span> template EPS_location_update_type eps_lu_type := ?,</span><br><span> template LocationAreaIdValue new_lai := ?) := {</span><br><span> sGsAP_LOCATION_UPDATE_REQUEST := {</span><br><span>@@ -574,7 +574,7 @@</span><br><span> </span><br><span> /* 8.14 */</span><br><span> template (value) PDU_SGsAP ts_SGsAP_PAGING_REQ(hexstring imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) charstring vlr_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) octetstring vlr_name,</span><br><span> template (value) Service_Indicator serv_ind,</span><br><span> template (omit) OCT4 tmsi) :=</span><br><span> {</span><br><span>@@ -596,7 +596,7 @@</span><br><span> }</span><br><span> }</span><br><span> template PDU_SGsAP tr_SGsAP_PAGING_REQ(template hexstring imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- template charstring vlr_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ template octetstring vlr_name,</span><br><span> template Service_Indicator serv_ind,</span><br><span> template OCT4 tmsi) :=</span><br><span> {</span><br><span>@@ -619,21 +619,21 @@</span><br><span> }</span><br><span> </span><br><span> /* 8.15 */</span><br><span style="color: hsl(0, 100%, 40%);">-template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_MME(template (value) charstring mme_name) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_MME(template (value) octetstring mme_name) := {</span><br><span> sGsAP_RESET_ACK := {</span><br><span> messageType := '00010110'B,</span><br><span> mME_Name := ts_SGsAP_IE_MmeName(mme_name),</span><br><span> vLR_Name := omit</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_VLR(template (value) charstring vlr_name) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_VLR(template (value) octetstring vlr_name) := {</span><br><span> sGsAP_RESET_ACK := {</span><br><span> messageType := '00010110'B,</span><br><span> mME_Name := omit,</span><br><span> vLR_Name := ts_SGsAP_IE_VlrName(vlr_name)</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-template PDU_SGsAP tr_SGsAP_RESET_ACK(template charstring mme_name, template charstring vlr_name) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template PDU_SGsAP tr_SGsAP_RESET_ACK(template octetstring mme_name, template octetstring vlr_name) := {</span><br><span> sGsAP_RESET_ACK := {</span><br><span> messageType := '00010110'B,</span><br><span> mME_Name := tr_SGsAP_IE_MmeName(mme_name),</span><br><span>@@ -642,21 +642,21 @@</span><br><span> }</span><br><span> </span><br><span> /* 8.16 */</span><br><span style="color: hsl(0, 100%, 40%);">-template (value) PDU_SGsAP ts_SGsAP_RESET_IND_MME(template (value) charstring mme_name) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) PDU_SGsAP ts_SGsAP_RESET_IND_MME(template (value) octetstring mme_name) := {</span><br><span> sGsAP_RESET_INDICATION := {</span><br><span> messageType := '00010101'B,</span><br><span> mME_Name := ts_SGsAP_IE_MmeName(mme_name),</span><br><span> vLR_Name := omit</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-template (value) PDU_SGsAP ts_SGsAP_RESET_IND_VLR(template (value) charstring vlr_name) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) PDU_SGsAP ts_SGsAP_RESET_IND_VLR(template (value) octetstring vlr_name) := {</span><br><span> sGsAP_RESET_INDICATION := {</span><br><span> messageType := '00010101'B,</span><br><span> mME_Name := omit,</span><br><span> vLR_Name := ts_SGsAP_IE_VlrName(vlr_name)</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-template PDU_SGsAP tr_SGsAP_RESET_IND(template charstring mme_name, template charstring vlr_name) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template PDU_SGsAP tr_SGsAP_RESET_IND(template octetstring mme_name, template octetstring vlr_name) := {</span><br><span> sGsAP_RESET_INDICATION := {</span><br><span> messageType := '00010101'B,</span><br><span> mME_Name := tr_SGsAP_IE_MmeName(mme_name),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11486">change 11486</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/11486"/><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: I31a8ea04ef508beba9014aac5479693c47b7b956 </div>
<div style="display:none"> Gerrit-Change-Number: 11486 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>