<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12819">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: replace octet string with decmatch when matching RR RELEASE<br><br>The 'decmatch' keyword allows us to match the decoded version of some<br>octetstring, which is very useful in the situations where we have<br>the L3 message only as octetstring but want to check if it matches<br>some L3 template.<br><br>Change-Id: I0a91e067f7e8062bf991fef8b0d4d8da740bfafc<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/BSC_Tests_LCLS.ttcn<br>M library/L3_Templates.ttcn<br>3 files changed, 34 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index 5ac8191..555aac8 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -62,7 +62,6 @@</span><br><span> const integer NUM_TCHH_PER_BTS := 2;</span><br><span> const integer NUM_TCHF_PER_BTS := 4;</span><br><span> const integer NUM_SDCCH_PER_BTS := 4;</span><br><span style="color: hsl(0, 100%, 40%);">-template octetstring t_l3_rr_chan_rel := '060D??*'O;</span><br><span> </span><br><span> </span><br><span> /* per-BTS state which we keep */</span><br><span>@@ -872,7 +871,7 @@</span><br><span> got_deact_sacch := true;</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(rsl_chan_nr, ?, t_l3_rr_chan_rel))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) {</span><br><span> got_rr_chan_rel := true;</span><br><span> repeat;</span><br><span> }</span><br><span>@@ -2816,7 +2815,7 @@</span><br><span> [] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {</span><br><span> log("Got Deact SACCH");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, t_l3_rr_chan_rel)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_RR_RELEASE)) {</span><br><span> log("Got RR Release");</span><br><span> }</span><br><span> [] RSL.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) {</span><br><span>diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn</span><br><span>index 0fada93..67ccecf 100644</span><br><span>--- a/bsc/BSC_Tests_LCLS.ttcn</span><br><span>+++ b/bsc/BSC_Tests_LCLS.ttcn</span><br><span>@@ -702,7 +702,7 @@</span><br><span> var myBSSMAP_Cause cause_val := GSM0808_CAUSE_CALL_CONTROL;</span><br><span> CONN_A.send(ts_BSSMAP_ClearCommand(enum2int(cause_val)));</span><br><span> interleave {</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_RSL_DATA_REQ(?, tr_RslLinkID_DCCH(0), t_l3_rr_chan_rel));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CONN_A.receive(tr_RSL_DATA_REQ(?, tr_RslLinkID_DCCH(0), decmatch tr_RRM_RR_RELEASE));</span><br><span> [] CONN_A.receive(tr_RSL_DEACT_SACCH(?));</span><br><span> [] CONN_A.receive(tr_RSL_RF_CHAN_REL(?)) -> value rsl {</span><br><span> var RSL_IE_Body ieb;</span><br><span>diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn</span><br><span>index 3978498..0b714d3 100644</span><br><span>--- a/library/L3_Templates.ttcn</span><br><span>+++ b/library/L3_Templates.ttcn</span><br><span>@@ -660,6 +660,37 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template PDU_ML3_NW_MS tr_RRM_RR_RELEASE(template OCT1 cause := ?) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ discriminator := '0110'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%);">+ rrm := {</span><br><span style="color: hsl(120, 100%, 40%);">+ channelRelease := {</span><br><span style="color: hsl(120, 100%, 40%);">+ messageType := '00001101'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ rRCause := {</span><br><span style="color: hsl(120, 100%, 40%);">+ valuePart := cause</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ bARange := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ groupChannelDescription := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ groupCipherKeyNumber := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ gPRSResumption := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ bAListPref := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ uTRANFrequencyList := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ cellChannelDescr := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ cellSelectionIndicator := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ enhanced_DTM_CS_Release_Indication := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ vGCS_Ciphering_Parameters := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ group_Channel_Description_2 := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ talkerIdentity := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ talkerPriorityStatus := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ vGCS_AMR_Configuration := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ individual_Priorities := *</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> template PDU_ML3_MS_NW ts_ML3_MO := {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12819">change 12819</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/12819"/><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: I0a91e067f7e8062bf991fef8b0d4d8da740bfafc </div>
<div style="display:none"> Gerrit-Change-Number: 12819 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>