rrc_eNB update 10/09

openair2/RRC/LTE/rrc_eNB.c

@@ -3201,16 +3201,18 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
   mac_MainConfig->phr_Config->choice.setup.prohibitPHR_Timer = LTE_MAC_MainConfig__phr_Config__setup__prohibitPHR_Timer_sf200; // sf20 = 20 subframes // LTE_MAC_MainConfig__phr_Config__setup__prohibitPHR_Timer_sf1000
   mac_MainConfig->phr_Config->choice.setup.dl_PathlossChange = LTE_MAC_MainConfig__phr_Config__setup__dl_PathlossChange_dB3;  // Value dB1 =1 dB, dB3 = 3 dB
 
+  mac_MainConfig->drx_Config = NULL;
   if (!NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type)) {
     /* CDRX Configuration */
     // Need to check if UE is a BR UE
     rnti_t rnti = ue_context_pP->ue_id_rnti;
     module_id_t module_id = ctxt_pP->module_id;
     int UE_id = find_UE_id(module_id, rnti);
+
+    if (UE_id != -1) {
       eNB_MAC_INST *mac = RC.mac[module_id];
       UE_list_t *UE_list = &(mac->UE_list);
 
-    if (UE_id != -1) {
       if ((rrc_inst->carrier[cc_id].sib1->tdd_Config == NULL) && 
         (UE_list->UE_template[ue_context_pP->ue_context.primaryCC_id][UE_id].rach_resource_type == 0)) {
         // CDRX can be only configured in case of FDD and non BR UE (09/04/19)
@@ -3220,25 +3222,25 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
         /* Process the IE drx_Config */
         if (cc_id < MAX_NUM_CCs) {
           mac_MainConfig->drx_Config = do_DrxConfig(cc_id, &rrc_inst->configuration, UEcap); // drx_Config IE
+          if (mac_MainConfig->drx_Config == NULL) {
+            LOG_E(MAC, "drx_Configuration parameter is NULL, cannot configure local UE parameters\n");
+          }
         } else {
           LOG_E(RRC, "Invalid CC_id for DRX configuration\n");
         }
-
-      /* Set timers and thresholds values in local MAC context of UE */
-      eNB_Config_Local_DRX(module_id, ue_context_pP->ue_id_rnti, mac_MainConfig->drx_Config);
-
-      LOG_D(RRC, "DRX configured in mac main config for RRC Connection Reconfiguration\n");
-
       } else { // CDRX not implemented for TDD and LTE-M (09/04/19)
-        mac_MainConfig->drx_Config = NULL;
+        LOG_D(RRC, "CDRX not implemented for TDD and LTE-M\n");
       }
     } else { // UE_id invalid
       LOG_E(RRC, "Invalid UE_id found!\n");
-      mac_MainConfig->drx_Config = NULL;
     }
   } else { // No CDRX with the CU/DU split in this version
     LOG_E(RRC, "CU/DU split activated\n");
-    mac_MainConfig->drx_Config = NULL;
+  }
+  if (mac_MainConfig->drx_Config != NULL) {
+    /* Set timers and thresholds values in local MAC context of UE */
+    eNB_Config_Local_DRX(module_id, rnti, mac_MainConfig->drx_Config);
+    LOG_D(RRC, "DRX configured in mac main config for RRC Connection Reconfiguration\n");
   } 
 
 #if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0))