Fix ITTI errors in E1AP target

openair2/COMMON/e1ap_messages_def.h

@@ -19,9 +19,13 @@
  *      contact@openairinterface.org
  */
 
+#ifndef E1AP_MESSAGES_DEF_H_
+#define E1AP_MESSAGES_DEF_H_
+
 /* gNB_CUUP application layer -> E1AP messages */
 MESSAGE_DEF(E1AP_SETUP_REQ  , MESSAGE_PRIORITY_MED , e1ap_setup_req_t , e1ap_setup_req)
 
 /* E1AP -> eNB_DU or eNB_CU_RRC -> E1AP application layer messages */
 MESSAGE_DEF(E1AP_SETUP_RESP , MESSAGE_PRIORITY_MED, e1ap_setup_resp_t , e1ap_setup_resp)
 
+#endif /* E1AP_MESSAGES_DEF_H_ */

openair2/COMMON/messages_def.h

@@ -42,3 +42,4 @@
 #include "udp_messages_def.h"
 #include "gtpv1_u_messages_def.h"
 #include "flexran_messages_def.h"
+#include "e1ap_message_types.h"

openair2/E1AP/e1ap_common.h

@@ -21,11 +21,14 @@
  *      contact@openairinterface.org
  */
 
+#ifndef E1AP_COMMON_H_
+#define E1AP_COMMON_H_
+
+#include "E1AP_E1AP-PDU.h"
 #include "E1AP_TransactionID.h"
 #include "E1AP_PriorityLevel.h"
 
 #define MAX_NUM_TRANSAC_IDS 8
-#define E1AP_MAX_NUM_PLMNS
 
 #define E1AP_SETUP_REQ(mSGpTR)                     (mSGpTR)->ittiMsg.e1ap_setup_req
 #define E1AP_SETUP_RESP(mSGpTR)                    (mSGpTR)->ittiMsg.e1ap_setup_resp
@@ -36,36 +39,12 @@
 typedef f1ap_net_ip_address_t e1ap_net_ip_address_t;
 
 typedef int (*e1ap_message_processing_t)(
-  instance_t            instance,
-  uint32_t              assoc_id,
-  uint32_t              stream,
-  E1AP_E1AP_PDU_t       *message_p
+  instance_t            instance;
+  uint32_t              assoc_id;
+  uint32_t              stream;
+  E1AP_E1AP_PDU_t       *message_p;
 };
 
-typedef struct PLMN_ID_s {
-  int mcc;
-  int mnc;
-  int mnc_digit_length;
-} PLMN_ID_t;
-
-typedef struct e1ap_setup_req_s {
-  uint64_t              gNB_cu_up_id;
-  char *                gNB_cu_up_name;
-  uint64_t              transac_id;
-  int                   supported_plmns; 
-  PLMN_ID_t             plmns[E1AP_MAX_NUM_PLMNS];
-  uint16_t              sctp_in_streams;
-  uint16_t              sctp_out_streams;
-  uint16_t              default_sctp_stream_id;
-  f1ap_net_ip_address_t CUUP_e1_ip_address;
-  f1ap_net_ip_address_t CUCP_e1_ip_address;
-  E1AP_CNSupport_t      cn_support;
-} e1ap_setup_req_t;
-
-typedef struct e1ap_setup_resp_s {
-  long transac_id;
-} e1ap_setup_resp_t;
-
 typedef struct cell_group_s {
   long id;
 } cell_group_t;
@@ -193,3 +172,5 @@ typedef enum {
   CPtype = 0,
   UPtype
 } E1_t;
+
+#endif /* E1AP_COMMON_H_ */