Merge branch 'feature-127-protocol-split' of...

Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split

Conflicts:
	openair2/RRC/LTE/rrc_eNB.c

.gitignore

@@ -5,3 +5,4 @@
 log/
 lte_build_oai/
 targets/bin/
+cmake_targets/nas_sim_tools/build/

openair2/F1AP/f1ap_cu_rrc_message_transfer.c

@@ -187,15 +187,6 @@ int CU_send_DL_RRC_MESSAGE_TRANSFER(instance_t                instance,
   uint8_t  *buffer;
   uint32_t  len;
 
-  if (f1ap_stream == 0) {
-    LOG_E(CU_F1AP, "[CU  %d] Received DL RRC message transfer on stream == %d\n",
-	  f1ap_assoc_id, f1ap_stream);
-    return -1;
-  }
-
-  out = &pdu.choice.initiatingMessage->value.choice.DLRRCMessageTransfer; 
-
-  
   /* Create */
   /* 0. Message Type */ 
   memset(&pdu, 0, sizeof(pdu));

openair2/RRC/LTE/rrc_eNB.c

@@ -5762,13 +5762,9 @@ rrc_eNB_generate_RRCConnectionSetup(
     case ngran_eNB_CU    :
     case ngran_ng_eNB_CU :
     case ngran_gNB_CU    :
-      // nothing to do  for CU 
-      break;
-    case ngran_eNB_DU    :
-    case ngran_gNB_DU  :
       // create an ITTI message
-    	/* TODO: F1 IDs ar missing in RRC */
-      message_p = itti_alloc_new_message (TASK_CU_F1, F1AP_DL_RRC_MESSAGE);
+      /* TODO: F1 IDs ar missing in RRC */
+      message_p = itti_alloc_new_message (TASK_RRC_ENB, F1AP_DL_RRC_MESSAGE);
       memset (F1AP_DL_RRC_MESSAGE (message_p).rrc_container, 0, F1AP_DL_RRC_MESSAGE);
       memcpy (F1AP_DL_RRC_MESSAGE (message_p).rrc_container, 
   			  (uint8_t*) ue_p->Srb0.Tx_buffer.Payload, 
@@ -5781,7 +5777,17 @@ rrc_eNB_generate_RRCConnectionSetup(
       F1AP_DL_RRC_MESSAGE (message_p).execute_duplication      = 1;
       F1AP_DL_RRC_MESSAGE (message_p).RAT_frequency_priority_information.en_dc      = 0; 
       itti_send_msg_to_task (TASK_CU_F1, UE_MODULE_ID_TO_INSTANCE(ctxt_pP->module_id), message_p);
+<<<<<<< HEAD
 
+=======
+      LOG_E(RRC, "F1AP_DL_RRC_MESSAGE\n");
+      break;
+    case ngran_eNB_DU    :
+    case ngran_gNB_DU  :
+      // nothing to do for DU 
+      LOG_E(RRC, "nothing to do for DU\n");
+      break;
+>>>>>>> a45d496c8cb20a4d28628cbfae54ce906678d0cb
     case ngran_eNB:   
     case ngran_ng_eNB :
     case ngran_gNB  :