Preliminary work to handle UE context setup response at F1AP layer of the CU

-Remaining to handle the incoming information at RRC layer of the CU as well

openair2/COMMON/f1ap_messages_types.h

@@ -324,14 +324,21 @@ typedef struct f1ap_drb_to_be_setup_s {
   long           drb_id;
   f1ap_up_tnl_t  up_ul_tnl[2];
   uint8_t        up_ul_tnl_length;
+  f1ap_up_tnl_t  up_dl_tnl[2];
+  uint8_t        up_dl_tnl_length;
   rlc_mode_t     rlc_mode;
 } f1ap_drb_to_be_setup_t;
 
 typedef struct f1ap_srb_to_be_setup_s {
   long           srb_id;
   rlc_mode_t     rlc_mode;
+  uint8_t        lcid;
 } f1ap_srb_to_be_setup_t;
 
+typedef struct f1ap_rb_failed_to_be_setup_s {
+  long           rb_id;
+} f1ap_rb_failed_to_be_setup_t;
+
 typedef struct f1ap_ue_context_setup_req_s {
   uint32_t gNB_CU_ue_id;    // BK: need to replace by use from rnti
   uint32_t *gNB_DU_ue_id;
@@ -366,6 +373,10 @@ typedef struct f1ap_ue_context_setup_resp_s {
   uint8_t  drbs_setup_length;       // BK: need to replace by s1ap_initial_context_setup_req
   f1ap_srb_to_be_setup_t *srbs_setup;
   uint8_t  srbs_setup_length;
+  uint8_t  srbs_failed_to_be_setup_length;
+  f1ap_rb_failed_to_be_setup_t *srbs_failed_to_be_setup;
+  uint8_t  drbs_failed_to_be_setup_length;
+  f1ap_rb_failed_to_be_setup_t *drbs_failed_to_be_setup;
 } f1ap_ue_context_setup_resp_t;
 
 typedef enum F1ap_Cause_e {

openair2/F1AP/f1ap_cu_ue_context_management.c

@@ -625,31 +625,117 @@ int CU_handle_UE_CONTEXT_SETUP_RESPONSE(instance_t       instance,
                                         uint32_t         assoc_id,
                                         uint32_t         stream,
                                         F1AP_F1AP_PDU_t *pdu) {
+  MessageDef                       *msg_p;
   F1AP_UEContextSetupResponse_t    *container;
   F1AP_UEContextSetupResponseIEs_t *ie;
   DevAssert(pdu);
+  msg_p = itti_alloc_new_message(TASK_DU_F1, 0,  F1AP_UE_CONTEXT_SETUP_RESP);
+  f1ap_ue_context_setup_resp_t *f1ap_ue_context_setup_resp = &F1AP_UE_CONTEXT_SETUP_RESP(msg_p);
   container = &pdu->choice.successfulOutcome->value.choice.UEContextSetupResponse;
+  int i;
+
   /* GNB_CU_UE_F1AP_ID */
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupResponseIEs_t, ie, container,
                              F1AP_ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID, true);
+  f1ap_ue_context_setup_resp->gNB_CU_ue_id = ie->value.choice.GNB_CU_UE_F1AP_ID;
+
   /* GNB_DU_UE_F1AP_ID */
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupResponseIEs_t, ie, container,
                              F1AP_ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID, true);
+  f1ap_ue_context_setup_resp->gNB_DU_ue_id = ie->value.choice.GNB_DU_UE_F1AP_ID;
+
   /* DUtoCURRCInformation */
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupResponseIEs_t, ie, container,
                              F1AP_ProtocolIE_ID_id_DUtoCURRCInformation, true);
+  if (ie == NULL){
+    LOG_E(F1AP,"%s %d: ie is a NULL pointer \n",__FILE__,__LINE__);
+    return -1;
+  }
+  memcpy(f1ap_ue_context_setup_resp->du_to_cu_rrc_information, ie->value.choice.DUtoCURRCInformation.cellGroupConfig.buf, ie->value.choice.DUtoCURRCInformation.cellGroupConfig.size);
+  f1ap_ue_context_setup_resp->du_to_cu_rrc_information_length = ie->value.choice.DUtoCURRCInformation.cellGroupConfig.size;
+
   /* DRBs_Setup_List */
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupResponseIEs_t, ie, container,
                              F1AP_ProtocolIE_ID_id_DRBs_Setup_List, true);
