Osmocom Open Build Service

open5gs_2.5.5.1.9545.202211070002.dsc -> open5gs_2.5.5.4.4106.202211080002.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.5.5.1.9545.202211070002
+Version: 2.5.5.4.4106.202211080002
 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:
- a36990937cb12de7fc969a232c71afd862e40859 11489968 open5gs_2.5.5.1.9545.202211070002.tar.xz
+ 8dc7c45ae20518e59533a5fff826814768971509 11490308 open5gs_2.5.5.4.4106.202211080002.tar.xz
 Checksums-Sha256:
- 8a40eda675b9b1b81b9dd9cc96a4818b4ffe525d7e1dbd801bce0d04719bc26e 11489968 open5gs_2.5.5.1.9545.202211070002.tar.xz
+ 84c547381787d846a206d16a66c1be9008d9091d9661d63cc1a8d8c4c190b1c0 11490308 open5gs_2.5.5.4.4106.202211080002.tar.xz
 Files:
- b19f8202d7125d5dba334c86938f6309 11489968 open5gs_2.5.5.1.9545.202211070002.tar.xz
+ db346b61856c64016371fd8aa53e1e34 11490308 open5gs_2.5.5.4.4106.202211080002.tar.xz

open5gs_2.5.5.1.9545.202211070002.tar.xz/.tarball-version -> open5gs_2.5.5.4.4106.202211080002.tar.xz/.tarball-version Changed

open5gs_2.5.5.1.9545.202211070002.tar.xz/debian/changelog -> open5gs_2.5.5.4.4106.202211080002.tar.xz/debian/changelog Changed

open5gs_2.5.5.1.9545.202211070002.tar.xz/src/smf/gsm-build.c -> open5gs_2.5.5.4.4106.202211080002.tar.xz/src/smf/gsm-build.c Changed

open5gs_2.5.5.1.9545.202211070002.tar.xz/src/smf/gsm-build.h -> open5gs_2.5.5.4.4106.202211080002.tar.xz/src/smf/gsm-build.h Changed

open5gs_2.5.5.1.9545.202211070002.tar.xz/src/smf/n4-handler.c -> open5gs_2.5.5.4.4106.202211080002.tar.xz/src/smf/n4-handler.c Changed

@@ -464,11 +464,23 @@
 
             ogs_assert(flags & OGS_PFCP_MODIFY_SESSION);
 
+            /*
+             * TS24.501
+             * 6.2 General on elementary 5GSM procedures
+             * 6.2.1 Principles of PTI handling for 5GSM procedures
+             *
+             * If a command message is not sent as result of
+             * a received request message, the sending entity shall
+             * include in the command message the PTI value set to
+             * "no procedure transaction identity assigned"
+             * (see examples in figure 6.2.1.4).
+             */
+            sess->pti = OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED;
+
             memset(&param, 0, sizeof(param));
             param.state = SMF_NETWORK_REQUESTED_QOS_FLOW_MODIFICATION;
             param.n1smbuf = gsm_build_pdu_session_modification_command(
                     sess,
-                    OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED,
                     OGS_NAS_QOS_CODE_DELETE_EXISTING_QOS_RULE,
                     OGS_NAS_DELETE_NEW_QOS_FLOW_DESCRIPTION);
             ogs_assert(param.n1smbuf);
@@ -492,7 +504,7 @@
 
             ogs_assert(flags & OGS_PFCP_MODIFY_SESSION);
             n1smbuf = gsm_build_pdu_session_modification_command(
-                    sess, sess->pti,
+                    sess,
                     OGS_NAS_QOS_CODE_DELETE_EXISTING_QOS_RULE,
                     OGS_NAS_DELETE_NEW_QOS_FLOW_DESCRIPTION);
             ogs_assert(n1smbuf);
@@ -528,11 +540,23 @@
 
             ogs_assert(flags & OGS_PFCP_MODIFY_SESSION);
 
