Change in osmo-iuh[master]: RFC: Add lib prefix to structs with duplicated names

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
Thu Oct 21 16:54:52 UTC 2021


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


Change subject: RFC: Add lib prefix to structs with duplicated names
......................................................................

RFC: Add lib prefix to structs with duplicated names

Otherwise it's impossible to include eg. rua/*.h and ranap/*.h since
they will collision and gcc will error.

Following commands are used to generate this patch:
"""
for t in hnbap ranap rua sabp; do ag -l "struct Member" include/osmocom/$t src/$t/ | xargs sed -i "s/struct Member/struct ${t}_Member/g"; done
for t in hnbap ranap rua sabp; do ag -l "struct errorIndication_ies" include/osmocom/$t src/$t/ | xargs sed -i "s/struct errorIndication_ies/struct ${t}_errorIndication_ies/g"; done
for t in hnbap ranap rua sabp; do ag -l "struct directTransfer_ies" include/osmocom/$t src/$t/ | xargs sed -i "s/struct directTransfer_ies/struct ${t}_directTransfer_ies/g"; done
"""

Change-Id: I552fc028c7d08c880fdb844ece75816602c5bb67
---
M include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h
M include/osmocom/hnbap/ErrorIndication.h
M include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
M include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
M include/osmocom/ranap/RANAP_DataVolumeList.h
M include/osmocom/ranap/RANAP_DirectTransfer.h
M include/osmocom/ranap/RANAP_EUTRANFrequencies.h
M include/osmocom/ranap/RANAP_ErrorIndication.h
M include/osmocom/ranap/RANAP_GA-Polygon.h
M include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h
M include/osmocom/ranap/RANAP_LA-LIST.h
M include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h
M include/osmocom/ranap/RANAP_MessageStructure.h
M include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h
M include/osmocom/ranap/RANAP_RABDataVolumeReport.h
M include/osmocom/ranap/RANAP_RABParametersList.h
M include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h
M include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
M include/osmocom/rua/RUA_DirectTransfer.h
M include/osmocom/rua/RUA_ErrorIndication.h
M include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h
M include/osmocom/sabp/SABP_MessageStructure.h
M src/hnbap/CriticalityDiagnostics-IE-List.c
M src/hnbap/ErrorIndication.c
M src/ranap/RANAP_AuthorisedPLMNs.c
M src/ranap/RANAP_CriticalityDiagnostics-IE-List.c
M src/ranap/RANAP_DataVolumeList.c
M src/ranap/RANAP_DirectTransfer.c
M src/ranap/RANAP_EUTRANFrequencies.c
M src/ranap/RANAP_ErrorIndication.c
M src/ranap/RANAP_GA-Polygon.c
M src/ranap/RANAP_JoinedMBMSBearerService-IEs.c
M src/ranap/RANAP_LA-LIST.c
M src/ranap/RANAP_LeftMBMSBearerService-IEs.c
M src/ranap/RANAP_MessageStructure.c
M src/ranap/RANAP_PLMNs-in-shared-network.c
M src/ranap/RANAP_RABDataVolumeReport.c
M src/ranap/RANAP_RABParametersList.c
M src/ranap/RANAP_UnsuccessfulLinking-IEs.c
M src/rua/RUA_CriticalityDiagnostics-IE-List.c
M src/rua/RUA_DirectTransfer.c
M src/rua/RUA_ErrorIndication.c
M src/sabp/SABP_CriticalityDiagnostics-IE-List.c
M src/sabp/SABP_MessageStructure.c
44 files changed, 121 insertions(+), 121 deletions(-)



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

