Osmocom Open Build Service

open5gs_2.5.7.dsc -> open5gs_2.5.8.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.7
+Version: 2.5.8
 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:
- d6c5d6d5f14991e71f3563c490835e14abd4db90 13114432 open5gs_2.5.7.tar.xz
+ e897336da0dd76c1ec44566c805b0790198a4625 13114496 open5gs_2.5.8.tar.xz
 Checksums-Sha256:
- 9304b8df7b683fe9f2e3fa592297e75690285476e613f687c2e4d39c36bf4769 13114432 open5gs_2.5.7.tar.xz
+ f3ddbb82da91464a5ffdcb11f039fbf42b0dfe5b200796e8162f0bfb72430575 13114496 open5gs_2.5.8.tar.xz
 Files:
- 93d783f336c306276721bfd5dc88e74d 13114432 open5gs_2.5.7.tar.xz
+ 9788e2808cc95a64f41d19c33cfe8307 13114496 open5gs_2.5.8.tar.xz

open5gs_2.5.7.tar.xz/.tarball-version -> open5gs_2.5.8.tar.xz/.tarball-version Changed

open5gs_2.5.7.tar.xz/debian/changelog -> open5gs_2.5.8.tar.xz/debian/changelog Changed

open5gs_2.5.7.tar.xz/lib/app/ogs-context.c -> open5gs_2.5.8.tar.xz/lib/app/ogs-context.c Changed

open5gs_2.5.7.tar.xz/lib/core/ogs-pkbuf.c -> open5gs_2.5.8.tar.xz/lib/core/ogs-pkbuf.c Changed

@@ -28,15 +28,27 @@
 #define OGS_CLUSTER_512_SIZE    512
 #define OGS_CLUSTER_1024_SIZE   1024
 #define OGS_CLUSTER_2048_SIZE   2048
-#define OGS_CLUSTER_8192_SIZE   8192
-#define OGS_CLUSTER_BIG_SIZE    1024*1024
+#define OGS_CLUSTER_16384_SIZE  16384
+
+/*
+ *
+ * In lib/core/ogs-kqueue.c:69
+ *   context->change_list = ogs_calloc(
+ *       pollset->capacity, sizeof(struct kevent));
+ *   1. pollset->capacity : 1024*16
+ *   2. sizeof(struct kevent) : 64
+ *   3. sizeof(ogs_pkbuf_t *) is headroom in ogs_calloc()
+ *
+ * So, we use BIG_SIZE : 1024*(16*64=1024)*64+8
+ */
+#define OGS_CLUSTER_BIG_SIZE    (1024*1024+sizeof(ogs_pkbuf_t *))
 
 typedef uint8_t ogs_cluster_128_tOGS_CLUSTER_128_SIZE;
 typedef uint8_t ogs_cluster_256_tOGS_CLUSTER_256_SIZE;
 typedef uint8_t ogs_cluster_512_tOGS_CLUSTER_512_SIZE;
 typedef uint8_t ogs_cluster_1024_tOGS_CLUSTER_1024_SIZE;
 typedef uint8_t ogs_cluster_2048_tOGS_CLUSTER_2048_SIZE;
-typedef uint8_t ogs_cluster_8192_tOGS_CLUSTER_8192_SIZE;
+typedef uint8_t ogs_cluster_16384_tOGS_CLUSTER_16384_SIZE;
 typedef uint8_t ogs_cluster_big_tOGS_CLUSTER_BIG_SIZE;
 
 OGS_STATIC_ASSERT(sizeof(ogs_cluster_128_t) % sizeof(void *) == 0);
@@ -44,7 +56,7 @@
 OGS_STATIC_ASSERT(sizeof(ogs_cluster_512_t) % sizeof(void *) == 0);
 OGS_STATIC_ASSERT(sizeof(ogs_cluster_1024_t) % sizeof(void *) == 0);
 OGS_STATIC_ASSERT(sizeof(ogs_cluster_2048_t) % sizeof(void *) == 0);
