Osmocom Open Build Service

commit_2b6369e9d997eb8eb158e3803e3ae4f4d207cd4d.txt Deleted

commit_a6830b30a0093ed2fa9d563445bf67026588a8f2.txt Added

open5gs_2.7.0.142.2b636.dsc Deleted

@@ -1,39 +0,0 @@
-Format: 3.0 (native)
-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.0.142.2b636
-Maintainer: Harald Welte <laforge@gnumonks.org>
-Uploaders: Sukchan Lee <acetcom@gmail.com>
-Homepage: https://open5gs.org
-Standards-Version: 4.3.0
-Vcs-Browser: https://github.com/open5gs/open5gs
-Vcs-Git: git://github.com/open5gs/open5gs
-Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), cmake, flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev
-Package-List:
- open5gs deb net optional arch=any
- open5gs-amf deb net optional arch=any
- open5gs-ausf deb net optional arch=any
- open5gs-bsf deb net optional arch=any
- open5gs-common deb net optional arch=any
- open5gs-dbg deb net optional arch=any
- open5gs-hss deb net optional arch=any
- open5gs-mme deb net optional arch=any
- open5gs-nrf deb net optional arch=any
- open5gs-nssf deb net optional arch=any
- open5gs-pcf deb net optional arch=any
- open5gs-pcrf deb net optional arch=any
- open5gs-scp deb net optional arch=any
- open5gs-sepp deb net optional arch=any
- open5gs-sgwc deb net optional arch=any
- open5gs-sgwu deb net optional arch=any
- open5gs-smf deb net optional arch=any
- open5gs-udm deb net optional arch=any
- open5gs-udr deb net optional arch=any
- open5gs-upf deb net optional arch=any
-Checksums-Sha1:
- d54f368b8dff57ea210c61be405f7717e9d54826 14490100 open5gs_2.7.0.142.2b636.tar.xz
-Checksums-Sha256:
- 3a66f1b9bbc9cbaac106152bed1d3736f09bc914b4b800b532595b4b1091fe01 14490100 open5gs_2.7.0.142.2b636.tar.xz
-Files:
- 7b1c08a68b389c2a55b3ec3dbae7a339 14490100 open5gs_2.7.0.142.2b636.tar.xz

open5gs_2.7.0.143.a6830.dsc Added

@@ -0,0 +1,39 @@
+Format: 3.0 (native)
+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.0.143.a6830
+Maintainer: Harald Welte <laforge@gnumonks.org>
+Uploaders: Sukchan Lee <acetcom@gmail.com>
+Homepage: https://open5gs.org
+Standards-Version: 4.3.0
+Vcs-Browser: https://github.com/open5gs/open5gs
+Vcs-Git: git://github.com/open5gs/open5gs
+Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), cmake, flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev
+Package-List:
+ open5gs deb net optional arch=any
+ open5gs-amf deb net optional arch=any
+ open5gs-ausf deb net optional arch=any
+ open5gs-bsf deb net optional arch=any
+ open5gs-common deb net optional arch=any
+ open5gs-dbg deb net optional arch=any
+ open5gs-hss deb net optional arch=any
+ open5gs-mme deb net optional arch=any
+ open5gs-nrf deb net optional arch=any
+ open5gs-nssf deb net optional arch=any
+ open5gs-pcf deb net optional arch=any
+ open5gs-pcrf deb net optional arch=any
+ open5gs-scp deb net optional arch=any
+ open5gs-sepp deb net optional arch=any
+ open5gs-sgwc deb net optional arch=any
+ open5gs-sgwu deb net optional arch=any
+ open5gs-smf deb net optional arch=any
+ open5gs-udm deb net optional arch=any
+ open5gs-udr deb net optional arch=any
+ open5gs-upf deb net optional arch=any
+Checksums-Sha1:
+ 5db4abf9b57d63e770fd8c94cdb21c0e388acc4d 14490488 open5gs_2.7.0.143.a6830.tar.xz
+Checksums-Sha256:
+ 5a72ca4c59ba9772ab3597c4df54251dc5a2cd09855b73ba9e002435fd94cc79 14490488 open5gs_2.7.0.143.a6830.tar.xz
+Files:
+ c8ec923dfd6fafc5b46da603ef2c9c84 14490488 open5gs_2.7.0.143.a6830.tar.xz

