Remove big race condition, remove name "callback" on what is not a callback

openair2/COMMON/f1ap_messages_types.h

@@ -303,7 +303,7 @@ typedef struct f1ap_initial_ul_rrc_message_s {
   uint16_t crnti;
   uint8_t *rrc_container;
   int      rrc_container_length;
-  char *du2cu_rrc_container;
+  char du2cu_rrc_container[100];
   int      du2cu_rrc_container_length;
 } f1ap_initial_ul_rrc_message_t;
 

openair2/F1AP/f1ap_common.h

@@ -407,14 +407,16 @@
     if (mandatory) DevAssert(ie != NULL); \
   } while(0)
 
-/** \brief Function callback prototype.
+/** \brief Function array prototype.
  **/
-typedef int (*f1ap_message_decoded_callback)(
+typedef int (*f1ap_message_processing_t)(
   instance_t             instance,
   uint32_t               assoc_id,
   uint32_t               stream,
   F1AP_F1AP_PDU_t       *message_p
 );
+int f1ap_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream,
+                        const uint8_t *const data, const uint32_t data_length);
 
 typedef struct f1ap_cudu_ue_inst_s {
   // used for eNB stats generation

openair2/F1AP/f1ap_cu_task.c

@@ -31,7 +31,6 @@
 */
 
 #include "f1ap_common.h"
-#include "f1ap_handlers.h"
 #include "f1ap_cu_interface_management.h"
 #include "f1ap_cu_rrc_message_transfer.h"
 #include "f1ap_cu_ue_context_management.h"

openair2/F1AP/f1ap_cu_ue_context_management.c

@@ -324,7 +324,7 @@ int CU_send_UE_CONTEXT_SETUP_REQUEST(instance_t instance,
       {
         /* qoS_Characteristics */
         {
-          int some_decide_qoS_characteristics = 1; // BK: Need Check
+          int some_decide_qoS_characteristics = 0; // BK: Need Check
 
           if (some_decide_qoS_characteristics) {
             DRB_Information->dRB_QoS.qoS_Characteristics.present = F1AP_QoS_Characteristics_PR_non_Dynamic_5QI;
@@ -433,7 +433,7 @@ int CU_send_UE_CONTEXT_SETUP_REQUEST(instance_t instance,
         {
           /* qoS_Characteristics */
           {
-            int some_decide_qoS_characteristics = 1; // BK: Need Check
+            int some_decide_qoS_characteristics = 0; // BK: Need Check
             F1AP_QoS_Characteristics_t *QosParams=&flows_mapped_to_drb_item->qoSFlowLevelQoSParameters.qoS_Characteristics;
 
             if (some_decide_qoS_characteristics) {

openair2/F1AP/f1ap_du_task.c

@@ -31,7 +31,6 @@
 */
 
 #include "f1ap_common.h"
-#include "f1ap_handlers.h"
 #include "f1ap_du_interface_management.h"
 #include "f1ap_du_ue_context_management.h"
 #include "f1ap_du_rrc_message_transfer.h"

openair2/F1AP/f1ap_handlers.c

@@ -31,7 +31,6 @@
  */
 
 #include "f1ap_common.h"
-#include "f1ap_handlers.h"
 #include "f1ap_decoder.h"
 #include "f1ap_cu_interface_management.h"
 #include "f1ap_du_interface_management.h"
@@ -41,7 +40,7 @@
 #include "f1ap_du_ue_context_management.h"
 
 /* Handlers matrix. Only f1 related procedure present here */
-f1ap_message_decoded_callback f1ap_messages_callback[][3] = {
+f1ap_message_processing_t f1ap_messages_processing[][3] = {
 
 
   { 0, 0, 0 }, /* Reset */
@@ -92,8 +91,8 @@ int f1ap_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream,
   }
 
   /* Checking procedure Code and direction of message */
-  if (pdu.choice.initiatingMessage->procedureCode >= sizeof(f1ap_messages_callback) / (3 * sizeof(
-        f1ap_message_decoded_callback))
+  if (pdu.choice.initiatingMessage->procedureCode >= sizeof(f1ap_message_processing_t) / (3 * sizeof(
+        f1ap_message_processing_t))
       || (pdu.present > F1AP_F1AP_PDU_PR_unsuccessfulOutcome)) {
     LOG_E(F1AP, "[SCTP %d] Either procedureCode %ld or direction %d exceed expected\n",
           assoc_id, pdu.choice.initiatingMessage->procedureCode, pdu.present);
@@ -101,21 +100,19 @@ int f1ap_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream,
     return -1;
   }
 
-  /* No handler present.
-   * This can mean not implemented or no procedure for eNB (wrong direction).
-   */
-  if (f1ap_messages_callback[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1] == NULL) {
+
+  if (f1ap_messages_processing[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1] == NULL) {
+    // No handler present. This can mean not implemented or no procedure for eNB (wrong direction).
     LOG_E(F1AP, "[SCTP %d] No handler for procedureCode %ld in %s\n",
           assoc_id, pdu.choice.initiatingMessage->procedureCode,
           f1ap_direction2String(pdu.present - 1));
-    ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_F1AP_F1AP_PDU, &pdu);
-    return -1;
+    ret=-1;
+  } else {
+    /* Calling the right handler */
+    LOG_I(F1AP, "Calling handler with instance %ld\n",instance);
+    ret = (*f1ap_messages_processing[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1])
+      (instance, assoc_id, stream, &pdu);
   }
-
-  /* Calling the right handler */
-  LOG_I(F1AP, "Calling handler with instance %ld\n",instance);
-  ret = (*f1ap_messages_callback[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1])
-        (instance, assoc_id, stream, &pdu);
   ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_F1AP_F1AP_PDU, &pdu);
   return ret;
 }

openair2/F1AP/f1ap_handlers.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file f1ap_handlers.h
- * \brief f1ap messages handlers
- * \author EURECOM/NTUST
- * \date 2018
- * \version 0.1
- * \company Eurecom
- * \email: navid.nikaein@eurecom.fr, bing-kai.hong@eurecom.fr
- * \note
- * \warning
- */
-
-#ifndef F1AP_HANDLERS_H_
-#define F1AP_HANDLERS_H_
-
-int f1ap_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream,
-                        const uint8_t *const data, const uint32_t data_length);
-
-#endif /* F1AP_HANDLERS_H_ */

openair2/RRC/NR/L2_nr_interface.c

@@ -322,31 +322,27 @@ int8_t nr_mac_rrc_data_ind(const module_id_t     module_idP,
     // call do_RRCSetup like full procedure and extract masterCellGroup
     NR_CellGroupConfig_t cellGroupConfig;
     NR_ServingCellConfigCommon_t *scc=RC.nrrrc[module_idP]->carrier.servingcellconfigcommon;
-    uint8_t sdu2[100];
     memset(&cellGroupConfig,0,sizeof(cellGroupConfig));
     fill_initial_cellGroupConfig(rntiP,&cellGroupConfig,scc);
+    MessageDef* tmp=itti_alloc_new_message_sized(TASK_RRC_GNB, 0, F1AP_INITIAL_UL_RRC_MESSAGE, sizeof(f1ap_initial_ul_rrc_message_t) + sdu_lenP);
+    f1ap_initial_ul_rrc_message_t *msg = &F1AP_INITIAL_UL_RRC_MESSAGE(tmp);
     asn_enc_rval_t enc_rval = uper_encode_to_buffer(&asn_DEF_NR_CellGroupConfig,
 						    NULL,
 						    (void *)&cellGroupConfig,
-						    sdu2,
-						    100);
+						    msg->du2cu_rrc_container,
+						    sizeof(msg->du2cu_rrc_container));
 
-    int sdu2_len = (enc_rval.encoded+7)/8;
     if (enc_rval.encoded == -1) {
       LOG_I(F1AP,"Could not encoded cellGroupConfig, failed element %s\n",enc_rval.failed_type->name);
       exit(-1);
     }
     /* do ITTI message */
-    DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(
-      module_idP,
-      CC_id,
-      UE_id,
-      rntiP,
-      sduP,
-      sdu_lenP,
-      sdu2,
-      sdu2_len
-    );
+    msg->du2cu_rrc_container_length = (enc_rval.encoded+7)/8;
+    msg->crnti=rntiP;
+    msg->rrc_container=(uint8_t*) (msg+1); // Made extra room after the struct with itti_alloc_msg_sized()
+    memcpy(msg->rrc_container, sduP, sdu_lenP);
+    msg->rrc_container_length=sdu_lenP;
+    itti_send_msg(TASK_DU_F1, 0, tmp);
     return(0);
   }