Osmocom Open Build Service

open5gs_2.6.4.99.8a3db.202309182026.dsc -> open5gs_2.6.4.102.227d.202309192026.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.4.99.8a3db.202309182026
+Version: 2.6.4.102.227d.202309192026
 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:
- 0a9cb96249f94a267ae03da4f1f9e468fda8665c 14393064 open5gs_2.6.4.99.8a3db.202309182026.tar.xz
+ e48676050b307feae98d189a586413387c1eb065 14393168 open5gs_2.6.4.102.227d.202309192026.tar.xz
 Checksums-Sha256:
- 9947990a2e048a29a9f03fdc2e46afba812d7b86836395884f9f8236d39ee767 14393064 open5gs_2.6.4.99.8a3db.202309182026.tar.xz
+ dc150afee3e848afd110fd96cb7e58d7ed4a7e4c3542407a21993d3229f102c2 14393168 open5gs_2.6.4.102.227d.202309192026.tar.xz
 Files:
- f65e3fedd2bb2e920b19413583e9a114 14393064 open5gs_2.6.4.99.8a3db.202309182026.tar.xz
+ 6652b53dbc9ea0f8c27c7bb30ef2efbf 14393168 open5gs_2.6.4.102.227d.202309192026.tar.xz

open5gs_2.6.4.99.8a3db.202309182026.tar.xz/.tarball-version -> open5gs_2.6.4.102.227d.202309192026.tar.xz/.tarball-version Changed

open5gs_2.6.4.99.8a3db.202309182026.tar.xz/debian/changelog -> open5gs_2.6.4.102.227d.202309192026.tar.xz/debian/changelog Changed

open5gs_2.6.4.99.8a3db.202309182026.tar.xz/docs/assets/webui/install -> open5gs_2.6.4.102.227d.202309192026.tar.xz/docs/assets/webui/install Changed

open5gs_2.6.4.99.8a3db.202309182026.tar.xz/lib/pfcp/context.c -> open5gs_2.6.4.102.227d.202309192026.tar.xz/lib/pfcp/context.c Changed

@@ -143,6 +143,62 @@
     return OGS_OK;
 }
 
+static int ogs_pfcp_check_subnet_overlapping(void)
+{
+    ogs_pfcp_subnet_t *subnet = NULL;
+    ogs_pfcp_subnet_t *next_subnet = NULL;
+    char buf1OGS_ADDRSTRLEN;
+    char buf2OGS_ADDRSTRLEN;
+    int rv = OGS_OK;
+
+    ogs_list_for_each(&self.subnet_list, subnet){
+        for (next_subnet = ogs_list_next(subnet); (next_subnet);
+                next_subnet = ogs_list_next(next_subnet)) {
+            if (strcmp(subnet->dnn, next_subnet->dnn) == 0 &&
+                subnet->gw.family == next_subnet->gw.family) {
+                uint32_t *addr1 = subnet->sub.sub;
+                uint32_t *addr2 = next_subnet->sub.sub;
+                uint32_t mask4;
+                int i;
+                /* Get smaller subnet mask for IPv4 or IPv6 */
+                for (i = 0; i < 4 ; i++) {
+                    maski = (subnet->sub.maski & next_subnet->sub.maski);
+                }
+                /* Compare masked subnets if they overlap */
+                if (subnet->gw.family == AF_INET) {
+                    if ((addr10 & mask0) == (addr20 & mask0)) {
+                        ogs_error("Overlapping subnets in SMF configuration file: %s/%d and %s/%d",
+                                OGS_INET_NTOP(&subnet->gw.sub0, buf1),
+                                subnet->prefixlen,
+                                OGS_INET_NTOP(&next_subnet->gw.sub0, buf2),
+                                next_subnet->prefixlen);
+                        rv = OGS_ERROR;
+                    }
+                } else if (subnet->gw.family == AF_INET6) {
+                    if (((addr10 & mask0) == (addr20 & mask0)) &&
+                        ((addr11 & mask1) == (addr21 & mask1)) &&
+                        ((addr12 & mask2) == (addr22 & mask2)) &&
+                        ((addr13 & mask3) == (addr23 & mask3))) {
+                        ogs_error("Overlapping subnets in SMF configuration file: %s/%d and %s/%d",
+                                OGS_INET6_NTOP(&subnet->gw.sub0, buf1),
+                                subnet->prefixlen,
+                                OGS_INET6_NTOP(&next_subnet->gw.sub0, buf2),
+                                next_subnet->prefixlen);
+                        rv = OGS_ERROR;
+                    }
+                } else {
+                    ogs_error("Invalid family in subnet configuration %d",
+                            subnet->gw.family);
+                    rv = OGS_ERROR;
+                    ogs_assert_if_reached();
+                }
+            }
+        }
+    }
+
+    return rv;
+}
+
 static int ogs_pfcp_context_validation(const char *local)
 {
     if (ogs_list_first(&self.pfcp_list) == NULL &&
@@ -150,6 +206,9 @@
         ogs_error("No %s.pfcp: in '%s'", local, ogs_app()->file);
         return OGS_ERROR;
     }
+    if (ogs_pfcp_check_subnet_overlapping() != OGS_OK)
+        return OGS_ERROR;
+
     return OGS_OK;
 }
 
@@ -1892,16 +1951,8 @@
         subnet = ogs_pfcp_find_subnet(family);
 
     if (subnet == NULL) {
-        ogs_error("CHECK CONFIGURATION: Cannot find subnet family:%d, dnn:%s",
-                    family, dnn ? dnn : "No DNN");
-        ogs_error("Please add FALLBACK subnet as below.");
-        ogs_error("    subnet:");
-        if (family == AF_INET)
-            ogs_error("     - addr: 10.50.0.1/16");
-        else if (family == AF_INET6)
-            ogs_error("     - addr: 2001:db8:abcd::1/48");
-
-        *cause_value = OGS_PFCP_CAUSE_SYSTEM_FAILURE;
+        ogs_error("All IP addresses in all subnets are occupied");
+        *cause_value = OGS_PFCP_CAUSE_NO_RESOURCES_AVAILABLE;
         return NULL;
     }
 
@@ -2062,7 +2113,8 @@
 
     ogs_list_for_each(&self.subnet_list, subnet) {
         if ((subnet->family == AF_UNSPEC || subnet->family == family) &&
-            (strlen(subnet->dnn) == 0))
+            (strlen(subnet->dnn) == 0) &&
+            subnet->pool.avail)
             break;
     }
 
@@ -2079,7 +2131,8 @@
     ogs_list_for_each(&self.subnet_list, subnet) {
         if ((subnet->family == AF_UNSPEC || subnet->family == family) &&
             (strlen(subnet->dnn) == 0 ||
-                (strlen(subnet->dnn) && ogs_strcasecmp(subnet->dnn, dnn) == 0)))
+                (strlen(subnet->dnn) && ogs_strcasecmp(subnet->dnn, dnn) == 0)) &&
+            subnet->pool.avail)
             break;
     }

Changes of Revision 455