Use F1AP to transfer SRB1 messages in monolithic mode

Use F1AP to transfer SRB1 messages in monolithic mode

This is the second MR (of multiple MRs) for the implementation of RRCReestablishment procedures

openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c

@@ -36,7 +36,9 @@ int dl_rrc_message(module_id_t module_id, const f1ap_dl_rrc_message_t *dl_rrc)
   /* dispatch message to dl_rrc_message_rrcSetup() and others, similar to as is
    * done in the DU (should be the same here) */
 
-  if (dl_rrc->srb_id == 0) {
+  LOG_I(NR_MAC, "DL RRC Message Transfer with %d bytes for RNTI %04x SRB %d\n", dl_rrc->rrc_container_length, dl_rrc->rnti, dl_rrc->srb_id);
+
+  if (dl_rrc->srb_id == 0) { // SRB 0
 
     NR_DL_CCCH_Message_t *dl_ccch_msg = NULL;
     asn_dec_rval_t dec_rval = uper_decode(NULL,
@@ -71,6 +73,9 @@ int dl_rrc_message(module_id_t module_id, const f1ap_dl_rrc_message_t *dl_rrc)
       break;
     }
     return 0;
+  } else if (dl_rrc->srb_id == 1) { // SRB 1
+    nr_rlc_srb_recv_sdu(dl_rrc->rnti, DCCH, dl_rrc->rrc_container, dl_rrc->rrc_container_length);
+    return 0;
   }
 
   return -1; /* not handled yet */
@@ -115,7 +120,7 @@ int dl_rrc_message_rrcSetup(module_id_t module_id, const f1ap_dl_rrc_message_t *
   ue_p->SRB_configList = rrcSetup_ies->radioBearerConfig.srb_ToAddModList;
   ue_p->masterCellGroup = cellGroup;
 
-  nr_rlc_srb0_recv_sdu(dl_rrc->rnti, dl_rrc->rrc_container, dl_rrc->rrc_container_length);
+  nr_rlc_srb_recv_sdu(dl_rrc->rnti, CCCH, dl_rrc->rrc_container, dl_rrc->rrc_container_length);
 
   protocol_ctxt_t ctxt = { .module_id = module_id, .rnti = dl_rrc->rnti };
   nr_rrc_rlc_config_asn1_req(&ctxt,