From 44288d7553cade196ba9c0c6e79be4b95bf4685a Mon Sep 17 00:00:00 2001
From: He Shanyun <heshanyun@cn.fujitsu.com>
Date: Thu, 11 Mar 2021 16:54:38 +0900
Subject: [PATCH] fix issue about ittiSIM and CplaneNG of withS1

---
 openair2/RRC/NR/rrc_gNB_NGAP.c        | 4 +---
 openair2/SIMULATION/NR_RRC/itti_sim.c | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.c b/openair2/RRC/NR/rrc_gNB_NGAP.c
index 2f090da251..a6da63e8a3 100644
--- a/openair2/RRC/NR/rrc_gNB_NGAP.c
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.c
@@ -819,17 +819,15 @@ rrc_gNB_process_NGAP_DOWNLINK_NAS(
         itti_send_msg_to_task (TASK_RRC_UE_SIM, instance, message_p);
         LOG_I(NR_RRC, "Send DL NAS message \n");
 #else
-#if(0)
           /* Transfer data to PDCP */
           nr_rrc_data_req (
               &ctxt,
-              ue_context_p->ue_context.Srb2.Srb_info.Srb_id,
+              DCCH,
               (*rrc_gNB_mui)++,
               SDU_CONFIRM_NO,
               length,
               buffer,
               PDCP_TRANSMISSION_MODE_CONTROL);
-#endif
 #endif
         }
           break;
diff --git a/openair2/SIMULATION/NR_RRC/itti_sim.c b/openair2/SIMULATION/NR_RRC/itti_sim.c
index ea0ea343ed..eac16193ff 100644
--- a/openair2/SIMULATION/NR_RRC/itti_sim.c
+++ b/openair2/SIMULATION/NR_RRC/itti_sim.c
@@ -580,8 +580,14 @@ int main( int argc, char **argv )
     init_pdcp();
 
   if (RC.nb_nr_inst > 0)  {
+    nr_read_config_and_init();
     // don't create if node doesn't connect to RRC/S1/GTP
     AssertFatal(create_gNB_tasks(1) == 0,"cannot create ITTI tasks\n");
+    for (int gnb_id = 0; gnb_id < RC.nb_nr_inst; gnb_id++) {
+      MessageDef *msg_p = itti_alloc_new_message (TASK_GNB_APP, 0, NRRRC_CONFIGURATION_REQ);
+      NRRRC_CONFIGURATION_REQ(msg_p) = RC.nrrrc[gnb_id]->configuration;
+      itti_send_msg_to_task (TASK_RRC_GNB, GNB_MODULE_ID_TO_INSTANCE(gnb_id), msg_p);
+    }
   } else {
     printf("No ITTI, Initializing L1\n");
     return 0;