Osmocom Open Build Service

commit_0e0085c69f0c7bd00c93c9dc5145c75ea6cee194.txt Added

commit_ce7b60dbb52a898f51834f923e87dddc45462a39.txt Deleted

open5gs_2.5.5.90.ce7b6.dsc -> open5gs_2.5.5.91.0e00.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.90.ce7b6
+Version: 2.5.5.91.0e00
 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:
- 3728e322b356c019549a3debfb053c3091aa8428 13609484 open5gs_2.5.5.90.ce7b6.tar.xz
+ c6b83e79c9ca7b0645d812b852cab237296ac27f 13608528 open5gs_2.5.5.91.0e00.tar.xz
 Checksums-Sha256:
- fc55d0fb629bf1e7c4da6fa8e61a7a66db8d35f0646884d924c8ffbf0bf6a1c1 13609484 open5gs_2.5.5.90.ce7b6.tar.xz
+ 11edb7fdbd79057a933398866ee17226863258d7c4cf1aaae39c7435c8f97c19 13608528 open5gs_2.5.5.91.0e00.tar.xz
 Files:
- 73977d71ffdb5901c2a2e9466943905a 13609484 open5gs_2.5.5.90.ce7b6.tar.xz
+ 954a4e486d856dc273b3af6afacbfaab 13608528 open5gs_2.5.5.91.0e00.tar.xz

open5gs_2.5.5.90.ce7b6.tar.xz/.tarball-version -> open5gs_2.5.5.91.0e00.tar.xz/.tarball-version Changed

open5gs_2.5.5.90.ce7b6.tar.xz/debian/changelog -> open5gs_2.5.5.91.0e00.tar.xz/debian/changelog Changed

open5gs_2.5.5.90.ce7b6.tar.xz/lib/pfcp/context.c -> open5gs_2.5.5.91.0e00.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.5.90.ce7b6.tar.xz/lib/pfcp/context.h -> open5gs_2.5.5.91.0e00.tar.xz/lib/pfcp/context.h Changed

open5gs_2.5.5.90.ce7b6.tar.xz/tests/vonr/simple-test.c -> open5gs_2.5.5.91.0e00.tar.xz/tests/vonr/simple-test.c Changed

Changes of Revision 110