<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/16993">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails<br><br>Currently code using that function in osmo-pcu is disabled, allegadly<br>because SGSN was sending incorrect values, but it looks more like a CSN1<br>issue.<br><br>Related: OS#1525, OS#3499<br>Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb<br>---<br>M src/gsm_rlcmac.cpp<br>M src/gsm_rlcmac.h<br>M tests/rlcmac/RLCMACTest.cpp<br>M tests/rlcmac/RLCMACTest.ok<br>4 files changed, 49 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp</span><br><span>index ef7abcd..339279c 100644</span><br><span>--- a/src/gsm_rlcmac.cpp</span><br><span>+++ b/src/gsm_rlcmac.cpp</span><br><span>@@ -5510,10 +5510,10 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t *data)</span><br><span style="color: hsl(120, 100%, 40%);">+int decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t *data)</span><br><span> {</span><br><span> csnStream_t ar;</span><br><span> unsigned readIndex = 0;</span><br><span> csnStreamInit(&ar, 0, 8 * vector->data_len);</span><br><span style="color: hsl(0, 100%, 40%);">- /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, readIndex, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ return csnStreamDecoder(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, readIndex, data);</span><br><span> }</span><br><span>diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h</span><br><span>index a4750e8..0ac1207 100644</span><br><span>--- a/src/gsm_rlcmac.h</span><br><span>+++ b/src/gsm_rlcmac.h</span><br><span>@@ -5137,5 +5137,5 @@</span><br><span> void encode_gsm_rlcmac_uplink(bitvec * vector, RlcMacUplink_t * data);</span><br><span> void decode_gsm_rlcmac_uplink_data(bitvec * vector, RlcMacUplinkDataBlock_t * data);</span><br><span> void encode_gsm_rlcmac_downlink_data(bitvec * vector, RlcMacDownlinkDataBlock_t * data);</span><br><span style="color: hsl(0, 100%, 40%);">- void decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t * data);</span><br><span style="color: hsl(120, 100%, 40%);">+ int decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t * data);</span><br><span> #endif /* __PACKET_GSM_RLCMAC_H__ */</span><br><span>diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp</span><br><span>index e48a27c..b51d735 100644</span><br><span>--- a/tests/rlcmac/RLCMACTest.cpp</span><br><span>+++ b/tests/rlcmac/RLCMACTest.cpp</span><br><span>@@ -23,9 +23,11 @@</span><br><span> #include <iostream></span><br><span> #include <cstdlib></span><br><span> #include <cstring></span><br><span style="color: hsl(120, 100%, 40%);">+#include <assert.h></span><br><span> #include "csn1.h"</span><br><span> #include "gsm_rlcmac.h"</span><br><span> #include "gprs_rlcmac.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "decoding.h"</span><br><span> </span><br><span> extern "C" {</span><br><span> extern const struct log_info gprs_log_info;</span><br><span>@@ -38,6 +40,8 @@</span><br><span> }</span><br><span> using namespace std;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void *tall_pcu_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void printSizeofRLCMAC()</span><br><span> {</span><br><span> printf("*** %s ***\n", __func__);</span><br><span>@@ -203,6 +207,45 @@</span><br><span> msgb_free(m);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void testRAcap(void *test_ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("*** %s ***\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ MS_Radio_Access_capability_t data;</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&data, 0, sizeof(data));</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec *vector = bitvec_alloc(23, test_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ MS RA capability 1</span><br><span style="color: hsl(120, 100%, 40%);">+ 0001 .... = Access Technology Type: GSM E --note that GSM E covers GSM P (1)</span><br><span style="color: hsl(120, 100%, 40%);">+ .... 0010 101. .... = Length in bits: 0x15 (21)</span><br><span style="color: hsl(120, 100%, 40%);">+ ...0 01.. RF Power Capability, GMSK Power Class: Not specified (1)</span><br><span style="color: hsl(120, 100%, 40%);">+ A5 Bits: Same values apply for parameters as in the immediately preceding Access capabilities field within this IE (0)</span><br><span style="color: hsl(120, 100%, 40%);">+ .... ...1 = Controlled early Classmark Sending: Implemented</span><br><span style="color: hsl(120, 100%, 40%);">+ 0... .... = Pseudo Synchronisation: Not Present</span><br><span style="color: hsl(120, 100%, 40%);">+ .0.. .... = Voice Group Call Service: no VGCS capability or no notifications wanted</span><br><span style="color: hsl(120, 100%, 40%);">+ ..0. .... = Voice Broadcast Service: no VBS capability or no notifications wanted</span><br><span style="color: hsl(120, 100%, 40%);">+ ...1 .... = Multislot capability struct: Present</span><br><span style="color: hsl(120, 100%, 40%);">+ .... ..00 011. .... = GPRS multislot class: Max Rx-Slot/TDMA:2 Max Tx-Slot/TDMA:2 Max-Sum-Slot/TDMA:3 Tta:3 Ttb:2 Tra:3 Trb:1 Type:1 (3)</span><br><span style="color: hsl(120, 100%, 40%);">+ ...0 .... = GPRS Extended Dynamic Allocation Capability: Not Implemented</span><br><span style="color: hsl(120, 100%, 40%);">+*/</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(vector, "12a5146200");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = decode_gsm_ra_cap(vector, &data);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("decode_gsm_ra_cap fails? %s\n", rc !=0 ? "yes" : "no");</span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: OS#1525, OS#3499: csn1 fails to parse this MS RA Cap IE value */</span><br><span style="color: hsl(120, 100%, 40%);">+ assert (rc == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure there's 1 value (currently fails due to failed decoding) */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_assert(cap->Count_MS_RA_capability_value == 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure MS multislot class is parsed correctly (currently fails due</span><br><span style="color: hsl(120, 100%, 40%);">+ to failed decoding and count being 0) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ms_class = Decoding::get_ms_class_by_capability(&data);</span><br><span style="color: hsl(120, 100%, 40%);">+ assert(ms_class == 3);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int main(int argc, char *argv[])</span><br><span> {</span><br><span> void *ctx = talloc_named_const(NULL, 1, "RLCMACTest");</span><br><span>@@ -213,5 +256,6 @@</span><br><span> testRlcMacDownlink(ctx);</span><br><span> testRlcMacUplink(ctx);</span><br><span> testCsnLeftAlignedVarBmpBounds(ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ testRAcap(ctx);</span><br><span> talloc_free(ctx);</span><br><span> }</span><br><span>diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok</span><br><span>index 2af4d90..5793d57 100644</span><br><span>--- a/tests/rlcmac/RLCMACTest.ok</span><br><span>+++ b/tests/rlcmac/RLCMACTest.ok</span><br><span>@@ -123,3 +123,5 @@</span><br><span> vector2 = 40 0a 90 20 00 00 00 00 00 00 00 30 10 01 2a 08 00 13 2b 2b 2b 2b 2b </span><br><span> vector1 == vector2 : TRUE</span><br><span> *** testCsnLeftAlignedVarBmpBounds ***</span><br><span style="color: hsl(120, 100%, 40%);">+*** testRAcap ***</span><br><span style="color: hsl(120, 100%, 40%);">+decode_gsm_ra_cap fails? yes</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/16993">change 16993</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-pcu/+/16993"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb </div>
<div style="display:none"> Gerrit-Change-Number: 16993 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>