<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21123">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;">RLCMAC_EncDEc: Fix decode of DlEgprsDataBlock without LI<br><br>Change-Id: Iec7e1a2d876abfdc911a65113cc6c9e888257c61<br>---<br>M library/RLCMAC_EncDec.cc<br>1 file changed, 19 insertions(+), 7 deletions(-)<br><br></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 ea93de4..16291de 100644</span><br><span>--- a/library/RLCMAC_EncDec.cc</span><br><span>+++ b/library/RLCMAC_EncDec.cc</span><br><span>@@ -619,13 +619,25 @@</span><br><span>    }</span><br><span> </span><br><span>        /* RLC blocks at end */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret_val.blocks().is_bound()) {</span><br><span style="color: hsl(0, 100%, 40%);">-              for (int i = 0; i < ret_val.blocks().size_of(); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-                       unsigned int length = ret_val.blocks()[i].hdr()().length__ind();</span><br><span style="color: hsl(0, 100%, 40%);">-                        if (length > aligned_buffer.get_read_len())</span><br><span style="color: hsl(0, 100%, 40%);">-                          length = aligned_buffer.get_read_len();</span><br><span style="color: hsl(0, 100%, 40%);">-                 ret_val.blocks()[i].payload() = OCTETSTRING(length, aligned_buffer.get_read_data());</span><br><span style="color: hsl(0, 100%, 40%);">-                    aligned_buffer.increase_pos(length);</span><br><span style="color: hsl(120, 100%, 40%);">+  if (ret_val.e() == true) {</span><br><span style="color: hsl(120, 100%, 40%);">+            EgprsLlcBlock lb;</span><br><span style="color: hsl(120, 100%, 40%);">+             unsigned int length = aligned_buffer.get_read_len();</span><br><span style="color: hsl(120, 100%, 40%);">+          /* LI not present: The Upper Layer PDU that starts with the current RLC data block either</span><br><span style="color: hsl(120, 100%, 40%);">+              * fills the current RLC data block precisely or continues in the following in-sequence RLC</span><br><span style="color: hsl(120, 100%, 40%);">+            * data block */</span><br><span style="color: hsl(120, 100%, 40%);">+              lb.payload() = OCTETSTRING(length, ttcn_buffer.get_read_data());</span><br><span style="color: hsl(120, 100%, 40%);">+              aligned_buffer.increase_pos(length);</span><br><span style="color: hsl(120, 100%, 40%);">+          ret_val.blocks()[0] = lb;</span><br><span style="color: hsl(120, 100%, 40%);">+     } else {</span><br><span style="color: hsl(120, 100%, 40%);">+              /* RLC blocks at end */</span><br><span style="color: hsl(120, 100%, 40%);">+               if (ret_val.blocks().is_bound()) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    for (int i = 0; i < ret_val.blocks().size_of(); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+                             unsigned int length = ret_val.blocks()[i].hdr()().length__ind();</span><br><span style="color: hsl(120, 100%, 40%);">+                              if (length > aligned_buffer.get_read_len())</span><br><span style="color: hsl(120, 100%, 40%);">+                                        length = aligned_buffer.get_read_len();</span><br><span style="color: hsl(120, 100%, 40%);">+                               ret_val.blocks()[i].payload() = OCTETSTRING(length, aligned_buffer.get_read_data());</span><br><span style="color: hsl(120, 100%, 40%);">+                          aligned_buffer.increase_pos(length);</span><br><span style="color: hsl(120, 100%, 40%);">+                  }</span><br><span>            }</span><br><span>    }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21123">change 21123</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/+/21123"/><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: Iec7e1a2d876abfdc911a65113cc6c9e888257c61 </div>
<div style="display:none"> Gerrit-Change-Number: 21123 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>