NR RRC - RRCReestablishment - Fix MultiplePDU Regression

Simplify RRCReestablishmentComplete procedure with respective function,
removed the block that creates the SRB2  and created a function, with doxygen

openair2/RRC/NR/rrc_gNB.c

@@ -1284,6 +1284,68 @@ void rrc_gNB_generate_RRCReestablishment(const protocol_ctxt_t *ctxt_pP,
  * Handle RRC Reestablishment Complete Functions 
  */
 
+/// @brief Function used in RRCReestablishmentComplete procedure to reestablish the SRB2.
+/// @param old_xid The old RRC transaction id.
+/// @param new_xid The new RRC transaction id.
+void RRCReestablishmentComplete_fill_SRB2_configList(const protocol_ctxt_t *const ctxt_pP,
+                                                     rrc_gNB_ue_context_t *ue_context_pP,
+                                                     const uint8_t old_xid,
+                                                     const uint8_t new_xid)
+{
+  gNB_RRC_UE_t           *ue_p            = &ue_context_pP->ue_context;
+  NR_SRB_ToAddMod_t      *SRB2_config     = NULL;
+  NR_SRB_ToAddModList_t  *SRB_configList  = ue_p->SRB_configList;
+  NR_SRB_ToAddModList_t **SRB_configList2 = NULL;
+
+  SRB_configList2 = &ue_p->SRB_configList2[old_xid];
+
+  // get old configuration of SRB2
+  if (*SRB_configList2 != NULL) {
+    if((*SRB_configList2)->list.count!=0) {
+      LOG_D(NR_RRC, "RRC Reestablishment - SRB_configList2(%p) count is %d\n           SRB_configList2->list.array[0] addr is %p\n",
+      SRB_configList2, (*SRB_configList2)->list.count,  (*SRB_configList2)->list.array[0]);
+    }
+
+    for (int i = 0; (i < (*SRB_configList2)->list.count) && (i < 3); i++) {
+      if ((*SRB_configList2)->list.array[i]->srb_Identity == 2 ) {
+        LOG_D(NR_RRC, "RRC Reestablishment - get SRB2_config from (ue_p->SRB_configList2[%d])\n", old_xid);
+        SRB2_config = (*SRB_configList2)->list.array[i];
+        SRB2_config->reestablishPDCP  = CALLOC(1, sizeof(*SRB2_config->reestablishPDCP));
+        *SRB2_config->reestablishPDCP = NR_SRB_ToAddMod__reestablishPDCP_true;
+        break;
+      }
+    }
+  }
+
+  SRB_configList2 = &(ue_p->SRB_configList2[new_xid]);
+
+  if (*SRB_configList2) {
+    free(*SRB_configList2);
+    LOG_D(NR_RRC, "RRC Reestablishment - free(ue_p->SRB_configList2[%d])\n", new_xid);
+  }
+
+  *SRB_configList2 = CALLOC(1, sizeof(**SRB_configList2));
+
+  if (SRB2_config != NULL) {
+    // Add SRB2 to SRB configuration list
+    asn1cSeqAdd(&SRB_configList->list, SRB2_config);
+    asn1cSeqAdd(&(*SRB_configList2)->list, SRB2_config);
+    LOG_D(NR_RRC, "RRC Reestablishment - Add SRB2_config (srb_Identity:%ld) to ue_p->SRB_configList\n", SRB2_config->srb_Identity);
+    LOG_D(NR_RRC, "RRC Reestablishment - Add SRB2_config (srb_Identity:%ld) to ue_p->SRB_configList2[%d]\n", SRB2_config->srb_Identity, new_xid);
+  } else {
+    // SRB configuration list only contains SRB1.
+    LOG_W(NR_RRC,"RRC Reestablishment - SRB2 configuration does not exist in SRB configuration list\n");
+  }
+
+  ue_p->Srb[1].Active = 1;
+
+  if (get_softmodem_params()->sa) {
+    uint8_t send_security_mode_command = false;
+    nr_rrc_pdcp_config_security(ctxt_pP, ue_context_pP, send_security_mode_command);
+    LOG_D(NR_RRC, "RRC Reestablishment - set security successfully \n");
+  }
+}
+
 /// @brief Function used in RRCReestablishmentComplete procedure to reestablish the DRBs 
 ///        that the UE previously had, it gets the information from the established_drbs 
 ///        struct.
@@ -1418,54 +1480,9 @@ void rrc_gNB_process_RRCReestablishmentComplete(const protocol_ctxt_t *const ctx
   ue_p->StatusRrc = NR_RRC_CONNECTED;
   ue_p->ue_rrc_inactivity_timer = 1; // set rrc inactivity when UE goes into RRC_CONNECTED
   ue_p->reestablishment_xid = new_xid;
-  SRB_configList2 = &ue_p->SRB_configList2[xid];
-
-  // get old configuration of SRB2
-  if (*SRB_configList2 != NULL) {
-    if((*SRB_configList2)->list.count!=0) {
-      LOG_D(NR_RRC, "SRB_configList2(%p) count is %d\n           SRB_configList2->list.array[0] addr is %p",
-            SRB_configList2, (*SRB_configList2)->list.count,  (*SRB_configList2)->list.array[0]);
-    }
-
-    for (i = 0; (i < (*SRB_configList2)->list.count) && (i < 3); i++) {
-      if ((*SRB_configList2)->list.array[i]->srb_Identity == 2 ) {
-        LOG_D(NR_RRC, "get SRB2_config from (ue_p->SRB_configList2[%d])\n", xid);
-        SRB2_config = (*SRB_configList2)->list.array[i];
-        SRB2_config->reestablishPDCP = CALLOC(1, sizeof(*SRB2_config->reestablishPDCP));
-        *SRB2_config->reestablishPDCP = NR_SRB_ToAddMod__reestablishPDCP_true;
-        break;
-      }
-    }
-  }
-
-  // SRB2_config = CALLOC(1, sizeof(*SRB2_config));
-  // SRB2_config->srb_Identity = 2;
-
-  SRB_configList2 = &(ue_p->SRB_configList2[new_xid]);
-  DRB_configList2 = &(ue_p->DRB_configList2[new_xid]);
-
-  if (*SRB_configList2) {
-    free(*SRB_configList2);
-    LOG_D(NR_RRC, "free(ue_p->SRB_configList2[%d])\n", new_xid);
-  }
-
-  *SRB_configList2 = CALLOC(1, sizeof(**SRB_configList2));
-
-  if (SRB2_config != NULL) {
-    // Add SRB2 to SRB configuration list
-    asn1cSeqAdd(&SRB_configList->list, SRB2_config);
-    asn1cSeqAdd(&(*SRB_configList2)->list, SRB2_config);
-    LOG_D(NR_RRC, "Add SRB2_config (srb_Identity:%ld) to ue_p->SRB_configList\n", SRB2_config->srb_Identity);
-    LOG_D(NR_RRC, "Add SRB2_config (srb_Identity:%ld) to ue_p->SRB_configList2[%d]\n", SRB2_config->srb_Identity, new_xid);
-  } else {
-    // SRB configuration list only contains SRB1.
-    LOG_W(NR_RRC,"SRB2 configuration does not exist in SRB configuration list\n");
-  }
 
+  RRCReestablishmentComplete_fill_SRB2_configList(ctxt_pP, ue_context_pP, xid, new_xid);
   RRCReestablishmentComplete_fill_DRB_configList(ctxt_pP, ue_context_pP, new_xid);
-
-  ue_p->Srb[1].Active = 1;
-
   RRCReestablishmentComplete_update_ngu_tunnel(ctxt_pP, ue_context_pP, reestablish_rnti);
   RRCReestablishmentComplete_nas_pdu_update(ue_context_pP, xid);
 
@@ -1473,15 +1490,6 @@ void rrc_gNB_process_RRCReestablishmentComplete(const protocol_ctxt_t *const ctx
   LOG_I(NR_RRC, "Updating UEid from %04x to %lx\n", ue_p->rnti, ctxt_pP->rntiMaybeUEid);
   rrc_gNB_update_ue_context_rnti(ctxt_pP->rntiMaybeUEid, RC.nrrrc[ctxt_pP->module_id], ue_p->gNB_ue_ngap_id);
 
-  if (get_softmodem_params()->sa) {
-    uint8_t send_security_mode_command = false;
-    nr_rrc_pdcp_config_security(
-      ctxt_pP,
-      ue_context_pP,
-      send_security_mode_command ? 0 : 1);
-    LOG_D(NR_RRC, "set security successfully \n");
-  }
-
   uint8_t drb_id_to_setup_start = DRB_configList ? DRB_configList->list.array[0]->drb_Identity : 1;
   uint8_t nb_drb_to_setup = DRB_configList ? DRB_configList->list.count : ue_p->nb_of_pdusessions;
   /* TODO: hardcoded to 13 for the time being, to be changed? */