NR RRC - RRCReestablishment - Fix MultiplePDU Regression

The generateDRB function now creates a DRB and puts it in the struct member of gNB_RRC_UE_t, from this struct we can generate ASN1 messages by calling the generateDRB_ASN1

openair2/RRC/NR/rrc_gNB.c

@@ -643,7 +643,8 @@ void fill_DRB_configList(const protocol_ctxt_t *const ctxt_pP,
         if(drb_is_active(ue_p, drb_id)){ /* Non-GBR flow using the same DRB or a GBR flow with no available DRBs*/
           nb_drb_to_setup--;
         } else {
-          NR_DRB_ToAddMod_t *DRB_config = generateDRB(ue_p, drb_id, &ue_p->pduSession[i], rrc->configuration.enable_sdap, rrc->security.do_drb_integrity, rrc->security.do_drb_ciphering);
+          generateDRB(ue_p, drb_id, &ue_p->pduSession[i], rrc->configuration.enable_sdap, rrc->security.do_drb_integrity, rrc->security.do_drb_ciphering);
+          NR_DRB_ToAddMod_t *DRB_config = generateDRB_ASN1(ue_p->established_drbs[drb_id-1]);
           if (drb_id_to_setup_start == 0)
             drb_id_to_setup_start = DRB_config->drb_Identity;
           asn1cSeqAdd(&ue_p->DRB_configList->list, DRB_config);

openair2/RRC/NR/rrc_gNB_radio_bearers.c

@@ -36,66 +36,59 @@ rrc_pdu_session_param_t *find_pduSession(gNB_RRC_UE_t *ue, int id, bool create)
   return ue->pduSession + j;
 }
 
-NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, rrc_pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering)
+void generateDRB(gNB_RRC_UE_t *ue,
+                 uint8_t drb_id,
+                 rrc_pdu_session_param_t *pduSession,
+                 bool enable_sdap,
+                 int do_drb_integrity,
+                 int do_drb_ciphering)
 {
-  NR_DRB_ToAddMod_t *DRB_config = CALLOC(1, sizeof(*DRB_config));
-  DRB_config->drb_Identity = drb_id;
-  asn1cCalloc(DRB_config->cnAssociation, association);
-  association->present = NR_DRB_ToAddMod__cnAssociation_PR_sdap_Config;
-
-  /* SDAP Configuration */
-  NR_SDAP_Config_t *SDAP_config = CALLOC(1, sizeof(NR_SDAP_Config_t));
-  asn1cCalloc(SDAP_config->mappedQoS_FlowsToAdd, sdapFlows);
-
-  SDAP_config->pdu_Session = pduSession->param.pdusession_id;
-  
-  if (enable_sdap) {
-    SDAP_config->sdap_HeaderDL = NR_SDAP_Config__sdap_HeaderDL_present;
-    SDAP_config->sdap_HeaderUL = NR_SDAP_Config__sdap_HeaderUL_present;
-  } else {
-    SDAP_config->sdap_HeaderDL = NR_SDAP_Config__sdap_HeaderDL_absent;
-    SDAP_config->sdap_HeaderUL = NR_SDAP_Config__sdap_HeaderUL_absent;
-  }
-  
-  SDAP_config->defaultDRB = true;
-  
-  for (int qos_flow_index = 0; qos_flow_index < pduSession->param.nb_qos; qos_flow_index++) 
-  {
-    asn1cSequenceAdd(sdapFlows->list, NR_QFI_t, qfi);
-    *qfi = pduSession->param.qos[qos_flow_index].qfi;
-    if(pduSession->param.qos[qos_flow_index].fiveQI > 5)
-      pduSession->param.used_drbs[drb_id - 1] = DRB_ACTIVE_NONGBR;
-    else
-      pduSession->param.used_drbs[drb_id - 1] = DRB_ACTIVE;
-  }
-
-  association->choice.sdap_Config = SDAP_config;
-
-  /* PDCP Configuration */
-  asn1cCalloc(DRB_config->pdcp_Config, pdcpConfig);
-  asn1cCalloc(pdcpConfig->drb, drb);
-
-  asn1cCallocOne(drb->discardTimer, NR_PDCP_Config__drb__discardTimer_infinity);
-
-  asn1cCallocOne(drb->pdcp_SN_SizeUL, NR_PDCP_Config__drb__pdcp_SN_SizeUL_len18bits);
-  asn1cCallocOne(drb->pdcp_SN_SizeDL, NR_PDCP_Config__drb__pdcp_SN_SizeDL_len18bits);
-
-  drb->headerCompression.present = NR_PDCP_Config__drb__headerCompression_PR_notUsed;
-  drb->headerCompression.choice.notUsed = 0;
+  int i;
+  int qos_flow_index;
+  if (ue->established_drbs[drb_id - 1].status == DRB_INACTIVE) {
+    /* DRB Management */
+    ue->established_drbs[drb_id - 1].drb_id          = drb_id;
+    ue->established_drbs[drb_id - 1].reestablishPDCP = -1;
+    ue->established_drbs[drb_id - 1].recoverPDCP     = -1;
+    for (i = 0; i < NGAP_MAX_DRBS_PER_UE; i++) {
+      if ((ue->established_drbs[drb_id - 1].cnAssociation.sdap_config.pdusession_id == 0 ||
+           ue->established_drbs[drb_id - 1].cnAssociation.sdap_config.pdusession_id == pduSession->param.pdusession_id) &&
+           ue->established_drbs[drb_id - 1].defaultDRBid == 0) {
+        ue->established_drbs[drb_id - 1].cnAssociation.sdap_config.defaultDRB = true;
+        ue->established_drbs[drb_id - 1].defaultDRBid = drb_id;
+      }
+    }
+    /* SDAP Configuration */
+    ue->established_drbs[drb_id - 1].cnAssociation.present                   = NR_DRB_ToAddMod__cnAssociation_PR_sdap_Config;
+    ue->established_drbs[drb_id - 1].cnAssociation.sdap_config.pdusession_id = pduSession->param.pdusession_id;
+    if (enable_sdap) {
+      ue->established_drbs[drb_id - 1].cnAssociation.sdap_config.sdap_HeaderDL = NR_SDAP_Config__sdap_HeaderDL_present;
+      ue->established_drbs[drb_id - 1].cnAssociation.sdap_config.sdap_HeaderUL = NR_SDAP_Config__sdap_HeaderUL_present;
+    } else {
+      ue->established_drbs[drb_id - 1].cnAssociation.sdap_config.sdap_HeaderDL = NR_SDAP_Config__sdap_HeaderDL_absent;
+      ue->established_drbs[drb_id - 1].cnAssociation.sdap_config.sdap_HeaderUL = NR_SDAP_Config__sdap_HeaderUL_absent;
+    }
+    for (qos_flow_index = 0; qos_flow_index < pduSession->param.nb_qos; qos_flow_index++) 
+    {
+      ue->established_drbs[drb_id - 1].cnAssociation.sdap_config.mappedQoS_FlowsToAdd[qos_flow_index] = pduSession->param.qos[qos_flow_index].qfi;
+      if(pduSession->param.qos[qos_flow_index].fiveQI > 5)
+        ue->established_drbs[drb_id - 1].status = DRB_ACTIVE_NONGBR;
+      else
+        ue->established_drbs[drb_id - 1].status = DRB_ACTIVE;
+    }
+    /* PDCP Configuration */
+    ue->established_drbs[drb_id - 1].pdcp_config.discardTimer              = NR_PDCP_Config__drb__discardTimer_infinity;
+    ue->established_drbs[drb_id - 1].pdcp_config.pdcp_SN_SizeDL            = NR_PDCP_Config__drb__pdcp_SN_SizeDL_len18bits;
+    ue->established_drbs[drb_id - 1].pdcp_config.pdcp_SN_SizeUL            = NR_PDCP_Config__drb__pdcp_SN_SizeUL_len18bits;
+    ue->established_drbs[drb_id - 1].pdcp_config.t_Reordering              = NR_PDCP_Config__t_Reordering_ms100;
+    ue->established_drbs[drb_id - 1].pdcp_config.headerCompression.present = NR_PDCP_Config__drb__headerCompression_PR_notUsed;
+    ue->established_drbs[drb_id - 1].pdcp_config.headerCompression.NotUsed = 0;
+    if (do_drb_integrity)
+      ue->established_drbs[drb_id - 1].pdcp_config.integrityProtection    = NR_PDCP_Config__drb__integrityProtection_enabled;
+    if (!do_drb_ciphering)
+      ue->established_drbs[drb_id - 1].pdcp_config.ext1.cipheringDisabled = NR_PDCP_Config__ext1__cipheringDisabled_true;
 
-  asn1cCallocOne(pdcpConfig->t_Reordering, NR_PDCP_Config__t_Reordering_ms100);
-  
-  if (do_drb_integrity) {
-    asn1cCallocOne(drb->integrityProtection, NR_PDCP_Config__drb__integrityProtection_enabled);
-  }
-  if (!do_drb_ciphering) {
-    asn1cCalloc(pdcpConfig->ext1, ext1);
-    asn1cCallocOne(ext1->cipheringDisabled, NR_PDCP_Config__ext1__cipheringDisabled_true);
   }
-
-  ue->DRB_active[drb_id-1] = DRB_ACTIVE;
-
-  return DRB_config;
 }
 
 NR_DRB_ToAddMod_t *generateDRB_ASN1(drb_t drb_asn1)

openair2/RRC/NR/rrc_gNB_radio_bearers.h

@@ -39,7 +39,15 @@
 /// @param drb_t drb_asn1 
 /// @return Returns the ASN1 DRB-ToAddMod structs.
 NR_DRB_ToAddMod_t *generateDRB_ASN1(drb_t drb_asn1);
-NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue, uint8_t drb_id, rrc_pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering);
+/// @brief Creates and stores a DRB in the gNB_RRC_UE_t struct, it doesn't create the actual entity, 
+/// to create the actual entity use the generateDRB_ASN1.
+/// @param ue The gNB_RRC_UE_t struct that holds information for the UEs
+/// @param drb_id The Data Radio Bearer Identity to be created for the established DRB.
+/// @param pduSession The PDU Session that the DRB is created for.
+/// @param enable_sdap If true the SDAP header will be added to the packet, else it will not add or search for SDAP header.
+/// @param do_drb_integrity 
+/// @param do_drb_ciphering 
+void generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, rrc_pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering);
 uint8_t next_available_drb(gNB_RRC_UE_t *ue, rrc_pdu_session_param_t *pdusession, bool is_gbr);
 bool drb_is_active(gNB_RRC_UE_t *ue, uint8_t drb_id);