+  if(ie!=NULL){
+    f1ap_ue_context_setup_resp->drbs_setup_length = ie->value.choice.DRBs_Setup_List.list.count;
+    f1ap_ue_context_setup_resp->drbs_setup = calloc(f1ap_ue_context_setup_resp->drbs_setup_length,
+        sizeof(f1ap_drb_to_be_setup_t));
+    AssertFatal(f1ap_ue_context_setup_resp->drbs_setup,
+              "could not allocate memory for f1ap_ue_context_setup_resp->drbs_setup\n");
+    for (i = 0; i < f1ap_ue_context_setup_resp->drbs_setup_length; ++i) {
+      f1ap_drb_to_be_setup_t *drb_p = &f1ap_ue_context_setup_resp->drbs_setup[i];
+      F1AP_DRBs_Setup_Item_t *drbs_setup_item_p;
+      drbs_setup_item_p = &((F1AP_DRBs_Setup_ItemIEs_t *)ie->value.choice.DRBs_Setup_List.list.array[i])->value.choice.DRBs_Setup_Item;
+      drb_p->drb_id = drbs_setup_item_p->dRBID;
+      /* TODO in the following, assume only one UP UL TNL is present.
+       * this matches/assumes OAI CU/DU implementation, can be up to 2! */
+      drb_p->up_dl_tnl_length = 1;
+      AssertFatal(drbs_setup_item_p->dLUPTNLInformation_ToBeSetup_List.list.count > 0,
+          "no DL UP TNL Information in DRBs to be Setup list\n");
+      F1AP_DLUPTNLInformation_ToBeSetup_Item_t *dl_up_tnl_info_p = (F1AP_DLUPTNLInformation_ToBeSetup_Item_t *)drbs_setup_item_p->dLUPTNLInformation_ToBeSetup_List.list.array[0];
+      F1AP_GTPTunnel_t *dl_up_tnl0 = dl_up_tnl_info_p->dLUPTNLInformation.choice.gTPTunnel;
+      BIT_STRING_TO_TRANSPORT_LAYER_ADDRESS_IPv4(&dl_up_tnl0->transportLayerAddress, drb_p->up_dl_tnl[0].tl_address);
+      OCTET_STRING_TO_INT32(&dl_up_tnl0->gTP_TEID, drb_p->up_dl_tnl[0].gtp_teid);
+
+    }
+  }
   /* SRBs_FailedToBeSetup_List */
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupResponseIEs_t, ie, container,
                              F1AP_ProtocolIE_ID_id_SRBs_FailedToBeSetup_List, true);
+  if(ie!=NULL){
+    f1ap_ue_context_setup_resp->srbs_failed_to_be_setup_length = ie->value.choice.SRBs_FailedToBeSetup_List.list.count;
+    f1ap_ue_context_setup_resp->srbs_failed_to_be_setup = calloc(f1ap_ue_context_setup_resp->srbs_failed_to_be_setup_length,
+        sizeof(f1ap_rb_failed_to_be_setup_t));
+    AssertFatal(f1ap_ue_context_setup_resp->srbs_failed_to_be_setup,
+        "could not allocate memory for f1ap_ue_context_setup_resp->srbs_failed_to_be_setup\n");
+    for (i = 0; i < f1ap_ue_context_setup_resp->srbs_failed_to_be_setup_length; ++i) {
+      f1ap_rb_failed_to_be_setup_t *srb_p = &f1ap_ue_context_setup_resp->srbs_failed_to_be_setup[i];
+      srb_p->rb_id = ((F1AP_SRBs_FailedToBeSetup_Item_t *)ie->value.choice.SRBs_FailedToBeSetup_List.list.array[i])->sRBID;
+    }
+
+  }
   /* DRBs_FailedToBeSetup_List */
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupResponseIEs_t, ie, container,
                              F1AP_ProtocolIE_ID_id_DRBs_FailedToBeSetup_List, true);
