1. Transitioned to using latest asn1c compiler

[ric-app/admin.git] / src / E2AP-c / subscription / subscription_request.hpp

diff --git a/src/E2AP-c/subscription/subscription_request.hpp b/src/E2AP-c/subscription/subscription_request.hpp
index ed6bccd..830eee9 100644 (file)
--- a/src/E2AP-c/subscription/subscription_request.hpp
+++ b/src/E2AP-c/subscription/subscription_request.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#ifndef S_REQUEST
-#define S_REQUEST
+#ifndef S_REQUEST_
+#define S_REQUEST_
 
 #include <mdclog/mdclog.h>
 #include <vector>
@@ -27,16 +27,16 @@
 #include <sstream>
 
 #include <asn_application.h>
-#include <E2AP-PDU.h>
-#include <InitiatingMessage.h>
-#include <RICsubscriptionRequest.h>
-#include <RICsubscription.h>
-#include <ProtocolIE-Field.h>
-#include <ProtocolIE-Single-Container.h>
-#include <RICactions-ToBeSetup-List.h>
+#include <E2N_E2AP-PDU.h>
+#include <E2N_InitiatingMessage.h>
+#include <E2N_RICsubscriptionRequest.h>
+#include <E2N_RICsubscription.h>
+#include <E2N_ProtocolIE-Field.h>
+#include <E2N_ProtocolIE-Single-Container.h>
+#include <E2N_RICactions-ToBeSetup-List.h>
 
 #define NUM_SUBSCRIPTION_REQUEST_IES 3
-#define INITIAL_LIST_SIZE 4
+#define INITIAL_REQUEST_LIST_SIZE 4
   
 class subscription_request{   
 public:
@@ -45,21 +45,21 @@ public:
   subscription_request(void);
   ~subscription_request(void);
   
-  bool encode_e2ap_subscription(unsigned char *, size_t *, E2AP_PDU_t *, subscription_helper &);
-  bool set_fields(InitiatingMessage_t *, subscription_helper &);
-  bool get_fields(InitiatingMessage_t *, subscription_helper &);
+  bool encode_e2ap_subscription(unsigned char *, size_t *,  subscription_helper &);
+  bool set_fields(E2N_InitiatingMessage_t *, subscription_helper &);
+  bool get_fields(E2N_InitiatingMessage_t *, subscription_helper &);
     
-  std::string get_error_string(void) const{
+  std::string get_error(void) const{
     return error_string;
   }
     
 private:
     
-  InitiatingMessage_t *initMsg;
-  E2AP_PDU_t * e2ap_pdu_obj;
+  E2N_InitiatingMessage_t *initMsg;
+  E2N_E2AP_PDU_t * e2ap_pdu_obj;
 
-  RICsubscriptionRequest_IEs_t * IE_array;
-  RICaction_ToBeSetup_ItemIEs_t * action_array;
+  E2N_RICsubscriptionRequest_IEs_t * IE_array;
+  E2N_RICaction_ToBeSetup_ItemIEs_t * action_array;
   unsigned int action_array_size;  
   char errbuf[128];
   size_t errbuf_len = 128;