Osmocom Open Build Service

commit_610b9980388e88b5c53193d712db07c21002491b.txt Deleted

commit_b7386284a707953ac01071bf44ff460138b48e40.txt Added

open5gs_2.6.0.3.610b9.dsc -> open5gs_2.6.0.4.b7386.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.3.610b9
+Version: 2.6.0.4.b7386
 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:
- 5194e32e71a5c9eaeded9eec9400703eda77a552 13616112 open5gs_2.6.0.3.610b9.tar.xz
+ 98f1f69bb7517a2f0470b6dd178d415c38f12944 13614928 open5gs_2.6.0.4.b7386.tar.xz
 Checksums-Sha256:
- 8e65cc572fde7657a1912fb412b941492be6d07cfdb92cb63f79881d97b4c766 13616112 open5gs_2.6.0.3.610b9.tar.xz
+ 88981381fae737b78616da0947738a596b8b4ddad4ee52218a67456dc38850c5 13614928 open5gs_2.6.0.4.b7386.tar.xz
 Files:
- e3cabde3e770aebfeccf4029349431eb 13616112 open5gs_2.6.0.3.610b9.tar.xz
+ 9f3d99290f1d9e3607e4bbc0745f5df3 13614928 open5gs_2.6.0.4.b7386.tar.xz

open5gs_2.6.0.3.610b9.tar.xz/.tarball-version -> open5gs_2.6.0.4.b7386.tar.xz/.tarball-version Changed

open5gs_2.6.0.3.610b9.tar.xz/debian/changelog -> open5gs_2.6.0.4.b7386.tar.xz/debian/changelog Changed

open5gs_2.6.0.3.610b9.tar.xz/lib/sbi/context.c -> open5gs_2.6.0.4.b7386.tar.xz/lib/sbi/context.c Changed

@@ -31,10 +31,12 @@
 static OGS_POOL(smf_info_pool, ogs_sbi_smf_info_t);
 static OGS_POOL(nf_info_pool, ogs_sbi_nf_info_t);
 
-void ogs_sbi_context_init(void)
+void ogs_sbi_context_init(OpenAPI_nf_type_e nf_type)
 {
     char nf_instance_idOGS_UUID_FORMATTED_LENGTH + 1;
 
+    ogs_assert(nf_type);
+
     ogs_assert(context_initialized == 0);
 
     /* Initialize SBI context */
@@ -62,18 +64,21 @@
 
     ogs_pool_init(&nf_info_pool, ogs_app()->pool.nf * OGS_MAX_NUM_OF_NF_INFO);
 
-    /* Add AELF NF-Instance */
+    /* Add SELF NF-Instance */
     self.nf_instance = ogs_sbi_nf_instance_add();
     ogs_assert(self.nf_instance);
 
     ogs_uuid_get(&self.uuid);
     ogs_uuid_format(nf_instance_id, &self.uuid);
     ogs_sbi_nf_instance_set_id(self.nf_instance, nf_instance_id);
+    ogs_sbi_nf_instance_set_type(self.nf_instance, nf_type);
 
     /* Add NRF NF-Instance */
-    self.nrf_instance = ogs_sbi_nf_instance_add();
-    ogs_assert(self.nrf_instance);
-    ogs_sbi_nf_instance_set_type(self.nrf_instance, OpenAPI_nf_type_NRF);
+    if (nf_type != OpenAPI_nf_type_NRF) {
+        self.nrf_instance = ogs_sbi_nf_instance_add();
+        ogs_assert(self.nrf_instance);
+        ogs_sbi_nf_instance_set_type(self.nrf_instance, OpenAPI_nf_type_NRF);
+    }
 
     /* Add SCP NF-Instance */
     self.scp_instance = ogs_sbi_nf_instance_add();
@@ -1409,16 +1414,13 @@
     return NULL;
 }
 
