Change in osmo-iuh[master]: rua: Use asn1c flag -fcompound-names to avoid name collisions with ot...

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
Wed Oct 27 15:22:57 UTC 2021 

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


Change subject: rua: Use asn1c flag -fcompound-names to avoid name collisions with other libs
......................................................................

rua: Use asn1c flag -fcompound-names to avoid name collisions with other libs

Change-Id: Id4e337cdc82c26922b7ca7f0fe8af523e9a0945c
---
M include/osmocom/rua/RUA_Ansi-41-IDNNS.h
M include/osmocom/rua/RUA_CN-DomainIndicator.h
M include/osmocom/rua/RUA_CSGMembershipStatus.h
M include/osmocom/rua/RUA_Cause.h
M include/osmocom/rua/RUA_CauseMisc.h
M include/osmocom/rua/RUA_CauseProtocol.h
M include/osmocom/rua/RUA_CauseRadioNetwork.h
M include/osmocom/rua/RUA_CauseTransport.h
M include/osmocom/rua/RUA_Connect.h
M include/osmocom/rua/RUA_ConnectionlessTransfer.h
M include/osmocom/rua/RUA_Context-ID.h
M include/osmocom/rua/RUA_Criticality.h
M include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
M include/osmocom/rua/RUA_CriticalityDiagnostics.h
M include/osmocom/rua/RUA_DirectTransfer.h
M include/osmocom/rua/RUA_Disconnect.h
M include/osmocom/rua/RUA_ErrorIndication.h
M include/osmocom/rua/RUA_Establishment-Cause.h
M include/osmocom/rua/RUA_Gsm-map-IDNNS.h
M include/osmocom/rua/RUA_IE-Extensions.h
M include/osmocom/rua/RUA_IE.h
M include/osmocom/rua/RUA_InitiatingMessage.h
M include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h
M include/osmocom/rua/RUA_Presence.h
M include/osmocom/rua/RUA_PrivateIE-ID.h
M include/osmocom/rua/RUA_PrivateMessage.h
M include/osmocom/rua/RUA_ProcedureCode.h
M include/osmocom/rua/RUA_ProtocolIE-ID.h
M include/osmocom/rua/RUA_RANAP-Message.h
M include/osmocom/rua/RUA_RUA-PDU.h
M include/osmocom/rua/RUA_RoutingParameter.h
M include/osmocom/rua/RUA_SuccessfulOutcome.h
M include/osmocom/rua/RUA_TriggeringMessage.h
M include/osmocom/rua/RUA_TypeOfError.h
M include/osmocom/rua/RUA_UnsuccessfulOutcome.h
M src/rua/Makefile.am
M src/rua/RUA_Ansi-41-IDNNS.c
M src/rua/RUA_CN-DomainIndicator.c
M src/rua/RUA_CSGMembershipStatus.c
M src/rua/RUA_Cause.c
M src/rua/RUA_CauseMisc.c
M src/rua/RUA_CauseProtocol.c
M src/rua/RUA_CauseRadioNetwork.c
M src/rua/RUA_CauseTransport.c
M src/rua/RUA_Connect.c
M src/rua/RUA_ConnectionlessTransfer.c
M src/rua/RUA_Context-ID.c
M src/rua/RUA_Criticality.c
M src/rua/RUA_CriticalityDiagnostics-IE-List.c
M src/rua/RUA_CriticalityDiagnostics.c
M src/rua/RUA_DirectTransfer.c
M src/rua/RUA_Disconnect.c
M src/rua/RUA_ErrorIndication.c
M src/rua/RUA_Establishment-Cause.c
M src/rua/RUA_Gsm-map-IDNNS.c
M src/rua/RUA_IE-Extensions.c
M src/rua/RUA_IE.c
M src/rua/RUA_InitiatingMessage.c
M src/rua/RUA_IntraDomainNasNodeSelector.c
M src/rua/RUA_Presence.c
M src/rua/RUA_PrivateIE-ID.c
M src/rua/RUA_PrivateMessage.c
M src/rua/RUA_ProcedureCode.c
M src/rua/RUA_ProtocolIE-ID.c
M src/rua/RUA_RANAP-Message.c
M src/rua/RUA_RUA-PDU.c
M src/rua/RUA_RoutingParameter.c
M src/rua/RUA_SuccessfulOutcome.c
M src/rua/RUA_TriggeringMessage.c
M src/rua/RUA_TypeOfError.c
M src/rua/RUA_UnsuccessfulOutcome.c
71 files changed, 187 insertions(+), 187 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/92/25992/1