-OGS_STATIC_ASSERT(sizeof(ogs_cluster_8192_t) % sizeof(void *) == 0);
+OGS_STATIC_ASSERT(sizeof(ogs_cluster_16384_t) % sizeof(void *) == 0);
 OGS_STATIC_ASSERT(sizeof(ogs_cluster_big_t) % sizeof(void *) == 0);
 
 typedef struct ogs_pkbuf_pool_s {
@@ -56,7 +68,7 @@
     OGS_POOL(cluster_512, ogs_cluster_512_t);
     OGS_POOL(cluster_1024, ogs_cluster_1024_t);
     OGS_POOL(cluster_2048, ogs_cluster_2048_t);
-    OGS_POOL(cluster_8192, ogs_cluster_8192_t);
+    OGS_POOL(cluster_16384, ogs_cluster_16384_t);
     OGS_POOL(cluster_big, ogs_cluster_big_t);
 
     ogs_thread_mutex_t mutex;
@@ -104,7 +116,7 @@
     config->cluster_512_pool = 4096;
     config->cluster_1024_pool = 2048;
     config->cluster_2048_pool = 1024;
-    config->cluster_8192_pool = 512;
+    config->cluster_16384_pool = 512;
     config->cluster_big_pool = 8;
 #endif
 }
@@ -139,7 +151,7 @@
 
     tmp = config->cluster_128_pool + config->cluster_256_pool +
         config->cluster_512_pool + config->cluster_1024_pool +
-        config->cluster_2048_pool + config->cluster_8192_pool +
+        config->cluster_2048_pool + config->cluster_16384_pool +
         config->cluster_big_pool;
 
     ogs_pool_init(&pool->pkbuf, tmp);
@@ -150,7 +162,7 @@
     ogs_pool_init(&pool->cluster_512, config->cluster_512_pool);
     ogs_pool_init(&pool->cluster_1024, config->cluster_1024_pool);
     ogs_pool_init(&pool->cluster_2048, config->cluster_2048_pool);
-    ogs_pool_init(&pool->cluster_8192, config->cluster_8192_pool);
+    ogs_pool_init(&pool->cluster_16384, config->cluster_16384_pool);
     ogs_pool_init(&pool->cluster_big, config->cluster_big_pool);
 #endif
 
@@ -188,7 +200,7 @@
     ogs_pool_final(&pool->cluster_512);
     ogs_pool_final(&pool->cluster_1024);
     ogs_pool_final(&pool->cluster_2048);
-    ogs_pool_final(&pool->cluster_8192);
+    ogs_pool_final(&pool->cluster_16384);
     ogs_pool_final(&pool->cluster_big);
 
     ogs_thread_mutex_destroy(&pool->mutex);
@@ -378,10 +390,10 @@
         ogs_pool_alloc(&pool->cluster_2048, (ogs_cluster_2048_t**)&buffer);
         ogs_expect_or_return_val(buffer, NULL);
         cluster->size = OGS_CLUSTER_2048_SIZE;
-    } else if (size <= OGS_CLUSTER_8192_SIZE) {
-        ogs_pool_alloc(&pool->cluster_8192, (ogs_cluster_8192_t**)&buffer);
+    } else if (size <= OGS_CLUSTER_16384_SIZE) {
+        ogs_pool_alloc(&pool->cluster_16384, (ogs_cluster_16384_t**)&buffer);
         ogs_expect_or_return_val(buffer, NULL);
-        cluster->size = OGS_CLUSTER_8192_SIZE;
+        cluster->size = OGS_CLUSTER_16384_SIZE;
     } else if (size <= OGS_CLUSTER_BIG_SIZE) {
         ogs_pool_alloc(&pool->cluster_big, (ogs_cluster_big_t**)&buffer);
         ogs_expect_or_return_val(buffer, NULL);
@@ -419,9 +431,9 @@
         ogs_pool_free(
                 &pool->cluster_2048, (ogs_cluster_2048_t*)cluster->buffer);
         break;
-    case OGS_CLUSTER_8192_SIZE:
+    case OGS_CLUSTER_16384_SIZE:
         ogs_pool_free(
-                &pool->cluster_8192, (ogs_cluster_8192_t*)cluster->buffer);
+                &pool->cluster_16384, (ogs_cluster_16384_t*)cluster->buffer);
         break;
     case OGS_CLUSTER_BIG_SIZE:
         ogs_pool_free(&pool->cluster_big, (ogs_cluster_big_t*)cluster->buffer);

