From a45d496c8cb20a4d28628cbfae54ce906678d0cb Mon Sep 17 00:00:00 2001
From: Bing-Kai Hong <Bing-Kai.Hong@eurecom.fr>
Date: Mon, 17 Sep 2018 16:02:13 +0200
Subject: [PATCH] Update F1 DL RRC message transfer from DU to CU
---
.gitignore | 1 +
openair2/F1AP/f1ap_cu_rrc_message_transfer.c | 9 ---------
openair2/RRC/LTE/rrc_eNB.c | 18 ++++++++++--------
3 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/.gitignore b/.gitignore
index 35696f4cbf1..d7126a6224f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
log/
lte_build_oai/
targets/bin/
+cmake_targets/nas_sim_tools/build/
diff --git a/openair2/F1AP/f1ap_cu_rrc_message_transfer.c b/openair2/F1AP/f1ap_cu_rrc_message_transfer.c
index 6ad346b486e..d9d061c6d22 100644
--- a/openair2/F1AP/f1ap_cu_rrc_message_transfer.c
+++ b/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));
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 709bf4fd780..0202f42d2ac 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/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,
@@ -5780,8 +5776,14 @@ rrc_eNB_generate_RRCConnectionSetup(
F1AP_DL_RRC_MESSAGE (message_p).srb_id = CCCH;
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_RRC_ENB, UE_MODULE_ID_TO_INSTANCE(ctxt_pP->module_id), message_p);
-
+ itti_send_msg_to_task (TASK_CU_F1, UE_MODULE_ID_TO_INSTANCE(ctxt_pP->module_id), message_p);
+ 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;
case ngran_eNB:
case ngran_ng_eNB :
case ngran_gNB :
--
GitLab