[unbuilt] RRC Reconnection Complete for CU/DU done. Not done for monolithique

openair2/F1AP/f1ap_du_rrc_message_transfer.c

@@ -736,7 +736,25 @@ int DU_send_UL_RRC_MESSAGE_TRANSFER(instance_t instance,
         break;
 
       case LTE_UL_DCCH_MessageType__c1_PR_rrcConnectionReconfigurationComplete:
+        LOG_I(F1AP, "[MSG] RRC UL rrcConnectionReconfigurationComplete\n");
 
+        int UE_id_mac = find_UE_id(instance, rnti);
+        
+        if (UE_id_mac == -1) {
+          LOG_E(MAC, "Can't find UE_id(MAC) of UE rnti %x\n", rnti);
+          break;
+        }
+        
+        UE_sched_ctrl_t *UE_scheduling_control = &(RC.mac[instance]->UE_list.UE_sched_ctrl[UE_id_mac]);
+        
+        if (UE_scheduling_control == NULL) {
+          LOG_E(MAC, "Can't get UE scheduling control structure of UE rnti %x\n", rnti);
+          break;
+        } else if (UE_scheduling_control->cdrx_waiting_ack == TRUE) {
+          UE_scheduling_control->cdrx_waiting_ack = FALSE;
+          // UE_scheduling_control->cdrx_configured = TRUE; // Set to TRUE when RRC Connection Reconfiguration is sent (under test)
+          LOG_I(MAC, "CDRX configuration after first RRC Connection Reconfiguration Complete reception\n");
+        }
         break;
 
       case LTE_UL_DCCH_MessageType__c1_PR_rrcConnectionReestablishmentComplete:
@@ -744,18 +762,13 @@ int DU_send_UL_RRC_MESSAGE_TRANSFER(instance_t instance,
 
       case LTE_UL_DCCH_MessageType__c1_PR_rrcConnectionSetupComplete:
         LOG_I(F1AP, "[MSG] RRC UL rrcConnectionSetupComplete \n");
-       if(!ue_context_p){
+        
+        if(!ue_context_p){
           LOG_E(F1AP, "Did not find the UE context associated with UE RNTOI %x, ue_context_p is NULL\n", rnti);
-        }else {
+
+        } else {
           LOG_I(F1AP, "Processing RRCConnectionSetupComplete UE %x\n", rnti);
           ue_context_p->ue_context.Status = RRC_CONNECTED;
-  
-          int UE_id_mac = find_UE_id(instance, rnti);
-          UE_sched_ctrl_t *UE_scheduling_control = &(RC.mac[instance]->UE_list.UE_sched_ctrl[UE_id_mac]);
-          if (UE_scheduling_control->cdrx_waiting_ack == TRUE) {
-            UE_scheduling_control->cdrx_waiting_ack = FALSE;
-          }
-
         }
         break;
 

openair2/RRC/LTE/rrc_eNB.c

@@ -6494,23 +6494,6 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
   ue_context_pP->ue_context.ue_reestablishment_timer = 0;
   ue_context_pP->ue_context.ue_rrc_inactivity_timer = 1; // reset rrc inactivity timer
 
-  if (!NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type)) {
-    /* CDRX: activated if ack was expected */
-    int UE_id_mac = find_UE_id(ctxt_pP->module_id, ue_context_pP->ue_context.rnti);
-    if (UE_id_mac == -1){
-      LOG_E(RRC,PROTOCOL_RRC_CTXT_UE_FMT" rrc_eNB_process_RRCConnectionReconfigurationComplete without UE_id(MAC) rnti %x, let's return\n",
-            PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP), ue_context_pP->ue_context.rnti);
-      return;
-    }
-    UE_sched_ctrl_t *UE_scheduling_control = &(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id_mac]);
-    
-    if (UE_scheduling_control->cdrx_waiting_ack == TRUE) {
-      UE_scheduling_control->cdrx_waiting_ack = FALSE;
-      // UE_scheduling_control->cdrx_configured = TRUE;
-      LOG_I(RRC, "CDRX configuration after first RRC Connection Reconfiguration Complete reception\n");
-    }
-  } // No CDRX with the CU/DU split in this version of the code
-
   T(T_ENB_RRC_CONNECTION_RECONFIGURATION_COMPLETE,
     T_INT(ctxt_pP->module_id),
     T_INT(ctxt_pP->frame),