Osmocom Open Build Service

commit_5f9b941d2543d7364c1d7bbf44af0f4dc7668017.txt Deleted

commit_79f73fae2a68495f4e74318fb162b05cd79e5e0c.txt Added

open5gs_2.6.0.8.5f9b.dsc -> open5gs_2.6.0.10.79f73.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.8.5f9b
+Version: 2.6.0.10.79f73
 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:
- 5ba4456271794f84f5257896fa691ee797de8e14 13617004 open5gs_2.6.0.8.5f9b.tar.xz
+ bc76658e1d5552a84768f9433ea2bc77d9d99af4 13616644 open5gs_2.6.0.10.79f73.tar.xz
 Checksums-Sha256:
- 5e516b4b381656180cae13990fe21bc7376f393a2acd7f60bd46fc1d2e49ab63 13617004 open5gs_2.6.0.8.5f9b.tar.xz
+ c5bf40462ac800bb800c9281cd0b983a21095e763f9cd648d1e08f175ba68515 13616644 open5gs_2.6.0.10.79f73.tar.xz
 Files:
- 0babab4709531841a2196ee1d5919eff 13617004 open5gs_2.6.0.8.5f9b.tar.xz
+ 28cf2f0b72182d36cc7a7f51f9e702bd 13616644 open5gs_2.6.0.10.79f73.tar.xz

open5gs_2.6.0.8.5f9b.tar.xz/.tarball-version -> open5gs_2.6.0.10.79f73.tar.xz/.tarball-version Changed

open5gs_2.6.0.8.5f9b.tar.xz/debian/changelog -> open5gs_2.6.0.10.79f73.tar.xz/debian/changelog Changed

open5gs_2.6.0.8.5f9b.tar.xz/src/amf/context.h -> open5gs_2.6.0.10.79f73.tar.xz/src/amf/context.h Changed

open5gs_2.6.0.8.5f9b.tar.xz/src/amf/gmm-handler.c -> open5gs_2.6.0.10.79f73.tar.xz/src/amf/gmm-handler.c Changed

@@ -646,7 +646,7 @@
 int gmm_handle_deregistration_request(amf_ue_t *amf_ue,
         ogs_nas_5gs_deregistration_request_from_ue_t *deregistration_request)
 {
-    int r;
+    int r, state, xact_count = 0;
     ogs_nas_de_registration_type_t *de_registration_type = NULL;
 
     ogs_assert(amf_ue);
@@ -690,13 +690,30 @@
 
     ogs_info("%s    SUCI", amf_ue->suci);
 
-    amf_sbi_send_release_all_sessions(
-            amf_ue, AMF_RELEASE_SM_CONTEXT_NO_STATE);
+    xact_count = amf_sess_xact_count(amf_ue);
 
-    if (ogs_list_count(&amf_ue->sess_list) == 0) {
-        r = nas_5gs_send_de_registration_accept(amf_ue);
-        ogs_expect(r == OGS_OK);
-        ogs_assert(r != OGS_ERROR);
+    state = AMF_UE_INITIATED_DE_REGISTERED;
+    amf_sbi_send_release_all_sessions(amf_ue, state);
+
+    if (!AMF_SESSION_RELEASE_PENDING(amf_ue) &&
+        amf_sess_xact_count(amf_ue) == xact_count) {
+        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));
+        } else {
+            r = nas_5gs_send_de_registration_accept(amf_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
+        }
     }
 
     return OGS_OK;

open5gs_2.6.0.8.5f9b.tar.xz/src/amf/gmm-sm.c -> open5gs_2.6.0.10.79f73.tar.xz/src/amf/gmm-sm.c Changed

@@ -183,6 +183,75 @@
             END
             break;
 