+            /*
+             * TS24.501
+             * 6.2 General on elementary 5GSM procedures
+             * 6.2.1 Principles of PTI handling for 5GSM procedures
+             *
+             * If a command message is not sent as result of
+             * a received request message, the sending entity shall
+             * include in the command message the PTI value set to
+             * "no procedure transaction identity assigned"
+             * (see examples in figure 6.2.1.4).
+             */
+            sess->pti = OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED;
+
             memset(&param, 0, sizeof(param));
             param.state = SMF_NETWORK_REQUESTED_QOS_FLOW_MODIFICATION;
             param.n1smbuf = gsm_build_pdu_session_modification_command(
                     sess,
-                    OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED,
                     OGS_NAS_QOS_CODE_CREATE_NEW_QOS_RULE,
                     OGS_NAS_CREATE_NEW_QOS_FLOW_DESCRIPTION);
             ogs_assert(param.n1smbuf);
@@ -577,12 +601,23 @@
         if (flags & OGS_PFCP_MODIFY_NETWORK_REQUESTED) {
             ogs_assert(flags & OGS_PFCP_MODIFY_SESSION);
 
+            /*
+             * TS24.501
+             * 6.2 General on elementary 5GSM procedures
+             * 6.2.1 Principles of PTI handling for 5GSM procedures
+             *
+             * If a command message is not sent as result of
+             * a received request message, the sending entity shall
+             * include in the command message the PTI value set to
+             * "no procedure transaction identity assigned"
+             * (see examples in figure 6.2.1.4).
+             */
+            sess->pti = OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED;
+
             memset(&param, 0, sizeof(param));
             param.state = SMF_NETWORK_REQUESTED_QOS_FLOW_MODIFICATION;
             param.n1smbuf = gsm_build_pdu_session_modification_command(
-                    sess,
-                    OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED,
-                    qos_rule_code, qos_flow_description_code);
+                    sess, qos_rule_code, qos_flow_description_code);
             ogs_assert(param.n1smbuf);
             param.n2smbuf =
                 ngap_build_pdu_session_resource_modify_request_transfer(
@@ -599,8 +634,7 @@
 
             ogs_assert(flags & OGS_PFCP_MODIFY_SESSION);
             n1smbuf = gsm_build_pdu_session_modification_command(
-                    sess, sess->pti,
-                    qos_rule_code, qos_flow_description_code);
+                    sess, qos_rule_code, qos_flow_description_code);
             ogs_assert(n1smbuf);
 
             n2smbuf = ngap_build_pdu_session_resource_modify_request_transfer(

open5gs_2.5.5.1.9545.202211070002.tar.xz/src/smf/nsmf-handler.c -> open5gs_2.5.5.4.4106.202211080002.tar.xz/src/smf/nsmf-handler.c Changed

@@ -28,6 +28,7 @@
 {
     smf_ue_t *smf_ue = NULL;
 
+    ogs_nas_5gsm_header_t *gsm_header = NULL;
     ogs_pkbuf_t *n1smbuf = NULL;
 
     ogs_sbi_client_t *client = NULL;
@@ -50,12 +51,42 @@
     if (!SmContextCreateData) {
         ogs_error("%s:%d No SmContextCreateData",
                 smf_ue->supi, sess->psi);
-        n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
-            OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
         smf_sbi_send_sm_context_create_error(stream,
                 OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No SmContextCreateData", smf_ue->supi, n1smbuf);
+                "No SmContextCreateData", smf_ue->supi, NULL);
+        return false;
+    }
+
+    n1SmMsg = SmContextCreateData->n1_sm_msg;
+    if (!n1SmMsg || !n1SmMsg->content_id) {
+        ogs_error("%s:%d No n1SmMsg", smf_ue->supi, sess->psi);
+        smf_sbi_send_sm_context_create_error(stream,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No n1SmMsg", smf_ue->supi, NULL);
+        return false;
+    }
+
+    n1smbuf = ogs_sbi_find_part_by_content_id(message, n1SmMsg->content_id);
+    if (!n1smbuf) {
+        ogs_error("%s:%d No N1 SM Content %s",
+                smf_ue->supi, sess->psi, n1SmMsg->content_id);
+        smf_sbi_send_sm_context_create_error(stream,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No N1 SM Content", smf_ue->supi, NULL);
+        return false;
+    }
+
+    gsm_header = (ogs_nas_5gsm_header_t *)n1smbuf->data;
+    ogs_assert(gsm_header);
+
+    sess->pti = gsm_header->procedure_transaction_identity;
+    if (sess->pti == OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED) {
+        ogs_error("%s:%d No PTI", smf_ue->supi, sess->psi);
+        smf_sbi_send_sm_context_create_error(stream,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No PTI", smf_ue->supi, NULL);
         return false;
+
     }
 
     sNssai = SmContextCreateData->s_nssai;
@@ -106,29 +137,6 @@
         return false;
     }
 
-    n1SmMsg = SmContextCreateData->n1_sm_msg;
-    if (!n1SmMsg || !n1SmMsg->content_id) {
-        ogs_error("%s:%d No n1SmMsg", smf_ue->supi, sess->psi);
-        n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
-            OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
-        smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No n1SmMsg", smf_ue->supi, n1smbuf);
-        return false;
-    }
-
-    n1smbuf = ogs_sbi_find_part_by_content_id(message, n1SmMsg->content_id);
-    if (!n1smbuf) {
-        ogs_error("%s:%d No N1 SM Content %s",
-                smf_ue->supi, sess->psi, n1SmMsg->content_id);
-        n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
-            OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
-        smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No N1 SM Content", smf_ue->supi, n1smbuf);
-        return false;
-    }
-
     if (!SmContextCreateData->sm_context_status_uri) {
         ogs_error("%s:%d No SmContextStatusNotification",
                 smf_ue->supi, sess->psi);
@@ -228,6 +236,7 @@
     OpenAPI_ref_to_binary_data_t *n1SmMsg = NULL;
     OpenAPI_ref_to_binary_data_t *n2SmMsg = NULL;
 
+    ogs_nas_5gsm_header_t *gsm_header = NULL;
     ogs_pkbuf_t *n1smbuf = NULL;
     ogs_pkbuf_t *n2smbuf = NULL;
 
@@ -274,11 +283,9 @@
         n1SmMsg = SmContextUpdateData->n1_sm_msg;
         if (!n1SmMsg || !n1SmMsg->content_id) {
             ogs_error("%s:%d No n1SmMsg", smf_ue->supi, sess->psi);
-            n1smbuf = gsm_build_pdu_session_release_reject(sess,
-                OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
             smf_sbi_send_sm_context_update_error(stream,
                     OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                    "No n1SmMsg", smf_ue->supi, n1smbuf, NULL);
+                    "No n1SmMsg", smf_ue->supi, NULL, NULL);
             return false;
         }
 
@@ -286,14 +293,16 @@
         if (!n1smbuf) {
             ogs_error("%s:%d No N1 SM Content %s",
                     smf_ue->supi, sess->psi, n1SmMsg->content_id);
-            n1smbuf = gsm_build_pdu_session_release_reject(sess,
-                OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
             smf_sbi_send_sm_context_update_error(stream,
                     OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                    "No N1 SM Content", smf_ue->supi, n1smbuf, NULL);
+                    "No N1 SM Content", smf_ue->supi, NULL, NULL);
             return false;
         }
 
+        gsm_header = (ogs_nas_5gsm_header_t *)n1smbuf->data;
+        ogs_assert(gsm_header);
+        sess->pti = gsm_header->procedure_transaction_identity;
+
         /*
          * NOTE : The pkbuf created in the SBI message will be removed
          *        from ogs_sbi_message_free().

open5gs_2.5.5.1.9545.202211070002.tar.xz/src/smf/smf-sm.c -> open5gs_2.5.5.4.4106.202211080002.tar.xz/src/smf/smf-sm.c Changed

open5gs_2.5.5.1.9545.202211070002.tar.xz/tests/slice/different-dnn-test.c -> open5gs_2.5.5.4.4106.202211080002.tar.xz/tests/slice/different-dnn-test.c Changed

open5gs_2.5.5.1.9545.202211070002.tar.xz/tests/slice/same-dnn-test.c -> open5gs_2.5.5.4.4106.202211080002.tar.xz/tests/slice/same-dnn-test.c Changed

Changes of Revision 135