Osmocom Open Build Service

open5gs_2.7.2.4623.6c67.202503032026.dsc -> open5gs_2.7.2.4625.4012.202503042026.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.7.2.4623.6c67.202503032026
+Version: 2.7.2.4625.4012.202503042026
 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:
- c390ebcd225281b1d76500c3b3973add697d7155 14526096 open5gs_2.7.2.4623.6c67.202503032026.tar.xz
+ d74c8af25129ee0977e9091079d285d963f0ccdf 14526816 open5gs_2.7.2.4625.4012.202503042026.tar.xz
 Checksums-Sha256:
- a4988fb2ac0594903c5449b74e6947625caef1e4b15e56f5c41c8fd4ba246f75 14526096 open5gs_2.7.2.4623.6c67.202503032026.tar.xz
+ 2479a67042b6c1b6f3f7225d70979b371a3653d7a43e9b29176175ae0a95e8de 14526816 open5gs_2.7.2.4625.4012.202503042026.tar.xz
 Files:
- 2a05e14472623266dd5fcba123e33093 14526096 open5gs_2.7.2.4623.6c67.202503032026.tar.xz
+ 8563a17bb419ea1eca28f55f326f8f16 14526816 open5gs_2.7.2.4625.4012.202503042026.tar.xz

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/.tarball-version -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/.tarball-version Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/debian/changelog -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/debian/changelog Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/lib/sbi/client.h -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/lib/sbi/client.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -40,15 +40,15 @@
             client = ((__cTX)->client); \
             ogs_assert(client); \
             if (client->fqdn) { \
-                ogs_warn("NF EndPoint(fqdn) updated %s:%d", \
+                ogs_warn("UnRef NF EndPoint(fqdn) %s:%d", \
                         client->fqdn, client->fqdn_port); \
             } \
             if (client->addr) { \
-                ogs_warn("NF EndPoint(addr) updated %s:%d", \
+                ogs_warn("UnRef NF EndPoint(addr) %s:%d", \
                     OGS_ADDR(client->addr, buf), OGS_PORT(client->addr)); \
             } \
             if (client->addr6) { \
-                ogs_warn("NF EndPoint(addr6) updated %s:%d", \
+                ogs_warn("UnRef NF EndPoint(addr6) %s:%d", \
                     OGS_ADDR(client->addr6, buf), OGS_PORT(client->addr6)); \
             } \
             ogs_sbi_client_remove(client); \
@@ -58,15 +58,15 @@
         ((__cTX)->client) = (__pClient); \
         ogs_debug("CLIENT Ref %d", (__pClient)->reference_count); \
         if ((__pClient)->fqdn) { \
-            ogs_info("NF EndPoint(fqdn) setup %s:%d", \
+            ogs_info("Setup NF EndPoint(fqdn) %s:%d", \
                     (__pClient)->fqdn, (__pClient)->fqdn_port); \
         } \
         if ((__pClient)->addr) { \
-            ogs_info("NF EndPoint(addr) setup %s:%d", \
+            ogs_info("Setup NF EndPoint(addr) %s:%d", \
                 OGS_ADDR((__pClient)->addr, buf), OGS_PORT((__pClient)->addr)); \
         } \
         if ((__pClient)->addr6) { \
-            ogs_info("NF EndPoint(addr6) setup %s:%d", \
+            ogs_info("Setup NF EndPoint(addr6) %s:%d", \
                 OGS_ADDR((__pClient)->addr6, buf), \
                 OGS_PORT((__pClient)->addr6)); \
         } \

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/lib/sbi/context.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/lib/sbi/context.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -1390,7 +1390,19 @@
 {
     ogs_sbi_nf_instance_t *nf_instance = NULL;
 
-    ogs_assert(id);
+    /*
+     * This is related to Issue #3093.
+     *
+     * We want to be able to use 'ogs_sbi_nf_instance_id_find(char *id)'
+     * even if the 'id' is NULL as in the use case below.
+     *
+     * ogs_sbi_nf_instance_find(
+     *    sess->sbi.service_type_arrayservice_type.nf_instance_id));
+     *
+     * To do so, we changed the 'assert(id)' to 'if (!id) return NULL',
+     * as shown below.
+     */
+    if (!id) return NULL;
 
     ogs_list_for_each(&ogs_sbi_self()->nf_instance_list, nf_instance) {
         if (nf_instance->id && strcmp(nf_instance->id, id) == 0)
@@ -2394,7 +2406,7 @@
         }
     }
 
-    return nf_instance->client;
+    return NULL;
 }
 
 ogs_sbi_client_t *ogs_sbi_client_find_by_service_type(
@@ -2417,10 +2429,21 @@
 
 void ogs_sbi_object_free(ogs_sbi_object_t *sbi_object)
 {
+    int i;
+
     ogs_assert(sbi_object);
 
     if (ogs_list_count(&sbi_object->xact_list))
         ogs_error("SBI running %d", ogs_list_count(&sbi_object->xact_list));
+
+    for (i = 0; i < OGS_SBI_MAX_NUM_OF_SERVICE_TYPE; i++) {
+        if (sbi_object->service_type_arrayi.nf_instance_id)
+            ogs_free(sbi_object->service_type_arrayi.nf_instance_id);
+    }
+    for (i = 0; i < OGS_SBI_MAX_NUM_OF_NF_TYPE; i++) {
+        if (sbi_object->nf_type_arrayi.nf_instance_id)
+            ogs_free(sbi_object->nf_type_arrayi.nf_instance_id);
+    }
 }
 
 ogs_sbi_xact_t *ogs_sbi_xact_add(

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/lib/sbi/context.h -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/lib/sbi/context.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -202,8 +202,9 @@
     ogs_sbi_obj_type_e type;
 
     struct {
-        ogs_sbi_nf_instance_t *nf_instance;
+        char *nf_instance_id;
 
+#if ENABLE_VALIDITY_TIMEOUT
         /*
          * Search.Result stored in nf_instance->time.validity_duration;
          *
@@ -213,6 +214,7 @@
          * if no validityPeriod in SearchResult, validity_timeout is 0.
          */
         ogs_time_t validity_timeout;
+#endif
     } nf_type_arrayOGS_SBI_MAX_NUM_OF_NF_TYPE,
       service_type_arrayOGS_SBI_MAX_NUM_OF_SERVICE_TYPE;
 
@@ -478,49 +480,77 @@
 
 int ogs_sbi_default_client_port(OpenAPI_uri_scheme_e scheme);
 
+#if ENABLE_VALIDITY_TIMEOUT
 #define OGS_SBI_SETUP_NF_INSTANCE(__cTX, __nFInstance) \
     do { \
         ogs_assert(__nFInstance); \
         ogs_assert((__nFInstance)->id); \
+        ogs_assert((__nFInstance)->nf_type); \
         ogs_assert((__nFInstance)->t_validity); \
         \
-        if ((__cTX).nf_instance) { \
-            ogs_warn("%s NF Instance updated type:%s validity:%ds", \
-                    ((__cTX).nf_instance)->id, \
-                    OpenAPI_nf_type_ToString(((__cTX).nf_instance)->nf_type), \
-                    ((__cTX).nf_instance)->time.validity_duration); \
+        if ((__cTX).nf_instance_id) { \
+            ogs_warn("%s Unlink NF Instance " \
+                    "type:%s validity:%d timeout:%lds", \
+                    ((__cTX).nf_instance_id), \
+                    OpenAPI_nf_type_ToString((__nFInstance)->nf_type), \
+                    (__nFInstance)->time.validity_duration, \
+                    (long)((__cTX).validity_timeout)); \
+            ogs_free((__cTX).nf_instance_id); \
         } \
         \
-        ((__cTX).nf_instance) = __nFInstance; \
+        ((__cTX).nf_instance_id) = ogs_strdup((__nFInstance)->id); \
         if ((__nFInstance)->time.validity_duration) { \
             ((__cTX).validity_timeout) = (__nFInstance)->t_validity->timeout; \
         } else { \
             ((__cTX).validity_timeout) = 0; \
         } \
-        ogs_info("%s NF Instance setup type:%s validity:%ds", \
-                (__nFInstance)->id, \
+        ogs_info("%s Setup NF Instance type:%s validity:%d timeout:%lds", \
+                ((__cTX).nf_instance_id), \
                 OpenAPI_nf_type_ToString((__nFInstance)->nf_type), \
-                (__nFInstance)->time.validity_duration); \
+                (__nFInstance)->time.validity_duration, \
+                (long)((__cTX).validity_timeout)); \
     } while(0)
+#else
+#define OGS_SBI_SETUP_NF_INSTANCE(__cTX, __nFInstance) \
+    do { \
+        ogs_assert(__nFInstance); \
+        ogs_assert((__nFInstance)->id); \
+        ogs_assert((__nFInstance)->nf_type); \
+        \
+        if ((__cTX).nf_instance_id) { \
+            ogs_warn("%s Unlink NF Instance type:%s", \
+                    ((__cTX).nf_instance_id), \
+                    OpenAPI_nf_type_ToString((__nFInstance)->nf_type)); \
+            ogs_free((__cTX).nf_instance_id); \
+        } \
+        \
+        ((__cTX).nf_instance_id) = ogs_strdup((__nFInstance)->id); \
+        ogs_info("%s Setup NF Instance type:%s", \
+                ((__cTX).nf_instance_id), \
+                OpenAPI_nf_type_ToString((__nFInstance)->nf_type)); \
+    } while(0)
+#endif
 
 /*
- * Search.Result stored in nf_instance->time.validity_duration;
+ * Issue #3470
  *
- * validity_timeout = nf_instance->validity->timeout =
- *     ogs_get_monotonic_time() + nf_instance->time.validity_duration;
+ * Previously, nf_instance pointers were stored in nf_type_array and
+ * service_type_array. This led to a dangling pointer problem when an
+ * nf_instance was removed via ogs_sbi_nf_instance_remove().
  *
- * if no validityPeriod in SearchResult, validity_timeout is 0.
+ * To resolve this, we now store nf_instance_id instead, and use
+ * ogs_sbi_nf_instance_find(nf_instance_id) to verify the validity of an
+ * nf_instance.
  */
+#if ENABLE_VALIDITY_TIMEOUT
 #define OGS_SBI_GET_NF_INSTANCE(__cTX) \
     ((__cTX).validity_timeout == 0 || \
      (__cTX).validity_timeout > ogs_get_monotonic_time() ? \
-        ((__cTX).nf_instance) : NULL)
-
-#define OGS_SBI_NF_INSTANCE_VALID(__nFInstance) \
-    (((__nFInstance) && ((__nFInstance)->t_validity) && \
-     ((__nFInstance)->time.validity_duration == 0 || \
-      (__nFInstance)->t_validity->timeout > ogs_get_monotonic_time())) ? \
-         true : false)
+        (ogs_sbi_nf_instance_find((__cTX).nf_instance_id)) : NULL)
+#else
+#define OGS_SBI_GET_NF_INSTANCE(__cTX) \
+        ogs_sbi_nf_instance_find((__cTX).nf_instance_id)
+#endif
 
 bool ogs_sbi_discovery_param_is_matched(
         ogs_sbi_nf_instance_t *nf_instance,

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/lib/sbi/mhd-server.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/lib/sbi/mhd-server.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/lib/sbi/nghttp2-server.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/lib/sbi/nghttp2-server.c Changed

@@ -30,6 +30,7 @@
 
 static int server_start(ogs_sbi_server_t *server,
         int (*cb)(ogs_sbi_request_t *request, void *data));
+static void server_graceful_shutdown(ogs_sbi_server_t *server);
 static void server_stop(ogs_sbi_server_t *server);
 
 static bool server_send_rspmem_persistent(
@@ -47,6 +48,7 @@
     server_final,
 
     server_start,
+    server_graceful_shutdown,
     server_stop,
 
     server_send_rspmem_persistent,
@@ -442,6 +444,33 @@
     return OGS_OK;
 }
 
+/* Gracefully shutdown the server by sending GOAWAY to each session. */
+static void server_graceful_shutdown(ogs_sbi_server_t *server)
+{
+    ogs_sbi_session_t *sbi_sess = NULL;
+    ogs_sbi_session_t *next_sbi_sess = NULL;
+    int rv;
+
+    /* Iterate over all active sessions in the server. */
+    ogs_list_for_each_safe(&server->session_list, next_sbi_sess, sbi_sess) {
+        /* Submit a GOAWAY frame using the last stream ID. */
+        rv = nghttp2_submit_goaway(sbi_sess->session,
+                                   NGHTTP2_FLAG_NONE,
+                                   sbi_sess->last_stream_id,
+                                   NGHTTP2_NO_ERROR,
+                                   NULL, 0);
+        if (rv != 0) {
+            ogs_error("nghttp2_submit_goaway() failed (%d:%s)",
+                      rv, nghttp2_strerror(rv));
+        }
+
+        /* Send the GOAWAY frame to the client. */
+        if (session_send(sbi_sess) != OGS_OK) {
+            ogs_error("session_send() failed during graceful shutdown");
+        }
+    }
+}
+
 static void server_stop(ogs_sbi_server_t *server)
 {
     ogs_assert(server);

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/lib/sbi/path.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/lib/sbi/path.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/lib/sbi/server.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/lib/sbi/server.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/lib/sbi/server.h -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/lib/sbi/server.h Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/amf/gmm-handler.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/amf/gmm-handler.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/amf/init.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/amf/init.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/amf/namf-build.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/amf/namf-build.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/amf/namf-handler.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/amf/namf-handler.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/amf/nnrf-handler.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/amf/nnrf-handler.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/amf/sbi-path.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/amf/sbi-path.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/ausf/init.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/ausf/init.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/bsf/init.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/bsf/init.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/nrf/init.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/nrf/init.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/nssf/init.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/nssf/init.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/pcf/init.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/pcf/init.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/scp/context.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/scp/context.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/scp/context.h -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/scp/context.h Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/scp/init.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/scp/init.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/sepp/context.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/sepp/context.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/sepp/context.h -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/sepp/context.h Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/sepp/init.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/sepp/init.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/smf/init.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/smf/init.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/udm/init.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/udm/init.c Changed

open5gs_2.7.2.4623.6c67.202503032026.tar.xz/src/udr/init.c -> open5gs_2.7.2.4625.4012.202503042026.tar.xz/src/udr/init.c Changed

Changes of Revision 986