+        CASE(OGS_SBI_SERVICE_NAME_NUDM_SDM)
+            if ((sbi_message->res_status != OGS_SBI_HTTP_STATUS_OK) &&
+                (sbi_message->res_status != OGS_SBI_HTTP_STATUS_CREATED) &&
+                (sbi_message->res_status != OGS_SBI_HTTP_STATUS_NO_CONTENT)) {
+                ogs_error("%s HTTP response error %d",
+                          amf_ue->supi, sbi_message->res_status);
+                break;
+            }
+
+            SWITCH(sbi_message->h.resource.component1)
+            CASE(OGS_SBI_RESOURCE_NAME_AM_DATA)
+            CASE(OGS_SBI_RESOURCE_NAME_SMF_SELECT_DATA)
+            CASE(OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA)
+                ogs_warn("%s Ignore SBI message", amf_ue->supi);
+                break;
+
+            CASE(OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS)
+                SWITCH(sbi_message->h.method)
+                CASE(OGS_SBI_HTTP_METHOD_DELETE)
+                    /*
+                     * - AMF_UE_INITIATED_DE_REGISTERED
+                     * 1. PDU session establishment request
+                     * 2. PDUSessionResourceSetupRequest +
+                     *    PDU session establishment accept
+                     * 3. PDUSessionResourceSetupResponse
+                     * 4. Deregistration request
+                     * 5. UEContextReleaseCommand
+                     * 6. UEContextReleaseComplete
+                     *
+                     * - AMF_RELEASE_SM_CONTEXT_NO_STATE
+                     * 1. PDU session release request
+                     * 2. PDUSessionResourceReleaseCommand +
+                     *    PDU session release command
+                     * 3. PDUSessionResourceReleaseREsponse
+                     * 4. PDU session release complete
+                     * 5. Deregistration request
+                     * 6. UEContextReleaseCommand
+                     * 7. UEContextReleaseComplete
+                     */
+                    if (state == AMF_RELEASE_SM_CONTEXT_NO_STATE ||
+                        state == AMF_UE_INITIATED_DE_REGISTERED) {
+                        if (amf_ue->data_change_subscription_id) {
+                            ogs_free(amf_ue->data_change_subscription_id);
+                            amf_ue->data_change_subscription_id = NULL;
+                        }
+
+                        ogs_assert(true ==
+                            amf_ue_sbi_discover_and_send(
+                                OGS_SBI_SERVICE_TYPE_NUDM_UECM, NULL,
+                                amf_nudm_uecm_build_registration_delete,
+                                amf_ue, state, NULL));
+                    } else {
+                        ogs_fatal("Invalid state %d", state);
+                        ogs_assert_if_reached();
+                    }
+                    break;
+                DEFAULT
+                    ogs_warn("%s Ignore invalid HTTP method %s",
+                            amf_ue->suci, sbi_message->h.method);
+                END
+                break;
+
+            DEFAULT
+                ogs_error("Invalid resource name %s",
+                        sbi_message->h.resource.component1);
+                ogs_assert_if_reached();
+            END
+            break;
+
         CASE(OGS_SBI_SERVICE_NAME_NUDM_UECM)
             if (sbi_message->res_status != OGS_SBI_HTTP_STATUS_CREATED &&
                 sbi_message->res_status != OGS_SBI_HTTP_STATUS_NO_CONTENT &&
@@ -201,31 +270,43 @@
                 CASE(OGS_SBI_HTTP_METHOD_PATCH)
                     SWITCH(sbi_message->h.resource.component2)
                     CASE(OGS_SBI_RESOURCE_NAME_AMF_3GPP_ACCESS)
-                       if (amf_ue->data_change_subscription_id) {
-                            ogs_free(amf_ue->data_change_subscription_id);
-                            amf_ue->data_change_subscription_id = NULL;
-                        }
-
-                        if (state ==
-                                AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED ||
-                            state ==
-                                AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED) {
-                            amf_sbi_send_release_all_sessions(amf_ue, state);
-                            if ((ogs_list_count(&amf_ue->sess_list) == 0) &&
-                                (PCF_AM_POLICY_ASSOCIATED(amf_ue))) {
+                        /*
+                         * - AMF_UE_INITIATED_DE_REGISTERED
+                         * 1. PDU session establishment request
+                         * 2. PDUSessionResourceSetupRequest +
+                         *    PDU session establishment accept
+                         * 3. PDUSessionResourceSetupResponse
+                         * 4. Deregistration request
+                         * 5. UEContextReleaseCommand
+                         * 6. UEContextReleaseComplete
+                         *
+                         * - AMF_RELEASE_SM_CONTEXT_NO_STATE
+                         * 1. PDU session release request
+                         * 2. PDUSessionResourceReleaseCommand +
+                         *    PDU session release command
+                         * 3. PDUSessionResourceReleaseREsponse
+                         * 4. PDU session release complete
+                         * 5. Deregistration request
+                         * 6. UEContextReleaseCommand
+                         * 7. UEContextReleaseComplete
+                         */
+                        if (state == AMF_RELEASE_SM_CONTEXT_NO_STATE ||
+                            state == AMF_UE_INITIATED_DE_REGISTERED) {
+                            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));
+                            } else {
+                                r = nas_5gs_send_de_registration_accept(amf_ue);
+                                ogs_expect(r == OGS_OK);
+                                ogs_assert(r != OGS_ERROR);
                             }
                         } else {
-                            ogs_assert(true ==
-                                amf_ue_sbi_discover_and_send(
-                                    OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
-                                    amf_nausf_auth_build_authenticate_delete,
-                                    amf_ue, state, NULL));
+                            ogs_fatal("Invalid state %d", state);
+                            ogs_assert_if_reached();
                         }
                         break;
                     DEFAULT
