Osmocom Open Build Service

commit_2618e3da780eca02f3bd3cc4b023606dfb0ae9b7.txt Deleted

commit_82e901616472b1599c2f72e3fe2fbac90b07b34f.txt Added

open5gs_2.6.0.37.2618e.dsc -> open5gs_2.6.0.38.82e9.dsc Changed

@@ -2,7 +2,7 @@
 Source: open5gs
 Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
 Architecture: any
-Version: 2.6.0.37.2618e
+Version: 2.6.0.38.82e9
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Uploaders: Sukchan Lee <acetcom@gmail.com>
 Homepage: https://open5gs.org
@@ -31,8 +31,8 @@
  open5gs-udr deb net optional arch=any
  open5gs-upf deb net optional arch=any
 Checksums-Sha1:
- 424b2948ce82ab9442900d0241bd62f1df88ab5d 13621152 open5gs_2.6.0.37.2618e.tar.xz
+ 162633c049adde4963edf4944d88d1b534247c88 13621960 open5gs_2.6.0.38.82e9.tar.xz
 Checksums-Sha256:
- 620b2f582e96653e403d1fe77cc489802a1088d7d76c74ca2622e4f8d84ae7ea 13621152 open5gs_2.6.0.37.2618e.tar.xz
+ 73ef6b8757b2488833f9af010a937bf4a15e1c072086499158f590cce04a8508 13621960 open5gs_2.6.0.38.82e9.tar.xz
 Files:
- b198acab8843207e07533d8e8529003b 13621152 open5gs_2.6.0.37.2618e.tar.xz
+ a503273d927a95d196f82248eff097b3 13621960 open5gs_2.6.0.38.82e9.tar.xz

open5gs_2.6.0.37.2618e.tar.xz/.tarball-version -> open5gs_2.6.0.38.82e9.tar.xz/.tarball-version Changed

open5gs_2.6.0.37.2618e.tar.xz/debian/changelog -> open5gs_2.6.0.38.82e9.tar.xz/debian/changelog Changed

open5gs_2.6.0.37.2618e.tar.xz/lib/gtp/v2/path.c -> open5gs_2.6.0.38.82e9.tar.xz/lib/gtp/v2/path.c Changed

open5gs_2.6.0.37.2618e.tar.xz/lib/gtp/xact.h -> open5gs_2.6.0.38.82e9.tar.xz/lib/gtp/xact.h Changed

open5gs_2.6.0.37.2618e.tar.xz/lib/pfcp/rule-match.c -> open5gs_2.6.0.38.82e9.tar.xz/lib/pfcp/rule-match.c Changed

@@ -162,20 +162,20 @@
             continue;
         }
 
