Remove commented code

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -1877,38 +1877,6 @@ int do_RRCReestablishment(const protocol_ctxt_t *const ctxt_pP,
   *SRB_configList = CALLOC(1, sizeof(NR_SRB_ToAddModList_t));
   asn1cSeqAdd(&(*SRB_configList)->list, SRB1_config);
   /****************************** masterCellGroup ******************************/
-  /*
-   NR_CellGroupConfig_t *cellGroupConfig = NULL;
-   char masterCellGroup_buf[1000];
-   gNB_RRC_UE_t *ue_p = &ue_context_pP->ue_context;
-   if (masterCellGroup_from_DU) {
-    // decode masterCellGroup OCTET_STRING received from DU and place in ue context
-    uper_decode(NULL,
-    &asn_DEF_NR_CellGroupConfig,   //might be added prefix later
-    (void **)&cellGroupConfig,
-    (uint8_t *)masterCellGroup_from_DU->buf,
-    masterCellGroup_from_DU->size, 0, 0);
-
-    xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, (const void*)cellGroupConfig);
-  }
-  else {
-    cellGroupConfig = calloc(1, sizeof(NR_CellGroupConfig_t));
-    fill_initial_cellGroupConfig(ue_context_pP->ue_context.rnti,ue_context_pP->local_uid,cellGroupConfig,scc,carrier);
-
-    enc_rval = uper_encode_to_buffer(&asn_DEF_NR_CellGroupConfig,
-             NULL,
-             (void *)cellGroupConfig,
-             masterCellGroup_buf,
-             1000);
-
-    if(enc_rval.encoded == -1) {
-      LOG_E(NR_RRC, "ASN1 message CellGroupConfig encoding failed (%s, %lu)!\n",
-      enc_rval.failed_type->name, enc_rval.encoded);
-      return -1;
-    }
-  }
-  ue_p->masterCellGroup = cellGroupConfig;
-  */
   rrcReestablishment->rrc_TransactionIdentifier = Transaction_id;
   rrcReestablishment->criticalExtensions.present = NR_RRCReestablishment__criticalExtensions_PR_rrcReestablishment;
   rrcReestablishment->criticalExtensions.choice.rrcReestablishment = CALLOC(1, sizeof(NR_RRCReestablishment_IEs_t));

openair2/RRC/NR/rrc_gNB.c

@@ -1223,18 +1223,6 @@ void rrc_gNB_generate_RRCReestablishment(const protocol_ctxt_t *ctxt_pP,
                                        &rrc->carrier);
 
   LOG_I(NR_RRC, "[RAPROC] UE %04x Logical Channel DL-DCCH, Generating NR_RRCReestablishment (bytes %d)\n", ue_p->rnti, size);
-#if (0)
-  /* TODO : It may be needed if gNB goes into full stack working. */
-  UE = find_nr_UE(module_id, rnti);
-  if (UE_id != -1) {
-    /* Activate reject timer, if RRCComplete not received after 10 frames, reject UE */
-    RC.nrmac[module_id]->UE_info.UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer = 1;
-    /* Reject UE after 10 frames, NR_RRCReestablishmentReject is triggered */
-    RC.nrmac[module_id]->UE_info.UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer_thres = 100;
-  } else {
-    LOG_E(NR_RRC, " Generating NR_RRCReestablishment without UE_id(MAC) rnti %x\n", rnti);
-  }
-#endif
 
   uint8_t *kRRCenc = NULL;
   uint8_t *kRRCint = NULL;
@@ -1798,34 +1786,6 @@ static int nr_rrc_gNB_decode_ccch(module_id_t module_id, rnti_t rnti, const uint
           rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(module_id, c_rnti, 0);
           break;
         }
-#if 0
-        int UE_id = find_nr_UE_id(gnb_rrc_inst, c_rnti);
-        if (UE_id == -1) {
-          LOG_E(NR_RRC, "NR_RRCReestablishmentRequest without MAC context, rnti %04x, fallback to RRC establishment\n", c_rnti);
-          rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(module_id, rnti, 0);
-          break;
-        }
-
-        // previous rnti
-        rnti_t previous_rnti = 0;
-
-        for (int i = 0; i < MAX_MOBILES_PER_ENB; i++) {
-          if (reestablish_rnti_map[i][1] == c_rnti) {
-            previous_rnti = reestablish_rnti_map[i][0];
-            break;
-          }
-        }
-
-        if (previous_rnti != 0) {
-          UE_id = find_nr_UE_id(gnb_rrc_inst, previous_rnti);
-          if (UE_id == -1) {
-            LOG_E(NR_RRC,"RRCReestablishmentRequest without mac context previous rnti %04x, nex rnti %04x, fallback to RRC establishment\n",
-                  previous_rnti, c_rnti);
-            rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(module_id, rnti, 0);
-            break;
-          }
-        }
-#endif
         // c-plane not end
         if ((UE->StatusRrc != NR_RRC_RECONFIGURED) && (UE->reestablishment_cause == NR_ReestablishmentCause_spare1)) {
           LOG_E(NR_RRC, "NR_RRCReestablishmentRequest (UE %x c-plane is not end), RRC establishment failed\n", c_rnti);
@@ -2419,19 +2379,6 @@ rrc_gNB_decode_dcch(
           break;
         }
 
-#if (0)
-        /* TODO : It may be needed if gNB goes into full stack working. */
-        // clear
-        int UE_id = find_nr_UE_id(gnb_rrc_inst, ctxt_pP->rntiMaybeUEid);
-
-        if (UE_id == -1) {
-          LOG_E(NR_RRC, PROTOCOL_RRC_CTXT_UE_FMT " NR_RRCReestablishmentComplete without UE_id(MAC) rnti %lx, fault\n", PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP), ctxt_pP->rntiMaybeUEid);
-          break;
-        }
-
-        RC.nrmac[gnb_rrc_inst]->UE_info.UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer = 0;
-#endif
-
         if (ul_dcch_msg->message.choice.c1->choice.rrcReestablishmentComplete->criticalExtensions.present == NR_RRCReestablishmentComplete__criticalExtensions_PR_rrcReestablishmentComplete) {
           rrc_gNB_process_RRCReestablishmentComplete(ctxt_pP, reestablish_rnti, ue_context_p, ul_dcch_msg->message.choice.c1->choice.rrcReestablishmentComplete->rrc_TransactionIdentifier);