diff --git a/include/osmocom/rua/RUA_Ansi-41-IDNNS.h b/include/osmocom/rua/RUA_Ansi-41-IDNNS.h
index 26e5d62..9c78efd 100644
--- a/include/osmocom/rua/RUA_Ansi-41-IDNNS.h
+++ b/include/osmocom/rua/RUA_Ansi-41-IDNNS.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Ansi_41_IDNNS_H_
diff --git a/include/osmocom/rua/RUA_CN-DomainIndicator.h b/include/osmocom/rua/RUA_CN-DomainIndicator.h
index 507558b..60eadb9 100644
--- a/include/osmocom/rua/RUA_CN-DomainIndicator.h
+++ b/include/osmocom/rua/RUA_CN-DomainIndicator.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CN_DomainIndicator_H_
diff --git a/include/osmocom/rua/RUA_CSGMembershipStatus.h b/include/osmocom/rua/RUA_CSGMembershipStatus.h
index a4889ca..cc5cbb6 100644
--- a/include/osmocom/rua/RUA_CSGMembershipStatus.h
+++ b/include/osmocom/rua/RUA_CSGMembershipStatus.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CSGMembershipStatus_H_
diff --git a/include/osmocom/rua/RUA_Cause.h b/include/osmocom/rua/RUA_Cause.h
index 8269f9f..860b7e1 100644
--- a/include/osmocom/rua/RUA_Cause.h
+++ b/include/osmocom/rua/RUA_Cause.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Cause_H_
diff --git a/include/osmocom/rua/RUA_CauseMisc.h b/include/osmocom/rua/RUA_CauseMisc.h
index 45ca8db..ffb4fe7 100644
--- a/include/osmocom/rua/RUA_CauseMisc.h
+++ b/include/osmocom/rua/RUA_CauseMisc.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * >From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CauseMisc_H_
diff --git a/include/osmocom/rua/RUA_CauseProtocol.h b/include/osmocom/rua/RUA_CauseProtocol.h
index b857ce5..661105c 100644
--- a/include/osmocom/rua/RUA_CauseProtocol.h
+++ b/include/osmocom/rua/RUA_CauseProtocol.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CauseProtocol_H_
diff --git a/include/osmocom/rua/RUA_CauseRadioNetwork.h b/include/osmocom/rua/RUA_CauseRadioNetwork.h
index 6a28791..47a6ebd 100644
--- a/include/osmocom/rua/RUA_CauseRadioNetwork.h
+++ b/include/osmocom/rua/RUA_CauseRadioNetwork.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CauseRadioNetwork_H_
diff --git a/include/osmocom/rua/RUA_CauseTransport.h b/include/osmocom/rua/RUA_CauseTransport.h
index d46e434..a18cca5 100644
--- a/include/osmocom/rua/RUA_CauseTransport.h
+++ b/include/osmocom/rua/RUA_CauseTransport.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CauseTransport_H_
diff --git a/include/osmocom/rua/RUA_Connect.h b/include/osmocom/rua/RUA_Connect.h
index 7ea12e3..b006269 100644
--- a/include/osmocom/rua/RUA_Connect.h
+++ b/include/osmocom/rua/RUA_Connect.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Connect_H_
@@ -23,7 +23,7 @@
 
 /* RUA_Connect */
 typedef struct RUA_Connect {
-	struct connect_ies {
+	struct RUA_Connect__connect_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_ConnectionlessTransfer.h b/include/osmocom/rua/RUA_ConnectionlessTransfer.h
index 65e2078..c14ee5a 100644
--- a/include/osmocom/rua/RUA_ConnectionlessTransfer.h
+++ b/include/osmocom/rua/RUA_ConnectionlessTransfer.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_ConnectionlessTransfer_H_
@@ -23,7 +23,7 @@
 
 /* RUA_ConnectionlessTransfer */
 typedef struct RUA_ConnectionlessTransfer {
-	struct connectionlessTransfer_ies {
+	struct RUA_ConnectionlessTransfer__connectionlessTransfer_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_Context-ID.h b/include/osmocom/rua/RUA_Context-ID.h
index 45c9489..b96a7bb 100644
--- a/include/osmocom/rua/RUA_Context-ID.h
+++ b/include/osmocom/rua/RUA_Context-ID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Context_ID_H_
diff --git a/include/osmocom/rua/RUA_Criticality.h b/include/osmocom/rua/RUA_Criticality.h
index 781dd0c..26a330c 100644
--- a/include/osmocom/rua/RUA_Criticality.h
+++ b/include/osmocom/rua/RUA_Criticality.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Criticality_H_
diff --git a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
index ae84738..0f948d3 100644
--- a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CriticalityDiagnostics_IE_List_H_
@@ -26,7 +26,7 @@
 
 /* RUA_CriticalityDiagnostics-IE-List */
 typedef struct RUA_CriticalityDiagnostics_IE_List {
-	A_SEQUENCE_OF(struct Member {
+	A_SEQUENCE_OF(struct RUA_CriticalityDiagnostics_IE_List__Member {
 		RUA_Criticality_t	 iECriticality;
 		RUA_ProtocolIE_ID_t	 iE_ID;
 		RUA_TypeOfError_t	 typeOfError;
diff --git a/include/osmocom/rua/RUA_CriticalityDiagnostics.h b/include/osmocom/rua/RUA_CriticalityDiagnostics.h
index 98d2aa4..b4d6d96 100644
--- a/include/osmocom/rua/RUA_CriticalityDiagnostics.h
+++ b/include/osmocom/rua/RUA_CriticalityDiagnostics.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CriticalityDiagnostics_H_
diff --git a/include/osmocom/rua/RUA_DirectTransfer.h b/include/osmocom/rua/RUA_DirectTransfer.h
index dd72260..8de1593 100644
--- a/include/osmocom/rua/RUA_DirectTransfer.h
+++ b/include/osmocom/rua/RUA_DirectTransfer.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_DirectTransfer_H_
@@ -23,7 +23,7 @@
 
 /* RUA_DirectTransfer */
 typedef struct RUA_DirectTransfer {
-	struct directTransfer_ies {
+	struct RUA_DirectTransfer__directTransfer_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_Disconnect.h b/include/osmocom/rua/RUA_Disconnect.h
index 2e23cd9..ff24255 100644
--- a/include/osmocom/rua/RUA_Disconnect.h
+++ b/include/osmocom/rua/RUA_Disconnect.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Disconnect_H_
@@ -23,7 +23,7 @@
 
 /* RUA_Disconnect */
 typedef struct RUA_Disconnect {
-	struct disconnect_ies {
+	struct RUA_Disconnect__disconnect_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_ErrorIndication.h b/include/osmocom/rua/RUA_ErrorIndication.h
index a8e2124..28785f1 100644
--- a/include/osmocom/rua/RUA_ErrorIndication.h
+++ b/include/osmocom/rua/RUA_ErrorIndication.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_ErrorIndication_H_
@@ -23,7 +23,7 @@
 
 /* RUA_ErrorIndication */
 typedef struct RUA_ErrorIndication {
-	struct errorIndication_ies {
+	struct RUA_ErrorIndication__errorIndication_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_Establishment-Cause.h b/include/osmocom/rua/RUA_Establishment-Cause.h
index 0c855b4..ccc7521 100644
--- a/include/osmocom/rua/RUA_Establishment-Cause.h
+++ b/include/osmocom/rua/RUA_Establishment-Cause.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Establishment_Cause_H_
diff --git a/include/osmocom/rua/RUA_Gsm-map-IDNNS.h b/include/osmocom/rua/RUA_Gsm-map-IDNNS.h
index f2939fe..634103c 100644
--- a/include/osmocom/rua/RUA_Gsm-map-IDNNS.h
+++ b/include/osmocom/rua/RUA_Gsm-map-IDNNS.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Gsm_map_IDNNS_H_
@@ -22,66 +22,66 @@
 #endif
 
 /* Dependencies */
-typedef enum routingbasis_PR {
-	routingbasis_PR_NOTHING,	/* No components present */
-	routingbasis_PR_localPTMSI,
-	routingbasis_PR_tMSIofsamePLMN,
-	routingbasis_PR_tMSIofdifferentPLMN,
-	routingbasis_PR_iMSIresponsetopaging,
-	routingbasis_PR_iMSIcauseUEinitiatedEvent,
-	routingbasis_PR_iMEI,
-	routingbasis_PR_spare2,
-	routingbasis_PR_spare1
-} routingbasis_PR;
+typedef enum RUA_Gsm_map_IDNNS__routingbasis_PR {
+	RUA_Gsm_map_IDNNS__routingbasis_PR_NOTHING,	/* No components present */
+	RUA_Gsm_map_IDNNS__routingbasis_PR_localPTMSI,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_tMSIofsamePLMN,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_tMSIofdifferentPLMN,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_iMSIresponsetopaging,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_iMSIcauseUEinitiatedEvent,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_iMEI,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_spare2,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_spare1
+} RUA_Gsm_map_IDNNS__routingbasis_PR;
 
 /* RUA_Gsm-map-IDNNS */
 typedef struct RUA_Gsm_map_IDNNS {
-	struct routingbasis {
-		routingbasis_PR present;
+	struct RUA_Gsm_map_IDNNS__routingbasis {
+		RUA_Gsm_map_IDNNS__routingbasis_PR present;
 		union RUA_Gsm_map_IDNNS__routingbasis_u {
-			struct localPTMSI {
+			struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} localPTMSI;
-			struct tMSIofsamePLMN {
+			struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} tMSIofsamePLMN;
-			struct tMSIofdifferentPLMN {
+			struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} tMSIofdifferentPLMN;
-			struct iMSIresponsetopaging {
+			struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} iMSIresponsetopaging;
-			struct iMSIcauseUEinitiatedEvent {
+			struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} iMSIcauseUEinitiatedEvent;
-			struct iMEI {
+			struct RUA_Gsm_map_IDNNS__routingbasis__iMEI {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} iMEI;
-			struct spare2 {
+			struct RUA_Gsm_map_IDNNS__routingbasis__spare2 {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} spare2;
-			struct spare1 {
+			struct RUA_Gsm_map_IDNNS__routingbasis__spare1 {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_IE-Extensions.h b/include/osmocom/rua/RUA_IE-Extensions.h
index c92210f..364cbd5 100644
--- a/include/osmocom/rua/RUA_IE-Extensions.h
+++ b/include/osmocom/rua/RUA_IE-Extensions.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_IE_Extensions_H_
diff --git a/include/osmocom/rua/RUA_IE.h b/include/osmocom/rua/RUA_IE.h
index 509b140..2881366 100644
--- a/include/osmocom/rua/RUA_IE.h
+++ b/include/osmocom/rua/RUA_IE.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_IE_H_
diff --git a/include/osmocom/rua/RUA_InitiatingMessage.h b/include/osmocom/rua/RUA_InitiatingMessage.h
index d372834..61dd089 100644
--- a/include/osmocom/rua/RUA_InitiatingMessage.h
+++ b/include/osmocom/rua/RUA_InitiatingMessage.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_InitiatingMessage_H_
diff --git a/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h b/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h
index 186bd8c..78c88e7 100644
--- a/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h
+++ b/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_IntraDomainNasNodeSelector_H_
@@ -23,25 +23,25 @@
 #endif
 
 /* Dependencies */
-typedef enum version_PR {
-	version_PR_NOTHING,	/* No components present */
-	version_PR_release99,
-	version_PR_later
-} version_PR;
-typedef enum cn_Type_PR {
-	cn_Type_PR_NOTHING,	/* No components present */
-	cn_Type_PR_gsm_Map_IDNNS,
-	cn_Type_PR_ansi_41_IDNNS
-} cn_Type_PR;
+typedef enum RUA_IntraDomainNasNodeSelector__version_PR {
+	RUA_IntraDomainNasNodeSelector__version_PR_NOTHING,	/* No components present */
+	RUA_IntraDomainNasNodeSelector__version_PR_release99,
+	RUA_IntraDomainNasNodeSelector__version_PR_later
+} RUA_IntraDomainNasNodeSelector__version_PR;
+typedef enum RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR {
+	RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR_NOTHING,	/* No components present */
+	RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR_gsm_Map_IDNNS,
+	RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR_ansi_41_IDNNS
+} RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR;
 
 /* RUA_IntraDomainNasNodeSelector */
 typedef struct RUA_IntraDomainNasNodeSelector {
-	struct version {
-		version_PR present;
+	struct RUA_IntraDomainNasNodeSelector__version {
+		RUA_IntraDomainNasNodeSelector__version_PR present;
 		union RUA_IntraDomainNasNodeSelector__version_u {
-			struct release99 {
-				struct cn_Type {
-					cn_Type_PR present;
+			struct RUA_IntraDomainNasNodeSelector__version__release99 {
+				struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type {
+					RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR present;
 					union RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_u {
 						RUA_Gsm_map_IDNNS_t	 gsm_Map_IDNNS;
 						RUA_Ansi_41_IDNNS_t	 ansi_41_IDNNS;
@@ -54,7 +54,7 @@
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} release99;
-			struct later {
+			struct RUA_IntraDomainNasNodeSelector__version__later {
 				BIT_STRING_t	 futurecoding;
 				
 				/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_Presence.h b/include/osmocom/rua/RUA_Presence.h
index d583d7d..b241dae 100644
--- a/include/osmocom/rua/RUA_Presence.h
+++ b/include/osmocom/rua/RUA_Presence.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Presence_H_
diff --git a/include/osmocom/rua/RUA_PrivateIE-ID.h b/include/osmocom/rua/RUA_PrivateIE-ID.h
index 1aa7d07..602439d 100644
--- a/include/osmocom/rua/RUA_PrivateIE-ID.h
+++ b/include/osmocom/rua/RUA_PrivateIE-ID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_PrivateIE_ID_H_
diff --git a/include/osmocom/rua/RUA_PrivateMessage.h b/include/osmocom/rua/RUA_PrivateMessage.h
index fcea8fa..d385bf0 100644
--- a/include/osmocom/rua/RUA_PrivateMessage.h
+++ b/include/osmocom/rua/RUA_PrivateMessage.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_PrivateMessage_H_
@@ -23,7 +23,7 @@
 
 /* RUA_PrivateMessage */
 typedef struct RUA_PrivateMessage {
-	struct privateMessage_ies {
+	struct RUA_PrivateMessage__privateMessage_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_ProcedureCode.h b/include/osmocom/rua/RUA_ProcedureCode.h
index 63c5974..616a6df 100644
--- a/include/osmocom/rua/RUA_ProcedureCode.h
+++ b/include/osmocom/rua/RUA_ProcedureCode.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_ProcedureCode_H_
diff --git a/include/osmocom/rua/RUA_ProtocolIE-ID.h b/include/osmocom/rua/RUA_ProtocolIE-ID.h
index 8fc5915..db53b3c 100644
--- a/include/osmocom/rua/RUA_ProtocolIE-ID.h
+++ b/include/osmocom/rua/RUA_ProtocolIE-ID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_ProtocolIE_ID_H_
diff --git a/include/osmocom/rua/RUA_RANAP-Message.h b/include/osmocom/rua/RUA_RANAP-Message.h
index b32c301..b5d2ffc 100644
--- a/include/osmocom/rua/RUA_RANAP-Message.h
+++ b/include/osmocom/rua/RUA_RANAP-Message.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_RANAP_Message_H_
diff --git a/include/osmocom/rua/RUA_RUA-PDU.h b/include/osmocom/rua/RUA_RUA-PDU.h
index 334da5b..77fb655 100644
--- a/include/osmocom/rua/RUA_RUA-PDU.h
+++ b/include/osmocom/rua/RUA_RUA-PDU.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_RUA_PDU_H_
diff --git a/include/osmocom/rua/RUA_RoutingParameter.h b/include/osmocom/rua/RUA_RoutingParameter.h
index b917f46..9766176 100644
--- a/include/osmocom/rua/RUA_RoutingParameter.h
+++ b/include/osmocom/rua/RUA_RoutingParameter.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_RoutingParameter_H_
diff --git a/include/osmocom/rua/RUA_SuccessfulOutcome.h b/include/osmocom/rua/RUA_SuccessfulOutcome.h
index fb8924e..b7208f5 100644
--- a/include/osmocom/rua/RUA_SuccessfulOutcome.h
+++ b/include/osmocom/rua/RUA_SuccessfulOutcome.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_SuccessfulOutcome_H_
diff --git a/include/osmocom/rua/RUA_TriggeringMessage.h b/include/osmocom/rua/RUA_TriggeringMessage.h
index b6dfb8b..c1e017b 100644
--- a/include/osmocom/rua/RUA_TriggeringMessage.h
+++ b/include/osmocom/rua/RUA_TriggeringMessage.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_TriggeringMessage_H_
diff --git a/include/osmocom/rua/RUA_TypeOfError.h b/include/osmocom/rua/RUA_TypeOfError.h
index 51bdab7..7d6cf41 100644
--- a/include/osmocom/rua/RUA_TypeOfError.h
+++ b/include/osmocom/rua/RUA_TypeOfError.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_TypeOfError_H_
diff --git a/include/osmocom/rua/RUA_UnsuccessfulOutcome.h b/include/osmocom/rua/RUA_UnsuccessfulOutcome.h
index b7058f9..09e1a13 100644
--- a/include/osmocom/rua/RUA_UnsuccessfulOutcome.h
+++ b/include/osmocom/rua/RUA_UnsuccessfulOutcome.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_UnsuccessfulOutcome_H_
diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am
index 493a466..8cb2e7d 100644
--- a/src/rua/Makefile.am
+++ b/src/rua/Makefile.am
@@ -81,7 +81,7 @@
 regen: regenerate-from-asn1-source
 
 regenerate-from-asn1-source:
-	ASN1C_PREFIX="RUA_" asn1c -R -gen-PER $(top_srcdir)/asn1/rua/RUA-CommonDataTypes.asn $(top_srcdir)/asn1/rua/RUA-Constants.asn $(top_srcdir)/asn1/rua/RUA-IEs.asn $(top_srcdir)/asn1/rua/RUA-PDU.asn
+	ASN1C_PREFIX="RUA_" asn1c -R -fcompound-names -gen-PER $(top_srcdir)/asn1/rua/RUA-CommonDataTypes.asn $(top_srcdir)/asn1/rua/RUA-Constants.asn $(top_srcdir)/asn1/rua/RUA-IEs.asn $(top_srcdir)/asn1/rua/RUA-PDU.asn
 #	change include style to `#include <dir/foo.h>'
 	$(top_srcdir)/move-asn1-header-files.sh osmocom/rua $(ASN_MODULE_INC)
 #	Finally copy *.c from buildir to srcdir:
diff --git a/src/rua/RUA_Ansi-41-IDNNS.c b/src/rua/RUA_Ansi-41-IDNNS.c
index 3f1c77a..a43f85d 100644
--- a/src/rua/RUA_Ansi-41-IDNNS.c
+++ b/src/rua/RUA_Ansi-41-IDNNS.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_Ansi-41-IDNNS.h>
diff --git a/src/rua/RUA_CN-DomainIndicator.c b/src/rua/RUA_CN-DomainIndicator.c
index 503258d..f690d14 100644
--- a/src/rua/RUA_CN-DomainIndicator.c
+++ b/src/rua/RUA_CN-DomainIndicator.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_CN-DomainIndicator.h>
diff --git a/src/rua/RUA_CSGMembershipStatus.c b/src/rua/RUA_CSGMembershipStatus.c
index 7cc8c3e..8a32372 100644
--- a/src/rua/RUA_CSGMembershipStatus.c
+++ b/src/rua/RUA_CSGMembershipStatus.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_CSGMembershipStatus.h>
diff --git a/src/rua/RUA_Cause.c b/src/rua/RUA_Cause.c
index 4fd0027..ac5548f 100644
--- a/src/rua/RUA_Cause.c
+++ b/src/rua/RUA_Cause.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_Cause.h>
diff --git a/src/rua/RUA_CauseMisc.c b/src/rua/RUA_CauseMisc.c
index fb9400b..8d66fae 100644
--- a/src/rua/RUA_CauseMisc.c
+++ b/src/rua/RUA_CauseMisc.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_CauseMisc.h>
diff --git a/src/rua/RUA_CauseProtocol.c b/src/rua/RUA_CauseProtocol.c
index 48bcabf..e824c4e 100644
--- a/src/rua/RUA_CauseProtocol.c
+++ b/src/rua/RUA_CauseProtocol.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_CauseProtocol.h>
diff --git a/src/rua/RUA_CauseRadioNetwork.c b/src/rua/RUA_CauseRadioNetwork.c
index 9e3a6f6..aa1bd56 100644
--- a/src/rua/RUA_CauseRadioNetwork.c
+++ b/src/rua/RUA_CauseRadioNetwork.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_CauseRadioNetwork.h>
diff --git a/src/rua/RUA_CauseTransport.c b/src/rua/RUA_CauseTransport.c
index 5cc4234..b47a014 100644
--- a/src/rua/RUA_CauseTransport.c
+++ b/src/rua/RUA_CauseTransport.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_CauseTransport.h>
diff --git a/src/rua/RUA_Connect.c b/src/rua/RUA_Connect.c
index 291a0f5..94b0a09 100644
--- a/src/rua/RUA_Connect.c
+++ b/src/rua/RUA_Connect.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_Connect.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_connect_ies_specs_2 = {
-	sizeof(struct connect_ies),
-	offsetof(struct connect_ies, _asn_ctx),
+	sizeof(struct RUA_Connect__connect_ies),
+	offsetof(struct RUA_Connect__connect_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/rua/RUA_ConnectionlessTransfer.c b/src/rua/RUA_ConnectionlessTransfer.c
index c90e8ba..32b8ff1 100644
--- a/src/rua/RUA_ConnectionlessTransfer.c
+++ b/src/rua/RUA_ConnectionlessTransfer.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_ConnectionlessTransfer.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_connectionlessTransfer_ies_specs_2 = {
-	sizeof(struct connectionlessTransfer_ies),
-	offsetof(struct connectionlessTransfer_ies, _asn_ctx),
+	sizeof(struct RUA_ConnectionlessTransfer__connectionlessTransfer_ies),
+	offsetof(struct RUA_ConnectionlessTransfer__connectionlessTransfer_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/rua/RUA_Context-ID.c b/src/rua/RUA_Context-ID.c
index a0c5c3b..b542bdb 100644
--- a/src/rua/RUA_Context-ID.c
+++ b/src/rua/RUA_Context-ID.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_Context-ID.h>
diff --git a/src/rua/RUA_Criticality.c b/src/rua/RUA_Criticality.c
index 05d27ad..8b292f5 100644
--- a/src/rua/RUA_Criticality.c
+++ b/src/rua/RUA_Criticality.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_Criticality.h>
diff --git a/src/rua/RUA_CriticalityDiagnostics-IE-List.c b/src/rua/RUA_CriticalityDiagnostics-IE-List.c
index bc87f91..43a5179 100644
--- a/src/rua/RUA_CriticalityDiagnostics-IE-List.c
+++ b/src/rua/RUA_CriticalityDiagnostics-IE-List.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h>
@@ -13,7 +13,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct Member, iECriticality),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, iECriticality),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_Criticality,
@@ -22,7 +22,7 @@
 		0,
 		"iECriticality"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, iE_ID),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_ProtocolIE_ID,
@@ -31,7 +31,7 @@
 		0,
 		"iE-ID"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct Member, typeOfError),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, typeOfError),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_TypeOfError,
@@ -40,7 +40,7 @@
 		0,
 		"typeOfError"
 		},
-	{ ATF_POINTER, 1, offsetof(struct Member, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_IE_Extensions,
@@ -61,8 +61,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct Member),
-	offsetof(struct Member, _asn_ctx),
+	sizeof(struct RUA_CriticalityDiagnostics_IE_List__Member),
+	offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, _asn_ctx),
 	asn_MAP_Member_tag2el_2,
 	4,	/* Count of tags in the map */
 	asn_MAP_Member_oms_2,	/* Optional members */
diff --git a/src/rua/RUA_CriticalityDiagnostics.c b/src/rua/RUA_CriticalityDiagnostics.c
index 58791f5..dae8096 100644
--- a/src/rua/RUA_CriticalityDiagnostics.c
+++ b/src/rua/RUA_CriticalityDiagnostics.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_CriticalityDiagnostics.h>
diff --git a/src/rua/RUA_DirectTransfer.c b/src/rua/RUA_DirectTransfer.c
index d11cb88..a9c8de1 100644
--- a/src/rua/RUA_DirectTransfer.c
+++ b/src/rua/RUA_DirectTransfer.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_DirectTransfer.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_directTransfer_ies_specs_2 = {
-	sizeof(struct directTransfer_ies),
-	offsetof(struct directTransfer_ies, _asn_ctx),
+	sizeof(struct RUA_DirectTransfer__directTransfer_ies),
+	offsetof(struct RUA_DirectTransfer__directTransfer_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/rua/RUA_Disconnect.c b/src/rua/RUA_Disconnect.c
index e63be21..6dd5be1 100644
--- a/src/rua/RUA_Disconnect.c
+++ b/src/rua/RUA_Disconnect.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_Disconnect.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_disconnect_ies_specs_2 = {
-	sizeof(struct disconnect_ies),
-	offsetof(struct disconnect_ies, _asn_ctx),
+	sizeof(struct RUA_Disconnect__disconnect_ies),
+	offsetof(struct RUA_Disconnect__disconnect_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/rua/RUA_ErrorIndication.c b/src/rua/RUA_ErrorIndication.c
index 21293b1..564a1fd 100644
--- a/src/rua/RUA_ErrorIndication.c
+++ b/src/rua/RUA_ErrorIndication.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_ErrorIndication.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_errorIndication_ies_specs_2 = {
-	sizeof(struct errorIndication_ies),
-	offsetof(struct errorIndication_ies, _asn_ctx),
+	sizeof(struct RUA_ErrorIndication__errorIndication_ies),
+	offsetof(struct RUA_ErrorIndication__errorIndication_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/rua/RUA_Establishment-Cause.c b/src/rua/RUA_Establishment-Cause.c
index 0316b03..1f27b56 100644
--- a/src/rua/RUA_Establishment-Cause.c
+++ b/src/rua/RUA_Establishment-Cause.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_Establishment-Cause.h>
diff --git a/src/rua/RUA_Gsm-map-IDNNS.c b/src/rua/RUA_Gsm-map-IDNNS.c
index 0c50092..7cdbebb 100644
--- a/src/rua/RUA_Gsm-map-IDNNS.c
+++ b/src/rua/RUA_Gsm-map-IDNNS.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_Gsm-map-IDNNS.h>
@@ -13,7 +13,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_localPTMSI_3[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct localPTMSI, routingparameter),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI, routingparameter),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_RoutingParameter,
@@ -31,8 +31,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_localPTMSI_specs_3 = {
-	sizeof(struct localPTMSI),
-	offsetof(struct localPTMSI, _asn_ctx),
+	sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI),
+	offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI, _asn_ctx),
 	asn_MAP_localPTMSI_tag2el_3,
 	1,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
@@ -68,7 +68,7 @@
 };
 
 static asn_TYPE_member_t asn_MBR_tMSIofsamePLMN_5[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct tMSIofsamePLMN, routingparameter),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN, routingparameter),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_RoutingParameter,
@@ -86,8 +86,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_tMSIofsamePLMN_specs_5 = {
-	sizeof(struct tMSIofsamePLMN),
-	offsetof(struct tMSIofsamePLMN, _asn_ctx),
+	sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN),
+	offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN, _asn_ctx),
 	asn_MAP_tMSIofsamePLMN_tag2el_5,
 	1,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
@@ -123,7 +123,7 @@
 };
 
 static asn_TYPE_member_t asn_MBR_tMSIofdifferentPLMN_7[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct tMSIofdifferentPLMN, routingparameter),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN, routingparameter),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_RoutingParameter,
@@ -141,8 +141,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_tMSIofdifferentPLMN_specs_7 = {
-	sizeof(struct tMSIofdifferentPLMN),
-	offsetof(struct tMSIofdifferentPLMN, _asn_ctx),
+	sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN),
+	offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN, _asn_ctx),
 	asn_MAP_tMSIofdifferentPLMN_tag2el_7,
 	1,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
@@ -178,7 +178,7 @@
 };
 
 static asn_TYPE_member_t asn_MBR_iMSIresponsetopaging_9[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct iMSIresponsetopaging, routingparameter),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging, routingparameter),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_RoutingParameter,
@@ -196,8 +196,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_iMSIresponsetopaging_specs_9 = {
-	sizeof(struct iMSIresponsetopaging),
-	offsetof(struct iMSIresponsetopaging, _asn_ctx),
+	sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging),
+	offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging, _asn_ctx),
 	asn_MAP_iMSIresponsetopaging_tag2el_9,
 	1,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
@@ -233,7 +233,7 @@
 };
 
 static asn_TYPE_member_t asn_MBR_iMSIcauseUEinitiatedEvent_11[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct iMSIcauseUEinitiatedEvent, routingparameter),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent, routingparameter),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_RoutingParameter,
@@ -251,8 +251,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_iMSIcauseUEinitiatedEvent_specs_11 = {
-	sizeof(struct iMSIcauseUEinitiatedEvent),
-	offsetof(struct iMSIcauseUEinitiatedEvent, _asn_ctx),
+	sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent),
+	offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent, _asn_ctx),
 	asn_MAP_iMSIcauseUEinitiatedEvent_tag2el_11,
 	1,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
@@ -288,7 +288,7 @@
 };
 
 static asn_TYPE_member_t asn_MBR_iMEI_13[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct iMEI, routingparameter),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMEI, routingparameter),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_RoutingParameter,
@@ -306,8 +306,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_iMEI_specs_13 = {
-	sizeof(struct iMEI),
-	offsetof(struct iMEI, _asn_ctx),
+	sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__iMEI),
+	offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMEI, _asn_ctx),
 	asn_MAP_iMEI_tag2el_13,
 	1,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
@@ -343,7 +343,7 @@
 };
 
 static asn_TYPE_member_t asn_MBR_spare2_15[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct spare2, routingparameter),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__spare2, routingparameter),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_RoutingParameter,
@@ -361,8 +361,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_spare2_specs_15 = {
-	sizeof(struct spare2),
-	offsetof(struct spare2, _asn_ctx),
+	sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__spare2),
+	offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__spare2, _asn_ctx),
 	asn_MAP_spare2_tag2el_15,
 	1,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
@@ -398,7 +398,7 @@
 };
 
 static asn_TYPE_member_t asn_MBR_spare1_17[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct spare1, routingparameter),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__spare1, routingparameter),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_RoutingParameter,
@@ -416,8 +416,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_spare1_specs_17 = {
-	sizeof(struct spare1),
-	offsetof(struct spare1, _asn_ctx),
+	sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__spare1),
+	offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__spare1, _asn_ctx),
 	asn_MAP_spare1_tag2el_17,
 	1,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
@@ -453,7 +453,7 @@
 };
 
 static asn_TYPE_member_t asn_MBR_routingbasis_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.localPTMSI),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.localPTMSI),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		0,
 		&asn_DEF_localPTMSI_3,
@@ -462,7 +462,7 @@
 		0,
 		"localPTMSI"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.tMSIofsamePLMN),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.tMSIofsamePLMN),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		0,
 		&asn_DEF_tMSIofsamePLMN_5,
@@ -471,7 +471,7 @@
 		0,
 		"tMSIofsamePLMN"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.tMSIofdifferentPLMN),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.tMSIofdifferentPLMN),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		0,
 		&asn_DEF_tMSIofdifferentPLMN_7,
@@ -480,7 +480,7 @@
 		0,
 		"tMSIofdifferentPLMN"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.iMSIresponsetopaging),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.iMSIresponsetopaging),
 		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 		0,
 		&asn_DEF_iMSIresponsetopaging_9,
@@ -489,7 +489,7 @@
 		0,
 		"iMSIresponsetopaging"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.iMSIcauseUEinitiatedEvent),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.iMSIcauseUEinitiatedEvent),
 		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
 		0,
 		&asn_DEF_iMSIcauseUEinitiatedEvent_11,
@@ -498,7 +498,7 @@
 		0,
 		"iMSIcauseUEinitiatedEvent"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.iMEI),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.iMEI),
 		(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
 		0,
 		&asn_DEF_iMEI_13,
@@ -507,7 +507,7 @@
 		0,
 		"iMEI"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.spare2),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.spare2),
 		(ASN_TAG_CLASS_CONTEXT | (6 << 2)),
 		0,
 		&asn_DEF_spare2_15,
@@ -516,7 +516,7 @@
 		0,
 		"spare2"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.spare1),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.spare1),
 		(ASN_TAG_CLASS_CONTEXT | (7 << 2)),
 		0,
 		&asn_DEF_spare1_17,