diff --git a/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h b/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h
index 3e24ec9..a073f52 100644
--- a/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h
@@ -28,7 +28,7 @@
 
 /* CriticalityDiagnostics-IE-List */
 typedef struct CriticalityDiagnostics_IE_List {
-	A_SEQUENCE_OF(struct Member {
+	A_SEQUENCE_OF(struct hnbap_Member {
 		Criticality_t	 iECriticality;
 		ProtocolIE_ID_t	 iE_ID;
 		TypeOfError_t	 typeOfError;
diff --git a/include/osmocom/hnbap/ErrorIndication.h b/include/osmocom/hnbap/ErrorIndication.h
index 110934c..abce354 100644
--- a/include/osmocom/hnbap/ErrorIndication.h
+++ b/include/osmocom/hnbap/ErrorIndication.h
@@ -25,7 +25,7 @@
 
 /* ErrorIndication */
 typedef struct ErrorIndication {
-	struct errorIndication_ies {
+	struct hnbap_errorIndication_ies {
 		A_SEQUENCE_OF(struct IE) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h b/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
index 77b65a7..485227d 100644
--- a/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
+++ b/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
@@ -24,7 +24,7 @@
 
 /* RANAP_AuthorisedPLMNs */
 typedef struct RANAP_AuthorisedPLMNs {
-	A_SEQUENCE_OF(struct MemberC {
+	A_SEQUENCE_OF(struct ranap_MemberC {
 		RANAP_PLMNidentity_t	 pLMNidentity;
 		RANAP_AuthorisedSNAs_t	*authorisedSNAsList	/* OPTIONAL */;
 		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
diff --git a/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h b/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
index 0eaeb3e..ea0b548 100644
--- a/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
@@ -25,7 +25,7 @@
 
 /* RANAP_CriticalityDiagnostics-IE-List */
 typedef struct RANAP_CriticalityDiagnostics_IE_List {
-	A_SEQUENCE_OF(struct MemberG {
+	A_SEQUENCE_OF(struct ranap_MemberG {
 		RANAP_Criticality_t	 iECriticality;
 		RANAP_ProtocolIE_ID_t	 iE_ID;
 		RANAP_RepetitionNumber0_t	*repetitionNumber	/* OPTIONAL */;
diff --git a/include/osmocom/ranap/RANAP_DataVolumeList.h b/include/osmocom/ranap/RANAP_DataVolumeList.h
index 459c2d5..9c40d7f 100644
--- a/include/osmocom/ranap/RANAP_DataVolumeList.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeList.h
@@ -24,7 +24,7 @@
 
 /* RANAP_DataVolumeList */
 typedef struct RANAP_DataVolumeList {
-	A_SEQUENCE_OF(struct MemberH {
+	A_SEQUENCE_OF(struct ranap_MemberH {
 		RANAP_UnsuccessfullyTransmittedDataVolume_t	 dl_UnsuccessfullyTransmittedDataVolume;
 		RANAP_DataVolumeReference_t	*dataVolumeReference	/* OPTIONAL */;
 		RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
diff --git a/include/osmocom/ranap/RANAP_DirectTransfer.h b/include/osmocom/ranap/RANAP_DirectTransfer.h
index 2a8a1ff..5a16a4c 100644
--- a/include/osmocom/ranap/RANAP_DirectTransfer.h
+++ b/include/osmocom/ranap/RANAP_DirectTransfer.h
@@ -22,7 +22,7 @@
 
 /* RANAP_DirectTransfer */
 typedef struct RANAP_DirectTransfer {
-	struct directTransfer_ies {
+	struct ranap_directTransfer_ies {
 		A_SEQUENCE_OF(RANAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/ranap/RANAP_EUTRANFrequencies.h b/include/osmocom/ranap/RANAP_EUTRANFrequencies.h
index f6c653c..8d87b29 100644
--- a/include/osmocom/ranap/RANAP_EUTRANFrequencies.h
+++ b/include/osmocom/ranap/RANAP_EUTRANFrequencies.h
@@ -24,7 +24,7 @@
 
 /* RANAP_EUTRANFrequencies */
 typedef struct RANAP_EUTRANFrequencies {
-	A_SEQUENCE_OF(struct MemberJ {
+	A_SEQUENCE_OF(struct ranap_MemberJ {
 		long	 earfcn;
 		RANAP_MeasBand_t	*measBand	/* OPTIONAL */;
 		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
diff --git a/include/osmocom/ranap/RANAP_ErrorIndication.h b/include/osmocom/ranap/RANAP_ErrorIndication.h
index 5bad287..db5b80f 100644
--- a/include/osmocom/ranap/RANAP_ErrorIndication.h
+++ b/include/osmocom/ranap/RANAP_ErrorIndication.h
@@ -22,7 +22,7 @@
 
 /* RANAP_ErrorIndication */
 typedef struct RANAP_ErrorIndication {
-	struct errorIndication_ies {
+	struct ranap_errorIndication_ies {
 		A_SEQUENCE_OF(RANAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/ranap/RANAP_GA-Polygon.h b/include/osmocom/ranap/RANAP_GA-Polygon.h
index 200d0a4..feac8d0 100644
--- a/include/osmocom/ranap/RANAP_GA-Polygon.h
+++ b/include/osmocom/ranap/RANAP_GA-Polygon.h
@@ -23,7 +23,7 @@
 
 /* RANAP_GA-Polygon */
 typedef struct RANAP_GA_Polygon {
-	A_SEQUENCE_OF(struct Member {
+	A_SEQUENCE_OF(struct ranap_Member {
 		RANAP_GeographicalCoordinates_t	 geographicalCoordinates;
 		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
 		/*
diff --git a/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h b/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h
index b27cde4..21db94f 100644
--- a/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h
+++ b/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h
@@ -24,7 +24,7 @@
 
 /* RANAP_JoinedMBMSBearerService-IEs */
 typedef struct RANAP_JoinedMBMSBearerService_IEs {
-	A_SEQUENCE_OF(struct MemberF {
+	A_SEQUENCE_OF(struct ranap_MemberF {
 		RANAP_TMGI_t	 tMGI;
 		RANAP_MBMS_PTP_RAB_ID_t	 mBMS_PTP_RAB_ID;
 		RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
diff --git a/include/osmocom/ranap/RANAP_LA-LIST.h b/include/osmocom/ranap/RANAP_LA-LIST.h
index 08e76ed..7d81456 100644
--- a/include/osmocom/ranap/RANAP_LA-LIST.h
+++ b/include/osmocom/ranap/RANAP_LA-LIST.h
@@ -24,7 +24,7 @@
 
 /* RANAP_LA-LIST */
 typedef struct RANAP_LA_LIST {
-	A_SEQUENCE_OF(struct MemberA {
+	A_SEQUENCE_OF(struct ranap_MemberA {
 		RANAP_LAC_t	 lAC;
 		RANAP_ListOF_SNAs_t	 listOF_SNAs;
 		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
diff --git a/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h b/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h
index f348739..7422a7e 100644
--- a/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h
+++ b/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h
@@ -23,7 +23,7 @@
 
 /* RANAP_LeftMBMSBearerService-IEs */
 typedef struct RANAP_LeftMBMSBearerService_IEs {
-	A_SEQUENCE_OF(struct MemberK {
+	A_SEQUENCE_OF(struct ranap_MemberK {
 		RANAP_TMGI_t	 tMGI;
 		RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
 		/*
diff --git a/include/osmocom/ranap/RANAP_MessageStructure.h b/include/osmocom/ranap/RANAP_MessageStructure.h
index f44d0b4..54198c4 100644
--- a/include/osmocom/ranap/RANAP_MessageStructure.h
+++ b/include/osmocom/ranap/RANAP_MessageStructure.h
@@ -24,7 +24,7 @@
 
 /* RANAP_MessageStructure */
 typedef struct RANAP_MessageStructure {
-	A_SEQUENCE_OF(struct MemberL {
+	A_SEQUENCE_OF(struct ranap_MemberL {
 		RANAP_ProtocolIE_ID_t	 iE_ID;
 		RANAP_RepetitionNumber1_t	*repetitionNumber	/* OPTIONAL */;
 		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
diff --git a/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h b/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h
index d335490..1b1a98d 100644
--- a/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h
+++ b/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h
@@ -24,7 +24,7 @@
 
 /* RANAP_PLMNs-in-shared-network */
 typedef struct RANAP_PLMNs_in_shared_network {
-	A_SEQUENCE_OF(struct MemberM {
+	A_SEQUENCE_OF(struct ranap_MemberM {
 		RANAP_PLMNidentity_t	 pLMNidentity;
 		RANAP_LA_LIST_t	 lA_LIST;
 		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
diff --git a/include/osmocom/ranap/RANAP_RABDataVolumeReport.h b/include/osmocom/ranap/RANAP_RABDataVolumeReport.h
index ab671d5..8ae0043 100644
--- a/include/osmocom/ranap/RANAP_RABDataVolumeReport.h
+++ b/include/osmocom/ranap/RANAP_RABDataVolumeReport.h
@@ -24,7 +24,7 @@
 
 /* RANAP_RABDataVolumeReport */
 typedef struct RANAP_RABDataVolumeReport {
-	A_SEQUENCE_OF(struct MemberN {
+	A_SEQUENCE_OF(struct ranap_MemberN {
 		RANAP_UnsuccessfullyTransmittedDataVolume_t	 dl_UnsuccessfullyTransmittedDataVolume;
 		RANAP_DataVolumeReference_t	*dataVolumeReference	/* OPTIONAL */;
 		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
diff --git a/include/osmocom/ranap/RANAP_RABParametersList.h b/include/osmocom/ranap/RANAP_RABParametersList.h
index f3bec06..c05c631 100644
--- a/include/osmocom/ranap/RANAP_RABParametersList.h
+++ b/include/osmocom/ranap/RANAP_RABParametersList.h
@@ -26,7 +26,7 @@
 
 /* RANAP_RABParametersList */
 typedef struct RANAP_RABParametersList {
-	A_SEQUENCE_OF(struct MemberB {
+	A_SEQUENCE_OF(struct ranap_MemberB {
 		RANAP_RAB_ID_t	 rab_Id;
 		RANAP_CN_DomainIndicator_t	 cn_domain;
 		RANAP_RABDataVolumeReport_t	*rabDataVolumeReport	/* OPTIONAL */;
diff --git a/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h b/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h
index 149db08..ca5fd9f 100644
--- a/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h
+++ b/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h
@@ -24,7 +24,7 @@
 
 /* RANAP_UnsuccessfulLinking-IEs */
 typedef struct RANAP_UnsuccessfulLinking_IEs {
-	A_SEQUENCE_OF(struct MemberD {
+	A_SEQUENCE_OF(struct ranap_MemberD {
 		RANAP_TMGI_t	 tMGI;
 		RANAP_Cause_t	 cause;
 		RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
diff --git a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
index c10dc14..d16a021 100644
--- a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
@@ -25,7 +25,7 @@
 
 /* RUA_CriticalityDiagnostics-IE-List */
 typedef struct RUA_CriticalityDiagnostics_IE_List {
-	A_SEQUENCE_OF(struct Member {
+	A_SEQUENCE_OF(struct rua_Member {
 		RUA_Criticality_t	 iECriticality;
 		RUA_ProtocolIE_ID_t	 iE_ID;
 		RUA_TypeOfError_t	 typeOfError;
diff --git a/include/osmocom/rua/RUA_DirectTransfer.h b/include/osmocom/rua/RUA_DirectTransfer.h
index 223bf83..23280e2 100644
--- a/include/osmocom/rua/RUA_DirectTransfer.h
+++ b/include/osmocom/rua/RUA_DirectTransfer.h
@@ -22,7 +22,7 @@
 
 /* RUA_DirectTransfer */
 typedef struct RUA_DirectTransfer {
-	struct directTransfer_ies {
+	struct rua_directTransfer_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 bdc997d..1b3ce12 100644
--- a/include/osmocom/rua/RUA_ErrorIndication.h
+++ b/include/osmocom/rua/RUA_ErrorIndication.h
@@ -22,7 +22,7 @@
 
 /* RUA_ErrorIndication */
 typedef struct RUA_ErrorIndication {
-	struct errorIndication_ies {
+	struct rua_errorIndication_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h b/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h
index 2d2fa40..7667735 100644
--- a/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h
@@ -25,7 +25,7 @@
 
 /* SABP_CriticalityDiagnostics-IE-List */
 typedef struct SABP_CriticalityDiagnostics_IE_List {
-	A_SEQUENCE_OF(struct Member {
+	A_SEQUENCE_OF(struct sabp_Member {
 		SABP_Criticality_t	 iECriticality;
 		SABP_ProtocolIE_ID_t	 iE_ID;
 		SABP_RepetitionNumber0_t	*repetitionNumber	/* OPTIONAL */;
diff --git a/include/osmocom/sabp/SABP_MessageStructure.h b/include/osmocom/sabp/SABP_MessageStructure.h
index f63f28e..fce5f73 100644
--- a/include/osmocom/sabp/SABP_MessageStructure.h
+++ b/include/osmocom/sabp/SABP_MessageStructure.h
@@ -24,7 +24,7 @@
 
 /* SABP_MessageStructure */
 typedef struct SABP_MessageStructure {
-	A_SEQUENCE_OF(struct MemberA {
+	A_SEQUENCE_OF(struct sabp_MemberA {
 		SABP_ProtocolIE_ID_t	 iE_ID;
 		SABP_RepetitionNumber1_t	*repetitionNumber	/* OPTIONAL */;
 		SABP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
diff --git a/src/hnbap/CriticalityDiagnostics-IE-List.c b/src/hnbap/CriticalityDiagnostics-IE-List.c
index b3f48e8..f30ad6f 100644
--- a/src/hnbap/CriticalityDiagnostics-IE-List.c
+++ b/src/hnbap/CriticalityDiagnostics-IE-List.c
@@ -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 hnbap_Member, iECriticality),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_Criticality,
@@ -22,7 +22,7 @@
 		0,
 		"iECriticality"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID),
+	{ ATF_NOFLAGS, 0, offsetof(struct hnbap_Member, iE_ID),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_ProtocolIE_ID,
@@ -31,7 +31,7 @@
 		0,
 		"iE-ID"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct Member, typeOfError),
+	{ ATF_NOFLAGS, 0, offsetof(struct hnbap_Member, typeOfError),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_TypeOfError,
@@ -40,7 +40,7 @@
 		0,
 		"typeOfError"
 		},
-	{ ATF_POINTER, 1, offsetof(struct Member, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct hnbap_Member, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_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 hnbap_Member),
+	offsetof(struct hnbap_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/hnbap/ErrorIndication.c b/src/hnbap/ErrorIndication.c
index 9765617..4c802fb 100644
--- a/src/hnbap/ErrorIndication.c
+++ b/src/hnbap/ErrorIndication.c
@@ -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 hnbap_errorIndication_ies),
+	offsetof(struct hnbap_errorIndication_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/ranap/RANAP_AuthorisedPLMNs.c b/src/ranap/RANAP_AuthorisedPLMNs.c
index b25c22e..fa9eb99 100644
--- a/src/ranap/RANAP_AuthorisedPLMNs.c
+++ b/src/ranap/RANAP_AuthorisedPLMNs.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberC_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberC, pLMNidentity),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberC, pLMNidentity),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_PLMNidentity,
@@ -21,7 +21,7 @@
 		0,
 		"pLMNidentity"
 		},
-	{ ATF_POINTER, 2, offsetof(struct MemberC, authorisedSNAsList),
+	{ ATF_POINTER, 2, offsetof(struct ranap_MemberC, authorisedSNAsList),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_AuthorisedSNAs,
@@ -30,7 +30,7 @@
 		0,
 		"authorisedSNAsList"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberC, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_MemberC, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_IE_Extensions,
@@ -50,8 +50,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberC_specs_2 = {
-	sizeof(struct MemberC),
-	offsetof(struct MemberC, _asn_ctx),
+	sizeof(struct ranap_MemberC),
+	offsetof(struct ranap_MemberC, _asn_ctx),
 	asn_MAP_MemberC_tag2el_2,
 	3,	/* Count of tags in the map */
 	asn_MAP_MemberC_oms_2,	/* Optional members */
diff --git a/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c b/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c
index 044a235..2a077a9 100644
--- a/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c
+++ b/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberG_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberG, iECriticality),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberG, iECriticality),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_Criticality,
@@ -21,7 +21,7 @@
 		0,
 		"iECriticality"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberG, iE_ID),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberG, iE_ID),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_ProtocolIE_ID,
@@ -30,7 +30,7 @@
 		0,
 		"iE-ID"
 		},
-	{ ATF_POINTER, 2, offsetof(struct MemberG, repetitionNumber),
+	{ ATF_POINTER, 2, offsetof(struct ranap_MemberG, repetitionNumber),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_RepetitionNumber0,
@@ -39,7 +39,7 @@
 		0,
 		"repetitionNumber"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberG, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_MemberG, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_IE_Extensions,
@@ -60,8 +60,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberG_specs_2 = {
-	sizeof(struct MemberG),
-	offsetof(struct MemberG, _asn_ctx),
+	sizeof(struct ranap_MemberG),
+	offsetof(struct ranap_MemberG, _asn_ctx),
 	asn_MAP_MemberG_tag2el_2,
 	4,	/* Count of tags in the map */
 	asn_MAP_MemberG_oms_2,	/* Optional members */
diff --git a/src/ranap/RANAP_DataVolumeList.c b/src/ranap/RANAP_DataVolumeList.c
index 5be74e1..b3ab16b 100644
--- a/src/ranap/RANAP_DataVolumeList.c
+++ b/src/ranap/RANAP_DataVolumeList.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberH_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberH, dl_UnsuccessfullyTransmittedDataVolume),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberH, dl_UnsuccessfullyTransmittedDataVolume),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_UnsuccessfullyTransmittedDataVolume,
@@ -21,7 +21,7 @@
 		0,
 		"dl-UnsuccessfullyTransmittedDataVolume"
 		},
-	{ ATF_POINTER, 2, offsetof(struct MemberH, dataVolumeReference),
+	{ ATF_POINTER, 2, offsetof(struct ranap_MemberH, dataVolumeReference),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_DataVolumeReference,
@@ -30,7 +30,7 @@
 		0,
 		"dataVolumeReference"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberH, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_MemberH, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_ProtocolExtensionContainer,
@@ -50,8 +50,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberH_specs_2 = {
-	sizeof(struct MemberH),
-	offsetof(struct MemberH, _asn_ctx),
+	sizeof(struct ranap_MemberH),
+	offsetof(struct ranap_MemberH, _asn_ctx),
 	asn_MAP_MemberH_tag2el_2,
 	3,	/* Count of tags in the map */
 	asn_MAP_MemberH_oms_2,	/* Optional members */
diff --git a/src/ranap/RANAP_DirectTransfer.c b/src/ranap/RANAP_DirectTransfer.c
index 03fed10..ec89e2d 100644
--- a/src/ranap/RANAP_DirectTransfer.c
+++ b/src/ranap/RANAP_DirectTransfer.c
@@ -58,8 +58,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 ranap_directTransfer_ies),
+	offsetof(struct ranap_directTransfer_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/ranap/RANAP_EUTRANFrequencies.c b/src/ranap/RANAP_EUTRANFrequencies.c
index f6faca6..47ffcd8 100644
--- a/src/ranap/RANAP_EUTRANFrequencies.c
+++ b/src/ranap/RANAP_EUTRANFrequencies.c
@@ -42,7 +42,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberJ_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberJ, earfcn),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberJ, earfcn),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
@@ -51,7 +51,7 @@
 		0,
 		"earfcn"
 		},
-	{ ATF_POINTER, 2, offsetof(struct MemberJ, measBand),
+	{ ATF_POINTER, 2, offsetof(struct ranap_MemberJ, measBand),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_MeasBand,
@@ -60,7 +60,7 @@
 		0,
 		"measBand"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberJ, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_MemberJ, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_IE_Extensions,
@@ -80,8 +80,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberJ_specs_2 = {
-	sizeof(struct MemberJ),
-	offsetof(struct MemberJ, _asn_ctx),
+	sizeof(struct ranap_MemberJ),
+	offsetof(struct ranap_MemberJ, _asn_ctx),
 	asn_MAP_MemberJ_tag2el_2,
 	3,	/* Count of tags in the map */
 	asn_MAP_MemberJ_oms_2,	/* Optional members */
diff --git a/src/ranap/RANAP_ErrorIndication.c b/src/ranap/RANAP_ErrorIndication.c
index 4fcb502..71e9c4d 100644
--- a/src/ranap/RANAP_ErrorIndication.c
+++ b/src/ranap/RANAP_ErrorIndication.c
@@ -58,8 +58,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 ranap_errorIndication_ies),
+	offsetof(struct ranap_errorIndication_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/ranap/RANAP_GA-Polygon.c b/src/ranap/RANAP_GA-Polygon.c
index 0e9979f..7aea850 100644
--- a/src/ranap/RANAP_GA-Polygon.c
+++ b/src/ranap/RANAP_GA-Polygon.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct Member, geographicalCoordinates),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_Member, geographicalCoordinates),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_GeographicalCoordinates,
@@ -21,7 +21,7 @@
 		0,
 		"geographicalCoordinates"
 		},
-	{ ATF_POINTER, 1, offsetof(struct Member, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_Member, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_IE_Extensions,
@@ -40,8 +40,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct Member),
-	offsetof(struct Member, _asn_ctx),
+	sizeof(struct ranap_Member),
+	offsetof(struct ranap_Member, _asn_ctx),
 	asn_MAP_Member_tag2el_2,
 	2,	/* Count of tags in the map */
 	asn_MAP_Member_oms_2,	/* Optional members */
diff --git a/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c b/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c
index 4055055..b6aa203 100644
--- a/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c
+++ b/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberF_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberF, tMGI),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberF, tMGI),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_TMGI,
@@ -21,7 +21,7 @@
 		0,
 		"tMGI"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberF, mBMS_PTP_RAB_ID),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberF, mBMS_PTP_RAB_ID),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_MBMS_PTP_RAB_ID,
@@ -30,7 +30,7 @@
 		0,
 		"mBMS-PTP-RAB-ID"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberF, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_MemberF, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_ProtocolExtensionContainer,
@@ -50,8 +50,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberF_specs_2 = {
-	sizeof(struct MemberF),
-	offsetof(struct MemberF, _asn_ctx),
+	sizeof(struct ranap_MemberF),
+	offsetof(struct ranap_MemberF, _asn_ctx),
 	asn_MAP_MemberF_tag2el_2,
 	3,	/* Count of tags in the map */
 	asn_MAP_MemberF_oms_2,	/* Optional members */
diff --git a/src/ranap/RANAP_LA-LIST.c b/src/ranap/RANAP_LA-LIST.c
index 59793d8..dbe62fc 100644
--- a/src/ranap/RANAP_LA-LIST.c
+++ b/src/ranap/RANAP_LA-LIST.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberA_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberA, lAC),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberA, lAC),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_LAC,
@@ -21,7 +21,7 @@
 		0,
 		"lAC"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberA, listOF_SNAs),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberA, listOF_SNAs),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_ListOF_SNAs,
@@ -30,7 +30,7 @@
 		0,
 		"listOF-SNAs"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberA, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_MemberA, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_IE_Extensions,
@@ -50,8 +50,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberA_specs_2 = {
-	sizeof(struct MemberA),
-	offsetof(struct MemberA, _asn_ctx),
+	sizeof(struct ranap_MemberA),
+	offsetof(struct ranap_MemberA, _asn_ctx),
 	asn_MAP_MemberA_tag2el_2,
 	3,	/* Count of tags in the map */
 	asn_MAP_MemberA_oms_2,	/* Optional members */
diff --git a/src/ranap/RANAP_LeftMBMSBearerService-IEs.c b/src/ranap/RANAP_LeftMBMSBearerService-IEs.c
index b6f00f1..05f2eb3 100644
--- a/src/ranap/RANAP_LeftMBMSBearerService-IEs.c
+++ b/src/ranap/RANAP_LeftMBMSBearerService-IEs.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberK_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberK, tMGI),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberK, tMGI),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_TMGI,
@@ -21,7 +21,7 @@
 		0,
 		"tMGI"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberK, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_MemberK, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_ProtocolExtensionContainer,
@@ -40,8 +40,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberK_specs_2 = {
-	sizeof(struct MemberK),
-	offsetof(struct MemberK, _asn_ctx),
+	sizeof(struct ranap_MemberK),
+	offsetof(struct ranap_MemberK, _asn_ctx),
 	asn_MAP_MemberK_tag2el_2,
 	2,	/* Count of tags in the map */
 	asn_MAP_MemberK_oms_2,	/* Optional members */
diff --git a/src/ranap/RANAP_MessageStructure.c b/src/ranap/RANAP_MessageStructure.c
index 92dab9d..0fe6257 100644
--- a/src/ranap/RANAP_MessageStructure.c
+++ b/src/ranap/RANAP_MessageStructure.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberL_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberL, iE_ID),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberL, iE_ID),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_ProtocolIE_ID,
@@ -21,7 +21,7 @@
 		0,
 		"iE-ID"
 		},
-	{ ATF_POINTER, 2, offsetof(struct MemberL, repetitionNumber),
+	{ ATF_POINTER, 2, offsetof(struct ranap_MemberL, repetitionNumber),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_RepetitionNumber1,
@@ -30,7 +30,7 @@
 		0,
 		"repetitionNumber"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberL, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_MemberL, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_IE_Extensions,
@@ -50,8 +50,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberL_specs_2 = {
-	sizeof(struct MemberL),
-	offsetof(struct MemberL, _asn_ctx),
+	sizeof(struct ranap_MemberL),
+	offsetof(struct ranap_MemberL, _asn_ctx),
 	asn_MAP_MemberL_tag2el_2,
 	3,	/* Count of tags in the map */
 	asn_MAP_MemberL_oms_2,	/* Optional members */
diff --git a/src/ranap/RANAP_PLMNs-in-shared-network.c b/src/ranap/RANAP_PLMNs-in-shared-network.c
index e98d5e2..d504509 100644
--- a/src/ranap/RANAP_PLMNs-in-shared-network.c
+++ b/src/ranap/RANAP_PLMNs-in-shared-network.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberM_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberM, pLMNidentity),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberM, pLMNidentity),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_PLMNidentity,
@@ -21,7 +21,7 @@
 		0,
 		"pLMNidentity"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberM, lA_LIST),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberM, lA_LIST),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_LA_LIST,
@@ -30,7 +30,7 @@
 		0,
 		"lA-LIST"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberM, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_MemberM, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_IE_Extensions,
@@ -50,8 +50,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberM_specs_2 = {
-	sizeof(struct MemberM),
-	offsetof(struct MemberM, _asn_ctx),
+	sizeof(struct ranap_MemberM),
+	offsetof(struct ranap_MemberM, _asn_ctx),
 	asn_MAP_MemberM_tag2el_2,
 	3,	/* Count of tags in the map */
 	asn_MAP_MemberM_oms_2,	/* Optional members */
diff --git a/src/ranap/RANAP_RABDataVolumeReport.c b/src/ranap/RANAP_RABDataVolumeReport.c
index 6be90da..b049046 100644
--- a/src/ranap/RANAP_RABDataVolumeReport.c
+++ b/src/ranap/RANAP_RABDataVolumeReport.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberN_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberN, dl_UnsuccessfullyTransmittedDataVolume),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberN, dl_UnsuccessfullyTransmittedDataVolume),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_UnsuccessfullyTransmittedDataVolume,
@@ -21,7 +21,7 @@
 		0,
 		"dl-UnsuccessfullyTransmittedDataVolume"
 		},
-	{ ATF_POINTER, 2, offsetof(struct MemberN, dataVolumeReference),
+	{ ATF_POINTER, 2, offsetof(struct ranap_MemberN, dataVolumeReference),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_DataVolumeReference,
@@ -30,7 +30,7 @@
 		0,
 		"dataVolumeReference"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberN, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_MemberN, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_IE_Extensions,
@@ -50,8 +50,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberN_specs_2 = {
-	sizeof(struct MemberN),
-	offsetof(struct MemberN, _asn_ctx),
+	sizeof(struct ranap_MemberN),
+	offsetof(struct ranap_MemberN, _asn_ctx),
 	asn_MAP_MemberN_tag2el_2,
 	3,	/* Count of tags in the map */
 	asn_MAP_MemberN_oms_2,	/* Optional members */
diff --git a/src/ranap/RANAP_RABParametersList.c b/src/ranap/RANAP_RABParametersList.c
index 89fe75b..5dc60c2 100644
--- a/src/ranap/RANAP_RABParametersList.c
+++ b/src/ranap/RANAP_RABParametersList.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberB_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberB, rab_Id),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberB, rab_Id),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_RAB_ID,
@@ -21,7 +21,7 @@
 		0,
 		"rab-Id"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberB, cn_domain),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberB, cn_domain),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_CN_DomainIndicator,
@@ -30,7 +30,7 @@
 		0,
 		"cn-domain"
 		},
-	{ ATF_POINTER, 3, offsetof(struct MemberB, rabDataVolumeReport),
+	{ ATF_POINTER, 3, offsetof(struct ranap_MemberB, rabDataVolumeReport),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_RABDataVolumeReport,
@@ -39,7 +39,7 @@
 		0,
 		"rabDataVolumeReport"
 		},
-	{ ATF_POINTER, 2, offsetof(struct MemberB, upInformation),
+	{ ATF_POINTER, 2, offsetof(struct ranap_MemberB, upInformation),
 		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_UPInformation,
@@ -48,7 +48,7 @@
 		0,
 		"upInformation"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberB, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_MemberB, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_IE_Extensions,
@@ -70,8 +70,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberB_specs_2 = {
-	sizeof(struct MemberB),
-	offsetof(struct MemberB, _asn_ctx),
+	sizeof(struct ranap_MemberB),
+	offsetof(struct ranap_MemberB, _asn_ctx),
 	asn_MAP_MemberB_tag2el_2,
 	5,	/* Count of tags in the map */
 	asn_MAP_MemberB_oms_2,	/* Optional members */
diff --git a/src/ranap/RANAP_UnsuccessfulLinking-IEs.c b/src/ranap/RANAP_UnsuccessfulLinking-IEs.c
index 9b18171..3a0974a 100644
--- a/src/ranap/RANAP_UnsuccessfulLinking-IEs.c
+++ b/src/ranap/RANAP_UnsuccessfulLinking-IEs.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberD_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberD, tMGI),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberD, tMGI),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_TMGI,
@@ -21,7 +21,7 @@
 		0,
 		"tMGI"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberD, cause),
+	{ ATF_NOFLAGS, 0, offsetof(struct ranap_MemberD, cause),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		+1,	/* EXPLICIT tag at current level */
 		&asn_DEF_RANAP_Cause,
@@ -30,7 +30,7 @@
 		0,
 		"cause"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberD, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct ranap_MemberD, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RANAP_ProtocolExtensionContainer,
@@ -50,8 +50,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberD_specs_2 = {
-	sizeof(struct MemberD),
-	offsetof(struct MemberD, _asn_ctx),
+	sizeof(struct ranap_MemberD),
+	offsetof(struct ranap_MemberD, _asn_ctx),
 	asn_MAP_MemberD_tag2el_2,
 	3,	/* Count of tags in the map */
 	asn_MAP_MemberD_oms_2,	/* Optional members */
diff --git a/src/rua/RUA_CriticalityDiagnostics-IE-List.c b/src/rua/RUA_CriticalityDiagnostics-IE-List.c
index 55e4657..8ef0e4f 100644
--- a/src/rua/RUA_CriticalityDiagnostics-IE-List.c
+++ b/src/rua/RUA_CriticalityDiagnostics-IE-List.c
@@ -12,7 +12,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_Member, iECriticality),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_Criticality,
@@ -21,7 +21,7 @@
 		0,
 		"iECriticality"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID),
+	{ ATF_NOFLAGS, 0, offsetof(struct rua_Member, iE_ID),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_ProtocolIE_ID,
@@ -30,7 +30,7 @@
 		0,
 		"iE-ID"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct Member, typeOfError),
+	{ ATF_NOFLAGS, 0, offsetof(struct rua_Member, typeOfError),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_TypeOfError,
@@ -39,7 +39,7 @@
 		0,
 		"typeOfError"
 		},
-	{ ATF_POINTER, 1, offsetof(struct Member, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct rua_Member, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_RUA_IE_Extensions,
@@ -60,8 +60,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_Member),
+	offsetof(struct rua_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_DirectTransfer.c b/src/rua/RUA_DirectTransfer.c
index 8036517..aeb0675 100644
--- a/src/rua/RUA_DirectTransfer.c
+++ b/src/rua/RUA_DirectTransfer.c
@@ -58,8 +58,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_ies),
+	offsetof(struct rua_directTransfer_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 d95ff32..f3210ee 100644
--- a/src/rua/RUA_ErrorIndication.c
+++ b/src/rua/RUA_ErrorIndication.c
@@ -58,8 +58,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_ies),
+	offsetof(struct rua_errorIndication_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/sabp/SABP_CriticalityDiagnostics-IE-List.c b/src/sabp/SABP_CriticalityDiagnostics-IE-List.c
index 8d5c403..3aaf867 100644
--- a/src/sabp/SABP_CriticalityDiagnostics-IE-List.c
+++ b/src/sabp/SABP_CriticalityDiagnostics-IE-List.c
@@ -12,7 +12,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 sabp_Member, iECriticality),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_SABP_Criticality,
@@ -21,7 +21,7 @@
 		0,
 		"iECriticality"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID),
+	{ ATF_NOFLAGS, 0, offsetof(struct sabp_Member, iE_ID),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_SABP_ProtocolIE_ID,
@@ -30,7 +30,7 @@
 		0,
 		"iE-ID"
 		},
-	{ ATF_POINTER, 2, offsetof(struct Member, repetitionNumber),
+	{ ATF_POINTER, 2, offsetof(struct sabp_Member, repetitionNumber),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_SABP_RepetitionNumber0,
@@ -39,7 +39,7 @@
 		0,
 		"repetitionNumber"
 		},
-	{ ATF_POINTER, 1, offsetof(struct Member, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct sabp_Member, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_SABP_IE_Extensions,
@@ -60,8 +60,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 sabp_Member),
+	offsetof(struct sabp_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/sabp/SABP_MessageStructure.c b/src/sabp/SABP_MessageStructure.c
index db4c0d6..3c60c1b 100644
--- a/src/sabp/SABP_MessageStructure.c
+++ b/src/sabp/SABP_MessageStructure.c
@@ -12,7 +12,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_MemberA_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct MemberA, iE_ID),
+	{ ATF_NOFLAGS, 0, offsetof(struct sabp_MemberA, iE_ID),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_SABP_ProtocolIE_ID,
@@ -21,7 +21,7 @@
 		0,
 		"iE-ID"
 		},
-	{ ATF_POINTER, 2, offsetof(struct MemberA, repetitionNumber),
+	{ ATF_POINTER, 2, offsetof(struct sabp_MemberA, repetitionNumber),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_SABP_RepetitionNumber1,
@@ -30,7 +30,7 @@
 		0,
 		"repetitionNumber"
 		},
-	{ ATF_POINTER, 1, offsetof(struct MemberA, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct sabp_MemberA, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_SABP_IE_Extensions,
@@ -50,8 +50,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MemberA_specs_2 = {
-	sizeof(struct MemberA),
-	offsetof(struct MemberA, _asn_ctx),
+	sizeof(struct sabp_MemberA),
+	offsetof(struct sabp_MemberA, _asn_ctx),
 	asn_MAP_MemberA_tag2el_2,
 	3,	/* Count of tags in the map */
 	asn_MAP_MemberA_oms_2,	/* Optional members */

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

Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: I552fc028c7d08c880fdb844ece75816602c5bb67
Gerrit-Change-Number: 25888
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/20211021/c6a54491/attachment.htm>


More information about the gerrit-log mailing list