Osmocom Open Build Service

open5gs_2.7.6.4819.964b.202511261800.dsc -> open5gs_2.7.6.4820.8860.202511271800.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.6.4819.964b.202511261800
+Version: 2.7.6.4820.8860.202511271800
 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:
- 0eea054b149bb517776b3b805cd8c183a95d3d70 15093588 open5gs_2.7.6.4819.964b.202511261800.tar.xz
+ 9ce69ef54f2a554a5dbe599f43d20d1ab29cf68f 15094892 open5gs_2.7.6.4820.8860.202511271800.tar.xz
 Checksums-Sha256:
- 0705f8bb038d2b464d849edc9e6c350a3c5d012e20549e665631316fc7dd36be 15093588 open5gs_2.7.6.4819.964b.202511261800.tar.xz
+ e5fe32de990378a12d3835c946f716e66a915a29239c2cd26cd6ed1323c584d8 15094892 open5gs_2.7.6.4820.8860.202511271800.tar.xz
 Files:
- caed595ebbcedda625f0e4fac37c44f5 15093588 open5gs_2.7.6.4819.964b.202511261800.tar.xz
+ 6289776543db19342bdf8ac5f20d23db 15094892 open5gs_2.7.6.4820.8860.202511271800.tar.xz

open5gs_2.7.6.4819.964b.202511261800.tar.xz/.tarball-version -> open5gs_2.7.6.4820.8860.202511271800.tar.xz/.tarball-version Changed

open5gs_2.7.6.4819.964b.202511261800.tar.xz/debian/changelog -> open5gs_2.7.6.4820.8860.202511271800.tar.xz/debian/changelog Changed

open5gs_2.7.6.4819.964b.202511261800.tar.xz/lib/pfcp/context.c -> open5gs_2.7.6.4820.8860.202511271800.tar.xz/lib/pfcp/context.c Changed

@@ -1399,7 +1399,7 @@
     return OGS_PFCP_CAUSE_REQUEST_ACCEPTED;
 }
 
-void ogs_pfcp_object_teid_hash_set(
+uint8_t ogs_pfcp_object_teid_hash_set(
         ogs_pfcp_object_type_e type, ogs_pfcp_pdr_t *pdr,
         bool restoration_indication)
 {
@@ -1429,12 +1429,20 @@
                     &ogs_gtp_self()->gtpu_resource_list,
                     pdr->dnn, pdr->src_if);
             if (resource) {
-                ogs_assert(
-                    (resource->info.v4 && pdr->f_teid.ipv4) ||
-                    (resource->info.v6 && pdr->f_teid.ipv6));
-                ogs_assert(OGS_OK ==
-                    ogs_pfcp_user_plane_ip_resource_info_to_f_teid(
-                    &resource->info, &pdr->f_teid, &pdr->f_teid_len));
+                if (!((resource->info.v4 && pdr->f_teid.ipv4) ||
+                      (resource->info.v6 && pdr->f_teid.ipv6))) {
+                    ogs_error("CH F-TEID address family mismatch: "
+                            "resourcev4:%d v6:%d fteidv4:%d v6:%d",
+                            resource->info.v4, resource->info.v6,
+                            pdr->f_teid.ipv4, pdr->f_teid.ipv6);
+                    return OGS_PFCP_CAUSE_REQUEST_REJECTED;
+                }
+                if (OGS_OK != ogs_pfcp_user_plane_ip_resource_info_to_f_teid(
+                        &resource->info, &pdr->f_teid, &pdr->f_teid_len)) {
+                    ogs_error("user_plane_ip_resource_info_to_f_teid() "
+                            "failed in CH path");
+                    return OGS_PFCP_CAUSE_REQUEST_REJECTED;
+                }
                 if (resource->info.teidri)
                     pdr->f_teid.teid = OGS_PFCP_GTPU_INDEX_TO_TEID(
                             pdr->teid, resource->info.teidri,
@@ -1442,16 +1450,26 @@
                 else
                     pdr->f_teid.teid = pdr->teid;
             } else {
-                ogs_assert(
-                    (ogs_gtp_self()->gtpu_addr && pdr->f_teid.ipv4) ||
-                    (ogs_gtp_self()->gtpu_addr6 && pdr->f_teid.ipv6));
-                ogs_assert(OGS_OK ==
-                    ogs_pfcp_sockaddr_to_f_teid(
+                if (!((ogs_gtp_self()->gtpu_addr && pdr->f_teid.ipv4) ||
+                    (ogs_gtp_self()->gtpu_addr6 && pdr->f_teid.ipv6))) {
+                    ogs_error("CH F-TEID address family mismatch with local "
+                            "GTP-U address: gtpuv4:%p v6:%p "
+                            "fteidv4:%d v6:%d",
+                            ogs_gtp_self()->gtpu_addr,
+                            ogs_gtp_self()->gtpu_addr6,
+                            pdr->f_teid.ipv4, pdr->f_teid.ipv6);
+                    return OGS_PFCP_CAUSE_REQUEST_REJECTED;
+                }
+                if (OGS_OK != ogs_pfcp_sockaddr_to_f_teid(
                         pdr->f_teid.ipv4 ?
                             ogs_gtp_self()->gtpu_addr : NULL,
                         pdr->f_teid.ipv6 ?
                             ogs_gtp_self()->gtpu_addr6 : NULL,
-                        &pdr->f_teid, &pdr->f_teid_len));
+                        &pdr->f_teid, &pdr->f_teid_len)) {
+                    ogs_error("ogs_pfcp_sockaddr_to_f_teid() "
+                            "failed in CH path");
+                    return OGS_PFCP_CAUSE_REQUEST_REJECTED;
+                }
                 pdr->f_teid.teid = pdr->teid;
             }
         }
@@ -1478,6 +1496,8 @@
         ogs_fatal("Unknown type %d", type);
         ogs_assert_if_reached();
     }
+
+    return OGS_PFCP_CAUSE_REQUEST_ACCEPTED;
 }
 
 ogs_pfcp_object_t *ogs_pfcp_object_find_by_teid(uint32_t teid)

open5gs_2.7.6.4819.964b.202511261800.tar.xz/lib/pfcp/context.h -> open5gs_2.7.6.4820.8860.202511271800.tar.xz/lib/pfcp/context.h Changed

open5gs_2.7.6.4819.964b.202511261800.tar.xz/src/sgwu/sxa-handler.c -> open5gs_2.7.6.4820.8860.202511271800.tar.xz/src/sgwu/sxa-handler.c Changed

open5gs_2.7.6.4819.964b.202511261800.tar.xz/src/upf/n4-handler.c -> open5gs_2.7.6.4820.8860.202511271800.tar.xz/src/upf/n4-handler.c Changed

Changes of Revision 1252