+  if(ie!=NULL){
+    f1ap_ue_context_setup_resp->drbs_failed_to_be_setup_length = ie->value.choice.DRBs_FailedToBeSetup_List.list.count;
+    f1ap_ue_context_setup_resp->drbs_failed_to_be_setup = calloc(f1ap_ue_context_setup_resp->drbs_failed_to_be_setup_length,
+        sizeof(f1ap_rb_failed_to_be_setup_t));
+    AssertFatal(f1ap_ue_context_setup_resp->drbs_failed_to_be_setup,
+        "could not allocate memory for f1ap_ue_context_setup_resp->drbs_failed_to_be_setup\n");
+    for (i = 0; i < f1ap_ue_context_setup_resp->drbs_failed_to_be_setup_length; ++i) {
+      f1ap_rb_failed_to_be_setup_t *drb_p = &f1ap_ue_context_setup_resp->drbs_failed_to_be_setup[i];
+      drb_p->rb_id = ((F1AP_DRBs_FailedToBeSetup_Item_t *)ie->value.choice.DRBs_FailedToBeSetup_List.list.array[i])->dRBID;
+    }
+  }
+
   /* SCell_FailedtoSetup_List */
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupResponseIEs_t, ie, container,
                              F1AP_ProtocolIE_ID_id_SCell_FailedtoSetup_List, true);
+  if(ie!=NULL){
+    LOG_E (F1AP, "Not supporting handling of SCell_FailedtoSetup_List \n");
+  }
+
+  /* SRBs_Setup_List */
+  F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupResponseIEs_t, ie, container,
+      F1AP_ProtocolIE_ID_id_SRBs_Setup_List, true);
+  if(ie!=NULL){
+    f1ap_ue_context_setup_resp->srbs_setup_length = ie->value.choice.SRBs_Setup_List.list.count;
+    f1ap_ue_context_setup_resp->srbs_setup = calloc(f1ap_ue_context_setup_resp->srbs_setup_length,
+        sizeof(f1ap_srb_to_be_setup_t));
+    AssertFatal(f1ap_ue_context_setup_resp->drbs_setup,
+        "could not allocate memory for f1ap_ue_context_setup_resp->drbs_setup\n");
+    for (i = 0; i < f1ap_ue_context_setup_resp->srbs_setup_length; ++i) {
+      f1ap_srb_to_be_setup_t *srb_p = &f1ap_ue_context_setup_resp->srbs_setup[i];
+      F1AP_SRBs_Setup_Item_t *srbs_setup_item_p;
+      srbs_setup_item_p = &((F1AP_SRBs_Setup_ItemIEs_t *)ie->value.choice.SRBs_Setup_List.list.array[i])->value.choice.SRBs_Setup_Item;
+      srb_p->srb_id = srbs_setup_item_p->sRBID;
+      srb_p->lcid = srbs_setup_item_p->lCID;
+    }
+  }
+
+  itti_send_msg_to_task(TASK_RRC_GNB, instance, msg_p);
   return 0;
 }
 

openair2/F1AP/f1ap_du_ue_context_management.c

@@ -133,33 +133,33 @@ int DU_handle_UE_CONTEXT_SETUP_REQUEST(instance_t       instance,
     F1AP_UEContextSetupRequestIEs_t *ieDrb;
     F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupRequestIEs_t, ieDrb, container,
                                F1AP_ProtocolIE_ID_id_DRBs_ToBeSetup_List, true);
