<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14455">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/GSUP_Types.ttcn: refactor PROC_SS IEs generation<br><br>Both ts_GSUP_PROC_SS_ERR() and tr_GSUP_PROC_SS_ERR() templates<br>used to compose the set of GSUP IEs manually, while similar ones<br>were using both f_gen_ts_ss_ies() and f_gen_tr_ss_ies().<br><br>This led to the following problems:<br><br> - tr_GSUP_PROC_SS_ERR was not tolerant to omitted<br> message class IE, which was recently introduced;<br> - code duplication.<br><br>Let's modify the both functions in order to accept an optional<br>Cause IE value, which is omitted by default, and use them in<br>the both templates.<br><br>Change-Id: I5cd6d2bc754bcedd1e721b3bd95ada9cdd44bcf0<br>---<br>M library/GSUP_Types.ttcn<br>1 file changed, 39 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn</span><br><span>index 8081347..e627538 100644</span><br><span>--- a/library/GSUP_Types.ttcn</span><br><span>+++ b/library/GSUP_Types.ttcn</span><br><span>@@ -1089,18 +1089,26 @@</span><br><span> hexstring imsi,</span><br><span> OCT4 sid,</span><br><span> GSUP_SessionState state,</span><br><span style="color: hsl(0, 100%, 40%);">- template (omit) octetstring ss</span><br><span style="color: hsl(120, 100%, 40%);">+ template (omit) octetstring ss := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (omit) integer cause := omit</span><br><span> ) return GSUP_IEs {</span><br><span> /* Mandatory IEs */</span><br><span> var GSUP_IEs ies := {</span><br><span style="color: hsl(0, 100%, 40%);">- valueof(ts_GSUP_IE_IMSI(imsi)),</span><br><span style="color: hsl(0, 100%, 40%);">- valueof(ts_GSUP_IE_SessionId(sid)),</span><br><span style="color: hsl(0, 100%, 40%);">- valueof(ts_GSUP_IE_SessionState(state))</span><br><span style="color: hsl(120, 100%, 40%);">+ valueof(ts_GSUP_IE_IMSI(imsi))</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Cause IE is needed for PROC_SS_ERR */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (isvalue(cause)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ies := ies & { valueof(ts_GSUP_IE_Cause(valueof(cause))) };</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%);">+ /* Mandatory session IEs */</span><br><span style="color: hsl(120, 100%, 40%);">+ ies := ies & { valueof(ts_GSUP_IE_SessionId(sid)) };</span><br><span style="color: hsl(120, 100%, 40%);">+ ies := ies & { valueof(ts_GSUP_IE_SessionState(state)) };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Optional SS payload */</span><br><span> if (isvalue(ss)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ies[3] := valueof(ts_GSUP_IE_SSInfo(valueof(ss)));</span><br><span style="color: hsl(120, 100%, 40%);">+ ies := ies & { valueof(ts_GSUP_IE_SSInfo(valueof(ss))) };</span><br><span> }</span><br><span> </span><br><span> return ies;</span><br><span>@@ -1109,29 +1117,42 @@</span><br><span> template hexstring imsi,</span><br><span> template OCT4 sid := ?,</span><br><span> template GSUP_SessionState state := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- template octetstring ss := ?</span><br><span style="color: hsl(120, 100%, 40%);">+ template octetstring ss := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ template integer cause := omit</span><br><span> ) return template GSUP_IEs {</span><br><span> /* Mandatory IEs */</span><br><span> var template GSUP_IEs ies := {</span><br><span style="color: hsl(0, 100%, 40%);">- tr_GSUP_IE_IMSI(imsi),</span><br><span style="color: hsl(0, 100%, 40%);">- tr_GSUP_IE_SessionId(sid),</span><br><span style="color: hsl(0, 100%, 40%);">- tr_GSUP_IE_SessionState(state)</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_GSUP_IE_IMSI(imsi)</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- var integer last_idx := 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer idx := 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Cause IE is needed for PROC_SS_ERR */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (istemplatekind(cause, "*")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ies[idx] := *;</span><br><span style="color: hsl(120, 100%, 40%);">+ idx := idx + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (not istemplatekind(cause, "omit")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ies[idx] := tr_GSUP_IE_Cause(cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ idx := idx + 1;</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%);">+ /* Mandatory session IEs */</span><br><span style="color: hsl(120, 100%, 40%);">+ ies[idx] := tr_GSUP_IE_SessionId(sid);</span><br><span style="color: hsl(120, 100%, 40%);">+ ies[idx + 1] := tr_GSUP_IE_SessionState(state);</span><br><span style="color: hsl(120, 100%, 40%);">+ idx := idx + 2;</span><br><span> </span><br><span> /* Optional SS payload */</span><br><span> if (istemplatekind(ss, "*")) {</span><br><span style="color: hsl(0, 100%, 40%);">- ies[3] := *;</span><br><span style="color: hsl(0, 100%, 40%);">- last_idx := last_idx + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ ies[idx] := *;</span><br><span style="color: hsl(120, 100%, 40%);">+ idx := idx + 1;</span><br><span> } else if (not istemplatekind(ss, "omit")) {</span><br><span style="color: hsl(0, 100%, 40%);">- ies[3] := tr_GSUP_IE_SSInfo(ss);</span><br><span style="color: hsl(0, 100%, 40%);">- last_idx := last_idx + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ ies[idx] := tr_GSUP_IE_SSInfo(ss);</span><br><span style="color: hsl(120, 100%, 40%);">+ idx := idx + 1;</span><br><span> }</span><br><span> </span><br><span> /* the GSUP Message Class IE is optional, as old implementations don't have it yet */</span><br><span> var template GSUP_IEs ies2 := ies;</span><br><span style="color: hsl(0, 100%, 40%);">- ies2[last_idx] := tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_USSD);</span><br><span style="color: hsl(0, 100%, 40%);">- last_idx := last_idx + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ ies2[idx] := tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_USSD);</span><br><span style="color: hsl(120, 100%, 40%);">+ idx := idx + 1;</span><br><span> </span><br><span> return (ies, ies2);</span><br><span> }</span><br><span>@@ -1181,12 +1202,7 @@</span><br><span> integer cause</span><br><span> ) := ts_GSUP(</span><br><span> OSMO_GSUP_MSGT_PROC_SS_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- valueof(ts_GSUP_IE_IMSI(imsi)),</span><br><span style="color: hsl(0, 100%, 40%);">- valueof(ts_GSUP_IE_Cause(cause)),</span><br><span style="color: hsl(0, 100%, 40%);">- valueof(ts_GSUP_IE_SessionId(sid)),</span><br><span style="color: hsl(0, 100%, 40%);">- valueof(ts_GSUP_IE_SessionState(state))</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_gen_ts_ss_ies(imsi, sid, state, cause := cause)</span><br><span> );</span><br><span> template GSUP_PDU tr_GSUP_PROC_SS_ERR(</span><br><span> template hexstring imsi,</span><br><span>@@ -1195,13 +1211,7 @@</span><br><span> template integer cause := ?</span><br><span> ) := tr_GSUP(</span><br><span> OSMO_GSUP_MSGT_PROC_SS_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- tr_GSUP_IE_IMSI(imsi),</span><br><span style="color: hsl(0, 100%, 40%);">- tr_GSUP_IE_Cause(cause),</span><br><span style="color: hsl(0, 100%, 40%);">- tr_GSUP_IE_SessionId(sid),</span><br><span style="color: hsl(0, 100%, 40%);">- tr_GSUP_IE_SessionState(state),</span><br><span style="color: hsl(0, 100%, 40%);">- tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_USSD)</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_gen_tr_ss_ies(imsi, sid, state, cause := cause)</span><br><span> );</span><br><span> </span><br><span> template (value) GSUP_PDU ts_GSUP_MO_FORWARD_SM_REQ(</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14455">change 14455</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/+/14455"/><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: I5cd6d2bc754bcedd1e721b3bd95ada9cdd44bcf0 </div>
<div style="display:none"> Gerrit-Change-Number: 14455 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>