@@ -248,44 +329,6 @@
             END
             break;
 
-        CASE(OGS_SBI_SERVICE_NAME_NUDM_SDM)
-            if ((sbi_message->res_status != OGS_SBI_HTTP_STATUS_OK) &&
-                (sbi_message->res_status != OGS_SBI_HTTP_STATUS_CREATED) &&
-                (sbi_message->res_status != OGS_SBI_HTTP_STATUS_NO_CONTENT)) {
-                ogs_error("%s HTTP response error %d",
-                          amf_ue->supi, sbi_message->res_status);
-                break;
-            }
-
-            SWITCH(sbi_message->h.resource.component1)
-            CASE(OGS_SBI_RESOURCE_NAME_AM_DATA)
-            CASE(OGS_SBI_RESOURCE_NAME_SMF_SELECT_DATA)
-            CASE(OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA)
-                ogs_warn("%s Ignore SBI message", amf_ue->supi);
-                break;
-
-            CASE(OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS)
-                SWITCH(sbi_message->h.method)
-                CASE(OGS_SBI_HTTP_METHOD_DELETE)
-                    ogs_assert(true ==
-                        amf_ue_sbi_discover_and_send(
-                            OGS_SBI_SERVICE_TYPE_NUDM_UECM, NULL,
-                            amf_nudm_uecm_build_registration_delete,
-                            amf_ue, state, NULL));
-                    break;
-                DEFAULT
-                    ogs_warn("%s Ignore invalid HTTP method %s",
-                            amf_ue->suci, sbi_message->h.method);
-                END
-                break;
-
-            DEFAULT
-                ogs_error("Invalid resource name %s",
-                        sbi_message->h.resource.component1);
-                ogs_assert_if_reached();
-            END
-            break;
-
         CASE(OGS_SBI_SERVICE_NAME_NPCF_AM_POLICY_CONTROL)
             SWITCH(sbi_message->h.resource.component0)
             CASE(OGS_SBI_RESOURCE_NAME_POLICIES)
@@ -295,33 +338,36 @@
                     break;
 
                 CASE(OGS_SBI_HTTP_METHOD_DELETE)
