[MERGED] osmo-ttcn3-hacks[master]: L1CTL: Correctly parse L1CTL messages with zero-length payload

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: L1CTL: Correctly parse L1CTL messages with zero-length payload
......................................................................


L1CTL: Correctly parse L1CTL messages with zero-length payload

Some messages can happen with zero-length payload section,
e.g. a DL_DATA_IND with CRC errors.

Change-Id: Ice1d872c12fb33bc4e2d285870fdb877f6efe355
---
M library/L1CTL_Types.ttcn
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn
index 7403099..4c0e14d 100644
--- a/library/L1CTL_Types.ttcn
+++ b/library/L1CTL_Types.ttcn
@@ -170,7 +170,7 @@
 	type record L1ctlDlMessage {
 		L1ctlHeader	header,
 		L1ctlDlInfo	dl_info optional,
-		L1ctlDlPayload	payload
+		L1ctlDlPayload	payload optional
 	} with { variant (dl_info) "PRESENCE(header.msg_type = L1CTL_FBSB_CONF,
 					     header.msg_type = L1CTL_RACH_CONF,
 					     header.msg_type = L1CTL_DATA_IND,
@@ -442,7 +442,7 @@
 	template L1ctlDlMessage tr_L1CTL_MsgType(template L1ctlMsgType msg_type) := {
 		header := tr_L1ctlHeader(msg_type),
 		dl_info := *,
-		payload := ?
+		payload := *
 	}
 
 	template L1ctlDlMessage tr_L1CTL_CCCH_MODE_CONF := tr_L1CTL_MsgType(L1CTL_CCCH_MODE_CONF);
@@ -604,7 +604,7 @@
 	template L1ctlDlMessage tr_L1CTL_RACH_CONF := {
 		header := tr_L1ctlHeader(L1CTL_RACH_CONF),
 		dl_info := ?,
-		payload := ?
+		payload := *
 	};
 
 	/* for matching against incoming DATA_IND */

-- 
To view, visit https://gerrit.osmocom.org/7806
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice1d872c12fb33bc4e2d285870fdb877f6efe355
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder