<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14342">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;">bts: Add TC_segm_concat to test segmentation+concatenation<br><br>Change-Id: I6a9ce3e27f4a01412186b3b5d8d2b86573b6f8ac<br>---<br>M bts/BTS_Tests_LAPDm.ttcn<br>M library/LAPDm_Types.ttcn<br>2 files changed, 129 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn</span><br><span>index 2eade0a..2738477 100644</span><br><span>--- a/bts/BTS_Tests_LAPDm.ttcn</span><br><span>+++ b/bts/BTS_Tests_LAPDm.ttcn</span><br><span>@@ -694,6 +694,129 @@</span><br><span> f_testmatrix_each_chan(pars, refers(f_TC_iframe_timer_recovery));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+type record LapdmDlConfig {</span><br><span style="color: hsl(120, 100%, 40%);">+ integer n201,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer t200</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%);">+type record LapdmDlState {</span><br><span style="color: hsl(120, 100%, 40%);">+ integer v_s,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer v_a,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer v_r</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%);">+template (value) LapdmDlState t_init_LapdmDlState := {</span><br><span style="color: hsl(120, 100%, 40%);">+ v_s := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ v_a := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ v_r := 0</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%);">+private function inc_mod8(inout integer v)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ v := (v + 1) mod 8;</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%);">+private function f_lapdm_transceive_mo(inout LapdmDlState dls, RslLinkId link_id, octetstring l3)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var LAPDm_ph_data pd;</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer offset := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer n201 := 20;</span><br><span style="color: hsl(120, 100%, 40%);">+ var boolean is_sacch := false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (link_id.c == SACCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ n201 := 18;</span><br><span style="color: hsl(120, 100%, 40%);">+ is_sacch := true;</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%);">+ while (offset < lengthof(l3)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer remain_len := lengthof(l3) - offset;</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer seg_len := remain_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (remain_len > n201) {</span><br><span style="color: hsl(120, 100%, 40%);">+ seg_len := n201;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring segment := substr(l3, offset, seg_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ var boolean more;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (offset + lengthof(segment) < lengthof(l3)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ more := true;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ more := false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* send the next segment */</span><br><span style="color: hsl(120, 100%, 40%);">+ LAPDM.send(t_PH_DATA(0, is_sacch,</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_LAPDm_I(link_id.sapi, c_r:=cr_MO_CMD, p:=false,</span><br><span style="color: hsl(120, 100%, 40%);">+ nr:=dls.v_a, ns:=dls.v_s, l3:=segment, m:=more)));</span><br><span style="color: hsl(120, 100%, 40%);">+ inc_mod8(dls.v_s);</span><br><span style="color: hsl(120, 100%, 40%);">+ offset := offset + lengthof(segment);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* wait for it to be acknowledged */</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] LAPDM.receive(t_PH_DATA(0, is_sacch, tr_LAPDm_RR(link_id.sapi, c_r:=cr_MT_RSP,</span><br><span style="color: hsl(120, 100%, 40%);">+ p:=false, nr:=(dls.v_s) mod 8)));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_ignore_background();</span><br><span style="color: hsl(120, 100%, 40%);">+ [] LAPDM.receive(t_PH_DATA(0, is_sacch, ?)) -> value pd {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "received unexpected LAPDm ", pd);</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] LAPDM.receive(t_PH_DATA(0, ?, ?)) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [offset < lengthof(l3)] RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, ?)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "received RSL DATA IND before message complete");</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 style="color: hsl(120, 100%, 40%);">+ timer T := 1.0;</span><br><span style="color: hsl(120, 100%, 40%);">+ T.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, ?)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Received RSL DATA IND with wrong payload");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout waiting for RSL DATA IND of de-segmented message");</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 style="color: hsl(120, 100%, 40%);">+/* Section 5.8.5 of TS 04.06 */</span><br><span style="color: hsl(120, 100%, 40%);">+const integer c_TS0406_MAX_L3_OCTETS := 251;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_TC_segm_concat(charstring id) runs on ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ const integer sapi := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ var RslLinkId link_id := valueof(ts_RslLinkID_DCCH(sapi));</span><br><span style="color: hsl(120, 100%, 40%);">+ var default d;</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := 3.0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fp_common_init();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* some common altstep for meas res and other background noise */</span><br><span style="color: hsl(120, 100%, 40%);">+ d := activate(as_ignore_background());</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL.clear;</span><br><span style="color: hsl(120, 100%, 40%);">+ LAPDM.clear;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring l3_mo := f_rnd_octstring(5);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 1) The BTS is brought into the multiple frame established state */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* MO Establish Request via LADPm: SAPI = 0, C = 0, P = 1, M = 0, 0 ≤ L ≤ N201.. */</span><br><span style="color: hsl(120, 100%, 40%);">+ LAPDM.send(t_PH_DATA(0, false, ts_LAPDm_SABM(sapi, c_r:=cr_MO_CMD, p:=true, l3:=l3_mo)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3_mo));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* UA: SAPI = 0, R = 0, F = 1, M = 0, L = L of SABM. */</span><br><span style="color: hsl(120, 100%, 40%);">+ LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_UA(sapi, cr_MT_RSP, f:=true, l3:=l3_mo)));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ l3_mo := f_rnd_octstring(c_TS0406_MAX_L3_OCTETS);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ deactivate(d);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var LapdmDlState dls := valueof(t_init_LapdmDlState);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_lapdm_transceive_mo(dls, link_id, l3_mo);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fp_common_fini();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_segm_concat() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_testmatrix_each_chan(pars, refers(f_TC_segm_concat));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> </span><br><span> control {</span><br><span>@@ -710,6 +833,7 @@</span><br><span> execute(TC_establish_ign_first_sabm());</span><br><span> execute(TC_iframe_seq_and_ack());</span><br><span> execute(TC_iframe_timer_recovery());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_segm_concat());</span><br><span> }</span><br><span> </span><br><span> }</span><br><span>diff --git a/library/LAPDm_Types.ttcn b/library/LAPDm_Types.ttcn</span><br><span>index 577c9bd..caccc12 100644</span><br><span>--- a/library/LAPDm_Types.ttcn</span><br><span>+++ b/library/LAPDm_Types.ttcn</span><br><span>@@ -352,23 +352,24 @@</span><br><span> </span><br><span> template LapdmFrame tr_LAPDm_I(template LapdmSapi sapi, template boolean c_r,</span><br><span> template boolean p, template uint3_t nr,</span><br><span style="color: hsl(0, 100%, 40%);">- template uint3_t ns, template octetstring l3) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template uint3_t ns, template octetstring l3,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean m := false) := {</span><br><span> ab := {</span><br><span> addr := tr_LapdmAddr(sapi, c_r),</span><br><span> ctrl := tr_LapdmCtrlI(nr, ns, p),</span><br><span> len := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- m := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ m := m,</span><br><span> el := 1,</span><br><span> payload := l3</span><br><span> }</span><br><span> }</span><br><span> template (value) LapdmFrame ts_LAPDm_I(LapdmSapi sapi, boolean c_r, boolean p, uint3_t nr,</span><br><span style="color: hsl(0, 100%, 40%);">- uint3_t ns, octetstring l3) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint3_t ns, octetstring l3, boolean m := false) := {</span><br><span> ab := {</span><br><span> addr := ts_LapdmAddr(sapi, c_r),</span><br><span> ctrl := ts_LapdmCtrlI(nr, ns, p),</span><br><span> len := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- m := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ m := m,</span><br><span> el := 1,</span><br><span> payload := l3</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14342">change 14342</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/+/14342"/><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: I6a9ce3e27f4a01412186b3b5d8d2b86573b6f8ac </div>
<div style="display:none"> Gerrit-Change-Number: 14342 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>