open5gs_2.5.7.tar.xz/lib/core/ogs-pkbuf.h -> open5gs_2.5.8.tar.xz/lib/core/ogs-pkbuf.h Changed

open5gs_2.5.7.tar.xz/lib/core/ogs-strings.h -> open5gs_2.5.8.tar.xz/lib/core/ogs-strings.h Changed

open5gs_2.5.7.tar.xz/lib/pfcp/context.c -> open5gs_2.5.8.tar.xz/lib/pfcp/context.c Changed

@@ -929,6 +929,20 @@
             self.object_teid_hash, &teid, sizeof(teid));
 }
 
+int ogs_pfcp_object_count_by_teid(ogs_pfcp_sess_t *sess, uint32_t teid)
+{
+    ogs_pfcp_pdr_t *pdr = NULL;
+    int count = 0;
+
+    ogs_assert(sess);
+
+    ogs_list_for_each(&sess->pdr_list, pdr) {
+        if (pdr->f_teid.teid == teid) count++;
+    }
+
+    return count;
+}
+
 ogs_pfcp_pdr_t *ogs_pfcp_pdr_find_by_choose_id(
         ogs_pfcp_sess_t *sess, uint8_t choose_id)
 {
@@ -997,9 +1011,21 @@
 
     ogs_pfcp_rule_remove_all(pdr);
 
-    if (pdr->hash.teid.len)
-        ogs_hash_set(self.object_teid_hash,
-                &pdr->hash.teid.key, pdr->hash.teid.len, NULL);
+    if (pdr->hash.teid.len) {
+        /*
+         * Issues #2003
+         *
+         * In 5G Core, two PDRs can use different QFIDs for the same TEID.
+         * So, before deleting a TEID, we should check if there is a PDR
+         * using the same TEID.
+         *
+         * Since this PDR has already been deleted with ogs_list_remove() above,
+         * if the current list has a TEID count of 0, there are no other PDRs.
+         */
+        if (ogs_pfcp_object_count_by_teid(pdr->sess, pdr->f_teid.teid) == 0)
+            ogs_hash_set(self.object_teid_hash,
+                    &pdr->hash.teid.key, pdr->hash.teid.len, NULL);
+    }
 
     if (pdr->dnn)
         ogs_free(pdr->dnn);

open5gs_2.5.7.tar.xz/lib/pfcp/context.h -> open5gs_2.5.8.tar.xz/lib/pfcp/context.h Changed

open5gs_2.5.7.tar.xz/lib/pfcp/rule-match.c -> open5gs_2.5.8.tar.xz/lib/pfcp/rule-match.c Changed

open5gs_2.5.7.tar.xz/lib/proto/types.h -> open5gs_2.5.8.tar.xz/lib/proto/types.h Changed

open5gs_2.5.7.tar.xz/lib/sbi/client.c -> open5gs_2.5.8.tar.xz/lib/sbi/client.c Changed

open5gs_2.5.7.tar.xz/meson.build -> open5gs_2.5.8.tar.xz/meson.build Changed

open5gs_2.5.7.tar.xz/src/amf/nas-path.c -> open5gs_2.5.8.tar.xz/src/amf/nas-path.c Changed

open5gs_2.5.7.tar.xz/src/scp/sbi-path.c -> open5gs_2.5.8.tar.xz/src/scp/sbi-path.c Changed

open5gs_2.5.7.tar.xz/src/upf/gtp-path.c -> open5gs_2.5.8.tar.xz/src/upf/gtp-path.c Changed

open5gs_2.5.7.tar.xz/tests/registration/multi-ue-test.c -> open5gs_2.5.8.tar.xz/tests/registration/multi-ue-test.c Changed

open5gs_2.5.7.tar.xz/tests/vonr/simple-test.c -> open5gs_2.5.8.tar.xz/tests/vonr/simple-test.c Changed

Changes of Revision 12