@@ -537,10 +537,10 @@
     { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 } /* spare1 */
 };
 static asn_CHOICE_specifics_t asn_SPC_routingbasis_specs_2 = {
-	sizeof(struct routingbasis),
-	offsetof(struct routingbasis, _asn_ctx),
-	offsetof(struct routingbasis, present),
-	sizeof(((struct routingbasis *)0)->present),
+	sizeof(struct RUA_Gsm_map_IDNNS__routingbasis),
+	offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, _asn_ctx),
+	offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, present),
+	sizeof(((struct RUA_Gsm_map_IDNNS__routingbasis *)0)->present),
 	asn_MAP_routingbasis_tag2el_2,
 	8,	/* Count of tags in the map */
 	0,
diff --git a/src/rua/RUA_IE-Extensions.c b/src/rua/RUA_IE-Extensions.c
index 2bcdc72..a90056f 100644
--- a/src/rua/RUA_IE-Extensions.c
+++ b/src/rua/RUA_IE-Extensions.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_IE-Extensions.h>
diff --git a/src/rua/RUA_IE.c b/src/rua/RUA_IE.c
index 73dc0b1..086787f 100644
--- a/src/rua/RUA_IE.c
+++ b/src/rua/RUA_IE.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_IE.h>
diff --git a/src/rua/RUA_InitiatingMessage.c b/src/rua/RUA_InitiatingMessage.c
index b1278ec..1c6f2e4 100644
--- a/src/rua/RUA_InitiatingMessage.c
+++ b/src/rua/RUA_InitiatingMessage.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_InitiatingMessage.h>
diff --git a/src/rua/RUA_IntraDomainNasNodeSelector.c b/src/rua/RUA_IntraDomainNasNodeSelector.c
index 0653abb..fef8f2a 100644
--- a/src/rua/RUA_IntraDomainNasNodeSelector.c
+++ b/src/rua/RUA_IntraDomainNasNodeSelector.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_IntraDomainNasNodeSelector.h>
@@ -54,7 +54,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_cn_Type_4[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct cn_Type, choice.gsm_Map_IDNNS),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type, choice.gsm_Map_IDNNS),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_Gsm_map_IDNNS,
@@ -63,7 +63,7 @@
 		0,
 		"gsm-Map-IDNNS"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct cn_Type, choice.ansi_41_IDNNS),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type, choice.ansi_41_IDNNS),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_Ansi_41_IDNNS,
