Change in osmo-ttcn3-hacks[master]: RLCMAC: Fix decoding of dl data block with no llc block header byte

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

pespin gerrit-no-reply at lists.osmocom.org
Fri Feb 5 10:14:48 UTC 2021


pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22706 )

Change subject: RLCMAC: Fix decoding of dl data block with no llc block header byte
......................................................................

RLCMAC: Fix decoding of dl data block with no llc block header byte

The value was marked as unbound while it should be marked as omitted:

"""
dl_block := { data := { cs := CS_1 (0), mac_hdr := { mac_hdr := { payload_type := MAC_PT_RLC_DATA (0), rrbp := RRBP_Nplus13_mod_2715648 (0), rrbp_valid := false, usf := 7 }, hdr_ext := { pr := PWR_RED_0_to_3dB (0), spare := '0'B, tfi := 0, fbi := false, bsn := 0, e := true } }, blocks := { { hdr := <unbound>, payload := '0D0C8653110FFEF072972C5A790C0317299753B5'O } } } } }
"""

Change-Id: If00338729ee1b2c8a4e100495e7cfa0599a4cb8b
---
M library/RLCMAC_EncDec.cc
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc
index ac60b37..ac22def 100644
--- a/library/RLCMAC_EncDec.cc
+++ b/library/RLCMAC_EncDec.cc
@@ -505,6 +505,7 @@
 		/* LI not present: The Upper Layer PDU that starts with the current RLC data block either
 		 * fills the current RLC data block precisely or continues in the following in-sequence RLC
 		 * data block */
+		lb.hdr() = OMIT_VALUE;
 		lb.payload() = OCTETSTRING(length, ttcn_buffer.get_read_data());
 		ttcn_buffer.increase_pos(length);
 		ret_val.blocks()[0] = lb;
@@ -663,6 +664,7 @@
 		/* LI not present: The Upper Layer PDU that starts with the current RLC data block either
 		 * fills the current RLC data block precisely or continues in the following in-sequence RLC
 		 * data block */
+		lb.hdr() = OMIT_VALUE;
 		lb.payload() = OCTETSTRING(length, ttcn_buffer.get_read_data());
 		aligned_buffer.increase_pos(length);
 		ret_val.blocks()[0] = lb;
@@ -792,6 +794,7 @@
 		/* LI not present: The Upper Layer PDU that starts with the current RLC data block either
 		 * fills the current RLC data block precisely or continues in the following in-sequence RLC
 		 * data block */
+		lb.hdr() = OMIT_VALUE;
 		lb.payload() = OCTETSTRING(length, ttcn_buffer.get_read_data());
 		ttcn_buffer.increase_pos(length);
 		ret_val.blocks()[0] = lb;
@@ -945,6 +948,7 @@
 		/* LI not present: The Upper Layer PDU that starts with the current RLC data block either
 		 * fills the current RLC data block precisely or continues in the following in-sequence RLC
 		 * data block */
+		lb.hdr() = OMIT_VALUE;
 		lb.payload() = OCTETSTRING(length, aligned_buffer.get_read_data());
 		aligned_buffer.increase_pos(length);
 		ret_val.blocks()[0] = lb;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22706
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: If00338729ee1b2c8a4e100495e7cfa0599a4cb8b
Gerrit-Change-Number: 22706
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210205/a9fc179c/attachment.htm>


More information about the gerrit-log mailing list