E2AP Abstraction Changes 07/4907/2
authorsjana <sj492a@att.com>
Thu, 22 Oct 2020 17:05:48 +0000 (10:05 -0700)
committersjana <sj492a@att.com>
Thu, 22 Oct 2020 18:19:16 +0000 (11:19 -0700)
Issue-ID: RICAPP-119

Signed-off-by: sjana <sj492a@att.com>
Change-Id: I3b1b5721bc2004a44eeb5c9e8f754e6a0679ef62

261 files changed:
asn1c_defs/Cause.c
asn1c_defs/Cause.h
asn1c_defs/CauseMisc.c
asn1c_defs/CauseMisc.h
asn1c_defs/CauseProtocol.c
asn1c_defs/CauseProtocol.h
asn1c_defs/CauseRIC.c
asn1c_defs/CauseRIC.h
asn1c_defs/CauseRICservice.c
asn1c_defs/CauseRICservice.h
asn1c_defs/CauseTransport.c
asn1c_defs/CauseTransport.h
asn1c_defs/Criticality.c
asn1c_defs/Criticality.h
asn1c_defs/CriticalityDiagnostics-IE-Item.c
asn1c_defs/CriticalityDiagnostics-IE-Item.h
asn1c_defs/CriticalityDiagnostics-IE-List.c
asn1c_defs/CriticalityDiagnostics-IE-List.h
asn1c_defs/CriticalityDiagnostics.c
asn1c_defs/CriticalityDiagnostics.h
asn1c_defs/E2AP-PDU.c
asn1c_defs/E2AP-PDU.h
asn1c_defs/E2SM-HelloWorld-ActionDefinition-Format1.c
asn1c_defs/E2SM-HelloWorld-ActionDefinition-Format1.h
asn1c_defs/E2SM-HelloWorld-ActionDefinition.c
asn1c_defs/E2SM-HelloWorld-ActionDefinition.h
asn1c_defs/E2SM-HelloWorld-ControlHeader-Format1.c
asn1c_defs/E2SM-HelloWorld-ControlHeader-Format1.h
asn1c_defs/E2SM-HelloWorld-ControlHeader.c
asn1c_defs/E2SM-HelloWorld-ControlHeader.h
asn1c_defs/E2SM-HelloWorld-ControlMessage-Format1.c
asn1c_defs/E2SM-HelloWorld-ControlMessage-Format1.h
asn1c_defs/E2SM-HelloWorld-ControlMessage.c
asn1c_defs/E2SM-HelloWorld-ControlMessage.h
asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition-Format1.c
asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition-Format1.h
asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition.c
asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition.h
asn1c_defs/E2SM-HelloWorld-IndicationHeader-Format1.c
asn1c_defs/E2SM-HelloWorld-IndicationHeader-Format1.h
asn1c_defs/E2SM-HelloWorld-IndicationHeader.c
asn1c_defs/E2SM-HelloWorld-IndicationHeader.h
asn1c_defs/E2SM-HelloWorld-IndicationMessage-Format1.c
asn1c_defs/E2SM-HelloWorld-IndicationMessage-Format1.h
asn1c_defs/E2SM-HelloWorld-IndicationMessage.c
asn1c_defs/E2SM-HelloWorld-IndicationMessage.h
asn1c_defs/E2setupFailure.c
asn1c_defs/E2setupFailure.h
asn1c_defs/E2setupRequest.c
asn1c_defs/E2setupRequest.h
asn1c_defs/E2setupResponse.c
asn1c_defs/E2setupResponse.h
asn1c_defs/ENB-ID-Choice.c
asn1c_defs/ENB-ID-Choice.h
asn1c_defs/ENB-ID.c
asn1c_defs/ENB-ID.h
asn1c_defs/ENGNB-ID.c
asn1c_defs/ENGNB-ID.h
asn1c_defs/ErrorIndication.c
asn1c_defs/ErrorIndication.h
asn1c_defs/GNB-CU-UP-ID.c
asn1c_defs/GNB-CU-UP-ID.h
asn1c_defs/GNB-DU-ID.c
asn1c_defs/GNB-DU-ID.h
asn1c_defs/GNB-ID-Choice.c
asn1c_defs/GNB-ID-Choice.h
asn1c_defs/GlobalE2node-ID.c
asn1c_defs/GlobalE2node-ID.h
asn1c_defs/GlobalE2node-eNB-ID.c
asn1c_defs/GlobalE2node-eNB-ID.h
asn1c_defs/GlobalE2node-en-gNB-ID.c
asn1c_defs/GlobalE2node-en-gNB-ID.h
asn1c_defs/GlobalE2node-gNB-ID.c
asn1c_defs/GlobalE2node-gNB-ID.h
asn1c_defs/GlobalE2node-ng-eNB-ID.c
asn1c_defs/GlobalE2node-ng-eNB-ID.h
asn1c_defs/GlobalENB-ID.c
asn1c_defs/GlobalENB-ID.h
asn1c_defs/GlobalRIC-ID.c
asn1c_defs/GlobalRIC-ID.h
asn1c_defs/GlobalenGNB-ID.c
asn1c_defs/GlobalenGNB-ID.h
asn1c_defs/GlobalgNB-ID.c
asn1c_defs/GlobalgNB-ID.h
asn1c_defs/GlobalngeNB-ID.c
asn1c_defs/GlobalngeNB-ID.h
asn1c_defs/HW-Header.c
asn1c_defs/HW-Header.h
asn1c_defs/HW-Message.c
asn1c_defs/HW-Message.h
asn1c_defs/HW-TriggerNature.c
asn1c_defs/HW-TriggerNature.h
asn1c_defs/InitiatingMessage.c
asn1c_defs/InitiatingMessage.h
asn1c_defs/NativeEnumerated.c
asn1c_defs/OCTET_STRING.c
asn1c_defs/PLMN-Identity.c
asn1c_defs/PLMN-Identity.h
asn1c_defs/Presence.c
asn1c_defs/Presence.h
asn1c_defs/ProcedureCode.c
asn1c_defs/ProcedureCode.h
asn1c_defs/ProtocolIE-Container.c
asn1c_defs/ProtocolIE-Container.h
asn1c_defs/ProtocolIE-ContainerList.c
asn1c_defs/ProtocolIE-ContainerList.h
asn1c_defs/ProtocolIE-ContainerPair.c
asn1c_defs/ProtocolIE-ContainerPair.h
asn1c_defs/ProtocolIE-ContainerPairList.c
asn1c_defs/ProtocolIE-ContainerPairList.h
asn1c_defs/ProtocolIE-Field.c
asn1c_defs/ProtocolIE-Field.h
asn1c_defs/ProtocolIE-FieldPair.c
asn1c_defs/ProtocolIE-FieldPair.h
asn1c_defs/ProtocolIE-ID.c
asn1c_defs/ProtocolIE-ID.h
asn1c_defs/ProtocolIE-SingleContainer.c
asn1c_defs/ProtocolIE-SingleContainer.h
asn1c_defs/RANfunction-Item.c
asn1c_defs/RANfunction-Item.h
asn1c_defs/RANfunctionDefinition.c
asn1c_defs/RANfunctionDefinition.h
asn1c_defs/RANfunctionID-Item.c
asn1c_defs/RANfunctionID-Item.h
asn1c_defs/RANfunctionID.c
asn1c_defs/RANfunctionID.h
asn1c_defs/RANfunctionIDcause-Item.c
asn1c_defs/RANfunctionIDcause-Item.h
asn1c_defs/RANfunctionRevision.c
asn1c_defs/RANfunctionRevision.h
asn1c_defs/RANfunctions-List.c
asn1c_defs/RANfunctions-List.h
asn1c_defs/RANfunctionsID-List.c
asn1c_defs/RANfunctionsID-List.h
asn1c_defs/RANfunctionsIDcause-List.c
asn1c_defs/RANfunctionsIDcause-List.h
asn1c_defs/RANparameter-ID.c
asn1c_defs/RANparameter-ID.h
asn1c_defs/RANparameter-Item.c
asn1c_defs/RANparameter-Item.h
asn1c_defs/RANparameter-List.c [new file with mode: 0644]
asn1c_defs/RANparameter-List.h [new file with mode: 0644]
asn1c_defs/RANparameter-Name.c
asn1c_defs/RANparameter-Name.h
asn1c_defs/RANparameter-Test.c
asn1c_defs/RANparameter-Test.h
asn1c_defs/RANparameter-Value.c
asn1c_defs/RANparameter-Value.h
asn1c_defs/RICaction-Admitted-Item.c
asn1c_defs/RICaction-Admitted-Item.h
asn1c_defs/RICaction-Admitted-List.c
asn1c_defs/RICaction-Admitted-List.h
asn1c_defs/RICaction-NotAdmitted-Item.c
asn1c_defs/RICaction-NotAdmitted-Item.h
asn1c_defs/RICaction-NotAdmitted-List.c
asn1c_defs/RICaction-NotAdmitted-List.h
asn1c_defs/RICaction-ToBeSetup-Item.c
asn1c_defs/RICaction-ToBeSetup-Item.h
asn1c_defs/RICactionDefinition.c
asn1c_defs/RICactionDefinition.h
asn1c_defs/RICactionID.c
asn1c_defs/RICactionID.h
asn1c_defs/RICactionType.c
asn1c_defs/RICactionType.h
asn1c_defs/RICactions-ToBeSetup-List.c
asn1c_defs/RICactions-ToBeSetup-List.h
asn1c_defs/RICcallProcessID.c
asn1c_defs/RICcallProcessID.h
asn1c_defs/RICcontrolAckRequest.c
asn1c_defs/RICcontrolAckRequest.h
asn1c_defs/RICcontrolAcknowledge.c
asn1c_defs/RICcontrolAcknowledge.h
asn1c_defs/RICcontrolFailure.c
asn1c_defs/RICcontrolFailure.h
asn1c_defs/RICcontrolHeader.c
asn1c_defs/RICcontrolHeader.h
asn1c_defs/RICcontrolMessage.c
asn1c_defs/RICcontrolMessage.h
asn1c_defs/RICcontrolOutcome.c
asn1c_defs/RICcontrolOutcome.h
asn1c_defs/RICcontrolRequest.c
asn1c_defs/RICcontrolRequest.h
asn1c_defs/RICcontrolStatus.c
asn1c_defs/RICcontrolStatus.h
asn1c_defs/RICeventTriggerDefinition.c
asn1c_defs/RICeventTriggerDefinition.h
asn1c_defs/RICindication.c
asn1c_defs/RICindication.h
asn1c_defs/RICindicationHeader.c
asn1c_defs/RICindicationHeader.h
asn1c_defs/RICindicationMessage.c
asn1c_defs/RICindicationMessage.h
asn1c_defs/RICindicationSN.c
asn1c_defs/RICindicationSN.h
asn1c_defs/RICindicationType.c
asn1c_defs/RICindicationType.h
asn1c_defs/RICrequestID.c
asn1c_defs/RICrequestID.h
asn1c_defs/RICserviceQuery.c
asn1c_defs/RICserviceQuery.h
asn1c_defs/RICserviceUpdate.c
asn1c_defs/RICserviceUpdate.h
asn1c_defs/RICserviceUpdateAcknowledge.c
asn1c_defs/RICserviceUpdateAcknowledge.h
asn1c_defs/RICserviceUpdateFailure.c
asn1c_defs/RICserviceUpdateFailure.h
asn1c_defs/RICsubscriptionDeleteFailure.c
asn1c_defs/RICsubscriptionDeleteFailure.h
asn1c_defs/RICsubscriptionDeleteRequest.c
asn1c_defs/RICsubscriptionDeleteRequest.h
asn1c_defs/RICsubscriptionDeleteResponse.c
asn1c_defs/RICsubscriptionDeleteResponse.h
asn1c_defs/RICsubscriptionDetails.c
asn1c_defs/RICsubscriptionDetails.h
asn1c_defs/RICsubscriptionFailure.c
asn1c_defs/RICsubscriptionFailure.h
asn1c_defs/RICsubscriptionRequest.c
asn1c_defs/RICsubscriptionRequest.h
asn1c_defs/RICsubscriptionResponse.c
asn1c_defs/RICsubscriptionResponse.h
asn1c_defs/RICsubsequentAction.c
asn1c_defs/RICsubsequentAction.h
asn1c_defs/RICsubsequentActionType.c
asn1c_defs/RICsubsequentActionType.h
asn1c_defs/RICtimeToWait.c
asn1c_defs/RICtimeToWait.h
asn1c_defs/RanParameter-List.c [new file with mode: 0644]
asn1c_defs/RanParameter-List.h [new file with mode: 0644]
asn1c_defs/ResetRequest.c
asn1c_defs/ResetRequest.h
asn1c_defs/ResetResponse.c
asn1c_defs/ResetResponse.h
asn1c_defs/SuccessfulOutcome.c
asn1c_defs/SuccessfulOutcome.h
asn1c_defs/TimeToWait.c
asn1c_defs/TimeToWait.h
asn1c_defs/TriggeringMessage.c
asn1c_defs/TriggeringMessage.h
asn1c_defs/TypeOfError.c
asn1c_defs/TypeOfError.h
asn1c_defs/UnsuccessfulOutcome.c
asn1c_defs/UnsuccessfulOutcome.h
asn1c_defs/asn_constant.h
asn1c_defs/constr_CHOICE.c
asn1c_defs/pdu_collection.c
src/xapp-asn/e2ap/e2ap_action.hpp [new file with mode: 0644]
src/xapp-asn/e2ap/e2ap_control.cc
src/xapp-asn/e2ap/e2ap_control.hpp
src/xapp-asn/e2ap/e2ap_indication.cc
src/xapp-asn/e2ap/e2ap_indication.hpp
src/xapp-asn/e2ap/e2ap_subscription_request.hpp [new file with mode: 0644]
src/xapp-asn/e2sm/e2sm_control.cc
src/xapp-asn/e2sm/e2sm_control.hpp
src/xapp-asn/e2sm/e2sm_indication.cc
src/xapp-asn/e2sm/e2sm_indication.hpp
src/xapp-asn/e2sm/e2sm_subscription.cc
src/xapp-asn/e2sm/e2sm_subscription.hpp
src/xapp-mgmt/msgs_proc.cc
src/xapp-mgmt/msgs_proc.hpp
src/xapp-mgmt/subs_mgmt.hpp
src/xapp.cc

index 216f970..f69ff74 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 0311e82..065ffd9 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 98cb877..3429d70 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index fe9470a..b7e336f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 007c664..4bf6e59 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index d074a19..5f25ada 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 81ca48b..e49ca72 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 9b8f9ec..72e66d0 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index fc06d4c..6411095 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 98989eb..82ea26a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index de4d52a..bec13d8 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 1a7ad59..e839e86 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index e3e69c8..b60cef0 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-CommonDataTypes"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2df73f9..68e455f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-CommonDataTypes"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 54b3fc9..42eb719 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 3aa9196..cb27d23 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 09410ff..697d4c4 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 3bbb58b..83f8f3e 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index d9b8977..c039e45 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 8c67719..90ee9a2 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index c14802f..b2d8966 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Descriptions"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 52a19b1..210b4f2 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Descriptions"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 484e72e..621fa32 100644 (file)
@@ -1,98 +1,23 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
 #include "E2SM-HelloWorld-ActionDefinition-Format1.h"
 
