Osmocom Open Build Service

open5gs_2.6.6.32.adcdc.202311232026.dsc -> open5gs_2.6.6.33.a19d.202311242026.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-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
 Architecture: any
-Version: 2.6.6.32.adcdc.202311232026
+Version: 2.6.6.33.a19d.202311242026
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Uploaders: Sukchan Lee <acetcom@gmail.com>
 Homepage: https://open5gs.org
@@ -32,8 +32,8 @@
  open5gs-udr deb net optional arch=any
  open5gs-upf deb net optional arch=any
 Checksums-Sha1:
- bb2fa6a7a2a6cd602db91b89cb09c39c6db4b3b4 14458056 open5gs_2.6.6.32.adcdc.202311232026.tar.xz
+ e225d0a0fbffa64a57507a18f419efcd80428c47 14458676 open5gs_2.6.6.33.a19d.202311242026.tar.xz
 Checksums-Sha256:
- db8e8837198ea1b593583664235131863138e69c1eb08b3fad7c88fb468f1f1d 14458056 open5gs_2.6.6.32.adcdc.202311232026.tar.xz
+ 67d59c45396b08208d92dca0b1d127bb6b1f9836cebeba1b5d4924ecd6a0bb36 14458676 open5gs_2.6.6.33.a19d.202311242026.tar.xz
 Files:
- 20b4d3261a20317b7a50d142815119df 14458056 open5gs_2.6.6.32.adcdc.202311232026.tar.xz
+ e4644240d9ac9ada906a4bdd78f04297 14458676 open5gs_2.6.6.33.a19d.202311242026.tar.xz

open5gs_2.6.6.32.adcdc.202311232026.tar.xz/.tarball-version -> open5gs_2.6.6.33.a19d.202311242026.tar.xz/.tarball-version Changed

open5gs_2.6.6.32.adcdc.202311232026.tar.xz/debian/changelog -> open5gs_2.6.6.33.a19d.202311242026.tar.xz/debian/changelog Changed

open5gs_2.6.6.32.adcdc.202311232026.tar.xz/lib/sbi/path.c -> open5gs_2.6.6.33.a19d.202311242026.tar.xz/lib/sbi/path.c Changed

@@ -92,6 +92,7 @@
     ogs_sbi_xact_t *xact = NULL;
     ogs_sbi_object_t *sbi_object = NULL;
     ogs_sbi_service_type_e service_type = OGS_SBI_SERVICE_TYPE_NULL;
+    ogs_sbi_discovery_option_t *discovery_option = NULL;
     OpenAPI_nf_type_e target_nf_type = OpenAPI_nf_type_NULL;
     OpenAPI_nf_type_e requester_nf_type = OpenAPI_nf_type_NULL;
 
@@ -118,6 +119,8 @@
     requester_nf_type = xact->requester_nf_type;
     ogs_assert(requester_nf_type);
 
+    discovery_option = xact->discovery_option;
+
     if (status != OGS_OK) {
         ogs_log_message(
                 status == OGS_DONE ? OGS_LOG_DEBUG : OGS_LOG_WARN, 0,
@@ -148,6 +151,61 @@
             ogs_sbi_nf_instance_set_id(nf_instance, producer_id);
             ogs_sbi_nf_instance_set_type(nf_instance, target_nf_type);
 
+            switch (target_nf_type) {
+            case OpenAPI_nf_type_SMF:
+                if (discovery_option &&
+                    discovery_option->num_of_snssais && discovery_option->dnn &&
+                    discovery_option->tai_presence == true) {
+    /*
+     * If we assume that SMF is executed first and then AMF is executed,
+     * AMF will not have SMF information, so it needs to discover SMF
+     * through NFDiscovery instead of the subscription notification.
+     *
+     * Let's assume that in smfInfo, TAC is set to 1 and 2, and two SMFs are
+     * executed. In this case, TAI will be added to the discovery option and
+     * will be performed during the NFDiscovery process.
+     *
+     * If the first SMF is discovered with TAC 1 in conjunction with SCP,
+     * AMF will remember this SMF through Producer-Id. However, if the second
+     * SMF with TAC 2 is discovered, the previously discovered SMF with TAC 1
+     * will be selected.
+     *
+     * Therefore, to avoid such a situation, we reflect the contents of
+     * the discovery option in NFProfile. For SMF, we record the s_nssai, dnn,
+     * and tai information in the ogs_sbi_smf_info_t structure, which is created
+     * as ogs_sbi_nf_info_t. Then, when we try to find the second SMF
+     * with TAC 2, we compare these values in the amf_sbi_select_nf() function,
+     * allowing us to discover a new SMF.
+     */
+                    ogs_sbi_nf_info_t *nf_info = NULL;
+                    ogs_sbi_smf_info_t *smf_info = NULL;
+
+                    nf_info = ogs_sbi_nf_info_add(
+                            &nf_instance->nf_info_list, OpenAPI_nf_type_SMF);
+                    ogs_assert(nf_info);
+
+                    smf_info = &nf_info->smf;
+                    ogs_assert(smf_info);
+
+                    smf_info->slice0.dnn0 =
+                        ogs_strdup(discovery_option->dnn);
+                    ogs_assert(smf_info->slice0.dnn0);
+                    smf_info->slice0.num_of_dnn++;
+
+                    memcpy(&smf_info->slice0.s_nssai,
+                            &discovery_option->snssais0,
+                            sizeof(ogs_s_nssai_t));
+                    smf_info->num_of_slice++;
+
+                    memcpy(&smf_info->nr_tai0,
+                            &discovery_option->tai, sizeof(ogs_5gs_tai_t));
+                    smf_info->num_of_nr_tai++;
+                }
+                break;
+            default:
+                break;
+            }
+
             ogs_sbi_nf_fsm_init(nf_instance);
 
             ogs_info("%s (SCP-discover) NF registered %s:%d",

Changes of Revision 521