-                    if (state == AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED) {
-                        ogs_warn("%s Implicit De-registered", amf_ue->supi);
-                        OGS_FSM_TRAN(&amf_ue->sm,
-                                &gmm_state_ue_context_will_remove);
-
-                    } else if (state ==
-                            AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED) {
-                        ogs_warn("%s Explicit De-registered", amf_ue->supi);
-
-                        amf_ue->explict_de_registered.sbi_done = true;
-
-                        if (amf_ue->explict_de_registered.n1_done == true) {
-                            r = ngap_send_ran_ue_context_release_command(
-                                    amf_ue->ran_ue,

open5gs_2.6.0.8.5f9b.tar.xz/src/amf/namf-handler.c -> open5gs_2.6.0.10.79f73.tar.xz/src/amf/namf-handler.c Changed

@@ -521,7 +521,7 @@
 int amf_namf_callback_handle_dereg_notify(
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
-    int r, status = OGS_SBI_HTTP_STATUS_NO_CONTENT;
+    int r, state, status = OGS_SBI_HTTP_STATUS_NO_CONTENT;
 
     amf_ue_t *amf_ue = NULL;
 
@@ -553,8 +553,14 @@
         goto cleanup;
     }
 
-    if (DeregistrationData->access_type != OpenAPI_access_type_3GPP_ACCESS)
-    {
+    if (DeregistrationData->dereg_reason ==
+            OpenAPI_deregistration_reason_NULL) {
+        status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+        ogs_error("%s No Deregistraion Reason ", amf_ue->supi);
+        goto cleanup;
+    }
+
+    if (DeregistrationData->access_type != OpenAPI_access_type_3GPP_ACCESS) {
         status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
         ogs_error("%s Deregistration access type not 3GPP", amf_ue->supi);
         goto cleanup;
@@ -572,6 +578,21 @@
      * Deregistration procedure. In this case, the AMF performs network requested PDU Session Release for any PDU
      * session associated with non-emergency service as described in clause 4.3.4.
      */
+
+    /*
+     * - 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,
@@ -580,24 +601,32 @@
         ogs_expect(r == OGS_OK);
         ogs_assert(r != OGS_ERROR);
 
-        ogs_assert(true == amf_ue_sbi_discover_and_send(
-                OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
-                amf_nudm_sdm_build_subscription_delete,
-                amf_ue,
-                AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED, NULL));
+        state = AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED;
+
     } else if (CM_IDLE(amf_ue)) {
         ogs_error("Not implemented : Use Implicit De-registration");
 
-        ogs_assert(true == amf_ue_sbi_discover_and_send(
-                OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
-                amf_nudm_sdm_build_subscription_delete,
-                amf_ue,
-                AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED, NULL));
+        state = AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED;
+
     } else {
         ogs_fatal("Invalid State");
         ogs_assert_if_reached();
     }
 
+    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));
+    }
+
 cleanup:
     memset(&sendmsg, 0, sizeof(sendmsg));
 
@@ -799,8 +828,7 @@
 int amf_namf_callback_handle_sdm_data_change_notify(
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
-    int status = OGS_SBI_HTTP_STATUS_NO_CONTENT;
-    int r;
+    int r, state, status = OGS_SBI_HTTP_STATUS_NO_CONTENT;
 
     amf_ue_t *amf_ue = NULL;
 
@@ -880,6 +908,20 @@
     }
 
     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,
@@ -887,24 +929,32 @@
             ogs_expect(r == OGS_OK);
             ogs_assert(r != OGS_ERROR);
 
-            ogs_assert(true == amf_ue_sbi_discover_and_send(
-                    OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
-                    amf_nudm_sdm_build_subscription_delete,
-                    amf_ue,
-                    AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED, NULL));
+            state = AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED;
+
         } else if (CM_IDLE(amf_ue)) {
             ogs_error("Not implemented : Use Implicit De-registration");
 
-            ogs_assert(true == amf_ue_sbi_discover_and_send(
-                    OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
-                    amf_nudm_sdm_build_subscription_delete,
-                    amf_ue,
-                    AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED, NULL));
+            state = AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED;
+
         } else {
             ogs_fatal("Invalid State");
             ogs_assert_if_reached();
         }
 
+        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));
+        }
+
     } else if (ambr_changed) {
         ogs_pkbuf_t *ngapbuf;

open5gs_2.6.0.8.5f9b.tar.xz/src/amf/nsmf-handler.c -> open5gs_2.6.0.10.79f73.tar.xz/src/amf/nsmf-handler.c Changed

@@ -910,21 +910,110 @@
                 /* Not reached here */
                 ogs_assert_if_reached();
 
-            } else if (state == AMF_RELEASE_SM_CONTEXT_NO_STATE ||
-                        state == AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED ||
-                        state == AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED) {
-                /* NO_STATE */
+            } else if (state == AMF_UE_INITIATED_DE_REGISTERED) {
 
-                if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_authentication)) {
+                if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_de_registered)) {
+                    /*
+                     * 1. PDU session establishment request
+                     * 2. PDUSessionResourceSetupRequest +
+                     *    PDU session establishment accept
+                     * 3. PDUSessionResourceSetupResponse
+                     * 4. Deregistration request
+                     * 5. UEContextReleaseCommand
+                     * 6. UEContextReleaseComplete
+                     */
+                    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));
+                    } else {
+                        r = nas_5gs_send_de_registration_accept(amf_ue);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
+                    }
 