-void ogs_sbi_nf_instance_build_default(
-        ogs_sbi_nf_instance_t *nf_instance, OpenAPI_nf_type_e nf_type)
+void ogs_sbi_nf_instance_build_default(ogs_sbi_nf_instance_t *nf_instance)
 {
     ogs_sbi_server_t *server = NULL;
     char *hostname = NULL;
 
     ogs_assert(nf_instance);
-    ogs_assert(nf_type);
 
-    ogs_sbi_nf_instance_set_type(nf_instance, nf_type);
     ogs_sbi_nf_instance_set_status(nf_instance, OpenAPI_nf_status_REGISTERED);
 
     hostname = NULL;
@@ -1685,6 +1687,9 @@
     ogs_assert(target_nf_type);
     ogs_assert(requester_nf_type);
 
+    if (NF_INSTANCE_EXCLUDED_FROM_DISCOVERY(nf_instance))
+        return false;
+
     if (!OGS_FSM_CHECK(&nf_instance->sm, ogs_sbi_nf_state_registered))
         return false;

open5gs_2.6.0.3.610b9.tar.xz/lib/sbi/context.h -> open5gs_2.6.0.4.b7386.tar.xz/lib/sbi/context.h Changed

@@ -109,6 +109,21 @@
     ogs_timer_t *t_no_heartbeat;            /* check heartbeat */
     ogs_timer_t *t_validity;                /* check validation */
 
+    /*
+     * Issues #2034
+     *
+     * Other NF instances are obtained through NRF
+     * or created directly through configuration files.
+     *
+     * Other NFs created by the config file should not be passed
+     * through NRF discovery or anything like that.
+     *
+     * Since self-created NF Instances do not have an ID,
+     * they are implemented to exclude them from NRF Discovery.
+     */
+#define NF_INSTANCE_EXCLUDED_FROM_DISCOVERY(__nFInstance) \
+    (!(__nFInstance) || !((__nFInstance)->id))
+
 #define NF_INSTANCE_ID(__nFInstance) \
     ((__nFInstance) ? ((__nFInstance)->id) : NULL)
 #define NF_INSTANCE_ID_IS_SELF(_iD) \
@@ -329,7 +344,7 @@
     };
 } ogs_sbi_nf_info_t;
 
-void ogs_sbi_context_init(void);
+void ogs_sbi_context_init(OpenAPI_nf_type_e nf_type);
 void ogs_sbi_context_final(void);
 ogs_sbi_context_t *ogs_sbi_self(void);
 int ogs_sbi_context_parse_config(
@@ -385,8 +400,7 @@
 ogs_sbi_nf_info_t *ogs_sbi_nf_info_find(
         ogs_list_t *list, OpenAPI_nf_type_e nf_type);
 
-void ogs_sbi_nf_instance_build_default(
-        ogs_sbi_nf_instance_t *nf_instance, OpenAPI_nf_type_e nf_type);
+void ogs_sbi_nf_instance_build_default(ogs_sbi_nf_instance_t *nf_instance);
 ogs_sbi_nf_service_t *ogs_sbi_nf_service_build_default(
         ogs_sbi_nf_instance_t *nf_instance, const char *name);

open5gs_2.6.0.3.610b9.tar.xz/lib/sbi/path.c -> open5gs_2.6.0.4.b7386.tar.xz/lib/sbi/path.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/amf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/amf/init.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/amf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/amf/sbi-path.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/ausf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/ausf/init.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/ausf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/ausf/sbi-path.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/bsf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/bsf/init.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/bsf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/bsf/sbi-path.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/nrf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/nrf/init.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/nrf/nnrf-handler.c -> open5gs_2.6.0.4.b7386.tar.xz/src/nrf/nnrf-handler.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/nrf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/nrf/sbi-path.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/nssf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/nssf/init.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/nssf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/nssf/sbi-path.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/pcf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/pcf/init.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/pcf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/pcf/sbi-path.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/scp/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/scp/init.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/scp/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/scp/sbi-path.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/smf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/smf/init.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/smf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/smf/sbi-path.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/udm/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/udm/init.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/udm/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/udm/sbi-path.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/udr/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/udr/init.c Changed

open5gs_2.6.0.3.610b9.tar.xz/src/udr/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/udr/sbi-path.c Changed

open5gs_2.6.0.3.610b9.tar.xz/tests/af/init.c -> open5gs_2.6.0.4.b7386.tar.xz/tests/af/init.c Changed

open5gs_2.6.0.3.610b9.tar.xz/tests/af/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/tests/af/sbi-path.c Changed

open5gs_2.6.0.3.610b9.tar.xz/tests/registration/abts-main.c -> open5gs_2.6.0.4.b7386.tar.xz/tests/registration/abts-main.c Changed

Changes of Revision 132