-    f1ap_ue_context_setup_req->drbs_to_be_setup_length = ieDrb->value.choice.DRBs_ToBeSetup_List.list.count;
-    f1ap_ue_context_setup_req->drbs_to_be_setup = calloc(f1ap_ue_context_setup_req->drbs_to_be_setup_length,
+    if(ieDrb!=NULL){
+      f1ap_ue_context_setup_req->drbs_to_be_setup_length = ieDrb->value.choice.DRBs_ToBeSetup_List.list.count;
+      f1ap_ue_context_setup_req->drbs_to_be_setup = calloc(f1ap_ue_context_setup_req->drbs_to_be_setup_length,
         sizeof(f1ap_drb_to_be_setup_t));
-    AssertFatal(f1ap_ue_context_setup_req->drbs_to_be_setup,
+      AssertFatal(f1ap_ue_context_setup_req->drbs_to_be_setup,
                 "could not allocate memory for f1ap_ue_context_setup_req->drbs_to_be_setup\n");
 
-    teids=malloc(f1ap_ue_context_setup_req->drbs_to_be_setup_length*sizeof(*teids));
-    for (i = 0; i < f1ap_ue_context_setup_req->drbs_to_be_setup_length; ++i) {
-      f1ap_drb_to_be_setup_t *drb_p = &f1ap_ue_context_setup_req->drbs_to_be_setup[i];
-      F1AP_DRBs_ToBeSetup_Item_t *drbs_tobesetup_item_p;
-      drbs_tobesetup_item_p = &((F1AP_DRBs_ToBeSetup_ItemIEs_t *)ieDrb->value.choice.DRBs_ToBeSetup_List.list.array[i])->value.choice.DRBs_ToBeSetup_Item;
-      drb_p->drb_id = drbs_tobesetup_item_p->dRBID;
-      /* TODO in the following, assume only one UP UL TNL is present.
-      * this matches/assumes OAI CU implementation, can be up to 2! */
-      drb_p->up_ul_tnl_length = 1;
-      AssertFatal(drbs_tobesetup_item_p->uLUPTNLInformation_ToBeSetup_List.list.count > 0,
+      teids=malloc(f1ap_ue_context_setup_req->drbs_to_be_setup_length*sizeof(*teids));
+      for (i = 0; i < f1ap_ue_context_setup_req->drbs_to_be_setup_length; ++i) {
+        f1ap_drb_to_be_setup_t *drb_p = &f1ap_ue_context_setup_req->drbs_to_be_setup[i];
+        F1AP_DRBs_ToBeSetup_Item_t *drbs_tobesetup_item_p;
+        drbs_tobesetup_item_p = &((F1AP_DRBs_ToBeSetup_ItemIEs_t *)ieDrb->value.choice.DRBs_ToBeSetup_List.list.array[i])->value.choice.DRBs_ToBeSetup_Item;
+        drb_p->drb_id = drbs_tobesetup_item_p->dRBID;
+        /* TODO in the following, assume only one UP UL TNL is present.
+        * this matches/assumes OAI CU implementation, can be up to 2! */
+        drb_p->up_ul_tnl_length = 1;
+        AssertFatal(drbs_tobesetup_item_p->uLUPTNLInformation_ToBeSetup_List.list.count > 0,
                   "no UL UP TNL Information in DRBs to be Setup list\n");
-      F1AP_ULUPTNLInformation_ToBeSetup_Item_t *ul_up_tnl_info_p = (F1AP_ULUPTNLInformation_ToBeSetup_Item_t *)drbs_tobesetup_item_p->uLUPTNLInformation_ToBeSetup_List.list.array[0];
-      F1AP_GTPTunnel_t *ul_up_tnl0 = ul_up_tnl_info_p->uLUPTNLInformation.choice.gTPTunnel;
-      BIT_STRING_TO_TRANSPORT_LAYER_ADDRESS_IPv4(&ul_up_tnl0->transportLayerAddress, drb_p->up_ul_tnl[0].tl_address);
-      OCTET_STRING_TO_INT32(&ul_up_tnl0->gTP_TEID, drb_p->up_ul_tnl[0].gtp_teid);
-
-      switch (drbs_tobesetup_item_p->rLCMode) {
-        case F1AP_RLCMode_rlc_am:
-          drb_p->rlc_mode = RLC_MODE_AM;
+        F1AP_ULUPTNLInformation_ToBeSetup_Item_t *ul_up_tnl_info_p = (F1AP_ULUPTNLInformation_ToBeSetup_Item_t *)drbs_tobesetup_item_p->uLUPTNLInformation_ToBeSetup_List.list.array[0];
+        F1AP_GTPTunnel_t *ul_up_tnl0 = ul_up_tnl_info_p->uLUPTNLInformation.choice.gTPTunnel;
+        BIT_STRING_TO_TRANSPORT_LAYER_ADDRESS_IPv4(&ul_up_tnl0->transportLayerAddress, drb_p->up_ul_tnl[0].tl_address);
+        OCTET_STRING_TO_INT32(&ul_up_tnl0->gTP_TEID, drb_p->up_ul_tnl[0].gtp_teid);
+
+        switch (drbs_tobesetup_item_p->rLCMode) {
+          case F1AP_RLCMode_rlc_am:
+            drb_p->rlc_mode = RLC_MODE_AM;
           break;
-
         default:
           drb_p->rlc_mode = RLC_MODE_TM;
           break;
@@ -180,21 +180,24 @@ int DU_handle_UE_CONTEXT_SETUP_REQUEST(instance_t       instance,
 				   DURecvCb);
       teids[i]=x;
 
+      }
     }
     F1AP_UEContextSetupRequestIEs_t *ieSrb;
     F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupRequestIEs_t, ieSrb, container,
                                    F1AP_ProtocolIE_ID_id_SRBs_ToBeSetup_List, true);
-    f1ap_ue_context_setup_req->srbs_to_be_setup_length = ieSrb->value.choice.SRBs_ToBeSetup_List.list.count;
-    f1ap_ue_context_setup_req->srbs_to_be_setup = calloc(f1ap_ue_context_setup_req->srbs_to_be_setup_length,
+    if(ieSrb != NULL){
+      f1ap_ue_context_setup_req->srbs_to_be_setup_length = ieSrb->value.choice.SRBs_ToBeSetup_List.list.count;
+      f1ap_ue_context_setup_req->srbs_to_be_setup = calloc(f1ap_ue_context_setup_req->srbs_to_be_setup_length,
             sizeof(f1ap_srb_to_be_setup_t));
-    AssertFatal(f1ap_ue_context_setup_req->srbs_to_be_setup,
+      AssertFatal(f1ap_ue_context_setup_req->srbs_to_be_setup,
                     "could not allocate memory for f1ap_ue_context_setup_req->srbs_to_be_setup\n");
 
-    for (i = 0; i < f1ap_ue_context_setup_req->srbs_to_be_setup_length; ++i) {
-      f1ap_srb_to_be_setup_t *srb_p = &f1ap_ue_context_setup_req->srbs_to_be_setup[i];
-      F1AP_SRBs_ToBeSetup_Item_t *srbs_tobesetup_item_p;
-      srbs_tobesetup_item_p = &((F1AP_SRBs_ToBeSetup_ItemIEs_t *)ieSrb->value.choice.SRBs_ToBeSetup_List.list.array[i])->value.choice.SRBs_ToBeSetup_Item;
-      srb_p->srb_id = srbs_tobesetup_item_p->sRBID;
+      for (i = 0; i < f1ap_ue_context_setup_req->srbs_to_be_setup_length; ++i) {
+        f1ap_srb_to_be_setup_t *srb_p = &f1ap_ue_context_setup_req->srbs_to_be_setup[i];
+        F1AP_SRBs_ToBeSetup_Item_t *srbs_tobesetup_item_p;
+        srbs_tobesetup_item_p = &((F1AP_SRBs_ToBeSetup_ItemIEs_t *)ieSrb->value.choice.SRBs_ToBeSetup_List.list.array[i])->value.choice.SRBs_ToBeSetup_Item;
+        srb_p->srb_id = srbs_tobesetup_item_p->sRBID;
+      }
     }
   }
 

openair2/RRC/NR/rrc_gNB.c

@@ -1365,7 +1365,7 @@ rrc_gNB_process_RRCReconfigurationComplete(
 
         /* Here the callback function used as input is not the right one. Need to create a new one probably for F1-U, not sure
          * if the kind of input parameters to the callback function are convenient though for gtp-u over F1-U.*/
-        ue_context_pP->ue_context.incoming_teid[i] = newGtpuCreateTunnel(0, create_tunnel_req.rnti,
+        ue_context_pP->ue_context.incoming_teid[i] = newGtpuCreateTunnel(INSTANCE_DEFAULT, create_tunnel_req.rnti,
             create_tunnel_req.incoming_rb_id[i],
             create_tunnel_req.incoming_rb_id[i],
             create_tunnel_req.outgoing_teid[i],
@@ -3671,6 +3671,10 @@ void *rrc_gnb_task(void *args_p) {
       rrc_DU_process_ue_context_setup_request(msg_p, msg_name_p, instance);
       break;
 
+    case F1AP_UE_CONTEXT_SETUP_RESP:
+      LOG_W(NR_RRC, "Handling of F1 UE context setup response context at the RRC layer of the CU is pending \n");
+      break;
+
       /* Messages from X2AP */
       case X2AP_ENDC_SGNB_ADDITION_REQ:
         LOG_I(NR_RRC, "Received ENDC sgNB addition request from X2AP \n");