@@ -78,10 +78,10 @@
     { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* ansi-41-IDNNS */
 };
 static asn_CHOICE_specifics_t asn_SPC_cn_Type_specs_4 = {
-	sizeof(struct cn_Type),
-	offsetof(struct cn_Type, _asn_ctx),
-	offsetof(struct cn_Type, present),
-	sizeof(((struct cn_Type *)0)->present),
+	sizeof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type),
+	offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type, _asn_ctx),
+	offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type, present),
+	sizeof(((struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type *)0)->present),
 	asn_MAP_cn_Type_tag2el_4,
 	2,	/* Count of tags in the map */
 	0,
@@ -114,7 +114,7 @@
 };
 
 static asn_TYPE_member_t asn_MBR_release99_3[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct release99, cn_Type),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99, cn_Type),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		+1,	/* EXPLICIT tag at current level */
 		&asn_DEF_cn_Type_4,
@@ -132,8 +132,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* cn-Type */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_release99_specs_3 = {
-	sizeof(struct release99),
-	offsetof(struct release99, _asn_ctx),
+	sizeof(struct RUA_IntraDomainNasNodeSelector__version__release99),
+	offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99, _asn_ctx),
 	asn_MAP_release99_tag2el_3,
 	1,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
@@ -169,7 +169,7 @@
 };
 
 static asn_TYPE_member_t asn_MBR_later_7[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct later, futurecoding),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version__later, futurecoding),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_BIT_STRING,
