sync

cmake_targets/CMakeLists.txt

@@ -522,6 +522,7 @@ set(HWLIB_EXMIMO_SOURCE
 add_library(oai_exmimodevif MODULE ${HWLIB_EXMIMO_SOURCE} )
 
 include_directories("${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/")
+#set (option_HWUSRPLIB_lib "-l uhd -lboost_thread -lboost_filesystem  -lboost_system")
 set(HWLIB_USRP_SOURCE
   ${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
   )
@@ -1744,7 +1745,7 @@ add_executable(lte-softmodem
 
 target_link_libraries (lte-softmodem -ldl
   -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB ${X2AP_LIB} ${X2AP_ENB} GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
+  RRC_LIB S1AP_LIB S1AP_ENB ${X2AP_LIB} ${X2AP_ENB} GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7 -lboost_thread -lboost_filesystem  -lboost_system
   -Wl,--end-group )
 
 target_link_libraries (lte-softmodem ${LIBXML2_LIBRARIES})

openair2/X2AP/x2ap_eNB.c

@@ -407,7 +407,7 @@ void x2ap_eNB_handle_handover_req(instance_t instance,
   x2ap_eNB_instance_t *instance_p;
   x2ap_eNB_data_t     *target;
   const Enb_properties_array_t *enb_properties = enb_config_get();
-  int target_enb_id = enb_properties->properties[x2ap_handover_req->target_mod_id]->eNB_id;
+  int target_enb_id = 0xe00 + x2ap_handover_req->target_physCellId;//enb_properties->properties[x2ap_handover_req->target_mod_id]->eNB_id;
 
   instance_p = x2ap_eNB_get_instance(instance);
   DevAssert(instance_p != NULL);
@@ -434,7 +434,7 @@ void x2ap_eNB_handle_handover_req_ack(instance_t instance,
   x2ap_eNB_instance_t *instance_p;
   x2ap_eNB_data_t     *target;
   const Enb_properties_array_t *enb_properties = enb_config_get();
-  int target_enb_id = enb_properties->properties[x2ap_handover_req_ack->target_mod_id]->eNB_id;
+  int target_enb_id = 3584; //enb_properties->properties[x2ap_handover_req_ack->target_mod_id]->eNB_id;
 
   instance_p = x2ap_eNB_get_instance(instance);
   DevAssert(instance_p != NULL);

openair2/X2AP/x2ap_eNB_handler.c

@@ -235,7 +235,7 @@ x2ap_eNB_handle_handover_preparation(uint32_t assoc_id,
   X2AP_HANDOVER_REQ(m).source_x2id = x2HandoverRequest->old_eNB_UE_X2AP_ID;
   X2AP_HANDOVER_REQ(m).source_rnti = x2id_to_source_rnti[x2HandoverRequest->old_eNB_UE_X2AP_ID];
   if ((x2HandoverRequest->uE_ContextInformation.aS_SecurityInformation.key_eNodeB_star.buf) &&
-	  (x2HandoverRequest->uE_ContextInformation.aS_SecurityInformation.key_eNodeB_star.size == 256)) {
+	  (x2HandoverRequest->uE_ContextInformation.aS_SecurityInformation.key_eNodeB_star.size == 32)) {
     memcpy(X2AP_HANDOVER_REQ(m).kenb, x2HandoverRequest->uE_ContextInformation.aS_SecurityInformation.key_eNodeB_star.buf, 32);
     X2AP_HANDOVER_REQ(m).kenb_ncc = x2HandoverRequest->uE_ContextInformation.aS_SecurityInformation.nextHopChainingCount;
     itti_send_msg_to_task(TASK_RRC_ENB, x2ap_eNB_data->x2ap_eNB_instance->instance, m);

targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.x2ho.usrpb210.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB_Eurecom_X2HO_LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -6,7 +6,7 @@ eNBs =
 (
  {
     ////////// Identification parameters:
-    eNB_ID    =  0xe00;
+    eNB_ID    =  0xe01;
 
     cell_type =  "CELL_MACRO_ENB";
 
@@ -33,7 +33,7 @@ eNBs =
         eutra_band              			      = 7;
         downlink_frequency      			      = 2660000000L;
         uplink_frequency_offset 			      = -120000000;
-        Nid_cell					      = 0;
+        Nid_cell					      = 1;
         N_RB_DL                 			      = 25;
         Nid_cell_mbsfn          			      = 0;
         nb_antenna_ports          			      = 1;
@@ -137,14 +137,14 @@ eNBs =
 
     ////////// MME parameters:
 
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+    mme_ip_address      = ( { ipv4       = "192.168.117.104";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
                             }
                           );
     ///X2
-    target_enb_x2_ip_address      = ( { ipv4       = "127.0.0.10";
+    target_enb_x2_ip_address      = ( { ipv4       = "192.168.117.103";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
@@ -154,14 +154,14 @@ eNBs =
     NETWORK_INTERFACES :
     {
 
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth6";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.82/24";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth6";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.82/24";
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth3";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.117.107/24";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth3";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.117.107/24";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
 
-	ENB_INTERFACE_NAME_FOR_X2C               = "lo";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "127.0.0.11/24";
+	ENB_INTERFACE_NAME_FOR_X2C               = "eth3";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.117.107/24";
         ENB_PORT_FOR_X2C                         = 36422; # Spec ?
 
 	ENB_INTERFACE_NAME_FOR_X2U              = "eth0";

targets/RT/USER/lte-enb.c

@@ -1047,6 +1047,7 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
       exit_fun("Exiting");
     }
   } else {
+    LOG_I(PHY,"First Frame: %d , First Subframe: %d Timestamp: %"PRId64" \n",proc->frame_rx, proc->subframe_rx, proc->timestamp_rx);	
     proc->first_rx--;
     *frame = proc->frame_rx;
     *subframe = proc->subframe_rx;