open5gs_2.7.0.142.2b636.tar.xz/.tarball-version -> open5gs_2.7.0.143.a6830.tar.xz/.tarball-version Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/310014.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/310014.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/csfb.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/csfb.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/5gc-sepp1-999-70.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/5gc-sepp1-999-70.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/5gc-sepp2-001-01.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/5gc-sepp2-001-01.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/5gc-sepp3-315-010.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/5gc-sepp3-315-010.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/5gc-tls-sepp1-999-70.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/5gc-tls-sepp1-999-70.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/5gc-tls-sepp2-001-01.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/5gc-tls-sepp2-001-01.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/5gc-tls-sepp3-315-010.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/5gc-tls-sepp3-315-010.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/gnb-001-01-ue-001-01.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/gnb-001-01-ue-001-01.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/gnb-001-01-ue-315-010.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/gnb-001-01-ue-315-010.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/gnb-001-01-ue-999-70.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/gnb-001-01-ue-999-70.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/gnb-315-010-ue-001-01.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/gnb-315-010-ue-001-01.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/gnb-315-010-ue-315-010.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/gnb-315-010-ue-315-010.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/gnb-315-010-ue-999-70.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/gnb-315-010-ue-999-70.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/gnb-999-70-ue-001-01.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/gnb-999-70-ue-001-01.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/gnb-999-70-ue-315-010.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/gnb-999-70-ue-315-010.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/examples/gnb-999-70-ue-999-70.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/examples/gnb-999-70-ue-999-70.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/non3gpp.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/non3gpp.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/open5gs/smf.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/open5gs/smf.yaml.in Changed

@@ -34,8 +34,9 @@
       - address: 127.0.0.4
         port: 9090
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -327,23 +328,26 @@
 #  o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48
 #   (If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash.)
 #  session:
-#    - subnet: 10.45.0.1/16
+#    - subnet: 10.45.0.0/16
+#      gateway: 10.45.0.1
 #      dnn: internet
-#    - subnet: 2001:db8:cafe::1/48
+#    - subnet: 2001:db8:cafe::/48
 #      dnn: internet
-#    - subnet: 10.46.0.1/16
+#    - subnet: 10.46.0.0/16
+#      gateway: 10.46.0.1
 #      dnn: ims
-#    - subnet: 2001:db8:babe::1/48
+#    - subnet: 2001:db8:babe::/48
 #      dnn: ims
 #
 #  o Pool Range
 #  session:
-#    - subnet: 10.45.0.1/16
+#    - subnet: 10.45.0.0/16
+#      gateway: 10.45.0.1
 #      range:
 #        - 10.45.0.100-10.45.0.200
 #        - 10.45.1.100-
 #        - -10.45.0.200
-#    - subnet: 2001:db8:cafe::1/48
+#    - subnet: 2001:db8:cafe::/48
 #      range:
 #        - 2001:db8:cafe:a0::0-2001:db8:cafe:b0::0
 #        - 2001:db8:cafe:c0::0-2001:db8:cafe:d0::0

open5gs_2.7.0.142.2b636.tar.xz/configs/open5gs/upf.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/open5gs/upf.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/sample.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/sample.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/slice.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/slice.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/srsenb.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/srsenb.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/volte.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/volte.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/configs/vonr.yaml.in -> open5gs_2.7.0.143.a6830.tar.xz/configs/vonr.yaml.in Changed

open5gs_2.7.0.142.2b636.tar.xz/debian/changelog -> open5gs_2.7.0.143.a6830.tar.xz/debian/changelog Changed