@@ -187,8 +187,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* futurecoding */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_later_specs_7 = {
-	sizeof(struct later),
-	offsetof(struct later, _asn_ctx),
+	sizeof(struct RUA_IntraDomainNasNodeSelector__version__later),
+	offsetof(struct RUA_IntraDomainNasNodeSelector__version__later, _asn_ctx),
 	asn_MAP_later_tag2el_7,
 	1,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
@@ -224,7 +224,7 @@
 };
 
 static asn_TYPE_member_t asn_MBR_version_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct version, choice.release99),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version, choice.release99),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		0,
 		&asn_DEF_release99_3,
@@ -233,7 +233,7 @@
 		0,
 		"release99"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct version, choice.later),
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version, choice.later),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		0,
 		&asn_DEF_later_7,
@@ -248,10 +248,10 @@
     { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* later */
 };
 static asn_CHOICE_specifics_t asn_SPC_version_specs_2 = {
-	sizeof(struct version),
-	offsetof(struct version, _asn_ctx),
-	offsetof(struct version, present),
-	sizeof(((struct version *)0)->present),
+	sizeof(struct RUA_IntraDomainNasNodeSelector__version),
+	offsetof(struct RUA_IntraDomainNasNodeSelector__version, _asn_ctx),
+	offsetof(struct RUA_IntraDomainNasNodeSelector__version, present),
+	sizeof(((struct RUA_IntraDomainNasNodeSelector__version *)0)->present),
 	asn_MAP_version_tag2el_2,
 	2,	/* Count of tags in the map */
 	0,
diff --git a/src/rua/RUA_Presence.c b/src/rua/RUA_Presence.c
index 581a3ed..6dd6c87 100644
--- a/src/rua/RUA_Presence.c
+++ b/src/rua/RUA_Presence.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_Presence.h>
diff --git a/src/rua/RUA_PrivateIE-ID.c b/src/rua/RUA_PrivateIE-ID.c
index 5947369..acc4b2a 100644
--- a/src/rua/RUA_PrivateIE-ID.c
+++ b/src/rua/RUA_PrivateIE-ID.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_PrivateIE-ID.h>
diff --git a/src/rua/RUA_PrivateMessage.c b/src/rua/RUA_PrivateMessage.c
index efad1bb..dbe38b3 100644
--- a/src/rua/RUA_PrivateMessage.c
+++ b/src/rua/RUA_PrivateMessage.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_PrivateMessage.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_privateMessage_ies_specs_2 = {
-	sizeof(struct privateMessage_ies),
-	offsetof(struct privateMessage_ies, _asn_ctx),
+	sizeof(struct RUA_PrivateMessage__privateMessage_ies),
+	offsetof(struct RUA_PrivateMessage__privateMessage_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/rua/RUA_ProcedureCode.c b/src/rua/RUA_ProcedureCode.c
index cf7da40..b597e51 100644
--- a/src/rua/RUA_ProcedureCode.c
+++ b/src/rua/RUA_ProcedureCode.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_ProcedureCode.h>
diff --git a/src/rua/RUA_ProtocolIE-ID.c b/src/rua/RUA_ProtocolIE-ID.c
index b264e16..3947767 100644
--- a/src/rua/RUA_ProtocolIE-ID.c
+++ b/src/rua/RUA_ProtocolIE-ID.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_ProtocolIE-ID.h>
diff --git a/src/rua/RUA_RANAP-Message.c b/src/rua/RUA_RANAP-Message.c
index 9998e84..978d829 100644
--- a/src/rua/RUA_RANAP-Message.c
+++ b/src/rua/RUA_RANAP-Message.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_RANAP-Message.h>
diff --git a/src/rua/RUA_RUA-PDU.c b/src/rua/RUA_RUA-PDU.c
index fb6cd28..a026497 100644
--- a/src/rua/RUA_RUA-PDU.c
+++ b/src/rua/RUA_RUA-PDU.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_RUA-PDU.h>
diff --git a/src/rua/RUA_RoutingParameter.c b/src/rua/RUA_RoutingParameter.c
index 8e83456..f96a5f0 100644
--- a/src/rua/RUA_RoutingParameter.c
+++ b/src/rua/RUA_RoutingParameter.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_RoutingParameter.h>
diff --git a/src/rua/RUA_SuccessfulOutcome.c b/src/rua/RUA_SuccessfulOutcome.c
index 183ed34..3bf39c5 100644
--- a/src/rua/RUA_SuccessfulOutcome.c
+++ b/src/rua/RUA_SuccessfulOutcome.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_SuccessfulOutcome.h>
diff --git a/src/rua/RUA_TriggeringMessage.c b/src/rua/RUA_TriggeringMessage.c
index b2e9128..4cfae4c 100644
--- a/src/rua/RUA_TriggeringMessage.c
+++ b/src/rua/RUA_TriggeringMessage.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_TriggeringMessage.h>
diff --git a/src/rua/RUA_TypeOfError.c b/src/rua/RUA_TypeOfError.c
index a8b081c..84018b3 100644
--- a/src/rua/RUA_TypeOfError.c
+++ b/src/rua/RUA_TypeOfError.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_TypeOfError.h>
diff --git a/src/rua/RUA_UnsuccessfulOutcome.c b/src/rua/RUA_UnsuccessfulOutcome.c
index 5fa5a2e..2e2cca7 100644
--- a/src/rua/RUA_UnsuccessfulOutcome.c
+++ b/src/rua/RUA_UnsuccessfulOutcome.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/rua/RUA_UnsuccessfulOutcome.h>

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

Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: Id4e337cdc82c26922b7ca7f0fe8af523e9a0945c
Gerrit-Change-Number: 25992
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/20211027/b11ea44c/attachment.htm>

More information about the gerrit-log mailing list