hnodeb: Updates in HNBLLIF and HNBGW_COnnectioNHandler to support and test IuUP

Depends: osmo-hnodeb.git Change-Id Ibe356fa7b1abaca0091e368db8478e79c09c6cb0
Related: SYS#5516
Change-Id: I19612fce8190dfe14f98d346adb5db4e1c2a08d9
diff --git a/library/HNBLLIF_Types.ttcn b/library/HNBLLIF_Types.ttcn
index a3a6c4c..fa44f11 100644
--- a/library/HNBLLIF_Types.ttcn
+++ b/library/HNBLLIF_Types.ttcn
@@ -241,14 +241,28 @@
 	HNBLL_IF_AUDIO_MSG_CONN_DATA		('0002'O)
 } with { variant "FIELDLENGTH(16)" };
 
+const integer HNBLLIF_MAX_RFCIS := 64;
+const integer HNBLLIF_MAX_SUBFLOWS := 7;
+type record length(HNBLLIF_MAX_RFCIS) of uint8_t HNBLLIF_AUDIO_IPTIs;
+type record length(HNBLLIF_MAX_SUBFLOWS) of uint16_t HNBLLIF_AUDIO_RFCI_SubflowSizes;
+type record length(HNBLLIF_MAX_RFCIS) of HNBLLIF_AUDIO_RFCI_SubflowSizes HNBLLIF_AUDIO_SubflowSizes;
+
 /* CONN_ESTABLISH */
 type record HNBLLIF_AUDIO_conn_establish_req {
 	uint32_t context_id,
 	uint16_t remote_rtp_port,
 	uint8_t reserved,
 	HNBLLIF_AddrType remote_rtp_address_type,
-	HNBLLIF_Addr remote_addr
-} with { variant "" };
+	HNBLLIF_Addr remote_addr,
+	uint8_t transparent, /* 1=transparent; 0=SMpSDU */
+	uint8_t data_pdu_type,
+	uint16_t supported_versions_mask, /* host byte order */
+	uint8_t num_rfci,
+	uint8_t num_subflows,
+	HNBLLIF_AUDIO_SubflowSizes subflow_sizes,
+	uint8_t IPTIs_present, /* 1=present; 0=not present */
+	HNBLLIF_AUDIO_IPTIs IPTIs /* values range 0-15, 4 bits */
+} with { variant ""  };
 
 type record HNBLLIF_AUDIO_conn_establish_cnf {
 	uint32_t context_id,
@@ -292,12 +306,20 @@
 /* CONN_DATA */
 type record HNBLLIF_AUDIO_conn_data_ind {
 	uint32_t audio_conn_id,
+	uint8_t frame_nr,
+	uint8_t fqc, /* enumerated IuUP_FQC */
+	uint8_t rfci,
+	uint8_t spare,
 	uint32_t data_len,
 	octetstring data /* RANAP message */
 } with { variant (data_len) "LENGTHTO (data)" };
 
 type record HNBLLIF_AUDIO_conn_data_req {
 	uint32_t audio_conn_id,
+	uint8_t frame_nr,
+	uint8_t fqc,  /* enumerated IuUP_FQC */
+	uint8_t rfci,
+	uint8_t spare,
 	uint32_t data_len,
 	octetstring data /* RANAP message */
 } with { variant (data_len) "LENGTHTO (data)" };