-        ogs_debug("PROTO:%d SRC:%08x %08x %08x %08x",
+        ogs_trace("PROTO:%d SRC:%08x %08x %08x %08x",
                 proto, be32toh(src_addr0), be32toh(src_addr1),
                 be32toh(src_addr2), be32toh(src_addr3));
-        ogs_debug("HLEN:%d  DST:%08x %08x %08x %08x",
+        ogs_trace("HLEN:%d  DST:%08x %08x %08x %08x",
                 ip_hlen, be32toh(dst_addr0), be32toh(dst_addr1),
                 be32toh(dst_addr2), be32toh(dst_addr3));
 
-        ogs_debug("PROTO:%d SRC:%d-%d DST:%d-%d",
+        ogs_trace("PROTO:%d SRC:%d-%d DST:%d-%d",
                 ipfw->proto,
                 ipfw->port.src.low,
                 ipfw->port.src.high,
                 ipfw->port.dst.low,
                 ipfw->port.dst.high);
-        ogs_debug("SRC:%08x %08x %08x %08x/%08x %08x %08x %08x",
+        ogs_trace("SRC:%08x %08x %08x %08x/%08x %08x %08x %08x",
                 be32toh(ipfw->ip.src.addr0),
                 be32toh(ipfw->ip.src.addr1),
                 be32toh(ipfw->ip.src.addr2),
@@ -184,7 +184,7 @@
                 be32toh(ipfw->ip.src.mask1),
                 be32toh(ipfw->ip.src.mask2),
                 be32toh(ipfw->ip.src.mask3));
-        ogs_debug("DST:%08x %08x %08x %08x/%08x %08x %08x %08x",
+        ogs_trace("DST:%08x %08x %08x %08x/%08x %08x %08x %08x",
                 be32toh(ipfw->ip.dst.addr0),
                 be32toh(ipfw->ip.dst.addr1),
                 be32toh(ipfw->ip.dst.addr2),

open5gs_2.6.0.37.2618e.tar.xz/src/amf/gmm-build.h -> open5gs_2.6.0.38.82e9.tar.xz/src/amf/gmm-build.h Changed

open5gs_2.6.0.37.2618e.tar.xz/src/amf/namf-handler.c -> open5gs_2.6.0.38.82e9.tar.xz/src/amf/namf-handler.c Changed

@@ -851,11 +851,10 @@
     ModificationNotification = recvmsg->ModificationNotification;
     if (!ModificationNotification) {
         status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
-        ogs_error("%s No ModificationNotification", amf_ue->supi);
+        ogs_error("No ModificationNotification");
         goto cleanup;
     }
 
-
     OpenAPI_list_for_each(ModificationNotification->notify_items, node) {
         OpenAPI_notify_item_t *item = node->data;
 
@@ -909,67 +908,65 @@
         res_name = NULL;
     }
 
-    if (amf_ue_is_rat_restricted(amf_ue)) {
-        /*
-         * - AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED
-         * 1. UDM_UECM_DeregistrationNotification
-         * 2. Deregistration request
-         * 3. UDM_SDM_Unsubscribe
-         * 4. UDM_UECM_Deregisration
-         * 5. PDU session release request
-         * 6. PDUSessionResourceReleaseCommand +
-         *    PDU session release command
-         * 7. PDUSessionResourceReleaseResponse
-         * 8. AM_Policy_Association_Termination
-         * 9.  Deregistration accept
-         * 10. Signalling Connecion Release
-         */
-        if (CM_CONNECTED(amf_ue)) {
-            r = nas_5gs_send_de_registration_request(
-                    amf_ue,
-                    OpenAPI_deregistration_reason_REREGISTRATION_REQUIRED,
-                    OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED);
-            ogs_expect(r == OGS_OK);
-            ogs_assert(r != OGS_ERROR);
-
-            state = AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED;
+    if (amf_ue) {
+        if (amf_ue_is_rat_restricted(amf_ue)) {
+            /*
+             * - AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED
+             * 1. UDM_UECM_DeregistrationNotification
+             * 2. Deregistration request
+             * 3. UDM_SDM_Unsubscribe
+             * 4. UDM_UECM_Deregisration
+             * 5. PDU session release request
+             * 6. PDUSessionResourceReleaseCommand +
+             *    PDU session release command
+             * 7. PDUSessionResourceReleaseResponse
+             * 8. AM_Policy_Association_Termination
+             * 9.  Deregistration accept
+             * 10. Signalling Connecion Release
+             */
+            if (CM_CONNECTED(amf_ue)) {
+                r = nas_5gs_send_de_registration_request(
+                        amf_ue,
+                        OpenAPI_deregistration_reason_REREGISTRATION_REQUIRED, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
+
+                state = AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED;
+
+            } else if (CM_IDLE(amf_ue)) {
+                ogs_error("Not implemented : Use Implicit De-registration");
+
+                state = AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED;
+
+            } else {
+                ogs_fatal("Invalid State");
+                ogs_assert_if_reached();
+            }
 
-        } else if (CM_IDLE(amf_ue)) {
-            ogs_error("Not implemented : Use Implicit De-registration");
+            if (UDM_SDM_SUBSCRIBED(amf_ue)) {
+                ogs_assert(true == amf_ue_sbi_discover_and_send(
+                        OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
+                        amf_nudm_sdm_build_subscription_delete,
+                        amf_ue, state, NULL));
+            } else if (PCF_AM_POLICY_ASSOCIATED(amf_ue)) {
+                ogs_assert(true ==
+                    amf_ue_sbi_discover_and_send(
+                        OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL,
+                        NULL,
+                        amf_npcf_am_policy_control_build_delete,
+                        amf_ue, state, NULL));
+            }
 
-            state = AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED;
+        } else if (ambr_changed) {
+            ogs_pkbuf_t *ngapbuf;
 
-        } else {
-            ogs_fatal("Invalid State");
-            ogs_assert_if_reached();
-        }
+            ngapbuf = ngap_build_ue_context_modification_request(amf_ue);
+            ogs_assert(ngapbuf);
 
-        if (UDM_SDM_SUBSCRIBED(amf_ue)) {
-            r = amf_ue_sbi_discover_and_send(
-                    OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
-                    amf_nudm_sdm_build_subscription_delete,
-                    amf_ue, state, NULL);
-            ogs_expect(r == OGS_OK);
-            ogs_assert(r != OGS_ERROR);
-        } else if (PCF_AM_POLICY_ASSOCIATED(amf_ue)) {
-            r = amf_ue_sbi_discover_and_send(
-                    OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL,
-                    NULL,
-                    amf_npcf_am_policy_control_build_delete,
-                    amf_ue, state, NULL);
+            r = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
             ogs_expect(r == OGS_OK);
             ogs_assert(r != OGS_ERROR);
         }
-
-    } else if (ambr_changed) {
-        ogs_pkbuf_t *ngapbuf;
-
-        ngapbuf = ngap_build_ue_context_modification_request(amf_ue);
-        ogs_assert(ngapbuf);
-
-        r = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
-        ogs_expect(r == OGS_OK);
-        ogs_assert(r != OGS_ERROR);
     }
 
 cleanup:

open5gs_2.6.0.37.2618e.tar.xz/src/amf/nas-path.c -> open5gs_2.6.0.38.82e9.tar.xz/src/amf/nas-path.c Changed

@@ -27,8 +27,7 @@
     int rv;
     ogs_assert(pkbuf);
 
-    amf_ue = amf_ue_cycle(amf_ue);
-    if (!amf_ue) {
+    if (!amf_ue_cycle(amf_ue)) {
         ogs_error("UE(amf-ue) context has already been removed");
         ogs_pkbuf_free(pkbuf);
         return OGS_NOTFOUND;
@@ -48,8 +47,7 @@
 
     ogs_assert(pkbuf);
 
-    amf_ue = amf_ue_cycle(amf_ue);
-    if (!amf_ue) {
+    if (!amf_ue_cycle(amf_ue)) {
         ogs_error("UE(amf-ue) context has already been removed");
         ogs_pkbuf_free(pkbuf);
         return OGS_NOTFOUND;
@@ -85,7 +83,11 @@
     ogs_pkbuf_t *ngapbuf = NULL;
     ogs_pkbuf_t *gmmbuf = NULL;
 
-    ogs_assert(amf_ue);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
     if (!ran_ue) {
         ogs_error("NG context has already been removed");
@@ -187,9 +189,12 @@
     int rv;
     ogs_pkbuf_t *gmmbuf = NULL;
 
-    amf_metrics_inst_by_cause_add(gmm_cause, AMF_METR_CTR_RM_REG_INITFAIL, 1);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
-    ogs_assert(amf_ue);
+    amf_metrics_inst_by_cause_add(gmm_cause, AMF_METR_CTR_RM_REG_INITFAIL, 1);
 
     ogs_warn("%s Registration reject %d", amf_ue->suci, gmm_cause);
 
@@ -214,7 +219,11 @@
     ogs_pkbuf_t *gmmbuf = NULL;
     ogs_pkbuf_t *ngapbuf = NULL;
 
-    ogs_assert(amf_ue);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
     if (!ran_ue) {
         ogs_error("NG context has already been removed");
@@ -288,7 +297,15 @@
     int rv;
     ogs_pkbuf_t *gmmbuf = NULL;
 
-    ogs_assert(amf_ue);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!ran_ue_cycle(amf_ue->ran_ue)) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Service reject", amf_ue->supi);
 
@@ -311,7 +328,11 @@
     ran_ue_t *ran_ue = NULL;
     ogs_pkbuf_t *gmmbuf = NULL;
 
-    ogs_assert(amf_ue);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
     if (!ran_ue) {
         ogs_error("NG context has already been removed");
@@ -354,7 +375,11 @@
     ran_ue_t *ran_ue = NULL;
     ogs_pkbuf_t *gmmbuf = NULL;
 
-    ogs_assert(amf_ue);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
     if (!ran_ue) {
         ogs_error("NG context has already been removed");
@@ -394,7 +419,15 @@
     int rv;
     ogs_pkbuf_t *gmmbuf = NULL;
 
-    ogs_assert(amf_ue);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!ran_ue_cycle(amf_ue->ran_ue)) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("Identity request");
 
@@ -428,7 +461,15 @@
     int rv;
     ogs_pkbuf_t *gmmbuf = NULL;
 
-    ogs_assert(amf_ue);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!ran_ue_cycle(amf_ue->ran_ue)) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Authentication request", amf_ue->suci);
 
@@ -462,9 +503,17 @@
     int rv;
     ogs_pkbuf_t *gmmbuf = NULL;
 
-    amf_metrics_inst_by_cause_add(0, AMF_METR_CTR_RM_REG_INITFAIL, 1);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!ran_ue_cycle(amf_ue->ran_ue)) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
-    ogs_assert(amf_ue);
+    amf_metrics_inst_by_cause_add(0, AMF_METR_CTR_RM_REG_INITFAIL, 1);
 
     ogs_warn("%s Authentication reject", amf_ue->suci);
 
@@ -485,7 +534,15 @@
     int rv;
     ogs_pkbuf_t *gmmbuf = NULL;
 
-    ogs_assert(amf_ue);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!ran_ue_cycle(amf_ue->ran_ue)) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Security mode command", amf_ue->supi);
 
@@ -520,7 +577,15 @@
     int rv;
     ogs_pkbuf_t *gmmbuf = NULL;
 
-    ogs_assert(amf_ue);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!ran_ue_cycle(amf_ue->ran_ue)) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_info("%s Configuration update command", amf_ue->supi);
 
@@ -767,10 +832,25 @@
         rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
         ogs_expect(rv == OGS_OK);
     } else {
-        ogs_error("ngap_build_pdu_session_resource_release_command() failed");
-        ogs_error("    ACTIVATED0x%x SUPI%s PSI%d",
-                ran_ue->psimask.activated, amf_ue->supi, sess->psi);
-        return OGS_ERROR;

open5gs_2.6.0.37.2618e.tar.xz/src/amf/ngap-path.c -> open5gs_2.6.0.38.82e9.tar.xz/src/amf/ngap-path.c Changed

@@ -52,8 +52,7 @@
 
     ogs_assert(pkbuf);
 
-    gnb = amf_gnb_cycle(gnb);
-    if (!gnb) {
+    if (!amf_gnb_cycle(gnb)) {
         ogs_error("gNB has already been removed");
         ogs_pkbuf_free(pkbuf);
         return OGS_NOTFOUND;
@@ -86,8 +85,7 @@
     int rv;
     ogs_assert(pkbuf);
 
-    ran_ue = ran_ue_cycle(ran_ue);
-    if (!ran_ue) {
+    if (!ran_ue_cycle(ran_ue)) {
         ogs_error("NG context has already been removed");
         ogs_pkbuf_free(pkbuf);
         return OGS_NOTFOUND;
@@ -260,6 +258,12 @@
     ogs_pkbuf_t *ngap_buffer;
 
     ogs_debug("NG-Setup response");
+
+    if (!amf_gnb_cycle(gnb)) {
+        ogs_error("gNB has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ngap_buffer = ngap_build_ng_setup_response();
     if (!ngap_buffer) {
         ogs_error("ngap_build_ng_setup_response() failed");
@@ -279,6 +283,12 @@
     ogs_pkbuf_t *ngap_buffer;
 
     ogs_debug("NG-Setup failure");
+
+    if (!amf_gnb_cycle(gnb)) {
+        ogs_error("gNB has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ngap_buffer = ngap_build_ng_setup_failure(
             group, cause, NGAP_TimeToWait_v10s);
     if (!ngap_buffer) {
@@ -298,6 +308,12 @@
     ogs_pkbuf_t *ngap_buffer;
 
     ogs_debug("RANConfigurationUpdateAcknowledge");
+
+    if (!amf_gnb_cycle(gnb)) {
+        ogs_error("gNB has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ngap_buffer = ngap_build_ran_configuration_update_ack();
     if (!ngap_buffer) {
         ogs_error("ngap_build_ran_configuration_update_ack() failed");
@@ -317,6 +333,12 @@
     ogs_pkbuf_t *ngap_buffer;
 
     ogs_debug("RANConfigurationUpdateFailure");
+
+    if (!amf_gnb_cycle(gnb)) {
+        ogs_error("gNB has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ngap_buffer = ngap_build_ran_configuration_update_failure(
             group, cause, NGAP_TimeToWait_v10s);
     if (!ngap_buffer) {
@@ -337,7 +359,10 @@
     int rv;
     ogs_pkbuf_t *ngapbuf = NULL;
 
-    ogs_assert(ran_ue);
+    if (!ran_ue_cycle(ran_ue)) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("UEContextReleaseCommand");
     ogs_debug("    RAN_UE_NGAP_ID%d AMF_UE_NGAP_ID%lld",
@@ -369,7 +394,11 @@
     uint8_t action, ogs_time_t duration)
 {
     int rv;
-    ogs_assert(amf_ue);
+
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     rv = ngap_send_ran_ue_context_release_command(
             amf_ue->ran_ue, group, cause, action, duration);
@@ -386,6 +415,13 @@
     int i, j;
     int rv;
 
+    ogs_debug("NG-Paging");
+
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ogs_assert(ogs_timer_running(
                 amf_ue->implicit_deregistration.timer) == false);
 
@@ -436,7 +472,10 @@
     int rv;
     ogs_pkbuf_t *ngapbuf = NULL;
 
-    ogs_assert(target_gnb);
+    if (!amf_gnb_cycle(target_gnb)) {
+        ogs_error("gNB has already been removed");
+        return OGS_NOTFOUND;
+    }
     ogs_assert(transfer);
 
     ngapbuf = ngap_build_downlink_ran_configuration_transfer(transfer);
@@ -459,8 +498,17 @@
     ogs_pkbuf_t *ngapbuf = NULL;
 
     ogs_assert(sess);
+
     amf_ue = sess->amf_ue;
-    ogs_assert(amf_ue);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!ran_ue_cycle(amf_ue->ran_ue)) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ngapbuf = ngap_build_path_switch_ack(amf_ue);
     if (!ngapbuf) {
@@ -481,12 +529,22 @@
     ran_ue_t *source_ue = NULL, *target_ue = NULL;
     ogs_pkbuf_t *ngapbuf = NULL;
 
-    ogs_assert(amf_ue);
-    source_ue = amf_ue->ran_ue;
-    ogs_assert(source_ue);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    source_ue = ran_ue_cycle(amf_ue->ran_ue);
+    if (!source_ue) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
-    target_ue = source_ue->target_ue;
-    ogs_assert(target_ue);
+    target_ue = ran_ue_cycle(source_ue->target_ue);
+    if (!target_ue) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ngapbuf = ngap_build_handover_request(target_ue);
     if (!ngapbuf) {
@@ -506,7 +564,11 @@
     int rv;
     ogs_pkbuf_t *ngapbuf = NULL;
 
-    ogs_assert(source_ue);
+    if (!ran_ue_cycle(source_ue)) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ogs_assert(cause);
 
     ngapbuf = ngap_build_handover_preparation_failure(source_ue, cause);
@@ -528,9 +590,16 @@
     ran_ue_t *source_ue = NULL;
     ogs_pkbuf_t *ngapbuf = NULL;
 
-    ogs_assert(amf_ue);
-    source_ue = amf_ue->ran_ue;
-    ogs_assert(source_ue);
+    if (!amf_ue_cycle(amf_ue)) {
+        ogs_error("UE(amf-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    source_ue = ran_ue_cycle(amf_ue->ran_ue);
+    if (!source_ue) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }

open5gs_2.6.0.37.2618e.tar.xz/src/mme/emm-sm.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/emm-sm.c Changed

@@ -224,7 +224,7 @@
 
 static void common_register_state(ogs_fsm_t *s, mme_event_t *e)
 {
-    int r, rv;
+    int r, rv, xact_count = 0;
 
     mme_ue_t *mme_ue = NULL;
     enb_ue_t *enb_ue = NULL;
@@ -248,6 +248,8 @@
 
         h.type = e->nas_type;
 
+        xact_count = mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR);
+
         if (message->emm.h.security_header_type
                 == OGS_NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE) {
             ogs_info("%s Service request", mme_ue->imsi_bcd);
@@ -325,12 +327,15 @@
                 break;
             }
 
-            if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
-                mme_gtp_send_delete_all_sessions(mme_ue,
-                        OGS_GTP_DELETE_SEND_AUTHENTICATION_REQUEST);
-            } else {
+            mme_gtp_send_delete_all_sessions(mme_ue,
+                    OGS_GTP_DELETE_SEND_AUTHENTICATION_REQUEST);
+
+            if (!MME_SESSION_RELEASE_PENDING(mme_ue) &&
+                mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR) ==
+                    xact_count) {
                 mme_s6a_send_air(mme_ue, NULL);
             }
+
             OGS_FSM_TRAN(s, &emm_state_authentication);
             break;
 
@@ -353,10 +358,12 @@
             }
 
             if (h.integrity_protected && SECURITY_CONTEXT_IS_VALID(mme_ue)) {
-                if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
-                    mme_gtp_send_delete_all_sessions(mme_ue,
-                        OGS_GTP_DELETE_HANDLE_PDN_CONNECTIVITY_REQUEST);
-                } else {
+                mme_gtp_send_delete_all_sessions(mme_ue,
+                    OGS_GTP_DELETE_HANDLE_PDN_CONNECTIVITY_REQUEST);
+
+                if (!MME_SESSION_RELEASE_PENDING(mme_ue) &&
+                    mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR) ==
+                        xact_count) {
                     rv = nas_eps_send_emm_to_esm(mme_ue,
                             &mme_ue->pdn_connectivity_request);
                     if (rv != OGS_OK) {
@@ -370,15 +377,21 @@
                         break;
                     }
                 }
+
                 OGS_FSM_TRAN(s, &emm_state_initial_context_setup);
+
             } else {
-                if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
-                    mme_gtp_send_delete_all_sessions(mme_ue,
-                        OGS_GTP_DELETE_SEND_AUTHENTICATION_REQUEST);
-                } else {
+                mme_gtp_send_delete_all_sessions(mme_ue,
+                    OGS_GTP_DELETE_SEND_AUTHENTICATION_REQUEST);
+
+                if (!MME_SESSION_RELEASE_PENDING(mme_ue) &&
+                    mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR) ==
+                        xact_count) {
                     mme_s6a_send_air(mme_ue, NULL);
                 }
+
                 OGS_FSM_TRAN(s, &emm_state_authentication);
+
             }
             break;
 
@@ -1174,7 +1187,7 @@
 
 void emm_state_initial_context_setup(ogs_fsm_t *s, mme_event_t *e)
 {
-    int r, rv;
+    int r, rv, xact_count;
     mme_ue_t *mme_ue = NULL;
     ogs_nas_eps_message_t *message = NULL;
     ogs_nas_security_header_type_t h;
@@ -1196,6 +1209,8 @@
         message = e->nas_message;
         ogs_assert(message);
 
+        xact_count = mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR);
+
         if (message->emm.h.security_header_type
                 == OGS_NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE) {
             ogs_debug("Service request");
@@ -1311,8 +1326,16 @@
 
             mme_gtp_send_delete_all_sessions(mme_ue,
                 OGS_GTP_DELETE_SEND_AUTHENTICATION_REQUEST);
+
+            if (!MME_SESSION_RELEASE_PENDING(mme_ue) &&
+                mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR) ==
+                    xact_count) {
+                mme_s6a_send_air(mme_ue, NULL);
+            }
+
             OGS_FSM_TRAN(s, &emm_state_authentication);
             break;
+
         case OGS_NAS_EPS_EMM_STATUS:
             ogs_warn("EMM STATUS : IMSI%s Cause%d",
                     mme_ue->imsi_bcd,
@@ -1412,7 +1435,7 @@
 
 void emm_state_exception(ogs_fsm_t *s, mme_event_t *e)
 {
-    int r, rv;
+    int r, rv, xact_count;
 
     mme_ue_t *mme_ue = NULL;
     enb_ue_t *enb_ue = NULL;
@@ -1442,6 +1465,8 @@
 
         h.type = e->nas_type;
 
+        xact_count = mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR);
+
         switch (message->emm.h.message_type) {
         case OGS_NAS_EPS_ATTACH_REQUEST:
             ogs_warn("%s Attach request", mme_ue->imsi_bcd);
@@ -1464,10 +1489,12 @@
             }
 
             if (h.integrity_protected && SECURITY_CONTEXT_IS_VALID(mme_ue)) {
-                if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
-                    mme_gtp_send_delete_all_sessions(mme_ue,
-                        OGS_GTP_DELETE_HANDLE_PDN_CONNECTIVITY_REQUEST);
-                } else {
+                mme_gtp_send_delete_all_sessions(mme_ue,
+                    OGS_GTP_DELETE_HANDLE_PDN_CONNECTIVITY_REQUEST);
+
+                if (!MME_SESSION_RELEASE_PENDING(mme_ue) &&
+                    mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR) ==
+                        xact_count) {
                     rv = nas_eps_send_emm_to_esm(mme_ue,
                             &mme_ue->pdn_connectivity_request);
                     if (rv != OGS_OK) {
@@ -1481,15 +1508,21 @@
                         break;
                     }
                 }
+
                 OGS_FSM_TRAN(s, &emm_state_initial_context_setup);
+
             } else {
-                if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
-                    mme_gtp_send_delete_all_sessions(mme_ue,
-                        OGS_GTP_DELETE_SEND_AUTHENTICATION_REQUEST);
-                } else {
+                mme_gtp_send_delete_all_sessions(mme_ue,
+                    OGS_GTP_DELETE_SEND_AUTHENTICATION_REQUEST);
+
+                if (!MME_SESSION_RELEASE_PENDING(mme_ue) &&
+                    mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR) ==
+                        xact_count) {
                     mme_s6a_send_air(mme_ue, NULL);
                 }
+
                 OGS_FSM_TRAN(s, &emm_state_authentication);
+
             }
             break;

open5gs_2.6.0.37.2618e.tar.xz/src/mme/esm-handler.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/esm-handler.c Changed

open5gs_2.6.0.37.2618e.tar.xz/src/mme/esm-sm.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/esm-sm.c Changed

open5gs_2.6.0.37.2618e.tar.xz/src/mme/mme-context.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/mme-context.c Changed

@@ -2460,19 +2460,6 @@
     return mme_ue;
 }
 
-void mme_ue_hash_remove(mme_ue_t *mme_ue)
-{
-    ogs_assert(mme_ue);
-
-    if (mme_ue->imsi_len != 0)
-        ogs_hash_set(mme_self()->imsi_ue_hash,
-                mme_ue->imsi, mme_ue->imsi_len, NULL);
-
-    if (mme_ue->current.m_tmsi)
-        ogs_hash_set(self.guti_ue_hash,
-                &mme_ue->current.guti, sizeof(ogs_nas_eps_guti_t), NULL);
-}
-
 void mme_ue_remove(mme_ue_t *mme_ue)
 {
     ogs_assert(mme_ue);
@@ -2484,8 +2471,15 @@
     ogs_assert(mme_ue->sgw_ue);
     sgw_ue_remove(mme_ue->sgw_ue);
 
-    if (mme_ue->current.m_tmsi)
+    if (mme_ue->imsi_len != 0)
+        ogs_hash_set(mme_self()->imsi_ue_hash,
+                mme_ue->imsi, mme_ue->imsi_len, NULL);
+
+    if (mme_ue->current.m_tmsi) {
+        ogs_hash_set(self.guti_ue_hash,
+                &mme_ue->current.guti, sizeof(ogs_nas_eps_guti_t), NULL);
         ogs_assert(mme_m_tmsi_free(mme_ue->current.m_tmsi) == OGS_OK);
+    }
 
     if (mme_ue->next.m_tmsi)
         ogs_assert(mme_m_tmsi_free(mme_ue->next.m_tmsi) == OGS_OK);
@@ -2534,7 +2528,6 @@
 
         if (enb_ue) enb_ue_remove(enb_ue);
 
-        mme_ue_hash_remove(mme_ue);
         mme_ue_remove(mme_ue);
     }
 }
@@ -2768,6 +2761,8 @@
 int mme_ue_set_imsi(mme_ue_t *mme_ue, char *imsi_bcd)
 {
     mme_ue_t *old_mme_ue = NULL;
+    mme_sess_t *old_sess = NULL;
+    mme_bearer_t *old_bearer = NULL;
     ogs_assert(mme_ue && imsi_bcd);
 
     ogs_cpystrn(mme_ue->imsi_bcd, imsi_bcd, OGS_MAX_IMSI_BCD_LEN+1);
@@ -2792,24 +2787,42 @@
 
     /*
      * We should delete the MME-Session Context in the MME-UE Context.
-     * Otherwise, all unnecessary SESSIONs remain in SMF/SGW-C/SGW-U/UPF.
+     * Otherwise, all unnecessary SESSIONs remain in SMF/UPF.
+     *
+     * In order to do this, MME-Session Context should be moved
+     * from OLD MME-UE Context to NEW MME-UE Context.
      *
-     * Hash deletion is separated from mme_ue_remove(). Otherwise,
-     * hash deletion occurs simultaneously in mme_ue_remove()
-     * after mme_gtp_send_delete_all_session(). This will delete the Hash
-     * we added immediately below, so we can't find this IMSI.
+     * If needed, The Session deletion process in NEW-MME UE context will work.
      *
-     * Note that we should not use the session movement method in AMF.
-     * This is because the MME-S11-TEID in the Delete Session Response
-     * uses the OLD MME.
+     * Note that we should not send Session-Release to the SGW-C at this point.
+     * Another GTPv2-C Transaction can cause fatal errors.
      */
-            mme_ue_hash_remove(old_mme_ue);
-
-            if (SESSION_CONTEXT_IS_AVAILABLE(old_mme_ue)) {
-                ogs_warn("%s Trigger OLD Session Remove", mme_ue->imsi_bcd);
-                mme_gtp_send_delete_all_sessions(old_mme_ue,
-                        OGS_GTP_DELETE_UE_CONTEXT_REMOVE_PARTIAL);
+            /* Phase-1 : Change MME-UE Context in Session Context */
+            ogs_list_for_each(&old_mme_ue->sess_list, old_sess) {
+                ogs_list_for_each(&old_sess->bearer_list, old_bearer) {
+                    old_bearer->mme_ue = mme_ue;
+
+                    if (old_bearer->ebi_node)
+                        ogs_pool_free(
+                                &old_mme_ue->ebi_pool, old_bearer->ebi_node);
+                    old_bearer->ebi_node = NULL;
+                }
+                old_sess->mme_ue = mme_ue;
             }
+
+            /* Phase-2 : Move Session Context from OLD to NEW MME-UE Context */
+            memcpy(&mme_ue->sess_list,
+                    &old_mme_ue->sess_list, sizeof(mme_ue->sess_list));
+
+            /* Phase-3 : Clear Session Context in OLD MME-UE Context */
+            memset(&old_mme_ue->sess_list, 0, sizeof(old_mme_ue->sess_list));
+
+            /* Phase-4 : Move sgw_ue->sgw_s11_teid */
+            ogs_assert(old_mme_ue->sgw_ue);
+            ogs_assert(mme_ue->sgw_ue);
+            mme_ue->sgw_ue->sgw_s11_teid = old_mme_ue->sgw_ue->sgw_s11_teid;
+
+            mme_ue_remove(old_mme_ue);
         }
     }
 
@@ -2860,20 +2873,76 @@
 bool mme_ue_have_active_eps_bearers(mme_ue_t *mme_ue)
 {
     mme_sess_t *sess = NULL;
+
+    ogs_assert(mme_ue);
+
+    ogs_list_for_each(&mme_ue->sess_list, sess) {
+        if (mme_sess_have_active_eps_bearers(sess) == true)
+            return true;
+    }
+
+    return false;
+}
+
+bool mme_sess_have_active_eps_bearers(mme_sess_t *sess)
+{
     mme_bearer_t *bearer = NULL;
+    ogs_assert(sess);
+
+    ogs_list_for_each(&sess->bearer_list, bearer) {
+        if (OGS_FSM_CHECK(&bearer->sm, esm_state_active))
+            return true;
+    }
+
+    return false;
+}
+
+bool mme_ue_have_session_release_pending(mme_ue_t *mme_ue)
+{
+    mme_sess_t *sess = NULL;
 
     ogs_assert(mme_ue);
 
     ogs_list_for_each(&mme_ue->sess_list, sess) {
-        ogs_list_for_each(&sess->bearer_list, bearer) {
-            if (OGS_FSM_CHECK(&bearer->sm, esm_state_active))
-                return true;
-        }
+        if (mme_sess_have_session_release_pending(sess) == true)
+            return true;
+    }
+
+    return false;
+}
+
+bool mme_sess_have_session_release_pending(mme_sess_t *sess)
+{
+    mme_bearer_t *bearer = NULL;
+    ogs_assert(sess);
+
+    ogs_list_for_each(&sess->bearer_list, bearer) {
+        if (OGS_FSM_CHECK(&bearer->sm, esm_state_pdn_will_disconnect))
+            return true;
     }
 
     return false;
 }
 
+int mme_ue_xact_count(mme_ue_t *mme_ue, uint8_t org)
+{
+    sgw_ue_t *sgw_ue = NULL;
+    ogs_gtp_node_t *gnode = NULL;
+
+    ogs_assert(org == OGS_GTP_LOCAL_ORIGINATOR ||
+                org == OGS_GTP_REMOTE_ORIGINATOR);
+
+    sgw_ue = mme_ue->sgw_ue;
+    if (!sgw_ue) return 0;
+
+    gnode = sgw_ue->gnode;
+    if (!gnode) return 0;
+
+    return org == OGS_GTP_LOCAL_ORIGINATOR ?
+            ogs_list_count(&gnode->local_list) :
+                ogs_list_count(&gnode->remote_list);
+}
+
 void enb_ue_associate_mme_ue(enb_ue_t *enb_ue, mme_ue_t *mme_ue)
 {
     ogs_assert(mme_ue);
@@ -3112,9 +3181,7 @@
     unsigned int count = 0;
     mme_sess_t *sess = NULL;
 
-    sess = mme_sess_first(mme_ue);
-    while (sess) {
-        sess = mme_sess_next(sess);
+    ogs_list_for_each(&mme_ue->sess_list, sess) {

open5gs_2.6.0.37.2618e.tar.xz/src/mme/mme-context.h -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/mme-context.h Changed

@@ -285,14 +285,6 @@
     /* UE identity */
     uint32_t        sgw_s11_teid;   /* SGW-S11-TEID is received from SGW */
 
-    /*
-     * If the MME sends Delete-Session-Request to the SGW for all sessions,
-     *    session_context_will_deleted = 1
-     * When the MME receives a Delete-Session-Response for the last session,
-     *    session_context_will_deleted = 0
-     */
-    int             session_context_will_deleted;
-
     /* S11 Holding timer for removing this context */
     ogs_timer_t     *t_s11_holding;
 
@@ -477,6 +469,7 @@
 #define MME_CLEAR_PAGING_INFO(__mME) \
     do { \
         ogs_assert(__mME); \
+        ogs_debug("%s Clear Paging Info", mme_ue->imsi_bcd); \
         (__mME)->paging.type = 0; \
     } while(0)
 
@@ -484,6 +477,7 @@
     do { \
         ogs_assert(__mME); \
         ogs_assert(__tYPE); \
+        ogs_debug("%s Store Paging Info", mme_ue->imsi_bcd); \
         (__mME)->paging.type = __tYPE; \
         (__mME)->paging.data = __dATA; \
     } while(0)
@@ -605,19 +599,16 @@
 #define SESSION_CONTEXT_IS_AVAILABLE(__mME) \
      ((__mME) && ((__mME)->sgw_ue) && (((__mME)->sgw_ue)->sgw_s11_teid))
 
-#define SESSION_CONTEXT_WILL_DELETED(__mME) \
-     ((__mME) && ((__mME)->sgw_ue) && \
-      (((__mME)->sgw_ue)->session_context_will_deleted))
-
 #define CLEAR_SESSION_CONTEXT(__mME) \
     do { \
         ogs_assert((__mME)); \
         ((__mME)->sgw_ue)->sgw_s11_teid = 0; \
-        ((__mME)->sgw_ue)->session_context_will_deleted = 0; \
     } while(0)
 
 #define ACTIVE_EPS_BEARERS_IS_AVAIABLE(__mME) \
     (mme_ue_have_active_eps_bearers(__mME))
+#define MME_SESSION_RELEASE_PENDING(__mME) \
+    (mme_ue_have_session_release_pending(__mME))
 typedef struct mme_sess_s {
     ogs_lnode_t     lnode;
 
@@ -808,7 +799,6 @@
 void mme_ue_confirm_guti(mme_ue_t *mme_ue);
 
 mme_ue_t *mme_ue_add(enb_ue_t *enb_ue);
-void mme_ue_hash_remove(mme_ue_t *mme_ue);
 void mme_ue_remove(mme_ue_t *mme_ue);
 void mme_ue_remove_all(void);
 mme_ue_t *mme_ue_cycle(mme_ue_t *mme_ue);
@@ -828,6 +818,11 @@
 void mme_ue_clear_indirect_tunnel(mme_ue_t *mme_ue);
 
 bool mme_ue_have_active_eps_bearers(mme_ue_t *mme_ue);
+bool mme_sess_have_active_eps_bearers(mme_sess_t *sess);
+bool mme_ue_have_session_release_pending(mme_ue_t *mme_ue);
+bool mme_sess_have_session_release_pending(mme_sess_t *sess);
+
+int mme_ue_xact_count(mme_ue_t *mme_ue, uint8_t org);
 
 /*
  * o RECV Initial UE-Message : S-TMSI

open5gs_2.6.0.37.2618e.tar.xz/src/mme/mme-gtp-path.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/mme-gtp-path.c Changed

@@ -332,33 +332,12 @@
     ogs_assert(sgw_ue);
     ogs_assert(action);
 
-    if (SESSION_CONTEXT_WILL_DELETED(mme_ue)) {
-        ogs_warn("%s Delete-Session-Request has already sent",
-                mme_ue->imsi_bcd);
-        return;
-    }
-
-    sgw_ue->session_context_will_deleted = 1;
-
-    sess = mme_sess_first(mme_ue);
-    while (sess != NULL) {
-        next_sess = mme_sess_next(sess);
-
+    ogs_list_for_each_safe(&mme_ue->sess_list, next_sess, sess) {
         if (MME_HAVE_SGW_S1U_PATH(sess)) {
-            mme_bearer_t *bearer = mme_default_bearer_in_sess(sess);
-            ogs_assert(bearer);
-
-            if (bearer &&
-                OGS_FSM_CHECK(&bearer->sm, esm_state_pdn_will_disconnect)) {
-                ogs_warn("PDN will disconnectEBI:%d", bearer->ebi);
-            } else {
-                mme_gtp_send_delete_session_request(sgw_ue, sess, action);
-            }
+            mme_gtp_send_delete_session_request(sgw_ue, sess, action);
         } else {
             mme_sess_remove(sess);
         }
-
-        sess = next_sess;
     }
 }

open5gs_2.6.0.37.2618e.tar.xz/src/mme/mme-path.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/mme-path.c Changed

@@ -27,16 +27,20 @@
 
 void mme_send_delete_session_or_detach(mme_ue_t *mme_ue)
 {
-    int r;
+    int r, xact_count;
     ogs_assert(mme_ue);
 
+    xact_count = mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR);
+
     switch (mme_ue->detach_type) {
     case MME_DETACH_TYPE_REQUEST_FROM_UE:
         ogs_debug("Detach Request from UE");
-        if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
-            mme_gtp_send_delete_all_sessions(
-                    mme_ue, OGS_GTP_DELETE_SEND_DETACH_ACCEPT);
-        } else {
+        mme_gtp_send_delete_all_sessions(
+                mme_ue, OGS_GTP_DELETE_SEND_DETACH_ACCEPT);
+
+        if (!MME_SESSION_RELEASE_PENDING(mme_ue) &&
+            mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR) ==
+                xact_count) {
             r = nas_eps_send_detach_accept(mme_ue);
             ogs_expect(r == OGS_OK);
             ogs_assert(r != OGS_ERROR);
@@ -57,9 +61,7 @@
      */
     case MME_DETACH_TYPE_HSS_EXPLICIT:
         ogs_debug("Explicit HSS Detach");
-        if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
-            mme_gtp_send_delete_all_sessions(mme_ue, OGS_GTP_DELETE_NO_ACTION);
-        }
+        mme_gtp_send_delete_all_sessions(mme_ue, OGS_GTP_DELETE_NO_ACTION);
         break;
 
     /* MME Implicit Detach, ie: Lost Communication
@@ -68,10 +70,12 @@
      */
     case MME_DETACH_TYPE_MME_IMPLICIT:
         ogs_debug("Implicit MME Detach");
-        if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
-            mme_gtp_send_delete_all_sessions(mme_ue,
-                OGS_GTP_DELETE_SEND_RELEASE_WITH_UE_CONTEXT_REMOVE);
-        } else {
+        mme_gtp_send_delete_all_sessions(mme_ue,
+            OGS_GTP_DELETE_SEND_RELEASE_WITH_UE_CONTEXT_REMOVE);
+
+        if (!MME_SESSION_RELEASE_PENDING(mme_ue) &&
+            mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR) ==
+                xact_count) {
             enb_ue_t *enb_ue = enb_ue_cycle(mme_ue->enb_ue);
             if (enb_ue) {
                 ogs_assert(OGS_OK ==
@@ -82,7 +86,6 @@
                 if (mme_ue->location_updated_but_not_canceled_yet == true) {
                     mme_s6a_send_pur(mme_ue);
                 } else {
-                    mme_ue_hash_remove(mme_ue);
                     mme_ue_remove(mme_ue);
                 }
             }
@@ -105,10 +108,8 @@
      */
     case MME_DETACH_TYPE_HSS_IMPLICIT:
         ogs_debug("Implicit HSS Detach");
-        if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
-            mme_gtp_send_delete_all_sessions(mme_ue,
-                OGS_GTP_DELETE_SEND_RELEASE_WITH_UE_CONTEXT_REMOVE);
-        }
+        mme_gtp_send_delete_all_sessions(mme_ue,
+            OGS_GTP_DELETE_SEND_RELEASE_WITH_UE_CONTEXT_REMOVE);
         break;
 
     default:
@@ -119,13 +120,18 @@
 
 void mme_send_delete_session_or_mme_ue_context_release(mme_ue_t *mme_ue)
 {
-    int r;
+    int r, xact_count = 0;
+
     ogs_assert(mme_ue);
 
-    if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
-        mme_gtp_send_delete_all_sessions(mme_ue,
-                OGS_GTP_DELETE_SEND_RELEASE_WITH_UE_CONTEXT_REMOVE);
-    } else {
+    xact_count = mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR);
+
+    mme_gtp_send_delete_all_sessions(mme_ue,
+            OGS_GTP_DELETE_SEND_RELEASE_WITH_UE_CONTEXT_REMOVE);
+
+    if (!MME_SESSION_RELEASE_PENDING(mme_ue) &&
+        mme_ue_xact_count(mme_ue, OGS_GTP_LOCAL_ORIGINATOR) ==
+            xact_count) {
         enb_ue_t *enb_ue = enb_ue_cycle(mme_ue->enb_ue);
         if (enb_ue) {
             r = s1ap_send_ue_context_release_command(enb_ue,

open5gs_2.6.0.37.2618e.tar.xz/src/mme/mme-s11-handler.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/mme-s11-handler.c Changed

@@ -111,8 +111,18 @@
     create_action = xact->create_action;
     sess = xact->data;
     ogs_assert(sess);
-    mme_ue = sess->mme_ue;
-    ogs_assert(mme_ue);
+    mme_ue = mme_ue_cycle(sess->mme_ue);
+
+    rv = ogs_gtp_xact_commit(xact);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_commit() failed");
+        return;
+    }
+
+    if (!mme_ue) {
+        ogs_error("MME-UE Context has already been removed");
+        return;
+    }
     source_ue = sgw_ue_cycle(mme_ue->sgw_ue);
     ogs_assert(source_ue);
 
@@ -124,12 +134,6 @@
         ogs_assert(target_ue);
     }
 
-    rv = ogs_gtp_xact_commit(xact);
-    if (rv != OGS_OK) {
-        ogs_error("ogs_gtp_xact_commit() failed");
-        return;
-    }
-
     /************************
      * Getting Cause Value
      ************************/
@@ -458,10 +462,7 @@
      ********************/
     ogs_assert(xact);
     modify_action = xact->modify_action;
-    mme_ue = xact->data;
-    ogs_assert(mme_ue);
-    sgw_ue = sgw_ue_cycle(mme_ue->sgw_ue);
-    ogs_assert(sgw_ue);
+    mme_ue = mme_ue_cycle(xact->data);
 
     rv = ogs_gtp_xact_commit(xact);
     if (rv != OGS_OK) {
@@ -469,6 +470,13 @@
         return;
     }
 
+    if (!mme_ue) {
+        ogs_error("MME-UE Context has already been removed");
+        return;
+    }
+    sgw_ue = sgw_ue_cycle(mme_ue->sgw_ue);
+    ogs_assert(sgw_ue);
+
     /************************
      * Getting Cause Value
      ************************/
@@ -568,8 +576,18 @@
     ogs_assert(action);
     sess = xact->data;
     ogs_assert(sess);
-    mme_ue = sess->mme_ue;
-    ogs_assert(mme_ue);
+    mme_ue = mme_ue_cycle(sess->mme_ue);
+
+    rv = ogs_gtp_xact_commit(xact);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_commit() failed");
+        return;
+    }
+
+    if (!mme_ue) {
+        ogs_error("MME-UE Context has already been removed");
+        return;
+    }
     target_ue = sgw_ue_cycle(mme_ue->sgw_ue);
     ogs_assert(target_ue);
 
@@ -581,17 +599,24 @@
         ogs_assert(source_ue);
     }
 
-    rv = ogs_gtp_xact_commit(xact);
-    if (rv != OGS_OK) {
-        ogs_error("ogs_gtp_xact_commit() failed");
-        return;
-    }
-
     /************************
      * Check MME-UE Context
      ************************/
     if (!mme_ue_from_teid) {
-        ogs_error("No Context in TEID");
+        /*
+         * In mme_ue_set_imsi(),
+         * OLD MME-UE Context could be switched to NEW MME-UE Context
+         *
+         * OLD/NEW MME-UE Contexts have different MME-S11-TEID.
+         * Since MME has NEW MME-S11-TEID and SGW-C has OLD MME-S11-TEID.
+         *
+         * At this time, if the MME receives OLD MME-S11-TEID from SGW-C
+         * in the Delete Session Response, MME cannot find MME-UE Context.
+         *
+         * Since there is such a case,
+         * Delete Session Response treats this as a WARNING.
+         */
+        ogs_warn("No Context in TEID");
     }
 
     /********************
@@ -645,12 +670,7 @@
         ogs_expect(r == OGS_OK);
         ogs_assert(r != OGS_ERROR);
 
-        /*
-         * mme_sess_remove() should not be called here.
-         *
-         * if Deactivate bearer context accept is received,
-         * Session will be removed */
-        CLEAR_SGW_S1U_PATH(sess);
+        /* mme_sess_remove() should not be called here. */
         return;
 
     } else if (action == OGS_GTP_DELETE_SEND_RELEASE_WITH_UE_CONTEXT_REMOVE) {
@@ -659,7 +679,6 @@
                 if (mme_ue->location_updated_but_not_canceled_yet == true) {
                     mme_s6a_send_pur(mme_ue);
                 } else {
-                    mme_ue_hash_remove(mme_ue);
                     mme_ue_remove(mme_ue);
                 }
             } else {
@@ -702,12 +721,6 @@
             }
         }
 
-    } else if (action == OGS_GTP_DELETE_UE_CONTEXT_REMOVE_PARTIAL) {
-
-        /* Remove MME-UE Context with Session Context since IMSI duplicated */
-        mme_ue_remove(mme_ue);
-        return;
-
     } else if (action == OGS_GTP_DELETE_IN_PATH_SWITCH_REQUEST) {
 
         /* Don't have to remove Session in X2 Handover with SGW relocation */
@@ -918,6 +931,7 @@
                 ogs_assert(OGS_OK ==
                     mme_gtp_send_create_bearer_response(
                         bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
+                MME_CLEAR_PAGING_INFO(mme_ue);
             } else {
                 MME_STORE_PAGING_INFO(mme_ue,
                     MME_PAGING_TYPE_CREATE_BEARER, bearer);
@@ -926,11 +940,13 @@
                 ogs_assert(r != OGS_ERROR);
             }
         } else {
+            MME_CLEAR_PAGING_INFO(mme_ue);
             r = nas_eps_send_activate_dedicated_bearer_context_request(bearer);
             ogs_expect(r == OGS_OK);
             ogs_assert(r != OGS_ERROR);
         }
     } else {
+        MME_CLEAR_PAGING_INFO(mme_ue);
         /*
          * After received Activate EPS default bearer context accept
          * Invoke nas_eps_send_activate_all_dedicated_bearers()
@@ -1066,6 +1082,7 @@
                 ogs_assert(OGS_OK ==
                     mme_gtp_send_update_bearer_response(
                         bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
+                MME_CLEAR_PAGING_INFO(mme_ue);
             } else {
                 MME_STORE_PAGING_INFO(mme_ue,
                     MME_PAGING_TYPE_UPDATE_BEARER, bearer);
@@ -1074,6 +1091,7 @@
                 ogs_assert(r != OGS_ERROR);
             }
         } else {
+            MME_CLEAR_PAGING_INFO(mme_ue);
             r = nas_eps_send_modify_bearer_context_request(bearer,
                     req->bearer_contexts.bearer_level_qos.presence,
                     req->bearer_contexts.tft.presence);
@@ -1081,6 +1099,7 @@
             ogs_assert(r != OGS_ERROR);
         }
     } else {
+        MME_CLEAR_PAGING_INFO(mme_ue);
         ogs_error("IGNORE Update Bearer Request : "
                 "Both QoS and TFT is NULL");
 
@@ -1221,6 +1240,7 @@
             ogs_assert(OGS_OK ==
                 mme_gtp_send_delete_bearer_response(
                     bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
+            MME_CLEAR_PAGING_INFO(mme_ue);
         } else {

open5gs_2.6.0.37.2618e.tar.xz/src/mme/mme-s6a-handler.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/mme-s6a-handler.c Changed

@@ -143,7 +143,6 @@
     if (s6a_message->result_code != ER_DIAMETER_SUCCESS) {
         ogs_error("Purge UE failed for IMSI%s %d", mme_ue->imsi_bcd,
             s6a_message->result_code);
-        mme_ue_hash_remove(mme_ue);
         mme_ue_remove(mme_ue);
         return OGS_ERROR;
     }
@@ -151,7 +150,6 @@
     if (pua_message->pua_flags & OGS_DIAM_S6A_PUA_FLAGS_FREEZE_MTMSI)
         ogs_debug("Freeze M-TMSI requested but not implemented.");
 
-    mme_ue_hash_remove(mme_ue);
     mme_ue_remove(mme_ue);
 
     return OGS_OK;
@@ -226,7 +224,6 @@
      */
     if (OGS_FSM_CHECK(&mme_ue->sm, emm_state_de_registered)) {
         ogs_warn("UE has already been de-registered");
-        mme_ue_hash_remove(mme_ue);
         mme_ue_remove(mme_ue);
         return;
     }
@@ -279,6 +276,7 @@
                 } else {
                     mme_send_delete_session_or_detach(mme_ue);
                 }
+                MME_CLEAR_PAGING_INFO(mme_ue);
             } else {
                 MME_STORE_PAGING_INFO(mme_ue,
                     MME_PAGING_TYPE_DETACH_TO_UE, NULL);
@@ -287,6 +285,7 @@
                 ogs_assert(r != OGS_ERROR);
             }
         } else {
+            MME_CLEAR_PAGING_INFO(mme_ue);
             r = nas_eps_send_detach_request(mme_ue);
             ogs_expect(r == OGS_OK);
             ogs_assert(r != OGS_ERROR);

open5gs_2.6.0.37.2618e.tar.xz/src/mme/nas-path.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/nas-path.c Changed

@@ -32,8 +32,7 @@
 
     ogs_assert(pkbuf);
 
-    mme_ue = mme_ue_cycle(mme_ue);
-    if (!mme_ue) {
+    if (!mme_ue_cycle(mme_ue)) {
         ogs_error("UE(mme-ue) context has already been removed");
         ogs_pkbuf_free(pkbuf);
         return OGS_NOTFOUND;
@@ -51,7 +50,11 @@
     int rv;
     ogs_pkbuf_t *esmbuf = NULL;
 
-    ogs_assert(mme_ue);
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ogs_assert(esm_message_container);
     ogs_assert(esm_message_container->length);
 
@@ -74,25 +77,22 @@
 {
     int rv;
     ogs_pkbuf_t *s1apbuf = NULL;
-    enb_ue_t *enb_ue = NULL;
 
     ogs_assert(pkbuf);
 
-    mme_ue = mme_ue_cycle(mme_ue);
-    if (!mme_ue) {
+    if (!mme_ue_cycle(mme_ue)) {
         ogs_error("UE(mme-ue) context has already been removed");
         ogs_pkbuf_free(pkbuf);
         return OGS_NOTFOUND;
     }
 
-    enb_ue = enb_ue_cycle(mme_ue->enb_ue);
-    if (!enb_ue) {
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
         ogs_error("S1 context has already been removed");
         ogs_pkbuf_free(pkbuf);
         return OGS_NOTFOUND;
     }
 
-    s1apbuf = s1ap_build_downlink_nas_transport(enb_ue, pkbuf);
+    s1apbuf = s1ap_build_downlink_nas_transport(mme_ue->enb_ue, pkbuf);
     if (!s1apbuf) {
         ogs_error("s1ap_build_downlink_nas_transport() failed");
         return OGS_ERROR;
@@ -112,7 +112,16 @@
     ogs_pkbuf_t *s1apbuf = NULL;
     ogs_pkbuf_t *esmbuf = NULL, *emmbuf = NULL;
 
-    ogs_assert(mme_ue);
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     sess = mme_sess_first(mme_ue);
     ogs_assert(sess);
     ogs_assert(mme_sess_next(sess) == NULL);
@@ -178,12 +187,16 @@
     mme_sess_t *sess = NULL;
     ogs_pkbuf_t *esmbuf = NULL, *emmbuf = NULL;
 
-    mme_ue = mme_ue_cycle(mme_ue);
-    if (!mme_ue) {
+    if (!mme_ue_cycle(mme_ue)) {
         ogs_error("UE(mme-ue) context has already been removed");
         return OGS_NOTFOUND;
     }
 
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ogs_debug("%s Attach reject", mme_ue->imsi_bcd);
     ogs_debug("    Cause%d", emm_cause);
 
@@ -213,7 +226,15 @@
     int rv;
     ogs_pkbuf_t *emmbuf = NULL;
 
-    ogs_assert(mme_ue);
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("Identity request");
 
@@ -247,7 +268,15 @@
     int rv;
     ogs_pkbuf_t *emmbuf = NULL;
 
-    ogs_assert(mme_ue);
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Authentication request", mme_ue->imsi_bcd);
 
@@ -281,7 +310,15 @@
     int rv;
     ogs_pkbuf_t *emmbuf = NULL;
 
-    ogs_assert(mme_ue);
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Security mode command", mme_ue->imsi_bcd);
 
@@ -315,7 +352,15 @@
     int rv;
     ogs_pkbuf_t *emmbuf = NULL;
 
-    ogs_assert(mme_ue);
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Authentication reject", mme_ue->imsi_bcd);
 
@@ -336,6 +381,16 @@
     int rv;
     ogs_pkbuf_t *emmbuf = NULL;
 
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ogs_debug("%s Detach request to UE", mme_ue->imsi_bcd);
 
     if (mme_ue->t3422.pkbuf) {
@@ -367,12 +422,14 @@
 {
     int rv;
  
-    enb_ue_t *enb_ue = NULL;
     ogs_pkbuf_t *emmbuf = NULL;
 
-    ogs_assert(mme_ue);
-    enb_ue = enb_ue_cycle(mme_ue->enb_ue);
-    if (!enb_ue) {
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
         ogs_error("S1 context has already been removed");
         return OGS_NOTFOUND;
     }
@@ -394,7 +451,7 @@
         }
     }
 
-    rv = s1ap_send_ue_context_release_command(enb_ue,
+    rv = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
             S1AP_Cause_PR_nas, S1AP_CauseNas_detach,

open5gs_2.6.0.37.2618e.tar.xz/src/mme/s1ap-build.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/s1ap-build.c Changed

@@ -201,6 +201,7 @@
     S1AP_NAS_PDU_t *NAS_PDU = NULL;
 
     ogs_assert(emmbuf);
+    enb_ue = enb_ue_cycle(enb_ue);
     ogs_assert(enb_ue);
 
     ogs_debug("DownlinkNASTransport");
@@ -283,16 +284,10 @@
     mme_sess_t *sess = NULL;
     mme_bearer_t *bearer = NULL;
 
+    mme_ue = mme_ue_cycle(mme_ue);
     ogs_assert(mme_ue);
     enb_ue = enb_ue_cycle(mme_ue->enb_ue);
-    if (!enb_ue) {
-        ogs_error("S1 context has already been removed");
-        if (emmbuf && emmbuf->len) {
-            ogs_error("NAS message is forcibly removed");
-            ogs_pkbuf_free(emmbuf);
-        }
-        return NULL;
-    }
+    ogs_assert(enb_ue);
 
     ogs_debug("InitialContextSetupRequest");
 
@@ -706,6 +701,7 @@
 
     enb_ue_t *enb_ue = NULL;
 
+    mme_ue = mme_ue_cycle(mme_ue);
     ogs_assert(mme_ue);
     enb_ue = enb_ue_cycle(mme_ue->enb_ue);
     ogs_assert(enb_ue);
@@ -841,6 +837,7 @@
     S1AP_UE_S1AP_IDs_t *UE_S1AP_IDs = NULL;
     S1AP_Cause_t *Cause = NULL;
 
+    enb_ue = enb_ue_cycle(enb_ue);
     ogs_assert(enb_ue);
 
     if (enb_ue->mme_ue_s1ap_id == 0) {
@@ -926,7 +923,7 @@
     ogs_assert(esmbuf);
     ogs_assert(bearer);
 
-    mme_ue = bearer->mme_ue;
+    mme_ue = mme_ue_cycle(bearer->mme_ue);
     ogs_assert(mme_ue);
     enb_ue = enb_ue_cycle(mme_ue->enb_ue);
     ogs_assert(enb_ue);
@@ -1059,7 +1056,7 @@
     ogs_assert(esmbuf);
     ogs_assert(bearer);
 
-    mme_ue = bearer->mme_ue;
+    mme_ue = mme_ue_cycle(bearer->mme_ue);
     ogs_assert(mme_ue);
     enb_ue = enb_ue_cycle(mme_ue->enb_ue);
     ogs_assert(enb_ue);
@@ -1187,7 +1184,7 @@
     ogs_assert(esmbuf);
     ogs_assert(bearer);
 
-    mme_ue = bearer->mme_ue;
+    mme_ue = mme_ue_cycle(bearer->mme_ue);
     ogs_assert(mme_ue);
     enb_ue = enb_ue_cycle(mme_ue->enb_ue);
     ogs_assert(enb_ue);
@@ -1308,6 +1305,7 @@
     mme_sess_t *sess = NULL;
     mme_bearer_t *bearer = NULL;
 
+    mme_ue = mme_ue_cycle(mme_ue);
     ogs_assert(mme_ue);
     enb_ue = enb_ue_cycle(mme_ue->enb_ue);
     ogs_assert(enb_ue);
@@ -1409,6 +1407,7 @@
     uint64_t ue_imsi_value = 0;
     int i = 0;
 
+    mme_ue = mme_ue_cycle(mme_ue);
     ogs_assert(mme_ue);
 
     ogs_debug("Paging");
@@ -1577,6 +1576,7 @@
     mme_bearer_t *bearer = NULL;
     enb_ue_t *enb_ue = NULL;
 
+    mme_ue = mme_ue_cycle(mme_ue);
     ogs_assert(mme_ue);
     enb_ue = enb_ue_cycle(mme_ue->enb_ue);
     ogs_assert(enb_ue);
@@ -1773,8 +1773,10 @@
     mme_sess_t *sess = NULL;
     mme_bearer_t *bearer = NULL;
 
+    source_ue = enb_ue_cycle(source_ue);
     ogs_assert(source_ue);
-    mme_ue = source_ue->mme_ue;
+    mme_ue = mme_ue_cycle(source_ue->mme_ue);
+    ogs_assert(mme_ue);
 
     ogs_debug("HandoverCommand");
 
@@ -1930,6 +1932,7 @@
     S1AP_ENB_UE_S1AP_ID_t *ENB_UE_S1AP_ID = NULL;
     S1AP_Cause_t *Cause = NULL;
 
+    source_ue = enb_ue_cycle(source_ue);
     ogs_assert(source_ue);
     ogs_assert(group);
 
@@ -2022,8 +2025,9 @@
     ogs_assert(cause);
     ogs_assert(source_totarget_transparentContainer);
 
+    target_ue = enb_ue_cycle(target_ue);
     ogs_assert(target_ue);
-    mme_ue = target_ue->mme_ue;
+    mme_ue = mme_ue_cycle(target_ue->mme_ue);
     ogs_assert(mme_ue);
 
     ogs_debug("HandoverRequest");
@@ -2256,6 +2260,7 @@
     S1AP_MME_UE_S1AP_ID_t *MME_UE_S1AP_ID = NULL;
     S1AP_ENB_UE_S1AP_ID_t *ENB_UE_S1AP_ID = NULL;
 
+    source_ue = enb_ue_cycle(source_ue);
     ogs_assert(source_ue);
 
     ogs_debug("HandoverCancelAcknowledge");
@@ -2319,6 +2324,7 @@
     S1AP_ENB_StatusTransfer_TransparentContainer_t
         *ENB_StatusTransfer_TransparentContainer = NULL;
 
+    target_ue = enb_ue_cycle(target_ue);
     ogs_assert(target_ue);
     ogs_assert(enb_statustransfer_transparentContainer);

open5gs_2.6.0.37.2618e.tar.xz/src/mme/s1ap-handler.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/s1ap-handler.c Changed

open5gs_2.6.0.37.2618e.tar.xz/src/mme/s1ap-path.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/s1ap-path.c Changed

@@ -53,8 +53,7 @@
 
     ogs_assert(pkbuf);
 
-    enb = mme_enb_cycle(enb);
-    if (!enb) {
+    if (!mme_enb_cycle(enb)) {
         ogs_error("eNB has already been removed");
         ogs_pkbuf_free(pkbuf);
         return OGS_NOTFOUND;
@@ -87,8 +86,7 @@
     int rv;
     ogs_assert(pkbuf);
 
-    enb_ue = enb_ue_cycle(enb_ue);
-    if (!enb_ue) {
+    if (!enb_ue_cycle(enb_ue)) {
         ogs_error("S1 context has already been removed");
         ogs_pkbuf_free(pkbuf);
         return OGS_NOTFOUND;
@@ -268,6 +266,12 @@
     ogs_pkbuf_t *s1ap_buffer;
 
     ogs_debug("S1-Setup response");
+
+    if (!mme_enb_cycle(enb)) {
+        ogs_error("eNB has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     s1ap_buffer = s1ap_build_setup_rsp();
     if (!s1ap_buffer) {
         ogs_error("s1ap_build_setup_rsp() failed");
@@ -287,6 +291,12 @@
     ogs_pkbuf_t *s1ap_buffer;
 
     ogs_debug("S1-Setup failure");
+
+    if (!mme_enb_cycle(enb)) {
+        ogs_error("eNB has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     s1ap_buffer = s1ap_build_setup_failure(group, cause, S1AP_TimeToWait_v10s);
     if (!s1ap_buffer) {
         ogs_error("s1ap_build_setup_failure() failed");
@@ -304,9 +314,18 @@
     int rv;
     ogs_pkbuf_t *s1apbuf = NULL;
 
-    ogs_assert(mme_ue);
-
     ogs_debug("InitialContextSetupRequest");
+
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     s1apbuf = s1ap_build_initial_context_setup_request(mme_ue, NULL);
     if (!s1apbuf) {
         ogs_error("s1ap_build_initial_context_setup_request() failed");
@@ -324,9 +343,18 @@
     int rv;
     ogs_pkbuf_t *s1apbuf = NULL;
 
-    ogs_assert(mme_ue);
-
     ogs_debug("UEContextModificationRequest");
+
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     s1apbuf = s1ap_build_ue_context_modification_request(mme_ue);
     if (!s1apbuf) {
         ogs_error("s1ap_build_ue_context_modification_request() failed");
@@ -346,9 +374,13 @@
     int rv;
     ogs_pkbuf_t *s1apbuf = NULL;
 
-    ogs_assert(enb_ue);
-
     ogs_debug("UEContextReleaseCommand");
+
+    if (!enb_ue_cycle(enb_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ogs_debug("    ENB_UE_S1AP_ID%d MME_UE_S1AP_ID%d",
             enb_ue->enb_ue_s1ap_id, enb_ue->mme_ue_s1ap_id);
 
@@ -380,6 +412,13 @@
     int i;
     int rv;
 
+    ogs_debug("S1-Paging");
+
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ogs_assert(ogs_timer_running(mme_ue->t_implicit_detach.timer) == false);
 
     /* Find enB with matched TAI */
@@ -429,10 +468,15 @@
     int rv;
     ogs_pkbuf_t *s1apbuf = NULL;
 
-    ogs_assert(target_enb);
+    ogs_debug("MMEConfigurationTransfer");
+
+    if (!mme_enb_cycle(target_enb)) {
+        ogs_error("eNB has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     ogs_assert(SONConfigurationTransfer);
 
-    ogs_debug("MMEConfigurationTransfer");
     s1apbuf = s1ap_build_mme_configuration_transfer(SONConfigurationTransfer);
     if (!s1apbuf) {
         ogs_error("s1ap_build_mme_configuration_transfer() failed");
@@ -450,9 +494,18 @@
     int rv;
     ogs_pkbuf_t *s1apbuf = NULL;
 
-    ogs_assert(mme_ue);
-
     ogs_debug("E-RABModificationConfirm");
+
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     s1apbuf = s1ap_build_e_rab_modification_confirm(mme_ue);
     if (!s1apbuf) {
         ogs_error("s1ap_build_e_rab_modification_confirm() failed");
@@ -471,9 +524,18 @@
     int rv;
     ogs_pkbuf_t *s1apbuf = NULL;
 
-    ogs_assert(mme_ue);
-
     ogs_debug("PathSwitchAcknowledge");
+
+    if (!mme_ue_cycle(mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!enb_ue_cycle(mme_ue->enb_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     s1apbuf = s1ap_build_path_switch_ack(
                 mme_ue, e_rab_to_switched_in_uplink_list);
     if (!s1apbuf) {
@@ -492,9 +554,18 @@
     int rv;
     ogs_pkbuf_t *s1apbuf = NULL;
 
-    ogs_assert(source_ue);
-
     ogs_debug("HandoverCommand");
+
+    if (!enb_ue_cycle(source_ue)) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    if (!mme_ue_cycle(source_ue->mme_ue)) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
+
     s1apbuf = s1ap_build_handover_command(source_ue);
     if (!s1apbuf) {
         ogs_error("s1ap_build_handover_command() failed");
@@ -513,10 +584,15 @@

open5gs_2.6.0.37.2618e.tar.xz/src/mme/sgsap-handler.c -> open5gs_2.6.0.38.82e9.tar.xz/src/mme/sgsap-handler.c Changed

@@ -402,6 +402,7 @@
                     ogs_assert(OGS_OK ==
                         sgsap_send_paging_reject(
                             mme_ue, SGSAP_SGS_CAUSE_UE_UNREACHABLE));
+                    MME_CLEAR_PAGING_INFO(mme_ue);
                 } else {
                     /* UE will respond Extended Service Request in PS CNDomain*/
                     MME_STORE_PAGING_INFO(mme_ue,
@@ -426,6 +427,7 @@
                     ogs_assert(OGS_OK ==
                         sgsap_send_paging_reject(
                             mme_ue, SGSAP_SGS_CAUSE_UE_UNREACHABLE));
+                    MME_CLEAR_PAGING_INFO(mme_ue);
                 } else {
                     /* UE will respond Service Request in PS CNDomain*/
                     MME_STORE_PAGING_INFO(mme_ue,
@@ -438,6 +440,7 @@
                 goto paging_reject;
 
         } else {
+            MME_CLEAR_PAGING_INFO(mme_ue);
             if (CS_CALL_SERVICE_INDICATOR(mme_ue)) {
                 r = nas_eps_send_cs_service_notification(mme_ue);
                 ogs_expect(r == OGS_OK);

open5gs_2.6.0.37.2618e.tar.xz/src/sgwu/gtp-path.c -> open5gs_2.6.0.38.82e9.tar.xz/src/sgwu/gtp-path.c Changed

open5gs_2.6.0.37.2618e.tar.xz/src/smf/pfcp-path.c -> open5gs_2.6.0.38.82e9.tar.xz/src/smf/pfcp-path.c Changed

open5gs_2.6.0.37.2618e.tar.xz/src/upf/gtp-path.c -> open5gs_2.6.0.38.82e9.tar.xz/src/upf/gtp-path.c Changed

open5gs_2.6.0.37.2618e.tar.xz/src/upf/rule-match.c -> open5gs_2.6.0.38.82e9.tar.xz/src/upf/rule-match.c Changed

Changes of Revision 162