-                    ogs_assert(true ==
-                        amf_ue_sbi_discover_and_send(
-                            OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
-                            amf_nausf_auth_build_authenticate,
-                            amf_ue, 0, NULL));
+                } else if (OGS_FSM_CHECK(&amf_ue->sm,
+                            gmm_state_authentication)) {
+                    ogs_fatal("Release SM Context in authentication");
+                    ogs_assert_if_reached();
+                } else if (OGS_FSM_CHECK(
+                            &amf_ue->sm, gmm_state_security_mode)) {
+                    ogs_fatal("Release SM Context in security-mode");
+                    ogs_assert_if_reached();
+                } else if (OGS_FSM_CHECK(&amf_ue->sm,
+                                gmm_state_initial_context_setup)) {
+                    ogs_fatal("Release SM Context in initial-context-setup");
+                    ogs_assert_if_reached();
+                } else if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_registered)) {
+                    ogs_fatal("Release SM Context in registered");
+                    ogs_assert_if_reached();
+                } else if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_exception)) {
+                    ogs_fatal("Release SM Context in exception");
+                    ogs_assert_if_reached();
+                } else {
+                    ogs_fatal("Release SM Context : INVALID STATE");
+                    ogs_assert_if_reached();
+                }
+
+            } else if (state == AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED ||
+                        state == AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED) {
 
+                if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_de_registered)) {
+                    ogs_fatal("Release SM Context in de-registered");
+                    ogs_assert_if_reached();
                 } else if (OGS_FSM_CHECK(&amf_ue->sm,
-                            gmm_state_de_registered)) {
+                            gmm_state_authentication)) {
+                    ogs_fatal("Release SM Context in authentication");
+                    ogs_assert_if_reached();
+                } else if (OGS_FSM_CHECK(
+                            &amf_ue->sm, gmm_state_security_mode)) {
+                    ogs_fatal("Release SM Context in security-mode");
+                    ogs_assert_if_reached();
+                } else if (OGS_FSM_CHECK(&amf_ue->sm,
+                                gmm_state_initial_context_setup)) {
+                    ogs_fatal("Release SM Context in initial-context-setup");
+                    ogs_assert_if_reached();
+                } else if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_registered)) {
+                    /*
+                     * 1. Network-Initiated Implict-Explicit De-Registered
+                     * 5. Deregistration request
+                     * 5. Deregistration accept
+                     * 6. UEContextReleaseCommand
+                     * 7. UEContextReleaseComplete
+                     */
+                    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));
+                    }
+
+                } else if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_exception)) {
+                    ogs_fatal("Release SM Context in exception");
+                    ogs_assert_if_reached();
+                } else {
+                    ogs_fatal("Release SM Context : INVALID STATE");
+                    ogs_assert_if_reached();
+                }
+            } else if (state == AMF_RELEASE_SM_CONTEXT_NO_STATE) {
+                /* NO_STATE */
+
+                if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_de_registered)) {
                     /*
                      * 1. PDU session release request
                      * 2. PDUSessionResourceReleaseCommand +
@@ -935,13 +1024,40 @@
                      * 6. UEContextReleaseCommand
                      * 7. UEContextReleaseComplete
                      */
+                    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));
+                    } else {
+                        r = nas_5gs_send_de_registration_accept(amf_ue);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
+                    }
+                } else if (OGS_FSM_CHECK(&amf_ue->sm,
+                            gmm_state_authentication)) {
 
                     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));
+                            OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
+                            amf_nausf_auth_build_authenticate,
+                            amf_ue, 0, NULL));
 
+                } else if (OGS_FSM_CHECK(
+                            &amf_ue->sm, gmm_state_security_mode)) {
+                    ogs_fatal("Release SM Context in security-mode");
+                    ogs_assert_if_reached();
+                } else if (OGS_FSM_CHECK(&amf_ue->sm,
+                                gmm_state_initial_context_setup)) {
+                    ogs_fatal("Release SM Context in initial-context-setup");
+                    ogs_assert_if_reached();
                 } else if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_registered)) {
                     /*
                      * 1. PDU session release request
@@ -950,8 +1066,6 @@
                      * 3. PDUSessionResourceReleaseREsponse
                      * 4. PDU session release complete
                      *
-                     * No Deregistration request in the above step
-                     *
                      * So, Nothing to do!
                      */
                 } else if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_exception)) {
@@ -967,14 +1081,6 @@
                     ogs_expect(r == OGS_OK);
                     ogs_assert(r != OGS_ERROR);
 
-                } else if (OGS_FSM_CHECK(&amf_ue->sm,
-                                gmm_state_initial_context_setup)) {
-                    ogs_fatal("Release SM Context in initial-context-setup");
-                    ogs_assert_if_reached();
-                } else if (OGS_FSM_CHECK(
-                            &amf_ue->sm, gmm_state_security_mode)) {
-                    ogs_fatal("Release SM Context in security-mode");
-                    ogs_assert_if_reached();
                 } else {
                     ogs_fatal("Release SM Context : INVALID STATE");
                     ogs_assert_if_reached();

open5gs_2.6.0.8.5f9b.tar.xz/src/amf/sbi-path.c -> open5gs_2.6.0.10.79f73.tar.xz/src/amf/sbi-path.c Changed

open5gs_2.6.0.8.5f9b.tar.xz/src/amf/sbi-path.h -> open5gs_2.6.0.10.79f73.tar.xz/src/amf/sbi-path.h Changed

open5gs_2.6.0.8.5f9b.tar.xz/src/smf/gx-path.c -> open5gs_2.6.0.10.79f73.tar.xz/src/smf/gx-path.c Changed

open5gs_2.6.0.8.5f9b.tar.xz/src/smf/gy-path.c -> open5gs_2.6.0.10.79f73.tar.xz/src/smf/gy-path.c Changed

Changes of Revision 137