-#include "RANparameter-Item.h"
-static int
-memb_ranParameter_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
-                       asn_app_constraint_failed_f *ctfailcb, void *app_key) {
-       size_t size;
-       
-       if(!sptr) {
-               ASN__CTFAIL(app_key, td, sptr,
-                       "%s: value not given (%s:%d)",
-                       td->name, __FILE__, __LINE__);
-               return -1;
-       }
-       
-       /* Determine the number of elements */
-       size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
-       
-       if((size >= 1 && size <= 255)) {
-               /* Perform validation of the inner elements */
-               return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
-       } else {
-               ASN__CTFAIL(app_key, td, sptr,
-                       "%s: constraint failed (%s:%d)",
-                       td->name, __FILE__, __LINE__);
-               return -1;
-       }
-}
-
-static asn_per_constraints_t asn_PER_type_ranParameter_List_constr_2 CC_NOTUSED = {
-       { APC_UNCONSTRAINED,    -1, -1,  0,  0 },
-       { APC_CONSTRAINED,       8,  8,  1,  255 }      /* (SIZE(1..255)) */,
-       0, 0    /* No PER value map */
-};
-static asn_per_constraints_t asn_PER_memb_ranParameter_List_constr_2 CC_NOTUSED = {
-       { APC_UNCONSTRAINED,    -1, -1,  0,  0 },
-       { APC_CONSTRAINED,       8,  8,  1,  255 }      /* (SIZE(1..255)) */,
-       0, 0    /* No PER value map */
-};
-static asn_TYPE_member_t asn_MBR_ranParameter_List_2[] = {
-       { ATF_POINTER, 0, 0,
-               (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
-               0,
-               &asn_DEF_RANparameter_Item,
-               0,
-               { 0, 0, 0 },
-               0, 0, /* No default value */
-               ""
-               },
-};
-static const ber_tlv_tag_t asn_DEF_ranParameter_List_tags_2[] = {
-       (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-       (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static asn_SET_OF_specifics_t asn_SPC_ranParameter_List_specs_2 = {
-       sizeof(struct E2SM_HelloWorld_ActionDefinition_Format1__ranParameter_List),
-       offsetof(struct E2SM_HelloWorld_ActionDefinition_Format1__ranParameter_List, _asn_ctx),
-       0,      /* XER encoding is XMLDelimitedItemList */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_ranParameter_List_2 = {
-       "ranParameter-List",
-       "ranParameter-List",
-       &asn_OP_SEQUENCE_OF,
-       asn_DEF_ranParameter_List_tags_2,
-       sizeof(asn_DEF_ranParameter_List_tags_2)
-               /sizeof(asn_DEF_ranParameter_List_tags_2[0]) - 1, /* 1 */
-       asn_DEF_ranParameter_List_tags_2,       /* Same as above */
-       sizeof(asn_DEF_ranParameter_List_tags_2)
-               /sizeof(asn_DEF_ranParameter_List_tags_2[0]), /* 2 */
-       { 0, &asn_PER_type_ranParameter_List_constr_2, SEQUENCE_OF_constraint },
-       asn_MBR_ranParameter_List_2,
-       1,      /* Single element */
-       &asn_SPC_ranParameter_List_specs_2      /* Additional specs */
-};
-
 asn_TYPE_member_t asn_MBR_E2SM_HelloWorld_ActionDefinition_Format1_1[] = {
-       { ATF_POINTER, 1, offsetof(struct E2SM_HelloWorld_ActionDefinition_Format1, ranParameter_List),
+       { ATF_NOFLAGS, 0, offsetof(struct E2SM_HelloWorld_ActionDefinition_Format1, ranParameter_List),
                (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+               -1,     /* IMPLICIT tag at current level */
+               &asn_DEF_RANparameter_List,
                0,
-               &asn_DEF_ranParameter_List_2,
-               0,
-               { 0, &asn_PER_memb_ranParameter_List_constr_2,  memb_ranParameter_List_constraint_1 },
+               { 0, 0, 0 },
                0, 0, /* No default value */
                "ranParameter-List"
                },
 };
-static const int asn_MAP_E2SM_HelloWorld_ActionDefinition_Format1_oms_1[] = { 0 };
 static const ber_tlv_tag_t asn_DEF_E2SM_HelloWorld_ActionDefinition_Format1_tags_1[] = {
        (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
@@ -104,8 +29,7 @@ asn_SEQUENCE_specifics_t asn_SPC_E2SM_HelloWorld_ActionDefinition_Format1_specs_
        offsetof(struct E2SM_HelloWorld_ActionDefinition_Format1, _asn_ctx),
        asn_MAP_E2SM_HelloWorld_ActionDefinition_Format1_tag2el_1,
        1,      /* Count of tags in the map */
-       asn_MAP_E2SM_HelloWorld_ActionDefinition_Format1_oms_1, /* Optional members */
-       1, 0,   /* Root/Additions */
+       0, 0, 0,        /* Optional elements (not needed) */
        1,      /* First extension addition */
 };
 asn_TYPE_descriptor_t asn_DEF_E2SM_HelloWorld_ActionDefinition_Format1 = {
index 0419ffe..e361ccd 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <asn_SEQUENCE_OF.h>
-#include <constr_SEQUENCE_OF.h>
+#include "RANparameter-List.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Forward declarations */
-struct RANparameter_Item;
-
 /* E2SM-HelloWorld-ActionDefinition-Format1 */
 typedef struct E2SM_HelloWorld_ActionDefinition_Format1 {
-       struct E2SM_HelloWorld_ActionDefinition_Format1__ranParameter_List {
-               A_SEQUENCE_OF(struct RANparameter_Item) list;
-               
-               /* Context for parsing across buffer boundaries */
-               asn_struct_ctx_t _asn_ctx;
-       } *ranParameter_List;
+       RANparameter_List_t      ranParameter_List;
        /*
         * This type is extensible,
         * possible extensions are below.
index 668b36e..e097b32 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 4a5fc84..80e489a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 4e3dbe0..5dbebf9 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index f2b5d0a..cbb80b4 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 86a1c49..633a307 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 84dbf8b..22c78d5 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index ef07491..6c26443 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 17f8d37..edfd5ae 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 4ee48f2..7c9787b 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 62c0c5b..7b58d3b 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index c6a9bce..7424576 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 41346b4..62167db 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index b9e6d97..3d37608 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 007f0e8..f2edfd7 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2d709fd..c753e76 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 6cecbe0..747feb9 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index eaa21dd..43c12a6 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index d1ba457..c7a206d 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 6e883a1..e5acdc3 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 817e0cb..b2d5d89 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index dfdfb4a..6336c94 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index cd3e8b3..77fc36d 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 0fc15cd..0de5bbf 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index c0f0a80..177bb94 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 0f5a3a3..5c722b5 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 60ac19d..e616c54 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 04c0ea6..89c8189 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 3feb668..6e0cbaf 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 014dbeb..f5e95f4 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 0fd9d31..7bea7f5 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index f1b3faf..1e9f936 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 3f7d554..cc15d1e 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 635de20..46ac40e 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index fae9914..f5885f0 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 5225be3..cab3f7b 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index a3db103..9d50ca2 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 7fccd5d..b16eb48 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 231a64e..0bf723f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 76534e9..857a217 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 29b510c..8af72bb 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 538454e..14a6ba8 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index c51b572..a883727 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index a0c6820..dd56af6 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 7868eb7..4c6d47f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 14513f5..2251ef9 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 779350e..e189a86 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index c0b3768..9465de5 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 19e5500..1ea04f0 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 518e0f3..9014abc 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index f31f72b..0c39c6f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 58b345f..a89e588 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index bac3c1a..6f075a4 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 781c474..449b448 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index bd2c018..0942464 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 327ab7a..c35641a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2e53f41..2dc0c91 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index f97c722..6054641 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index e6e8ae8..cf96976 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 318370f..6178aee 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 52efce0..a31a056 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 650ae98..bb7615d 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 177a467..30aa1fb 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index d4c04f1..16dd229 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 7ac2f65..db20eb9 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index ffc7efd..60b8009 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 735d247..5d0643d 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index a19877e..f8db042 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index cc62d13..39a5b41 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 9c34727..b7d73cf 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Descriptions"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 1072067..ef22437 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Descriptions"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 800da97..50ffb1d 100644 (file)
@@ -97,7 +97,7 @@ NativeEnumerated_decode_uper(const asn_codec_ctx_t *opt_codec_ctx,
     const asn_INTEGER_specifics_t *specs = td->specifics;
     asn_dec_rval_t rval = { RC_OK, 0 };
        long *native = (long *)*sptr;
-       const asn_per_constraint_t *ct;
+       const asn_per_constraint_t *ct = NULL;
        long value;
 
        (void)opt_codec_ctx;
@@ -115,7 +115,7 @@ NativeEnumerated_decode_uper(const asn_codec_ctx_t *opt_codec_ctx,
 
        ASN_DEBUG("Decoding %s as NativeEnumerated", td->name);
 
-       if(ct->flags & APC_EXTENSIBLE) {
+       if(ct && ct->flags & APC_EXTENSIBLE) {
                int inext = per_get_few_bits(pd, 1);
                if(inext < 0) ASN__DECODE_STARVED;
                if(inext) ct = 0;
@@ -165,7 +165,7 @@ NativeEnumerated_encode_uper(const asn_TYPE_descriptor_t *td,
         (const asn_INTEGER_specifics_t *)td->specifics;
        asn_enc_rval_t er = {0,0,0};
        long native, value;
-       const asn_per_constraint_t *ct;
+       const asn_per_constraint_t *ct = NULL;
        int inext = 0;
        asn_INTEGER_enum_map_t key;
        const asn_INTEGER_enum_map_t *kf;
@@ -193,13 +193,13 @@ NativeEnumerated_encode_uper(const asn_TYPE_descriptor_t *td,
        }
        value = kf - specs->value2enum;
 
-       if(ct->range_bits >= 0) {
+       if(ct && ct->range_bits >= 0) {
                int cmpWith = specs->extension
                                ? specs->extension - 1 : specs->map_count;
                if(value >= cmpWith)
                        inext = 1;
        }
-       if(ct->flags & APC_EXTENSIBLE) {
+       if(ct && ct->flags & APC_EXTENSIBLE) {
                if(per_put_few_bits(po, inext, 1))
                        ASN__ENCODE_FAILED;
                if(inext) ct = 0;
@@ -236,7 +236,7 @@ NativeEnumerated_decode_aper(const asn_codec_ctx_t *opt_codec_ctx,
        const asn_INTEGER_specifics_t *specs = (const asn_INTEGER_specifics_t *)td->specifics;
        asn_dec_rval_t rval = { RC_OK, 0 };
        long *native = (long *)*sptr;
-       const asn_per_constraint_t *ct;
+       const asn_per_constraint_t *ct = NULL;
        long value;
 
        (void)opt_codec_ctx;
@@ -254,7 +254,7 @@ NativeEnumerated_decode_aper(const asn_codec_ctx_t *opt_codec_ctx,
 
        ASN_DEBUG("Decoding %s as NativeEnumerated", td->name);
 
-       if(ct->flags & APC_EXTENSIBLE) {
+       if(ct && ct->flags & APC_EXTENSIBLE) {
                int inext = per_get_few_bits(pd, 1);
                if(inext < 0) ASN__DECODE_STARVED;
                if(inext) ct = 0;
@@ -302,7 +302,7 @@ NativeEnumerated_encode_aper(const asn_TYPE_descriptor_t *td,
        const asn_INTEGER_specifics_t *specs = (const asn_INTEGER_specifics_t *)td->specifics;
        asn_enc_rval_t er = {0,0,0};
        long native, value;
-       const asn_per_constraint_t *ct;
+       const asn_per_constraint_t *ct = NULL;
        int inext = 0;
        asn_INTEGER_enum_map_t key;
        asn_INTEGER_enum_map_t *kf;
@@ -331,13 +331,13 @@ NativeEnumerated_encode_aper(const asn_TYPE_descriptor_t *td,
        }
        value = kf - specs->value2enum;
 
-       if(ct->range_bits >= 0) {
+       if(ct && ct->range_bits >= 0) {
                int cmpWith = specs->extension
                              ? specs->extension - 1 : specs->map_count;
                if(value >= cmpWith)
                        inext = 1;
        }
-       if(ct->flags & APC_EXTENSIBLE) {
+       if(ct && ct->flags & APC_EXTENSIBLE) {
                if(per_put_few_bits(po, inext, 1))
                        ASN__ENCODE_FAILED;
                if(inext) ct = 0;
index 432ce5a..ae34c96 100644 (file)
@@ -157,7 +157,7 @@ OS__add_stack_el(struct _stack *st) {
                nel = (struct _stack_el *)CALLOC(1, sizeof(struct _stack_el));
                if(nel == NULL)
                        return NULL;
-       
+
                if(st->tail) {
                        /* Increase a subcontainment depth */
                        nel->cont_level = st->tail->cont_level + 1;
@@ -745,7 +745,7 @@ OCTET_STRING__handle_control_chars(void *struct_ptr, const void *chunk_buf, size
                        return 0;
                }
        }
-       
+
        return -1;      /* No, it's not */
 }
 
@@ -1956,7 +1956,9 @@ OCTET_STRING_encode_aper(const asn_TYPE_descriptor_t *td,
                        ret = aper_put_length(po, csiz->upper_bound - csiz->lower_bound + 1, sizeinunits - csiz->lower_bound);
                        if(ret) ASN__ENCODE_FAILED;
                }
-               if (st->size > 2) { /* X.691 #16 NOTE 1 */
+               /* EB MOD
+                   AFAIU if lb != ub it is aligned whatever the number of bits */
+               if ((st->size > 2) || (csiz->lower_bound != csiz->upper_bound)) { /* X.691 #16.11 */
                        if (aper_put_align(po) < 0)
                                ASN__ENCODE_FAILED;
                }
index 0bee12e..13cb647 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index dcdfe18..cd3c495 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2e26921..3d79059 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-CommonDataTypes"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 7a7c767..342d661 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-CommonDataTypes"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index ad6f7e7..e249718 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-CommonDataTypes"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 89996de..b308887 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-CommonDataTypes"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 89e5e1a..26f0511 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 364495b..cbecfd9 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index d572233..e638670 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index e94a09c..6ad49b6 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 49ae4a7..9bd199d 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 03c2f74..957548a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2923ea5..981d0d9 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 50ff679..6f3603a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index caec745..0dc6e47 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2515bf4..335c767 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 82bda1a..8cb02cf 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 191ea27..5c52fc6 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 92c8c14..22f6915 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-CommonDataTypes"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index a6afe03..c09d2f3 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-CommonDataTypes"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 506b061..36d9c58 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 5cf2853..4f4214f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-Containers"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 9d60d21..e3db093 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 3877316..866ffce 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index bec3c36..2c284fc 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2fdead2..f9ebd15 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 7a2c15c..e34040d 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 30fb177..57e155a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index ca5602f..34ad369 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index e8ea3f6..ae17aaa 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index aca1f62..3ddc1cc 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index c4505b5..916f7fb 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 563dda0..034bf19 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 74853ea..12e4cab 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 12912e0..634938e 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 6a4a41a..aa6e23a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 3e5dda5..2f3b5a7 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 5313c5c..8b46859 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 75fa57f..3bb0da0 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index d1cbefd..4baf6c8 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index de87c0b..dcb4355 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
@@ -21,7 +21,7 @@ RANparameter_ID_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,
        
        value = *(const long *)sptr;
        
-       if((value >= 0 && value <= 255)) {
+       if((value >= 0 && value <= 100)) {
                /* Constraint check succeeded */
                return 0;
        } else {
@@ -37,7 +37,7 @@ RANparameter_ID_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,
  * so here we adjust the DEF accordingly.
  */
 asn_per_constraints_t asn_PER_type_RANparameter_ID_constr_1 CC_NOTUSED = {
-       { APC_CONSTRAINED,       8,  8,  0,  255 }      /* (0..255) */,
+       { APC_CONSTRAINED,       7,  7,  0,  100 }      /* (0..100) */,
        { APC_UNCONSTRAINED,    -1, -1,  0,  0 },
        0, 0    /* No PER value map */
 };
index 1295f53..42743e6 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index a944aed..5e9ae87 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index a254450..7f36c8c 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
diff --git a/asn1c_defs/RANparameter-List.c b/asn1c_defs/RANparameter-List.c
new file mode 100644 (file)
index 0000000..5f2ace2
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-HelloWorld-IEs"
+ *     found in "e2sm-HelloWorld-v001.asn"
+ *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
+ */
+
+#include "RANparameter-List.h"
+
+#include "RANparameter-Item.h"
+asn_per_constraints_t asn_PER_type_RANparameter_List_constr_1 CC_NOTUSED = {
+       { APC_UNCONSTRAINED,    -1, -1,  0,  0 },
+       { APC_CONSTRAINED,       7,  7,  1,  100 }      /* (SIZE(1..100)) */,
+       0, 0    /* No PER value map */
+};
+asn_TYPE_member_t asn_MBR_RANparameter_List_1[] = {
+       { ATF_POINTER, 0, 0,
+               (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+               0,
+               &asn_DEF_RANparameter_Item,
+               0,
+               { 0, 0, 0 },
+               0, 0, /* No default value */
+               ""
+               },
+};
+static const ber_tlv_tag_t asn_DEF_RANparameter_List_tags_1[] = {
+       (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+asn_SET_OF_specifics_t asn_SPC_RANparameter_List_specs_1 = {
+       sizeof(struct RANparameter_List),
+       offsetof(struct RANparameter_List, _asn_ctx),
+       0,      /* XER encoding is XMLDelimitedItemList */
+};
+asn_TYPE_descriptor_t asn_DEF_RANparameter_List = {
+       "RANparameter-List",
+       "RANparameter-List",
+       &asn_OP_SEQUENCE_OF,
+       asn_DEF_RANparameter_List_tags_1,
+       sizeof(asn_DEF_RANparameter_List_tags_1)
+               /sizeof(asn_DEF_RANparameter_List_tags_1[0]), /* 1 */
+       asn_DEF_RANparameter_List_tags_1,       /* Same as above */
+       sizeof(asn_DEF_RANparameter_List_tags_1)
+               /sizeof(asn_DEF_RANparameter_List_tags_1[0]), /* 1 */
+       { 0, &asn_PER_type_RANparameter_List_constr_1, SEQUENCE_OF_constraint },
+       asn_MBR_RANparameter_List_1,
+       1,      /* Single element */
+       &asn_SPC_RANparameter_List_specs_1      /* Additional specs */
+};
+
diff --git a/asn1c_defs/RANparameter-List.h b/asn1c_defs/RANparameter-List.h
new file mode 100644 (file)
index 0000000..18f09bb
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-HelloWorld-IEs"
+ *     found in "e2sm-HelloWorld-v001.asn"
+ *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
+ */
+
+#ifndef        _RANparameter_List_H_
+#define        _RANparameter_List_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct RANparameter_Item;
+
+/* RANparameter-List */
+typedef struct RANparameter_List {
+       A_SEQUENCE_OF(struct RANparameter_Item) list;
+       
+       /* Context for parsing across buffer boundaries */
+       asn_struct_ctx_t _asn_ctx;
+} RANparameter_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANparameter_List;
+extern asn_SET_OF_specifics_t asn_SPC_RANparameter_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_RANparameter_List_1[1];
+extern asn_per_constraints_t asn_PER_type_RANparameter_List_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RANparameter_List_H_ */
+#include <asn_internal.h>
index e37f98d..ad194c5 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 81be1af..d172dae 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 94d0d26..c6a2335 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index efbe744..5946432 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index b2f0e9b..bffcfb7 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index d5a7d5c..c1895d5 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-HelloWorld-IEs"
- *     found in "/home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn"
+ *     found in "e2sm-HelloWorld-v001.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 01034b5..1b01f80 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 52cada2..05883ba 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index acf003f..251a61a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 063508c..0f53cb1 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 364fcd3..747a529 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 73826cc..3d44090 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 4fdb387..a4f656f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 4406da9..a24aabb 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 1e8983b..580cc9f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index faf8bbf..c881c32 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 3fcd14e..220fc33 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 489c195..86bb4ef 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 0a94813..f3eb81d 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 851d5b3..068e0db 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 0469ed8..dec4ecf 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index bc4ae24..3add63f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index edf0d42..2107172 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 506bbb8..105ab79 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 26f1de5..7e19fa7 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 6f72308..e3ac800 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index e6028d7..aa6c5ea 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index bdefee2..e658c5e 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 6c14811..86dbf2b 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index f1d40b7..8e1fc3a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 3fcef66..507ed34 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 14b86d4..715dfeb 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 073f472..f3afae4 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 24c7187..6907190 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 8906e37..9aabdcc 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index dcd5ece..fc6a84c 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 49e615a..26e3048 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index f185ee3..d065421 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index e9aa676..d2ed2a1 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 18a8e9e..e7e3659 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 60c6fbf..b935667 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 8e09491..bb06dc0 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2aeaeab..ef4dc70 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 963c158..4b6258a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 52c6f62..5ae7d28 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 3cab9e2..fbf8c9d 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 77aa08e..223ec0c 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2ec1a1e..f1355c6 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 18db177..8cf70c9 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2b198ca..777829f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index e458b29..67bdff3 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 898a1c5..d07c9ed 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2fb4a3d..a77173f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index d665337..dac22be 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index cc350e3..bcb4982 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 4b3ab0a..4a06672 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 73f7fcc..c89e7a1 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 77c63e2..2c4ef8b 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 1a93f22..961cacb 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 613f8fd..3a00283 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 7792227..bf13534 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 0dc17cc..5be500f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index f3d1b01..8f180a7 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 78fe31f..f7fde09 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index f4344d9..0517d61 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 094e91e..605fd0c 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 170a7b5..8370454 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index bf69065..0b5abdb 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index bb9b5b3..3305596 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 9c5020c..15300ec 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 6d9cd43..fa3fdc6 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 7b7d497..dbd9442 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index cbcccfe..8c94d07 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 5d56ea2..24f9758 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index cecb478..3d64a72 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index a320a3f..61128d7 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index fc2bceb..8fe6994 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 9f6279b..3136496 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2ce9f49..0a4f0ef 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 1c1e484..ee65289 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 63f47b3..14bfc99 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 716dc6c..a172bd9 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 2df21d7..be4d248 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 3f6626c..442daa9 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
diff --git a/asn1c_defs/RanParameter-List.c b/asn1c_defs/RanParameter-List.c
new file mode 100644 (file)
index 0000000..8d15c9a
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-HelloWorld-IEs"
+ *     found in "e2sm-HelloWorld-v001.asn"
+ *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
+ */
+
+#include "RanParameter-List.h"
+
+#include "RANparameter-Item.h"
+asn_per_constraints_t asn_PER_type_RanParameter_List_constr_1 CC_NOTUSED = {
+       { APC_UNCONSTRAINED,    -1, -1,  0,  0 },
+       { APC_CONSTRAINED,       8,  8,  1,  255 }      /* (SIZE(1..255)) */,
+       0, 0    /* No PER value map */
+};
+asn_TYPE_member_t asn_MBR_RanParameter_List_1[] = {
+       { ATF_POINTER, 0, 0,
+               (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+               0,
+               &asn_DEF_RANparameter_Item,
+               0,
+               { 0, 0, 0 },
+               0, 0, /* No default value */
+               ""
+               },
+};
+static const ber_tlv_tag_t asn_DEF_RanParameter_List_tags_1[] = {
+       (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+asn_SET_OF_specifics_t asn_SPC_RanParameter_List_specs_1 = {
+       sizeof(struct RanParameter_List),
+       offsetof(struct RanParameter_List, _asn_ctx),
+       0,      /* XER encoding is XMLDelimitedItemList */
+};
+asn_TYPE_descriptor_t asn_DEF_RanParameter_List = {
+       "RanParameter-List",
+       "RanParameter-List",
+       &asn_OP_SEQUENCE_OF,
+       asn_DEF_RanParameter_List_tags_1,
+       sizeof(asn_DEF_RanParameter_List_tags_1)
+               /sizeof(asn_DEF_RanParameter_List_tags_1[0]), /* 1 */
+       asn_DEF_RanParameter_List_tags_1,       /* Same as above */
+       sizeof(asn_DEF_RanParameter_List_tags_1)
+               /sizeof(asn_DEF_RanParameter_List_tags_1[0]), /* 1 */
+       { 0, &asn_PER_type_RanParameter_List_constr_1, SEQUENCE_OF_constraint },
+       asn_MBR_RanParameter_List_1,
+       1,      /* Single element */
+       &asn_SPC_RanParameter_List_specs_1      /* Additional specs */
+};
+
diff --git a/asn1c_defs/RanParameter-List.h b/asn1c_defs/RanParameter-List.h
new file mode 100644 (file)
index 0000000..7c0ccc9
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-HelloWorld-IEs"
+ *     found in "e2sm-HelloWorld-v001.asn"
+ *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
+ */
+
+#ifndef        _RanParameter_List_H_
+#define        _RanParameter_List_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct RANparameter_Item;
+
+/* RanParameter-List */
+typedef struct RanParameter_List {
+       A_SEQUENCE_OF(struct RANparameter_Item) list;
+       
+       /* Context for parsing across buffer boundaries */
+       asn_struct_ctx_t _asn_ctx;
+} RanParameter_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RanParameter_List;
+extern asn_SET_OF_specifics_t asn_SPC_RanParameter_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_RanParameter_List_1[1];
+extern asn_per_constraints_t asn_PER_type_RanParameter_List_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RanParameter_List_H_ */
+#include <asn_internal.h>
index e70f0a9..824b194 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index f1bf2ae..228ff0e 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 92fc800..029dee1 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index c6e10ea..56a1007 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Contents"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 8e9941f..47948cd 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Descriptions"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 906aa20..ccd18a3 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Descriptions"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 6c1d6af..806aeca 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index a9ff45b..1e6cf0c 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 41f10ca..8ee80f8 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-CommonDataTypes"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index da7b498..0009bf5 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-CommonDataTypes"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index ad4e6cd..6276bda 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index b2cc876..0600d8a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-IEs"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 4483d36..993ef54 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Descriptions"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index 5d8386e..eb6830e 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2AP-PDU-Descriptions"
- *     found in "/home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn"
+ *     found in "e2ap-oran-wg3-v01.00.asn"
  *     `asn1c -fno-include-deps -fcompound-names -findirect-choice -gen-PER -no-gen-OER`
  */
 
index cdae2a4..a8a43d6 100644 (file)
@@ -13,7 +13,7 @@ extern "C" {
 #define maxnoofErrors (256)
 #define maxofRANfunctionID (256)
 #define maxofRICactionID (16)
-#define maxofRANParameters (255)
+#define maxofRANParameters (100)
 
 
 #ifdef __cplusplus
index 613e6ea..86dcbb0 100644 (file)
@@ -1017,6 +1017,7 @@ CHOICE_decode_aper(const asn_codec_ctx_t *opt_codec_ctx,
        const asn_CHOICE_specifics_t *specs = (const asn_CHOICE_specifics_t *)td->specifics;
        asn_dec_rval_t rv;
        const asn_per_constraint_t *ct;
+       const asn_per_constraint_t *ext_ct = NULL;
        asn_TYPE_member_t *elm; /* CHOICE's element */
        void *memb_ptr;
        void **memb_ptr2;
@@ -1042,9 +1043,13 @@ CHOICE_decode_aper(const asn_codec_ctx_t *opt_codec_ctx,
        if(ct && ct->flags & APC_EXTENSIBLE) {
                value = per_get_few_bits(pd, 1);
                if(value < 0) ASN__DECODE_STARVED;
-               if(value) ct = 0;       /* Not restricted */
+               if(value) {
+                 ext_ct = ct;
+                 ct = 0;       /* Not restricted */
+               }
        }
 
+
        if(ct && ct->range_bits >= 0) {
                value = per_get_few_bits(pd, ct->range_bits);
                if(value < 0) ASN__DECODE_STARVED;
@@ -1055,7 +1060,7 @@ CHOICE_decode_aper(const asn_codec_ctx_t *opt_codec_ctx,
        } else {
                if(specs->ext_start == -1)
                        ASN__DECODE_FAILED;
-               value = uper_get_nsnnwn(pd);
+               value = aper_get_nsnnwn(pd, ext_ct->range_bits);
                if(value < 0) ASN__DECODE_STARVED;
                value += specs->ext_start;
                if((unsigned)value >= td->elements_count)
@@ -1083,7 +1088,7 @@ CHOICE_decode_aper(const asn_codec_ctx_t *opt_codec_ctx,
                rv = elm->type->op->aper_decoder(opt_codec_ctx, elm->type,
                                                 elm->encoding_constraints.per_constraints, memb_ptr2, pd);
        } else {
-               rv = uper_open_type_get(opt_codec_ctx, elm->type,
+               rv = aper_open_type_get(opt_codec_ctx, elm->type,
                                        elm->encoding_constraints.per_constraints, memb_ptr2, pd);
        }
 
@@ -1099,10 +1104,12 @@ CHOICE_encode_aper(const asn_TYPE_descriptor_t *td,
                    const void *sptr, asn_per_outp_t *po) {
        const asn_CHOICE_specifics_t *specs = (const asn_CHOICE_specifics_t *)td->specifics;
        const asn_TYPE_member_t *elm; /* CHOICE's element */
-       const asn_per_constraint_t *ct;
+       const asn_per_constraint_t *ct = NULL;
+       const asn_per_constraint_t *ext_ct = NULL;
        const void *memb_ptr;
-       int present;
-
+       unsigned present;
+       int present_enc;
+       
        if(!sptr) ASN__ENCODE_FAILED;
 
        ASN_DEBUG("Encoding %s as CHOICE using ALIGNED PER", td->name);
@@ -1110,7 +1117,7 @@ CHOICE_encode_aper(const asn_TYPE_descriptor_t *td,
        if(constraints) ct = &constraints->value;
        else if(td->encoding_constraints.per_constraints)
                ct = &td->encoding_constraints.per_constraints->value;
-       else ct = 0;
+       else ct = NULL;
 
        present = _fetch_present_idx(sptr,
                                     specs->pres_offset, specs->pres_size);
@@ -1126,25 +1133,38 @@ CHOICE_encode_aper(const asn_TYPE_descriptor_t *td,
 
        /* Adjust if canonical order is different from natural order */
        if(specs->to_canonical_order)
-               present = specs->to_canonical_order[present];
-
+               present_enc = specs->to_canonical_order[present];
+       else
+               present_enc = present;
+       
        ASN_DEBUG("Encoding %s CHOICE element %d", td->name, present);
 
-       if(ct && ct->range_bits >= 0) {
-               if(present < ct->lower_bound
-                       || present > ct->upper_bound) {
-                       if(ct->flags & APC_EXTENSIBLE) {
-                               if(per_put_few_bits(po, 1, 1))
-                                       ASN__ENCODE_FAILED;
-                       } else {
-                               ASN__ENCODE_FAILED;
-                       }
-                       ct = 0;
-               }
+       if(ct && (ct->range_bits >= 0)) {
+         // Value is not within the range of the primary values ?
+         if(present < ct->lower_bound || present > ct->upper_bound) {
+           if(ct->flags & APC_EXTENSIBLE) {
+             ASN_DEBUG("CHOICE member %d (enc %d) is an extension (%ld..%ld)",
+                       present, present_enc, ct->lower_bound, ct->upper_bound);
+             // X691/23.5 Extension marker = 1 
+             if(per_put_few_bits(po, 1, 1)) {
+               ASN__ENCODE_FAILED;
+             }
+           } else {
+             ASN__ENCODE_FAILED;
+           }
+           // no more need of constraint.
+           ext_ct = ct;
+           ct = NULL;
+         }
        }
-       if(ct && ct->flags & APC_EXTENSIBLE) {
-               if(per_put_few_bits(po, 0, 1))
-                       ASN__ENCODE_FAILED;
+       
+       if(ct && (ct->flags & APC_EXTENSIBLE)) {
+         ASN_DEBUG("CHOICE member %d (enc %d) is not an extension (%ld..%ld)",
+                   present, present, ct->lower_bound, ct->upper_bound);
+         // X691.23.5 Extension marker = 0
+         if(per_put_few_bits(po, 0, 1)) {
+           ASN__ENCODE_FAILED;
+         }
        }
 
        elm = &td->elements[present];
@@ -1156,8 +1176,10 @@ CHOICE_encode_aper(const asn_TYPE_descriptor_t *td,
                memb_ptr = (const char *)sptr + elm->memb_offset;
        }
 
-       if(ct && ct->range_bits >= 0) {
-               if(per_put_few_bits(po, present, ct->range_bits))
+       if(ct && (ct->range_bits >= 0)) {
+               // By construction (ct != 0), the alternative value is a non extended one.
+               // X691/23.7 X691/23.6 alternative value encoded as a range_bits bits value.
+               if(per_put_few_bits(po, present_enc, ct->range_bits))
                        ASN__ENCODE_FAILED;
 
                return elm->type->op->aper_encoder(elm->type, elm->encoding_constraints.per_constraints,
@@ -1166,10 +1188,10 @@ CHOICE_encode_aper(const asn_TYPE_descriptor_t *td,
                asn_enc_rval_t rval = {0,0,0};
                if(specs->ext_start == -1)
                        ASN__ENCODE_FAILED;
-               if (ct) {
-                 if(aper_put_nsnnwn(po, ct->range_bits, present - specs->ext_start))
+               // X691/23.8 normally encoded as a small non negative whole number
+               
+               if(ext_ct && aper_put_nsnnwn(po, ext_ct->range_bits, present_enc - specs->ext_start))
                        ASN__ENCODE_FAILED;
-               }
                if(aper_open_type_put(elm->type, elm->encoding_constraints.per_constraints,
                                      memb_ptr, po))
                        ASN__ENCODE_FAILED;
index 3925869..32bd103 100644 (file)
@@ -11,20 +11,18 @@ extern struct asn_TYPE_descriptor_s asn_DEF_E2SM_HelloWorld_IndicationHeader;
 extern struct asn_TYPE_descriptor_s asn_DEF_E2SM_HelloWorld_IndicationMessage;
 extern struct asn_TYPE_descriptor_s asn_DEF_E2SM_HelloWorld_ControlHeader;
 extern struct asn_TYPE_descriptor_s asn_DEF_E2SM_HelloWorld_ControlMessage;
-extern struct asn_TYPE_descriptor_s asn_DEF_HW_ControlCommand;
 
 
 struct asn_TYPE_descriptor_s *asn_pdu_collection[] = {
-       /* From module E2AP-PDU-Descriptions in /home/sjana/ASN-Defns/e2ap-oran-wg3-v01.00.asn */
+       /* From module E2AP-PDU-Descriptions in e2ap-oran-wg3-v01.00.asn */
        &asn_DEF_E2AP_PDU,      
-       /* From module E2SM-HelloWorld-IEs in /home/sjana/ASN-Defns/e2sm-HelloWorld-v002.asn */
+       /* From module E2SM-HelloWorld-IEs in e2sm-HelloWorld-v001.asn */
        &asn_DEF_E2SM_HelloWorld_EventTriggerDefinition,        
        &asn_DEF_E2SM_HelloWorld_ActionDefinition,      
        &asn_DEF_E2SM_HelloWorld_IndicationHeader,      
        &asn_DEF_E2SM_HelloWorld_IndicationMessage,     
        &asn_DEF_E2SM_HelloWorld_ControlHeader, 
        &asn_DEF_E2SM_HelloWorld_ControlMessage,        
-       &asn_DEF_HW_ControlCommand,     
        0
 };
 
diff --git a/src/xapp-asn/e2ap/e2ap_action.hpp b/src/xapp-asn/e2ap/e2ap_action.hpp
new file mode 100644 (file)
index 0000000..b3eb4f0
--- /dev/null
@@ -0,0 +1,108 @@
+/*
+==================================================================================
+
+        Copyright (c) 2019-2020 AT&T Intellectual Property.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================================
+*/
+/*
+ * action_e2ap.hpp
+ *
+ *  Created on: Jun 30, 2020
+ *      Author: sjana
+ */
+
+#ifndef XAPP_ASN_REFACTOR_E2AP_ACTION_HPP_
+#define XAPP_ASN_REFACTOR_E2AP_ACTION_HPP_
+#define E2SM_SIZE ((int)128)
+
+#include <mdclog/mdclog.h>
+
+#include <string>
+#include <memory>
+#include <sstream>
+#include <vector>
+/*
+ RICaction-ToBeSetup-Item ::= SEQUENCE {
+       ricActionID                                     RICactionID,
+       ricActionType                           RICactionType,
+       ricActionDefinition                     RICactionDefinition     OPTIONAL,
+       ricSubsequentAction                     RICsubsequentAction     OPTIONAL,
+       ...
+}
+RICsubsequentAction ::=SEQUENCE{
+       ricSubsequentActionType         RICsubsequentActionType,
+       ricTimeToWait                           RICtimeToWait,
+       ...
+}
+
+*/
+
+
+template<typename E2SMActionDefinition>
+class E2APAction{
+
+public:
+       class ActionIEs{
+       private:
+                        bool is_ricSubsequentAction;
+                        unsigned int ricActionType, ricActionID,ricSubsequentActionType,ricTimeToWait;
+                        unsigned char ricActionDefinition[E2SM_SIZE];
+                        size_t ricActionDefinition_size = E2SM_SIZE;
+       public:
+                        ActionIEs():ricActionType(0),ricActionID(0),ricSubsequentActionType(0),ricTimeToWait(0),is_ricSubsequentAction(false){ };
+                        ActionIEs& set_ricSubsequentAction(int subsequentActionType, int timeToWait){
+                                is_ricSubsequentAction = true;
+                                ricSubsequentActionType = subsequentActionType;
+                                ricTimeToWait = timeToWait;
+                                return *this;
+                        };
+
+                        ActionIEs& set_ricActionDefinition(E2SMActionDefinition &e2smObj){
+                                bool res = e2smObj.encode(&(this->ricActionDefinition)[0],&this->ricActionDefinition_size);
+                                if(!res){
+                                        mdclog_write(MDCLOG_ERR, "Failed to encode: %s","RIC Action Definition");
+                                        mdclog_write(MDCLOG_ERR, "Error during encode: %s",e2smObj.get_error());
+
+                                } else {
+                                        mdclog_write(MDCLOG_INFO, "Successfully encoded: %s","RIC Action Definition");
+                                }
+                                return *this;
+                        };
+                        ActionIEs& set_ricActionID(int actionID){ricActionID = actionID; return *this;};
+                        ActionIEs& set_ricActionType(int actionType) {ricActionType = actionType; return *this;};
+
+                        int    get_ricActionID(){return this->ricActionID;};
+                        int    get_ricActionType() {return this->ricActionType;};
+                        bool   get_is_ricSubsequentAction() { return this->is_ricSubsequentAction; };
+                        int    get_ricSubsequentActionType(){return this->ricSubsequentActionType; }
+                        int    get_ricTimeToWait(){ return this->ricTimeToWait; }
+                        void*  get_ricActionDefinition(){ return this->ricActionDefinition; };
+                        size_t get_ricActionDefinition_size(){return this->ricActionDefinition_size; };
+
+       };
+       E2APAction(){ _ref_list = std::make_unique<std::vector<ActionIEs>>(); _count_list = 0;};
+
+       std::vector<E2APAction<E2SMActionDefinition>::ActionIEs> * get_list() const {return _ref_list.get();};
+       int get_list_count() {return _count_list;};
+
+       void add(E2APAction<E2SMActionDefinition>::ActionIEs &actionObj) { _ref_list.get()->push_back(actionObj); _count_list++;};
+private:
+
+       std::unique_ptr<std::vector<ActionIEs>> _ref_list;
+       int _count_list;
+};
+
+
+#endif /* XAPP_ASN_REFACTOR_E2AP_ACTION_HPP_ */
index 638b618..9d36886 100644 (file)
@@ -23,7 +23,7 @@
  *      Author: sjana, Ashwin Sridharan
  */
 
-#include "e2ap_control.hpp"
+/*#include "e2ap_control.hpp"
 
 // Set up memory allocations for each IE for encoding
 // We are responsible for memory management for each IE for encoding
@@ -264,3 +264,4 @@ bool ric_control_request:: get_fields(InitiatingMessage_t * init_msg,  ric_contr
 InitiatingMessage_t * ric_control_request::get_message(void)  {
     return initMsg;
 }
+*/
index 2a2272c..158d2dd 100644 (file)
    limitations under the License.
 ==================================================================================
 */
+
 /*
- * ric_indication.h
+ * control.hpp
  *
- *  Created on: Jul 11, 2019
- *      Author: sjana, Ashwin Sridharan
+ *  Created on: Oct 10, 2020
+ *      Author: sjana
  */
+/*RICcontrolRequest ::= SEQUENCE {
+        protocolIEs                                     ProtocolIE-Container    {{RICcontrolRequest-IEs}},
+        ...
+}
 
-#ifndef E2AP_RIC_CONTROL_REQUEST_H_
-#define E2AP_RIC_CONTROL_REQUEST_H_
+RICcontrolRequest-IEs E2AP-PROTOCOL-IES ::= {
+        { ID id-RICrequestID                            CRITICALITY reject      TYPE RICrequestID                                       PRESENCE mandatory      }|
+        { ID id-RANfunctionID                           CRITICALITY reject      TYPE RANfunctionID                                      PRESENCE mandatory      }|
+        { ID id-RICcallProcessID                        CRITICALITY reject      TYPE RICcallProcessID                           PRESENCE optional       }|
+        { ID id-RICcontrolHeader                        CRITICALITY reject      TYPE RICcontrolHeader                           PRESENCE mandatory      }|
+        { ID id-RICcontrolMessage                       CRITICALITY reject      TYPE RICcontrolMessage                          PRESENCE mandatory      }|
+        { ID id-RICcontrolAckRequest            CRITICALITY reject      TYPE RICcontrolAckRequest                       PRESENCE optional       },
+        ...
+}
+*/
 
-  
+#ifndef SRC_XAPP_ASN_E2AP_E2AP_CONTROL_HPP_
+#define SRC_XAPP_ASN_E2AP_E2AP_CONTROL_HPP_
 #include <iostream>
 #include <errno.h>
 #include <mdclog/mdclog.h>
 #include <sstream>
+#include <memory>
 #include <E2AP-PDU.h>
 #include <InitiatingMessage.h>
 #include <RICcontrolRequest.h>
 #include <ProtocolIE-Field.h>
-#include "e2ap_control_helper.hpp"
 
 #define NUM_CONTROL_REQUEST_IES 6
-  
-  
-class ric_control_request{
-    
+#define IE_SIZE ((int)128)
+
+template <typename E2SMControlHeader, typename E2SMControlMessage>
+class E2APControlMessage{
+
 public:
-  ric_control_request(void);
-  ~ric_control_request(void);
-    
-  bool encode_e2ap_control_request(unsigned char *, size_t *,  ric_control_helper &);
-  InitiatingMessage_t * get_message (void) ;
-  bool set_fields(InitiatingMessage_t *, ric_control_helper &);
-  bool get_fields(InitiatingMessage_t *, ric_control_helper &);
-  std::string get_error(void) const {return error_string ; };
+  class ControlRequestIEs{
+  private:
+           long int ricRequestorID , ranFunctionID, ricCallProcessID,  ricControlAckRequest;
+           unsigned char ricControlHeader[IE_SIZE];
+           size_t ricControlHeader_size=IE_SIZE;
+           unsigned char ricControlMessage[IE_SIZE];
+           size_t ricControlMessage_size=IE_SIZE;
+           unsigned char ricCallProcessId[IE_SIZE];
+           size_t ricCallProcessId_size = IE_SIZE;
+           bool is_ricCallProcessId;
+
+         public:
+           ControlRequestIEs(void):ricRequestorID(1), ranFunctionID(1), ricCallProcessID(0), ricControlAckRequest(-1),is_ricCallProcessId(false){};
+           void* get_ricControlMessage(){return this->ricControlMessage; };
+           void* get_ricControlHeader(){return this->ricControlHeader; };
+           void* get_ricCallProcessId(){return this->ricCallProcessId;};
+
+           size_t get_ricControlMessageSize(){return this->ricControlMessage_size; };
+           size_t get_ricControlHeaderSize(){return this->ricControlHeader_size; };
+           size_t get_ricCallProcessIdSize(){return this->ricCallProcessId_size;};
+
+           long int get_ricRequestorID(){return this->ricRequestorID;};
+           long int get_ranFunctionID(){return this->ranFunctionID;};
+           long int get_ricControlAckRequest(){return this->ricControlAckRequest;};
+           bool get_is_ricCallProcessId(){return is_ricCallProcessId;};
+           ControlRequestIEs& set_ricControlHeader(E2SMControlHeader headerObj){
+               bool res = headerObj.encode(&(this->ricControlHeader)[0],&this->ricControlHeader_size);
+               if(!res){
+                               mdclog_write(MDCLOG_ERR, "Failed to encode: %s","RIC Control Header");
+                               mdclog_write(MDCLOG_ERR, "Error during encode: %s",headerObj.get_error());
+               } else {
+                               mdclog_write(MDCLOG_INFO, "Successfully encoded: %s","RIC Control Header");
+               }
+
+               return *this;
+           }
+           ControlRequestIEs& set_ricControlMessage(E2SMControlMessage msgObj){
+               bool res = msgObj.encode(&(this->ricControlMessage)[0],&this->ricControlMessage_size);
+               if(!res){
+                            mdclog_write(MDCLOG_ERR, "Failed to encode: %s","RIC Control Message");
+                            mdclog_write(MDCLOG_ERR, "Error during encode: %s",msgObj.get_error());
+                       } else {
+                            mdclog_write(MDCLOG_INFO, "Successfully encoded: %s","RIC Control Message");
+               }
+                       return *this;
+           }
+
+           ControlRequestIEs& set_ricCallProcessID(unsigned char* callproc, size_t callproc_size){
+               is_ricCallProcessId = true;
+               memcpy(ricCallProcessId, callproc, callproc_size); ricCallProcessId_size = callproc_size;
+               return *this;
+           }
+
+           ControlRequestIEs& set_ricRequestorID(long int reqID){this->ricRequestorID = reqID; return *this;}
+           ControlRequestIEs& set_ranFunctionID(long int funcID){this->ranFunctionID = funcID; return *this;}
+
+  };
+  E2APControlMessage(ControlRequestIEs &);
+ ~E2APControlMessage(void);
+  bool encode(unsigned char *, size_t *);
+  ControlRequestIEs& getIEs(){ return *_cntrlIEs.get();};
+  std::string get_error(void) const {return _error_string ; };
 private:
 
-  E2AP_PDU_t * e2ap_pdu_obj;
-  InitiatingMessage_t *initMsg;
+  E2AP_PDU_t * _e2ap_pdu_obj;
+  InitiatingMessage_t *_initMsg;
   RICcontrolRequest_IEs_t *IE_array;
-  std::string error_string;
+  std::string _error_string;
+  bool setfields(InitiatingMessage_t *);
+  std::unique_ptr<ControlRequestIEs> _cntrlIEs;
+  char _errbuf[128];
+  size_t _errbuf_len = 128;
+};
+
+template <typename T1, typename T2>
+E2APControlMessage<T1,T2>::E2APControlMessage(ControlRequestIEs &controlObj){
+
+  _cntrlIEs = std::make_unique<ControlRequestIEs>();
+  *_cntrlIEs = controlObj;
+
+  _e2ap_pdu_obj = 0;
+  _e2ap_pdu_obj = (E2AP_PDU_t * )calloc(1, sizeof(E2AP_PDU_t));
+  assert(_e2ap_pdu_obj != 0);
+
+  _initMsg = 0;
+  _initMsg = (InitiatingMessage_t * )calloc(1, sizeof(InitiatingMessage_t));
+  assert(_initMsg != 0);
+
+  IE_array = 0;
+  IE_array = (RICcontrolRequest_IEs_t *)calloc(NUM_CONTROL_REQUEST_IES, sizeof(RICcontrolRequest_IEs_t));
+  assert(IE_array != 0);
+
+  _e2ap_pdu_obj->present = E2AP_PDU_PR_initiatingMessage;
+  _e2ap_pdu_obj->choice.initiatingMessage = _initMsg;
+
 
-  char errbuf[128];
-  size_t errbuf_len = 128;
 };
 
 
-#endif /* E2AP_RIC_CONTROL_REQUEST_H_ */
+// Clear assigned protocolIE list from RIC control_request IE container
+template <typename T1, typename T2>
+E2APControlMessage<T1,T2>::~E2APControlMessage(void){
+
+  mdclog_write(MDCLOG_DEBUG, "Freeing E2AP Control Request object memory");
+
+  RICcontrolRequest_t *ricControl_Request  = &(_initMsg->value.choice.RICcontrolRequest);
+  for(int i = 0; i < ricControl_Request->protocolIEs.list.size; i++){
+    ricControl_Request->protocolIEs.list.array[i] = 0;
+  }
+
+  if (ricControl_Request->protocolIEs.list.size > 0){
+    free(ricControl_Request->protocolIEs.list.array);
+    ricControl_Request->protocolIEs.list.size = 0;
+    ricControl_Request->protocolIEs.list.count = 0;
+  }
+
+  free(IE_array);
+  free(_initMsg);
+  _e2ap_pdu_obj->choice.initiatingMessage = 0;
+
+  ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, _e2ap_pdu_obj);
+  mdclog_write(MDCLOG_DEBUG, "Freed E2AP Control Request object memory");
+
+}
+
+template <typename T1, typename T2>
+bool E2APControlMessage<T1,T2>::encode(unsigned char *buf, size_t *size){
+
+  _initMsg->procedureCode = ProcedureCode_id_RICcontrol;
+  _initMsg->criticality = Criticality_ignore;
+  _initMsg->value.present = InitiatingMessage__value_PR_RICcontrolRequest;
+
+  bool res;
+
+  res = setfields(_initMsg);
+  if (!res){
+    return false;
+  }
+
+  int ret_constr = asn_check_constraints(&asn_DEF_E2AP_PDU, (void *) _e2ap_pdu_obj, _errbuf, &_errbuf_len);
+  if(ret_constr){
+    _error_string.assign(_errbuf, _errbuf_len);
+    _error_string = "Constraints failed for encoding control . Reason = " + _error_string;
+    return false;
+  }
+
+  xer_fprint(stdout, &asn_DEF_E2AP_PDU, _e2ap_pdu_obj);
+
+  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, _e2ap_pdu_obj, buf, *size);
+
+  if(retval.encoded == -1){
+    _error_string.assign(strerror(errno));
+    return false;
+  }
+  else {
+    if(*size < retval.encoded){
+      std::stringstream ss;
+      ss  <<"Error encoding event trigger definition. Reason =  encoded pdu size " << retval.encoded << " exceeds buffer size " << *size << std::endl;
+      _error_string = ss.str();
+      return false;
+    }
+  }
+
+  *size = retval.encoded;
+  return true;
+
+}
+
+template <typename T1, typename T2>
+bool E2APControlMessage<T1,T2>::setfields(InitiatingMessage_t *_initMsg){
+  unsigned int ie_index;
+
+  if (_initMsg == 0){
+    _error_string = "Invalid reference for E2AP Control_Request message in set_fields";
+    return false;
+  }
+
+  RICcontrolRequest_t * E2APControlMessage = &(_initMsg->value.choice.RICcontrolRequest);
+  E2APControlMessage->protocolIEs.list.count = 0; // reset
+
+  // for(i = 0; i < NUM_CONTROL_REQUEST_IES;i++){
+  //   memset(&(IE_array[i]), 0, sizeof(RICcontrolRequest_IEs_t));
+  // }
+
+  // Mandatory IE
+  ie_index = 0;
+  RICcontrolRequest_IEs_t *ies_ricreq = &IE_array[ie_index];
+  ies_ricreq->criticality = Criticality_reject;
+  ies_ricreq->id = ProtocolIE_ID_id_RICrequestID;
+  ies_ricreq->value.present = RICcontrolRequest_IEs__value_PR_RICrequestID;
+  RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID;
+  ricrequest_ie->ricRequestorID = this->getIEs().get_ricRequestorID();
+  //ricrequest_ie->ricRequestSequenceNumber = dinput.req_seq_no;
+  ASN_SEQUENCE_ADD(&(E2APControlMessage->protocolIEs), &(IE_array[ie_index]));
+
+  // Mandatory IE
+  ie_index = 1;
+  RICcontrolRequest_IEs_t *ies_ranfunc = &IE_array[ie_index];
+  ies_ranfunc->criticality = Criticality_reject;
+  ies_ranfunc->id = ProtocolIE_ID_id_RANfunctionID;
+  ies_ranfunc->value.present = RICcontrolRequest_IEs__value_PR_RANfunctionID;
+  RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID;
+  *ranfunction_ie = this->getIEs().get_ranFunctionID();
+  ASN_SEQUENCE_ADD(&(E2APControlMessage->protocolIEs), &(IE_array[ie_index]));
+
+
+  // Mandatory IE
+  ie_index = 2;
+  RICcontrolRequest_IEs_t *ies_richead = &IE_array[ie_index];
+  ies_richead->criticality = Criticality_reject;
+  ies_richead->id = ProtocolIE_ID_id_RICcontrolHeader;
+  ies_richead->value.present = RICcontrolRequest_IEs__value_PR_RICcontrolHeader;
+  RICcontrolHeader_t *richeader_ie = &ies_richead->value.choice.RICcontrolHeader;
+  richeader_ie->buf = (uint8_t*)this->getIEs().get_ricControlHeader();
+  richeader_ie->size = this->getIEs().get_ricControlHeaderSize();
+  ASN_SEQUENCE_ADD(&(E2APControlMessage->protocolIEs), &(IE_array[ie_index]));
+
+  // Mandatory IE
+  ie_index = 3;
+  RICcontrolRequest_IEs_t *ies_indmsg = &IE_array[ie_index];
+  ies_indmsg->criticality = Criticality_reject;
+  ies_indmsg->id = ProtocolIE_ID_id_RICcontrolMessage;
+  ies_indmsg->value.present = RICcontrolRequest_IEs__value_PR_RICcontrolMessage;
+  RICcontrolMessage_t *ricmsg_ie = &ies_indmsg->value.choice.RICcontrolMessage;
+  ricmsg_ie->buf = (uint8_t*)this->getIEs().get_ricControlMessage();
+  ricmsg_ie->size = this->getIEs().get_ricControlMessageSize();
+  ASN_SEQUENCE_ADD(&(E2APControlMessage->protocolIEs), &(IE_array[ie_index]));
+
+  // Optional IE
+  ie_index = 4;
+  if (this->getIEs().get_ricControlAckRequest()>= 0){
+    RICcontrolRequest_IEs_t *ies_indtyp = &IE_array[ie_index];
+    ies_indtyp->criticality = Criticality_reject;
+    ies_indtyp->id = ProtocolIE_ID_id_RICcontrolAckRequest;
+    ies_indtyp->value.present = RICcontrolRequest_IEs__value_PR_RICcontrolAckRequest;
+    RICcontrolAckRequest_t *ricackreq_ie = &ies_indtyp->value.choice.RICcontrolAckRequest;
+    *ricackreq_ie = this->getIEs().get_ricControlAckRequest();
+    ASN_SEQUENCE_ADD(&(E2APControlMessage->protocolIEs), &(IE_array[ie_index]));
+  }
+
+  // Optional IE
+  ie_index = 5;
+  if(this->getIEs().get_is_ricCallProcessId()){
+    RICcontrolRequest_IEs_t *ies_callprocid = &IE_array[ie_index];
+    ies_callprocid->criticality = Criticality_reject;
+    ies_callprocid->id = ProtocolIE_ID_id_RICcallProcessID;
+    ies_callprocid->value.present = RICcontrolRequest_IEs__value_PR_RICcallProcessID;
+    RICcallProcessID_t *riccallprocessid_ie = &ies_callprocid->value.choice.RICcallProcessID;
+    riccallprocessid_ie->buf = (uint8_t*)this->getIEs().get_ricCallProcessId();
+    riccallprocessid_ie->size = this->getIEs().get_ricCallProcessIdSize();
+    ASN_SEQUENCE_ADD(&(E2APControlMessage->protocolIEs), &(IE_array[ie_index]));
+
+  }
+  return true;
+
+};
+
+#endif /* SRC_XAPP_ASN_E2AP_E2AP_CONTROL_HPP_ */
index c9f9130..04ab301 100644 (file)
@@ -23,7 +23,7 @@
  *      Author: sjana, Ashwin Sridharan
  */
 
-#include "e2ap_indication.hpp"
+/*#include "e2ap_indication.hpp"
 
 // Set up memory allocations for each IE for encoding
 // We are responsible for memory management for each IE for encoding
@@ -281,3 +281,4 @@ bool ric_indication:: get_fields(InitiatingMessage_t * init_msg,  ric_indication
 InitiatingMessage_t * ric_indication::get_message(void)  {
     return initMsg;
 }
+*/
index 6c8abf1..4848598 100644 (file)
@@ -1,3 +1,4 @@
+
 /*
 ==================================================================================
 
    limitations under the License.
 ==================================================================================
 */
+
 /*
- * ric_indication.h
+ * indication.hpp
  *
- *  Created on: Jul 11, 2019
- *      Author: sjana, Ashwin Sridharan
+ *  Created on: Sep 18, 2020
+ *      Author: Shraboni Jana
  */
+/*-- **************************************************************
+--
+-- RIC Indication Elementary Procedure
+--
+-- **************************************************************
+-- **************************************************************
+--
+-- RIC INDICATION
+--
+-- **************************************************************
+RICindication ::= SEQUENCE {
+        protocolIEs                                     ProtocolIE-Container    {{RICindication-IEs}},
+        ...
+}
 
-#ifndef E2AP_RIC_INDICATION_H_
-#define E2AP_RIC_INDICATION_H_
+RICindication-IEs E2AP-PROTOCOL-IES ::= {
+        { ID id-RICrequestID                            CRITICALITY reject      TYPE RICrequestID                                       PRESENCE mandatory      }|
+        { ID id-RANfunctionID                           CRITICALITY reject      TYPE RANfunctionID                                      PRESENCE mandatory      }|
+        { ID id-RICactionID                                     CRITICALITY reject      TYPE RICactionID                                        PRESENCE mandatory      }|
+        { ID id-RICindicationSN                         CRITICALITY reject      TYPE RICindicationSN                            PRESENCE optional       }|
+        { ID id-RICindicationType                       CRITICALITY reject      TYPE RICindicationType                          PRESENCE mandatory      }|
+        { ID id-RICindicationHeader                     CRITICALITY reject      TYPE RICindicationHeader                        PRESENCE mandatory      }|
+        { ID id-RICindicationMessage            CRITICALITY reject      TYPE RICindicationMessage                       PRESENCE mandatory      }|
+        { ID id-RICcallProcessID                        CRITICALITY reject      TYPE RICcallProcessID                           PRESENCE optional       },
+        ...
+}*/
 
-  
-#include <iostream>
-#include <errno.h>
-#include <mdclog/mdclog.h>
-#include <sstream>
+
+#ifndef SRC_XAPP_ASN_E2AP_E2AP_INDICATION_HPP_
+#define SRC_XAPP_ASN_E2AP_E2AP_INDICATION_HPP_
+
+#include <string>
 #include <E2AP-PDU.h>
 #include <InitiatingMessage.h>
 #include <RICindication.h>
 #include <ProtocolIE-Field.h>
-#include "e2ap_indication_helper.hpp"
+#include <iostream>
+#include <errno.h>
+#include <mdclog/mdclog.h>
+#include <sstream>
+#include <memory>
 
-#define NUM_INDICATION_IES 8
-  
+#define IE_SIZE ((int)128)
 
+template <typename E2SMIndicationHeader, typename E2SMIndicationMessage>
+class E2APIndication{
 
-class ric_indication{
-  
 public:
-  ric_indication(void);
-  ~ric_indication(void);
-  
-  bool encode_e2ap_indication(unsigned char *, size_t *,  ric_indication_helper &);
-  InitiatingMessage_t * get_message (void) ;
-  bool set_fields(InitiatingMessage_t *, ric_indication_helper &);
-  bool get_fields(InitiatingMessage_t *, ric_indication_helper &);
-  std::string get_error(void) const {return error_string ; };
-  
+       E2APIndication();
+       E2APIndication(unsigned char *, size_t *, bool&);
+       ~E2APIndication(void);
+       class IndicationIEs{
+               private:
+                       long int ricRequestorID, ranFunctionID, ricActionID, ricIndicationSN, ricIndicationType;
+                       size_t ricIndicationHeader_size = IE_SIZE;
+                       unsigned char ricIndicationHeader[IE_SIZE];
+
+                       size_t ricIndicationMessage_size = IE_SIZE;
+                       unsigned char ricIndicationMessage[IE_SIZE];
+
+                       unsigned char ricCallProcessId[IE_SIZE];
+                       size_t ricCallProcessId_size = IE_SIZE;
+
+               public:
+                       IndicationIEs(void) : ricRequestorID(0), ranFunctionID(0), ricActionID(0),ricIndicationSN(0), ricIndicationType(0){};
+                       void* get_ricIndicationMessage(){return this->ricIndicationMessage; };
+                       void* get_ricIndicationHeader(){return this->ricIndicationHeader; };
+                       void* get_ricCallProcessId(){return this->ricCallProcessId;};
+
+                       size_t get_ricIndicationMessageSize(){return this->ricIndicationMessage_size; };
+                       size_t get_ricIndicationHeaderSize(){return this->ricIndicationHeader_size; };
+                       size_t get_ricCallProcessIdSize(){return this->ricCallProcessId_size;};
+
+                       long int get_ricRequestorID(){return this->ricRequestorID;};
+                       long int get_ranFunctionID(){return this->ranFunctionID;};
+                       long int get_ricActionID(){return this->ricActionID;};
+                       long int get_ricIndicationSN(){return this->ricIndicationSN;};
+
+                       IndicationIEs& set_ricIndicationHeader(unsigned char* header, size_t header_size){
+                               memcpy(ricIndicationHeader,header,header_size); ricIndicationHeader_size = header_size; return *this;
+                       }
+                       IndicationIEs& set_ricIndicationMessage(unsigned char* message, size_t message_size){
+                               memcpy(ricIndicationHeader,message,message_size); ricIndicationMessage_size = message_size; return *this;}
+
+                       IndicationIEs& set_ricCallProcessID(unsigned char* callproc, size_t callproc_size){
+                               memcpy(ricCallProcessId, callproc, callproc_size); ricCallProcessId_size = callproc_size;
+                               return *this;
+                       }
+
+                       IndicationIEs& set_ricRequestorID(long int reqID){this->ricRequestorID = reqID; return *this;}
+                       IndicationIEs& set_ranFunctionID(long int funcID){this->ranFunctionID = funcID; return *this;}
+                       IndicationIEs& set_ricActionID(long int actID){ this->ricActionID = actID; return *this;}
+                       IndicationIEs& set_ricIndicationType(long int typ){ this->ricIndicationType = typ; return *this;}
+                       IndicationIEs& set_ricIndicationSN(long int sn){ this->ricIndicationSN = sn; return *this;}
+
+
+       };
+
+  IndicationIEs getIndicationIEs(){ return *_indicationIEs.get(); }
+
+  std::string get_error(void) const {return _error_string ; };
+  bool encode(unsigned char *buf, size_t *size);
+  bool decode(unsigned char *buf, size_t *size);
+
 private:
-  
+
   E2AP_PDU_t * e2ap_pdu_obj;
   InitiatingMessage_t *initMsg;
   RICindication_IEs_t *IE_array;
-  std::string error_string;
-  char errbuf[128];
-  size_t errbuf_len = 128;
+  std::unique_ptr<IndicationIEs> _indicationIEs;
+
+  unsigned int ricIndicationIEs_Count;
+
+  std::string _error_string;
+  char _errbuf[128];
+  size_t _errbuf_len = 128;
+
+  bool setfields( InitiatingMessage_t *);
+};
+
+template<typename T1, typename T2>
+E2APIndication<T1,T2>::E2APIndication(){
+
+  ricIndicationIEs_Count = 8;
+
+  e2ap_pdu_obj = 0;
+  e2ap_pdu_obj = (E2AP_PDU_t * )calloc(1, sizeof(E2AP_PDU_t));
+  assert(e2ap_pdu_obj != 0);
+
+  initMsg = 0;
+  initMsg = (InitiatingMessage_t * )calloc(1, sizeof(InitiatingMessage_t));
+  assert(initMsg != 0);
+
+  IE_array = 0;
+  IE_array = (RICindication_IEs_t *)calloc(ricIndicationIEs_Count, sizeof(RICindication_IEs_t));
+  assert(IE_array != 0);
+
+  e2ap_pdu_obj->present = E2AP_PDU_PR_initiatingMessage;
+  e2ap_pdu_obj->choice.initiatingMessage = initMsg;
+
+  _indicationIEs = std::make_unique<IndicationIEs>();
+
 };
+template<typename T1, typename T2>
+E2APIndication<T1,T2>::E2APIndication(unsigned char *buf, size_t *size, bool &status){
+         e2ap_pdu_obj = 0;
+         initMsg = 0;
+         IE_array = 0;
+
+         _indicationIEs = std::make_unique<IndicationIEs>();
+          status =  this->decode(buf, size);
+
+}
+
+
+// Clear assigned protocolIE list from RIC indication IE container
+template<typename T1, typename T2>
+E2APIndication<T1,T2>::~E2APIndication(void){
+
+  mdclog_write(MDCLOG_DEBUG, "Freeing E2AP Indication object memory");
+  RICindication_t *ricIndication  = &(initMsg->value.choice.RICindication);
+  for(int i = 0; i < ricIndication->protocolIEs.list.size; i++){
+    ricIndication->protocolIEs.list.array[i] = 0;
+  }
+  if (ricIndication->protocolIEs.list.size > 0){
+    free(ricIndication->protocolIEs.list.array);
+    ricIndication->protocolIEs.list.array = 0;
+    ricIndication->protocolIEs.list.count = 0;
+    ricIndication->protocolIEs.list.size = 0;
+  }
+
+  free(IE_array);
+  ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, e2ap_pdu_obj);
+  mdclog_write(MDCLOG_DEBUG, "Freed E2AP Indication object memory");
+}
 
+template<typename T1, typename T2>
+bool E2APIndication<T1, T2>::decode(unsigned char *buf, size_t *size)
+{
+
+       asn_dec_rval_t dec_res  = asn_decode(0,ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, (void**)&(e2ap_pdu_obj), buf, *size);
+       if(dec_res.code != RC_OK){
+                        mdclog_write(MDCLOG_ERR, "Failed to decode: %s","RIC Indication Message");
+                        return false;
+       } else {
+                        mdclog_write(MDCLOG_INFO, "Successfully decoded: %s","RIC Indication Message");
+       }
+
+  xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2ap_pdu_obj);
+
+  initMsg = e2ap_pdu_obj->choice.initiatingMessage;
+  //write the decoding code.
+  if (initMsg == 0){
+    _error_string = "Invalid reference for E2AP Indication message in get_fields";
+    return false;
+  }
+
+
+  for(int edx = 0; edx < initMsg->value.choice.RICindication.protocolIEs.list.count; edx++) {
+       RICindication_IEs_t *memb_ptr = initMsg->value.choice.RICindication.protocolIEs.list.array[edx];
+    switch(memb_ptr->id)
+     {
+      case (ProtocolIE_ID_id_RICindicationHeader):
+               _indicationIEs->set_ricIndicationHeader(memb_ptr->value.choice.RICindicationHeader.buf, memb_ptr->value.choice.RICindicationHeader.size);
+      break;
+
+      case (ProtocolIE_ID_id_RICindicationMessage):
+               _indicationIEs->set_ricIndicationMessage(memb_ptr->value.choice.RICindicationMessage.buf, memb_ptr->value.choice.RICindicationMessage.size);
+      break;
+
+      case (ProtocolIE_ID_id_RICrequestID):
+               _indicationIEs->set_ricRequestorID(memb_ptr->value.choice.RICrequestID.ricRequestorID);
+      break;
+
+      case (ProtocolIE_ID_id_RANfunctionID):
+               _indicationIEs->set_ranFunctionID(memb_ptr->value.choice.RANfunctionID);
+         break;
+
+      case (ProtocolIE_ID_id_RICindicationSN):
+               _indicationIEs->set_ricIndicationSN(memb_ptr->value.choice.RICindicationSN);
+         break;
+
+      case (ProtocolIE_ID_id_RICindicationType):
+               _indicationIEs->set_ricIndicationType(memb_ptr->value.choice.RICindicationType);
+         break;
+
+      case (ProtocolIE_ID_id_RICactionID):
+               _indicationIEs->set_ricActionID(memb_ptr->value.choice.RICactionID);
+         break;
+
+      case (ProtocolIE_ID_id_RICcallProcessID):
+               _indicationIEs->set_ricCallProcessID(memb_ptr->value.choice.RICcallProcessID.buf,memb_ptr->value.choice.RICcallProcessID.size);
+         break;
+
+      default:
+      break;
+      }
+
+  }
+
+  return true;
+
+}
+
+template<typename T1, typename T2>
+bool E2APIndication<T1,T2>::encode(unsigned char *buf, size_t *size){
+
+  initMsg->procedureCode = ProcedureCode_id_RICindication;
+  initMsg->criticality = Criticality_ignore;
+  initMsg->value.present = InitiatingMessage__value_PR_RICindication;
+
+  bool res;
+  asn_enc_rval_t retval;
+
+  res = setfields(initMsg);
+  if (!res){
+    return false;
+  }
+
+  int ret_constr = asn_check_constraints(&asn_DEF_E2AP_PDU, e2ap_pdu_obj, _errbuf, &_errbuf_len);
+  if(ret_constr){
+    _error_string.assign(&_errbuf[0], _errbuf_len);
+    _error_string = "Error encoding E2AP Indication message. Reason = " + _error_string;
+    return false;
+  }
+
+  xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2ap_pdu_obj);
+
+  retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, e2ap_pdu_obj, buf, *size);
+  if(retval.encoded == -1){
+    _error_string.assign(strerror(errno));
+    return false;
+  }
+
+  else {
+    if(*size < retval.encoded){
+      std::stringstream ss;
+      ss  <<"Error encoding E2AP Indication . Reason =  encoded pdu size " << retval.encoded << " exceeds buffer size " << *size << std::endl;
+      _error_string = ss.str();
+      return false;
+    }
+  }
+
+  *size = retval.encoded;
+  return true;
+
+}
+template<typename T1, typename T2>
+bool E2APIndication<T1,T2>::setfields(InitiatingMessage_t *initMsg){
+  unsigned int ie_index;
+
+  if (initMsg == 0){
+    _error_string = "Invalid reference for E2AP Indication message in set_fields";
+    return false;
+  }
+
+
+  RICindication_t * ric_indication = &(initMsg->value.choice.RICindication);
+  ric_indication->protocolIEs.list.count = 0;
+
+  ie_index = 0;
+
+  RICindication_IEs_t *ies_ricreq = &IE_array[ie_index];
+  ies_ricreq->criticality = Criticality_reject;
+  ies_ricreq->id = ProtocolIE_ID_id_RICrequestID;
+  ies_ricreq->value.present = RICindication_IEs__value_PR_RICrequestID;
+  RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID;
+  ricrequest_ie->ricRequestorID = _indicationIEs->ricRequestorID;
+  ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index]));
+
+  ie_index = 1;
+  RICindication_IEs_t *ies_ranfunc = &IE_array[ie_index];
+  ies_ranfunc->criticality = Criticality_reject;
+  ies_ranfunc->id = ProtocolIE_ID_id_RANfunctionID;
+  ies_ranfunc->value.present = RICindication_IEs__value_PR_RANfunctionID;
+  RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID;
+  *ranfunction_ie = _indicationIEs->ranFunctionID;
+  ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index]));
+
+  ie_index = 2;
+  RICindication_IEs_t *ies_actid = &IE_array[ie_index];
+  ies_actid->criticality = Criticality_reject;
+  ies_actid->id = ProtocolIE_ID_id_RICactionID;
+  ies_actid->value.present = RICindication_IEs__value_PR_RICactionID;
+  RICactionID_t *ricaction_ie = &ies_actid->value.choice.RICactionID;
+  *ricaction_ie = _indicationIEs->ricActionID;
+  ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index]));
+
+  ie_index = 3;
+  RICindication_IEs_t *ies_ricsn = &IE_array[ie_index];
+  ies_ricsn->criticality = Criticality_reject;
+  ies_ricsn->id = ProtocolIE_ID_id_RICindicationSN;
+  ies_ricsn->value.present = RICindication_IEs__value_PR_RICindicationSN;
+  RICindicationSN_t *ricsn_ie = &ies_ricsn->value.choice.RICindicationSN;
+  *ricsn_ie = _indicationIEs->ricIndicationSN;
+  ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index]));
+
+
+  ie_index = 4;
+  RICindication_IEs_t *ies_indtyp = &IE_array[ie_index];
+  ies_indtyp->criticality = Criticality_reject;
+  ies_indtyp->id = ProtocolIE_ID_id_RICindicationType;
+  ies_indtyp->value.present = RICindication_IEs__value_PR_RICindicationType;
+  RICindicationType_t *rictype_ie = &ies_indtyp->value.choice.RICindicationType;
+  *rictype_ie = _indicationIEs->ricIndicationType;
+  ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index]));
+
+  ie_index = 5;
+  RICindication_IEs_t *ies_richead = &IE_array[ie_index];
+  ies_richead->criticality = Criticality_reject;
+  ies_richead->id = ProtocolIE_ID_id_RICindicationHeader;
+  ies_richead->value.present = RICindication_IEs__value_PR_RICindicationHeader;
+  RICindicationHeader_t *richeader_ie = &ies_richead->value.choice.RICindicationHeader;
+  richeader_ie->buf = _indicationIEs->ricIndicationHeader;
+  richeader_ie->size = _indicationIEs->ricIndicationHeader_size;
+  ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index]));
+
+  ie_index = 6;
+  RICindication_IEs_t *ies_indmsg = &IE_array[ie_index];
+  ies_indmsg->criticality = Criticality_reject;
+  ies_indmsg->id = ProtocolIE_ID_id_RICindicationMessage;
+  ies_indmsg->value.present = RICindication_IEs__value_PR_RICindicationMessage;
+  RICindicationMessage_t *ricmsg_ie = &ies_indmsg->value.choice.RICindicationMessage;
+  ricmsg_ie->buf = _indicationIEs->ricIndicationMessage;
+  ricmsg_ie->size = _indicationIEs->ricIndicationMessage_size;
+  ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index]));
+
+
+  // optional call process id ..
+  if (_indicationIEs->call_process_id_size > 0){
+    ie_index = 7;
+    RICindication_IEs_t *ies_ind_callprocessid = &IE_array[ie_index];
+    ies_ind_callprocessid->criticality = Criticality_reject;
+    ies_ind_callprocessid->id = ProtocolIE_ID_id_RICcallProcessID;
+    ies_ind_callprocessid->value.present = RICindication_IEs__value_PR_RICcallProcessID;
+    RICcallProcessID_t *riccallprocessid_ie = &ies_ind_callprocessid->value.choice.RICcallProcessID;
+    riccallprocessid_ie->buf = _indicationIEs->call_process_id;
+    riccallprocessid_ie->size = _indicationIEs->call_process_id_size;
+    ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index]));
+  }
+
+  return true;
+
+};
 
-#endif /* E2AP_RIC_INDICATION_H_ */
+#endif /* SRC_XAPP_ASN_E2AP_E2AP_INDICATION_HPP_ */
diff --git a/src/xapp-asn/e2ap/e2ap_subscription_request.hpp b/src/xapp-asn/e2ap/e2ap_subscription_request.hpp
new file mode 100644 (file)
index 0000000..d7e618a
--- /dev/null
@@ -0,0 +1,353 @@
+/*
+==================================================================================
+
+        Copyright (c) 2019-2020 AT&T Intellectual Property.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================================
+*/
+/*
+ * e2ap_subscription.hpp
+ *
+ *  Created on: Jun 30, 2020
+ *      Author: sjana
+ */
+
+#ifndef XAPP_ASN_REFACTOR_E2AP_SUBSCRIPTION_HPP_
+#define XAPP_ASN_REFACTOR_E2AP_SUBSCRIPTION_HPP_
+#include <E2AP-PDU.h>
+#include <InitiatingMessage.h>
+#include <ProtocolIE-Field.h>
+#include <RICsubscriptionRequest.h>
+#include <ProtocolIE-SingleContainer.h>
+
+#include <RICactions-ToBeSetup-List.h>
+#include <RICsubsequentAction.h>
+#include <vector>
+
+#include "e2ap_action.hpp"
+/*
+ RICsubscriptionRequest-IEs E2AP-PROTOCOL-IES ::= {
+       { ID id-RICrequestID                            CRITICALITY reject      TYPE RICrequestID                                       PRESENCE mandatory}|
+       { ID id-RANfunctionID                           CRITICALITY reject      TYPE RANfunctionID                                      PRESENCE mandatory}|
+       { ID id-RICsubscriptionDetails          CRITICALITY reject      TYPE RICsubscriptionDetails                     PRESENCE mandatory},
+       ...
+}
+RICrequestID ::= SEQUENCE {
+       ricRequestorID                          INTEGER (0..65535),
+       ricInstanceID   INTEGER (0..65535),
+       ...
+}
+
+RICsubscriptionDetails ::= SEQUENCE {
+       ricEventTriggerDefinition       RICeventTriggerDefinition,
+       ricAction-ToBeSetup-List        RICactions-ToBeSetup-List,
+       ...
+}
+ */
+
+template <typename E2SMEventTriggerDefinition, typename E2SMActionDefinition>
+class E2APSubscriptionRequest {
+public:
+
+       class SubscriptionRequestIEs{
+       private:
+                long int ricRequestorID, ricInstanceID, ranFunctionID;
+                size_t ricEventTriggerDefinition_size = E2SM_SIZE;
+                unsigned char ricEventTriggerDefinition[E2SM_SIZE];
+
+                int ricAction_ToBeSetup_List_Count;
+                std::vector<typename E2APAction<E2SMActionDefinition>::ActionIEs> *ricAction_ToBeSetup_List;
+       public:
+                SubscriptionRequestIEs(void):ricRequestorID(0), ricInstanceID(0), ranFunctionID(0), ricAction_ToBeSetup_List(0), ricAction_ToBeSetup_List_Count(0){};
+                SubscriptionRequestIEs& set_ricRequestorID(long int req_id){ricRequestorID = req_id; return *this;};
+                SubscriptionRequestIEs& set_ricInstanceID(long int inst_id){ricInstanceID = inst_id; return *this;};
+                SubscriptionRequestIEs& set_ranFunctionID(long int func_id){ranFunctionID = func_id; return *this;};
+
+                SubscriptionRequestIEs& set_ricEventTriggerDefinition(E2SMEventTriggerDefinition &eventObj)
+                {
+                        bool res = eventObj.encode(&(this->ricEventTriggerDefinition)[0],&ricEventTriggerDefinition_size);
+                        if(!res){
+                                               mdclog_write(MDCLOG_ERR, "Failed to encode: %s","RIC Event Trigger Definition");
+                                               mdclog_write(MDCLOG_ERR, "Error during encode: %s",eventObj.get_error());
+                                       } else {
+                                               mdclog_write(MDCLOG_INFO, "Successfully encoded: %s of size: %d","RIC Event Trigger Definition",ricEventTriggerDefinition_size);
+                                       }
+
+                   return *this;
+                };
+
+                SubscriptionRequestIEs& set_ricAction_ToBeSetup_List(E2APAction<E2SMActionDefinition>  &actionObj)
+                { ricAction_ToBeSetup_List = actionObj.get_list();
+                  ricAction_ToBeSetup_List_Count = actionObj.get_list_count();
+                  return *this;
+                };
+
+                long int get_ricRequestorID(){return this->ricRequestorID;};
+                long int get_ricInstanceID(){return this->ricInstanceID;};
+                long int get_ranFunctionID(){return this->ranFunctionID;};
+
+                unsigned char* get_ricEventTriggerDefinition(){return this->ricEventTriggerDefinition;};
+                size_t get_ricEventTriggerDefinitionSize(){return this->ricEventTriggerDefinition_size;};
+                std::vector<typename E2APAction<E2SMActionDefinition>::ActionIEs>* get_ricAction_ToBeSetup_List(){ return this->ricAction_ToBeSetup_List;};
+                int get_ricAction_ToBeSetup_List_Count(){return this->ricAction_ToBeSetup_List_Count;};
+
+       };
+
+       E2APSubscriptionRequest(SubscriptionRequestIEs&);
+       ~E2APSubscriptionRequest();
+       bool encode(unsigned char *, size_t * );
+       std::string  get_error (void) const {return _error_string ;};
+       void add(SubscriptionRequestIEs &ies){_requestIEs = ies;};
+       SubscriptionRequestIEs& getIEs(){ return *_requestIEs.get();};
+private:
+
+       unsigned int ricSubscriptionRequestIEs_Count;
+       InitiatingMessage_t *initMsg;
+       E2AP_PDU_t * e2ap_pdu_obj;
+       RICsubscriptionRequest_IEs_t * IE_array;
+       RICaction_ToBeSetup_ItemIEs_t * action_array;
+       unsigned int action_array_size;
+
+       std::unique_ptr<SubscriptionRequestIEs> _requestIEs;
+       std::string _error_string;
+    char _errbuf[128];
+       size_t _errbuf_len = 128;
+
+       bool setfields(InitiatingMessage_t *);
+};
+
+template <typename T1,typename T2>
+E2APSubscriptionRequest<T1,T2>::E2APSubscriptionRequest(SubscriptionRequestIEs &subRequestObj){
+
+   ricSubscriptionRequestIEs_Count = 3;
+
+  _requestIEs = std::make_unique<SubscriptionRequestIEs>();
+  *_requestIEs = subRequestObj;
+
+  e2ap_pdu_obj = 0;
+  e2ap_pdu_obj = (E2AP_PDU_t * )calloc(1, sizeof(E2AP_PDU_t));
+  assert(e2ap_pdu_obj != 0);
+
+  initMsg = 0;
+  initMsg = (InitiatingMessage_t * )calloc(1, sizeof(InitiatingMessage_t));
+  assert(initMsg != 0);
+
+
+  IE_array = 0;
+  if(this->ricSubscriptionRequestIEs_Count == 0) {
+                 mdclog_write(MDCLOG_ERR, "E2AP Subscription Request IEs = 0.");
+  }
+  IE_array = (RICsubscriptionRequest_IEs_t *)calloc(this->ricSubscriptionRequestIEs_Count, sizeof(RICsubscriptionRequest_IEs_t));
+  assert(IE_array != 0);
+
+
+  action_array_size = subRequestObj.get_ricAction_ToBeSetup_List_Count();
+  action_array = 0;
+  action_array = (RICaction_ToBeSetup_ItemIEs_t *)calloc(action_array_size, sizeof(RICaction_ToBeSetup_ItemIEs_t));
+  assert(action_array != 0);
+
+
+  e2ap_pdu_obj->choice.initiatingMessage = initMsg;
+  e2ap_pdu_obj->present = E2AP_PDU_PR_initiatingMessage;
+
+
+
+};
+
+// Clear assigned protocolIE list from RIC indication IE container
+template <typename T1, typename T2>
+E2APSubscriptionRequest<T1,T2>::~E2APSubscriptionRequest(void){
+
+  mdclog_write(MDCLOG_DEBUG, "Freeing subscription request memory");;
+
+  RICsubscriptionDetails_t * ricsubscription_ie = &(IE_array[2].value.choice.RICsubscriptionDetails);
+
+  for(int i = 0; i < ricsubscription_ie->ricAction_ToBeSetup_List.list.size; i++){
+    ricsubscription_ie->ricAction_ToBeSetup_List.list.array[i] = 0;
+  }
+
+  // clear action list
+  if (ricsubscription_ie->ricAction_ToBeSetup_List.list.size > 0){
+    free(ricsubscription_ie->ricAction_ToBeSetup_List.list.array);
+    ricsubscription_ie->ricAction_ToBeSetup_List.list.size = 0;
+    ricsubscription_ie->ricAction_ToBeSetup_List.list.count = 0;
+    ricsubscription_ie->ricAction_ToBeSetup_List.list.array = 0;
+  }
+
+  // clear subsequent action array
+  for (unsigned int i = 0; i < action_array_size; i++){
+    free(action_array[i].value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction );
+  }
+
+  free(action_array);
+  RICsubscriptionRequest_t * subscription_request = &(initMsg->value.choice.RICsubscriptionRequest);
+
+  for(int i = 0; i < subscription_request->protocolIEs.list.size; i++){
+    subscription_request->protocolIEs.list.array[i] = 0;
+  }
+
+  if( subscription_request->protocolIEs.list.size > 0){
+    free( subscription_request->protocolIEs.list.array);
+    subscription_request->protocolIEs.list.array = 0;
+    subscription_request->protocolIEs.list.size = 0;
+    subscription_request->protocolIEs.list.count = 0;
+  }
+
+  free(IE_array);
+  free(initMsg);
+  e2ap_pdu_obj->choice.initiatingMessage = 0;
+
+  ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, e2ap_pdu_obj);
+  mdclog_write(MDCLOG_DEBUG, "Freed subscription request memory ");
+};
+
+template <typename T1, typename T2>
+bool E2APSubscriptionRequest<T1,T2>::encode(unsigned char *buf, size_t *size){
+
+  bool res;
+
+  initMsg->procedureCode = ProcedureCode_id_RICsubscription;
+  initMsg->criticality = Criticality_ignore;
+  initMsg->value.present = InitiatingMessage__value_PR_RICsubscriptionRequest;
+
+  res = setfields(initMsg);
+  if (!res){
+    return false;
+  }
+
+  int ret_constr = asn_check_constraints(&asn_DEF_E2AP_PDU, (void *) e2ap_pdu_obj, _errbuf, &_errbuf_len);
+  if(ret_constr){
+    _error_string.assign(_errbuf, _errbuf_len);
+    _error_string = "Constraints failed for encoding subscription request. Reason = " + _error_string;
+    return false;
+  }
+
+  xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2ap_pdu_obj);
+
+  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, e2ap_pdu_obj, buf, *size);
+
+  if(retval.encoded == -1){
+    _error_string.assign(strerror(errno));
+    _error_string = "Error encoding Subscription  Request. Reason = " + _error_string;
+    return false;
+  }
+  else {
+    if(*size < retval.encoded){
+      std::stringstream ss;
+      ss  <<"Error encoding Subscription  Request . Reason =  encoded pdu size " << retval.encoded << " exceeds buffer size " << *size << std::endl;
+      _error_string = ss.str();
+      retval.encoded = -1;
+      return false;
+    }
+  }
+
+  *size = retval.encoded;
+  return true;
+
+}
+
+template <typename T1, typename T2>
+bool E2APSubscriptionRequest<T1,T2>::setfields( InitiatingMessage_t * init_msg){
+
+
+  int ie_index;
+  int result = 0;
+
+  if (init_msg == 0){
+    _error_string = "Error. Invalid reference when getting fields from subscription request";
+    return false;
+  }
+
+  RICsubscriptionRequest_t * ric_subscription = &(init_msg->value.choice.RICsubscriptionRequest);
+  ric_subscription->protocolIEs.list.count = 0;
+
+  ie_index = 0;
+  RICsubscriptionRequest_IEs_t *ies_ricreq = &IE_array[ie_index];
+  ies_ricreq->criticality = Criticality_reject;
+  ies_ricreq->id = ProtocolIE_ID_id_RICrequestID;
+  ies_ricreq->value.present = RICsubscriptionRequest_IEs__value_PR_RICrequestID;
+  RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID;
+  ricrequest_ie->ricRequestorID = this->getIEs().get_ricRequestorID();
+  result = ASN_SEQUENCE_ADD(&(ric_subscription->protocolIEs), &IE_array[ie_index]);
+         assert(result == 0);
+
+  ie_index = 1;
+  RICsubscriptionRequest_IEs_t *ies_ranfunc = &IE_array[ie_index];
+  ies_ranfunc->criticality = Criticality_reject;
+  ies_ranfunc->id = ProtocolIE_ID_id_RANfunctionID;
+  ies_ranfunc->value.present = RICsubscriptionRequest_IEs__value_PR_RANfunctionID;
+  RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID;
+  *ranfunction_ie = this->getIEs().get_ranFunctionID();
+  result = ASN_SEQUENCE_ADD(&(ric_subscription->protocolIEs), &IE_array[ie_index]);
+  assert(result == 0);
+
+
+  ie_index = 2;
+  RICsubscriptionRequest_IEs_t *ies_actid = &IE_array[ie_index];
+  ies_actid->criticality = Criticality_reject;
+  ies_actid->id = ProtocolIE_ID_id_RICsubscriptionDetails;
+  ies_actid->value.present = RICsubscriptionRequest_IEs__value_PR_RICsubscriptionDetails;
+
+  RICsubscriptionDetails_t *ricsubscription_ie = &ies_actid->value.choice.RICsubscriptionDetails;
+  ricsubscription_ie->ricEventTriggerDefinition.buf = (uint8_t *) this->getIEs().get_ricEventTriggerDefinition();
+  ricsubscription_ie->ricEventTriggerDefinition.size = this->getIEs().get_ricEventTriggerDefinitionSize();
+
+
+
+  std::vector<typename E2APAction<T2>::ActionIEs> *ref_action_array = this->getIEs().get_ricAction_ToBeSetup_List();
+
+  // reset the list count on ricAction_ToBeSetup_List;
+  ricsubscription_ie->ricAction_ToBeSetup_List.list.count = 0;
+
+  for(unsigned int i = 0; i < ref_action_array->size(); i ++){
+    action_array[i].criticality = Criticality_ignore;
+    action_array[i].id = ProtocolIE_ID_id_RICaction_ToBeSetup_Item ;
+    action_array[i].value.present = RICaction_ToBeSetup_ItemIEs__value_PR_RICaction_ToBeSetup_Item;
+
+    action_array[i].value.choice.RICaction_ToBeSetup_Item.ricActionID = (*ref_action_array)[i].get_ricActionID();
+    action_array[i].value.choice.RICaction_ToBeSetup_Item.ricActionType = (*ref_action_array)[i].get_ricActionType();
+
+    if((*ref_action_array)[i].get_is_ricSubsequentAction()){
+       action_array[i].value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction = (RICsubsequentAction_t *)calloc(1, sizeof(RICsubsequentAction_t));
+       action_array[i].value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction->ricSubsequentActionType = (*ref_action_array)[i].get_ricSubsequentActionType();
+       action_array[i].value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction->ricTimeToWait = (*ref_action_array)[i].get_ricTimeToWait();
+    }
+    action_array[i].value.choice.RICaction_ToBeSetup_Item.ricActionDefinition = (RICactionDefinition_t*)calloc(1, sizeof(RICactionDefinition_t));
+
+    auto actionSize =  (*ref_action_array)[i].get_ricActionDefinition_size();
+    action_array[i].value.choice.RICaction_ToBeSetup_Item.ricActionDefinition->size = actionSize;
+    action_array[i].value.choice.RICaction_ToBeSetup_Item.ricActionDefinition->buf = (uint8_t *)calloc(1,actionSize);
+    memcpy(action_array[i].value.choice.RICaction_ToBeSetup_Item.ricActionDefinition->buf, (uint8_t*)(*ref_action_array)[i].get_ricActionDefinition(), actionSize);
+
+    action_array[i].value.choice.RICaction_ToBeSetup_Item.ricActionDefinition->size = actionSize;
+
+
+    result = ASN_SEQUENCE_ADD(&ricsubscription_ie->ricAction_ToBeSetup_List, &(action_array[i]));
+    if (result == -1){
+      _error_string = "Error : Unable to assign memory to add Action item to set up list";
+      return false;
+    }
+
+  }
+
+  result = ASN_SEQUENCE_ADD(&(ric_subscription->protocolIEs), &IE_array[ie_index]);
+  assert(result == 0);
+
+
+
+  return true;
+};
+
+
+#endif /* XAPP_ASN_REFACTOR_E2AP_SUBSCRIPTION_HPP_ */
index ba5f708..7e1be7d 100644 (file)
@@ -1,93 +1,99 @@
 /*
-  ==================================================================================
+==================================================================================
 
-  Copyright (c) 2019-2020 AT&T Intellectual Property.
+        Copyright (c) 2019-2020 AT&T Intellectual Property.
 
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-  Unless required by applicable law or agreed to in writing, softwares
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ==================================================================================
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================================
 */
 /*
- * e2sm_control.cc
+ * HWControlMessage.cc
  *
- *  Created on: Apr 30, 2020
+ *  Created on: Apr, 2020
  *      Author: Shraboni Jana
  */
 /* Classes to handle E2 service model based on e2sm-HelloWorld-v001.asn */
 #include "e2sm_control.hpp"
 
  //initialize
e2sm_control::e2sm_control(void){
HWControlMessage::HWControlMessage(void){
 
-       memset(&head_fmt1, 0, sizeof(E2SM_HelloWorld_ControlHeader_Format1_t));
+       memset(&_message_fmt1, 0, sizeof(E2SM_HelloWorld_ControlMessage_Format1_t));
 
-       memset(&msg_fmt1, 0, sizeof(E2SM_HelloWorld_ControlMessage_Format1_t));
+       _message = 0;
+    _message = (E2SM_HelloWorld_ControlMessage_t*)calloc(1, sizeof(E2SM_HelloWorld_ControlMessage_t));
+    assert(_message !=0);
+    _hw_msg_size = 0;
+  };
 
 
+ //initialize
+  HWControlHeader::HWControlHeader(void){
 
-    control_head = 0;
-    control_head = ( E2SM_HelloWorld_ControlHeader_t *)calloc(1, sizeof( E2SM_HelloWorld_ControlHeader_t));
-    assert(control_head != 0);
+       memset(&_header_fmt1, 0, sizeof(E2SM_HelloWorld_ControlHeader_Format1_t));
 
-    control_msg = 0;
-    control_msg = (E2SM_HelloWorld_ControlMessage_t*)calloc(1, sizeof(E2SM_HelloWorld_ControlMessage_t));
-    assert(control_msg !=0);
+       _header = 0;
+     _header = ( E2SM_HelloWorld_ControlHeader_t *)calloc(1, sizeof( E2SM_HelloWorld_ControlHeader_t));
+     assert(_header != 0);
 
-    errbuf_len = 128;
-  };
+     _hw_header = 0;
+   };
 
- e2sm_control::~e2sm_control(void){
 
-  mdclog_write(MDCLOG_DEBUG, "Freeing event trigger object memory");
+ HWControlMessage::~HWControlMessage(void){
 
-  control_head->choice.controlHeader_Format1 = 0;
-
-  control_msg->choice.controlMessage_Format1 = 0;
-
-  ASN_STRUCT_FREE(asn_DEF_E2SM_HelloWorld_ControlHeader, control_head);
-  ASN_STRUCT_FREE(asn_DEF_E2SM_HelloWorld_ControlMessage, control_msg);
+  mdclog_write(MDCLOG_DEBUG, "Freeing event trigger object memory");
+  _message->choice.controlMessage_Format1 = 0;
+  ASN_STRUCT_FREE(asn_DEF_E2SM_HelloWorld_ControlMessage, _message);
 
 
 };
+ HWControlHeader::~HWControlHeader(void){
 
-bool e2sm_control::encode_control_header(unsigned char *buf, size_t *size, e2sm_control_helper &helper){
+   mdclog_write(MDCLOG_DEBUG, "Freeing event trigger object memory");
+   _header->choice.controlHeader_Format1 = 0;
+   ASN_STRUCT_FREE(asn_DEF_E2SM_HelloWorld_ControlHeader, _header);
+ };
 
-  ASN_STRUCT_RESET(asn_DEF_E2SM_HelloWorld_ControlHeader, control_head);
+bool HWControlHeader::encode(unsigned char *buf, size_t *size){
+
+  ASN_STRUCT_RESET(asn_DEF_E2SM_HelloWorld_ControlHeader, _header);
 
   bool res;
-  res = set_fields(control_head, helper);
+  res = setfields(_header);
   if (!res){
 
     return false;
   }
 
-  int ret_constr = asn_check_constraints(&asn_DEF_E2SM_HelloWorld_ControlHeader, control_head, errbuf, &errbuf_len);
+  int ret_constr = asn_check_constraints(&asn_DEF_E2SM_HelloWorld_ControlHeader, _header, _errbuf, &_errbuf_len);
   if(ret_constr){
-    error_string.assign(&errbuf[0], errbuf_len);
+    _error_string.assign(&_errbuf[0], _errbuf_len);
     return false;
   }
 
-  xer_fprint(stdout, &asn_DEF_E2SM_HelloWorld_ControlHeader, control_head);
+  xer_fprint(stdout, &asn_DEF_E2SM_HelloWorld_ControlHeader, _header);
 
-  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_ControlHeader, control_head, buf, *size);
+  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_ControlHeader, _header, buf, *size);
 
   if(retval.encoded == -1){
-    error_string.assign(strerror(errno));
+    _error_string.assign(strerror(errno));
     return false;
   }
   else if (retval.encoded > *size){
     std::stringstream ss;
     ss  <<"Error encoding event trigger definition. Reason =  encoded pdu size " << retval.encoded << " exceeds buffer size " << *size << std::endl;
-    error_string = ss.str();
+    _error_string = ss.str();
     return false;
   }
   else{
@@ -97,33 +103,32 @@ bool e2sm_control::encode_control_header(unsigned char *buf, size_t *size, e2sm_
   return true;
 }
 
-bool e2sm_control::encode_control_message(unsigned char *buf, size_t *size, e2sm_control_helper &helper){
+bool HWControlMessage::encode(unsigned char *buf, size_t *size){
 
   bool res;
-  res = set_fields(control_msg, helper);
+  res = setfields(_message);
   if (!res){
     return false;
   }
 
-
-  int ret_constr = asn_check_constraints(&asn_DEF_E2SM_HelloWorld_ControlMessage, control_msg, errbuf, &errbuf_len);
+  int ret_constr = asn_check_constraints(&asn_DEF_E2SM_HelloWorld_ControlMessage, _message, _errbuf, &_errbuf_len);
   if(ret_constr){
-    error_string.assign(&errbuf[0], errbuf_len);
+    _error_string.assign(&_errbuf[0], _errbuf_len);
     return false;
   }
 
-  xer_fprint(stdout, &asn_DEF_E2SM_HelloWorld_ControlMessage, control_msg);
+  xer_fprint(stdout, &asn_DEF_E2SM_HelloWorld_ControlMessage, _message);
 
-  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_ControlMessage, control_msg, buf, *size);
+  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_ControlMessage, _message, buf, *size);
 
   if(retval.encoded == -1){
-    error_string.assign(strerror(errno));
+    _error_string.assign(strerror(errno));
     return false;
   }
   else if (retval.encoded > *size){
     std::stringstream ss;
     ss  <<"Error encoding action definition. Reason =  encoded pdu size " << retval.encoded << " exceeds buffer size " << *size << std::endl;
-    error_string = ss.str();
+    _error_string = ss.str();
     return false;
   }
   else{
@@ -133,63 +138,32 @@ bool e2sm_control::encode_control_message(unsigned char *buf, size_t *size, e2sm
   return true;
 }
 
-bool e2sm_control::set_fields(E2SM_HelloWorld_ControlHeader_t * ref_control_head, e2sm_control_helper & helper){
+bool HWControlHeader::setfields(E2SM_HelloWorld_ControlHeader_t * _header){
 
- if(ref_control_head == 0){
-    error_string = "Invalid reference for Event Trigger Definition set fields";
+ if(_header == 0){
+    _error_string = "Invalid reference for Event Trigger Definition set fields";
     return false;
   }
 
-  ref_control_head->present = E2SM_HelloWorld_ControlHeader_PR_controlHeader_Format1;
-
-  head_fmt1.controlHeaderParam = helper.header;
-
-  ref_control_head->choice.controlHeader_Format1 = &head_fmt1;
+ _header->present = E2SM_HelloWorld_ControlHeader_PR_controlHeader_Format1;
+  _header_fmt1.controlHeaderParam = this->get_hw_header();
+  _header->choice.controlHeader_Format1 = &_header_fmt1;
 
   return true;
 };
 
-bool e2sm_control::set_fields(E2SM_HelloWorld_ControlMessage_t * ref_control_msg, e2sm_control_helper & helper){
+bool HWControlMessage::setfields(E2SM_HelloWorld_ControlMessage_t * _message){
 
- if(ref_control_msg == 0){
-    error_string = "Invalid reference for Event Action Definition set fields";
+ if(_message == 0){
+    _error_string = "Invalid reference for Event Action Definition set fields";
     return false;
   }
-  ref_control_msg->present = E2SM_HelloWorld_ControlMessage_PR_controlMessage_Format1;
-
-  msg_fmt1.controlMsgParam.buf = helper.message;
-  msg_fmt1.controlMsgParam.size = helper.message_len;
-
-
-  ref_control_msg->choice.controlMessage_Format1 = &msg_fmt1;
+  _message->present = E2SM_HelloWorld_ControlMessage_PR_controlMessage_Format1;
 
+  _message_fmt1.controlMsgParam.buf = this->get_hw_message();
+  _message_fmt1.controlMsgParam.size = this->get_hw_message_size();
+  _message->choice.controlMessage_Format1 = &_message_fmt1;
 
   return true;
 };
 
-bool e2sm_control::get_fields(E2SM_HelloWorld_ControlHeader_t * ref_indictaion_header, e2sm_control_helper & helper){
-
-       if (ref_indictaion_header == 0){
-           error_string = "Invalid reference for Control Header get fields";
-           return false;
-         }
-
-       helper.header = ref_indictaion_header->choice.controlHeader_Format1->controlHeaderParam;
-       return true;
-}
-
-bool e2sm_control::get_fields(E2SM_HelloWorld_ControlMessage_t * ref_control_message, e2sm_control_helper & helper){
-
-         if (ref_control_message == 0){
-                   error_string = "Invalid reference for Control Message get fields";
-                   return false;
-                 }
-         helper.message = ref_control_message->choice.controlMessage_Format1->controlMsgParam.buf;
-         helper.message_len = ref_control_message->choice.controlMessage_Format1->controlMsgParam.size;
-
-         return true;
-  }
-
-
-
-
index 4d8d687..a93064e 100644 (file)
 /*
-  ==================================================================================
+==================================================================================
 
-  Copyright (c) 2019-2020 AT&T Intellectual Property.
+        Copyright (c) 2019-2020 AT&T Intellectual Property.
 
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-  Unless required by applicable law or agreed to in writing, softwares
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ==================================================================================
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================================
 */
 /*
- * e2sm_control.hpp
+ * e2sm_indication.hpp
  *
  *  Created on: Apr, 2020
  *      Author: Shraboni Jana
  */
+
 /* Classes to handle E2 service model based on e2sm-HelloWorld-v001.asn */
 #ifndef SRC_XAPP_ASN_E2SM_E2SM_CONTROL_HPP_
 #define SRC_XAPP_ASN_E2SM_E2SM_CONTROL_HPP_
 
-
 #include <sstream>
-#include <e2sm_helpers.hpp>
 #include <mdclog/mdclog.h>
 #include <vector>
-
+#include <string>
 #include <E2SM-HelloWorld-ControlHeader.h>
 #include <E2SM-HelloWorld-ControlMessage.h>
 #include <E2SM-HelloWorld-ControlHeader-Format1.h>
 #include <E2SM-HelloWorld-ControlMessage-Format1.h>
 #include <HW-Header.h>
 #include <HW-Message.h>
-class e2sm_control {
+
+class HWControlHeader {
 public:
-       e2sm_control(void);
-  ~e2sm_control(void);
+       HWControlHeader(void);
+       HWControlHeader(unsigned char*, size_t *, bool&);
+  ~HWControlHeader(void);
+   std::string  get_error (void) const {return _error_string ;};
 
-  bool set_fields(E2SM_HelloWorld_ControlHeader_t *, e2sm_control_helper &);
-  bool set_fields(E2SM_HelloWorld_ControlMessage_t *, e2sm_control_helper &);
+  long int get_hw_header(){return this->_hw_header;};
 
-  bool get_fields(E2SM_HelloWorld_ControlHeader_t *, e2sm_control_helper &);
-  bool get_fields(E2SM_HelloWorld_ControlMessage_t *, e2sm_control_helper &);
+  HWControlHeader& set_ricControlHeader(int param_header){
+                               _hw_header = param_header; return *this;
+                       }
 
-  bool encode_control_header(unsigned char *, size_t *, e2sm_control_helper &);
-  bool encode_control_message(unsigned char*, size_t *, e2sm_control_helper &);
 
+  bool decode(unsigned char*, size_t *);
+  bool encode(unsigned char*, size_t *);
 
-  std::string  get_error (void) const {return error_string ;};
 
 private:
 
-  E2SM_HelloWorld_ControlHeader_t * control_head; // used for encoding
-  E2SM_HelloWorld_ControlMessage_t* control_msg;
-  E2SM_HelloWorld_ControlHeader_Format1_t head_fmt1;
-  E2SM_HelloWorld_ControlMessage_Format1_t msg_fmt1;
+  long int _hw_header;
+  E2SM_HelloWorld_ControlHeader_t * _header; // used for encoding
+  E2SM_HelloWorld_ControlHeader_Format1_t _header_fmt1;
 
+  bool setfields(E2SM_HelloWorld_ControlHeader_t *);
 
-  size_t errbuf_len;
-  char errbuf[128];
-  std::string error_string;
+  size_t _errbuf_len = 128;
+  char _errbuf[128];
+  std::string _error_string;
 };
 
 
+class HWControlMessage {
+public:
+       HWControlMessage(void);
+       HWControlMessage(unsigned char*, size_t *, bool&);
+  ~HWControlMessage(void);
+
+  std::string  get_error (void) const {return _error_string ;};
+  bool decode(unsigned char*, size_t *);
+  bool encode(unsigned char*, size_t *);
+
+
+  size_t get_hw_message_size(){return this->_hw_msg_size;};
+  unsigned char* get_hw_message(){return this->_hw_msg;};
+
+  HWControlMessage& set_ricControlMessage(std::string msg){
+                               _hw_msg_size = strlen(msg.c_str());
+                               strncpy((char*)_hw_msg,msg.c_str(),_hw_msg_size);
+                               return *this;
+                       };
+
+private:
+
+  size_t _hw_msg_size;
+  unsigned char _hw_msg[128];
+
+  E2SM_HelloWorld_ControlMessage_t* _message;
+  E2SM_HelloWorld_ControlMessage_Format1_t _message_fmt1;
+
+  bool setfields(E2SM_HelloWorld_ControlMessage_t *);
+
+  size_t _errbuf_len = 128;
+  char _errbuf[128];
+  std::string _error_string;
+};
 
-#endif /* SRC_XAPP_ASN_E2SM_E2SM_CONTROL_HPP_ */
+#endif /* SRC_XAPP_ASN_E2SM_E2SM_INDICATION_HPP_ */
index 60ffd30..846704c 100644 (file)
@@ -17,7 +17,7 @@
 ==================================================================================
 */
 /*
- * e2sm_indication.cc
+ * HWIndicationMessage.cc
  *
  *  Created on: Apr, 2020
  *      Author: Shraboni Jana
 #include "e2sm_indication.hpp"
 
  //initialize
e2sm_indication::e2sm_indication(void){
HWIndicationMessage::HWIndicationMessage(void){
 
-       memset(&head_fmt1, 0, sizeof(E2SM_HelloWorld_IndicationHeader_Format1_t));
+       memset(&_message_fmt1, 0, sizeof(E2SM_HelloWorld_IndicationMessage_Format1_t));
 
-       memset(&msg_fmt1, 0, sizeof(E2SM_HelloWorld_IndicationMessage_Format1_t));
+       _message = 0;
+    _message = (E2SM_HelloWorld_IndicationMessage_t*)calloc(1, sizeof(E2SM_HelloWorld_IndicationMessage_t));
+    assert(_message !=0);
+    _hw_msg = 0;
+    _hw_msg_size = 0;
+  };
 
+ //initialize
+ HWIndicationMessage::HWIndicationMessage(unsigned char *buf, size_t *size, bool &status){
 
+       _message = 0;
+    _hw_msg = 0;
+    _hw_msg_size = 0;
 
-    indication_head = 0;
-    indication_head = ( E2SM_HelloWorld_IndicationHeader_t *)calloc(1, sizeof( E2SM_HelloWorld_IndicationHeader_t));
-    assert(indication_head != 0);
+    status = this->decode(buf, size);
 
-    indication_msg = 0;
-    indication_msg = (E2SM_HelloWorld_IndicationMessage_t*)calloc(1, sizeof(E2SM_HelloWorld_IndicationMessage_t));
-    assert(indication_msg !=0);
+ };
 
-    errbuf_len = 128;
-  };
+ //initialize
+  HWIndicationHeader::HWIndicationHeader(void){
 
- e2sm_indication::~e2sm_indication(void){
+       memset(&_header_fmt1, 0, sizeof(E2SM_HelloWorld_IndicationHeader_Format1_t));
 
-  mdclog_write(MDCLOG_DEBUG, "Freeing event trigger object memory");
+       _header = 0;
+     _header = ( E2SM_HelloWorld_IndicationHeader_t *)calloc(1, sizeof( E2SM_HelloWorld_IndicationHeader_t));
+     assert(_header != 0);
+
+     _hw_header = 0;
+   };
+
+  //initialize
+   HWIndicationHeader::HWIndicationHeader(unsigned char *buf, size_t *size, bool &status){
+
+       _header = 0;
+       _hw_header = 0;
+
+      status = this->decode(buf, size);
+
+   };
 
-  indication_head->choice.indicationHeader_Format1 = 0;
 
-  indication_msg->choice.indicationMessage_Format1 = 0;
+ HWIndicationMessage::~HWIndicationMessage(void){
 
-  ASN_STRUCT_FREE(asn_DEF_E2SM_HelloWorld_IndicationHeader, indication_head);
-  ASN_STRUCT_FREE(asn_DEF_E2SM_HelloWorld_IndicationMessage, indication_msg);
+  mdclog_write(MDCLOG_DEBUG, "Freeing event trigger object memory");
+  _message->choice.indicationMessage_Format1 = 0;
+  ASN_STRUCT_FREE(asn_DEF_E2SM_HelloWorld_IndicationMessage, _message);
 
 
 };
+ HWIndicationHeader::~HWIndicationHeader(void){
+
+   mdclog_write(MDCLOG_DEBUG, "Freeing event trigger object memory");
+   _header->choice.indicationHeader_Format1 = 0;
+   ASN_STRUCT_FREE(asn_DEF_E2SM_HelloWorld_IndicationHeader, _header);
+ };
 
-bool e2sm_indication::encode_indication_header(unsigned char *buf, size_t *size, e2sm_indication_helper &helper){
+bool HWIndicationHeader::encode(unsigned char *buf, size_t *size){
 
-  ASN_STRUCT_RESET(asn_DEF_E2SM_HelloWorld_IndicationHeader, indication_head);
+  ASN_STRUCT_RESET(asn_DEF_E2SM_HelloWorld_IndicationHeader, _header);
 
   bool res;
-  res = set_fields(indication_head, helper);
+  res = setfields(_header);
   if (!res){
 
     return false;
   }
 
-  int ret_constr = asn_check_constraints(&asn_DEF_E2SM_HelloWorld_IndicationHeader, indication_head, errbuf, &errbuf_len);
+  int ret_constr = asn_check_constraints(&asn_DEF_E2SM_HelloWorld_IndicationHeader, _header, _errbuf, &_errbuf_len);
   if(ret_constr){
-    error_string.assign(&errbuf[0], errbuf_len);
+    _error_string.assign(&_errbuf[0], _errbuf_len);
     return false;
   }
 
-  xer_fprint(stdout, &asn_DEF_E2SM_HelloWorld_IndicationHeader, indication_head);
+  xer_fprint(stdout, &asn_DEF_E2SM_HelloWorld_IndicationHeader, _header);
 
-  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_IndicationHeader, indication_head, buf, *size);
+  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_IndicationHeader, _header, buf, *size);
 
   if(retval.encoded == -1){
-    error_string.assign(strerror(errno));
+    _error_string.assign(strerror(errno));
     return false;
   }
   else if (retval.encoded > *size){
     std::stringstream ss;
     ss  <<"Error encoding event trigger definition. Reason =  encoded pdu size " << retval.encoded << " exceeds buffer size " << *size << std::endl;
-    error_string = ss.str();
+    _error_string = ss.str();
     return false;
   }
   else{
@@ -97,33 +124,32 @@ bool e2sm_indication::encode_indication_header(unsigned char *buf, size_t *size,
   return true;
 }
 
-bool e2sm_indication::encode_indication_message(unsigned char *buf, size_t *size, e2sm_indication_helper &helper){
+bool HWIndicationMessage::encode(unsigned char *buf, size_t *size){
 
   bool res;
-  res = set_fields(indication_msg, helper);
+  res = setfields(_message);
   if (!res){
     return false;
   }
 
-
-  int ret_constr = asn_check_constraints(&asn_DEF_E2SM_HelloWorld_IndicationMessage, indication_msg, errbuf, &errbuf_len);
+  int ret_constr = asn_check_constraints(&asn_DEF_E2SM_HelloWorld_IndicationMessage, _message, _errbuf, &_errbuf_len);
   if(ret_constr){
-    error_string.assign(&errbuf[0], errbuf_len);
+    _error_string.assign(&_errbuf[0], _errbuf_len);
     return false;
   }
 
-  xer_fprint(stdout, &asn_DEF_E2SM_HelloWorld_IndicationMessage, indication_msg);
+  xer_fprint(stdout, &asn_DEF_E2SM_HelloWorld_IndicationMessage, _message);
 
-  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_IndicationMessage, indication_msg, buf, *size);
+  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_IndicationMessage, _message, buf, *size);
 
   if(retval.encoded == -1){
-    error_string.assign(strerror(errno));
+    _error_string.assign(strerror(errno));
     return false;
   }
   else if (retval.encoded > *size){
     std::stringstream ss;
     ss  <<"Error encoding action definition. Reason =  encoded pdu size " << retval.encoded << " exceeds buffer size " << *size << std::endl;
-    error_string = ss.str();
+    _error_string = ss.str();
     return false;
   }
   else{
@@ -133,59 +159,68 @@ bool e2sm_indication::encode_indication_message(unsigned char *buf, size_t *size
   return true;
 }
 
-bool e2sm_indication::set_fields(E2SM_HelloWorld_IndicationHeader_t * ref_indication_head, e2sm_indication_helper & helper){
+bool HWIndicationHeader::setfields(E2SM_HelloWorld_IndicationHeader_t * _header){
 
- if(ref_indication_head == 0){
-    error_string = "Invalid reference for Event Trigger Definition set fields";
+ if(_header == 0){
+    _error_string = "Invalid reference for Event Trigger Definition set fields";
     return false;
   }
 
-  ref_indication_head->present = E2SM_HelloWorld_IndicationHeader_PR_indicationHeader_Format1;
-
-  head_fmt1.indicationHeaderParam = helper.header;
-
-  ref_indication_head->choice.indicationHeader_Format1 = &head_fmt1;
+ _header->present = E2SM_HelloWorld_IndicationHeader_PR_indicationHeader_Format1;
+  _header_fmt1.indicationHeaderParam = this->get_hw_header();
+  _header->choice.indicationHeader_Format1 = &_header_fmt1;
 
   return true;
 };
 
-bool e2sm_indication::set_fields(E2SM_HelloWorld_IndicationMessage_t * ref_indication_msg, e2sm_indication_helper & helper){
+bool HWIndicationMessage::setfields(E2SM_HelloWorld_IndicationMessage_t * _message){
 
- if(ref_indication_msg == 0){
-    error_string = "Invalid reference for Event Action Definition set fields";
+ if(_message == 0){
+    _error_string = "Invalid reference for Event Action Definition set fields";
     return false;
   }
-  ref_indication_msg->present = E2SM_HelloWorld_IndicationMessage_PR_indicationMessage_Format1;
-
-  msg_fmt1.indicationMsgParam.buf = helper.message;
-  msg_fmt1.indicationMsgParam.size = helper.message_len;
-
-
-  ref_indication_msg->choice.indicationMessage_Format1 = &msg_fmt1;
+  _message->present = E2SM_HelloWorld_IndicationMessage_PR_indicationMessage_Format1;
 
+  _message_fmt1.indicationMsgParam.buf = this->get_hw_message();
+  _message_fmt1.indicationMsgParam.size = this->get_hw_message_size();
+  _message->choice.indicationMessage_Format1 = &_message_fmt1;
 
   return true;
 };
 
-bool e2sm_indication::get_fields(E2SM_HelloWorld_IndicationHeader_t * ref_indictaion_header, e2sm_indication_helper & helper){
-
-       if (ref_indictaion_header == 0){
-           error_string = "Invalid reference for Indication Header get fields";
+bool HWIndicationHeader::decode(unsigned char *buf, size_t *size){
+       asn_dec_rval_t dec_res  = asn_decode(0,ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_IndicationHeader, (void**)&(_header), buf, *size);
+        if(dec_res.code != RC_OK){
+                mdclog_write(MDCLOG_ERR, "Failed to decode: %s","HW-E2SM RIC Indication Header");
+                return false;
+        } else {
+                mdclog_write(MDCLOG_INFO, "Successfully decoded: %s","HW-E2SM RIC Indication Header");
+        }
+
+        if (_header == 0){
+           _error_string = "Invalid reference for Indication Header get fields";
            return false;
          }
 
-       helper.header = ref_indictaion_header->choice.indicationHeader_Format1->indicationHeaderParam;
+       this->set_ricIndicationHeader(_header->choice.indicationHeader_Format1->indicationHeaderParam);
        return true;
 }
 
-bool e2sm_indication::get_fields(E2SM_HelloWorld_IndicationMessage_t * ref_indication_message, e2sm_indication_helper & helper){
+bool HWIndicationMessage::decode(unsigned char *buf, size_t *size){
+
+       asn_dec_rval_t dec_res  = asn_decode(0,ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_IndicationMessage, (void**)&(_message), buf, *size);
+       if(dec_res.code != RC_OK){
+                        mdclog_write(MDCLOG_ERR, "Failed to decode: %s","HW-E2SM RIC Indication Message");
+                        return false;
+       } else {
+                        mdclog_write(MDCLOG_INFO, "Successfully decoded: %s","HW-E2SM RIC Indication Message");
+       }
 
-         if (ref_indication_message == 0){
-                   error_string = "Invalid reference for Indication Message get fields";
+         if (_message == 0){
+                   _error_string = "Invalid reference for Indication Message get fields";
                    return false;
                  }
-         helper.message = ref_indication_message->choice.indicationMessage_Format1->indicationMsgParam.buf;
-         helper.message_len = ref_indication_message->choice.indicationMessage_Format1->indicationMsgParam.size;
+        // this->set_ricIndicationMessage(_message->choice.indicationMessage_Format1->indicationMsgParam.buf, _message->choice.indicationMessage_Format1->indicationMsgParam.size);
 
          return true;
   }
index a7fcdd7..4d820b7 100644 (file)
@@ -26,9 +26,7 @@
 /* Classes to handle E2 service model based on e2sm-HelloWorld-v001.asn */
 #ifndef SRC_XAPP_ASN_E2SM_E2SM_INDICATION_HPP_
 #define SRC_XAPP_ASN_E2SM_E2SM_INDICATION_HPP_
-
 #include <sstream>
-#include <e2sm_helpers.hpp>
 #include <mdclog/mdclog.h>
 #include <vector>
 
 #include <E2SM-HelloWorld-IndicationMessage-Format1.h>
 #include <HW-Header.h>
 #include <HW-Message.h>
-
-class e2sm_indication {
+class HWIndicationHeader {
 public:
-       e2sm_indication(void);
-  ~e2sm_indication(void);
+       HWIndicationHeader(void);
+       HWIndicationHeader(unsigned char*, size_t *, bool&);
+  ~HWIndicationHeader(void);
+   std::string  get_error (void) const {return _error_string ;};
+
+  long int get_hw_header(){return this->_hw_header;};
+
+  HWIndicationHeader& set_ricIndicationHeader(int param_header){
+                               _hw_header = param_header; return *this;
+                       }
+  bool decode(unsigned char*, size_t *);
+  bool encode(unsigned char*, size_t *);
+
 
-  bool set_fields(E2SM_HelloWorld_IndicationHeader_t *, e2sm_indication_helper &);
-  bool set_fields(E2SM_HelloWorld_IndicationMessage_t *, e2sm_indication_helper &);
+private:
 
-  bool get_fields(E2SM_HelloWorld_IndicationHeader_t *, e2sm_indication_helper &);
-  bool get_fields(E2SM_HelloWorld_IndicationMessage_t *, e2sm_indication_helper &);
+  long int _hw_header;
+  E2SM_HelloWorld_IndicationHeader_t * _header; // used for encoding
+  E2SM_HelloWorld_IndicationHeader_Format1_t _header_fmt1;
 
-  bool encode_indication_header(unsigned char *, size_t *, e2sm_indication_helper &);
-  bool encode_indication_message(unsigned char*, size_t *, e2sm_indication_helper &);
+  bool setfields(E2SM_HelloWorld_IndicationHeader_t *);
 
+  size_t _errbuf_len = 128;
+  char _errbuf[128];
+  std::string _error_string;
+};
+class HWIndicationMessage {
+public:
+       HWIndicationMessage(void);
+       HWIndicationMessage(unsigned char*, size_t *, bool&);
+  ~HWIndicationMessage(void);
 
-  std::string  get_error (void) const {return error_string ;};
+  std::string  get_error (void) const {return _error_string ;};
+  bool decode(unsigned char*, size_t *);
+  bool encode(unsigned char*, size_t *);
 
+  size_t get_hw_message_size(){return this->_hw_msg_size;};
+  unsigned char* get_hw_message(){return this->_hw_msg;};
+  HWIndicationMessage& set_hw_message(unsigned char* msg, size_t *msg_size){return *this;}
 private:
 
-  E2SM_HelloWorld_IndicationHeader_t * indication_head; // used for encoding
-  E2SM_HelloWorld_IndicationMessage_t* indication_msg;
-  E2SM_HelloWorld_IndicationHeader_Format1_t head_fmt1;
-  E2SM_HelloWorld_IndicationMessage_Format1_t msg_fmt1;
+  size_t _hw_msg_size;
+  unsigned char* _hw_msg;
 
+  E2SM_HelloWorld_IndicationMessage_t* _message;
+  E2SM_HelloWorld_IndicationMessage_Format1_t _message_fmt1;
 
-  size_t errbuf_len;
-  char errbuf[128];
-  std::string error_string;
-};
+  bool setfields(E2SM_HelloWorld_IndicationMessage_t *);
 
+  size_t _errbuf_len = 128;
+  char _errbuf[128];
+  std::string _error_string;
+};
 
+#endif
 
 
-#endif /* SRC_XAPP_ASN_E2SM_E2SM_INDICATION_HPP_ */
index 51511a4..1739b04 100644 (file)
@@ -1,99 +1,84 @@
 /*
-  ==================================================================================
+==================================================================================
 
-  Copyright (c) 2019-2020 AT&T Intellectual Property.
+        Copyright (c) 2019-2020 AT&T Intellectual Property.
 
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-  Unless required by applicable law or agreed to in writing, softwares
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ==================================================================================
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================================
 */
 /*
- * e2sm_control.cc
+ * e2sm_subscription.cc
  *
- *  Created on: Apr 30, 2020
- *      Author: Shraboni Jana
+ *  Created on: Jun 30, 2020
+ *      Author: sjana
  */
-/* Classes to handle E2 service model based on e2sm-HelloWorld-v001.asn */
 
 #include "e2sm_subscription.hpp"
 
- //initialize
- e2sm_subscription::e2sm_subscription(void){
 
-       memset(&event_fmt1, 0, sizeof(E2SM_HelloWorld_EventTriggerDefinition_Format1_t));
 
-       memset(&actn_fmt1, 0, sizeof(E2SM_HelloWorld_ActionDefinition_Format1_t));
+HWEventTriggerDefinition::HWEventTriggerDefinition(void){
 
+       memset(&_event_fmt1, 0, sizeof(E2SM_HelloWorld_EventTriggerDefinition_Format1_t));
 
-       ran_param = 0;
-       ran_param = (RANparameter_Item_t*)calloc(1, sizeof(RANparameter_Item_t));
-       assert(ran_param != 0);
+       _triggerNature = 1; //Making first selection as default since enumerated type.
 
-    event_trigger = 0;
-    event_trigger = ( E2SM_HelloWorld_EventTriggerDefinition_t *)calloc(1, sizeof( E2SM_HelloWorld_EventTriggerDefinition_t));
-    assert(event_trigger != 0);
+    _event_trigger = 0;
+    _event_trigger = ( E2SM_HelloWorld_EventTriggerDefinition_t *)calloc(1, sizeof( E2SM_HelloWorld_EventTriggerDefinition_t));
+    assert(_event_trigger != 0);
 
-    action_defn = 0;
-    action_defn = (E2SM_HelloWorld_ActionDefinition_t*)calloc(1, sizeof(E2SM_HelloWorld_ActionDefinition_t));
-    assert(action_defn !=0);
-
-    errbuf_len = 128;
   };
 
- e2sm_subscription::~e2sm_subscription(void){
+HWEventTriggerDefinition::~HWEventTriggerDefinition(void){
 
   mdclog_write(MDCLOG_DEBUG, "Freeing event trigger object memory");
-
-  event_trigger->choice.eventDefinition_Format1 = 0;
-
-  action_defn->choice.actionDefinition_Format1 = 0;
-
-  free(ran_param);
-
-  ASN_STRUCT_FREE(asn_DEF_E2SM_HelloWorld_EventTriggerDefinition, event_trigger);
-  ASN_STRUCT_FREE(asn_DEF_E2SM_HelloWorld_ActionDefinition, action_defn);
-
+  _event_trigger->choice.eventDefinition_Format1 = 0;
+  ASN_STRUCT_FREE(asn_DEF_E2SM_HelloWorld_EventTriggerDefinition, _event_trigger);
 
 };
 
-bool e2sm_subscription::encode_event_trigger(unsigned char *buf, size_t *size, e2sm_subscription_helper &helper){
+bool HWEventTriggerDefinition::encode(unsigned char *buf, size_t *size){
 
-  ASN_STRUCT_RESET(asn_DEF_E2SM_HelloWorld_EventTriggerDefinition, event_trigger);
+  ASN_STRUCT_RESET(asn_DEF_E2SM_HelloWorld_EventTriggerDefinition, _event_trigger);
 
-  bool res;
-  res = set_fields(event_trigger, helper);
-  if (!res){
+  if(_event_trigger == 0){
+      _error_string = "Invalid reference for Event Trigger Definition set fields";
+      return false;
+    }
+
+  _event_trigger->present = E2SM_HelloWorld_EventTriggerDefinition_PR_eventDefinition_Format1;
+  _event_fmt1.triggerNature = this->_triggerNature;
+  _event_trigger->choice.eventDefinition_Format1 = &_event_fmt1;
 
-    return false;
-  }
 
-  int ret_constr = asn_check_constraints(&asn_DEF_E2SM_HelloWorld_EventTriggerDefinition, event_trigger, errbuf, &errbuf_len);
+  int ret_constr = asn_check_constraints(&asn_DEF_E2SM_HelloWorld_EventTriggerDefinition, _event_trigger, _errbuf, &_errbuf_len);
   if(ret_constr){
-    error_string.assign(&errbuf[0], errbuf_len);
+    _error_string.assign(&_errbuf[0], _errbuf_len);
     return false;
   }
 
-  xer_fprint(stdout, &asn_DEF_E2SM_HelloWorld_EventTriggerDefinition, event_trigger);
+  xer_fprint(stdout, &asn_DEF_E2SM_HelloWorld_EventTriggerDefinition, _event_trigger);
 
-  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_EventTriggerDefinition, event_trigger, buf, *size);
+  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_EventTriggerDefinition, _event_trigger, buf, *size);
 
   if(retval.encoded == -1){
-    error_string.assign(strerror(errno));
+    _error_string.assign(strerror(errno));
     return false;
   }
   else if (retval.encoded > *size){
     std::stringstream ss;
     ss  <<"Error encoding event trigger definition. Reason =  encoded pdu size " << retval.encoded << " exceeds buffer size " << *size << std::endl;
-    error_string = ss.str();
+    _error_string = ss.str();
     return false;
   }
   else{
@@ -103,33 +88,60 @@ bool e2sm_subscription::encode_event_trigger(unsigned char *buf, size_t *size, e
   return true;
 }
 
-bool e2sm_subscription::encode_action_defn(unsigned char *buf, size_t *size, e2sm_subscription_helper &helper){
+HWActionDefinition::HWActionDefinition(void){
+
+       _param_list = std::make_unique<std::vector<RANParamIEs>>(); _count_list = 0;
+
+       memset(&_action_fmt1, 0, sizeof(E2SM_HelloWorld_ActionDefinition_Format1_t));
+
+       int SEQOFRANPARAMS = 1;
+
+       _ranparam_ie = 0;
+       _ranparam_ie = (RANparameter_Item_t*)calloc(SEQOFRANPARAMS, sizeof(RANparameter_Item_t));
+       assert(_ranparam_ie != 0);
+
+       _action_defn = 0;
+    _action_defn = (E2SM_HelloWorld_ActionDefinition_t*)calloc(1, sizeof(E2SM_HelloWorld_ActionDefinition_t));
+    assert(_action_defn !=0);
+
+
+};
+
+HWActionDefinition::~HWActionDefinition(void){
+
+  mdclog_write(MDCLOG_DEBUG, "Freeing Action Definition object memory");
+  _action_defn->choice.actionDefinition_Format1 = 0;
+  free(_ranparam_ie);
+  ASN_STRUCT_FREE(asn_DEF_E2SM_HelloWorld_ActionDefinition, _action_defn);
+
+
+};
+bool HWActionDefinition::encode(unsigned char *buf, size_t *size){
 
   bool res;
-  res = set_fields(action_defn, helper);
+  res = this->setfields(this->_action_defn);
   if (!res){
     return false;
   }
 
-
-  int ret_constr = asn_check_constraints(&asn_DEF_E2SM_HelloWorld_ActionDefinition, action_defn, errbuf, &errbuf_len);
+  int ret_constr = asn_check_constraints(&asn_DEF_E2SM_HelloWorld_ActionDefinition, this->_action_defn, _errbuf, &_errbuf_len);
   if(ret_constr){
-    error_string.assign(&errbuf[0], errbuf_len);
+    _error_string.assign(&_errbuf[0], _errbuf_len);
     return false;
   }
 
-  xer_fprint(stdout, &asn_DEF_E2SM_HelloWorld_ActionDefinition, action_defn);
+  xer_fprint(stdout, &asn_DEF_E2SM_HelloWorld_ActionDefinition, _action_defn);
 
-  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_ActionDefinition, action_defn, buf, *size);
+  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_HelloWorld_ActionDefinition, _action_defn, buf, *size);
 
   if(retval.encoded == -1){
-    error_string.assign(strerror(errno));
+    _error_string.assign(strerror(errno));
     return false;
   }
   else if (retval.encoded > *size){
     std::stringstream ss;
     ss  <<"Error encoding action definition. Reason =  encoded pdu size " << retval.encoded << " exceeds buffer size " << *size << std::endl;
-    error_string = ss.str();
+    _error_string = ss.str();
     return false;
   }
   else{
@@ -139,47 +151,39 @@ bool e2sm_subscription::encode_action_defn(unsigned char *buf, size_t *size, e2s
   return true;
 }
 
-bool e2sm_subscription::set_fields(E2SM_HelloWorld_EventTriggerDefinition_t * ref_event_trigger, e2sm_subscription_helper & helper){
+bool HWActionDefinition::setfields(E2SM_HelloWorld_ActionDefinition_t *_action_defn){
 
- if(ref_event_trigger == 0){
-    error_string = "Invalid reference for Event Trigger Definition set fields";
+ if(_action_defn == 0){
+    _error_string = "Invalid reference for Event Action Definition set fields";
     return false;
   }
+  _action_defn->present = E2SM_HelloWorld_ActionDefinition_PR_actionDefinition_Format1;
 
-  ref_event_trigger->present = E2SM_HelloWorld_EventTriggerDefinition_PR_eventDefinition_Format1;
+  _ranparam_ie = (RANparameter_Item_t*)calloc(this->_count_list, sizeof(RANparameter_Item_t));
+   assert(_ranparam_ie != 0);
 
-  event_fmt1.triggerNature = helper.triger_nature;
+  auto paramList = this->get_list();
+  int i = 0;
+  for(RANParamIEs item:*paramList){
 
-  ref_event_trigger->choice.eventDefinition_Format1 = &event_fmt1;
+         _ranparam_ie[i].ranParameter_ID = item.get_param_id();
+         _ranparam_ie[i].ranParameter_Name.buf = item.get_param_name();
+         _ranparam_ie[i].ranParameter_Name.size = item.get_param_name_size();
+         _ranparam_ie[i].ranParameter_Test = item.get_param_test();
+         _ranparam_ie[i].ranParameter_Value.buf = item.get_param_value();
+         _ranparam_ie[i].ranParameter_Value.size = item.get_param_value_size();
 
-  return true;
-};
+        const int res = ASN_SEQUENCE_ADD(&_action_fmt1.ranParameter_List, &(_ranparam_ie[i]));
+        if (res!=0){
+              _error_string = "Error : Unable to assign memory to add RAN PARAM item to set up list";
+              return false;
+           }
+         i++;
 
-bool e2sm_subscription::set_fields(E2SM_HelloWorld_ActionDefinition_t * ref_action_defn, e2sm_subscription_helper & helper){
-
- if(ref_action_defn == 0){
-    error_string = "Invalid reference for Event Action Definition set fields";
-    return false;
-  }
-  ref_action_defn->present = E2SM_HelloWorld_ActionDefinition_PR_actionDefinition_Format1;
-
-
-  ranparam_helper_t paramlst = helper.get_paramlist();
-
-  for(RANParam_Helper item:paramlst){
-         ran_param->ranParameter_ID = item.getran_helper()._param_id;
-         ran_param->ranParameter_Name.buf = item.getran_helper()._param_name;
-         ran_param->ranParameter_Name.size = item.getran_helper()._param_name_len;
-         ran_param->ranParameter_Test = item.getran_helper()._param_test;
-         ran_param->ranParameter_Value.buf = item.getran_helper()._param_value;
-         ran_param->ranParameter_Value.size = item.getran_helper()._param_value_len;
-         ASN_SEQUENCE_ADD(&(actn_fmt1.ranParameter_List->list.array), ran_param);
   }
 
-
-  ref_action_defn->choice.actionDefinition_Format1 = &actn_fmt1;
+  _action_defn->choice.actionDefinition_Format1 = &_action_fmt1;
 
 
   return true;
 };
-
index 6d046a2..8e56c73 100644 (file)
 ==================================================================================
 */
 /*
- * e2sm_control.cc
+ * e2sm_subscription.hpp
  *
- *  Created on: Apr 30, 2020
- *      Author: Shraboni Jana
+ *  Created on: Jun 30, 2020
+ *      Author: sjana
  */
-/* Classes to handle E2 service model based on e2sm-HelloWorld-v001.asn */
-#ifndef E2SM_
-#define E2SM_
 
+#ifndef XAPP_ASN_REFACTOR_E2SM_SUBSCRIPTION_HPP_
+#define XAPP_ASN_REFACTOR_E2SM_SUBSCRIPTION_HPP_
 
+
+#include <errno.h>
+#include <iostream>
+#include <vector>
 #include <sstream>
-#include <e2sm_helpers.hpp>
+#include <memory>
 #include <mdclog/mdclog.h>
-#include <vector>
 
 #include <E2SM-HelloWorld-EventTriggerDefinition.h>
 #include <E2SM-HelloWorld-ActionDefinition.h>
 #include <E2SM-HelloWorld-ActionDefinition-Format1.h>
 #include <HW-TriggerNature.h>
 #include <RANparameter-Item.h>
+#include <ProtocolIE-Field.h>
 
-/* builder class for E2SM event trigger definition */
-
-class e2sm_subscription {
+class HWEventTriggerDefinition {
 public:
-       e2sm_subscription(void);
-  ~e2sm_subscription(void);
+   HWEventTriggerDefinition(void);
+  ~HWEventTriggerDefinition(void);
+
+  bool encode(unsigned char *, size_t *);
+  std::string  get_error (void) const {return _error_string ;};
+  int get_triggerNature(){return this->_triggerNature;};
+  HWEventTriggerDefinition& set_triggerNature(int trigger){ this->_triggerNature = trigger; return *this;};
+
+private:
+
+  E2SM_HelloWorld_EventTriggerDefinition_t * _event_trigger; // used for encoding
+  E2SM_HelloWorld_EventTriggerDefinition_Format1_t _event_fmt1;
+  int _triggerNature;
 
-  bool set_fields(E2SM_HelloWorld_EventTriggerDefinition_t *, e2sm_subscription_helper &);
-  bool set_fields(E2SM_HelloWorld_ActionDefinition_t *, e2sm_subscription_helper &);
+  size_t _errbuf_len = 128;
+  char _errbuf[128];
+  std::string _error_string;
+};
 
-  bool encode_event_trigger(unsigned char *, size_t *, e2sm_subscription_helper &);
-  bool encode_action_defn(unsigned char*, size_t *, e2sm_subscription_helper &);
 
+class HWActionDefinition {
 
-  std::string  get_error (void) const {return error_string ;};
+public:
+  HWActionDefinition(void);
+  ~HWActionDefinition(void);
+  class RANParamIEs{
+
+  private:
+                 long int _param_id;
+             unsigned char _param_name[20];
+             size_t _param_name_size;
+             int _param_test;
+             unsigned char _param_value[20];
+             size_t _param_value_size;
+  public:
+                 RANParamIEs(void):_param_id(0),_param_name_size(0), _param_test(0),_param_value_size(0){};
+                 RANParamIEs& set_param_id(int param_id) {_param_id = param_id; return *this;};
+                 RANParamIEs& set_param_name(std::string param_name) { _param_name_size = strlen(param_name.c_str());
+                                                                                                                          strncpy((char*)_param_name,param_name.c_str(),_param_name_size); return *this;};
+                 RANParamIEs& set_param_test(int param_test) {_param_test = param_test; return *this;};
+                 RANParamIEs& set_param_value(std::string param_value) {_param_value_size = strlen(param_value.c_str());
+                                                                                                                                strncpy((char*)_param_value,param_value.c_str(),_param_value_size); return *this;};
+
+                 int get_param_id(){return this->_param_id;};
+                 int get_param_test(){return this->_param_test;};
+                 unsigned char* get_param_name(){return this->_param_name;};
+                 int get_param_name_size(){return this->_param_name_size;};
+                 unsigned char* get_param_value(){return this->_param_value;};
+                 int get_param_value_size(){return this->_param_value_size;};
+
+
+  };
+  std::vector<RANParamIEs> * get_list() const {return _param_list.get();};
+  int get_list_count() const {return _count_list;};
+  bool encode(unsigned char *, size_t *);
+  std::string  get_error (void) const {return _error_string ;};
+  void add(RANParamIEs ie_obj){
+         _param_list.get()->push_back(ie_obj);
+         _count_list ++;
+  }
 
 private:
+  std::unique_ptr<std::vector<RANParamIEs>> _param_list;
+  int _count_list;
+  E2SM_HelloWorld_ActionDefinition_t* _action_defn;
+  E2SM_HelloWorld_ActionDefinition_Format1_t _action_fmt1;
+  RANparameter_Item_t* _ranparam_ie;
 
-  E2SM_HelloWorld_EventTriggerDefinition_t * event_trigger; // used for encoding
-  E2SM_HelloWorld_ActionDefinition_t* action_defn;
-  E2SM_HelloWorld_EventTriggerDefinition_Format1_t event_fmt1;
-  E2SM_HelloWorld_ActionDefinition_Format1_t actn_fmt1;
-  RANparameter_Item_t *ran_param;
+  size_t _errbuf_len = 128;
+  char _errbuf[128];
+  std::string _error_string;
 
+  bool setfields(E2SM_HelloWorld_ActionDefinition_t *);
 
-  size_t errbuf_len;
-  char errbuf[128];
-  std::string error_string;
-};
 
+};
 
 
-#endif
+#endif /* XAPP_ASN_REFACTOR_E2SM_SUBSCRIPTION_HPP_ */
index 06cc81a..d4de3c7 100644 (file)
 
 #include "msgs_proc.hpp"
 
-
-bool XappMsgHandler::encode_subscription_delete_request(unsigned char* buffer, size_t *buf_len){
-
-       subscription_helper sub_helper;
-       sub_helper.set_request(0); // requirement of subscription manager ... ?
-       sub_helper.set_function_id(0);
-
-       subscription_delete e2ap_sub_req_del;
-
-         // generate the delete request pdu
-
-         bool res = e2ap_sub_req_del.encode_e2ap_subscription(&buffer[0], buf_len, sub_helper);
-         if(! res){
-           mdclog_write(MDCLOG_ERR, "%s, %d: Error encoding subscription delete request pdu. Reason = %s", __FILE__, __LINE__, e2ap_sub_req_del.get_error().c_str());
-           return false;
-         }
-
-       return true;
-
-}
-
+/*
 bool XappMsgHandler::decode_subscription_response(unsigned char* data_buf, size_t data_size){
 
        subscription_helper subhelper;
@@ -78,7 +58,7 @@ bool XappMsgHandler::decode_subscription_response(unsigned char* data_buf, size_
        ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, e2pdu);
        return res;
 
-}
+}*/
 
 bool  XappMsgHandler::a1_policy_handler(char * message, int *message_len, a1_policy_helper &helper){
 
index fb9164e..3792ec2 100644 (file)
 #include <mdclog/mdclog.h>
 
 #include "a1_helper.hpp"
-#include "e2ap_control.hpp"
-#include "e2ap_control_response.hpp"
-#include "e2ap_indication.hpp"
-#include "subscription_delete_request.hpp"
-#include "subscription_delete_response.hpp"
-#include "subscription_helper.hpp"
-#include "subscription_request.hpp"
-#include "subscription_request.hpp"
-#include "subscription_response.hpp"
-#include "e2sm_subscription.hpp"
 #include "subs_mgmt.hpp"
 
 #define MAX_RMR_RECV_SIZE 2<<15
index c500827..5d113ed 100644 (file)
 #include <chrono>
 #include <tuple>
 #include <rmr/RIC_message_types.h>
-
-#include "subscription_delete_request.hpp"
-#include "subscription_delete_response.hpp"
-#include "subscription_request.hpp"
-#include "subscription_response.hpp"
+#include "e2ap_action.hpp"
+#include "e2ap_subscription_request.hpp"
+#include "e2sm_subscription.hpp"
 
 #define SUBSCR_SUCCESS 1
 #define SUBSCR_ERR_TX -1
index 7d5d2b3..1753661 100644 (file)
@@ -126,8 +126,9 @@ void Xapp::startup_subscribe_requests(void ){
 
    mdclog_write(MDCLOG_INFO,"Preparing to send subscription in file= %s, line=%d",__FILE__,__LINE__);
 
-   auto gnblist = get_rnib_gnblist();
+   std::string sub_id = "1";
 
+   auto gnblist = get_rnib_gnblist();
    int sz = gnblist.size();
 
    if(sz <= 0)
@@ -142,35 +143,36 @@ void Xapp::startup_subscribe_requests(void ){
        // strncpy((char *)data,strMsg,strlen(strMsg));
        // data_size = strlen(strMsg);
 
-        subscription_helper  din;
-        subscription_helper  dout;
+        unsigned char buf[1024];
+        size_t buf_size = 1024;
 
-        subscription_request sub_req;
-        subscription_request sub_recv;
 
-        unsigned char buf[BUFFER_SIZE];
-        size_t buf_size = BUFFER_SIZE;
-        bool res;
+        HWEventTriggerDefinition eventObj;
+        eventObj.set_triggerNature(0);
 
+        //creating Action Definition
+        HWActionDefinition e2sm_actdefn1;
+        e2sm_actdefn1.add(HWActionDefinition::RANParamIEs().set_param_id(1).set_param_name("ENodeBID").set_param_test(1).set_param_value("SR123"));
 
-        //Random Data  for request
-        int request_id = 1;
-        int function_id = 0;
-        std::string event_def = "HelloWorld Event Definition";
+        //first Action Object
+        E2APAction<HWActionDefinition> actionObj;
+        actionObj.add(E2APAction<HWActionDefinition>::ActionIEs().set_ricActionID(1).set_ricActionType(1).set_ricActionDefinition(e2sm_actdefn1));
 
-        din.set_request(request_id);
-        din.set_function_id(function_id);
-        din.set_event_def(event_def.c_str(), event_def.length());
+        E2APSubscriptionRequest<HWEventTriggerDefinition, HWActionDefinition> requestObj(E2APSubscriptionRequest<HWEventTriggerDefinition, HWActionDefinition>::SubscriptionRequestIEs().set_ranFunctionID(1).set_ricInstanceID(1).set_ricRequestorID(3).set_ricAction_ToBeSetup_List(actionObj).set_ricEventTriggerDefinition(eventObj));
 
-        std::string act_def = "HelloWorld Action Definition";
+        bool res = requestObj.encode(&buf[0], &buf_size);
+        if(!res)
+                 mdclog_write(MDCLOG_ERR,"SubscriptionRequest ENCODING Error: %s",requestObj.get_error().c_str());
+        else
+                 mdclog_write(MDCLOG_INFO,"SubscriptionRequest ENCODING SUCESS");
 
-        din.add_action(1,1,(void*)act_def.c_str(), act_def.length(), 0);
 
-        res = sub_req.encode_e2ap_subscription(&buf[0], &buf_size, din);
 
         xapp_rmr_header rmr_header;
         rmr_header.message_type = RIC_SUB_REQ;
         rmr_header.payload_length = buf_size; //data_size
+
+        strcpy((char*)rmr_header.sid,sub_id.c_str());
         strcpy((char*)rmr_header.meid,gnblist[i].c_str());
 
         mdclog_write(MDCLOG_INFO,"Sending subscription in file= %s, line=%d for MEID %s",__FILE__,__LINE__, meid);