Change in osmo-ttcn3-hacks[master]: WIP: Implement SystemInformation13 Rest Octets types

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 )


Change subject: WIP: Implement SystemInformation13 Rest Octets types
......................................................................

WIP: Implement SystemInformation13 Rest Octets types

Change-Id: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809
---
M bsc/BSC_Tests.ttcn
M library/GSM_RestOctets.ttcn
M library/GSM_SystemInformation.ttcn
3 files changed, 41 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/22802/1

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 52b4906..e2c17e6 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -165,8 +165,7 @@
 	SI2quaterRestOctetsList si2quater optional,
 	SystemInformationType3 si3 optional,
 	SystemInformationType4 si4 optional,
-	/* TODO: replace with proper decoding of SI13, implement SI13 in GSM_SystemInformation.ttcn */
-	octetstring si13 optional,
+	SystemInformationType13 si13 optional,
 	SystemInformationType5 si5 optional,
 	SystemInformationType5bis si5bis optional,
 	SystemInformationType5ter si5ter optional,
@@ -371,7 +370,9 @@
 		s := omit
 	    }
 	},
-	si13 := '9000185A6FC9E08410AB2B2B2B2B2B2B2B2B2B2B'O,
+	si13 := {
+		rest_octets := '9000185A6FC9E08410AB2B2B2B2B2B2B2B2B2B2B'O
+	},
 	si5 := {
 	    bcch_freq_list := '10000000000000000000000000000000'O
 	},
diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn
index d47e510..ec817eb 100644
--- a/library/GSM_RestOctets.ttcn
+++ b/library/GSM_RestOctets.ttcn
@@ -692,6 +692,30 @@
 	variant "PADDING(yes), PADDING_PATTERN('00101011'B)"
 };
 
+/* 10.5.2.37b SI 13 Rest Octets (O & S) */
+type record SI13RestOctets {
+	BIT1			presence, // L/H
+
+
+	SelectionParamsOpt	sel_params,
+	PowerOffsetOpt		pwr_offset,
+	GPRSIndicatorOpt	gprs_ind,
+	BIT1			s_presence, // L/H
+	/* TODO: optional "Rest Octets S" part */
+	bitstring		s optional
+} with {
+
+	variant (presence) "CSN.1 L/H"
+
+
+	variant (s_presence) "CSN.1 L/H"
+	variant (s) "PRESENCE(s_presence = '1'B)"
+
+	/* The TITAN's RAW encoder generates an octet-aligned octetstring,
+	 * so we should make sure that unused bits contain proper padding. */
+	variant "PADDING(yes), PADDING_PATTERN('00101011'B)"
+};
+
 /* Selection Parameters */
 type record SelectionParams {
 	boolean			cbq,
@@ -777,6 +801,11 @@
 external function dec_SI4RestOctets(in octetstring stream) return SI4RestOctets
 	with { extension "prototype(convert) decode(RAW)" };
 
+external function enc_SI13RestOctets(in SI13RestOctets ro) return octetstring
+	with { extension "prototype(convert) encode(RAW)" };
+external function dec_SI13RestOctets(in octetstring stream) return SI13RestOctets
+	with { extension "prototype(convert) decode(RAW)" };
+
 
 /* Basic templates to be extended in place */
 template (value) SI3RestOctets ts_SI3RestOctets := {
diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn
index 85abb7f..86ff817 100644
--- a/library/GSM_SystemInformation.ttcn
+++ b/library/GSM_SystemInformation.ttcn
@@ -160,7 +160,7 @@
 		rach_control := ?,
 		rest_octets := ?
 	};
-		
+
 
 	/* 44.018 9.1.36 */
 	type record SystemInformationType4 {
@@ -196,6 +196,11 @@
 		RestOctets			rest_octets length(0..7)
 	} with { variant "" };
 
+	/* 44.018 9.1.43a */
+	type record SystemInformationType13 {
+		SI13RestOctets			rest_octets
+	} with { variant "" };
+
 	type union SystemInformationUnion {
 		SystemInformationType1		si1,
 		SystemInformationType2		si2,
@@ -208,6 +213,7 @@
 		SystemInformationType5bis	si5bis,
 		SystemInformationType5ter	si5ter,
 		SystemInformationType6		si6,
+		SystemInformationType13		si13,
 		octetstring			other
 	} with { variant "" };
 
@@ -225,6 +231,7 @@
 			      si5bis, header.message_type = SYSTEM_INFORMATION_TYPE_5bis;
 			      si5ter, header.message_type = SYSTEM_INFORMATION_TYPE_5ter;
 			      si6, header.message_type = SYSTEM_INFORMATION_TYPE_6;
+			      si13, header.message_type = SYSTEM_INFORMATION_TYPE_13;
 			      other, OTHERWISE;
 			)" };
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802
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: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809
Gerrit-Change-Number: 22802
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210209/960922a3/attachment.htm>