<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22711">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RLCMAC: Fix unbound spb value in decoded egprs data blocks<br><br>That field is only present in Header Type 3 blocks.<br><br>Change-Id: Ie05576d7d7c18933dd9abcdc055cbfe1e4e54756<br>---<br>M library/RLCMAC_EncDec.cc<br>M library/RLCMAC_Types.ttcn<br>2 files changed, 6 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/22711/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc</span><br><span>index ac22def..97bd0be 100644</span><br><span>--- a/library/RLCMAC_EncDec.cc</span><br><span>+++ b/library/RLCMAC_EncDec.cc</span><br><span>@@ -545,6 +545,7 @@</span><br><span>       ret_val.bsn2__offset() = egprs1->bsn2_lo << 7 | egprs1->bsn2_hi;</span><br><span>         ret_val.pr() = egprs1->pr;</span><br><span>        ret_val.cps() = egprs1->cps;</span><br><span style="color: hsl(120, 100%, 40%);">+       ret_val.spb() = OMIT_VALUE;</span><br><span> </span><br><span>      ttcn_buffer.increase_pos(sizeof(*egprs1));</span><br><span>   return ret_val;</span><br><span>@@ -571,6 +572,7 @@</span><br><span>        ret_val.bsn2__offset() = 0; /*TODO: mark optional and not set ? */</span><br><span>   ret_val.pr() = egprs2->pr;</span><br><span>        ret_val.cps() = egprs2->cps;</span><br><span style="color: hsl(120, 100%, 40%);">+       ret_val.spb() = OMIT_VALUE;</span><br><span> </span><br><span>      ttcn_buffer.increase_pos(sizeof(*egprs2));</span><br><span>   return ret_val;</span><br><span>diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn</span><br><span>index 3110a66..fe47231 100644</span><br><span>--- a/library/RLCMAC_Types.ttcn</span><br><span>+++ b/library/RLCMAC_Types.ttcn</span><br><span>@@ -238,9 +238,9 @@</span><br><span>               uint11_t        bsn1,</span><br><span>                uint8_t         bsn2_offset,</span><br><span>                 uint2_t         pr, /* power reduction */</span><br><span style="color: hsl(0, 100%, 40%);">-               uint2_t         spb,</span><br><span style="color: hsl(120, 100%, 40%);">+          uint2_t         spb optional,</span><br><span>                uint4_t         cps</span><br><span style="color: hsl(0, 100%, 40%);">-     } with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+      } with { variant (spb) "PRESENCE(header_type=RLCMAC_HDR_TYPE_3)" };</span><br><span>        /* Manual C++ Decoder: */</span><br><span>    type record RlcmacDlEgprsDataBlock {</span><br><span>                 CodingScheme            mcs, /* Provided by C++ Decoder */</span><br><span>@@ -295,9 +295,10 @@</span><br><span>            uint4_t         cps,</span><br><span>                 boolean         pfi_ind,</span><br><span>             BIT1            rsb,</span><br><span style="color: hsl(0, 100%, 40%);">-            BIT2            spb</span><br><span style="color: hsl(120, 100%, 40%);">+           BIT2            spb optional</span><br><span>         } with {</span><br><span>             variant (pfi_ind) "FIELDLENGTH(1)"</span><br><span style="color: hsl(120, 100%, 40%);">+          variant (spb) "PRESENCE(header_type=RLCMAC_HDR_TYPE_3)"</span><br><span>    };</span><br><span>   /* Manual C++ Decoder:  10.3a.2.1 EGPRS Uplink RLC data block */</span><br><span>     type record RlcmacUlEgprsDataBlock {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22711">change 22711</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/+/22711"/><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: Ie05576d7d7c18933dd9abcdc055cbfe1e4e54756 </div>
<div style="display:none"> Gerrit-Change-Number: 22711 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>