x2ho cell expansion and x2ho parameter configuration file conversion

openair2/COMMON/x2ap_messages_types.h

@@ -39,7 +39,7 @@
 #define X2AP_HANDOVER_CANCEL(mSGpTR)            (mSGpTR)->ittiMsg.x2ap_handover_cancel
 
 
-#define X2AP_MAX_NB_ENB_IP_ADDRESS 2
+#define X2AP_MAX_NB_ENB_IP_ADDRESS 6
 
 // eNB application layer -> X2AP messages
 

openair2/RRC/LTE/rrc_defs.h

@@ -816,7 +816,25 @@ typedef struct {
   uint32_t                           sizeof_paging[MAX_MOBILES_PER_ENB];
 } rrc_eNB_carrier_data_t;
 
-  
+typedef struct measurement_event_info_s{
+  uint8_t               threshold_RSRP;
+  uint8_t               maxReportCells;
+  uint8_t               reportInterval;
+  uint8_t               a3_Offset;
+  uint8_t               hysteresis;
+  uint8_t               timeToTrigger;
+}measurement_event_info_t;
+
+typedef struct rrc_eNB_measurement_data_s{
+  uint8_t               allowedMeasBandwidth;
+  measurement_event_info_t      event1_config;	
+  measurement_event_info_t      event2_config;	
+  measurement_event_info_t      event3_config;	
+  measurement_event_info_t      event4_config;	
+  measurement_event_info_t      event5_config;
+  measurement_event_info_t      event6_config;	
+}rrc_eNB_measurement_data_t;
+
 typedef struct eNB_RRC_INST_s {
   /// southbound midhaul configuration
   ngran_node_t                    node_type;
@@ -869,6 +887,7 @@ typedef struct eNB_RRC_INST_s {
   uint16_t sctp_in_streams;
   uint16_t sctp_out_streams;
 
+  rrc_eNB_measurement_data_t measurement;
 } eNB_RRC_INST;
 
 #define MAX_UE_CAPABILITY_SIZE 255

openair2/X2AP/x2ap_eNB.c

@@ -174,6 +174,7 @@ void x2ap_eNB_handle_sctp_association_ind(instance_t instance, sctp_new_associat
     DevAssert(x2ap_enb_data_p != NULL);
     x2ap_enb_data_p->cnx_id                = x2ap_eNB_fetch_add_global_cnx_id();
     x2ap_enb_data_p->x2ap_eNB_instance = instance_p;
+    x2ap_enb_data_p->assoc_id    = sctp_new_association_ind->assoc_id;
     /* Insert the new descriptor in list of known eNB
      * but not yet associated.
      */
@@ -191,7 +192,7 @@ void x2ap_eNB_handle_sctp_association_ind(instance_t instance, sctp_new_associat
   printf("x2ap_eNB_handle_sctp_association_ind at 2\n");
   dump_trees();
   /* Update parameters */
-  x2ap_enb_data_p->assoc_id    = sctp_new_association_ind->assoc_id;
+  //x2ap_enb_data_p->assoc_id    = sctp_new_association_ind->assoc_id;
   x2ap_enb_data_p->in_streams  = sctp_new_association_ind->in_streams;
   x2ap_enb_data_p->out_streams = sctp_new_association_ind->out_streams;
   printf("x2ap_eNB_handle_sctp_association_ind at 3\n");

openair3/SCTP/sctp_eNB_task.c

@@ -805,7 +805,7 @@ static int sctp_create_new_listener(
         return -1;
     }
 
-    if (listen(sd, 5) < 0) {
+    if (listen(sd, 6) < 0) {
         SCTP_ERROR("listen: %s:%d\n", strerror(errno), errno);
         free(sctp_cnx);
         sctp_cnx = NULL;