open5gs_2.7.0.142.2b636.tar.xz/lib/pfcp/context.c -> open5gs_2.7.0.143.a6830.tar.xz/lib/pfcp/context.c Changed

@@ -743,6 +743,7 @@
                     do {
                         ogs_pfcp_subnet_t *subnet = NULL;
                         const char *ipstr = NULL;
+                        const char *gateway = NULL;
                         const char *mask_or_numbits = NULL;
                         const char *dnn = NULL;
                         const char *dev = self.tun_ifname;
@@ -781,6 +782,8 @@
                                         mask_or_numbits = (const char *)v;
                                     }
                                 }
+                            } else if (!strcmp(subnet_key, "gateway")) {
+                                gateway = ogs_yaml_iter_value(&subnet_iter);
                             } else if (!strcmp(subnet_key, "apn") ||
                                         !strcmp(subnet_key, "dnn")) {
                                 dnn = ogs_yaml_iter_value(&subnet_iter);
@@ -825,7 +828,7 @@
                         }
 
                         subnet = ogs_pfcp_subnet_add(
-                                ipstr, mask_or_numbits, dnn, dev);
+                                ipstr, mask_or_numbits, gateway, dnn, dev);
                         ogs_assert(subnet);
 
                         subnet->num_of_range = num;
@@ -2150,7 +2153,7 @@
 
 ogs_pfcp_subnet_t *ogs_pfcp_subnet_add(
         const char *ipstr, const char *mask_or_numbits,
-        const char *dnn, const char *ifname)
+        const char *gateway, const char *dnn, const char *ifname)
 {
     int rv;
     ogs_pfcp_dev_t *dev = NULL;
@@ -2179,6 +2182,43 @@
 
         subnet->family = subnet->gw.family;
         subnet->prefixlen = atoi(mask_or_numbits);
+
+        if (memcmp(subnet->gw.sub, subnet->sub.sub,
+                    sizeof(subnet->gw.sub)) != 0) {
+            char *subnet_string = NULL;
+
+            if (subnet->family == AF_INET) {
+                subnet_string = ogs_ipv4_to_string(subnet->sub.sub0);
+                ogs_assert(subnet_string);
+            } else if (subnet->family == AF_INET6) {
+                subnet_string = ogs_ipv6addr_to_string(
+                        (uint8_t*)&subnet->sub.sub0);
+                ogs_assert(subnet_string);
+            }
+
+            ogs_warn("Please change the configuration files of "
+                    "smf.yaml and upf.yaml as below.");
+            ogs_log_print(OGS_LOG_WARN, "\n<OLD Format>\n");
+            ogs_log_print(OGS_LOG_WARN, "smf:\n");
+            ogs_log_print(OGS_LOG_WARN, "  session:\n");
+            ogs_log_print(OGS_LOG_WARN, "    - subnet: %s/%s\n",
+                    ipstr, mask_or_numbits);
+            ogs_log_print(OGS_LOG_WARN, "\n<NEW Format>\n");
+            ogs_log_print(OGS_LOG_WARN, "smf:\n");
+            ogs_log_print(OGS_LOG_WARN, "  session:\n");
+            ogs_log_print(OGS_LOG_WARN, "    - subnet: %s/%s\n",
+                    subnet_string ? subnet_string : "Unknown", mask_or_numbits);
+            if (subnet->family == AF_INET)
+                ogs_log_print(OGS_LOG_WARN, "      gateway: %s", ipstr);
+            ogs_log_print(OGS_LOG_WARN, "\n\n\n");
+
+            ogs_free(subnet_string);
+        }
+    }
+
+    if (gateway) {
+        rv = ogs_ipsubnet(&subnet->gw, gateway, NULL);
+        ogs_assert(rv == OGS_OK);
     }
 
     if (dnn)

open5gs_2.7.0.142.2b636.tar.xz/lib/pfcp/context.h -> open5gs_2.7.0.143.a6830.tar.xz/lib/pfcp/context.h Changed

Changes of Revision 441