Merge remote-tracking branch 'origin/int-f1-ue-ctxt-release' into integration_2023_w21

openair3/NAS/NR_UE/nr_nas_msg_sim.c

@@ -999,6 +999,11 @@ void *nas_nrue_task(void *args_p)
       case NAS_CONN_RELEASE_IND:
         LOG_I(NAS, "[UE %ld] Received %s: cause %u\n", instance, ITTI_MSG_NAME (msg_p),
               NAS_CONN_RELEASE_IND (msg_p).cause);
+        /* the following is not clean, but probably necessary: we need to give
+         * time to RLC to Ack the SRB1 PDU which contained the RRC release
+         * message. Hence, we just below wait some time, before finally
+         * unblocking the nr-uesoftmodem, which will terminate the process. */
+        usleep(100000);
         itti_wait_tasks_unblock(); /* will unblock ITTI to stop nr-uesoftmodem */
         break;
 

openair3/NGAP/ngap_gNB_context_management_procedures.c

@@ -138,6 +138,11 @@ int ngap_ue_context_release_req(instance_t instance,
     /* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
     NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: %u\n",
               ue_release_req_p->gNB_ue_ngap_id);
+    /* send response to free the UE: we don't know it, but it should be
+     * released since RRC seems to know it (e.g., there is no AMF) */
+    MessageDef *msg = itti_alloc_new_message(TASK_NGAP, 0, NGAP_UE_CONTEXT_RELEASE_COMMAND);
+    NGAP_UE_CONTEXT_RELEASE_COMMAND(msg).gNB_ue_ngap_id = ue_release_req_p->gNB_ue_ngap_id;
+    itti_send_msg_to_task(TASK_RRC_GNB, ngap_gNB_instance_p->instance, msg);
     return -1;
   }