Change in osmo-ttcn3-hacks[master]: RLCMAC_EncDEc.cc: dec_RlcmacUl(Egprs)DataBlock: fix tlli and pfi unin...

[laforge]

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

Change subject: RLCMAC_EncDEc.cc: dec_RlcmacUl(Egprs)DataBlock: fix tlli and pfi uninitialized instead of omit
......................................................................

RLCMAC_EncDEc.cc: dec_RlcmacUl(Egprs)DataBlock: fix tlli and pfi uninitialized instead of omit

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

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



diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc
index f4735e9..d544e69 100644
--- a/library/RLCMAC_EncDec.cc
+++ b/library/RLCMAC_EncDec.cc
@@ -606,10 +606,14 @@
 	if (ret_val.mac__hdr().tlli__ind()) {
 		ret_val.tlli() = OCTETSTRING(4, ttcn_buffer.get_read_data());
 		ttcn_buffer.increase_pos(4);
+	} else {
+		ret_val.tlli() = OMIT_VALUE;
 	}
 	/* parse optional PFI */
 	if (ret_val.mac__hdr().pfi__ind()) {
 		ret_val.pfi().decode(RlcmacUlDataBlock_pfi_descr_, ttcn_buffer, TTCN_EncDec::CT_RAW);
+	} else {
+		ret_val.pfi() = OMIT_VALUE;
 	}
 
 	/* RLC blocks at end */
@@ -734,10 +738,14 @@
 	if (ret_val.tlli__ind()) {
 		ret_val.tlli() = OCTETSTRING(4, aligned_buffer.get_read_data());
 		aligned_buffer.increase_pos(4);
+	} else {
+		ret_val.tlli() = OMIT_VALUE;
 	}
 	/* parse optional PFI */
 	if (ret_val.mac__hdr().pfi__ind()) {
 		ret_val.pfi().decode(RlcmacUlDataBlock_pfi_descr_, aligned_buffer, TTCN_EncDec::CT_RAW);
+	} else {
+		ret_val.pfi() = OMIT_VALUE;
 	}
 
 	/* RLC blocks at end */

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17986
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: Id63ae66cd715512f12eb87fd9ff0a9f5af93d5d2
Gerrit-Change-Number: 17986
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200501/401fdd6f/attachment.htm>