Osmocom Open Build Service

open5gs_2.6.4.dsc -> open5gs_2.6.5.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
+Version: 2.6.5
 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:
- 19941fd2e7bf2e13e7bdc6fa9dff9ac4b9029681 14122996 open5gs_2.6.4.tar.xz
+ 5c7410b4625aa07c6230e17fb8a141daac4f5dde 14418884 open5gs_2.6.5.tar.xz
 Checksums-Sha256:
- a12278efe5e45ff8e2e5023bea2d4dcf0e97474e45425df1e5b053388d0e368f 14122996 open5gs_2.6.4.tar.xz
+ 0553f82073e3fed4ec618cd00e9dc342f647e7f3a20fbc79861a9df589b7e8d2 14418884 open5gs_2.6.5.tar.xz
 Files:
- a1e188c2587f18381c9cd77ad9fce6d1 14122996 open5gs_2.6.4.tar.xz
+ 7e8e870d8fb869059fff5f14b6db39c6 14418884 open5gs_2.6.5.tar.xz

open5gs_2.6.5.tar.xz/.github/workflows/cifuzz.yml Added

@@ -0,0 +1,34 @@
+name: CIFuzz
+on: pull_request
+permissions: {}
+jobs:
+ Fuzzing:
+   runs-on: ubuntu-latest
+   permissions:
+     security-events: write
+   steps:
+   - name: Build Fuzzers
+     id: build
+     uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+     with:
+       oss-fuzz-project-name: 'open5gs'
+   - name: Run Fuzzers
+     uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+     with:
+       oss-fuzz-project-name: 'open5gs'
+       fuzz-seconds: 300
+       output-sarif: true
+   - name: Upload Crash
+     uses: actions/upload-artifact@v3
+     if: failure() && steps.build.outcome == 'success'
+     with:
+       name: artifacts
+       path: ./out/artifacts
+   - name: Upload Sarif
+     if: always() && steps.build.outcome == 'success'
+     uses: github/codeql-action/upload-sarif@v2
+     with:
+      # Path to SARIF file relative to the root of the repository
+      sarif_file: cifuzz-sarif/results.sarif
+      checkout_path: cifuzz-sarif
+      category: CIFuzz

open5gs_2.6.4.tar.xz/.tarball-version -> open5gs_2.6.5.tar.xz/.tarball-version Changed

open5gs_2.6.4.tar.xz/configs/310014.yaml.in -> open5gs_2.6.5.tar.xz/configs/310014.yaml.in Changed

open5gs_2.6.4.tar.xz/configs/csfb.yaml.in -> open5gs_2.6.5.tar.xz/configs/csfb.yaml.in Changed

open5gs_2.6.4.tar.xz/configs/non3gpp.yaml.in -> open5gs_2.6.5.tar.xz/configs/non3gpp.yaml.in Changed

open5gs_2.6.4.tar.xz/configs/open5gs/mme.yaml.in -> open5gs_2.6.5.tar.xz/configs/open5gs/mme.yaml.in Changed

@@ -475,6 +475,53 @@
         - ::1
 
 #
+# <GTPv1C Client>
+#
+#  o Specify SGSN addresses the GTPv1C must connect to
+#
+#  o One SGSN is defined.
+#    If prefer_ipv4 is not true, fd69:f21d:873c:fa::2 is selected.
+#  sgsn:
+#    - gtpc:
+#        addr:
+#          - 127.0.0.3
+#          - fd69:f21d:873c:fa::2
+#      routes:
+#      - rai:
+#          lai:
+#            plmn_id:
+#              mcc: 001
+#              mnc: 01
+#            lac: 43690
+#          rac: 187
+#        ci: 1223
+#
+#  o Two SGSNs are defined. Last one is used by default if no
+#    matching RAI+CI route is found.
+#  sgsn:
+#    - gtpc:
+#        addr:
+#          - 127.0.0.3
+#          - fd69:f21d:873c:fa::2
+#      routes:
+#      - rai:
+#          lai:
+#            plmn_id:
+#              mcc: 001
+#              mnc: 01
+#            lac: 43690
+#          rac: 187
+#        ci: 1223
+#    - name: sgsn3.open5gs.org
+#      default_route: true
+#
+sgsn:
+  - gtpc:
+      addr:
+        - 127.0.0.3
+    default_route: true
+
+#
 #  o Disable use of IPv4 addresses (only IPv6)
 #  parameter:
 #    no_ipv4: true
@@ -534,3 +581,5 @@
 #    t3423:
 #      value: 720  # 12 minutes * 60 = 720 seconds
 time:
+  t3412:
+    value: 540     # 9 mintues * 60 = 540 seconds

open5gs_2.6.4.tar.xz/configs/sample.yaml.in -> open5gs_2.6.5.tar.xz/configs/sample.yaml.in Changed

open5gs_2.6.4.tar.xz/configs/slice.yaml.in -> open5gs_2.6.5.tar.xz/configs/slice.yaml.in Changed

open5gs_2.6.4.tar.xz/configs/srsenb.yaml.in -> open5gs_2.6.5.tar.xz/configs/srsenb.yaml.in Changed

open5gs_2.6.4.tar.xz/configs/volte.yaml.in -> open5gs_2.6.5.tar.xz/configs/volte.yaml.in Changed

open5gs_2.6.4.tar.xz/configs/vonr.yaml.in -> open5gs_2.6.5.tar.xz/configs/vonr.yaml.in Changed

open5gs_2.6.4.tar.xz/debian/changelog -> open5gs_2.6.5.tar.xz/debian/changelog Changed

open5gs_2.6.4.tar.xz/docs/_docs/guide/01-quickstart.md -> open5gs_2.6.5.tar.xz/docs/_docs/guide/01-quickstart.md Changed

@@ -68,7 +68,7 @@
 
 **Note:** Package managers can be used to install Open5GS in *Debian/Ubuntu and openSUSE* environments (for major and minor builds). *CentOS, Fedora, and Mac OSX* require you to build with source code({{ site.url }}{{ site.baseurl }}/docs/guide/02-building-open5gs-from-sources).
 {: .notice--warning}
-**Note:** Nighly builds are offered by Osmocom(https://osmocom.org) on OBS(https://build.opensuse.org/package/show/network:osmocom:nightly/open5gs). Scroll down to use a nightly build package.
+**Note:** Nighly builds are offered by Osmocom(https://osmocom.org) on OBS(https://obs.osmocom.org/package/show/osmocom:nightly/open5gs). Scroll down to use a nightly build package.
 {: .notice--warning}
 
 #### Getting MongoDB
@@ -188,10 +188,19 @@
 1. *Debian and Ubuntu* based Linux distributions can install Node.js(https://nodejs.org/) as follows:
 
     ```bash
+    # Download and import the Nodesource GPG key
     $ sudo apt update
-    $ sudo apt install curl
-    $ curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
-    $ sudo apt install nodejs
+    $ sudo apt install -y ca-certificates curl gnupg
+    $ sudo mkdir -p /etc/apt/keyrings
+    $ curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+
+    # Create deb repository
+    $ NODE_MAJOR=20
+    $ echo "deb signed-by=/etc/apt/keyrings/nodesource.gpg https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+
+    # Run Update and Install
+    $ sudo apt update
+    $ sudo apt install nodejs -y
     ```
 
 2. To install Node.js(https://nodejs.org/) on *openSUSE*, run the following:

open5gs_2.6.4.tar.xz/docs/_docs/guide/02-building-open5gs-from-sources.md -> open5gs_2.6.5.tar.xz/docs/_docs/guide/02-building-open5gs-from-sources.md Changed

open5gs_2.6.4.tar.xz/docs/_docs/hardware/01-genodebs.md -> open5gs_2.6.5.tar.xz/docs/_docs/hardware/01-genodebs.md Changed

open5gs_2.6.4.tar.xz/docs/_docs/platform/02-centos.md -> open5gs_2.6.5.tar.xz/docs/_docs/platform/02-centos.md Changed

open5gs_2.6.4.tar.xz/docs/_docs/platform/03-fedora.md -> open5gs_2.6.5.tar.xz/docs/_docs/platform/03-fedora.md Changed

open5gs_2.6.4.tar.xz/docs/_docs/platform/05-macosx-apple-silicon.md -> open5gs_2.6.5.tar.xz/docs/_docs/platform/05-macosx-apple-silicon.md Changed

open5gs_2.6.4.tar.xz/docs/_docs/troubleshoot/02-now-in-github-issues.md -> open5gs_2.6.5.tar.xz/docs/_docs/troubleshoot/02-now-in-github-issues.md Changed

open5gs_2.6.4.tar.xz/docs/_docs/tutorial/01-your-first-lte.md -> open5gs_2.6.5.tar.xz/docs/_docs/tutorial/01-your-first-lte.md Changed

open5gs_2.6.4.tar.xz/docs/_docs/tutorial/03-VoLTE-dockerized.md -> open5gs_2.6.5.tar.xz/docs/_docs/tutorial/03-VoLTE-dockerized.md Changed

@@ -55,8 +55,8 @@
 cd docker_open5gs/base
 docker build --no-cache --force-rm -t docker_open5gs .
 
-cd ../kamailio_base
-docker build --no-cache --force-rm -t open5gs_kamailio .
+cd ../ims_base
+docker build --no-cache --force-rm -t docker_kamailio .
 ```
 
 #### 3. Configuring your setup
@@ -99,7 +99,7 @@
 ```
 cd docker_open5gs
 source .env
-docker-compose build --no-cache
+docker compose build --no-cache
 ```
 
 #### 5. (Optional) Run srsENB in a separate container
@@ -111,15 +111,15 @@
 ```
 cd docker_open5gs
 source .env
-docker-compose -f srsenb.yaml build --no-cache
-docker-compose -f srsenb.yaml up
+docker compose -f srsenb.yaml build --no-cache
+docker compose -f srsenb.yaml up
 ```
 
 #### 6. Configuration and register two UE
 
 If there is a need to change the Core Network component configuration files
 found under their respective folder, make sure to re-compile images using
-`docker-compose build` again.
+`docker compose build` again.
 {: .notice--warning}
 
 Open (http://<DOCKER_HOST_IP>:3000) in a web browser, where <DOCKER_HOST_IP> is

open5gs_2.6.5.tar.xz/docs/_docs/tutorial/05-roaming.md Added

@@ -0,0 +1,955 @@
+---
+title: Roaming
+---
+
+## 0. Introduction
+
+Now, we will explain how to install and test 5G Core Roaming using Open5GS. Since we cannot test roaming with UERANSIM, we will use the test environment of Open5GS. 
+
+We can only use the LBO method. HR roaming will be implemented at a later date. And also, 5G roaming has been implemented according to the document below.
+
+```
+TS29.500
+6 General Functionalities in Service Based Architecture
+6.1 Routing Mechanisms
+6.1.4.3 Routing across PLMN
+```
+
+Let's start the explanation assuming that the connection test of the UE to this single host has been completed.
+
+## 1. Your First Roaming with Test Program
+
+#### Build & Install
+
+We'll start with the `roaming-tier3` branch from now on.
+```
+$ git clone https://github.com/open5gs/open5gs
+$ cd open5gs
+$ git checkout roaming-tier3
+$ meson build --prefix=`pwd`/install
+$ ninja -C build install
+```
+
+#### Configure FQDN to DNS
+
+For routing to Home PLMN, NRF, AUSF and UDM address in H-PLMN shall use FQDN format, so please edit the /etc/hosts file as follows.
+
+```diff
+$ diff -u hosts.old hosts.new
+--- hosts.old	2023-10-02 11:58:54.261154726 +0900
++++ hosts.new	2023-10-02 11:59:02.868771248 +0900
+@@ -1,6 +1,18 @@
+ 127.0.0.1	localhost
+ 127.0.1.1	open5gs
+
++127.0.1.10	nrf.5gc.mnc070.mcc999.3gppnetwork.org
++127.0.1.11	ausf.5gc.mnc070.mcc999.3gppnetwork.org
++127.0.1.12	udm.5gc.mnc070.mcc999.3gppnetwork.org
++
++127.0.2.10	nrf.5gc.mnc001.mcc001.3gppnetwork.org
++127.0.2.11	ausf.5gc.mnc001.mcc001.3gppnetwork.org
++127.0.2.12	udm.5gc.mnc001.mcc001.3gppnetwork.org
++
++127.0.3.10	nrf.5gc.mnc010.mcc315.3gppnetwork.org
++127.0.3.11	ausf.5gc.mnc010.mcc315.3gppnetwork.org
++127.0.3.12	udm.5gc.mnc010.mcc315.3gppnetwork.org
++
+ # The following lines are desirable for IPv6 capable hosts
+ ::1     ip6-localhost ip6-loopback
+ fe00::0 ip6-localnet
+```
+
+
+#### Running V-PLMN 5G Core and H-PLMN 5G Core in the Single Host
+
+5G Core requires root privileges as it uses reserved ports such as http(80) or https(443).
+
+```
+$ sudo ./build/tests/app/5gc -c ./build/configs/examples/5gc-sepp1-999-70.yaml
+$ sudo ./build/tests/app/5gc -c ./build/configs/examples/5gc-sepp2-001-01.yaml
+$ sudo ./build/tests/app/5gc -c ./build/configs/examples/5gc-sepp3-315-010.yaml
+```
+
+Performs a test of UE access while roaming subscribed to H-PLMN.
+```
+$ ./build/tests/registration/registration -c ./build/configs/examples/gnb-999-70-ue-001-01.yaml simple-test
+$ ./build/tests/registration/registration -c ./build/configs/examples/gnb-999-70-ue-315-010.yaml simple-test
+$ ./build/tests/registration/registration -c ./build/configs/examples/gnb-001-01-ue-999-70.yaml simple-test
+$ ./build/tests/registration/registration -c ./build/configs/examples/gnb-001-01-ue-315-010.yaml simple-test
+$ ./build/tests/registration/registration -c ./build/configs/examples/gnb-315-010-ue-999-70.yaml simple-test
+$ ./build/tests/registration/registration -c ./build/configs/examples/gnb-315-010-ue-001-01.yaml simple-test
+```
+
+You can see the sample traffic.  -- 5g-roaming-lbo.pcapng({{ site.url }}{{ site.baseurl }}/assets/pcapng/5g_roaming_lbo.pcapng).
+
+
+## 2. Roaming Deployment
+
+### VM and Subscriber Information
+
+Each VMs are as follows.
+
+- VM1
+```
+Hostname: sepp1.localdomain
+PLMN-ID: MNC(999), MNC(70)
+IP Address: 10.10.1.5
+N32-c: 10.10.1.251
+N32-c: 10.10.1.252
+```
+
+- VM2
+```
+Hostname: sepp2.localdomain
+PLMN-ID: MNC(001), MNC(01)
+IP Address: 10.10.2.5
+N32-c: 10.10.2.251
+N32-c: 10.10.2.252
+```
+
+- VM3
+```
+Hostname: sepp3.localdomain
+PLMN-ID: MNC(003), MNC(03)
+IP Address: 10.10.3.5
+N32-c: 10.10.3.251
+N32-c: 10.10.3.252
+```
+
+- Subscriber
+```
+imsi-999700000000001
+imsi-001010000000001
+imsi-315010000000001
+```
+
+### Setting for VM1
+
+- Edit /etc/hosts
+
+```diff
+ $ diff -u hosts.old hosts.new
+--- hosts.old	2023-10-02 12:22:41.320546720 +0900
++++ hosts.new	2023-10-02 12:22:33.576884651 +0900
+@@ -1,6 +1,10 @@
+ 127.0.0.1	localhost
+ 127.0.1.1	open5gs
+
++127.0.0.10	nrf.5gc.mnc070.mcc999.3gppnetwork.org
++127.0.0.11	ausf.5gc.mnc070.mcc999.3gppnetwork.org
++127.0.0.12	udm.5gc.mnc070.mcc999.3gppnetwork.org
++
+ # The following lines are desirable for IPv6 capable hosts
+ ::1     ip6-localhost ip6-loopback
+ fe00::0 ip6-localnet
+ ```
+
+NRF shall follow TS23.003(28.3.2.3.2 Format of NRF FQDN) for routing.
+
+- Update nrf.yaml
+
+```diff
+$ diff --git a/configs/open5gs/nrf.yaml.in b/configs/open5gs/nrf.yaml.in
+index 3996b2bd9..e57f286b7 100644
+--- a/configs/open5gs/nrf.yaml.in
++++ b/configs/open5gs/nrf.yaml.in
+@@ -13,8 +13,7 @@ nrf:
+           mnc: 70
+     sbi:
+       server:
+-        - address: 127.0.0.10
+-          port: 7777
++        - address: nrf.5gc.mnc070.mcc999.3gppnetwork.org
+
+ ################################################################################
+ # SBI Server
+```
+
+- Update scp.yaml
+
+```diff
+$ diff --git a/configs/open5gs/scp.yaml.in b/configs/open5gs/scp.yaml.in
+index 9be6cdc93..eee7d3e3f 100644
+--- a/configs/open5gs/scp.yaml.in
++++ b/configs/open5gs/scp.yaml.in
+@@ -13,7 +13,7 @@ scp:
+           port: 7777
+       client:
+         nrf:
+-          - uri: http://127.0.0.10:7777
++          - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+
+ ################################################################################
+ # SCP Info
+```
+
+- Update nssf.yaml
+
+```diff
+$ diff --git a/configs/open5gs/nssf.yaml.in b/configs/open5gs/nssf.yaml.in
+index d01645b2c..7d89cffef 100644
+--- a/configs/open5gs/nssf.yaml.in
++++ b/configs/open5gs/nssf.yaml.in
+@@ -17,7 +17,7 @@ nssf:
+         scp:
+           - uri: http://127.0.0.200:7777
+         nsi:
+-          - uri: http://127.0.0.10:7777
++          - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+             s_nssai:

open5gs_2.6.4.tar.xz/docs/_pages/docs.md -> open5gs_2.6.5.tar.xz/docs/_pages/docs.md Changed

@@ -12,10 +12,11 @@
 
 - Tutorials
   - Your First LTE(tutorial/01-your-first-lte)
-  - 5G SA COTS UE(https://docs.srsran.com/en/latest/app_notes/source/5g_sa_COTS/source/index.html) from SRS(https://srs.io)
+  - 5G SA COTS UE(https://docs.srsran.com/projects/project/en/latest/tutorials/source/cotsUE/source/index.html) from SRS(https://srs.io)
   - Metrics with Prometheus(tutorial/04-metrics-prometheus)
   - VoLTE Setup with Kamailio IMS and Open5GS(tutorial/02-VoLTE-setup)
   - Dockerized VoLTE Setup(tutorial/03-VoLTE-dockerized)
+  - Roaming(tutorial/05-roaming)
 
 - Inside Source Code
   - UPF Code Explanation(https://medium.com/@aditya.koranga/open5gs-upf-code-explanation-with-flow-c-79c50f253dd1)
@@ -42,6 +43,7 @@
   - Kubernetes Open5GS Deployment(https://dev.to/infinitydon/virtual-4g-simulation-using-kubernetes-and-gns3-3b7k?fbclid=IwAR1p99h13a-mCfejanbBQe0H0-jp5grXkn5mWf1WrTHf47UtegB2-UHGGZQ)
   - 5G Core SBI mTLS Using External Certificate PKI(https://futuredon.medium.com/5g-core-sbi-mtls-using-external-certificate-pki-4ffc02ac7728)
   - 5G Frame Routing(https://futuredon.medium.com/5g-frame-routing-6e34d8587123)
+  - 5G SCTP LoadBalancer Using LoxiLB(https://futuredon.medium.com/5g-sctp-loadbalancer-using-loxilb-b525198a9103)(Video Link(https://youtu.be/k3ICc7MXcC8))
 
 - @nickvsnetworking
   - My first 5G Core : Open5GS and UERANSIM(http://nickvsnetworking.com/my-first-5g-core-open5gs-and-ueransim/)
@@ -63,3 +65,11 @@
   - SCP Indirect communication Model C(https://github.com/s5uishida/open5gs_5gc_ueransim_scp_model_c_sample_config)
   - Monitoring Metrics with Prometheus(https://github.com/s5uishida/open5gs_5gc_ueransim_metrics_sample_config)
   - Frame Routing(https://github.com/s5uishida/open5gs_5gc_ueransim_framed_routing_sample_config)
+  - VPP-UPF with DPDK(https://github.com/s5uishida/open5gs_5gc_ueransim_vpp_upf_dpdk_sample_config)
+ 
+- @gradiant helm charts
+  - Open5GS EPC and SRS LTE in kubernetes(https://gradiant.github.io/openverso-charts/open5gs-srslte.html)
+  - Open5GS NGC and UERANSIM in kubernetes(https://gradiant.github.io/openverso-charts/open5gs-ueransim-gnb.html)
+  - Open5GS NGC and OpenAirInterface GNB with ettus USRP in kubernetes(https://gradiant.github.io/openverso-charts/open5gs-oaignb.html)
+  - Open5GS EPC and SRS ENB with ettus USRP in kubernetes(https://gradiant.github.io/openverso-charts/open5gs-srsenb.html)
+  - Open5GS with Service Communication Proxy in kubernetes(https://gradiant.github.io/openverso-charts/open5gs-scp.html)

open5gs_2.6.5.tar.xz/docs/assets/pcapng/5g_roaming_lbo.pcapng Added

open5gs_2.6.4.tar.xz/docs/assets/webui/install -> open5gs_2.6.5.tar.xz/docs/assets/webui/install Changed

open5gs_2.6.4.tar.xz/lib/app/ogs-context.c -> open5gs_2.6.5.tar.xz/lib/app/ogs-context.c Changed

open5gs_2.6.4.tar.xz/lib/core/ogs-epoll.c -> open5gs_2.6.5.tar.xz/lib/core/ogs-epoll.c Changed

open5gs_2.6.4.tar.xz/lib/core/ogs-pool.h -> open5gs_2.6.5.tar.xz/lib/core/ogs-pool.h Changed

@@ -28,14 +28,6 @@
 extern "C" {
 #endif
 
-#if OGS_USE_TALLOC == 1
-#define ogs_pool_create ogs_malloc
-#define ogs_pool_destroy ogs_free
-#else
-#define ogs_pool_create malloc
-#define ogs_pool_destroy free
-#endif
-
 typedef uint32_t ogs_pool_id_t;
 
 #define OGS_POOL(pool, type) \
@@ -46,14 +38,18 @@
         type **free, *array, **index; \
     } pool
 
+/*
+ * ogs_pool_init() shall be used in the initialization routine.
+ * Otherwise, memory will be fragment since this function uses system malloc()
+ */
 #define ogs_pool_init(pool, _size) do { \
     int i; \
     (pool)->name = #pool; \
-    (pool)->free = ogs_pool_create(sizeof(*(pool)->free) * _size); \
+    (pool)->free = malloc(sizeof(*(pool)->free) * _size); \
     ogs_assert((pool)->free); \
-    (pool)->array = ogs_pool_create(sizeof(*(pool)->array) * _size); \
+    (pool)->array = malloc(sizeof(*(pool)->array) * _size); \
     ogs_assert((pool)->array); \
-    (pool)->index = ogs_pool_create(sizeof(*(pool)->index) * _size); \
+    (pool)->index = malloc(sizeof(*(pool)->index) * _size); \
     ogs_assert((pool)->index); \
     (pool)->size = (pool)->avail = _size; \
     (pool)->head = (pool)->tail = 0; \
@@ -63,13 +59,55 @@
     } \
 } while (0)
 
+/*
+ * ogs_pool_final() shall be used in the finalization routine.
+ * Otherwise, memory will be fragment since this function uses system free()
+ */
 #define ogs_pool_final(pool) do { \
     if (((pool)->size != (pool)->avail)) \
         ogs_error("%d in '%s%d' were not released.", \
                 (pool)->size - (pool)->avail, (pool)->name, (pool)->size); \
-    ogs_pool_destroy((pool)->free); \
-    ogs_pool_destroy((pool)->array); \
-    ogs_pool_destroy((pool)->index); \
+    free((pool)->free); \
+    free((pool)->array); \
+    free((pool)->index); \
+} while (0)
+
+/*
+ * COMPARED WITH ogs_pool_init()
+ *
+ * ogs_pool_create() could be called while the process is running,
+ * so this function should use ogs_malloc() instead of system malloc()
+ */
+#define ogs_pool_create(pool, _size) do { \
+    int i; \
+    (pool)->name = #pool; \
+    (pool)->free = ogs_malloc(sizeof(*(pool)->free) * _size); \
+    ogs_assert((pool)->free); \
+    (pool)->array = ogs_malloc(sizeof(*(pool)->array) * _size); \
+    ogs_assert((pool)->array); \
+    (pool)->index = ogs_malloc(sizeof(*(pool)->index) * _size); \
+    ogs_assert((pool)->index); \
+    (pool)->size = (pool)->avail = _size; \
+    (pool)->head = (pool)->tail = 0; \
+    for (i = 0; i < _size; i++) { \
+        (pool)->freei = &((pool)->arrayi); \
+        (pool)->indexi = NULL; \
+    } \
+} while (0)
+
+/*
+ * COMPARED WITH ogs_pool_final()
+ *
+ * ogs_pool_destroy() could be called while the process is running,
+ * so this function should use ogs_free() instead of system free()
+ */
+#define ogs_pool_destroy(pool) do { \
+    if (((pool)->size != (pool)->avail)) \
+        ogs_error("%d in '%s%d' were not released.", \
+                (pool)->size - (pool)->avail, (pool)->name, (pool)->size); \
+    ogs_free((pool)->free); \
+    ogs_free((pool)->array); \
+    ogs_free((pool)->index); \
 } while (0)
 
 #define ogs_pool_index(pool, node) (((node) - (pool)->array)+1)

open5gs_2.6.4.tar.xz/lib/core/ogs-timer.c -> open5gs_2.6.5.tar.xz/lib/core/ogs-timer.c Changed

open5gs_2.6.4.tar.xz/lib/core/ogs-timer.h -> open5gs_2.6.5.tar.xz/lib/core/ogs-timer.h Changed

open5gs_2.6.4.tar.xz/lib/core/ogs-tlv-msg.c -> open5gs_2.6.5.tar.xz/lib/core/ogs-tlv-msg.c Changed

open5gs_2.6.4.tar.xz/lib/crypt/meson.build -> open5gs_2.6.5.tar.xz/lib/crypt/meson.build Changed

open5gs_2.6.4.tar.xz/lib/crypt/ogs-crypt.h -> open5gs_2.6.5.tar.xz/lib/crypt/ogs-crypt.h Changed

open5gs_2.6.5.tar.xz/lib/crypt/openssl Added

open5gs_2.6.5.tar.xz/lib/crypt/openssl/snow3g.h Added

@@ -0,0 +1,118 @@
+/* $OpenBSD: snow3g.h,v 0.10 2015 raphael.catolino@gmail.com$ */
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http:
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http:
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#ifndef HEADER_SNOW3G_H
+#define HEADER_SNOW3G_H
+
+#if 0 /* modified by acetcom */
+#include <openssl/opensslconf.h>
+#else
+#include "core/ogs-core.h"
+#endif
+
+#ifdef OPENSSL_NO_SNOW3G
+#error SNOW3G is disabled.
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define SNOW_ENCRYPT	1
+#define SNOW_DECRYPT	0
+
+#define SNOW_WORD_SIZE 4
+#define SNOW_KEY_SIZE 16
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct snow_key_st {
+  uint32_t key4;
+  uint32_t iv4;
+};
+
+struct fsm_st {
+  uint32_t r1;
+  uint32_t r2;
+  uint32_t r3;
+};
+
+typedef struct snow_ctx_st {
+  uint32_t lfsrSNOW_KEY_SIZE;
+  struct fsm_st fsm;
+} SNOW_CTX;
+
+struct snow_key_st
+#if 0
+snow_array_to_key(const unsigned char key16, const unsigned char iv16);
+#else
+snow_array_to_key(const unsigned char *key, const unsigned char *iv);
+#endif
+
+void
+SNOW_set_key(struct snow_key_st key_iv, SNOW_CTX *ctx);
+
+void
+SNOW_gen_keystream(uint32_t *stream, size_t nb_word, SNOW_CTX *ctx);
+
+void
+SNOW_init(uint32_t countc, uint8_t bearer, uint8_t direction,
+    const char *confidentiality_key, SNOW_CTX *ctx);
+
+void
+SNOW(size_t nb_byte, const unsigned char *in, unsigned char *out, SNOW_CTX *ctx);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* !HEADER_SNOW_H */

open5gs_2.6.5.tar.xz/lib/crypt/openssl/snow_core.c Added

@@ -0,0 +1,938 @@
+/* $OpenBSD: snow_core.c,v 0.10 2015 raphael.catolino@gmail.com$ */
+
+/**
+ * snow 3g stream cipher.
+ *
+ * This code is hereby placed in the public domain.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Implementation of the 3GPP UEA2 algorithm, aka the snow-3g stream cipher.
+ * The specification can be found at :
+ * http://www.gsma.com/technicalprojects/wp-content/uploads/2012/04/snow3gspec.pdf
+ */
+
+#include <assert.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <openssl/snow3g.h>
+
+/* Base components used in snow 3g specification */
+
+/* Rijndael lookup tables for S-Boxes */
+static const uint32_t S1_T0256 = {
+  0xa56363c6U, 0x847c7cf8U, 0x997777eeU, 0x8d7b7bf6U,
+  0x0df2f2ffU, 0xbd6b6bd6U, 0xb16f6fdeU, 0x54c5c591U,
+  0x50303060U, 0x03010102U, 0xa96767ceU, 0x7d2b2b56U,
+  0x19fefee7U, 0x62d7d7b5U, 0xe6abab4dU, 0x9a7676ecU,
+  0x45caca8fU, 0x9d82821fU, 0x40c9c989U, 0x877d7dfaU,
+  0x15fafaefU, 0xeb5959b2U, 0xc947478eU, 0x0bf0f0fbU,
+  0xecadad41U, 0x67d4d4b3U, 0xfda2a25fU, 0xeaafaf45U,
+  0xbf9c9c23U, 0xf7a4a453U, 0x967272e4U, 0x5bc0c09bU,
+  0xc2b7b775U, 0x1cfdfde1U, 0xae93933dU, 0x6a26264cU,
+  0x5a36366cU, 0x413f3f7eU, 0x02f7f7f5U, 0x4fcccc83U,
+  0x5c343468U, 0xf4a5a551U, 0x34e5e5d1U, 0x08f1f1f9U,
+  0x937171e2U, 0x73d8d8abU, 0x53313162U, 0x3f15152aU,
+  0x0c040408U, 0x52c7c795U, 0x65232346U, 0x5ec3c39dU,
+  0x28181830U, 0xa1969637U, 0x0f05050aU, 0xb59a9a2fU,
+  0x0907070eU, 0x36121224U, 0x9b80801bU, 0x3de2e2dfU,
+  0x26ebebcdU, 0x6927274eU, 0xcdb2b27fU, 0x9f7575eaU,
+  0x1b090912U, 0x9e83831dU, 0x742c2c58U, 0x2e1a1a34U,
+  0x2d1b1b36U, 0xb26e6edcU, 0xee5a5ab4U, 0xfba0a05bU,
+  0xf65252a4U, 0x4d3b3b76U, 0x61d6d6b7U, 0xceb3b37dU,
+  0x7b292952U, 0x3ee3e3ddU, 0x712f2f5eU, 0x97848413U,
+  0xf55353a6U, 0x68d1d1b9U, 0x00000000U, 0x2cededc1U,
+  0x60202040U, 0x1ffcfce3U, 0xc8b1b179U, 0xed5b5bb6U,
+  0xbe6a6ad4U, 0x46cbcb8dU, 0xd9bebe67U, 0x4b393972U,
+  0xde4a4a94U, 0xd44c4c98U, 0xe85858b0U, 0x4acfcf85U,
+  0x6bd0d0bbU, 0x2aefefc5U, 0xe5aaaa4fU, 0x16fbfbedU,
+  0xc5434386U, 0xd74d4d9aU, 0x55333366U, 0x94858511U,
+  0xcf45458aU, 0x10f9f9e9U, 0x06020204U, 0x817f7ffeU,
+  0xf05050a0U, 0x443c3c78U, 0xba9f9f25U, 0xe3a8a84bU,
+  0xf35151a2U, 0xfea3a35dU, 0xc0404080U, 0x8a8f8f05U,
+  0xad92923fU, 0xbc9d9d21U, 0x48383870U, 0x04f5f5f1U,
+  0xdfbcbc63U, 0xc1b6b677U, 0x75dadaafU, 0x63212142U,
+  0x30101020U, 0x1affffe5U, 0x0ef3f3fdU, 0x6dd2d2bfU,
+  0x4ccdcd81U, 0x140c0c18U, 0x35131326U, 0x2fececc3U,
+  0xe15f5fbeU, 0xa2979735U, 0xcc444488U, 0x3917172eU,
+  0x57c4c493U, 0xf2a7a755U, 0x827e7efcU, 0x473d3d7aU,
+  0xac6464c8U, 0xe75d5dbaU, 0x2b191932U, 0x957373e6U,
+  0xa06060c0U, 0x98818119U, 0xd14f4f9eU, 0x7fdcdca3U,
+  0x66222244U, 0x7e2a2a54U, 0xab90903bU, 0x8388880bU,
+  0xca46468cU, 0x29eeeec7U, 0xd3b8b86bU, 0x3c141428U,
+  0x79dedea7U, 0xe25e5ebcU, 0x1d0b0b16U, 0x76dbdbadU,
+  0x3be0e0dbU, 0x56323264U, 0x4e3a3a74U, 0x1e0a0a14U,
+  0xdb494992U, 0x0a06060cU, 0x6c242448U, 0xe45c5cb8U,
+  0x5dc2c29fU, 0x6ed3d3bdU, 0xefacac43U, 0xa66262c4U,
+  0xa8919139U, 0xa4959531U, 0x37e4e4d3U, 0x8b7979f2U,
+  0x32e7e7d5U, 0x43c8c88bU, 0x5937376eU, 0xb76d6ddaU,
+  0x8c8d8d01U, 0x64d5d5b1U, 0xd24e4e9cU, 0xe0a9a949U,
+  0xb46c6cd8U, 0xfa5656acU, 0x07f4f4f3U, 0x25eaeacfU,
+  0xaf6565caU, 0x8e7a7af4U, 0xe9aeae47U, 0x18080810U,
+  0xd5baba6fU, 0x887878f0U, 0x6f25254aU, 0x722e2e5cU,
+  0x241c1c38U, 0xf1a6a657U, 0xc7b4b473U, 0x51c6c697U,
+  0x23e8e8cbU, 0x7cdddda1U, 0x9c7474e8U, 0x211f1f3eU,
+  0xdd4b4b96U, 0xdcbdbd61U, 0x868b8b0dU, 0x858a8a0fU,
+  0x907070e0U, 0x423e3e7cU, 0xc4b5b571U, 0xaa6666ccU,
+  0xd8484890U, 0x05030306U, 0x01f6f6f7U, 0x120e0e1cU,
+  0xa36161c2U, 0x5f35356aU, 0xf95757aeU, 0xd0b9b969U,
+  0x91868617U, 0x58c1c199U, 0x271d1d3aU, 0xb99e9e27U,
+  0x38e1e1d9U, 0x13f8f8ebU, 0xb398982bU, 0x33111122U,
+  0xbb6969d2U, 0x70d9d9a9U, 0x898e8e07U, 0xa7949433U,
+  0xb69b9b2dU, 0x221e1e3cU, 0x92878715U, 0x20e9e9c9U,
+  0x49cece87U, 0xff5555aaU, 0x78282850U, 0x7adfdfa5U,
+  0x8f8c8c03U, 0xf8a1a159U, 0x80898909U, 0x170d0d1aU,
+  0xdabfbf65U, 0x31e6e6d7U, 0xc6424284U, 0xb86868d0U,
+  0xc3414182U, 0xb0999929U, 0x772d2d5aU, 0x110f0f1eU,
+  0xcbb0b07bU, 0xfc5454a8U, 0xd6bbbb6dU, 0x3a16162cU,
+};
+
+static const uint32_t S1_T1256 = {
+  0x6363c6a5U, 0x7c7cf884U, 0x7777ee99U, 0x7b7bf68dU,
+  0xf2f2ff0dU, 0x6b6bd6bdU, 0x6f6fdeb1U, 0xc5c59154U,
+  0x30306050U, 0x01010203U, 0x6767cea9U, 0x2b2b567dU,
+  0xfefee719U, 0xd7d7b562U, 0xabab4de6U, 0x7676ec9aU,
+  0xcaca8f45U, 0x82821f9dU, 0xc9c98940U, 0x7d7dfa87U,
+  0xfafaef15U, 0x5959b2ebU, 0x47478ec9U, 0xf0f0fb0bU,
+  0xadad41ecU, 0xd4d4b367U, 0xa2a25ffdU, 0xafaf45eaU,
+  0x9c9c23bfU, 0xa4a453f7U, 0x7272e496U, 0xc0c09b5bU,
+  0xb7b775c2U, 0xfdfde11cU, 0x93933daeU, 0x26264c6aU,
+  0x36366c5aU, 0x3f3f7e41U, 0xf7f7f502U, 0xcccc834fU,
+  0x3434685cU, 0xa5a551f4U, 0xe5e5d134U, 0xf1f1f908U,
+  0x7171e293U, 0xd8d8ab73U, 0x31316253U, 0x15152a3fU,
+  0x0404080cU, 0xc7c79552U, 0x23234665U, 0xc3c39d5eU,
+  0x18183028U, 0x969637a1U, 0x05050a0fU, 0x9a9a2fb5U,
+  0x07070e09U, 0x12122436U, 0x80801b9bU, 0xe2e2df3dU,
+  0xebebcd26U, 0x27274e69U, 0xb2b27fcdU, 0x7575ea9fU,
+  0x0909121bU, 0x83831d9eU, 0x2c2c5874U, 0x1a1a342eU,
+  0x1b1b362dU, 0x6e6edcb2U, 0x5a5ab4eeU, 0xa0a05bfbU,
+  0x5252a4f6U, 0x3b3b764dU, 0xd6d6b761U, 0xb3b37dceU,
+  0x2929527bU, 0xe3e3dd3eU, 0x2f2f5e71U, 0x84841397U,
+  0x5353a6f5U, 0xd1d1b968U, 0x00000000U, 0xededc12cU,
+  0x20204060U, 0xfcfce31fU, 0xb1b179c8U, 0x5b5bb6edU,
+  0x6a6ad4beU, 0xcbcb8d46U, 0xbebe67d9U, 0x3939724bU,
+  0x4a4a94deU, 0x4c4c98d4U, 0x5858b0e8U, 0xcfcf854aU,
+  0xd0d0bb6bU, 0xefefc52aU, 0xaaaa4fe5U, 0xfbfbed16U,
+  0x434386c5U, 0x4d4d9ad7U, 0x33336655U, 0x85851194U,
+  0x45458acfU, 0xf9f9e910U, 0x02020406U, 0x7f7ffe81U,
+  0x5050a0f0U, 0x3c3c7844U, 0x9f9f25baU, 0xa8a84be3U,
+  0x5151a2f3U, 0xa3a35dfeU, 0x404080c0U, 0x8f8f058aU,
+  0x92923fadU, 0x9d9d21bcU, 0x38387048U, 0xf5f5f104U,
+  0xbcbc63dfU, 0xb6b677c1U, 0xdadaaf75U, 0x21214263U,
+  0x10102030U, 0xffffe51aU, 0xf3f3fd0eU, 0xd2d2bf6dU,
+  0xcdcd814cU, 0x0c0c1814U, 0x13132635U, 0xececc32fU,
+  0x5f5fbee1U, 0x979735a2U, 0x444488ccU, 0x17172e39U,
+  0xc4c49357U, 0xa7a755f2U, 0x7e7efc82U, 0x3d3d7a47U,
+  0x6464c8acU, 0x5d5dbae7U, 0x1919322bU, 0x7373e695U,
+  0x6060c0a0U, 0x81811998U, 0x4f4f9ed1U, 0xdcdca37fU,
+  0x22224466U, 0x2a2a547eU, 0x90903babU, 0x88880b83U,
+  0x46468ccaU, 0xeeeec729U, 0xb8b86bd3U, 0x1414283cU,
+  0xdedea779U, 0x5e5ebce2U, 0x0b0b161dU, 0xdbdbad76U,
+  0xe0e0db3bU, 0x32326456U, 0x3a3a744eU, 0x0a0a141eU,
+  0x494992dbU, 0x06060c0aU, 0x2424486cU, 0x5c5cb8e4U,
+  0xc2c29f5dU, 0xd3d3bd6eU, 0xacac43efU, 0x6262c4a6U,
+  0x919139a8U, 0x959531a4U, 0xe4e4d337U, 0x7979f28bU,
+  0xe7e7d532U, 0xc8c88b43U, 0x37376e59U, 0x6d6ddab7U,
+  0x8d8d018cU, 0xd5d5b164U, 0x4e4e9cd2U, 0xa9a949e0U,
+  0x6c6cd8b4U, 0x5656acfaU, 0xf4f4f307U, 0xeaeacf25U,
+  0x6565caafU, 0x7a7af48eU, 0xaeae47e9U, 0x08081018U,
+  0xbaba6fd5U, 0x7878f088U, 0x25254a6fU, 0x2e2e5c72U,
+  0x1c1c3824U, 0xa6a657f1U, 0xb4b473c7U, 0xc6c69751U,
+  0xe8e8cb23U, 0xdddda17cU, 0x7474e89cU, 0x1f1f3e21U,
+  0x4b4b96ddU, 0xbdbd61dcU, 0x8b8b0d86U, 0x8a8a0f85U,
+  0x7070e090U, 0x3e3e7c42U, 0xb5b571c4U, 0x6666ccaaU,
+  0x484890d8U, 0x03030605U, 0xf6f6f701U, 0x0e0e1c12U,
+  0x6161c2a3U, 0x35356a5fU, 0x5757aef9U, 0xb9b969d0U,
+  0x86861791U, 0xc1c19958U, 0x1d1d3a27U, 0x9e9e27b9U,
+  0xe1e1d938U, 0xf8f8eb13U, 0x98982bb3U, 0x11112233U,
+  0x6969d2bbU, 0xd9d9a970U, 0x8e8e0789U, 0x949433a7U,
+  0x9b9b2db6U, 0x1e1e3c22U, 0x87871592U, 0xe9e9c920U,
+  0xcece8749U, 0x5555aaffU, 0x28285078U, 0xdfdfa57aU,
+  0x8c8c038fU, 0xa1a159f8U, 0x89890980U, 0x0d0d1a17U,
+  0xbfbf65daU, 0xe6e6d731U, 0x424284c6U, 0x6868d0b8U,
+  0x414182c3U, 0x999929b0U, 0x2d2d5a77U, 0x0f0f1e11U,
+  0xb0b07bcbU, 0x5454a8fcU, 0xbbbb6dd6U, 0x16162c3aU,
+};
+
+static const uint32_t S1_T2256 = {
+  0x63c6a563U, 0x7cf8847cU, 0x77ee9977U, 0x7bf68d7bU,
+  0xf2ff0df2U, 0x6bd6bd6bU, 0x6fdeb16fU, 0xc59154c5U,
+  0x30605030U, 0x01020301U, 0x67cea967U, 0x2b567d2bU,
+  0xfee719feU, 0xd7b562d7U, 0xab4de6abU, 0x76ec9a76U,
+  0xca8f45caU, 0x821f9d82U, 0xc98940c9U, 0x7dfa877dU,
+  0xfaef15faU, 0x59b2eb59U, 0x478ec947U, 0xf0fb0bf0U,
+  0xad41ecadU, 0xd4b367d4U, 0xa25ffda2U, 0xaf45eaafU,
+  0x9c23bf9cU, 0xa453f7a4U, 0x72e49672U, 0xc09b5bc0U,
+  0xb775c2b7U, 0xfde11cfdU, 0x933dae93U, 0x264c6a26U,
+  0x366c5a36U, 0x3f7e413fU, 0xf7f502f7U, 0xcc834fccU,
+  0x34685c34U, 0xa551f4a5U, 0xe5d134e5U, 0xf1f908f1U,
+  0x71e29371U, 0xd8ab73d8U, 0x31625331U, 0x152a3f15U,
+  0x04080c04U, 0xc79552c7U, 0x23466523U, 0xc39d5ec3U,
+  0x18302818U, 0x9637a196U, 0x050a0f05U, 0x9a2fb59aU,
+  0x070e0907U, 0x12243612U, 0x801b9b80U, 0xe2df3de2U,
+  0xebcd26ebU, 0x274e6927U, 0xb27fcdb2U, 0x75ea9f75U,
+  0x09121b09U, 0x831d9e83U, 0x2c58742cU, 0x1a342e1aU,
+  0x1b362d1bU, 0x6edcb26eU, 0x5ab4ee5aU, 0xa05bfba0U,
+  0x52a4f652U, 0x3b764d3bU, 0xd6b761d6U, 0xb37dceb3U,
+  0x29527b29U, 0xe3dd3ee3U, 0x2f5e712fU, 0x84139784U,
+  0x53a6f553U, 0xd1b968d1U, 0x00000000U, 0xedc12cedU,
+  0x20406020U, 0xfce31ffcU, 0xb179c8b1U, 0x5bb6ed5bU,
+  0x6ad4be6aU, 0xcb8d46cbU, 0xbe67d9beU, 0x39724b39U,
+  0x4a94de4aU, 0x4c98d44cU, 0x58b0e858U, 0xcf854acfU,
+  0xd0bb6bd0U, 0xefc52aefU, 0xaa4fe5aaU, 0xfbed16fbU,
+  0x4386c543U, 0x4d9ad74dU, 0x33665533U, 0x85119485U,
+  0x458acf45U, 0xf9e910f9U, 0x02040602U, 0x7ffe817fU,
+  0x50a0f050U, 0x3c78443cU, 0x9f25ba9fU, 0xa84be3a8U,
+  0x51a2f351U, 0xa35dfea3U, 0x4080c040U, 0x8f058a8fU,
+  0x923fad92U, 0x9d21bc9dU, 0x38704838U, 0xf5f104f5U,

open5gs_2.6.4.tar.xz/lib/dbi/session.c -> open5gs_2.6.5.tar.xz/lib/dbi/session.c Changed

@@ -226,7 +226,7 @@
                     }
 
                     for (n = 0; n < unit; n++)
-                        session->ambr.downlink *= 1024;
+                        session->ambr.downlink *= 1000;
                 } else if (!strcmp(child5_key, "uplink") &&
                         BSON_ITER_HOLDS_DOCUMENT(&child5_iter)) {
                     uint8_t unit = 0;
@@ -246,7 +246,7 @@
                     }
 
                     for (n = 0; n < unit; n++)
-                        session->ambr.uplink *= 1024;
+                        session->ambr.uplink *= 1000;
                 }
 
             }
@@ -332,7 +332,7 @@
                                         }
 
                                         for (n = 0; n < unit; n++)
-                                            pcc_rule->qos.mbr.downlink *= 1024;
+                                            pcc_rule->qos.mbr.downlink *= 1000;
 
                                     } else if (!strcmp(child8_key, "uplink") &&
                                         BSON_ITER_HOLDS_DOCUMENT(
@@ -361,7 +361,7 @@
                                         }
 
                                         for (n = 0; n < unit; n++)
-                                            pcc_rule->qos.mbr.uplink *= 1024;
+                                            pcc_rule->qos.mbr.uplink *= 1000;
                                     }
                                 }
                             } else if (!strcmp(child7_key, "gbr") &&
@@ -397,7 +397,7 @@
                                         }
 
                                         for (n = 0; n < unit; n++)
-                                            pcc_rule->qos.gbr.downlink *= 1024;
+                                            pcc_rule->qos.gbr.downlink *= 1000;
 
                                     } else if (!strcmp(child8_key, "uplink") &&
                                         BSON_ITER_HOLDS_DOCUMENT(
@@ -426,7 +426,7 @@
                                         }
 
                                         for (n = 0; n < unit; n++)
-                                            pcc_rule->qos.gbr.uplink *= 1024;
+                                            pcc_rule->qos.gbr.uplink *= 1000;
                                     }
                                 }
                             }

open5gs_2.6.4.tar.xz/lib/dbi/subscription.c -> open5gs_2.6.5.tar.xz/lib/dbi/subscription.c Changed

@@ -424,7 +424,7 @@
                     }
 
                     for (n = 0; n < unit; n++)
-                        subscription_data->ambr.downlink *= 1024;
+                        subscription_data->ambr.downlink *= 1000;
                 } else if (!strcmp(child1_key, "uplink") &&
                         BSON_ITER_HOLDS_DOCUMENT(&child1_iter)) {
                     uint8_t unit = 0;
@@ -444,7 +444,7 @@
                     }
 
                     for (n = 0; n < unit; n++)
-                        subscription_data->ambr.uplink *= 1024;
+                        subscription_data->ambr.uplink *= 1000;
                 }
 
             }
@@ -593,7 +593,7 @@
                                             }
 
                                             for (n = 0; n < unit; n++)
-                                                session->ambr.downlink *= 1024;
+                                                session->ambr.downlink *= 1000;
                                         } else if (!strcmp(child5_key,
                                                     "uplink") &&
                                                 BSON_ITER_HOLDS_DOCUMENT(
@@ -624,7 +624,7 @@
                                             }
 
                                             for (n = 0; n < unit; n++)
-                                                session->ambr.uplink *= 1024;
+                                                session->ambr.uplink *= 1000;
                                         }
                                     }
                                 } else if (!strcmp(child4_key, "smf") &&

open5gs_2.6.4.tar.xz/lib/gtp/util.c -> open5gs_2.6.5.tar.xz/lib/gtp/util.c Changed

@@ -19,17 +19,28 @@
 
 #include "ogs-gtp.h"
 
-int ogs_gtpu_header_len(ogs_pkbuf_t *pkbuf)
+int ogs_gtpu_parse_header(
+        ogs_gtp2_header_desc_t *header_desc, ogs_pkbuf_t *pkbuf)
 {
     ogs_gtp2_header_t *gtp_h = NULL;
+    ogs_gtp2_extension_header_t ext_hdesc;
     uint8_t *ext_h = NULL;
     uint16_t len = 0;
+    int i;
 
     ogs_assert(pkbuf);
     ogs_assert(pkbuf->data);
 
     gtp_h = (ogs_gtp2_header_t *)pkbuf->data;
 
+    if (header_desc) {
+        memset(header_desc, 0, sizeof(*header_desc));
+
+        header_desc->flags = gtp_h->flags;
+        header_desc->type = gtp_h->type;
+        header_desc->teid = be32toh(gtp_h->teid);
+    }
+
     len = OGS_GTPV1U_HEADER_LEN;
     if (pkbuf->len < len) {
         ogs_error("the length of the packet is insufficient%d:%d",
@@ -52,6 +63,8 @@
          *
          * If no such Header follows,
          * then the value of the Next Extension Header Type shall be 0. */
+
+        i = 0;
         while (*(ext_h = (((uint8_t *)gtp_h) + len - 1))) {
         /*
          * The length of the Extension header shall be defined
@@ -63,11 +76,53 @@
                 ogs_error("No length in the Extension header");
                 return -1;
             }
+
+            if (((*ext_h) * 4) > OGS_GTP2_MAX_EXTENSION_HEADER_LEN) {
+                ogs_error("Overflow length : %d", (*ext_h));
+                return -1;
+            }
+
             if (pkbuf->len < len) {
                 ogs_error("the length of the packet is insufficient%d:%d",
                         pkbuf->len, len);
                 return -1;
             }
+
+            if (!header_desc) /* Skip to extract header content */
+                continue;
+
+            /* Copy Header Content */
+            memcpy(&ext_hdesc.arrayi, ext_h-1, (*ext_h) * 4);
+
+            switch (ext_hdesc.arrayi.type) {
+            case OGS_GTP2_EXTENSION_HEADER_TYPE_PDU_SESSION_CONTAINER:
+                header_desc->pdu_type = ext_hdesc.arrayi.pdu_type;
+                if (ext_hdesc.arrayi.pdu_type ==
+                    OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_UL_PDU_SESSION_INFORMATION) {
+                        header_desc->qos_flow_identifier =
+                            ext_hdesc.arrayi.qos_flow_identifier;
+                        ogs_trace("   QFI 0x%x",
+                                header_desc->qos_flow_identifier);
+                }
+                break;
+            case OGS_GTP2_EXTENSION_HEADER_TYPE_UDP_PORT:
+                header_desc->udp.presence = true;
+                header_desc->udp.port = be16toh(ext_hdesc.arrayi.udp_port);
+
+                ogs_trace("   UDP Port %d", header_desc->udp.port);
+                break;
+            case OGS_GTP2_EXTENSION_HEADER_TYPE_PDCP_NUMBER:
+                header_desc->pdcp_number_presence = true;
+                header_desc->pdcp_number =
+                    be16toh(ext_hdesc.arrayi.pdcp_number);
+
+                ogs_trace("   PDCP Number %d", header_desc->pdcp_number);
+                break;
+            default:
+                break;
+            }
+
+            i++;
         }
 
     } else if (gtp_h->flags & (OGS_GTPU_FLAGS_S|OGS_GTPU_FLAGS_PN)) {
@@ -93,7 +148,6 @@
     return len;
 }
 
-
 uint16_t ogs_in_cksum(uint16_t *addr, int len)
 {
     int nleft = len;

open5gs_2.6.4.tar.xz/lib/gtp/util.h -> open5gs_2.6.5.tar.xz/lib/gtp/util.h Changed

open5gs_2.6.4.tar.xz/lib/gtp/v1/message.c -> open5gs_2.6.5.tar.xz/lib/gtp/v1/message.c Changed

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
  * Copyright (C) 2022 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ * Copyright (C) 2023 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -21,7 +22,7 @@
 /*******************************************************************************
  * This file had been created by gtp1-tlv.py script v0.1.0
  * Please do not modify this file but regenerate it via script.
- * Created on: 2023-03-05 12:29:34.542862 by acetcom
+ * Created on: 2023-08-26 16:35:02.182792 by acetcom
  * from 29060-h40.docx
  ******************************************************************************/
 
@@ -2313,8 +2314,6 @@
 
     switch(gtp1_message->h.type) {
     case OGS_GTP1_ECHO_REQUEST_TYPE:
-        rv = ogs_tlv_parse_msg_desc(&gtp1_message->echo_request,
-                &ogs_gtp1_tlv_desc_echo_request, pkbuf, OGS_TLV_MODE_T1_L2);
         break;
     case OGS_GTP1_ECHO_RESPONSE_TYPE:
         rv = ogs_tlv_parse_msg_desc(&gtp1_message->echo_response,
@@ -2425,8 +2424,6 @@
                 &ogs_gtp1_tlv_desc_forward_relocation_response, pkbuf, OGS_TLV_MODE_T1_L2);
         break;
     case OGS_GTP1_FORWARD_RELOCATION_COMPLETE_TYPE:
-        rv = ogs_tlv_parse_msg_desc(&gtp1_message->forward_relocation_complete,
-                &ogs_gtp1_tlv_desc_forward_relocation_complete, pkbuf, OGS_TLV_MODE_T1_L2);
         break;
     case OGS_GTP1_RELOCATION_CANCEL_REQUEST_TYPE:
         rv = ogs_tlv_parse_msg_desc(&gtp1_message->relocation_cancel_request,

open5gs_2.6.4.tar.xz/lib/gtp/v1/message.h -> open5gs_2.6.5.tar.xz/lib/gtp/v1/message.h Changed

open5gs_2.6.4.tar.xz/lib/gtp/v1/support/gtp1-tlv.py -> open5gs_2.6.5.tar.xz/lib/gtp/v1/support/gtp1-tlv.py Changed

open5gs_2.6.4.tar.xz/lib/gtp/v2/build.c -> open5gs_2.6.5.tar.xz/lib/gtp/v2/build.c Changed

@@ -72,7 +72,11 @@
         ogs_error("ogs_pkbuf_alloc() failed");
         return NULL;
     }
-    ogs_pkbuf_reserve(pkbuf, OGS_GTPV1U_5GC_HEADER_LEN);
+    ogs_pkbuf_reserve(pkbuf,
+            OGS_GTPV1U_HEADER_LEN + /* 8 bytes */
+            4 + /* Seq Number(2) + N PDU Number(1) + Ext Header Type(1) */
+            4 + /* If 5GC, QFI Extension Header(4) */
+            4); /* UDP Port Extension Header(4) */
 
     /*
      * 8.3 Tunnel Endpoint Identifier Data I
@@ -118,9 +122,9 @@
         ogs_pkbuf_t *pkbuf)
 {
     ogs_gtp2_header_t *gtp_h = NULL;
-    ogs_gtp2_extension_header_t *ext_h = NULL;
     uint8_t flags;
     uint8_t gtp_hlen = 0;
+    int i;
 
     ogs_assert(gtp_hdesc);
     ogs_assert(ext_hdesc);
@@ -129,13 +133,22 @@
     /* Processing GTP Flags */
     flags = gtp_hdesc->flags;
     flags |= OGS_GTPU_FLAGS_V | OGS_GTPU_FLAGS_PT;
-    if (ext_hdesc->qos_flow_identifier) flags |= OGS_GTPU_FLAGS_E;
+    if (ext_hdesc->array0.type && ext_hdesc->array0.len)
+        flags |= OGS_GTPU_FLAGS_E;
 
     /* Define GTP Header Size */
-    if (flags & OGS_GTPU_FLAGS_E)
-        gtp_hlen = OGS_GTPV1U_HEADER_LEN+8;
-    else if (flags & (OGS_GTPU_FLAGS_S|OGS_GTPU_FLAGS_PN))
-        gtp_hlen = OGS_GTPV1U_HEADER_LEN+4;
+    if (flags & OGS_GTPU_FLAGS_E) {
+
+        gtp_hlen = OGS_GTPV1U_HEADER_LEN+OGS_GTPV1U_EXTENSION_HEADER_LEN;
+
+        i = 0;
+        while(ext_hdesc->arrayi.len) {
+            gtp_hlen += (ext_hdesc->arrayi.len*4);
+            i++;
+        }
+
+    } else if (flags & (OGS_GTPU_FLAGS_S|OGS_GTPU_FLAGS_PN))
+        gtp_hlen = OGS_GTPV1U_HEADER_LEN+OGS_GTPV1U_EXTENSION_HEADER_LEN;
     else
         gtp_hlen = OGS_GTPV1U_HEADER_LEN;
 
@@ -179,24 +192,30 @@
 
     /* Fill Extention Header */
     if (gtp_h->flags & OGS_GTPU_FLAGS_E) {
-        ext_h = (ogs_gtp2_extension_header_t *)
-            (pkbuf->data + OGS_GTPV1U_HEADER_LEN);
+        uint8_t *ext_h = (uint8_t *)(pkbuf->data +
+                    OGS_GTPV1U_HEADER_LEN + OGS_GTPV1U_EXTENSION_HEADER_LEN);
         ogs_assert(ext_h);
 
-        if (ext_hdesc->qos_flow_identifier) {
-            /* 5G Core */
-            ext_h->type = OGS_GTP2_EXTENSION_HEADER_TYPE_PDU_SESSION_CONTAINER;
-            ext_h->len = 1;
-            ext_h->pdu_type = ext_hdesc->pdu_type;
-            ext_h->qos_flow_identifier = ext_hdesc->qos_flow_identifier;
-            ext_h->next_type =
-                OGS_GTP2_EXTENSION_HEADER_TYPE_NO_MORE_EXTENSION_HEADERS;
-        } else {
-            /* EPC */
-            ext_h->type = ext_hdesc->type;
-            ext_h->len = 1;
-            ext_h->next_type =
-                OGS_GTP2_EXTENSION_HEADER_TYPE_NO_MORE_EXTENSION_HEADERS;
+        /* Copy Header Type */
+        *(ext_h-1) = ext_hdesc->array0.type;
+
+        i = 0;
+        while (i < OGS_GTP2_NUM_OF_EXTENSION_HEADER &&
+                (ext_h - pkbuf->data) < gtp_hlen) {
+            int len = ext_hdesc->arrayi.len*4;
+
+            /* Copy Header Content */
+            memcpy(ext_h, &ext_hdesc->arrayi.len, len-1);
+
+            /* Check if Next Header is Available */
+            if (ext_hdesc->arrayi+1.len)
+                ext_hlen-1 = ext_hdesc->arrayi+1.type;
+            else
+                ext_hlen-1 =
+                    OGS_GTP2_EXTENSION_HEADER_TYPE_NO_MORE_EXTENSION_HEADERS;
+
+            ext_h += len;
+            i++;
         }
     }
 }

open5gs_2.6.4.tar.xz/lib/gtp/v2/message.c -> open5gs_2.6.5.tar.xz/lib/gtp/v2/message.c Changed

@@ -20,7 +20,7 @@
 /*******************************************************************************
  * This file had been created by gtp-tlv.py script v0.1.0
  * Please do not modify this file but regenerate it via script.
- * Created on: 2023-03-05 11:59:11.018342 by acetcom
+ * Created on: 2023-08-26 16:35:12.648272 by acetcom
  * from 29274-h70.docx
  ******************************************************************************/
 
@@ -2983,8 +2983,6 @@
                 &ogs_gtp2_tlv_desc_create_indirect_data_forwarding_tunnel_response, pkbuf, OGS_TLV_MODE_T1_L2_I1);
         break;
     case OGS_GTP2_DELETE_INDIRECT_DATA_FORWARDING_TUNNEL_REQUEST_TYPE:
-        rv = ogs_tlv_parse_msg(&gtp2_message->delete_indirect_data_forwarding_tunnel_request,
-                &ogs_gtp2_tlv_desc_delete_indirect_data_forwarding_tunnel_request, pkbuf, OGS_TLV_MODE_T1_L2_I1);
         break;
     case OGS_GTP2_DELETE_INDIRECT_DATA_FORWARDING_TUNNEL_RESPONSE_TYPE:
         rv = ogs_tlv_parse_msg(&gtp2_message->delete_indirect_data_forwarding_tunnel_response,

open5gs_2.6.4.tar.xz/lib/gtp/v2/message.h -> open5gs_2.6.5.tar.xz/lib/gtp/v2/message.h Changed

open5gs_2.6.4.tar.xz/lib/gtp/v2/path.c -> open5gs_2.6.5.tar.xz/lib/gtp/v2/path.c Changed

@@ -21,22 +21,62 @@
 
 int ogs_gtp2_send_user_plane(
         ogs_gtp_node_t *gnode,
-        ogs_gtp2_header_t *gtp_hdesc, ogs_gtp2_extension_header_t *ext_hdesc,
+        ogs_gtp2_header_desc_t *header_desc,
         ogs_pkbuf_t *pkbuf)
 {
     char bufOGS_ADDRSTRLEN;
-    int rv;
+    int rv, i;
+
+    ogs_gtp2_header_t gtp_hdesc;
+    ogs_gtp2_extension_header_t ext_hdesc;
+
+    ogs_assert(header_desc);
+
+    memset(&gtp_hdesc, 0, sizeof(gtp_hdesc));
+    memset(&ext_hdesc, 0, sizeof(ext_hdesc));
+
+    gtp_hdesc.flags = header_desc->flags;
+    gtp_hdesc.type = header_desc->type;
+    gtp_hdesc.teid = header_desc->teid;
+
+    i = 0;
+
+    if (header_desc->qos_flow_identifier) {
+        ext_hdesc.arrayi.type =
+            OGS_GTP2_EXTENSION_HEADER_TYPE_PDU_SESSION_CONTAINER;
+        ext_hdesc.arrayi.len = 1;
+        ext_hdesc.arrayi.pdu_type = header_desc->pdu_type;
+        ext_hdesc.arrayi.qos_flow_identifier =
+            header_desc->qos_flow_identifier;
+        i++;
+    }
+
+    if (header_desc->udp.presence == true) {
+        ext_hdesc.arrayi.type = OGS_GTP2_EXTENSION_HEADER_TYPE_UDP_PORT;
+        ext_hdesc.arrayi.len = 1;
+        ext_hdesc.arrayi.udp_port = htobe16(header_desc->udp.port);
+        i++;
+    }
+
+    if (header_desc->pdcp_number_presence == true) {
+        ext_hdesc.arrayi.type = OGS_GTP2_EXTENSION_HEADER_TYPE_PDCP_NUMBER;
+        ext_hdesc.arrayi.len = 1;
+        ext_hdesc.arrayi.pdcp_number = htobe16(header_desc->pdcp_number);
+        i++;
+    }
 
-    ogs_gtp2_fill_header(gtp_hdesc, ext_hdesc, pkbuf);
+    ogs_gtp2_fill_header(&gtp_hdesc, &ext_hdesc, pkbuf);
 
     ogs_trace("SEND GTP-U%d to Peer%s : TEID0x%x",
-            gtp_hdesc->type, OGS_ADDR(&gnode->addr, buf), gtp_hdesc->teid);
+            header_desc->type,
+            OGS_ADDR(&gnode->addr, buf), header_desc->teid);
 
     rv = ogs_gtp_sendto(gnode, pkbuf);
     if (rv != OGS_OK) {
         if (ogs_socket_errno != OGS_EAGAIN) {
             ogs_error("SEND GTP-U%d to Peer%s : TEID0x%x",
-                gtp_hdesc->type, OGS_ADDR(&gnode->addr, buf), gtp_hdesc->teid);
+                header_desc->type,
+                OGS_ADDR(&gnode->addr, buf), header_desc->teid);
         }
     }
 
@@ -270,6 +310,7 @@
 
     ogs_gtp2_header_t gtp_hdesc;
     ogs_gtp2_extension_header_t ext_hdesc;
+    int i;
 
     ogs_assert(sock);
     ogs_assert(to);
@@ -285,8 +326,20 @@
 
     gtp_hdesc.type = OGS_GTPU_MSGTYPE_ERR_IND;
     gtp_hdesc.flags = OGS_GTPU_FLAGS_S|OGS_GTPU_FLAGS_E;
-    ext_hdesc.type = OGS_GTP2_EXTENSION_HEADER_TYPE_UDP_PORT;
-    ext_hdesc.qos_flow_identifier = qfi;
+
+    i = 0;
+    if (qfi) {
+        ext_hdesc.arrayi.type =
+            OGS_GTP2_EXTENSION_HEADER_TYPE_PDU_SESSION_CONTAINER;
+        ext_hdesc.arrayi.len = 1;
+        ext_hdesc.arrayi.pdu_type =
+            OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_DL_PDU_SESSION_INFORMATION;
+        ext_hdesc.arrayi.qos_flow_identifier = qfi;
+        i++;
+    }
+    ext_hdesc.arrayi.type = OGS_GTP2_EXTENSION_HEADER_TYPE_UDP_PORT;
+    ext_hdesc.arrayi.len = 1;
+    ext_hdesc.arrayi.udp_port = 0;
 
     ogs_gtp2_fill_header(&gtp_hdesc, &ext_hdesc, pkbuf);

open5gs_2.6.4.tar.xz/lib/gtp/v2/path.h -> open5gs_2.6.5.tar.xz/lib/gtp/v2/path.h Changed

open5gs_2.6.4.tar.xz/lib/gtp/v2/support/gtp-tlv.py -> open5gs_2.6.5.tar.xz/lib/gtp/v2/support/gtp-tlv.py Changed

open5gs_2.6.4.tar.xz/lib/gtp/v2/types.c -> open5gs_2.6.5.tar.xz/lib/gtp/v2/types.c Changed

@@ -127,14 +127,14 @@
      * giving a range of 1600 Mbps to 10 Gbps Mbps in 100 Mbps increaments.
      */
     if (extended2 >= 0b00000001 && extended2 <= 0b00111101) {
-        return 256*1024 + extended2 * 4*1024;
+        return 256*1000 + extended2 * 4*1000;
     } else if (extended2 >= 0b00111110 && extended2 <= 0b10100001) {
-        return 500*1024 + (extended2 - 0b00111101) * 10*1024;
+        return 500*1000 + (extended2 - 0b00111101) * 10*1000;
     } else if (extended2 >= 0b10100010 && extended2 <= 0b11110110) {
-        return 1500*1024 + (extended2 - 0b10100001) * 100*1024;
+        return 1500*1000 + (extended2 - 0b10100001) * 100*1000;
     } else if (extended2 > 0b11110110) {
         ogs_error("Protocol Error : extended2%x", extended2);
-        return 10*1000*1024; /* 10*1000 Mbps */
+        return 10*1000*1000; /* 10*1000 Mbps */
 
     /*
      * Octet 8
@@ -155,12 +155,12 @@
     } else if (extended >= 0b00000001 && extended <= 0b01001010) {
         return 8600 + extended * 100;
     } else if (extended >= 0b01001011 && extended <= 0b10111010) {
-        return 16*1024 + (extended - 0b01001010) * 1*1024;
+        return 16*1000 + (extended - 0b01001010) * 1*1000;
     } else if (extended >= 0b10111011 && extended <= 0b11111010) {
-        return 128*1024 + (extended - 0b10111010) * 2*1024;
+        return 128*1000 + (extended - 0b10111010) * 2*1000;
     } else if (extended > 0b11111010) {
         ogs_error("Protocol Error : extended%x", extended);
-        return 256*1024; /* 256 Mbps */
+        return 256*1000; /* 256 Mbps */
 
     /*
      * Octet 4

open5gs_2.6.4.tar.xz/lib/gtp/v2/types.h -> open5gs_2.6.5.tar.xz/lib/gtp/v2/types.h Changed

@@ -53,21 +53,48 @@
 typedef struct ogs_gtp2_extension_header_s {
 #define OGS_GTP2_EXTENSION_HEADER_TYPE_UDP_PORT 0x40
 #define OGS_GTP2_EXTENSION_HEADER_TYPE_PDU_SESSION_CONTAINER 0x85
+#define OGS_GTP2_EXTENSION_HEADER_TYPE_PDCP_NUMBER 0xc0
 #define OGS_GTP2_EXTENSION_HEADER_TYPE_NO_MORE_EXTENSION_HEADERS 0x0
     uint16_t sequence_number;
     uint8_t n_pdu_number;
-    uint8_t type;
-    uint8_t len;
+    struct {
+        uint8_t type;
+        uint8_t len;
+        union {
+            struct {
 #define OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_DL_PDU_SESSION_INFORMATION 0
 #define OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_UL_PDU_SESSION_INFORMATION 1
-    ED2(uint8_t pdu_type:4;,
-        uint8_t spare1:4;);
-    ED3(uint8_t paging_policy_presence:1;,
-        uint8_t reflective_qos_indicator:1;,
-        uint8_t qos_flow_identifier:6;);
-    uint8_t next_type;
+            ED2(uint8_t pdu_type:4;,
+                uint8_t spare1:4;);
+            ED3(uint8_t paging_policy_presence:1;,
+                uint8_t reflective_qos_indicator:1;,
+                uint8_t qos_flow_identifier:6;);
+            };
+            uint16_t udp_port;
+            uint16_t pdcp_number;
+        };
+
+/* sizeof(extension_header.arrayi) */
+#define OGS_GTP2_MAX_EXTENSION_HEADER_LEN 4
+
+#define OGS_GTP2_NUM_OF_EXTENSION_HEADER 8
+    } __attribute__ ((packed)) arrayOGS_GTP2_NUM_OF_EXTENSION_HEADER;
 } __attribute__ ((packed)) ogs_gtp2_extension_header_t;
 
+typedef struct ogs_gtp2_header_desc_s {
+    /* GTP Header */
+    uint8_t type;
+    uint8_t flags;
+    uint32_t teid;
+
+    /* GTP Extension Header */
+    uint8_t qos_flow_identifier;
+    uint8_t pdu_type;
+    ogs_port_t udp;
+    bool pdcp_number_presence;
+    uint16_t pdcp_number;
+} ogs_gtp2_header_desc_t;
+
 /* 8.4 Cause */
 #define OGS_GTP2_CAUSE_UNDEFINED_VALUE 0
 #define OGS_GTP2_CAUSE_LOCAL_DETACH 2
@@ -302,7 +329,7 @@
 } __attribute__ ((packed)) ogs_gtp2_flow_qos_t;
 
 #define ogs_gtp2_qos_to_bps(br, extended, extended2) \
-    ogs_gtp2_qos_to_kbps(br, extended, extended2) * 1024;
+    ogs_gtp2_qos_to_kbps(br, extended, extended2) * 1000;
 
 uint64_t ogs_gtp2_qos_to_kbps(uint8_t br, uint8_t extended, uint8_t extended2);

open5gs_2.6.4.tar.xz/lib/gtp/xact.c -> open5gs_2.6.5.tar.xz/lib/gtp/xact.c Changed

@@ -88,18 +88,21 @@
     xact->cb = cb;
     xact->data = data;
 
-    xact->tm_response = ogs_timer_add(
-            ogs_app()->timer_mgr, response_timeout, xact);
-    ogs_assert(xact->tm_response);
-    xact->response_rcount = ogs_app()->time.message.gtp.n3_response_rcount,
+    /* 7.6 "The T3-RESPONSE timer shall be started when a signalling request
+     * message (for which a response has been defined) is sent." */
+    if (hdesc->type != OGS_GTP1_RAN_INFORMATION_RELAY_TYPE) {
+        xact->tm_response = ogs_timer_add(
+                ogs_app()->timer_mgr, response_timeout, xact);
+        ogs_assert(xact->tm_response);
+        xact->response_rcount = ogs_app()->time.message.gtp.n3_response_rcount;
+    }
 
     xact->tm_holding = ogs_timer_add(
             ogs_app()->timer_mgr, holding_timeout, xact);
     ogs_assert(xact->tm_holding);
-    xact->holding_rcount = ogs_app()->time.message.gtp.n3_holding_rcount,
+    xact->holding_rcount = ogs_app()->time.message.gtp.n3_holding_rcount;
 
-    ogs_list_add(xact->org == OGS_GTP_LOCAL_ORIGINATOR ?
-            &xact->gnode->local_list : &xact->gnode->remote_list, xact);
+    ogs_list_add(&xact->gnode->local_list, xact);
 
     rv = ogs_gtp1_xact_update_tx(xact, hdesc, pkbuf);
     if (rv != OGS_OK) {
@@ -108,9 +111,8 @@
         return NULL;
     }
 
-    ogs_debug("%d %s Create  peer %s:%d",
+    ogs_debug("%d LOCAL Create  peer %s:%d",
             xact->xid,
-            xact->org == OGS_GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE",
             OGS_ADDR(&gnode->addr, buf),
             OGS_PORT(&gnode->addr));
 
@@ -156,8 +158,7 @@
     ogs_assert(xact->tm_holding);
     xact->holding_rcount = ogs_app()->time.message.gtp.n3_holding_rcount,
 
-    ogs_list_add(xact->org == OGS_GTP_LOCAL_ORIGINATOR ?
-            &xact->gnode->local_list : &xact->gnode->remote_list, xact);
+    ogs_list_add(&xact->gnode->local_list, xact);
 
     rv = ogs_gtp_xact_update_tx(xact, hdesc, pkbuf);
     if (rv != OGS_OK) {
@@ -166,9 +167,8 @@
         return NULL;
     }
 
-    ogs_debug("%d %s Create  peer %s:%d",
+    ogs_debug("%d LOCAL Create  peer %s:%d",
             xact->xid,
-            xact->org == OGS_GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE",
             OGS_ADDR(&gnode->addr, buf),
             OGS_PORT(&gnode->addr));
 
@@ -203,12 +203,10 @@
     ogs_assert(xact->tm_holding);
     xact->holding_rcount = ogs_app()->time.message.gtp.n3_holding_rcount,
 
-    ogs_list_add(xact->org == OGS_GTP_LOCAL_ORIGINATOR ?
-            &xact->gnode->local_list : &xact->gnode->remote_list, xact);
+    ogs_list_add(&xact->gnode->remote_list, xact);
 
-    ogs_debug("%d %s Create  peer %s:%d",
+    ogs_debug("%d REMOTE Create  peer %s:%d",
             xact->xid,
-            xact->org == OGS_GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE",
             OGS_ADDR(&gnode->addr, buf),
             OGS_PORT(&gnode->addr));
 
@@ -993,6 +991,7 @@
     case OGS_GTP1_FORWARD_RELOCATION_REQUEST_TYPE:
     case OGS_GTP1_RELOCATION_CANCEL_REQUEST_TYPE:
     case OGS_GTP1_UE_REGISTRATION_QUERY_REQUEST_TYPE:
+    case OGS_GTP1_RAN_INFORMATION_RELAY_TYPE:
         stage = GTP_XACT_INITIAL_STAGE;
         break;
     case OGS_GTP1_ECHO_RESPONSE_TYPE:

open5gs_2.6.4.tar.xz/lib/ipfw/ipv6.c -> open5gs_2.6.5.tar.xz/lib/ipfw/ipv6.c Changed

open5gs_2.6.4.tar.xz/lib/nas/common/conv.c -> open5gs_2.6.5.tar.xz/lib/nas/common/conv.c Changed

open5gs_2.6.4.tar.xz/lib/nas/common/security.c -> open5gs_2.6.5.tar.xz/lib/nas/common/security.c Changed

open5gs_2.6.4.tar.xz/lib/nas/common/types.c -> open5gs_2.6.5.tar.xz/lib/nas/common/types.c Changed

@@ -114,31 +114,31 @@
         length = ogs_max(length, 2);
     }
     /* Set to 16000 Kbps */
-    else if (input > 16000 && input < (17*1024)) {
+    else if (input > 16000 && input < (17*1000)) {
         *br = 0b11111110;
         *extended = 0b01001010;
         length = ogs_max(length, 2);
     }
     /* giving a range of 17 Mbps to 128 Mbps in 1 Mbps increments. */
-    else if (input >= (17*1024) && input <= (128*1024)) {
+    else if (input >= (17*1000) && input <= (128*1000)) {
         *br = 0b11111110;
-        *extended = ((input - (16*1024)) / (1*1024)) + 0b01001010;
+        *extended = ((input - (16*1000)) / (1*1000)) + 0b01001010;
         length = ogs_max(length, 2);
     }
     /* Set to 128 Mbps */
-    else if (input > (128*1024) && input < (130*1024)) {
+    else if (input > (128*1000) && input < (130*1000)) {
         *br = 0b11111110;
         *extended = 0b10111010;
         length = ogs_max(length, 2);
     }
     /* giving a range of 130 Mbps to 256 Mbps in 2 Mbps increments. */
-    else if (input >= (130*1024) && input <= (256*1024)) {
+    else if (input >= (130*1000) && input <= (256*1000)) {
         *br = 0b11111110;
-        *extended = ((input - (128*1024)) / (2*1024)) + 0b10111010;
+        *extended = ((input - (128*1000)) / (2*1000)) + 0b10111010;
         length = ogs_max(length, 2);
     }
     /* Set to 256 Mbps */
-    else if (input > (1*256*1024) && input < (2*256*1024)) {
+    else if (input > (1*256*1000) && input < (2*256*1000)) {
         *br = 0b11111110;
         *extended = 0b11111010;
         length = ogs_max(length, 2);
@@ -157,14 +157,14 @@
      */
 
     /* giving a range of values from 260M to 500M in 4M increments */
-    else if (input >= (2*256*1024) && input <= (255*256*1024)) {
+    else if (input >= (2*256*1000) && input <= (255*256*1000)) {
         *br = 0b11111110;
         *extended = 0b11111010;
-        *extended2 = (input - (1*256*1024)) / (256*1024);
+        *extended2 = (input - (1*256*1000)) / (256*1000);
         length = ogs_max(length, 3);
     }
     /* if the sending entity want to indicate BR higher than 65280M */
-    else if (input > (255*256*1024)) {
+    else if (input > (255*256*1000)) {
         *br = 0b11111110;
         *extended = 0b11111010;
         *extended2 = 0b11111110;
@@ -262,31 +262,31 @@
         length = ogs_max(length, 2);
     }
     /* Set to 16000 Kbps */
-    else if (input > 16000 && input < (17*1024)) {
+    else if (input > 16000 && input < (17*1000)) {
         *br = 0b11111110;
         *extended = 0b01001010;
         length = ogs_max(length, 2);
     }
     /* giving a range of 17 Mbps to 128 Mbps in 1 Mbps increments. */
-    else if (input >= (17*1024) && input <= (128*1024)) {
+    else if (input >= (17*1000) && input <= (128*1000)) {
         *br = 0b11111110;
-        *extended = ((input - (16*1024)) / (1*1024)) + 0b01001010;
+        *extended = ((input - (16*1000)) / (1*1000)) + 0b01001010;
         length = ogs_max(length, 2);
     }
     /* Set to 128 Mbps */
-    else if (input > (128*1024) && input < (130*1024)) {
+    else if (input > (128*1000) && input < (130*1000)) {
         *br = 0b11111110;
         *extended = 0b10111010;
         length = ogs_max(length, 2);
     }
     /* giving a range of 130 Mbps to 256 Mbps in 2 Mbps increments. */
-    else if (input >= (130*1024) && input <= (256*1024)) {
+    else if (input >= (130*1000) && input <= (256*1000)) {
         *br = 0b11111110;
-        *extended = ((input - (128*1024)) / (2*1024)) + 0b10111010;
+        *extended = ((input - (128*1000)) / (2*1000)) + 0b10111010;
         length = ogs_max(length, 2);
     }
     /* Set to 256 Mbps */
-    else if (input > (256*1024) && input < (260*1024)) {
+    else if (input > (256*1000) && input < (260*1000)) {
         *br = 0b11111110;
         *extended = 0b11111010;
         length = ogs_max(length, 2);
@@ -310,42 +310,42 @@
      */
 
     /* giving a range of values from 260M to 500M in 4M increments */
-    else if (input >= (260*1024) && input <= (500*1024)) {
+    else if (input >= (260*1000) && input <= (500*1000)) {
         *br = 0b11111110;
         *extended = 0b11111010;
-        *extended2 = (input - (256*1024)) / (4*1024);
+        *extended2 = (input - (256*1000)) / (4*1000);
         length = ogs_max(length, 3);
     }
     /* if a range of values from 500M to 510M */
-    else if (input > (500*1024) && input < (510*1024)) {
+    else if (input > (500*1000) && input < (510*1000)) {
         *br = 0b11111110;
         *extended = 0b11111010;
         *extended2 = 0b00111101;
         length = ogs_max(length, 3);
     }
     /* giving a range of values from 510M to 1500M in 10M increments */
-    else if (input >= (510*1024) && input <= (1500*1024)) {
+    else if (input >= (510*1000) && input <= (1500*1000)) {
         *br = 0b11111110;
         *extended = 0b11111010;
-        *extended2 = (input - (500*1024)) / (10*1024) + 0b00111101;
+        *extended2 = (input - (500*1000)) / (10*1000) + 0b00111101;
         length = ogs_max(length, 3);
     }
     /* if a range of values from 1500M to 1600M */
-    else if (input > (1500*1024) && input < (1600*1024)) {
+    else if (input > (1500*1000) && input < (1600*1000)) {
         *br = 0b11111110;
         *extended = 0b11111010;
         *extended2 = 0b10100001;
         length = ogs_max(length, 3);
     }
     /* giving a range of values from 1600M to 10000M in 100M increments */
-    else if (input >= (1600*1024) && input <= (10*1000*1024)) {
+    else if (input >= (1600*1000) && input <= (10*1000*1000)) {
         *br = 0b11111110;
         *extended = 0b11111010;
-        *extended2 = (input - (1500*1024)) / (100*1024) + 0b10100001;
+        *extended2 = (input - (1500*1000)) / (100*1000) + 0b10100001;
         length = ogs_max(length, 3);
     }
     /* if the sending entity want to indicate BR higher than 10000Mbps */
-    else if (input > (10*1000*1024)) {
+    else if (input > (10*1000*1000)) {
         *br = 0b11111110;
         *extended = 0b11111010;
         *extended2 = 0b11110110;
@@ -361,8 +361,8 @@
 {
     uint8_t length = 0;
 
-    dl_apn_ambr = dl_apn_ambr / 1024; /* Kbps */
-    ul_apn_ambr = ul_apn_ambr / 1024; /* Kbps */
+    dl_apn_ambr = dl_apn_ambr / 1000; /* Kbps */
+    ul_apn_ambr = ul_apn_ambr / 1000; /* Kbps */
 
     memset(apn_aggregate_maximum_bit_rate, 0,
         sizeof(ogs_nas_apn_aggregate_maximum_bit_rate_t));
@@ -387,10 +387,10 @@
 {
     uint8_t length = 0;
 
-    dl_mbr = dl_mbr / 1024; /* Kbps */
-    ul_mbr = ul_mbr / 1024; /* Kbps */
-    dl_gbr = dl_gbr / 1024; /* Kbps */
-    ul_gbr = ul_gbr / 1024; /* Kbps */
+    dl_mbr = dl_mbr / 1000; /* Kbps */
+    ul_mbr = ul_mbr / 1000; /* Kbps */
+    dl_gbr = dl_gbr / 1000; /* Kbps */
+    ul_gbr = ul_gbr / 1000; /* Kbps */
 
     memset(eps_qos, 0, sizeof(ogs_nas_eps_quality_of_service_t));
 
@@ -432,11 +432,11 @@
     ogs_assert(nas);
     ogs_assert(bitrate);
 
-    bitrate >>= 10; /* bps to Kbps */
+    bitrate /= 1000; /* bps to Kbps */
 
     for (nas->unit = OGS_NAS_BR_UNIT_1K;
             nas->unit < OGS_NAS_BR_UNIT_256P; nas->unit++) {
-        if ((bitrate >> 2) == 0) {
+        if (bitrate <= 0xFFFFUL) {
             break;
         }
         bitrate >>= 2;
@@ -449,55 +449,55 @@
     ogs_assert(nas_bitrate);
 
     if (nas_bitrate->unit == OGS_NAS_BR_UNIT_1K)
-        return nas_bitrate->value * 1024;
+        return nas_bitrate->value * 1000;
     if (nas_bitrate->unit == OGS_NAS_BR_UNIT_4K)
-        return nas_bitrate->value * 4 * 1024;
+        return nas_bitrate->value * 4 * 1000;
     if (nas_bitrate->unit == OGS_NAS_BR_UNIT_16K)
-        return nas_bitrate->value * 16 * 1024;
+        return nas_bitrate->value * 16 * 1000;

open5gs_2.6.4.tar.xz/lib/nas/eps/conv.c -> open5gs_2.6.5.tar.xz/lib/nas/eps/conv.c Changed

open5gs_2.6.4.tar.xz/lib/nas/eps/types.h -> open5gs_2.6.5.tar.xz/lib/nas/eps/types.h Changed

open5gs_2.6.4.tar.xz/lib/pfcp/context.c -> open5gs_2.6.5.tar.xz/lib/pfcp/context.c Changed

@@ -72,7 +72,7 @@
     ogs_pool_random_id_generate(&ogs_pfcp_pdr_teid_pool);
 
     pdr_random_to_index = ogs_calloc(
-            sizeof(ogs_pool_id_t), ogs_pfcp_pdr_pool.size);
+            sizeof(ogs_pool_id_t), ogs_pfcp_pdr_pool.size+1);
     ogs_assert(pdr_random_to_index);
     for (i = 0; i < ogs_pfcp_pdr_pool.size; i++)
         pdr_random_to_indexogs_pfcp_pdr_teid_pool.arrayi = i;
@@ -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;
 }
 
@@ -319,7 +378,7 @@
                             if (ogs_app()->parameter.no_ipv6 == 0 &&
                                 !self.pfcp_advertise6) {
                                 ogs_copyaddrinfo(&self.pfcp_advertise6, addr);
-                                ogs_filteraddrinfo(&self.pfcp_advertise6, AF_INET);
+                                ogs_filteraddrinfo(&self.pfcp_advertise6, AF_INET6);
                             }
                             ogs_freeaddrinfo(addr);
                         }
@@ -695,7 +754,10 @@
     ogs_assert(sa_list);
 
     ogs_pool_alloc(&ogs_pfcp_node_pool, &node);
-    ogs_assert(node);
+    if (!node) {
+        ogs_error("No memory: ogs_pool_alloc() failed");
+        return NULL;
+    }
     memset(node, 0, sizeof(ogs_pfcp_node_t));
 
     node->sa_list = sa_list;
@@ -731,6 +793,11 @@
 
     ogs_assert(OGS_OK == ogs_copyaddrinfo(&new, addr));
     node = ogs_pfcp_node_new(new);
+    if (!node) {
+        ogs_error("No memory : ogs_pfcp_node_new() failed");
+        ogs_freeaddrinfo(new);
+        return NULL;
+    }
 
     ogs_assert(node);
     memcpy(&node->addr, new, sizeof node->addr);
@@ -1884,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;
     }
 
@@ -2054,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;
     }
 
@@ -2071,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;
     }
 
@@ -2084,11 +2145,11 @@
 
     sess->obj.type = OGS_PFCP_OBJ_SESS_TYPE;
 
-    ogs_pool_init(&sess->pdr_id_pool, OGS_MAX_NUM_OF_PDR);
-    ogs_pool_init(&sess->far_id_pool, OGS_MAX_NUM_OF_FAR);
-    ogs_pool_init(&sess->urr_id_pool, OGS_MAX_NUM_OF_URR);
-    ogs_pool_init(&sess->qer_id_pool, OGS_MAX_NUM_OF_QER);
-    ogs_pool_init(&sess->bar_id_pool, OGS_MAX_NUM_OF_BAR);
+    ogs_pool_create(&sess->pdr_id_pool, OGS_MAX_NUM_OF_PDR);
+    ogs_pool_create(&sess->far_id_pool, OGS_MAX_NUM_OF_FAR);
+    ogs_pool_create(&sess->urr_id_pool, OGS_MAX_NUM_OF_URR);
+    ogs_pool_create(&sess->qer_id_pool, OGS_MAX_NUM_OF_QER);
+    ogs_pool_create(&sess->bar_id_pool, OGS_MAX_NUM_OF_BAR);
 
     ogs_pool_sequence_id_generate(&sess->pdr_id_pool);
     ogs_pool_sequence_id_generate(&sess->far_id_pool);
@@ -2100,9 +2161,9 @@
 {
     ogs_assert(sess);
 
-    ogs_pool_final(&sess->pdr_id_pool);
-    ogs_pool_final(&sess->far_id_pool);
-    ogs_pool_final(&sess->urr_id_pool);
-    ogs_pool_final(&sess->qer_id_pool);
-    ogs_pool_final(&sess->bar_id_pool);
+    ogs_pool_destroy(&sess->pdr_id_pool);
+    ogs_pool_destroy(&sess->far_id_pool);
+    ogs_pool_destroy(&sess->urr_id_pool);
+    ogs_pool_destroy(&sess->qer_id_pool);
+    ogs_pool_destroy(&sess->bar_id_pool);
 }

open5gs_2.6.4.tar.xz/lib/pfcp/conv.c -> open5gs_2.6.5.tar.xz/lib/pfcp/conv.c Changed

open5gs_2.6.4.tar.xz/lib/pfcp/conv.h -> open5gs_2.6.5.tar.xz/lib/pfcp/conv.h Changed

open5gs_2.6.4.tar.xz/lib/pfcp/handler.c -> open5gs_2.6.5.tar.xz/lib/pfcp/handler.c Changed

@@ -218,7 +218,8 @@
 }
 
 bool ogs_pfcp_up_handle_pdr(
-        ogs_pfcp_pdr_t *pdr, uint8_t type, ogs_pkbuf_t *recvbuf,
+        ogs_pfcp_pdr_t *pdr, uint8_t type,
+        ogs_gtp2_header_desc_t *recvhdr, ogs_pkbuf_t *recvbuf,
         ogs_pfcp_user_plane_report_t *report)
 {
     ogs_pfcp_far_t *far = NULL;
@@ -248,9 +249,27 @@
 
     } else {
         if (far->apply_action & OGS_PFCP_APPLY_ACTION_FORW) {
+            ogs_gtp2_header_desc_t sendhdr;
 
             /* Forward packet */
-            ogs_pfcp_send_g_pdu(pdr, type, sendbuf);
+            memset(&sendhdr, 0, sizeof(sendhdr));
+            sendhdr.type = type;
+
+            if (recvhdr) {
+                /*
+                 * Issue #2584
+                 * Discussion #2477
+                 *
+                 * Forward PDCP Number via Indirect Tunnel during Handover
+                 */
+                if (recvhdr->pdcp_number_presence == true) {
+                    sendhdr.pdcp_number_presence =
+                        recvhdr->pdcp_number_presence;
+                    sendhdr.pdcp_number = recvhdr->pdcp_number;
+                }
+            }
+
+            ogs_pfcp_send_g_pdu(pdr, &sendhdr, sendbuf);
 
         } else if (far->apply_action & OGS_PFCP_APPLY_ACTION_BUFF) {
 
@@ -1126,7 +1145,7 @@
     if (message->qer_id.presence == 0) {
         ogs_error("No QER-ID");
         *cause_value = OGS_PFCP_CAUSE_MANDATORY_IE_MISSING;
-        *offending_ie_value = OGS_PFCP_FAR_ID_TYPE;
+        *offending_ie_value = OGS_PFCP_QER_ID_TYPE;
         return NULL;
     }
 
@@ -1134,7 +1153,7 @@
     if (!qer) {
         ogs_error("Cannot find QER-ID%d in PDR", message->qer_id.u32);
         *cause_value = OGS_PFCP_CAUSE_MANDATORY_IE_INCORRECT;
-        *offending_ie_value = OGS_PFCP_FAR_ID_TYPE;
+        *offending_ie_value = OGS_PFCP_QER_ID_TYPE;
         return NULL;
     }
 
@@ -1178,7 +1197,7 @@
     if (message->qer_id.presence == 0) {
         ogs_error("No QER-ID");
         *cause_value = OGS_PFCP_CAUSE_MANDATORY_IE_MISSING;
-        *offending_ie_value = OGS_PFCP_FAR_ID_TYPE;
+        *offending_ie_value = OGS_PFCP_QER_ID_TYPE;
         return NULL;
     }
 
@@ -1186,7 +1205,7 @@
     if (!qer) {
         ogs_error("Cannot find QER-ID%d in PDR", message->qer_id.u32);
         *cause_value = OGS_PFCP_CAUSE_MANDATORY_IE_INCORRECT;
-        *offending_ie_value = OGS_PFCP_FAR_ID_TYPE;
+        *offending_ie_value = OGS_PFCP_QER_ID_TYPE;
         return NULL;
     }

open5gs_2.6.4.tar.xz/lib/pfcp/handler.h -> open5gs_2.6.5.tar.xz/lib/pfcp/handler.h Changed

open5gs_2.6.4.tar.xz/lib/pfcp/message.c -> open5gs_2.6.5.tar.xz/lib/pfcp/message.c Changed

@@ -20,7 +20,7 @@
 /*******************************************************************************
  * This file had been created by pfcp-tlv.py script v0.1.0
  * Please do not modify this file but regenerate it via script.
- * Created on: 2023-04-09 20:37:00.518388 by acetcom
+ * Created on: 2023-08-18 22:15:59.596820 by acetcom
  * from 29244-h71-modified.docx
  ******************************************************************************/
 
@@ -4779,9 +4779,6 @@
             ogs_expect(rv == OGS_OK);
             break;
         case OGS_PFCP_VERSION_NOT_SUPPORTED_RESPONSE_TYPE:
-            rv = ogs_tlv_parse_msg(&pfcp_message->pfcp_version_not_supported_response,
-                    &ogs_pfcp_msg_desc_pfcp_version_not_supported_response, pkbuf, OGS_TLV_MODE_T2_L2);
-            ogs_expect(rv == OGS_OK);
             break;
         case OGS_PFCP_NODE_REPORT_REQUEST_TYPE:
             rv = ogs_tlv_parse_msg(&pfcp_message->pfcp_node_report_request,
@@ -4834,9 +4831,6 @@
             ogs_expect(rv == OGS_OK);
             break;
         case OGS_PFCP_SESSION_DELETION_REQUEST_TYPE:
-            rv = ogs_tlv_parse_msg(&pfcp_message->pfcp_session_deletion_request,
-                    &ogs_pfcp_msg_desc_pfcp_session_deletion_request, pkbuf, OGS_TLV_MODE_T2_L2);
-            ogs_expect(rv == OGS_OK);
             break;
         case OGS_PFCP_SESSION_DELETION_RESPONSE_TYPE:
             rv = ogs_tlv_parse_msg(&pfcp_message->pfcp_session_deletion_response,

open5gs_2.6.4.tar.xz/lib/pfcp/message.h -> open5gs_2.6.5.tar.xz/lib/pfcp/message.h Changed

open5gs_2.6.4.tar.xz/lib/pfcp/path.c -> open5gs_2.6.5.tar.xz/lib/pfcp/path.c Changed

@@ -344,16 +344,16 @@
 }
 
 void ogs_pfcp_send_g_pdu(
-        ogs_pfcp_pdr_t *pdr, uint8_t type, ogs_pkbuf_t *sendbuf)
+        ogs_pfcp_pdr_t *pdr,
+        ogs_gtp2_header_desc_t *sendhdr, ogs_pkbuf_t *sendbuf)
 {
     ogs_gtp_node_t *gnode = NULL;
     ogs_pfcp_far_t *far = NULL;
 
-    ogs_gtp2_header_t gtp_hdesc;
-    ogs_gtp2_extension_header_t ext_hdesc;
+    ogs_gtp2_header_desc_t header_desc;
 
     ogs_assert(pdr);
-    ogs_assert(type);
+    ogs_assert(sendhdr);
     ogs_assert(sendbuf);
 
     far = pdr->far;
@@ -373,15 +373,28 @@
     ogs_assert(gnode);
     ogs_assert(gnode->sock);
 
-    memset(&gtp_hdesc, 0, sizeof(gtp_hdesc));
-    memset(&ext_hdesc, 0, sizeof(ext_hdesc));
+    memset(&header_desc, 0, sizeof(header_desc));
 
-    gtp_hdesc.type = type;
-    gtp_hdesc.teid = far->outer_header_creation.teid;
-    if (pdr->qer && pdr->qer->qfi)
-        ext_hdesc.qos_flow_identifier = pdr->qer->qfi;
+    header_desc.type = sendhdr->type;
+    header_desc.teid = far->outer_header_creation.teid;
 
-    ogs_gtp2_send_user_plane(gnode, &gtp_hdesc, &ext_hdesc, sendbuf);
+    if (pdr->qer && pdr->qer->qfi) {
+        header_desc.pdu_type =
+            OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_DL_PDU_SESSION_INFORMATION;
+        header_desc.qos_flow_identifier = pdr->qer->qfi;
+    }
+
+    if (sendhdr->udp.presence == true) {
+        header_desc.udp.presence = sendhdr->udp.presence;
+        header_desc.udp.port = sendhdr->udp.port;
+    }
+
+    if (sendhdr->pdcp_number_presence == true) {
+        header_desc.pdcp_number_presence = sendhdr->pdcp_number_presence;
+        header_desc.pdcp_number = sendhdr->pdcp_number;
+    }
+
+    ogs_gtp2_send_user_plane(gnode, &header_desc, sendbuf);
 }
 
 int ogs_pfcp_send_end_marker(ogs_pfcp_pdr_t *pdr)
@@ -391,8 +404,7 @@
 
     ogs_pkbuf_t *sendbuf = NULL;
 
-    ogs_gtp2_header_t gtp_hdesc;
-    ogs_gtp2_extension_header_t ext_hdesc;
+    ogs_gtp2_header_desc_t header_desc;
 
     ogs_assert(pdr);
     far = pdr->far;
@@ -415,15 +427,18 @@
     }
     ogs_pkbuf_reserve(sendbuf, OGS_GTPV1U_5GC_HEADER_LEN);
 
-    memset(&gtp_hdesc, 0, sizeof(gtp_hdesc));
-    memset(&ext_hdesc, 0, sizeof(ext_hdesc));
+    memset(&header_desc, 0, sizeof(header_desc));
+
+    header_desc.type = OGS_GTPU_MSGTYPE_END_MARKER;
+    header_desc.teid = far->outer_header_creation.teid;
 
-    gtp_hdesc.type = OGS_GTPU_MSGTYPE_END_MARKER;
-    gtp_hdesc.teid = far->outer_header_creation.teid;
-    if (pdr->qer && pdr->qer->qfi)
-        ext_hdesc.qos_flow_identifier = pdr->qer->qfi;
+    if (pdr->qer && pdr->qer->qfi) {
+        header_desc.pdu_type =
+            OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_DL_PDU_SESSION_INFORMATION;
+        header_desc.qos_flow_identifier = pdr->qer->qfi;
+    }
 
-    ogs_gtp2_send_user_plane(gnode, &gtp_hdesc, &ext_hdesc, sendbuf);
+    ogs_gtp2_send_user_plane(gnode, &header_desc, sendbuf);
 
     return OGS_OK;
 }
@@ -439,8 +454,13 @@
     if (far && far->gnode) {
         if (far->apply_action & OGS_PFCP_APPLY_ACTION_FORW) {
             for (i = 0; i < far->num_of_buffered_packet; i++) {
+                ogs_gtp2_header_desc_t sendhdr;
+
+                memset(&sendhdr, 0, sizeof(sendhdr));
+                sendhdr.type = OGS_GTPU_MSGTYPE_GPDU;
+
                 ogs_pfcp_send_g_pdu(
-                        pdr, OGS_GTPU_MSGTYPE_GPDU, far->buffered_packeti);
+                        pdr, &sendhdr, far->buffered_packeti);
             }
             far->num_of_buffered_packet = 0;
         }

open5gs_2.6.4.tar.xz/lib/pfcp/path.h -> open5gs_2.6.5.tar.xz/lib/pfcp/path.h Changed

open5gs_2.6.4.tar.xz/lib/pfcp/support/pfcp-tlv.py -> open5gs_2.6.5.tar.xz/lib/pfcp/support/pfcp-tlv.py Changed

open5gs_2.6.4.tar.xz/lib/pfcp/types.c -> open5gs_2.6.5.tar.xz/lib/pfcp/types.c Changed

@@ -349,7 +349,7 @@
 int16_t ogs_pfcp_build_bitrate(ogs_tlv_octet_t *octet,
         ogs_pfcp_bitrate_t *bitrate, void *data, int data_len)
 {
-    ogs_pfcp_bitrate_t target;
+    uint64_t target;
     int16_t size = 0;
 
     ogs_assert(bitrate);
@@ -358,18 +358,25 @@
     ogs_assert(data_len >= OGS_PFCP_BITRATE_LEN);
 
     octet->data = data;
-    memcpy(&target, bitrate, sizeof(ogs_pfcp_bitrate_t));
 
     /*
      * Ch 8.15 Bearer QoS in TS 29.274 v15.9.0
      *
      * The UL/DL MBR and GBR fields are encoded as kilobits
      * per second (1 kbps = 1000 bps) in binary value.
+     * The UL/DL MBR and GBR fields may require converting values
+     * in bits per second to kilobits per second when the UL/DL MBR
+     * and GBR values are received from an interface other than GTPv2
+     * interface. If such conversions result in fractions, then
+     * the value of UL/DL MBR and GBR fields shall be rounded upwards.
      */
-    ogs_uint64_to_buffer(target.uplink / 1000, 5,
+    target = (bitrate->uplink / 1000) + ((bitrate->uplink % 1000) ? 1 : 0);
+    ogs_uint64_to_buffer(target, 5,
             (unsigned char *)octet->data + size);
     size += 5;
-    ogs_uint64_to_buffer(target.downlink / 1000, 5,
+
+    target = (bitrate->downlink / 1000) + ((bitrate->downlink % 1000) ? 1 : 0);
+    ogs_uint64_to_buffer(target, 5,
             (unsigned char *)octet->data + size);
     size += 5;

open5gs_2.6.4.tar.xz/lib/sbi/context.c -> open5gs_2.6.5.tar.xz/lib/sbi/context.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/conv.c -> open5gs_2.6.5.tar.xz/lib/sbi/conv.c Changed

@@ -516,16 +516,16 @@
 {
     if (unit == OGS_SBI_BITRATE_KBPS) {
         return ogs_msprintf("%lld Kbps",
-                (long long)bitrate / 1024);
+                (long long)bitrate / 1000);
     } else if (unit == OGS_SBI_BITRATE_MBPS) {
         return ogs_msprintf("%lld Mbps",
-                (long long)bitrate / 1024 / 1024);
+                (long long)bitrate / 1000 / 1000);
     } else if (unit == OGS_SBI_BITRATE_GBPS) {
         return ogs_msprintf("%lld Gbps",
-                (long long)bitrate / 1024 / 1024 / 1024);
+                (long long)bitrate / 1000 / 1000 / 1000);
     } else if (unit == OGS_SBI_BITRATE_TBPS) {
         return ogs_msprintf("%lld Tbps",
-                (long long)bitrate / 1024 / 1024 / 1024 / 1024);
+                (long long)bitrate / 1000 / 1000 / 1000 / 1000);
     }
 
     return ogs_msprintf("%lld bps", (long long)bitrate);
@@ -547,13 +547,13 @@
 
     SWITCH(unit+1)
     CASE("Kbps")
-        return bitrate * 1024;
+        return bitrate * 1000;
     CASE("Mbps")
-        return bitrate * 1024 * 1024;
+        return bitrate * 1000 * 1000;
     CASE("Gbps")
-        return bitrate * 1024 * 1024 * 1024;
+        return bitrate * 1000 * 1000 * 1000;
     CASE("Tbps")
-        return bitrate * 1024 * 1024 * 1024 * 1024;
+        return bitrate * 1000 * 1000 * 1000 * 1000;
     DEFAULT
     END
     return bitrate;
@@ -772,7 +772,7 @@
     return OGS_OK;
 }
 
-char *ogs_sbi_s_nssai_to_string(ogs_s_nssai_t *s_nssai)
+char *ogs_sbi_s_nssai_to_json(ogs_s_nssai_t *s_nssai)
 {
     cJSON *item = NULL;
     OpenAPI_snssai_t sNSSAI;
@@ -798,7 +798,7 @@
     return v;
 }
 
-bool ogs_sbi_s_nssai_from_string(ogs_s_nssai_t *s_nssai, char *str)
+bool ogs_sbi_s_nssai_from_json(ogs_s_nssai_t *s_nssai, char *str)
 {
     bool rc = false;
 
@@ -823,6 +823,70 @@
     return rc;
 }
 
+char *ogs_sbi_s_nssai_to_string(ogs_s_nssai_t *s_nssai)
+{
+    ogs_assert(s_nssai);
+
+    if (s_nssai->sd.v != OGS_S_NSSAI_NO_SD_VALUE) {
+        return ogs_msprintf("%d-%06x", s_nssai->sst, s_nssai->sd.v);
+    } else {
+        return ogs_msprintf("%d", s_nssai->sst);
+    }
+}
+
+bool ogs_sbi_s_nssai_from_string(ogs_s_nssai_t *s_nssai, char *str)
+{
+    bool rc = false;
+    char *token, *p, *tofree;
+    char *sst = NULL;
+    char *sd = NULL;
+
+    ogs_assert(s_nssai);
+    ogs_assert(str);
+
+    tofree = p = ogs_strdup(str);
+    if (!p) {
+        ogs_error("ogs_strdup%s failed", str);
+        goto cleanup;
+    }
+
+    token = strsep(&p, "-");
+    if (!token) {
+        ogs_error("strsep%s failed", str);
+        goto cleanup;
+    }
+
+    sst = ogs_strdup(token);
+    if (!sst) {
+        ogs_error("ogs_strdup%s:%s failed", str, token);
+        goto cleanup;
+    }
+
+    s_nssai->sst = atoi(sst);
+    s_nssai->sd.v = OGS_S_NSSAI_NO_SD_VALUE;
+
+    if (p) {
+        sd = ogs_strdup(p);
+        if (!sd) {
+            ogs_error("ogs_strdup%s:%s failed", str, token);
+            goto cleanup;
+        }
+        s_nssai->sd = ogs_uint24_from_string(sd);
+    }
+
+    rc = true;
+
+cleanup:
+    if (tofree)
+        ogs_free(tofree);
+    if (sst)
+        ogs_free(sst);
+    if (sd)
+        ogs_free(sd);
+
+    return rc;
+}
+
 OpenAPI_plmn_id_t *ogs_sbi_build_plmn_id(ogs_plmn_id_t *plmn_id)
 {
     OpenAPI_plmn_id_t *PlmnId = NULL;
@@ -1257,17 +1321,3 @@
 
     ogs_free(QosData);
 }
-
-char *ogs_sbi_s_nssai_to_string_plain(ogs_s_nssai_t *s_nssai)
-{
-    ogs_assert(s_nssai);
-    if (s_nssai->sd.v !=
-            OGS_S_NSSAI_NO_SD_VALUE) {
-        return ogs_msprintf("%d%06x",
-            s_nssai->sst,
-            s_nssai->sd.v);
-    } else {
-        return ogs_msprintf("%d",
-            s_nssai->sst);
-    }
-}

open5gs_2.6.4.tar.xz/lib/sbi/conv.h -> open5gs_2.6.5.tar.xz/lib/sbi/conv.h Changed

open5gs_2.6.4.tar.xz/lib/sbi/message.c -> open5gs_2.6.5.tar.xz/lib/sbi/message.c Changed

@@ -107,6 +107,8 @@
     if (message->Amf3GppAccessRegistrationModification)
         OpenAPI_amf3_gpp_access_registration_modification_free(
                 message->Amf3GppAccessRegistrationModification);
+    if (message->SmfRegistration)
+        OpenAPI_smf_registration_free(message->SmfRegistration);
     if (message->AccessAndMobilitySubscriptionData)
         OpenAPI_access_and_mobility_subscription_data_free(
                 message->AccessAndMobilitySubscriptionData);
@@ -475,9 +477,9 @@
         }
     }
     if (message->param.single_nssai_presence) {
-        char *v = ogs_sbi_s_nssai_to_string(&message->param.s_nssai);
+        char *v = ogs_sbi_s_nssai_to_json(&message->param.s_nssai);
         if (!v) {
-            ogs_error("ogs_sbi_s_nssai_to_string() failed");
+            ogs_error("ogs_sbi_s_nssai_to_json() failed");
             ogs_sbi_request_free(request);
             return NULL;
         }
@@ -485,9 +487,9 @@
         ogs_free(v);
     }
     if (message->param.snssai_presence) {
-        char *v = ogs_sbi_s_nssai_to_string(&message->param.s_nssai);
+        char *v = ogs_sbi_s_nssai_to_json(&message->param.s_nssai);
         if (!v) {
-            ogs_error("ogs_sbi_s_nssai_to_string() failed");
+            ogs_error("ogs_sbi_s_nssai_to_json() failed");
             ogs_sbi_request_free(request);
             return NULL;
         }
@@ -748,16 +750,14 @@
         } else if (!strcmp(ogs_hash_this_key(hi), OGS_SBI_PARAM_SINGLE_NSSAI)) {
             char *v = ogs_hash_this_val(hi);
             if (v) {
-                bool rc = ogs_sbi_s_nssai_from_string(
-                        &message->param.s_nssai, v);
+                bool rc = ogs_sbi_s_nssai_from_json(&message->param.s_nssai, v);
                 if (rc == true)
                     message->param.single_nssai_presence = true;
             }
         } else if (!strcmp(ogs_hash_this_key(hi), OGS_SBI_PARAM_SNSSAI)) {
             char *v = ogs_hash_this_val(hi);
             if (v) {
-                bool rc = ogs_sbi_s_nssai_from_string(
-                        &message->param.s_nssai, v);
+                bool rc = ogs_sbi_s_nssai_from_json(&message->param.s_nssai, v);
                 if (rc == true)
                     message->param.snssai_presence = true;
             }
@@ -1055,6 +1055,9 @@
         item = OpenAPI_amf3_gpp_access_registration_modification_convertToJSON(
                 message->Amf3GppAccessRegistrationModification);
         ogs_assert(item);
+    } else if (message->SmfRegistration) {
+        item = OpenAPI_smf_registration_convertToJSON(message->SmfRegistration);
+        ogs_assert(item);
     } else if (message->AccessAndMobilitySubscriptionData) {
         item = OpenAPI_access_and_mobility_subscription_data_convertToJSON(
                 message->AccessAndMobilitySubscriptionData);
@@ -1359,8 +1362,6 @@
                         }
                     }
                     break;
-                CASE(OGS_SBI_HTTP_METHOD_DELETE)
-                    break;
                 DEFAULT
                     rv = OGS_ERROR;
                     ogs_error("Unknown method %s", message->h.method);
@@ -1428,7 +1429,6 @@
             CASE(OGS_SBI_RESOURCE_NAME_REGISTRATIONS)
                 SWITCH(message->h.resource.component2)
                 CASE(OGS_SBI_RESOURCE_NAME_AMF_3GPP_ACCESS)
-
                     SWITCH(message->h.method)
                     CASE(OGS_SBI_HTTP_METHOD_PUT)
                         if (message->res_status < 300) {
@@ -1463,6 +1463,21 @@
                         ogs_error("Unknown method %s", message->h.method);
                     END
                     break;
+
+                CASE(OGS_SBI_RESOURCE_NAME_SMF_REGISTRATIONS)
+                    if (message->res_status < 300) {
+                        message->SmfRegistration =
+                            OpenAPI_smf_registration_parseFromJSON(item);
+                        if (!message->SmfRegistration) {
+                            rv = OGS_ERROR;
+                            ogs_error("JSON parse error");
+                        }
+                    } else {
+                        ogs_error("HTTP ERROR Status : %d",
+                                message->res_status);
+                    }
+                    break;
+
                 DEFAULT
                     rv = OGS_ERROR;
                     ogs_error("Unknown resource name %s",
@@ -1601,18 +1616,39 @@
                     break;
 
                 CASE(OGS_SBI_RESOURCE_NAME_CONTEXT_DATA)
-                    if (message->res_status < 300) {
-                        message->Amf3GppAccessRegistration =
-                            OpenAPI_amf3_gpp_access_registration_parseFromJSON(
-                                    item);
-                        if (!message->Amf3GppAccessRegistration) {
-                            rv = OGS_ERROR;
-                            ogs_error("JSON parse error");
+                    SWITCH(message->h.resource.component3)
+                    CASE(OGS_SBI_RESOURCE_NAME_AMF_3GPP_ACCESS)
+                        if (message->res_status < 300) {
+                            message->Amf3GppAccessRegistration =
+                                OpenAPI_amf3_gpp_access_registration_parseFromJSON(
+                                        item);
+                            if (!message->Amf3GppAccessRegistration) {
+                                rv = OGS_ERROR;
+                                ogs_error("JSON parse error");
+                            }
+                        } else {
+                            ogs_error("HTTP ERROR Status : %d",
+                                    message->res_status);
                         }
-                    } else {
-                        ogs_error("HTTP ERROR Status : %d",
-                                message->res_status);
-                    }
+                        break;
+                    CASE(OGS_SBI_RESOURCE_NAME_SMF_REGISTRATIONS)
+                        if (message->res_status < 300) {
+                            message->SmfRegistration =
+                                OpenAPI_smf_registration_parseFromJSON(item);
+                            if (!message->SmfRegistration) {
+                                rv = OGS_ERROR;
+                                ogs_error("JSON parse error");
+                            }
+                        } else {
+                            ogs_error("HTTP ERROR Status : %d",
+                                    message->res_status);
+                        }
+                        break;
+                    DEFAULT
+                        rv = OGS_ERROR;
+                        ogs_error("Unknown resource name %s",
+                                message->h.resource.component3);
+                    END
                     break;
 
                 DEFAULT
@@ -1899,33 +1935,22 @@
         CASE(OGS_SBI_SERVICE_NAME_NPCF_AM_POLICY_CONTROL)
             SWITCH(message->h.resource.component0)
             CASE(OGS_SBI_RESOURCE_NAME_POLICIES)
-                SWITCH(message->h.method)
-                CASE(OGS_SBI_HTTP_METHOD_POST)
-                    if (message->res_status == 0) {
-                        message->PolicyAssociationRequest =
-                            OpenAPI_policy_association_request_parseFromJSON(
-                                    item);
-                        if (!message->PolicyAssociationRequest) {
-                            rv = OGS_ERROR;
-                            ogs_error("JSON parse error");
-                        }
-                    } else if (message->res_status ==
-                            OGS_SBI_HTTP_STATUS_CREATED) {
-                        message->PolicyAssociation =
-                            OpenAPI_policy_association_parseFromJSON(item);
-                        if (!message->PolicyAssociation) {
-                            rv = OGS_ERROR;
-                            ogs_error("JSON parse error");
-                        }
+                if (message->res_status == 0) {
+                    message->PolicyAssociationRequest =
+                        OpenAPI_policy_association_request_parseFromJSON(item);
+                    if (!message->PolicyAssociationRequest) {
+                        rv = OGS_ERROR;
+                        ogs_error("JSON parse error");
                     }
-                    break;
-                CASE(OGS_SBI_HTTP_METHOD_DELETE)
-                    /* Nothing */
-                    break;
-                DEFAULT
-                    rv = OGS_ERROR;
-                    ogs_error("Unknown method %s", message->h.method);
-                END
+                } else if (message->res_status ==
+                        OGS_SBI_HTTP_STATUS_CREATED) {
+                    message->PolicyAssociation =
+                        OpenAPI_policy_association_parseFromJSON(item);
+                    if (!message->PolicyAssociation) {
+                        rv = OGS_ERROR;
+                        ogs_error("JSON parse error");
+                    }
+                }
                 break;
             DEFAULT

open5gs_2.6.4.tar.xz/lib/sbi/message.h -> open5gs_2.6.5.tar.xz/lib/sbi/message.h Changed

open5gs_2.6.4.tar.xz/lib/sbi/nghttp2-server.c -> open5gs_2.6.5.tar.xz/lib/sbi/nghttp2-server.c Changed

@@ -592,7 +592,13 @@
 
     i = 0;
 
-    ogs_assert(strlen(status_stringresponse->status) == 3);
+    if (strlen(status_stringresponse->status) != 3) {
+        ogs_fatal("response status %d", response->status);
+        ogs_fatal("status string %s", status_stringresponse->status);
+        ogs_assert_if_reached();
+        return false;
+    }
+
     add_header(&nvai++, ":status", status_stringresponse->status);
 
     ogs_snprintf(srv_version, sizeof(srv_version),
@@ -906,6 +912,32 @@
             ogs_error("nghttp2_session_mem_recv() failed (%d:%s)",
                         (int)readlen, nghttp2_strerror((int)readlen));
             session_remove(sbi_sess);
+        } else {
+            /*
+             * Issues #2385
+             *
+             * Nokia AMF is sending GOAWAY because it didn't get
+             * ACK SETTINGS packet for the SETTINGS it set,
+             * this is according to http2 RFC, all settings must be
+             * ACK or connection will be dropped.
+             *
+             * Open5GS is not ACKing pure settings packets,
+             * looks like it is waiting for a header
+             * like POST/GET first to trigger
+             * sending settings ACK and then headers reply.
+             */
+
+            /*
+             * SOLVED
+             *
+             * Whether or not to send a Setting ACK is determined
+             * by the nghttp2 library. Therefore, when nghttp2 informs us
+             * that it want to send an SETTING frame with ACK
+             * by nghttp2_session_want_write(), we need to call session_send()
+             * directly to send it.
+             */
+            if (nghttp2_session_want_write(sbi_sess->session))
+                session_send(sbi_sess);
         }
     } else {
         if (n < 0) {
@@ -1034,40 +1066,15 @@
     ogs_assert(session);
     ogs_assert(frame);
 
-    stream = nghttp2_session_get_stream_user_data(session, frame->hd.stream_id);
-    if (!stream) {
-        if (frame->hd.type == NGHTTP2_SETTINGS) {
-            sbi_sess->settings.max_concurrent_streams =
-                nghttp2_session_get_remote_settings(
-                    session, NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS);
-            sbi_sess->settings.enable_push =
-                nghttp2_session_get_remote_settings(
-                    session, NGHTTP2_SETTINGS_ENABLE_PUSH);
-            ogs_debug("MAX_CONCURRENT_STREAMS = %d",
-                sbi_sess->settings.max_concurrent_streams);
-            ogs_debug("ENABLE_PUSH = %s",
-                sbi_sess->settings.enable_push ? "TRUE" : "false");
-
-        } else if (frame->hd.type == NGHTTP2_GOAWAY) {
-            rv = nghttp2_submit_goaway(
-                 session, NGHTTP2_FLAG_NONE, sbi_sess->last_stream_id,
-                 NGHTTP2_NO_ERROR, NULL, 0);
-            if (rv != 0) {
-                ogs_error("nghttp2_submit_goaway() failed (%d:%s)",
-                            rv, nghttp2_strerror(rv));
-                return OGS_ERROR;
-            }
-
-            session_send(sbi_sess);
-        }
-        return 0;
-    }
-
-    request = stream->request;
-    ogs_assert(request);
-
     switch (frame->hd.type) {
     case NGHTTP2_HEADERS:
+        stream = nghttp2_session_get_stream_user_data(
+                session, frame->hd.stream_id);
+        if (!stream) return 0;
+
+        request = stream->request;
+        ogs_assert(request);
+
         if (frame->headers.cat == NGHTTP2_HCAT_REQUEST) {
             const char *expect100 =
                 ogs_sbi_header_get(request->http.headers, OGS_SBI_EXPECT);
@@ -1090,6 +1097,13 @@
         OGS_GNUC_FALLTHROUGH;
 
     case NGHTTP2_DATA:
+        stream = nghttp2_session_get_stream_user_data(
+                session, frame->hd.stream_id);
+        if (!stream) return 0;
+
+        request = stream->request;
+        ogs_assert(request);
+
         /* HEADERS or DATA frame with +END_STREAM flag */
         if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
             ogs_log_level_e level = OGS_LOG_DEBUG;
@@ -1120,8 +1134,66 @@
 
                 return 0;
             }
-            break;
+        } else {
+            /* TODO : Need to implement the timeouf of reading STREAM */
+        }
+        break;
+    case NGHTTP2_SETTINGS:
+        ogs_debug("FLAGS(0x%x) %s",
+                frame->hd.flags,
+                frame->hd.flags & NGHTTP2_FLAG_ACK ? "ACK" : "NO-ACK");
+
+        if ((frame->hd.flags & NGHTTP2_FLAG_ACK) == 0) {
+            sbi_sess->settings.max_concurrent_streams =
+                nghttp2_session_get_remote_settings(
+                    session, NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS);
+            sbi_sess->settings.enable_push =
+                nghttp2_session_get_remote_settings(
+                    session, NGHTTP2_SETTINGS_ENABLE_PUSH);
+            ogs_debug("MAX_CONCURRENT_STREAMS = %d",
+                sbi_sess->settings.max_concurrent_streams);
+            ogs_debug("ENABLE_PUSH = %s",
+                sbi_sess->settings.enable_push ? "TRUE" : "false");
+
+            return 0;
         }
+
+        /*
+         * TODO:
+         *
+         * if Setting ACK received, need to stop Timer.
+         * Otherwise, we need to send NGHTTP2_GOAWAY
+         */
+        break;
+    case NGHTTP2_GOAWAY:
+#if 0 /* It is not neeed in other nghttp2 example */
+        rv = nghttp2_submit_goaway(
+             session, NGHTTP2_FLAG_NONE, sbi_sess->last_stream_id,
+             NGHTTP2_NO_ERROR, NULL, 0);
+        if (rv != 0) {
+            ogs_error("nghttp2_submit_goaway() failed (%d:%s)",
+                        rv, nghttp2_strerror(rv));
+            return OGS_ERROR;
+        }
+
+        session_send(sbi_sess);
+#endif
+        ogs_info("GOAWAY received: last-stream-id=%d",
+                frame->goaway.last_stream_id);
+        ogs_info("error_code=%d", frame->goaway.error_code);
+        break;
+    case NGHTTP2_RST_STREAM:
+        ogs_info("RST_STREAM received: stream_id=%d", frame->hd.stream_id);
+        break;
+    case NGHTTP2_PING:
+        if (frame->hd.flags & NGHTTP2_FLAG_ACK)
+            ogs_info("PING ACK received");
+        break;
+    case NGHTTP2_PUSH_PROMISE:
+        ogs_info("PUSH_PROMISE recieved: stream_id=%d", frame->hd.stream_id);
+        ogs_info("promised_stream_id=%d",
+                frame->push_promise.promised_stream_id);
+        break;
     default:
         break;
     }
@@ -1223,8 +1295,12 @@
 
         j = 0;
         while(paramsj.key && paramsj.val) {
-            ogs_sbi_header_set(request->http.params,
-                    paramsj.key, paramsj.val);
+            if (strlen(paramsj.key))
+                ogs_sbi_header_set(request->http.params,
+                        paramsj.key, paramsj.val);
+            else
+                ogs_warn("No KEY in Query-Parms");
+
             j++;
         }

open5gs_2.6.4.tar.xz/lib/sbi/nnrf-build.c -> open5gs_2.6.5.tar.xz/lib/sbi/nnrf-build.c Changed

@@ -1501,6 +1501,10 @@
     ogs_assert(subscription_data);
     ogs_assert(subscription_data->req_nf_type);
 
+    /* Issue #2630 : The format of subscrCond is invalid. Must be 'oneOf'. */
+    ogs_assert(!subscription_data->subscr_cond.nf_type ||
+            !subscription_data->subscr_cond.service_name);
+
     memset(&message, 0, sizeof(message));
     message.h.method = (char *)OGS_SBI_HTTP_METHOD_POST;
     message.h.service.name = (char *)OGS_SBI_SERVICE_NAME_NNRF_NFM;
@@ -1549,10 +1553,12 @@
     if (subscription_data->subscr_cond.nf_type) {
         SubscrCond.nf_type = subscription_data->subscr_cond.nf_type;
         SubscriptionData->subscr_cond = &SubscrCond;
-    }
-    if (subscription_data->subscr_cond.service_name) {
+    } else if (subscription_data->subscr_cond.service_name) {
         SubscrCond.service_name = subscription_data->subscr_cond.service_name;
         SubscriptionData->subscr_cond = &SubscrCond;
+    } else {
+        ogs_fatal("SubscrCond must be 'oneOf'.");
+        ogs_assert_if_reached();
     }
 
     message.SubscriptionData = SubscriptionData;

open5gs_2.6.4.tar.xz/lib/sbi/nnrf-path.c -> open5gs_2.6.5.tar.xz/lib/sbi/nnrf-path.c Changed

@@ -94,16 +94,25 @@
     ogs_sbi_request_t *request = NULL;
     ogs_sbi_subscription_data_t *subscription_data = NULL;
 
+    /* Issue #2630 : The format of subscrCond is invalid. Must be 'oneOf'. */
+    ogs_assert(!subscr_cond_nf_type || !subscr_cond_service_name);
+
     subscription_data = ogs_sbi_subscription_data_add();
     ogs_assert(subscription_data);
 
     subscription_data->req_nf_type = req_nf_type;
     if (req_nf_instance_id)
         subscription_data->req_nf_instance_id = ogs_strdup(req_nf_instance_id);
-    subscription_data->subscr_cond.nf_type = subscr_cond_nf_type;
-    if (subscr_cond_service_name)
+
+    if (subscr_cond_nf_type)
+        subscription_data->subscr_cond.nf_type = subscr_cond_nf_type;
+    else if (subscr_cond_service_name)
         subscription_data->subscr_cond.service_name =
             ogs_strdup(subscr_cond_service_name);
+    else {
+        ogs_fatal("SubscrCond must be 'oneOf'.");
+        ogs_assert_if_reached();
+    }
 
     request = ogs_nnrf_nfm_build_status_subscribe(subscription_data);
     if (!request) {

open5gs_2.6.4.tar.xz/lib/sbi/ogs-sbi.h -> open5gs_2.6.5.tar.xz/lib/sbi/ogs-sbi.h Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/access_and_mobility_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/access_and_mobility_data.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/access_and_mobility_subscription_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/access_and_mobility_subscription_data.c Changed

@@ -1142,11 +1142,17 @@
         rat_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(rat_restrictions_local, rat_restrictions) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(rat_restrictions_local)) {
                 ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed rat_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(rat_restrictionsList, (void *)OpenAPI_rat_type_FromString(rat_restrictions_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(rat_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(rat_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(rat_restrictionsList, (void *)localEnum);
         }
     }
 
@@ -1194,11 +1200,17 @@
         core_network_type_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(core_network_type_restrictions_local, core_network_type_restrictions) {
+            OpenAPI_core_network_type_e localEnum = OpenAPI_core_network_type_NULL;
             if (!cJSON_IsString(core_network_type_restrictions_local)) {
                 ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed core_network_type_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(core_network_type_restrictionsList, (void *)OpenAPI_core_network_type_FromString(core_network_type_restrictions_local->valuestring));
+            localEnum = OpenAPI_core_network_type_FromString(core_network_type_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_core_network_type_FromString(core_network_type_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(core_network_type_restrictionsList, (void *)localEnum);
         }
     }
 
@@ -1286,11 +1298,17 @@
         sor_update_indicator_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(sor_update_indicator_list_local, sor_update_indicator_list) {
+            OpenAPI_sor_update_indicator_e localEnum = OpenAPI_sor_update_indicator_NULL;
             if (!cJSON_IsString(sor_update_indicator_list_local)) {
                 ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed sor_update_indicator_list");
                 goto end;
             }
-            OpenAPI_list_add(sor_update_indicator_listList, (void *)OpenAPI_sor_update_indicator_FromString(sor_update_indicator_list_local->valuestring));
+            localEnum = OpenAPI_sor_update_indicator_FromString(sor_update_indicator_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_sor_update_indicator_FromString(sor_update_indicator_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(sor_update_indicator_listList, (void *)localEnum);
         }
     }
 
@@ -1491,11 +1509,17 @@
         primary_rat_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(primary_rat_restrictions_local, primary_rat_restrictions) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(primary_rat_restrictions_local)) {
                 ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed primary_rat_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(primary_rat_restrictionsList, (void *)OpenAPI_rat_type_FromString(primary_rat_restrictions_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(primary_rat_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(primary_rat_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(primary_rat_restrictionsList, (void *)localEnum);
         }
     }
 
@@ -1510,11 +1534,17 @@
         secondary_rat_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(secondary_rat_restrictions_local, secondary_rat_restrictions) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(secondary_rat_restrictions_local)) {
                 ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed secondary_rat_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(secondary_rat_restrictionsList, (void *)OpenAPI_rat_type_FromString(secondary_rat_restrictions_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(secondary_rat_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(secondary_rat_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(secondary_rat_restrictionsList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/access_and_mobility_subscription_data_1.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/access_and_mobility_subscription_data_1.c Changed

@@ -1142,11 +1142,17 @@
         rat_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(rat_restrictions_local, rat_restrictions) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(rat_restrictions_local)) {
                 ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed rat_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(rat_restrictionsList, (void *)OpenAPI_rat_type_FromString(rat_restrictions_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(rat_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(rat_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(rat_restrictionsList, (void *)localEnum);
         }
     }
 
@@ -1194,11 +1200,17 @@
         core_network_type_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(core_network_type_restrictions_local, core_network_type_restrictions) {
+            OpenAPI_core_network_type_e localEnum = OpenAPI_core_network_type_NULL;
             if (!cJSON_IsString(core_network_type_restrictions_local)) {
                 ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed core_network_type_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(core_network_type_restrictionsList, (void *)OpenAPI_core_network_type_FromString(core_network_type_restrictions_local->valuestring));
+            localEnum = OpenAPI_core_network_type_FromString(core_network_type_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_core_network_type_FromString(core_network_type_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(core_network_type_restrictionsList, (void *)localEnum);
         }
     }
 
@@ -1286,11 +1298,17 @@
         sor_update_indicator_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(sor_update_indicator_list_local, sor_update_indicator_list) {
+            OpenAPI_sor_update_indicator_e localEnum = OpenAPI_sor_update_indicator_NULL;
             if (!cJSON_IsString(sor_update_indicator_list_local)) {
                 ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed sor_update_indicator_list");
                 goto end;
             }
-            OpenAPI_list_add(sor_update_indicator_listList, (void *)OpenAPI_sor_update_indicator_FromString(sor_update_indicator_list_local->valuestring));
+            localEnum = OpenAPI_sor_update_indicator_FromString(sor_update_indicator_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_sor_update_indicator_FromString(sor_update_indicator_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(sor_update_indicator_listList, (void *)localEnum);
         }
     }
 
@@ -1491,11 +1509,17 @@
         primary_rat_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(primary_rat_restrictions_local, primary_rat_restrictions) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(primary_rat_restrictions_local)) {
                 ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed primary_rat_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(primary_rat_restrictionsList, (void *)OpenAPI_rat_type_FromString(primary_rat_restrictions_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(primary_rat_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(primary_rat_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(primary_rat_restrictionsList, (void *)localEnum);
         }
     }
 
@@ -1510,11 +1534,17 @@
         secondary_rat_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(secondary_rat_restrictions_local, secondary_rat_restrictions) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(secondary_rat_restrictions_local)) {
                 ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed secondary_rat_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(secondary_rat_restrictionsList, (void *)OpenAPI_rat_type_FromString(secondary_rat_restrictions_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(secondary_rat_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(secondary_rat_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(secondary_rat_restrictionsList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/af_event_exposure_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/af_event_exposure_data.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/am_requested_value_rep.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/am_requested_value_rep.c Changed

@@ -252,11 +252,17 @@
         access_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(access_types_local, access_types) {
+            OpenAPI_access_type_e localEnum = OpenAPI_access_type_NULL;
             if (!cJSON_IsString(access_types_local)) {
                 ogs_error("OpenAPI_am_requested_value_rep_parseFromJSON() failed access_types");
                 goto end;
             }
-            OpenAPI_list_add(access_typesList, (void *)OpenAPI_access_type_FromString(access_types_local->valuestring));
+            localEnum = OpenAPI_access_type_FromString(access_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_access_type_FromString(access_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(access_typesList, (void *)localEnum);
         }
     }
 
@@ -271,11 +277,17 @@
         rat_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(rat_types_local, rat_types) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(rat_types_local)) {
                 ogs_error("OpenAPI_am_requested_value_rep_parseFromJSON() failed rat_types");
                 goto end;
             }
-            OpenAPI_list_add(rat_typesList, (void *)OpenAPI_rat_type_FromString(rat_types_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(rat_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(rat_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(rat_typesList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/amf_event_mode.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/amf_event_mode.c Changed

@@ -203,11 +203,17 @@
         partitioning_criteriaList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(partitioning_criteria_local, partitioning_criteria) {
+            OpenAPI_partitioning_criteria_e localEnum = OpenAPI_partitioning_criteria_NULL;
             if (!cJSON_IsString(partitioning_criteria_local)) {
                 ogs_error("OpenAPI_amf_event_mode_parseFromJSON() failed partitioning_criteria");
                 goto end;
             }
-            OpenAPI_list_add(partitioning_criteriaList, (void *)OpenAPI_partitioning_criteria_FromString(partitioning_criteria_local->valuestring));
+            localEnum = OpenAPI_partitioning_criteria_FromString(partitioning_criteria_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_partitioning_criteria_FromString(partitioning_criteria_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(partitioning_criteriaList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/bsf_subscription.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/bsf_subscription.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/bsf_subscription_resp.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/bsf_subscription_resp.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/datalink_reporting_configuration.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/datalink_reporting_configuration.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/datalink_reporting_configuration_1.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/datalink_reporting_configuration_1.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/dccf_cond.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/dccf_cond.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/dccf_info.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/dccf_info.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/dnn_route_selection_descriptor.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/dnn_route_selection_descriptor.c Changed

@@ -136,11 +136,17 @@
         ssc_modesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(ssc_modes_local, ssc_modes) {
+            OpenAPI_ssc_mode_e localEnum = OpenAPI_ssc_mode_NULL;
             if (!cJSON_IsString(ssc_modes_local)) {
                 ogs_error("OpenAPI_dnn_route_selection_descriptor_parseFromJSON() failed ssc_modes");
                 goto end;
             }
-            OpenAPI_list_add(ssc_modesList, (void *)OpenAPI_ssc_mode_FromString(ssc_modes_local->valuestring));
+            localEnum = OpenAPI_ssc_mode_FromString(ssc_modes_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_ssc_mode_FromString(ssc_modes_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(ssc_modesList, (void *)localEnum);
         }
     }
 
@@ -155,11 +161,17 @@
         pdu_sess_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(pdu_sess_types_local, pdu_sess_types) {
+            OpenAPI_pdu_session_type_e localEnum = OpenAPI_pdu_session_type_NULL;
             if (!cJSON_IsString(pdu_sess_types_local)) {
                 ogs_error("OpenAPI_dnn_route_selection_descriptor_parseFromJSON() failed pdu_sess_types");
                 goto end;
             }
-            OpenAPI_list_add(pdu_sess_typesList, (void *)OpenAPI_pdu_session_type_FromString(pdu_sess_types_local->valuestring));
+            localEnum = OpenAPI_pdu_session_type_FromString(pdu_sess_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_pdu_session_type_FromString(pdu_sess_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(pdu_sess_typesList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/dnn_upf_info_item.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/dnn_upf_info_item.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/downlink_data_notification_control.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/downlink_data_notification_control.c Changed

@@ -98,11 +98,17 @@
         notif_ctrl_indsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(notif_ctrl_inds_local, notif_ctrl_inds) {
+            OpenAPI_notification_control_indication_e localEnum = OpenAPI_notification_control_indication_NULL;
             if (!cJSON_IsString(notif_ctrl_inds_local)) {
                 ogs_error("OpenAPI_downlink_data_notification_control_parseFromJSON() failed notif_ctrl_inds");
                 goto end;
             }
-            OpenAPI_list_add(notif_ctrl_indsList, (void *)OpenAPI_notification_control_indication_FromString(notif_ctrl_inds_local->valuestring));
+            localEnum = OpenAPI_notification_control_indication_FromString(notif_ctrl_inds_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_notification_control_indication_FromString(notif_ctrl_inds_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(notif_ctrl_indsList, (void *)localEnum);
         }
     }
 
@@ -117,11 +123,17 @@
         types_of_notifList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(types_of_notif_local, types_of_notif) {
+            OpenAPI_dl_data_delivery_status_e localEnum = OpenAPI_dl_data_delivery_status_NULL;
             if (!cJSON_IsString(types_of_notif_local)) {
                 ogs_error("OpenAPI_downlink_data_notification_control_parseFromJSON() failed types_of_notif");
                 goto end;
             }
-            OpenAPI_list_add(types_of_notifList, (void *)OpenAPI_dl_data_delivery_status_FromString(types_of_notif_local->valuestring));
+            localEnum = OpenAPI_dl_data_delivery_status_FromString(types_of_notif_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_dl_data_delivery_status_FromString(types_of_notif_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(types_of_notifList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/downlink_data_notification_control_rm.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/downlink_data_notification_control_rm.c Changed

@@ -98,11 +98,17 @@
         notif_ctrl_indsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(notif_ctrl_inds_local, notif_ctrl_inds) {
+            OpenAPI_notification_control_indication_e localEnum = OpenAPI_notification_control_indication_NULL;
             if (!cJSON_IsString(notif_ctrl_inds_local)) {
                 ogs_error("OpenAPI_downlink_data_notification_control_rm_parseFromJSON() failed notif_ctrl_inds");
                 goto end;
             }
-            OpenAPI_list_add(notif_ctrl_indsList, (void *)OpenAPI_notification_control_indication_FromString(notif_ctrl_inds_local->valuestring));
+            localEnum = OpenAPI_notification_control_indication_FromString(notif_ctrl_inds_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_notification_control_indication_FromString(notif_ctrl_inds_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(notif_ctrl_indsList, (void *)localEnum);
         }
     }
 
@@ -117,11 +123,17 @@
         types_of_notifList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(types_of_notif_local, types_of_notif) {
+            OpenAPI_dl_data_delivery_status_e localEnum = OpenAPI_dl_data_delivery_status_NULL;
             if (!cJSON_IsString(types_of_notif_local)) {
                 ogs_error("OpenAPI_downlink_data_notification_control_rm_parseFromJSON() failed types_of_notif");
                 goto end;
             }
-            OpenAPI_list_add(types_of_notifList, (void *)OpenAPI_dl_data_delivery_status_FromString(types_of_notif_local->valuestring));
+            localEnum = OpenAPI_dl_data_delivery_status_FromString(types_of_notif_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_dl_data_delivery_status_FromString(types_of_notif_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(types_of_notifList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/error_report.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/error_report.c Changed

@@ -235,11 +235,17 @@
         pol_dec_failure_reportsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(pol_dec_failure_reports_local, pol_dec_failure_reports) {
+            OpenAPI_policy_decision_failure_code_e localEnum = OpenAPI_policy_decision_failure_code_NULL;
             if (!cJSON_IsString(pol_dec_failure_reports_local)) {
                 ogs_error("OpenAPI_error_report_parseFromJSON() failed pol_dec_failure_reports");
                 goto end;
             }
-            OpenAPI_list_add(pol_dec_failure_reportsList, (void *)OpenAPI_policy_decision_failure_code_FromString(pol_dec_failure_reports_local->valuestring));
+            localEnum = OpenAPI_policy_decision_failure_code_FromString(pol_dec_failure_reports_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_policy_decision_failure_code_FromString(pol_dec_failure_reports_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(pol_dec_failure_reportsList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/event_subscription.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/event_subscription.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/events_subsc_put_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/events_subsc_put_data.c Changed

@@ -817,11 +817,17 @@
         req_qos_mon_paramsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(req_qos_mon_params_local, req_qos_mon_params) {
+            OpenAPI_requested_qos_monitoring_parameter_e localEnum = OpenAPI_requested_qos_monitoring_parameter_NULL;
             if (!cJSON_IsString(req_qos_mon_params_local)) {
                 ogs_error("OpenAPI_events_subsc_put_data_parseFromJSON() failed req_qos_mon_params");
                 goto end;
             }
-            OpenAPI_list_add(req_qos_mon_paramsList, (void *)OpenAPI_requested_qos_monitoring_parameter_FromString(req_qos_mon_params_local->valuestring));
+            localEnum = OpenAPI_requested_qos_monitoring_parameter_FromString(req_qos_mon_params_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_requested_qos_monitoring_parameter_FromString(req_qos_mon_params_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(req_qos_mon_paramsList, (void *)localEnum);
         }
     }
 
@@ -845,11 +851,17 @@
         req_anisList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(req_anis_local, req_anis) {
+            OpenAPI_required_access_info_e localEnum = OpenAPI_required_access_info_NULL;
             if (!cJSON_IsString(req_anis_local)) {
                 ogs_error("OpenAPI_events_subsc_put_data_parseFromJSON() failed req_anis");
                 goto end;
             }
-            OpenAPI_list_add(req_anisList, (void *)OpenAPI_required_access_info_FromString(req_anis_local->valuestring));
+            localEnum = OpenAPI_required_access_info_FromString(req_anis_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_required_access_info_FromString(req_anis_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(req_anisList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/events_subsc_req_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/events_subsc_req_data.c Changed

@@ -268,11 +268,17 @@
         req_qos_mon_paramsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(req_qos_mon_params_local, req_qos_mon_params) {
+            OpenAPI_requested_qos_monitoring_parameter_e localEnum = OpenAPI_requested_qos_monitoring_parameter_NULL;
             if (!cJSON_IsString(req_qos_mon_params_local)) {
                 ogs_error("OpenAPI_events_subsc_req_data_parseFromJSON() failed req_qos_mon_params");
                 goto end;
             }
-            OpenAPI_list_add(req_qos_mon_paramsList, (void *)OpenAPI_requested_qos_monitoring_parameter_FromString(req_qos_mon_params_local->valuestring));
+            localEnum = OpenAPI_requested_qos_monitoring_parameter_FromString(req_qos_mon_params_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_requested_qos_monitoring_parameter_FromString(req_qos_mon_params_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(req_qos_mon_paramsList, (void *)localEnum);
         }
     }
 
@@ -296,11 +302,17 @@
         req_anisList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(req_anis_local, req_anis) {
+            OpenAPI_required_access_info_e localEnum = OpenAPI_required_access_info_NULL;
             if (!cJSON_IsString(req_anis_local)) {
                 ogs_error("OpenAPI_events_subsc_req_data_parseFromJSON() failed req_anis");
                 goto end;
             }
-            OpenAPI_list_add(req_anisList, (void *)OpenAPI_required_access_info_FromString(req_anis_local->valuestring));
+            localEnum = OpenAPI_required_access_info_FromString(req_anis_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_required_access_info_FromString(req_anis_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(req_anisList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/events_subsc_req_data_rm.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/events_subsc_req_data_rm.c Changed

@@ -243,11 +243,17 @@
         req_qos_mon_paramsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(req_qos_mon_params_local, req_qos_mon_params) {
+            OpenAPI_requested_qos_monitoring_parameter_e localEnum = OpenAPI_requested_qos_monitoring_parameter_NULL;
             if (!cJSON_IsString(req_qos_mon_params_local)) {
                 ogs_error("OpenAPI_events_subsc_req_data_rm_parseFromJSON() failed req_qos_mon_params");
                 goto end;
             }
-            OpenAPI_list_add(req_qos_mon_paramsList, (void *)OpenAPI_requested_qos_monitoring_parameter_FromString(req_qos_mon_params_local->valuestring));
+            localEnum = OpenAPI_requested_qos_monitoring_parameter_FromString(req_qos_mon_params_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_requested_qos_monitoring_parameter_FromString(req_qos_mon_params_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(req_qos_mon_paramsList, (void *)localEnum);
         }
     }
 
@@ -271,11 +277,17 @@
         req_anisList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(req_anis_local, req_anis) {
+            OpenAPI_required_access_info_e localEnum = OpenAPI_required_access_info_NULL;
             if (!cJSON_IsString(req_anis_local)) {
                 ogs_error("OpenAPI_events_subsc_req_data_rm_parseFromJSON() failed req_anis");
                 goto end;
             }
-            OpenAPI_list_add(req_anisList, (void *)OpenAPI_required_access_info_FromString(req_anis_local->valuestring));
+            localEnum = OpenAPI_required_access_info_FromString(req_anis_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_required_access_info_FromString(req_anis_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(req_anisList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/immediate_mdt_conf.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/immediate_mdt_conf.c Changed

@@ -361,11 +361,17 @@
         measurement_lte_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(measurement_lte_list_local, measurement_lte_list) {
+            OpenAPI_measurement_lte_for_mdt_e localEnum = OpenAPI_measurement_lte_for_mdt_NULL;
             if (!cJSON_IsString(measurement_lte_list_local)) {
                 ogs_error("OpenAPI_immediate_mdt_conf_parseFromJSON() failed measurement_lte_list");
                 goto end;
             }
-            OpenAPI_list_add(measurement_lte_listList, (void *)OpenAPI_measurement_lte_for_mdt_FromString(measurement_lte_list_local->valuestring));
+            localEnum = OpenAPI_measurement_lte_for_mdt_FromString(measurement_lte_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_measurement_lte_for_mdt_FromString(measurement_lte_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(measurement_lte_listList, (void *)localEnum);
         }
     }
 
@@ -380,11 +386,17 @@
         measurement_nr_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(measurement_nr_list_local, measurement_nr_list) {
+            OpenAPI_measurement_nr_for_mdt_e localEnum = OpenAPI_measurement_nr_for_mdt_NULL;
             if (!cJSON_IsString(measurement_nr_list_local)) {
                 ogs_error("OpenAPI_immediate_mdt_conf_parseFromJSON() failed measurement_nr_list");
                 goto end;
             }
-            OpenAPI_list_add(measurement_nr_listList, (void *)OpenAPI_measurement_nr_for_mdt_FromString(measurement_nr_list_local->valuestring));
+            localEnum = OpenAPI_measurement_nr_for_mdt_FromString(measurement_nr_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_measurement_nr_for_mdt_FromString(measurement_nr_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(measurement_nr_listList, (void *)localEnum);
         }
     }
 
@@ -399,11 +411,17 @@
         reporting_trigger_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(reporting_trigger_list_local, reporting_trigger_list) {
+            OpenAPI_reporting_trigger_e localEnum = OpenAPI_reporting_trigger_NULL;
             if (!cJSON_IsString(reporting_trigger_list_local)) {
                 ogs_error("OpenAPI_immediate_mdt_conf_parseFromJSON() failed reporting_trigger_list");
                 goto end;
             }
-            OpenAPI_list_add(reporting_trigger_listList, (void *)OpenAPI_reporting_trigger_FromString(reporting_trigger_list_local->valuestring));
+            localEnum = OpenAPI_reporting_trigger_FromString(reporting_trigger_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_reporting_trigger_FromString(reporting_trigger_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(reporting_trigger_listList, (void *)localEnum);
         }
     }
 
@@ -522,11 +540,17 @@
         add_positioning_method_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(add_positioning_method_list_local, add_positioning_method_list) {
+            OpenAPI_positioning_method_mdt_e localEnum = OpenAPI_positioning_method_mdt_NULL;
             if (!cJSON_IsString(add_positioning_method_list_local)) {
                 ogs_error("OpenAPI_immediate_mdt_conf_parseFromJSON() failed add_positioning_method_list");
                 goto end;
             }
-            OpenAPI_list_add(add_positioning_method_listList, (void *)OpenAPI_positioning_method_mdt_FromString(add_positioning_method_list_local->valuestring));
+            localEnum = OpenAPI_positioning_method_mdt_FromString(add_positioning_method_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_positioning_method_mdt_FromString(add_positioning_method_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(add_positioning_method_listList, (void *)localEnum);
         }
     }
 
@@ -565,11 +589,17 @@
         sensor_measurement_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(sensor_measurement_list_local, sensor_measurement_list) {
+            OpenAPI_sensor_measurement_e localEnum = OpenAPI_sensor_measurement_NULL;
             if (!cJSON_IsString(sensor_measurement_list_local)) {
                 ogs_error("OpenAPI_immediate_mdt_conf_parseFromJSON() failed sensor_measurement_list");
                 goto end;
             }
-            OpenAPI_list_add(sensor_measurement_listList, (void *)OpenAPI_sensor_measurement_FromString(sensor_measurement_list_local->valuestring));
+            localEnum = OpenAPI_sensor_measurement_FromString(sensor_measurement_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_sensor_measurement_FromString(sensor_measurement_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(sensor_measurement_listList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/lcs_mo_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/lcs_mo_data.c Changed

@@ -102,11 +102,17 @@
         allowed_service_classesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(allowed_service_classes_local, allowed_service_classes) {
+            OpenAPI_lcs_mo_service_class_e localEnum = OpenAPI_lcs_mo_service_class_NULL;
             if (!cJSON_IsString(allowed_service_classes_local)) {
                 ogs_error("OpenAPI_lcs_mo_data_parseFromJSON() failed allowed_service_classes");
                 goto end;
             }
-            OpenAPI_list_add(allowed_service_classesList, (void *)OpenAPI_lcs_mo_service_class_FromString(allowed_service_classes_local->valuestring));
+            localEnum = OpenAPI_lcs_mo_service_class_FromString(allowed_service_classes_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_lcs_mo_service_class_FromString(allowed_service_classes_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(allowed_service_classesList, (void *)localEnum);
         }
 
     mo_assistance_data_types = cJSON_GetObjectItemCaseSensitive(lcs_mo_dataJSON, "moAssistanceDataTypes");

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/lmf_info.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/lmf_info.c Changed

@@ -274,11 +274,17 @@
         serving_access_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(serving_access_types_local, serving_access_types) {
+            OpenAPI_access_type_e localEnum = OpenAPI_access_type_NULL;
             if (!cJSON_IsString(serving_access_types_local)) {
                 ogs_error("OpenAPI_lmf_info_parseFromJSON() failed serving_access_types");
                 goto end;
             }
-            OpenAPI_list_add(serving_access_typesList, (void *)OpenAPI_access_type_FromString(serving_access_types_local->valuestring));
+            localEnum = OpenAPI_access_type_FromString(serving_access_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_access_type_FromString(serving_access_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(serving_access_typesList, (void *)localEnum);
         }
     }
 
@@ -293,11 +299,17 @@
         serving_an_node_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(serving_an_node_types_local, serving_an_node_types) {
+            OpenAPI_an_node_type_e localEnum = OpenAPI_an_node_type_NULL;
             if (!cJSON_IsString(serving_an_node_types_local)) {
                 ogs_error("OpenAPI_lmf_info_parseFromJSON() failed serving_an_node_types");
                 goto end;
             }
-            OpenAPI_list_add(serving_an_node_typesList, (void *)OpenAPI_an_node_type_FromString(serving_an_node_types_local->valuestring));
+            localEnum = OpenAPI_an_node_type_FromString(serving_an_node_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_an_node_type_FromString(serving_an_node_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(serving_an_node_typesList, (void *)localEnum);
         }
     }
 
@@ -312,11 +324,17 @@
         serving_rat_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(serving_rat_types_local, serving_rat_types) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(serving_rat_types_local)) {
                 ogs_error("OpenAPI_lmf_info_parseFromJSON() failed serving_rat_types");
                 goto end;
             }
-            OpenAPI_list_add(serving_rat_typesList, (void *)OpenAPI_rat_type_FromString(serving_rat_types_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(serving_rat_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(serving_rat_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(serving_rat_typesList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/mdt_configuration.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/mdt_configuration.c Changed

@@ -510,11 +510,17 @@
         measurement_lte_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(measurement_lte_list_local, measurement_lte_list) {
+            OpenAPI_measurement_lte_for_mdt_e localEnum = OpenAPI_measurement_lte_for_mdt_NULL;
             if (!cJSON_IsString(measurement_lte_list_local)) {
                 ogs_error("OpenAPI_mdt_configuration_parseFromJSON() failed measurement_lte_list");
                 goto end;
             }
-            OpenAPI_list_add(measurement_lte_listList, (void *)OpenAPI_measurement_lte_for_mdt_FromString(measurement_lte_list_local->valuestring));
+            localEnum = OpenAPI_measurement_lte_for_mdt_FromString(measurement_lte_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_measurement_lte_for_mdt_FromString(measurement_lte_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(measurement_lte_listList, (void *)localEnum);
         }
     }
 
@@ -529,11 +535,17 @@
         measurement_nr_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(measurement_nr_list_local, measurement_nr_list) {
+            OpenAPI_measurement_nr_for_mdt_e localEnum = OpenAPI_measurement_nr_for_mdt_NULL;
             if (!cJSON_IsString(measurement_nr_list_local)) {
                 ogs_error("OpenAPI_mdt_configuration_parseFromJSON() failed measurement_nr_list");
                 goto end;
             }
-            OpenAPI_list_add(measurement_nr_listList, (void *)OpenAPI_measurement_nr_for_mdt_FromString(measurement_nr_list_local->valuestring));
+            localEnum = OpenAPI_measurement_nr_for_mdt_FromString(measurement_nr_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_measurement_nr_for_mdt_FromString(measurement_nr_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(measurement_nr_listList, (void *)localEnum);
         }
     }
 
@@ -548,11 +560,17 @@
         sensor_measurement_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(sensor_measurement_list_local, sensor_measurement_list) {
+            OpenAPI_sensor_measurement_e localEnum = OpenAPI_sensor_measurement_NULL;
             if (!cJSON_IsString(sensor_measurement_list_local)) {
                 ogs_error("OpenAPI_mdt_configuration_parseFromJSON() failed sensor_measurement_list");
                 goto end;
             }
-            OpenAPI_list_add(sensor_measurement_listList, (void *)OpenAPI_sensor_measurement_FromString(sensor_measurement_list_local->valuestring));
+            localEnum = OpenAPI_sensor_measurement_FromString(sensor_measurement_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_sensor_measurement_FromString(sensor_measurement_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(sensor_measurement_listList, (void *)localEnum);
         }
     }
 
@@ -567,11 +585,17 @@
         reporting_trigger_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(reporting_trigger_list_local, reporting_trigger_list) {
+            OpenAPI_reporting_trigger_e localEnum = OpenAPI_reporting_trigger_NULL;
             if (!cJSON_IsString(reporting_trigger_list_local)) {
                 ogs_error("OpenAPI_mdt_configuration_parseFromJSON() failed reporting_trigger_list");
                 goto end;
             }
-            OpenAPI_list_add(reporting_trigger_listList, (void *)OpenAPI_reporting_trigger_FromString(reporting_trigger_list_local->valuestring));
+            localEnum = OpenAPI_reporting_trigger_FromString(reporting_trigger_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_reporting_trigger_FromString(reporting_trigger_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(reporting_trigger_listList, (void *)localEnum);
         }
     }
 
@@ -645,11 +669,17 @@
         event_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(event_list_local, event_list) {
+            OpenAPI_event_for_mdt_e localEnum = OpenAPI_event_for_mdt_NULL;
             if (!cJSON_IsString(event_list_local)) {
                 ogs_error("OpenAPI_mdt_configuration_parseFromJSON() failed event_list");
                 goto end;
             }
-            OpenAPI_list_add(event_listList, (void *)OpenAPI_event_for_mdt_FromString(event_list_local->valuestring));
+            localEnum = OpenAPI_event_for_mdt_FromString(event_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_event_for_mdt_FromString(event_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(event_listList, (void *)localEnum);
         }
     }
 
@@ -709,11 +739,17 @@
         add_positioning_method_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(add_positioning_method_list_local, add_positioning_method_list) {
+            OpenAPI_positioning_method_mdt_e localEnum = OpenAPI_positioning_method_mdt_NULL;
             if (!cJSON_IsString(add_positioning_method_list_local)) {
                 ogs_error("OpenAPI_mdt_configuration_parseFromJSON() failed add_positioning_method_list");
                 goto end;
             }
-            OpenAPI_list_add(add_positioning_method_listList, (void *)OpenAPI_positioning_method_mdt_FromString(add_positioning_method_list_local->valuestring));
+            localEnum = OpenAPI_positioning_method_mdt_FromString(add_positioning_method_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_positioning_method_mdt_FromString(add_positioning_method_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(add_positioning_method_listList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/mdt_configuration_1.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/mdt_configuration_1.c Changed

@@ -510,11 +510,17 @@
         measurement_lte_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(measurement_lte_list_local, measurement_lte_list) {
+            OpenAPI_measurement_lte_for_mdt_e localEnum = OpenAPI_measurement_lte_for_mdt_NULL;
             if (!cJSON_IsString(measurement_lte_list_local)) {
                 ogs_error("OpenAPI_mdt_configuration_1_parseFromJSON() failed measurement_lte_list");
                 goto end;
             }
-            OpenAPI_list_add(measurement_lte_listList, (void *)OpenAPI_measurement_lte_for_mdt_FromString(measurement_lte_list_local->valuestring));
+            localEnum = OpenAPI_measurement_lte_for_mdt_FromString(measurement_lte_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_measurement_lte_for_mdt_FromString(measurement_lte_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(measurement_lte_listList, (void *)localEnum);
         }
     }
 
@@ -529,11 +535,17 @@
         measurement_nr_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(measurement_nr_list_local, measurement_nr_list) {
+            OpenAPI_measurement_nr_for_mdt_e localEnum = OpenAPI_measurement_nr_for_mdt_NULL;
             if (!cJSON_IsString(measurement_nr_list_local)) {
                 ogs_error("OpenAPI_mdt_configuration_1_parseFromJSON() failed measurement_nr_list");
                 goto end;
             }
-            OpenAPI_list_add(measurement_nr_listList, (void *)OpenAPI_measurement_nr_for_mdt_FromString(measurement_nr_list_local->valuestring));
+            localEnum = OpenAPI_measurement_nr_for_mdt_FromString(measurement_nr_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_measurement_nr_for_mdt_FromString(measurement_nr_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(measurement_nr_listList, (void *)localEnum);
         }
     }
 
@@ -548,11 +560,17 @@
         sensor_measurement_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(sensor_measurement_list_local, sensor_measurement_list) {
+            OpenAPI_sensor_measurement_e localEnum = OpenAPI_sensor_measurement_NULL;
             if (!cJSON_IsString(sensor_measurement_list_local)) {
                 ogs_error("OpenAPI_mdt_configuration_1_parseFromJSON() failed sensor_measurement_list");
                 goto end;
             }
-            OpenAPI_list_add(sensor_measurement_listList, (void *)OpenAPI_sensor_measurement_FromString(sensor_measurement_list_local->valuestring));
+            localEnum = OpenAPI_sensor_measurement_FromString(sensor_measurement_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_sensor_measurement_FromString(sensor_measurement_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(sensor_measurement_listList, (void *)localEnum);
         }
     }
 
@@ -567,11 +585,17 @@
         reporting_trigger_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(reporting_trigger_list_local, reporting_trigger_list) {
+            OpenAPI_reporting_trigger_e localEnum = OpenAPI_reporting_trigger_NULL;
             if (!cJSON_IsString(reporting_trigger_list_local)) {
                 ogs_error("OpenAPI_mdt_configuration_1_parseFromJSON() failed reporting_trigger_list");
                 goto end;
             }
-            OpenAPI_list_add(reporting_trigger_listList, (void *)OpenAPI_reporting_trigger_FromString(reporting_trigger_list_local->valuestring));
+            localEnum = OpenAPI_reporting_trigger_FromString(reporting_trigger_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_reporting_trigger_FromString(reporting_trigger_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(reporting_trigger_listList, (void *)localEnum);
         }
     }
 
@@ -645,11 +669,17 @@
         event_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(event_list_local, event_list) {
+            OpenAPI_event_for_mdt_e localEnum = OpenAPI_event_for_mdt_NULL;
             if (!cJSON_IsString(event_list_local)) {
                 ogs_error("OpenAPI_mdt_configuration_1_parseFromJSON() failed event_list");
                 goto end;
             }
-            OpenAPI_list_add(event_listList, (void *)OpenAPI_event_for_mdt_FromString(event_list_local->valuestring));
+            localEnum = OpenAPI_event_for_mdt_FromString(event_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_event_for_mdt_FromString(event_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(event_listList, (void *)localEnum);
         }
     }
 
@@ -709,11 +739,17 @@
         add_positioning_method_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(add_positioning_method_list_local, add_positioning_method_list) {
+            OpenAPI_positioning_method_mdt_e localEnum = OpenAPI_positioning_method_mdt_NULL;
             if (!cJSON_IsString(add_positioning_method_list_local)) {
                 ogs_error("OpenAPI_mdt_configuration_1_parseFromJSON() failed add_positioning_method_list");
                 goto end;
             }
-            OpenAPI_list_add(add_positioning_method_listList, (void *)OpenAPI_positioning_method_mdt_FromString(add_positioning_method_list_local->valuestring));
+            localEnum = OpenAPI_positioning_method_mdt_FromString(add_positioning_method_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_positioning_method_mdt_FromString(add_positioning_method_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(add_positioning_method_listList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/mfaf_info.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/mfaf_info.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/model_5_gvn_group_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/model_5_gvn_group_data.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nef_cond.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/nef_cond.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nf_profile.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/nf_profile.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nf_service.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/nf_service.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/non_ue_n2_info_subscription_create_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/non_ue_n2_info_subscription_create_data.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nrf_info_served_lmf_info_value.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/nrf_info_served_lmf_info_value.c Changed

@@ -274,11 +274,17 @@
         serving_access_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(serving_access_types_local, serving_access_types) {
+            OpenAPI_access_type_e localEnum = OpenAPI_access_type_NULL;
             if (!cJSON_IsString(serving_access_types_local)) {
                 ogs_error("OpenAPI_nrf_info_served_lmf_info_value_parseFromJSON() failed serving_access_types");
                 goto end;
             }
-            OpenAPI_list_add(serving_access_typesList, (void *)OpenAPI_access_type_FromString(serving_access_types_local->valuestring));
+            localEnum = OpenAPI_access_type_FromString(serving_access_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_access_type_FromString(serving_access_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(serving_access_typesList, (void *)localEnum);
         }
     }
 
@@ -293,11 +299,17 @@
         serving_an_node_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(serving_an_node_types_local, serving_an_node_types) {
+            OpenAPI_an_node_type_e localEnum = OpenAPI_an_node_type_NULL;
             if (!cJSON_IsString(serving_an_node_types_local)) {
                 ogs_error("OpenAPI_nrf_info_served_lmf_info_value_parseFromJSON() failed serving_an_node_types");
                 goto end;
             }
-            OpenAPI_list_add(serving_an_node_typesList, (void *)OpenAPI_an_node_type_FromString(serving_an_node_types_local->valuestring));
+            localEnum = OpenAPI_an_node_type_FromString(serving_an_node_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_an_node_type_FromString(serving_an_node_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(serving_an_node_typesList, (void *)localEnum);
         }
     }
 
@@ -312,11 +324,17 @@
         serving_rat_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(serving_rat_types_local, serving_rat_types) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(serving_rat_types_local)) {
                 ogs_error("OpenAPI_nrf_info_served_lmf_info_value_parseFromJSON() failed serving_rat_types");
                 goto end;
             }
-            OpenAPI_list_add(serving_rat_typesList, (void *)OpenAPI_rat_type_FromString(serving_rat_types_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(serving_rat_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(serving_rat_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(serving_rat_typesList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nrf_info_served_nwdaf_info_value.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/nrf_info_served_nwdaf_info_value.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nrf_info_served_pcscf_info_list_value_value.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/nrf_info_served_pcscf_info_list_value_value.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nrf_info_served_scp_info_list_value.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/nrf_info_served_scp_info_list_value.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nrf_info_served_smf_info_value.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/nrf_info_served_smf_info_value.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nrf_info_served_udr_info_value.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/nrf_info_served_udr_info_value.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nrf_info_served_upf_info_value.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/nrf_info_served_upf_info_value.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nwdaf_cond.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/nwdaf_cond.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nwdaf_info.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/nwdaf_info.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/partial_success_report.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/partial_success_report.c Changed

@@ -259,11 +259,17 @@
         policy_dec_failure_reportsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(policy_dec_failure_reports_local, policy_dec_failure_reports) {
+            OpenAPI_policy_decision_failure_code_e localEnum = OpenAPI_policy_decision_failure_code_NULL;
             if (!cJSON_IsString(policy_dec_failure_reports_local)) {
                 ogs_error("OpenAPI_partial_success_report_parseFromJSON() failed policy_dec_failure_reports");
                 goto end;
             }
-            OpenAPI_list_add(policy_dec_failure_reportsList, (void *)OpenAPI_policy_decision_failure_code_FromString(policy_dec_failure_reports_local->valuestring));
+            localEnum = OpenAPI_policy_decision_failure_code_FromString(policy_dec_failure_reports_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_policy_decision_failure_code_FromString(policy_dec_failure_reports_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(policy_dec_failure_reportsList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/pcscf_info.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/pcscf_info.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/pdu_session_types.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/pdu_session_types.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/pdu_session_types_1.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/pdu_session_types_1.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/plmn_restriction.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/plmn_restriction.c Changed

@@ -190,11 +190,17 @@
         rat_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(rat_restrictions_local, rat_restrictions) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(rat_restrictions_local)) {
                 ogs_error("OpenAPI_plmn_restriction_parseFromJSON() failed rat_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(rat_restrictionsList, (void *)OpenAPI_rat_type_FromString(rat_restrictions_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(rat_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(rat_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(rat_restrictionsList, (void *)localEnum);
         }
     }
 
@@ -242,11 +248,17 @@
         core_network_type_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(core_network_type_restrictions_local, core_network_type_restrictions) {
+            OpenAPI_core_network_type_e localEnum = OpenAPI_core_network_type_NULL;
             if (!cJSON_IsString(core_network_type_restrictions_local)) {
                 ogs_error("OpenAPI_plmn_restriction_parseFromJSON() failed core_network_type_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(core_network_type_restrictionsList, (void *)OpenAPI_core_network_type_FromString(core_network_type_restrictions_local->valuestring));
+            localEnum = OpenAPI_core_network_type_FromString(core_network_type_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_core_network_type_FromString(core_network_type_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(core_network_type_restrictionsList, (void *)localEnum);
         }
     }
 
@@ -261,11 +273,17 @@
         primary_rat_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(primary_rat_restrictions_local, primary_rat_restrictions) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(primary_rat_restrictions_local)) {
                 ogs_error("OpenAPI_plmn_restriction_parseFromJSON() failed primary_rat_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(primary_rat_restrictionsList, (void *)OpenAPI_rat_type_FromString(primary_rat_restrictions_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(primary_rat_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(primary_rat_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(primary_rat_restrictionsList, (void *)localEnum);
         }
     }
 
@@ -280,11 +298,17 @@
         secondary_rat_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(secondary_rat_restrictions_local, secondary_rat_restrictions) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(secondary_rat_restrictions_local)) {
                 ogs_error("OpenAPI_plmn_restriction_parseFromJSON() failed secondary_rat_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(secondary_rat_restrictionsList, (void *)OpenAPI_rat_type_FromString(secondary_rat_restrictions_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(secondary_rat_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(secondary_rat_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(secondary_rat_restrictionsList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/plmn_restriction_1.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/plmn_restriction_1.c Changed

@@ -190,11 +190,17 @@
         rat_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(rat_restrictions_local, rat_restrictions) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(rat_restrictions_local)) {
                 ogs_error("OpenAPI_plmn_restriction_1_parseFromJSON() failed rat_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(rat_restrictionsList, (void *)OpenAPI_rat_type_FromString(rat_restrictions_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(rat_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(rat_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(rat_restrictionsList, (void *)localEnum);
         }
     }
 
@@ -242,11 +248,17 @@
         core_network_type_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(core_network_type_restrictions_local, core_network_type_restrictions) {
+            OpenAPI_core_network_type_e localEnum = OpenAPI_core_network_type_NULL;
             if (!cJSON_IsString(core_network_type_restrictions_local)) {
                 ogs_error("OpenAPI_plmn_restriction_1_parseFromJSON() failed core_network_type_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(core_network_type_restrictionsList, (void *)OpenAPI_core_network_type_FromString(core_network_type_restrictions_local->valuestring));
+            localEnum = OpenAPI_core_network_type_FromString(core_network_type_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_core_network_type_FromString(core_network_type_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(core_network_type_restrictionsList, (void *)localEnum);
         }
     }
 
@@ -261,11 +273,17 @@
         primary_rat_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(primary_rat_restrictions_local, primary_rat_restrictions) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(primary_rat_restrictions_local)) {
                 ogs_error("OpenAPI_plmn_restriction_1_parseFromJSON() failed primary_rat_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(primary_rat_restrictionsList, (void *)OpenAPI_rat_type_FromString(primary_rat_restrictions_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(primary_rat_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(primary_rat_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(primary_rat_restrictionsList, (void *)localEnum);
         }
     }
 
@@ -280,11 +298,17 @@
         secondary_rat_restrictionsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(secondary_rat_restrictions_local, secondary_rat_restrictions) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(secondary_rat_restrictions_local)) {
                 ogs_error("OpenAPI_plmn_restriction_1_parseFromJSON() failed secondary_rat_restrictions");
                 goto end;
             }
-            OpenAPI_list_add(secondary_rat_restrictionsList, (void *)OpenAPI_rat_type_FromString(secondary_rat_restrictions_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(secondary_rat_restrictions_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(secondary_rat_restrictions_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(secondary_rat_restrictionsList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/policy_association.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/policy_association.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/policy_association_request.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/policy_association_request.c Changed

@@ -745,11 +745,17 @@
         access_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(access_types_local, access_types) {
+            OpenAPI_access_type_e localEnum = OpenAPI_access_type_NULL;
             if (!cJSON_IsString(access_types_local)) {
                 ogs_error("OpenAPI_policy_association_request_parseFromJSON() failed access_types");
                 goto end;
             }
-            OpenAPI_list_add(access_typesList, (void *)OpenAPI_access_type_FromString(access_types_local->valuestring));
+            localEnum = OpenAPI_access_type_FromString(access_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_access_type_FromString(access_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(access_typesList, (void *)localEnum);
         }
     }
 
@@ -807,11 +813,17 @@
         rat_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(rat_types_local, rat_types) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(rat_types_local)) {
                 ogs_error("OpenAPI_policy_association_request_parseFromJSON() failed rat_types");
                 goto end;
             }
-            OpenAPI_list_add(rat_typesList, (void *)OpenAPI_rat_type_FromString(rat_types_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(rat_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(rat_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(rat_typesList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/policy_association_update_request.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/policy_association_update_request.c Changed

@@ -645,11 +645,17 @@
         triggersList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(triggers_local, triggers) {
+            OpenAPI_request_trigger_e localEnum = OpenAPI_request_trigger_NULL;
             if (!cJSON_IsString(triggers_local)) {
                 ogs_error("OpenAPI_policy_association_update_request_parseFromJSON() failed triggers");
                 goto end;
             }
-            OpenAPI_list_add(triggersList, (void *)OpenAPI_request_trigger_FromString(triggers_local->valuestring));
+            localEnum = OpenAPI_request_trigger_FromString(triggers_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_request_trigger_FromString(triggers_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(triggersList, (void *)localEnum);
         }
     }
 
@@ -839,11 +845,17 @@
         access_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(access_types_local, access_types) {
+            OpenAPI_access_type_e localEnum = OpenAPI_access_type_NULL;
             if (!cJSON_IsString(access_types_local)) {
                 ogs_error("OpenAPI_policy_association_update_request_parseFromJSON() failed access_types");
                 goto end;
             }
-            OpenAPI_list_add(access_typesList, (void *)OpenAPI_access_type_FromString(access_types_local->valuestring));
+            localEnum = OpenAPI_access_type_FromString(access_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_access_type_FromString(access_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(access_typesList, (void *)localEnum);
         }
     }
 
@@ -858,11 +870,17 @@
         rat_typesList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(rat_types_local, rat_types) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(rat_types_local)) {
                 ogs_error("OpenAPI_policy_association_update_request_parseFromJSON() failed rat_types");
                 goto end;
             }
-            OpenAPI_list_add(rat_typesList, (void *)OpenAPI_rat_type_FromString(rat_types_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(rat_types_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(rat_types_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(rat_typesList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/policy_update.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/policy_update.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/pro_se_allowed_plmn.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/pro_se_allowed_plmn.c Changed

@@ -110,11 +110,17 @@
         prose_direct_allowedList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(prose_direct_allowed_local, prose_direct_allowed) {
+            OpenAPI_prose_direct_allowed_e localEnum = OpenAPI_prose_direct_allowed_NULL;
             if (!cJSON_IsString(prose_direct_allowed_local)) {
                 ogs_error("OpenAPI_pro_se_allowed_plmn_parseFromJSON() failed prose_direct_allowed");
                 goto end;
             }
-            OpenAPI_list_add(prose_direct_allowedList, (void *)OpenAPI_prose_direct_allowed_FromString(prose_direct_allowed_local->valuestring));
+            localEnum = OpenAPI_prose_direct_allowed_FromString(prose_direct_allowed_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_prose_direct_allowed_FromString(prose_direct_allowed_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(prose_direct_allowedList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/protection_policy.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/protection_policy.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/qos_monitoring_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/qos_monitoring_data.c Changed

@@ -231,11 +231,17 @@
         req_qos_mon_paramsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(req_qos_mon_params_local, req_qos_mon_params) {
+            OpenAPI_requested_qos_monitoring_parameter_e localEnum = OpenAPI_requested_qos_monitoring_parameter_NULL;
             if (!cJSON_IsString(req_qos_mon_params_local)) {
                 ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed req_qos_mon_params");
                 goto end;
             }
-            OpenAPI_list_add(req_qos_mon_paramsList, (void *)OpenAPI_requested_qos_monitoring_parameter_FromString(req_qos_mon_params_local->valuestring));
+            localEnum = OpenAPI_requested_qos_monitoring_parameter_FromString(req_qos_mon_params_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_requested_qos_monitoring_parameter_FromString(req_qos_mon_params_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(req_qos_mon_paramsList, (void *)localEnum);
         }
 
     rep_freqs = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "repFreqs");
@@ -252,11 +258,17 @@
         rep_freqsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(rep_freqs_local, rep_freqs) {
+            OpenAPI_reporting_frequency_e localEnum = OpenAPI_reporting_frequency_NULL;
             if (!cJSON_IsString(rep_freqs_local)) {
                 ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed rep_freqs");
                 goto end;
             }
-            OpenAPI_list_add(rep_freqsList, (void *)OpenAPI_reporting_frequency_FromString(rep_freqs_local->valuestring));
+            localEnum = OpenAPI_reporting_frequency_FromString(rep_freqs_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_reporting_frequency_FromString(rep_freqs_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(rep_freqsList, (void *)localEnum);
         }
 
     rep_thresh_dl = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "repThreshDl");

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/registration_location_info.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/registration_location_info.c Changed

@@ -197,11 +197,17 @@
         access_type_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(access_type_list_local, access_type_list) {
+            OpenAPI_access_type_e localEnum = OpenAPI_access_type_NULL;
             if (!cJSON_IsString(access_type_list_local)) {
                 ogs_error("OpenAPI_registration_location_info_parseFromJSON() failed access_type_list");
                 goto end;
             }
-            OpenAPI_list_add(access_type_listList, (void *)OpenAPI_access_type_FromString(access_type_list_local->valuestring));
+            localEnum = OpenAPI_access_type_FromString(access_type_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_access_type_FromString(access_type_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(access_type_listList, (void *)localEnum);
         }
 
     registration_location_info_local_var = OpenAPI_registration_location_info_create (

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/reporting_information.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/reporting_information.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/requested_rule_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/requested_rule_data.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/scp_domain_cond.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/scp_domain_cond.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/scp_info.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/scp_info.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sec_negotiate_req_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/sec_negotiate_req_data.c Changed

@@ -256,11 +256,17 @@
         supported_sec_capability_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(supported_sec_capability_list_local, supported_sec_capability_list) {
+            OpenAPI_security_capability_e localEnum = OpenAPI_security_capability_NULL;
             if (!cJSON_IsString(supported_sec_capability_list_local)) {
                 ogs_error("OpenAPI_sec_negotiate_req_data_parseFromJSON() failed supported_sec_capability_list");
                 goto end;
             }
-            OpenAPI_list_add(supported_sec_capability_listList, (void *)OpenAPI_security_capability_FromString(supported_sec_capability_list_local->valuestring));
+            localEnum = OpenAPI_security_capability_FromString(supported_sec_capability_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_security_capability_FromString(supported_sec_capability_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(supported_sec_capability_listList, (void *)localEnum);
         }
 
     _3_gpp_sbi_target_api_root_supported = cJSON_GetObjectItemCaseSensitive(sec_negotiate_req_dataJSON, "3GppSbiTargetApiRootSupported");

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/session_rule_report.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/session_rule_report.c Changed

@@ -170,11 +170,17 @@
         policy_dec_failure_reportsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(policy_dec_failure_reports_local, policy_dec_failure_reports) {
+            OpenAPI_policy_decision_failure_code_e localEnum = OpenAPI_policy_decision_failure_code_NULL;
             if (!cJSON_IsString(policy_dec_failure_reports_local)) {
                 ogs_error("OpenAPI_session_rule_report_parseFromJSON() failed policy_dec_failure_reports");
                 goto end;
             }
-            OpenAPI_list_add(policy_dec_failure_reportsList, (void *)OpenAPI_policy_decision_failure_code_FromString(policy_dec_failure_reports_local->valuestring));
+            localEnum = OpenAPI_policy_decision_failure_code_FromString(policy_dec_failure_reports_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_policy_decision_failure_code_FromString(policy_dec_failure_reports_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(policy_dec_failure_reportsList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_policy_decision.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/sm_policy_decision.c Changed

@@ -1091,11 +1091,17 @@
         policy_ctrl_req_triggersList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(policy_ctrl_req_triggers_local, policy_ctrl_req_triggers) {
+            OpenAPI_policy_control_request_trigger_e localEnum = OpenAPI_policy_control_request_trigger_NULL;
             if (!cJSON_IsString(policy_ctrl_req_triggers_local)) {
                 ogs_error("OpenAPI_sm_policy_decision_parseFromJSON() failed policy_ctrl_req_triggers");
                 goto end;
             }
-            OpenAPI_list_add(policy_ctrl_req_triggersList, (void *)OpenAPI_policy_control_request_trigger_FromString(policy_ctrl_req_triggers_local->valuestring));
+            localEnum = OpenAPI_policy_control_request_trigger_FromString(policy_ctrl_req_triggers_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_policy_control_request_trigger_FromString(policy_ctrl_req_triggers_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(policy_ctrl_req_triggersList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_policy_update_context_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/sm_policy_update_context_data.c Changed

@@ -1126,11 +1126,17 @@
         rep_policy_ctrl_req_triggersList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(rep_policy_ctrl_req_triggers_local, rep_policy_ctrl_req_triggers) {
+            OpenAPI_policy_control_request_trigger_e localEnum = OpenAPI_policy_control_request_trigger_NULL;
             if (!cJSON_IsString(rep_policy_ctrl_req_triggers_local)) {
                 ogs_error("OpenAPI_sm_policy_update_context_data_parseFromJSON() failed rep_policy_ctrl_req_triggers");
                 goto end;
             }
-            OpenAPI_list_add(rep_policy_ctrl_req_triggersList, (void *)OpenAPI_policy_control_request_trigger_FromString(rep_policy_ctrl_req_triggers_local->valuestring));
+            localEnum = OpenAPI_policy_control_request_trigger_FromString(rep_policy_ctrl_req_triggers_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_policy_control_request_trigger_FromString(rep_policy_ctrl_req_triggers_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(rep_policy_ctrl_req_triggersList, (void *)localEnum);
         }
     }
 
@@ -1686,11 +1692,17 @@
         policy_dec_failure_reportsList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(policy_dec_failure_reports_local, policy_dec_failure_reports) {
+            OpenAPI_policy_decision_failure_code_e localEnum = OpenAPI_policy_decision_failure_code_NULL;
             if (!cJSON_IsString(policy_dec_failure_reports_local)) {
                 ogs_error("OpenAPI_sm_policy_update_context_data_parseFromJSON() failed policy_dec_failure_reports");
                 goto end;
             }
-            OpenAPI_list_add(policy_dec_failure_reportsList, (void *)OpenAPI_policy_decision_failure_code_FromString(policy_dec_failure_reports_local->valuestring));
+            localEnum = OpenAPI_policy_decision_failure_code_FromString(policy_dec_failure_reports_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_policy_decision_failure_code_FromString(policy_dec_failure_reports_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(policy_dec_failure_reportsList, (void *)localEnum);
         }
     }
 
@@ -1761,11 +1773,17 @@
         types_of_notifList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(types_of_notif_local, types_of_notif) {
+            OpenAPI_dl_data_delivery_status_e localEnum = OpenAPI_dl_data_delivery_status_NULL;
             if (!cJSON_IsString(types_of_notif_local)) {
                 ogs_error("OpenAPI_sm_policy_update_context_data_parseFromJSON() failed types_of_notif");
                 goto end;
             }
-            OpenAPI_list_add(types_of_notifList, (void *)OpenAPI_dl_data_delivery_status_FromString(types_of_notif_local->valuestring));
+            localEnum = OpenAPI_dl_data_delivery_status_FromString(types_of_notif_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_dl_data_delivery_status_FromString(types_of_notif_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(types_of_notifList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/smf_info.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/smf_info.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ssc_modes.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/ssc_modes.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ssc_modes_1.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/ssc_modes_1.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/subscription_data.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/subscription_data.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/trust_af_info.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/trust_af_info.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/udr_info.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/udr_info.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ue_context.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/ue_context.c Changed

@@ -1746,11 +1746,17 @@
         am_policy_req_trigger_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(am_policy_req_trigger_list_local, am_policy_req_trigger_list) {
+            OpenAPI_policy_req_trigger_e localEnum = OpenAPI_policy_req_trigger_NULL;
             if (!cJSON_IsString(am_policy_req_trigger_list_local)) {
                 ogs_error("OpenAPI_ue_context_parseFromJSON() failed am_policy_req_trigger_list");
                 goto end;
             }
-            OpenAPI_list_add(am_policy_req_trigger_listList, (void *)OpenAPI_policy_req_trigger_FromString(am_policy_req_trigger_list_local->valuestring));
+            localEnum = OpenAPI_policy_req_trigger_FromString(am_policy_req_trigger_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_policy_req_trigger_FromString(am_policy_req_trigger_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(am_policy_req_trigger_listList, (void *)localEnum);
         }
     }
 
@@ -1773,11 +1779,17 @@
         ue_policy_req_trigger_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(ue_policy_req_trigger_list_local, ue_policy_req_trigger_list) {
+            OpenAPI_policy_req_trigger_e localEnum = OpenAPI_policy_req_trigger_NULL;
             if (!cJSON_IsString(ue_policy_req_trigger_list_local)) {
                 ogs_error("OpenAPI_ue_context_parseFromJSON() failed ue_policy_req_trigger_list");
                 goto end;
             }
-            OpenAPI_list_add(ue_policy_req_trigger_listList, (void *)OpenAPI_policy_req_trigger_FromString(ue_policy_req_trigger_list_local->valuestring));
+            localEnum = OpenAPI_policy_req_trigger_FromString(ue_policy_req_trigger_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_policy_req_trigger_FromString(ue_policy_req_trigger_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(ue_policy_req_trigger_listList, (void *)localEnum);
         }
     }
 
@@ -1808,11 +1820,17 @@
         restricted_rat_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(restricted_rat_list_local, restricted_rat_list) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(restricted_rat_list_local)) {
                 ogs_error("OpenAPI_ue_context_parseFromJSON() failed restricted_rat_list");
                 goto end;
             }
-            OpenAPI_list_add(restricted_rat_listList, (void *)OpenAPI_rat_type_FromString(restricted_rat_list_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(restricted_rat_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(restricted_rat_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(restricted_rat_listList, (void *)localEnum);
         }
     }
 
@@ -1860,11 +1878,17 @@
         restricted_core_nw_type_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(restricted_core_nw_type_list_local, restricted_core_nw_type_list) {
+            OpenAPI_core_network_type_e localEnum = OpenAPI_core_network_type_NULL;
             if (!cJSON_IsString(restricted_core_nw_type_list_local)) {
                 ogs_error("OpenAPI_ue_context_parseFromJSON() failed restricted_core_nw_type_list");
                 goto end;
             }
-            OpenAPI_list_add(restricted_core_nw_type_listList, (void *)OpenAPI_core_network_type_FromString(restricted_core_nw_type_list_local->valuestring));
+            localEnum = OpenAPI_core_network_type_FromString(restricted_core_nw_type_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_core_network_type_FromString(restricted_core_nw_type_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(restricted_core_nw_type_listList, (void *)localEnum);
         }
     }
 
@@ -2046,11 +2070,17 @@
         restricted_primary_rat_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(restricted_primary_rat_list_local, restricted_primary_rat_list) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(restricted_primary_rat_list_local)) {
                 ogs_error("OpenAPI_ue_context_parseFromJSON() failed restricted_primary_rat_list");
                 goto end;
             }
-            OpenAPI_list_add(restricted_primary_rat_listList, (void *)OpenAPI_rat_type_FromString(restricted_primary_rat_list_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(restricted_primary_rat_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(restricted_primary_rat_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(restricted_primary_rat_listList, (void *)localEnum);
         }
     }
 
@@ -2065,11 +2095,17 @@
         restricted_secondary_rat_listList = OpenAPI_list_create();
 
         cJSON_ArrayForEach(restricted_secondary_rat_list_local, restricted_secondary_rat_list) {
+            OpenAPI_rat_type_e localEnum = OpenAPI_rat_type_NULL;
             if (!cJSON_IsString(restricted_secondary_rat_list_local)) {
                 ogs_error("OpenAPI_ue_context_parseFromJSON() failed restricted_secondary_rat_list");
                 goto end;
             }
-            OpenAPI_list_add(restricted_secondary_rat_listList, (void *)OpenAPI_rat_type_FromString(restricted_secondary_rat_list_local->valuestring));
+            localEnum = OpenAPI_rat_type_FromString(restricted_secondary_rat_list_local->valuestring);
+            if (!localEnum) {
+                ogs_error("OpenAPI_rat_type_FromString(restricted_secondary_rat_list_local->valuestring) failed");
+                goto end;
+            }
+            OpenAPI_list_add(restricted_secondary_rat_listList, (void *)localEnum);
         }
     }

open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/upf_info.c -> open5gs_2.6.5.tar.xz/lib/sbi/openapi/model/upf_info.c Changed

open5gs_2.6.4.tar.xz/lib/sbi/support/r17-20230301-openapitools-6.4.0/openapi-generator/templates/model-body.mustache -> open5gs_2.6.5.tar.xz/lib/sbi/support/r17-20230301-openapitools-6.4.0/openapi-generator/templates/model-body.mustache Changed

open5gs_2.6.4.tar.xz/lib/sbi/types.c -> open5gs_2.6.5.tar.xz/lib/sbi/types.c Changed

@@ -85,8 +85,6 @@
     { OpenAPI_nf_type_NSSAAF, OGS_SBI_SERVICE_NAME_NNSSAAF_NSSAA },
 };
 
-
-
 OpenAPI_nf_type_e ogs_sbi_service_type_to_nf_type(ogs_sbi_service_type_e type)
 {
     ogs_assert(type > OGS_SBI_SERVICE_TYPE_NULL &&
@@ -116,3 +114,80 @@
 
     return OGS_SBI_SERVICE_TYPE_NULL;
 }
+
+struct app_error_desc_s {
+    const char *app_strerror;
+};
+
+static struct app_error_desc_s app_error_desc = {
+    { NULL },
+    { OGS_SBI_APP_STRERROR_N1_SM_ERROR },
+    { OGS_SBI_APP_STRERROR_N2_SM_ERROR },
+    { OGS_SBI_APP_STRERROR_SNSSAI_DENIED },
+    { OGS_SBI_APP_STRERROR_DNN_DENIED },
+    { OGS_SBI_APP_STRERROR_PDUTYPE_DENIED },
+    { OGS_SBI_APP_STRERROR_SSC_DENIED },
+    { OGS_SBI_APP_STRERROR_SUBSCRIPTION_DENIED },
+    { OGS_SBI_APP_STRERROR_DNN_NOT_SUPPORTED },
+    { OGS_SBI_APP_STRERROR_PDUTYPE_NOT_SUPPORTED },
+    { OGS_SBI_APP_STRERROR_SSC_NOT_SUPPORTED },
+    { OGS_SBI_APP_STRERROR_HOME_ROUTED_ROAMING_REQUIRED },
+    { OGS_SBI_APP_STRERROR_OUT_OF_LADN_SERVICE_AREA },
+    { OGS_SBI_APP_STRERROR_PRIORITIZED_SERVICES_ONLY },
+    { OGS_SBI_APP_STRERROR_PDU_SESSION_ANCHOR_CHANGE },
+    { OGS_SBI_APP_STRERROR_TARGET_MME_CAPABILITY },
+    { OGS_SBI_APP_STRERROR_NO_EPS_5GS_CONTINUITY },
+    { OGS_SBI_APP_STRERROR_UNABLE_TO_PAGE_UE },
+    { OGS_SBI_APP_STRERROR_UE_NOT_RESPONDING },
+    { OGS_SBI_APP_STRERROR_REJECTED_BY_UE },
+    { OGS_SBI_APP_STRERROR_REJECTED_DUE_VPLMN_POLICY },
+    { OGS_SBI_APP_STRERROR_HO_TAU_IN_PROGRESS },
+    { OGS_SBI_APP_STRERROR_INTEGRITY_PROTECTED_MDR_NOT_ACCEPTABLE },
+    { OGS_SBI_APP_STRERROR_EBI_EXHAUSTED },
+    { OGS_SBI_APP_STRERROR_EBI_REJECTED_LOCAL_POLICY },
+    { OGS_SBI_APP_STRERROR_EBI_REJECTED_NO_N26 },
+    { OGS_SBI_APP_STRERROR_DEFAULT_EPS_BEARER_INACTIVE },
+    { OGS_SBI_APP_STRERROR_HANDOVER_RESOURCE_ALLOCATION_FAILURE },
+    { OGS_SBI_APP_STRERROR_LATE_OVERLAPPING_REQUEST },
+    { OGS_SBI_APP_STRERROR_DEFAULT_EBI_NOT_TRANSFERRED },
+    { OGS_SBI_APP_STRERROR_NOT_SUPPORTED_WITH_ISMF },
+    { OGS_SBI_APP_STRERROR_SERVICE_NOT_AUTHORIZED_BY_NEXT_HOP },
+    { OGS_SBI_APP_STRERROR_NO_DATA_FORWARDING },
+    { OGS_SBI_APP_STRERROR_S_NSSAI_UNAVAILABLE_DUE_TO_NSAC },
+    { OGS_SBI_APP_STRERROR_EXCEEDED_UE_SLICE_DATA_RATE },
+    { OGS_SBI_APP_STRERROR_EXCEEDED_SLICE_DATA_RATE },
+    { OGS_SBI_APP_STRERROR_CONTEXT_NOT_FOUND },
+    { OGS_SBI_APP_STRERROR_HIGHER_PRIORITY_REQUEST_ONGOING },
+    { OGS_SBI_APP_STRERROR_UE_IN_CM_IDLE_STATE },
+    { OGS_SBI_APP_STRERROR_INSUFFICIENT_RESOURCES_SLICE },
+    { OGS_SBI_APP_STRERROR_INSUFFICIENT_RESOURCES_SLICE_DNN },
+    { OGS_SBI_APP_STRERROR_DNN_CONGESTION },
+    { OGS_SBI_APP_STRERROR_S_NSSAI_CONGESTION },
+    { OGS_SBI_APP_STRERROR_PEER_NOT_RESPONDING },
+    { OGS_SBI_APP_STRERROR_NETWORK_FAILURE },
+    { OGS_SBI_APP_STRERROR_UPF_NOT_RESPONDING },
+    { OGS_SBI_APP_STRERROR_UE_NOT_REACHABLE },
+};
+
+const char *ogs_sbi_app_strerror(ogs_sbi_app_errno_e err)
+{
+    ogs_assert(err > OGS_SBI_APP_ERRNO_NULL &&
+                err < OGS_SBI_MAX_NUM_OF_APP_ERRNO);
+    ogs_assert(app_error_descerr.app_strerror);
+    return app_error_descerr.app_strerror;
+}
+
+ogs_sbi_app_errno_e ogs_sbi_app_errno(const char *str)
+{
+    int i;
+
+    ogs_assert(str);
+
+    for (i = 0; i < OGS_SBI_MAX_NUM_OF_APP_ERRNO; i++) {
+        if (app_error_desci.app_strerror &&
+            strcmp(str, app_error_desci.app_strerror) == 0)
+            return (ogs_sbi_app_errno_e)i;
+    }
+
+    return OGS_SBI_APP_ERRNO_NULL;
+}

open5gs_2.6.4.tar.xz/lib/sbi/types.h -> open5gs_2.6.5.tar.xz/lib/sbi/types.h Changed

@@ -161,6 +161,116 @@
 const char *ogs_sbi_service_type_to_name(ogs_sbi_service_type_e service_type);
 ogs_sbi_service_type_e ogs_sbi_service_type_from_name(const char *service_name);
 
+typedef enum {
+    OGS_SBI_APP_ERRNO_NULL = 0,
+
+    /*
+     * Nsmf_PDUService
+     *
+     * TS29.502
+     * 6.1.7 Error Handling
+     * 6.1.7.3 Application Errors
+     */
+    OGS_SBI_APP_ERRNO_N1_SM_ERRNO,
+    OGS_SBI_APP_ERRNO_N2_SM_ERRNO,
+    OGS_SBI_APP_ERRNO_SNSSAI_DENIED,
+    OGS_SBI_APP_ERRNO_DNN_DENIED,
+    OGS_SBI_APP_ERRNO_PDUTYPE_DENIED,
+    OGS_SBI_APP_ERRNO_SSC_DENIED,
+    OGS_SBI_APP_ERRNO_SUBSCRIPTION_DENIED,
+    OGS_SBI_APP_ERRNO_DNN_NOT_SUPPORTED,
+    OGS_SBI_APP_ERRNO_PDUTYPE_NOT_SUPPORTED,
+    OGS_SBI_APP_ERRNO_SSC_NOT_SUPPORTED,
+    OGS_SBI_APP_ERRNO_HOME_ROUTED_ROAMING_REQUIRED,
+    OGS_SBI_APP_ERRNO_OUT_OF_LADN_SERVICE_AREA,
+    OGS_SBI_APP_ERRNO_PRIORITIZED_SERVICES_ONLY,
+    OGS_SBI_APP_ERRNO_PDU_SESSION_ANCHOR_CHANGE,
+    OGS_SBI_APP_ERRNO_TARGET_MME_CAPABILITY,
+    OGS_SBI_APP_ERRNO_NO_EPS_5GS_CONTINUITY,
+    OGS_SBI_APP_ERRNO_UNABLE_TO_PAGE_UE,
+    OGS_SBI_APP_ERRNO_UE_NOT_RESPONDING,
+    OGS_SBI_APP_ERRNO_REJECTED_BY_UE,
+    OGS_SBI_APP_ERRNO_REJECTED_DUE_VPLMN_POLICY,
+    OGS_SBI_APP_ERRNO_HO_TAU_IN_PROGRESS,
+    OGS_SBI_APP_ERRNO_INTEGRITY_PROTECTED_MDR_NOT_ACCEPTABLE,
+    OGS_SBI_APP_ERRNO_EBI_EXHAUSTED,
+    OGS_SBI_APP_ERRNO_EBI_REJECTED_LOCAL_POLICY,
+    OGS_SBI_APP_ERRNO_EBI_REJECTED_NO_N26,
+    OGS_SBI_APP_ERRNO_DEFAULT_EPS_BEARER_INACTIVE,
+    OGS_SBI_APP_ERRNO_HANDOVER_RESOURCE_ALLOCATION_FAILURE,
+    OGS_SBI_APP_ERRNO_LATE_OVERLAPPING_REQUEST,
+    OGS_SBI_APP_ERRNO_DEFAULT_EBI_NOT_TRANSFERRED,
+    OGS_SBI_APP_ERRNO_NOT_SUPPORTED_WITH_ISMF,
+    OGS_SBI_APP_ERRNO_SERVICE_NOT_AUTHORIZED_BY_NEXT_HOP,
+    OGS_SBI_APP_ERRNO_NO_DATA_FORWARDING,
+    OGS_SBI_APP_ERRNO_S_NSSAI_UNAVAILABLE_DUE_TO_NSAC,
+    OGS_SBI_APP_ERRNO_EXCEEDED_UE_SLICE_DATA_RATE,
+    OGS_SBI_APP_ERRNO_EXCEEDED_SLICE_DATA_RATE,
+    OGS_SBI_APP_ERRNO_CONTEXT_NOT_FOUND,
+    OGS_SBI_APP_ERRNO_HIGHER_PRIORITY_REQUEST_ONGOING,
+    OGS_SBI_APP_ERRNO_UE_IN_CM_IDLE_STATE,
+    OGS_SBI_APP_ERRNO_INSUFFICIENT_RESOURCES_SLICE,
+    OGS_SBI_APP_ERRNO_INSUFFICIENT_RESOURCES_SLICE_DNN,
+    OGS_SBI_APP_ERRNO_DNN_CONGESTION,
+    OGS_SBI_APP_ERRNO_S_NSSAI_CONGESTION,
+    OGS_SBI_APP_ERRNO_PEER_NOT_RESPONDING,
+    OGS_SBI_APP_ERRNO_NETWORK_FAILURE,
+    OGS_SBI_APP_ERRNO_UPF_NOT_RESPONDING,
+    OGS_SBI_APP_ERRNO_UE_NOT_REACHABLE,
+
+    OGS_SBI_MAX_NUM_OF_APP_ERRNO,
+} ogs_sbi_app_errno_e;
+
+#define OGS_SBI_APP_STRERROR_N1_SM_ERROR "N1_SM_ERROR"
+#define OGS_SBI_APP_STRERROR_N2_SM_ERROR "N2_SM_ERROR"
+#define OGS_SBI_APP_STRERROR_SNSSAI_DENIED "SNSSAI_DENIED"
+#define OGS_SBI_APP_STRERROR_DNN_DENIED "DNN_DENIED"
+#define OGS_SBI_APP_STRERROR_PDUTYPE_DENIED "PDUTYPE_DENIED"
+#define OGS_SBI_APP_STRERROR_SSC_DENIED "SSC_DENIED"
+#define OGS_SBI_APP_STRERROR_SUBSCRIPTION_DENIED "SUBSCRIPTION_DENIED"
+#define OGS_SBI_APP_STRERROR_DNN_NOT_SUPPORTED "DNN_NOT_SUPPORTED"
+#define OGS_SBI_APP_STRERROR_PDUTYPE_NOT_SUPPORTED "PDUTYPE_NOT_SUPPORTED"
+#define OGS_SBI_APP_STRERROR_SSC_NOT_SUPPORTED "SSC_NOT_SUPPORTED"
+#define OGS_SBI_APP_STRERROR_HOME_ROUTED_ROAMING_REQUIRED "HOME_ROUTED_ROAMING_REQUIRED"
+#define OGS_SBI_APP_STRERROR_OUT_OF_LADN_SERVICE_AREA "OUT_OF_LADN_SERVICE_AREA"
+#define OGS_SBI_APP_STRERROR_PRIORITIZED_SERVICES_ONLY "PRIORITIZED_SERVICES_ONLY"
+#define OGS_SBI_APP_STRERROR_PDU_SESSION_ANCHOR_CHANGE "PDU_SESSION_ANCHOR_CHANGE"
+#define OGS_SBI_APP_STRERROR_TARGET_MME_CAPABILITY "TARGET_MME_CAPABILITY"
+#define OGS_SBI_APP_STRERROR_NO_EPS_5GS_CONTINUITY "NO_EPS_5GS_CONTINUITY"
+#define OGS_SBI_APP_STRERROR_UNABLE_TO_PAGE_UE "UNABLE_TO_PAGE_UE"
+#define OGS_SBI_APP_STRERROR_UE_NOT_RESPONDING "UE_NOT_RESPONDING"
+#define OGS_SBI_APP_STRERROR_REJECTED_BY_UE "REJECTED_BY_UE"
+#define OGS_SBI_APP_STRERROR_REJECTED_DUE_VPLMN_POLICY "REJECTED_DUE_VPLMN_POLICY"
+#define OGS_SBI_APP_STRERROR_HO_TAU_IN_PROGRESS "HO_TAU_IN_PROGRESS"
+#define OGS_SBI_APP_STRERROR_INTEGRITY_PROTECTED_MDR_NOT_ACCEPTABLE "INTEGRITY_PROTECTED_MDR_NOT_ACCEPTABLE"
+#define OGS_SBI_APP_STRERROR_EBI_EXHAUSTED "EBI_EXHAUSTED"
+#define OGS_SBI_APP_STRERROR_EBI_REJECTED_LOCAL_POLICY "EBI_REJECTED_LOCAL_POLICY"
+#define OGS_SBI_APP_STRERROR_EBI_REJECTED_NO_N26 "EBI_REJECTED_NO_N26"
+#define OGS_SBI_APP_STRERROR_DEFAULT_EPS_BEARER_INACTIVE "DEFAULT_EPS_BEARER_INACTIVE"
+#define OGS_SBI_APP_STRERROR_HANDOVER_RESOURCE_ALLOCATION_FAILURE "HANDOVER_RESOURCE_ALLOCATION_FAILURE"
+#define OGS_SBI_APP_STRERROR_LATE_OVERLAPPING_REQUEST "LATE_OVERLAPPING_REQUEST"
+#define OGS_SBI_APP_STRERROR_DEFAULT_EBI_NOT_TRANSFERRED "DEFAULT_EBI_NOT_TRANSFERRED"
+#define OGS_SBI_APP_STRERROR_NOT_SUPPORTED_WITH_ISMF "NOT_SUPPORTED_WITH_ISMF"
+#define OGS_SBI_APP_STRERROR_SERVICE_NOT_AUTHORIZED_BY_NEXT_HOP "SERVICE_NOT_AUTHORIZED_BY_NEXT_HOP"
+#define OGS_SBI_APP_STRERROR_NO_DATA_FORWARDING "NO_DATA_FORWARDING"
+#define OGS_SBI_APP_STRERROR_S_NSSAI_UNAVAILABLE_DUE_TO_NSAC "S_NSSAI_UNAVAILABLE_DUE_TO_NSAC"
+#define OGS_SBI_APP_STRERROR_EXCEEDED_UE_SLICE_DATA_RATE "EXCEEDED_UE_SLICE_DATA_RATE"
+#define OGS_SBI_APP_STRERROR_EXCEEDED_SLICE_DATA_RATE "EXCEEDED_SLICE_DATA_RATE"
+#define OGS_SBI_APP_STRERROR_CONTEXT_NOT_FOUND "CONTEXT_NOT_FOUND"
+#define OGS_SBI_APP_STRERROR_HIGHER_PRIORITY_REQUEST_ONGOING "HIGHER_PRIORITY_REQUEST_ONGOING"
+#define OGS_SBI_APP_STRERROR_UE_IN_CM_IDLE_STATE "UE_IN_CM_IDLE_STATE"
+#define OGS_SBI_APP_STRERROR_INSUFFICIENT_RESOURCES_SLICE "INSUFFICIENT_RESOURCES_SLICE"
+#define OGS_SBI_APP_STRERROR_INSUFFICIENT_RESOURCES_SLICE_DNN "INSUFFICIENT_RESOURCES_SLICE_DNN"
+#define OGS_SBI_APP_STRERROR_DNN_CONGESTION "DNN_CONGESTION"
+#define OGS_SBI_APP_STRERROR_S_NSSAI_CONGESTION "S_NSSAI_CONGESTION"
+#define OGS_SBI_APP_STRERROR_PEER_NOT_RESPONDING "PEER_NOT_RESPONDING"
+#define OGS_SBI_APP_STRERROR_NETWORK_FAILURE "NETWORK_FAILURE"
+#define OGS_SBI_APP_STRERROR_UPF_NOT_RESPONDING "UPF_NOT_RESPONDING"
+#define OGS_SBI_APP_STRERROR_UE_NOT_REACHABLE "UE_NOT_REACHABLE"
+
+const char *ogs_sbi_app_strerror(ogs_sbi_app_errno_e e);
+ogs_sbi_app_errno_e ogs_sbi_app_errno(const char *str);
+
 #ifdef __cplusplus
 }
 #endif

open5gs_2.6.4.tar.xz/meson.build -> open5gs_2.6.5.tar.xz/meson.build Changed

open5gs_2.6.4.tar.xz/misc/db/open5gs-dbctl -> open5gs_2.6.5.tar.xz/misc/db/open5gs-dbctl Changed

open5gs_2.6.4.tar.xz/src/amf/amf-sm.c -> open5gs_2.6.5.tar.xz/src/amf/amf-sm.c Changed

open5gs_2.6.4.tar.xz/src/amf/context.c -> open5gs_2.6.5.tar.xz/src/amf/context.c Changed

@@ -172,7 +172,7 @@
     }
 
     if (self.num_of_ciphering_order == 0) {
-        ogs_error("no amf.security.ciphering_order in '%s'",
+        ogs_error("No amf.security.ciphering_order in '%s'",
                 ogs_app()->file);
         return OGS_ERROR;
     }
@@ -181,6 +181,11 @@
         ogs_error("Not support GPRS Timer 2 %d", (int)self.time.t3502.value);
         return OGS_ERROR;
     }
+    if (!self.time.t3512.value) {
+        ogs_error("No amf.time.t3512.value in '%s'",
+                ogs_app()->file);
+        return OGS_ERROR;
+    }
     if (ogs_nas_gprs_timer_3_from_sec(&gprs_timer, self.time.t3512.value) !=
         OGS_OK) {
         ogs_error("Not support GPRS Timer 3 %d", (int)self.time.t3512.value);
@@ -1024,6 +1029,8 @@
                         } else
                             ogs_warn("unknown key `%s`", t3512_key);
                     }
+                } else if (!strcmp(time_key, "t3412")) {
+                    /* handle config in mme */
                 } else if (!strcmp(time_key, "nf_instance")) {
                     /* handle config in app library */
                 } else if (!strcmp(time_key, "subscription")) {
@@ -1750,6 +1757,12 @@
             mobile_identity_suci =
                 (ogs_nas_5gs_mobile_identity_suci_t *)mobile_identity->buffer;
 
+            if (mobile_identity_suci->h.supi_format !=
+                    OGS_NAS_5GS_SUPI_FORMAT_IMSI) {
+                ogs_error("Not implemented SUPI format %d",
+                    mobile_identity_suci->h.supi_format);
+                return NULL;
+            }
             if (mobile_identity_suci->protection_scheme_id !=
                     OGS_PROTECTION_SCHEME_NULL &&
                 mobile_identity_suci->protection_scheme_id !=
@@ -2185,11 +2198,19 @@
                         false)
                 continue;
 
-            nf_info = ogs_sbi_nf_info_find(
-                        &nf_instance->nf_info_list, nf_instance->nf_type);
-            if (nf_info) {
-                if (nf_instance->nf_type == OpenAPI_nf_type_SMF &&
-                    check_smf_info(nf_info, sess) == false)
+            if ((nf_instance->nf_type == OpenAPI_nf_type_SMF) &&
+                (ogs_list_count(&nf_instance->nf_info_list) > 0)) {
+
+                ogs_list_for_each(&nf_instance->nf_info_list, nf_info) {
+                    if (nf_info->nf_type != nf_instance->nf_type)
+                        continue;
+                    if (check_smf_info(nf_info, sess) == false)
+                        continue;
+
+                    break;
+                }
+
+                if (!nf_info)
                     continue;
             }
 
@@ -2509,7 +2530,7 @@
     ogs_info("Removed Number of gNB-UEs is now %d", num_of_ran_ue);
 }
 
-int get_ran_ue_load(void)
+int amf_instance_get_load(void)
 {
     return (((ogs_pool_size(&ran_ue_pool) -
             ogs_pool_avail(&ran_ue_pool)) * 100) /
@@ -2614,10 +2635,80 @@
     return false;
 }
 
+/*
+ * Issues #2482
+ *
+ * Changed to that registration can be accepted only
+ * when the UE slice is available in the RAN slice.
+ *
+ * TS23.502
+ * 4.2.2 Registration Management procedures
+ * 4.2.2.2 Registration procedures
+ * 4.2.2.2.2 General Registration
+ *
+ * 21. ...
+ * If the Requested NSSAI does not include S-NSSAIs which map to S-NSSAIs
+ * of the HPLMN subject to Network Slice-Specific Authentication and
+ * Authorization and the AMF determines that no S-NSSAI can be provided
+ * in the Allowed NSSAI for the UE in the current UE's Tracking Area and
+ * if no default S-NSSAI(s) not yet involved in the current UE Registration
+ * procedure could be further considered, the AMF shall reject the UE
+ * Registration and shall include in the rejection message the list
+ * of Rejected S-NSSAIs, each of them with the appropriate rejection
+ * cause value.
+ */
+static bool gnb_ta_is_supported(
+        amf_gnb_t *gnb,
+        ogs_plmn_id_t *plmn_id, ogs_uint24_t tac, ogs_s_nssai_t *s_nssai)
+{
+    int i, j, k;
+
+    ogs_assert(gnb);
+    ogs_assert(plmn_id);
+
+    for (i = 0; i < gnb->num_of_supported_ta_list; i++) {
+        if (gnb->supported_ta_listi.tac.v != tac.v)
+            continue;
+
+        for (j = 0; j < gnb->supported_ta_listi.num_of_bplmn_list; j++) {
+            if (memcmp(&gnb->supported_ta_listi.bplmn_listj.plmn_id,
+                        plmn_id, sizeof(*plmn_id)) != 0)
+                continue;
+
+            for (k = 0;
+                    k < gnb->supported_ta_listi.bplmn_listj.num_of_s_nssai;
+                    k++) {
+                if (gnb->supported_ta_listi.bplmn_listj.s_nssaik.sst ==
+                        s_nssai->sst &&
+                    gnb->supported_ta_listi.bplmn_listj.s_nssaik.sd.v ==
+                        s_nssai->sd.v)
+                    return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+
 bool amf_update_allowed_nssai(amf_ue_t *amf_ue)
 {
-    int i;
+    int i, j, k;
+    amf_gnb_t *gnb = NULL;
+    ran_ue_t *ran_ue = NULL;
+
     ogs_assert(amf_ue);
+    ran_ue = ran_ue_cycle(amf_ue->ran_ue);
+    if (!ran_ue) {
+        ogs_error("%s RAN-NG Context has already been removed",
+                    amf_ue->supi);
+        return false;
+    }
+    gnb = amf_gnb_cycle(ran_ue->gnb);
+    if (!gnb) {
+        ogs_error("gNB has already been removed");
+        return false;
+    }
 
     /*
      * TS23.501
@@ -2710,10 +2801,19 @@
             ogs_nas_rejected_s_nssai_t *rejected =
                     &amf_ue->rejected_nssai.
                         s_nssaiamf_ue->rejected_nssai.num_of_s_nssai;
+            bool ta_supported = false;
+
+
             slice = ogs_slice_find_by_s_nssai(
                     amf_ue->slice, amf_ue->num_of_slice,
                     (ogs_s_nssai_t *)requested);
-            if (slice) {
+            if (slice)
+                ta_supported = gnb_ta_is_supported(gnb,
+                        &amf_ue->nr_tai.plmn_id, amf_ue->nr_tai.tac,
+                        &slice->s_nssai);
+
+            if (ta_supported == true) {
+
                 allowed->sst = requested->sst;
                 allowed->sd.v = requested->sd.v;
                 allowed->mapped_hplmn_sst = requested->mapped_hplmn_sst;
@@ -2745,13 +2845,18 @@
                 &amf_ue->allowed_nssai.
                     s_nssaiamf_ue->allowed_nssai.num_of_s_nssai;
 
-            if (slice->default_indicator == true) {
+            if (slice->default_indicator == true &&
+                gnb_ta_is_supported(gnb,
+                    &amf_ue->nr_tai.plmn_id, amf_ue->nr_tai.tac,
+                    &slice->s_nssai) == true) {
+
                 allowed->sst = slice->s_nssai.sst;
                 allowed->sd.v = slice->s_nssai.sd.v;
                 allowed->mapped_hplmn_sst = 0;
                 allowed->mapped_hplmn_sd.v = OGS_S_NSSAI_NO_SD_VALUE;
 
                 amf_ue->allowed_nssai.num_of_s_nssai++;
+
             }
         }
     }

open5gs_2.6.4.tar.xz/src/amf/context.h -> open5gs_2.6.5.tar.xz/src/amf/context.h Changed

open5gs_2.6.4.tar.xz/src/amf/gmm-build.c -> open5gs_2.6.5.tar.xz/src/amf/gmm-build.c Changed

@@ -129,15 +129,14 @@
     network_feature_support->
         ims_voice_over_ps_session_over_3gpp_access_indicator = 1;
 
-    /* Set T3512 */
-    if (amf_self()->time.t3512.value) {
-        rv = ogs_nas_gprs_timer_3_from_sec(
-                &t3512_value->t, amf_self()->time.t3512.value);
-        ogs_assert(rv == OGS_OK);
-        registration_accept->presencemask |=
-            OGS_NAS_5GS_REGISTRATION_ACCEPT_T3512_VALUE_PRESENT;
-        t3512_value->length = 1;
-    }
+    /* Set T3512 : Mandatory in Open5GS */
+    ogs_assert(amf_self()->time.t3512.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(
+            &t3512_value->t, amf_self()->time.t3512.value);
+    ogs_assert(rv == OGS_OK);
+    registration_accept->presencemask |=
+        OGS_NAS_5GS_REGISTRATION_ACCEPT_T3512_VALUE_PRESENT;
+    t3512_value->length = 1;
 
     /* Set T3502 */
     if (amf_self()->time.t3502.value) {
@@ -173,11 +172,16 @@
     return pkbuf;
 }
 
-ogs_pkbuf_t *gmm_build_registration_reject(ogs_nas_5gmm_cause_t gmm_cause)
+ogs_pkbuf_t *gmm_build_registration_reject(
+        amf_ue_t *amf_ue, ogs_nas_5gmm_cause_t gmm_cause)
 {
     ogs_nas_5gs_message_t message;
     ogs_nas_5gs_registration_reject_t *registration_reject =
         &message.gmm.registration_reject;
+    ogs_nas_rejected_nssai_t *rejected_nssai =
+        &registration_reject->rejected_nssai;
+
+    ogs_assert(amf_ue);
 
     memset(&message, 0, sizeof(message));
     message.gmm.h.extended_protocol_discriminator =
@@ -186,6 +190,14 @@
 
     registration_reject->gmm_cause = gmm_cause;
 
+    if (amf_ue->rejected_nssai.num_of_s_nssai) {
+        ogs_nas_build_rejected_nssai(rejected_nssai,
+                amf_ue->rejected_nssai.s_nssai,
+                amf_ue->rejected_nssai.num_of_s_nssai);
+        registration_reject->presencemask |=
+            OGS_NAS_5GS_REGISTRATION_REJECT_REJECTED_NSSAI_PRESENT;
+    }
+
     return ogs_nas_5gs_plain_encode(&message);
 }

open5gs_2.6.4.tar.xz/src/amf/gmm-build.h -> open5gs_2.6.5.tar.xz/src/amf/gmm-build.h Changed

open5gs_2.6.4.tar.xz/src/amf/gmm-handler.c -> open5gs_2.6.5.tar.xz/src/amf/gmm-handler.c Changed

@@ -137,7 +137,12 @@
     case OGS_NAS_5GS_MOBILE_IDENTITY_SUCI:
         mobile_identity_suci =
             (ogs_nas_5gs_mobile_identity_suci_t *)mobile_identity->buffer;
-
+        if (mobile_identity_suci->h.supi_format !=
+                OGS_NAS_5GS_SUPI_FORMAT_IMSI) {
+            ogs_error("Not implemented SUPI format %d",
+                mobile_identity_suci->h.supi_format);
+            return OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE;
+        }
         if (mobile_identity_suci->protection_scheme_id !=
                 OGS_PROTECTION_SCHEME_NULL &&
             mobile_identity_suci->protection_scheme_id !=
@@ -902,6 +907,12 @@
     if (mobile_identity_header->type == OGS_NAS_5GS_MOBILE_IDENTITY_SUCI) {
         mobile_identity_suci =
             (ogs_nas_5gs_mobile_identity_suci_t *)mobile_identity->buffer;
+        if (mobile_identity_suci->h.supi_format !=
+                OGS_NAS_5GS_SUPI_FORMAT_IMSI) {
+            ogs_error("Not implemented SUPI format %d",
+                mobile_identity_suci->h.supi_format);
+            return OGS_ERROR;
+        }
         if (mobile_identity_suci->protection_scheme_id !=
                 OGS_PROTECTION_SCHEME_NULL &&
             mobile_identity_suci->protection_scheme_id !=

open5gs_2.6.4.tar.xz/src/amf/gmm-sm.c -> open5gs_2.6.5.tar.xz/src/amf/gmm-sm.c Changed

@@ -161,6 +161,80 @@
             }
             break;
 
+        case AMF_TIMER_MOBILE_REACHABLE:
+
+            /*
+             * TS 24.501
+             * 5.3.7 Handling of the periodic registration update timer and
+             *
+             * Upon expiry of the mobile reachable timer the network shall
+             * start the implicit de-registration timer over 3GPP access.
+             * The default value of the implicit de-registration timer over
+             * 3GPP access is 4 minutes greater than the value of timer T3512.
+             */
+
+            ogs_warn("%s Mobile Reachable Timer Expired", amf_ue->supi);
+
+            ogs_list_for_each(&amf_ue->sess_list, sess) {
+                if (sess->paging.ongoing == true &&
+                    sess->paging.n1n2_failure_txf_notif_uri != NULL) {
+                    ogs_assert(true ==
+                        amf_sbi_send_n1_n2_failure_notify(
+                            sess,
+                            OpenAPI_n1_n2_message_transfer_cause_UE_NOT_REACHABLE_FOR_SESSION));
+                }
+            }
+
+            /* Stop Paging */
+            AMF_UE_CLEAR_PAGING_INFO(amf_ue);
+            AMF_UE_CLEAR_N2_TRANSFER(
+                    amf_ue, pdu_session_resource_setup_request);
+            AMF_UE_CLEAR_5GSM_MESSAGE(amf_ue);
+            CLEAR_AMF_UE_TIMER(amf_ue->t3513);
+
+            ogs_timer_start(amf_ue->implicit_deregistration.timer,
+                    ogs_time_from_sec(amf_self()->time.t3512.value + 240));
+            break;
+
+        case AMF_TIMER_IMPLICIT_DEREGISTRATION:
+
+            /*
+             * TS 24.501
+             * 5.3.7 Handling of the periodic registration update timer and
+             *
+             * If the implicit de-registration timer expires before the UE
+             * contacts the network, the network shall implicitly de-register
+             * the UE.
+             *
+             * TS 23.502
+             * 4.2.2.3.3 Network-initiated Deregistration
+             *
+             * The AMF does not send the Deregistration Request message
+             * to the UE for Implicit Deregistration.
+             */
+
+            ogs_info("%s Do Network-initiated De-register UE", amf_ue->supi);
+
+            state = AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED;
+
+            if (UDM_SDM_SUBSCRIBED(amf_ue)) {
+                r = amf_ue_sbi_discover_and_send(
+                        OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
+                        amf_nudm_sdm_build_subscription_delete,
+                        amf_ue, state, NULL);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
+            } else if (PCF_AM_POLICY_ASSOCIATED(amf_ue)) {
+                    r = amf_ue_sbi_discover_and_send(
+                        OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL,
+                        NULL,
+                        amf_npcf_am_policy_control_build_delete,
+                        amf_ue, state, NULL);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
+            }
+            break;
+
         default:
             ogs_error("Unknown timer%s:%d",
                     amf_timer_get_name(e->h.timer_id), e->h.timer_id);
@@ -600,6 +674,7 @@
             ogs_timer_start(amf_ue->implicit_deregistration.timer,
                     ogs_time_from_sec(amf_self()->time.t3512.value + 240));
             break;
+
         case AMF_TIMER_IMPLICIT_DEREGISTRATION:
 
             /*
@@ -638,6 +713,7 @@
                     ogs_assert(r != OGS_ERROR);
             }
             break;
+
         default:
             ogs_error("Unknown timer%s:%d",
                     amf_timer_get_name(e->h.timer_id), e->h.timer_id);
@@ -1040,7 +1116,11 @@
 
                     if (amf_update_allowed_nssai(amf_ue) == false) {
                         ogs_error("No Allowed-NSSAI");
-
+                        r = nas_5gs_send_gmm_reject(
+                                amf_ue,
+                                OGS_5GMM_CAUSE_NO_NETWORK_SLICES_AVAILABLE);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
                         OGS_FSM_TRAN(s, gmm_state_exception);
                         break;
                     }
@@ -1830,10 +1910,6 @@
                 if (rv != OGS_OK) {
                     ogs_error("%s amf_nudm_sdm_handle_provisioned(%s) failed",
                             amf_ue->supi, sbi_message->h.resource.component1);
-                    r = nas_5gs_send_gmm_reject(
-                            amf_ue, OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED);
-                    ogs_expect(r == OGS_OK);
-                    ogs_assert(r != OGS_ERROR);
                     OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
                     break;
                 }
@@ -2216,6 +2292,12 @@
 
                     if (amf_update_allowed_nssai(amf_ue) == false) {
                         ogs_error("No Allowed-NSSAI");
+                        r = nas_5gs_send_gmm_reject(
+                                amf_ue,
+                                OGS_5GMM_CAUSE_NO_NETWORK_SLICES_AVAILABLE);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
+                        OGS_FSM_TRAN(s, gmm_state_exception);
                         break;
                     }

open5gs_2.6.4.tar.xz/src/amf/metrics.c -> open5gs_2.6.5.tar.xz/src/amf/metrics.c Changed

open5gs_2.6.4.tar.xz/src/amf/namf-handler.c -> open5gs_2.6.5.tar.xz/src/amf/namf-handler.c Changed

@@ -274,23 +274,18 @@
 
                 sendmsg.http.location = ogs_sbi_server_uri(server, &header);
 
-                if (ogs_timer_running(
-                            amf_ue->implicit_deregistration.timer) == true) {
-                    ogs_warn("%s Paging failed. Stop", amf_ue->supi);
-                } else {
-                    /* Store Paging Info */
-                    AMF_SESS_STORE_PAGING_INFO(
-                        sess, sendmsg.http.location,
-                        N1N2MessageTransferReqData->n1n2_failure_txf_notif_uri);
-
-                    /* Store N2 Transfer message */
-                    AMF_SESS_STORE_N2_TRANSFER(
-                            sess, pdu_session_resource_setup_request, n2buf);
-
-                    r = ngap_send_paging(amf_ue);
-                    ogs_expect(r == OGS_OK);
-                    ogs_assert(r != OGS_ERROR);
-                }
+                /* Store Paging Info */
+                AMF_SESS_STORE_PAGING_INFO(
+                    sess, sendmsg.http.location,
+                    N1N2MessageTransferReqData->n1n2_failure_txf_notif_uri);
+
+                /* Store N2 Transfer message */
+                AMF_SESS_STORE_N2_TRANSFER(
+                        sess, pdu_session_resource_setup_request, n2buf);
+
+                r = ngap_send_paging(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
             } else if (CM_CONNECTED(amf_ue)) {
                 r = nas_send_pdu_session_setup_request(sess, NULL, n2buf);
@@ -341,23 +336,18 @@
 
             sendmsg.http.location = ogs_sbi_server_uri(server, &header);
 
-            if (ogs_timer_running(
-                        amf_ue->implicit_deregistration.timer) == true) {
-                ogs_warn("%s Paging failed. Stop", amf_ue->supi);
-            } else {
-                /* Store Paging Info */
-                AMF_SESS_STORE_PAGING_INFO(
-                        sess, sendmsg.http.location, NULL);
-
-                /* Store 5GSM Message */
-                AMF_SESS_STORE_5GSM_MESSAGE(sess,
-                        OGS_NAS_5GS_PDU_SESSION_MODIFICATION_COMMAND,
-                        n1buf, n2buf);
+            /* Store Paging Info */
+            AMF_SESS_STORE_PAGING_INFO(
+                    sess, sendmsg.http.location, NULL);
+
+            /* Store 5GSM Message */
+            AMF_SESS_STORE_5GSM_MESSAGE(sess,
+                    OGS_NAS_5GS_PDU_SESSION_MODIFICATION_COMMAND,
+                    n1buf, n2buf);
 
-                r = ngap_send_paging(amf_ue);
-                ogs_expect(r == OGS_OK);
-                ogs_assert(r != OGS_ERROR);
-            }
+            r = ngap_send_paging(amf_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
         } else if (CM_CONNECTED(amf_ue)) {
             r = nas_send_pdu_session_modification_command(sess, n1buf, n2buf);
@@ -378,18 +368,53 @@
         }
 
         if (CM_IDLE(amf_ue)) {
-            if (n1buf)
-                ogs_pkbuf_free(n1buf);
-            if (n2buf)
-                ogs_pkbuf_free(n2buf);
-
             if (N1N2MessageTransferReqData->is_skip_ind == true &&
                 N1N2MessageTransferReqData->skip_ind == true) {
+
+                if (n1buf)
+                    ogs_pkbuf_free(n1buf);
+                if (n2buf)
+                    ogs_pkbuf_free(n2buf);
+
                 N1N2MessageTransferRspData.cause =
                     OpenAPI_n1_n2_message_transfer_cause_N1_MSG_NOT_TRANSFERRED;
+
             } else {
-                ogs_fatal("%s No skipInd", amf_ue->supi);
-                ogs_assert_if_reached();
+                ogs_sbi_server_t *server = NULL;
+                ogs_sbi_header_t header;
+
+                status = OGS_SBI_HTTP_STATUS_ACCEPTED;
+                N1N2MessageTransferRspData.cause =
+                    OpenAPI_n1_n2_message_transfer_cause_ATTEMPTING_TO_REACH_UE;
+
+                /* Location */
+                server = ogs_sbi_server_from_stream(stream);
+                ogs_assert(server);
+
+                memset(&header, 0, sizeof(header));
+                header.service.name = (char *)OGS_SBI_SERVICE_NAME_NAMF_COMM;
+                header.api.version = (char *)OGS_SBI_API_V1;
+                header.resource.component0 =
+                    (char *)OGS_SBI_RESOURCE_NAME_UE_CONTEXTS;
+                header.resource.component1 = amf_ue->supi;
+                header.resource.component2 =
+                    (char *)OGS_SBI_RESOURCE_NAME_N1_N2_MESSAGES;
+                header.resource.component3 = sess->sm_context_ref;
+
+                sendmsg.http.location = ogs_sbi_server_uri(server, &header);
+
+                /* Store Paging Info */
+                AMF_SESS_STORE_PAGING_INFO(
+                        sess, sendmsg.http.location, NULL);
+
+                /* Store 5GSM Message */
+                AMF_SESS_STORE_5GSM_MESSAGE(sess,
+                        OGS_NAS_5GS_PDU_SESSION_RELEASE_COMMAND,
+                        n1buf, n2buf);
+
+                r = ngap_send_paging(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
 
         } else if (CM_CONNECTED(amf_ue)) {
@@ -402,6 +427,36 @@
         }
         break;
 
+    case OpenAPI_ngap_ie_type_NULL:
+        /*
+         * No n2InfoContainer. According to TS23.502, this means that SMF has
+         * encountered an error and is rejecting the session.
+         *
+         * TS23.502
+         * 6.3.1.7 4.3.2.2 UE Requested PDU Session Establishment
+         * p100
+         * 11.  ...
+         * If the PDU session establishment failed anywhere between step 5
+         * and step 11, then the Namf_Communication_N1N2MessageTransfer
+         * request shall include the N1 SM container with a PDU Session
+         * Establishment Reject message ...
+         */
+        if (!n1buf) {
+            ogs_error("%s No N1 SM Content", amf_ue->supi);
+            return OGS_ERROR;
+        }
+
+        ogs_error("%d:%d PDU session establishment reject",
+                sess->psi, sess->pti);
+
+        r = nas_5gs_send_gsm_reject(sess,
+                OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, n1buf);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
+
+        amf_sess_remove(sess);
+        break;
+
     default:
         ogs_error("Not implemented ngapIeType%d", ngapIeType);
         ogs_assert_if_reached();

open5gs_2.6.4.tar.xz/src/amf/nas-path.c -> open5gs_2.6.5.tar.xz/src/amf/nas-path.c Changed

open5gs_2.6.4.tar.xz/src/amf/nas-security.c -> open5gs_2.6.5.tar.xz/src/amf/nas-security.c Changed

open5gs_2.6.4.tar.xz/src/amf/ngap-handler.c -> open5gs_2.6.5.tar.xz/src/amf/ngap-handler.c Changed

@@ -22,6 +22,36 @@
 #include "sbi-path.h"
 #include "nas-path.h"
 
+static bool maximum_number_of_gnbs_is_reached(void)
+{
+    amf_gnb_t *gnb = NULL, *next_gnb = NULL;
+    int number_of_gnbs_online = 0;
+
+    ogs_list_for_each_safe(&amf_self()->gnb_list, next_gnb, gnb) {
+        if (gnb->state.ng_setup_success) {
+            number_of_gnbs_online++;
+        }
+    }
+
+    return number_of_gnbs_online >= ogs_app()->max.peer;
+}
+
+static bool gnb_plmn_id_is_foreign(amf_gnb_t *gnb)
+{
+    int i, j;
+
+    for (i = 0; i < gnb->num_of_supported_ta_list; i++) {
+        for (j = 0; j < gnb->supported_ta_listi.num_of_bplmn_list; j++) {
+            if (memcmp(&gnb->plmn_id,
+                        &gnb->supported_ta_listi.bplmn_listj.plmn_id,
+                        OGS_PLMN_ID_LEN) == 0)
+                return false;
+        }
+    }
+
+    return true;
+}
+
 static bool served_tai_is_found(amf_gnb_t *gnb)
 {
     int i, j;
@@ -83,20 +113,6 @@
     return false;
 }
 
-static bool maximum_number_of_gnbs_is_reached(void)
-{
-    amf_gnb_t *gnb = NULL, *next_gnb = NULL;
-    int number_of_gnbs_online = 0;
-
-    ogs_list_for_each_safe(&amf_self()->gnb_list, next_gnb, gnb) {
-        if (gnb->state.ng_setup_success) {
-            number_of_gnbs_online++;
-        }
-    }
-
-    return number_of_gnbs_online >= ogs_app()->max.peer;
-}
-
 void ngap_handle_ng_setup_request(amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
@@ -178,6 +194,11 @@
     ogs_ngap_GNB_ID_to_uint32(&globalGNB_ID->gNB_ID, &gnb_id);
     ogs_debug("    IP%s GNB_ID0x%x", OGS_ADDR(gnb->sctp.addr, buf), gnb_id);
 
+    memcpy(&gnb->plmn_id,
+            globalGNB_ID->pLMNIdentity.buf, sizeof(gnb->plmn_id));
+    ogs_debug("    PLMN_IDMCC:%d MNC:%d",
+            ogs_plmn_id_mcc(&gnb->plmn_id), ogs_plmn_id_mnc(&gnb->plmn_id));
+
     if (PagingDRX)
         ogs_debug("    PagingDRX%ld", *PagingDRX);
 
@@ -297,11 +318,19 @@
         return;
     }
 
-    if (gnb->num_of_supported_ta_list == 0) {
+    /*
+     * TS38.413
+     * Section 8.7.1.4 Abnormal Conditions
+     *
+     * If the AMF does not identify any of the PLMNs/SNPNs indicated
+     * in the NG SETUP REQUEST message, it shall reject the NG Setup
+     * procedure with an appropriate cause value.
+     */
+    if (gnb_plmn_id_is_foreign(gnb)) {
         ogs_warn("NG-Setup failure:");
-        ogs_warn("    No supported TA exist in NG-Setup request");
-        group = NGAP_Cause_PR_protocol;
-        cause = NGAP_CauseProtocol_message_not_compatible_with_receiver_state;
+        ogs_warn("    globalGNB_ID PLMN-ID is foreign");
+        group = NGAP_Cause_PR_misc;
+        cause = NGAP_CauseMisc_unknown_PLMN_or_SNPN;
 
         r = ngap_send_ng_setup_failure(gnb, group, cause);
         ogs_expect(r == OGS_OK);
@@ -1019,6 +1048,22 @@
                 AMF_SESS_CLEAR_5GSM_MESSAGE(sess);
 
                 break;
+            case OGS_NAS_5GS_PDU_SESSION_RELEASE_COMMAND:
+                r = nas_send_pdu_session_release_command(sess,
+                            sess->gsm_message.n1buf, sess->gsm_message.n2buf);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
+
+                /* n1buf is de-allocated
+                 * in gmm_build_dl_nas_transport() */
+                sess->gsm_message.n1buf = NULL;
+                /* n2buf is de-allocated
+                 * in ngap_build_pdu_session_resource_modify_request() */
+                sess->gsm_message.n2buf = NULL;
+
+                AMF_SESS_CLEAR_5GSM_MESSAGE(sess);
+
+                break;
             default:
                 ogs_fatal("Unknown GSM Message Type%d",
                         sess->gsm_message.type);
@@ -1644,8 +1689,31 @@
          * to prevent retransmission of NAS messages.
          */
         CLEAR_AMF_UE_ALL_TIMERS(amf_ue);
+    }
+
+    switch (ran_ue->ue_ctx_rel_action) {
+    case NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE:
+        ogs_debug("    Action: NG context remove");
+        ran_ue_remove(ran_ue);
+        break;
+    case NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK:
+        ogs_debug("    Action: NG normal release");
+        ran_ue_remove(ran_ue);
+        if (!amf_ue) {
+            ogs_error("No UE(amf-ue) Context");
+            return;
+        }
+        amf_ue_deassociate(amf_ue);
 
         /*
+         * When AMF release the NAS signalling connection,
+         * ran_ue context is removed by ran_ue_remove() and
+         * amf_ue/ran_ue is de-associated by amf_ue_deassociate().
+         *
+         * In this case, implicit deregistration is attempted
+         * by the mobile reachable timer according to the standard document,
+         * and amf_ue will be removed by amf_ue_remove().
+         *
          * TS 24.501
          * 5.3.7 Handling of the periodic registration update timer and
          *
@@ -1664,28 +1732,11 @@
          * TODO: If the UE is registered for emergency services, the AMF shall
          * set the mobile reachable timer with a value equal to timer T3512.
          */
-        if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_registered) &&
-            ran_ue->ue_ctx_rel_action == NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK) {
+        ogs_timer_start(amf_ue->mobile_reachable.timer,
+                ogs_time_from_sec(amf_self()->time.t3512.value + 240));
 
-            ogs_timer_start(amf_ue->mobile_reachable.timer,
-                    ogs_time_from_sec(amf_self()->time.t3512.value + 240));
-        }
-    }
-
-    switch (ran_ue->ue_ctx_rel_action) {
-    case NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE:
-        ogs_debug("    Action: NG context remove");
-        ran_ue_remove(ran_ue);
-        break;
-    case NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK:
-        ogs_debug("    Action: NG normal release");
-        ran_ue_remove(ran_ue);
-        if (!amf_ue) {
-            ogs_error("No UE(amf-ue) Context");
-            return;
-        }
-        amf_ue_deassociate(amf_ue);
         break;
+
     case NGAP_UE_CTX_REL_UE_CONTEXT_REMOVE:
         ogs_debug("    Action: UE context remove");
         ran_ue_remove(ran_ue);

open5gs_2.6.4.tar.xz/src/amf/ngap-path.c -> open5gs_2.6.5.tar.xz/src/amf/ngap-path.c Changed

open5gs_2.6.4.tar.xz/src/amf/nsmf-handler.c -> open5gs_2.6.5.tar.xz/src/amf/nsmf-handler.c Changed

@@ -152,8 +152,9 @@
                  * NOTE : The pkbuf created in the SBI message will be removed
                  *        from ogs_sbi_message_free(), so it must be copied.
                  */
-                ogs_warn("%d:%d PDU session establishment reject",
+                ogs_error("%d:%d PDU session establishment reject",
                         sess->psi, sess->pti);
+
                 n1smbuf = ogs_pkbuf_copy(n1smbuf);
                 ogs_assert(n1smbuf);
                 r = nas_5gs_send_gsm_reject(sess,
@@ -663,6 +664,37 @@
                         ogs_warn("%s RAN-NG Context has already been removed",
                                 amf_ue->supi);
                     }
+
+        /*
+         * When AMF release the NAS signalling connection,
+         * ran_ue context is removed by ran_ue_remove() and
+         * amf_ue/ran_ue is de-associated by amf_ue_deassociate().
+         *
+         * In this case, implicit deregistration is attempted
+         * by the mobile reachable timer according to the standard document,
+         * and amf_ue will be removed by amf_ue_remove().
+         *
+         * TS 24.501
+         * 5.3.7 Handling of the periodic registration update timer and
+         *
+         * Start AMF_TIMER_MOBILE_REACHABLE
+         * mobile reachable timer
+         * The network supervises the periodic registration update procedure
+         * of the UE by means of the mobile reachable timer.
+         * If the UE is not registered for emergency services,
+         * the mobile reachable timer shall be longer than the value of timer
+         * T3512. In this case, by default, the mobile reachable timer is
+         * 4 minutes greater than the value of timer T3512.
+         * The mobile reachable timer shall be reset and started with the
+         * value as indicated above, when the AMF releases the NAS signalling
+         * connection for the UE.
+         *
+         * TODO: If the UE is registered for emergency services, the AMF shall
+         * set the mobile reachable timer with a value equal to timer T3512.
+         */
+                    ogs_timer_start(amf_ue->mobile_reachable.timer,
+                            ogs_time_from_sec(
+                                amf_self()->time.t3512.value + 240));
                 }
 
             } else if (state == AMF_REMOVE_S1_CONTEXT_BY_RESET_ALL) {
@@ -688,6 +720,37 @@
                         ogs_warn("%s RAN-NG Context has already been removed",
                                 amf_ue->supi);
                     }
+
+        /*
+         * When AMF release the NAS signalling connection,
+         * ran_ue context is removed by ran_ue_remove() and
+         * amf_ue/ran_ue is de-associated by amf_ue_deassociate().
+         *
+         * In this case, implicit deregistration is attempted
+         * by the mobile reachable timer according to the standard document,
+         * and amf_ue will be removed by amf_ue_remove().
+         *
+         * TS 24.501
+         * 5.3.7 Handling of the periodic registration update timer and
+         *
+         * Start AMF_TIMER_MOBILE_REACHABLE
+         * mobile reachable timer
+         * The network supervises the periodic registration update procedure
+         * of the UE by means of the mobile reachable timer.
+         * If the UE is not registered for emergency services,
+         * the mobile reachable timer shall be longer than the value of timer
+         * T3512. In this case, by default, the mobile reachable timer is
+         * 4 minutes greater than the value of timer T3512.
+         * The mobile reachable timer shall be reset and started with the
+         * value as indicated above, when the AMF releases the NAS signalling
+         * connection for the UE.
+         *
+         * TODO: If the UE is registered for emergency services, the AMF shall
+         * set the mobile reachable timer with a value equal to timer T3512.
+         */
+                    ogs_timer_start(amf_ue->mobile_reachable.timer,
+                            ogs_time_from_sec(
+                                amf_self()->time.t3512.value + 240));
                 }
 
             } else if (state == AMF_REMOVE_S1_CONTEXT_BY_RESET_PARTIAL) {
@@ -729,6 +792,36 @@
                         ogs_warn("%s RAN-NG Context has already been removed",
                                 amf_ue->supi);
                     }
+        /*
+         * When AMF release the NAS signalling connection,
+         * ran_ue context is removed by ran_ue_remove() and
+         * amf_ue/ran_ue is de-associated by amf_ue_deassociate().
+         *
+         * In this case, implicit deregistration is attempted
+         * by the mobile reachable timer according to the standard document,
+         * and amf_ue will be removed by amf_ue_remove().
+         *
+         * TS 24.501
+         * 5.3.7 Handling of the periodic registration update timer and
+         *
+         * Start AMF_TIMER_MOBILE_REACHABLE
+         * mobile reachable timer
+         * The network supervises the periodic registration update procedure
+         * of the UE by means of the mobile reachable timer.
+         * If the UE is not registered for emergency services,
+         * the mobile reachable timer shall be longer than the value of timer
+         * T3512. In this case, by default, the mobile reachable timer is
+         * 4 minutes greater than the value of timer T3512.
+         * The mobile reachable timer shall be reset and started with the
+         * value as indicated above, when the AMF releases the NAS signalling
+         * connection for the UE.
+         *
+         * TODO: If the UE is registered for emergency services, the AMF shall
+         * set the mobile reachable timer with a value equal to timer T3512.
+         */
+                    ogs_timer_start(amf_ue->mobile_reachable.timer,
+                            ogs_time_from_sec(
+                                amf_self()->time.t3512.value + 240));
                 }
             } else {
                 ogs_error("Invalid STATE%d", state);
@@ -756,6 +849,7 @@
         }
     } else {
         OpenAPI_sm_context_update_error_t *SmContextUpdateError = NULL;
+        OpenAPI_ext_problem_details_t *ProblemDetails = NULL;
         OpenAPI_ref_to_binary_data_t *n1SmMsg = NULL;
         ogs_pkbuf_t *n1smbuf = NULL;
 
@@ -778,8 +872,10 @@
 
             return OGS_ERROR;
         }
-        if (!SmContextUpdateError->error) {
-            ogs_error("%d:%d No Error %d",
+
+        ProblemDetails = SmContextUpdateError->error;
+        if (!ProblemDetails) {
+            ogs_error("%d:%d No ProblemDetails %d",
                     sess->psi, sess->pti, recvmsg->res_status);
             r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
@@ -789,6 +885,46 @@
             return OGS_ERROR;
         }
 
+        if (state == AMF_UPDATE_SM_CONTEXT_SERVICE_REQUEST) {
+            /*
+             * In a situation where the UPF is changed through High Availability
+             * it is implemented to send the Service-Accept to the UE
+             * even if reactivation for user-resource fails.
+             *
+             * This is because it cannot be predicted whether a UE will
+             * retransmit or leave it as it is, depending on the manufacturer,
+             * in case of including reactivation error IE
+             * such as Insufficient Resource.
+             *
+             * TS24.501
+             * 5.6 5GMM connection management procedures
+             * 5.6.1 Service request procedure
+             * 5.6.1.4 Service request procedure accepted by the network
+             * 5.6.1.4.1 UE is not using 5GS services
+             *           with control plane CIoT 5GS optimization
+             *
+             * NOTE 1: It is up to UE implementation when to re-send a request
+             * for user-plane re-establishment for the associated PDU session
+             * after receiving a PDU session reactivation result error cause IE
+             * with a 5GMM cause set to #92 "insufficient user-plane resources
+             * for the PDU session".
+             */
+            ogs_error("Service-Request: ACTIVATING FAILED %d:%s:%s",
+                    recvmsg->res_status,
+                    OpenAPI_up_cnx_state_ToString(
+                        SmContextUpdateError->up_cnx_state),
+                    ProblemDetails->cause ?  ProblemDetails->cause : "Unknown");
+
+            if (AMF_SESSION_SYNC_DONE(amf_ue,
+                        AMF_UPDATE_SM_CONTEXT_SERVICE_REQUEST)) {
+                r = nas_5gs_send_service_accept(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
+            }
+
+            return OGS_OK;
+        }
+
         n1SmMsg = SmContextUpdateError->n1_sm_msg;
         if (n1SmMsg && n1SmMsg->content_id) {
             n1smbuf = ogs_sbi_find_part_by_content_id(
@@ -798,8 +934,8 @@
                  * NOTE : The pkbuf created in the SBI message will be removed
                  *        from ogs_sbi_message_free(), so it must be copied.
                  */
-                ogs_error("%d:%d PDU session establishment reject",
-                        sess->psi, sess->pti);
+                ogs_error("%d:%d PDU session establishment reject state:%d",
+                        sess->psi, sess->pti, state);

open5gs_2.6.4.tar.xz/src/amf/nudm-build.c -> open5gs_2.6.5.tar.xz/src/amf/nudm-build.c Changed

open5gs_2.6.4.tar.xz/src/amf/nudm-handler.c -> open5gs_2.6.5.tar.xz/src/amf/nudm-handler.c Changed

@@ -35,6 +35,10 @@
     if (!ran_ue) {
         /* ran_ue is required for amf_ue_is_rat_restricted() */
         ogs_error("NG context has already been removed");
+        r = nas_5gs_send_gmm_reject(
+                amf_ue, OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -151,11 +155,19 @@
 
         if (amf_update_allowed_nssai(amf_ue) == false) {
             ogs_error("No Allowed-NSSAI");
+            r = nas_5gs_send_gmm_reject(
+                    amf_ue, OGS_5GMM_CAUSE_NO_NETWORK_SLICES_AVAILABLE);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return OGS_ERROR;
         }
 
         if (amf_ue_is_rat_restricted(amf_ue)) {
             ogs_error("Registration rejected due to RAT restrictions");
+            r = nas_5gs_send_gmm_reject(
+                    amf_ue, OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return OGS_ERROR;
         }

open5gs_2.6.4.tar.xz/src/amf/sbi-path.c -> open5gs_2.6.5.tar.xz/src/amf/sbi-path.c Changed

@@ -54,17 +54,17 @@
 
     /* Setup Subscription-Data */
     ogs_sbi_subscription_spec_add(
-            OpenAPI_nf_type_AUSF, OGS_SBI_SERVICE_NAME_NAUSF_AUTH);
+            OpenAPI_nf_type_NULL, OGS_SBI_SERVICE_NAME_NAUSF_AUTH);
     ogs_sbi_subscription_spec_add(
-            OpenAPI_nf_type_UDM, OGS_SBI_SERVICE_NAME_NUDM_UECM);
+            OpenAPI_nf_type_NULL, OGS_SBI_SERVICE_NAME_NUDM_UECM);
     ogs_sbi_subscription_spec_add(
-            OpenAPI_nf_type_UDM, OGS_SBI_SERVICE_NAME_NUDM_SDM);
+            OpenAPI_nf_type_NULL, OGS_SBI_SERVICE_NAME_NUDM_SDM);
     ogs_sbi_subscription_spec_add(
-            OpenAPI_nf_type_PCF, OGS_SBI_SERVICE_NAME_NPCF_AM_POLICY_CONTROL);
+            OpenAPI_nf_type_NULL, OGS_SBI_SERVICE_NAME_NPCF_AM_POLICY_CONTROL);
     ogs_sbi_subscription_spec_add(
-            OpenAPI_nf_type_SMF, OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION);
+            OpenAPI_nf_type_NULL, OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION);
     ogs_sbi_subscription_spec_add(
-            OpenAPI_nf_type_NSSF, OGS_SBI_SERVICE_NAME_NNSSF_NSSELECTION);
+            OpenAPI_nf_type_NULL, OGS_SBI_SERVICE_NAME_NNSSF_NSSELECTION);
 
     if (ogs_sbi_server_start_all(ogs_sbi_server_handler) != OGS_OK)
         return OGS_ERROR;

open5gs_2.6.4.tar.xz/src/ausf/ausf-sm.c -> open5gs_2.6.5.tar.xz/src/ausf/ausf-sm.c Changed

open5gs_2.6.4.tar.xz/src/ausf/context.c -> open5gs_2.6.5.tar.xz/src/ausf/context.c Changed

open5gs_2.6.4.tar.xz/src/ausf/sbi-path.c -> open5gs_2.6.5.tar.xz/src/ausf/sbi-path.c Changed

open5gs_2.6.4.tar.xz/src/hss/hss-context.c -> open5gs_2.6.5.tar.xz/src/hss/hss-context.c Changed

open5gs_2.6.4.tar.xz/src/hss/hss-sm.c -> open5gs_2.6.5.tar.xz/src/hss/hss-sm.c Changed

open5gs_2.6.4.tar.xz/src/hss/hss-swx-path.c -> open5gs_2.6.5.tar.xz/src/hss/hss-swx-path.c Changed

@@ -355,6 +355,16 @@
     ret = ogs_diam_message_experimental_rescode_set(ans, result_code);
     ogs_assert(ret == 0);
 
+    /* Set the User-Name AVP */
+    ret = fd_msg_avp_new(ogs_diam_user_name, 0, &avp);
+    ogs_assert(ret == 0);
+    val.os.data = (uint8_t *)user_name;
+    val.os.len = strlen(user_name);
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(ans, MSG_BRW_LAST_CHILD, avp);
+    ogs_assert(ret == 0);
+
     /* Set the Auth-Session-State AVP */
     ret = fd_msg_avp_new(ogs_diam_auth_session_state, 0, &avp);
     ogs_assert(ret == 0);
@@ -873,6 +883,16 @@
     ret = fd_msg_avp_setvalue(avp, &val);
     ogs_assert(ret == 0);
     ret = fd_msg_avp_add(ans, MSG_BRW_LAST_CHILD, avp);
+    ogs_assert(ret == 0);
+
+    /* Set the User-Name AVP */
+    ret = fd_msg_avp_new(ogs_diam_user_name, 0, &avp);
+    ogs_assert(ret == 0);
+    val.os.data = (uint8_t *)user_name;
+    val.os.len = strlen(user_name);
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(ans, MSG_BRW_LAST_CHILD, avp);
     ogs_assert(ret == 0);
 
     ret = fd_msg_send(msg, NULL, NULL);

open5gs_2.6.4.tar.xz/src/main.c -> open5gs_2.6.5.tar.xz/src/main.c Changed

open5gs_2.6.4.tar.xz/src/mme/emm-build.c -> open5gs_2.6.5.tar.xz/src/mme/emm-build.c Changed

open5gs_2.6.4.tar.xz/src/mme/emm-handler.c -> open5gs_2.6.5.tar.xz/src/mme/emm-handler.c Changed

@@ -54,6 +54,8 @@
 
     char imsi_bcdOGS_MAX_IMSI_BCD_LEN+1;
 
+    MME_UE_LIST_CHECK;
+
     ogs_assert(mme_ue);
     enb_ue = enb_ue_cycle(mme_ue->enb_ue);
     ogs_assert(enb_ue);
@@ -215,8 +217,13 @@
 
     switch (eps_mobile_identity->imsi.type) {
     case OGS_NAS_EPS_MOBILE_IDENTITY_IMSI:
-        ogs_assert(sizeof(ogs_nas_mobile_identity_imsi_t) ==
-                eps_mobile_identity->length);
+        if (sizeof(ogs_nas_mobile_identity_imsi_t) !=
+                eps_mobile_identity->length) {
+            ogs_error("mobile_identity length (%d != %d)",
+                    (int)sizeof(ogs_nas_mobile_identity_imsi_t),
+                    eps_mobile_identity->length);
+            return OGS_ERROR;
+        }
         memcpy(&mme_ue->nas_mobile_identity_imsi, 
             &eps_mobile_identity->imsi, eps_mobile_identity->length);
         ogs_nas_eps_imsi_to_bcd(
@@ -274,6 +281,7 @@
     ogs_assert(mme_ue);
 
     ogs_info("    IMSI%s", mme_ue->imsi_bcd);
+    MME_UE_LIST_CHECK;
 
     ogs_gettimeofday(&tv);
     ogs_gmtime(tv.tv_sec, &gmt);
@@ -787,6 +795,7 @@
     ogs_nas_mobile_identity_t *imeisv = &security_mode_complete->imeisv;
 
     ogs_assert(mme_ue);
+    MME_UE_LIST_CHECK;
 
     if (security_mode_complete->presencemask &
         OGS_NAS_EPS_SECURITY_MODE_COMMAND_IMEISV_REQUEST_PRESENT) {

open5gs_2.6.4.tar.xz/src/mme/emm-sm.c -> open5gs_2.6.5.tar.xz/src/mme/emm-sm.c Changed

@@ -191,10 +191,58 @@
         case MME_TIMER_MOBILE_REACHABLE:
             ogs_info("%s Mobile Reachable timer expired", mme_ue->imsi_bcd);
             CLEAR_MME_UE_TIMER(mme_ue->t_mobile_reachable);
-            /* TS 24.301 5.3.5
-             * Upon expiry of the mobile reachable timer the network shall
-             * start the implicit detach timer.
-             */
+        /*
+         * TS 24.301
+         * Section 5.3.5
+         * Handling of the periodic tracking area update timer and
+         * mobile reachable timer (S1 mode only)
+         *
+         * The periodic tracking area updating procedure is used to
+         * periodically notify the availability of the UE to the network.
+         * The procedure is controlled in the UE by timer T3412.
+         * The value of timer T3412 is sent by the network to the UE
+         * in the ATTACH ACCEPT message and can be sent in the TRACKING AREA
+         * UPDATE ACCEPT message. The UE shall apply this value in all tracking
+         * areas of the list of tracking areas assigned to the UE
+         * until a new value is received.
+         *
+         * If timer T3412 received by the UE in an ATTACH ACCEPT or TRACKING
+         * AREA UPDATE ACCEPT message contains an indication that the timer is
+         * deactivated or the timer value is zero, then timer T3412 is
+         * deactivated and the UE shall not perform the periodic tracking area
+         * updating procedure.
+         *
+         * Timer T3412 is reset and started with its initial value,
+         * when the UE changes from EMM-CONNECTED to EMM-IDLE mode.
+         *
+         * Timer T3412 is stopped when the UE enters EMM-CONNECTED mode or
+         * the EMM-DEREGISTERED state. If the UE is attached for emergency
+         * bearer services, and timer T3412 expires, the UE shall not initiate
+         * a periodic tracking area updating procedure, but shall locally detach
+         * from the network. When the UE is camping on a suitable cell, it may
+         * re-attach to regain normal service.
+         *
+         * When a UE is not attached for emergency bearer services, and timer
+         * T3412 expires, the periodic tracking area updating procedure shall
+         * be started and the timer shall be set to its initial value
+         * for the next start.
+         *
+         * If the UE is not attached for emergency bearer services, the mobile
+         * reachable timer shall be longer than T3412. In this case, by default,
+         * the mobile reachable timer is 4 minutes greater than timer T3412.
+         *
+         * Upon expiry of the mobile reachable timer the network shall start
+         * the implicit detach timer. The value of the implicit detach timer is
+         * network dependent. If ISR is activated, the default value of
+         * the implicit detach timer is 4 minutes greater than timer T3423.
+         * If the implicit detach timer expires before the UE contacts
+         * the network, the network shall implicitly detach the UE. If the MME
+         * includes timer T3346 in the TRACKING AREA UPDATE REJECT message or
+         * the SERVICE REJECT message and timer T3346 is greater than timer
+         * T3412, the MME sets the mobile reachable timer and the implicit
+         * detach timer such that the sum of the timer values is greater than
+         * timer T3346.
+         */
             ogs_debug("%s Starting Implicit Detach timer",
                 mme_ue->imsi_bcd);
             ogs_timer_start(mme_ue->t_implicit_detach.timer,
@@ -849,6 +897,7 @@
                         authentication_response_parameter;
 
             ogs_debug("Authentication response");
+            MME_UE_LIST_CHECK;
             ogs_debug("    IMSI%s", mme_ue->imsi_bcd);
 
             CLEAR_MME_UE_TIMER(mme_ue->t3460);

open5gs_2.6.4.tar.xz/src/mme/esm-handler.c -> open5gs_2.6.5.tar.xz/src/mme/esm-handler.c Changed

open5gs_2.6.4.tar.xz/src/mme/esm-sm.c -> open5gs_2.6.5.tar.xz/src/mme/esm-sm.c Changed

open5gs_2.6.4.tar.xz/src/mme/meson.build -> open5gs_2.6.5.tar.xz/src/mme/meson.build Changed

@@ -21,37 +21,39 @@
     mme-context.h
     s1ap-build.h
     s1ap-handler.h
-    s1ap-path.h 
+    s1ap-path.h
     sgsap-build.h
     sgsap-handler.h
     sgsap-conv.h
-    sgsap-path.h 
+    sgsap-path.h
     mme-fd-path.h
-    mme-s6a-handler.h 
+    mme-s6a-handler.h
     nas-security.h
-    nas-path.h 
+    nas-path.h
     emm-handler.h
-    emm-build.h 
+    emm-build.h
     esm-handler.h
-    esm-build.h 
+    esm-build.h
+    mme-gn-build.h
+    mme-gn-handler.h
     mme-gtp-path.h
     mme-s11-build.h
-    mme-s11-handler.h 
+    mme-s11-handler.h
     sbc-message.h
     sbc-handler.h
     mme-sm.h
     mme-path.h
-    metrics.h 
+    metrics.h
 
     mme-init.c
     mme-event.c
     mme-timer.c
-    mme-context.c 
+    mme-context.c
     s1ap-sm.c
     s1ap-build.c
     s1ap-handler.c
     s1ap-sctp.c
-    s1ap-path.c 
+    s1ap-path.c
     sgsap-sm.c
     sgsap-build.c
     sgsap-handler.c
@@ -59,7 +61,7 @@
     sgsap-sctp.c
     sgsap-path.c
     mme-fd-path.c
-    mme-s6a-handler.c 
+    mme-s6a-handler.c
     nas-security.c
     nas-path.c
     emm-sm.c
@@ -68,12 +70,14 @@
     esm-sm.c
     esm-handler.c
     esm-build.c
+    mme-gn-build.c
+    mme-gn-handler.c
     mme-gtp-path.c
     mme-s11-build.c
     mme-s11-handler.c
     mme-sm.c
-    mme-path.c 
-    sbc-handler.c 
+    mme-path.c
+    sbc-handler.c
     metrics.c
 '''.split())

open5gs_2.6.4.tar.xz/src/mme/mme-context.c -> open5gs_2.6.5.tar.xz/src/mme/mme-context.c Changed

@@ -37,6 +37,8 @@
 int __emm_log_domain;
 int __esm_log_domain;
 
+static OGS_POOL(mme_sgsn_route_pool, mme_sgsn_route_t);
+static OGS_POOL(mme_sgsn_pool, mme_sgsn_t);
 static OGS_POOL(mme_sgw_pool, mme_sgw_t);
 static OGS_POOL(mme_pgw_pool, mme_pgw_t);
 static OGS_POOL(mme_vlr_pool, mme_vlr_t);
@@ -88,12 +90,15 @@
     ogs_list_init(&self.s1ap_list);
     ogs_list_init(&self.s1ap_list6);
 
+    ogs_list_init(&self.sgsn_list);
     ogs_list_init(&self.sgw_list);
     ogs_list_init(&self.pgw_list);
     ogs_list_init(&self.enb_list);
     ogs_list_init(&self.vlr_list);
     ogs_list_init(&self.csmap_list);
 
+    ogs_pool_init(&mme_sgsn_route_pool, ogs_app()->pool.nf);
+    ogs_pool_init(&mme_sgsn_pool, ogs_app()->pool.nf);
     ogs_pool_init(&mme_sgw_pool, ogs_app()->pool.nf);
     ogs_pool_init(&mme_pgw_pool, ogs_app()->pool.nf);
     ogs_pool_init(&mme_vlr_pool, ogs_app()->pool.nf);
@@ -140,6 +145,7 @@
     mme_pgw_remove_all();
     mme_csmap_remove_all();
     mme_vlr_remove_all();
+    mme_sgsn_remove_all();
 
     ogs_assert(self.enb_addr_hash);
     ogs_hash_destroy(self.enb_addr_hash);
@@ -163,6 +169,8 @@
 
     ogs_pool_final(&mme_enb_pool);
 
+    ogs_pool_final(&mme_sgsn_pool);
+    ogs_pool_final(&mme_sgsn_route_pool);
     ogs_pool_final(&mme_sgw_pool);
     ogs_pool_final(&mme_pgw_pool);
     ogs_pool_final(&mme_csmap_pool);
@@ -185,6 +193,9 @@
     self.diam_config->cnf_port = DIAMETER_PORT;
     self.diam_config->cnf_port_tls = DIAMETER_SECURE_PORT;
 
+    /* Set the default T3412 to 9 minutes for backward compatibility. */
+    self.time.t3412.value = 540;
+
     return OGS_OK;
 }
 
@@ -259,7 +270,7 @@
         return OGS_ERROR;
     }
     if (self.num_of_ciphering_order == 0) {
-        ogs_error("no mme.security.ciphering_order in '%s'",
+        ogs_error("No mme.security.ciphering_order in '%s'",
                 ogs_app()->file);
         return OGS_ERROR;
     }
@@ -268,6 +279,11 @@
         ogs_error("Not support GPRS Timer %d", (int)self.time.t3402.value);
         return OGS_ERROR;
     }
+    if (!self.time.t3412.value) {
+        ogs_error("No mme.time.t3412.value in '%s'",
+                ogs_app()->file);
+        return OGS_ERROR;
+    }
     if (ogs_nas_gprs_timer_from_sec(&gprs_timer, self.time.t3412.value) !=
         OGS_OK) {
         ogs_error("Not support GPRS Timer %d", (int)self.time.t3412.value);
@@ -282,6 +298,94 @@
     return OGS_OK;
 }
 
+static int parse_plmn_id(ogs_yaml_iter_t *parent_iter, ogs_plmn_id_t *plmn_id)
+{
+     const char *mcc = NULL;
+    const char *mnc = NULL;
+    ogs_yaml_iter_t plmn_id_iter;
+    ogs_yaml_iter_recurse(parent_iter,
+            &plmn_id_iter);
+
+    while (ogs_yaml_iter_next(&plmn_id_iter)) {
+        const char *plmn_id_key = ogs_yaml_iter_key(&plmn_id_iter);
+        ogs_assert(plmn_id_key);
+
+        if (!strcmp(plmn_id_key, "mcc")) {
+            mcc = ogs_yaml_iter_value(&plmn_id_iter);
+        } else if (!strcmp(plmn_id_key, "mnc")) {
+            mnc = ogs_yaml_iter_value(&plmn_id_iter);
+        } else
+            ogs_warn("unknown key `%s`", plmn_id_key);
+    }
+
+    if (!mcc || ! mnc)
+        return OGS_ERROR;
+
+    ogs_plmn_id_build(plmn_id, atoi(mcc), atoi(mnc), strlen(mnc));
+    return OGS_OK;
+}
+
+static int parse_lai(ogs_yaml_iter_t *parent_iter, ogs_nas_lai_t *lai)
+{
+    bool plmn_id_parsed = false;
+    const char *lac = NULL;
+    ogs_plmn_id_t plmn_id;
+    ogs_yaml_iter_t lai_iter;
+    ogs_yaml_iter_recurse(parent_iter, &lai_iter);
+    int rc;
+
+    while (ogs_yaml_iter_next(&lai_iter)) {
+        const char *lai_key = ogs_yaml_iter_key(&lai_iter);
+        ogs_assert(lai_key);
+
+        if (!strcmp(lai_key, "plmn_id")) {
+            rc = parse_plmn_id(&lai_iter, &plmn_id);
+            ogs_assert(rc == OGS_OK);
+            plmn_id_parsed = true;
+        } else if (!strcmp(lai_key, "lac")) {
+            lac = ogs_yaml_iter_value(
+                    &lai_iter);
+        } else
+            ogs_warn("unknown key `%s`",
+                    lai_key);
+    }
+
+    if (!plmn_id_parsed || !lac)
+        return OGS_ERROR;
+
+    ogs_nas_from_plmn_id( &lai->nas_plmn_id, &plmn_id);
+    lai->lac = atoi(lac);
+    return OGS_OK;
+}
+
+static int parse_rai(ogs_yaml_iter_t *parent_iter, ogs_nas_rai_t *rai)
+{
+    bool lai_parsed = false, rac_parsed = false;
+    int rc;
+    ogs_yaml_iter_t rai_iter;
+    ogs_yaml_iter_recurse(parent_iter, &rai_iter);
+
+    while (ogs_yaml_iter_next(&rai_iter)) {
+        const char *rai_key = ogs_yaml_iter_key(&rai_iter);
+        ogs_assert(rai_key);
+
+        if (!strcmp(rai_key, "lai")) {
+                rc = parse_lai(&rai_iter, &rai->lai);
+                ogs_assert(rc == OGS_OK);
+                lai_parsed = true;
+        } else if (!strcmp(rai_key, "rac")) {
+            const char *v = ogs_yaml_iter_value(&rai_iter);
+            rai->rac = atoi(v);
+            rac_parsed = true;
+        } else
+                ogs_warn("unknown key `%s`", rai_key);
+    }
+
+    if (!lai_parsed || !rac_parsed)
+        return OGS_ERROR;
+    return OGS_OK;
+}
+
 int mme_context_parse_config(void)
 {
     int rv;
@@ -1452,6 +1556,172 @@
                 } else
                     ogs_warn("unknown key `%s`", mme_key);
             }
+        } else if (!strcmp(root_key, "sgsn")) {
+            ogs_yaml_iter_t sgsn_array, sgsn_iter;
+            ogs_yaml_iter_recurse(&root_iter, &sgsn_array);
+            ogs_assert(ogs_yaml_iter_type(&sgsn_array) == YAML_SEQUENCE_NODE);
+            do {
+                mme_sgsn_t *sgsn = NULL;
+                if (!ogs_yaml_iter_next(&sgsn_array))
+                    break;
+                ogs_yaml_iter_recurse(&sgsn_array, &sgsn_iter);
+                while (ogs_yaml_iter_next(&sgsn_iter)) {
+                    const char *sgsn_key = ogs_yaml_iter_key(&sgsn_iter);
+                    ogs_assert(sgsn_key);
+                    if (!strcmp(sgsn_key, "gtpc")) {
+                        ogs_yaml_iter_t gtpc_array, gtpc_iter;
+                        ogs_yaml_iter_recurse(&sgsn_iter, &gtpc_array);
+                        do {
+                            ogs_sockaddr_t *addr = NULL;
+                            int family = AF_UNSPEC;
+                            int i, num = 0;
+                            const char *hostnameOGS_MAX_NUM_OF_HOSTNAME;
+                            uint16_t port = ogs_gtp_self()->gtpc_port;
+
+                            if (ogs_yaml_iter_type(&gtpc_array) ==
+                                    YAML_MAPPING_NODE) {
+                                memcpy(&gtpc_iter, &gtpc_array,
+                                        sizeof(ogs_yaml_iter_t));
+                            } else if (ogs_yaml_iter_type(&gtpc_array) ==
+                                YAML_SEQUENCE_NODE) {

open5gs_2.6.4.tar.xz/src/mme/mme-context.h -> open5gs_2.6.5.tar.xz/src/mme/mme-context.h Changed

@@ -49,6 +49,7 @@
 #undef OGS_LOG_DOMAIN
 #define OGS_LOG_DOMAIN __mme_log_domain
 
+typedef struct mme_sgsn_s mme_sgsn_t;
 typedef struct mme_sgw_s mme_sgw_t;
 typedef struct mme_pgw_s mme_pgw_t;
 typedef struct mme_vlr_s mme_vlr_t;
@@ -85,9 +86,11 @@
     ogs_list_t      s1ap_list;      /* MME S1AP IPv4 Server List */
     ogs_list_t      s1ap_list6;     /* MME S1AP IPv6 Server List */
 
-    ogs_list_t      sgw_list;       /* SGW GTPC Client List */
+    ogs_list_t      sgw_list;       /* SGW GTPv2C Client List */
     mme_sgw_t       *sgw;           /* Iterator for SGW round-robin */
 
+    ogs_list_t      sgsn_list;       /* SGW GTPv1C Client List */
+
     ogs_list_t      pgw_list;       /* PGW GTPC Client List */
     ogs_sockaddr_t  *pgw_addr;      /* First IPv4 Address Selected */
     ogs_sockaddr_t  *pgw_addr6;     /* First IPv6 Address Selected */
@@ -145,6 +148,44 @@
     /* Generator for unique identification */
     uint32_t        mme_ue_s1ap_id;         /* mme_ue_s1ap_id generator */
 
+#define MME_UE_LIST_CHECK \
+    if (ogs_log_get_domain_level(OGS_LOG_DOMAIN) >= OGS_LOG_TRACE) { \
+        mme_ue_t *mme_ue = NULL; \
+        sgw_ue_t *sgw_ue = NULL; \
+        enb_ue_t *enb_ue = NULL; \
+        mme_sess_t *sess = NULL; \
+        mme_bearer_t *bearer = NULL; \
+        ogs_list_for_each(&mme_self()->mme_ue_list, mme_ue) { \
+            ogs_trace("MME_UE(%p) %s MME_S11_TEID%d", \
+                    mme_ue, mme_ue->imsi_bcd, mme_ue->mme_s11_teid); \
+            if (mme_ue->sgw_ue) { \
+                sgw_ue = mme_ue->sgw_ue; \
+                ogs_trace("SGW_UE(%p) MME_UE(%p) SGW_S11_TEID%d", \
+                        sgw_ue, mme_ue, sgw_ue->sgw_s11_teid); \
+            } \
+            if (mme_ue->enb_ue) { \
+                enb_ue = mme_ue->enb_ue; \
+                ogs_trace("ENB_UE(%p) MME_UE(%p) " \
+                    "ENB_UE_S1AP_ID:%d MME_UE_S1AP_ID:%d", \
+                    enb_ue, enb_ue->mme_ue, \
+                    enb_ue->enb_ue_s1ap_id, enb_ue->mme_ue_s1ap_id); \
+            } \
+            ogs_list_for_each(&mme_ue->sess_list, sess) { \
+                ogs_trace("SESS(%p) %s:%d", sess, \
+                        sess->session ? sess->session->name : "Unknown", \
+                        sess->pti); \
+                ogs_assert(sess->mme_ue == mme_ue); \
+                ogs_list_for_each(&sess->bearer_list, bearer) { \
+                    ogs_trace("BEARER(%p) %d " \
+                            "ENB_S1U_TEID%d SGW_S1U_TEID%d", \
+                            bearer, bearer->ebi, \
+                            bearer->enb_s1u_teid, bearer->sgw_s1u_teid); \
+                    ogs_assert(bearer->sess == sess); \
+                    ogs_assert(bearer->mme_ue == mme_ue); \
+                } \
+            } \
+        } \
+    }
     ogs_list_t      mme_ue_list;
 
     ogs_hash_t *enb_addr_hash;  /* hash table for ENB Address */
@@ -161,6 +202,18 @@
     } time;
 } mme_context_t;
 
+typedef struct mme_sgsn_route_s {
+    ogs_list_t    list;       /* listed in mme_sgsn_t->route_list */
+    ogs_nas_rai_t rai;
+    uint16_t cell_id;
+} mme_sgsn_route_t;
+
+typedef struct mme_sgsn_s {
+    ogs_gtp_node_t  gnode;
+    ogs_list_t      route_list; /* list of mme_sgsn_route_t */
+    bool            default_route; /* use this SGSN as default route */
+} mme_sgsn_t;
+
 typedef struct mme_sgw_s {
     ogs_gtp_node_t  gnode;
 
@@ -224,6 +277,7 @@
     ogs_fsm_t       sm;         /* A state machine */
 
     uint32_t        enb_id;     /* eNB_ID received from eNB */
+    ogs_plmn_id_t   plmn_id;    /* eNB PLMN-ID received from eNB */
     ogs_sctp_sock_t sctp;       /* SCTP socket */
 
     struct {
@@ -623,14 +677,14 @@
     do { \
         mme_ue_t *mme_ue = NULL; \
         ogs_assert(__sESS); \
-        mme_ue = __sESS->mme_ue; \
+        mme_ue = (__sESS)->mme_ue; \
         ogs_assert(mme_ue); \
         ogs_info("Removed Session: UE IMSI:%s APN:%s", \
                 mme_ue->imsi_bcd, \
-                sess->session ? sess->session->name : "Unknown"); \
+                (__sESS)->session ? (__sESS)->session->name : "Unknown"); \
         if (mme_sess_count(mme_ue) == 1) /* Last Session */ \
             CLEAR_SESSION_CONTEXT(mme_ue); \
-        mme_sess_remove(sess); \
+        mme_sess_remove(__sESS); \
     } while(0)
 
 #define ACTIVE_EPS_BEARERS_IS_AVAIABLE(__mME) \
@@ -776,6 +830,13 @@
 
 int mme_context_parse_config(void);
 
+mme_sgsn_t *mme_sgsn_add(ogs_sockaddr_t *addr);
+void mme_sgsn_remove(mme_sgsn_t *sgsn);
+void mme_sgsn_remove_all(void);
+mme_sgsn_t *mme_sgsn_find_by_addr(ogs_sockaddr_t *addr);
+mme_sgsn_t *mme_sgsn_find_by_routing_address(const ogs_nas_rai_t *rai, uint16_t cell_id);
+mme_sgsn_t *mme_sgsn_find_by_default_routing_address(void);
+
 mme_sgw_t *mme_sgw_add(ogs_sockaddr_t *addr);
 void mme_sgw_remove(mme_sgw_t *sgw);
 void mme_sgw_remove_all(void);

open5gs_2.6.4.tar.xz/src/mme/mme-event.c -> open5gs_2.6.5.tar.xz/src/mme/mme-event.c Changed

open5gs_2.6.4.tar.xz/src/mme/mme-event.h -> open5gs_2.6.5.tar.xz/src/mme/mme-event.h Changed

open5gs_2.6.4.tar.xz/src/mme/mme-fd-path.c -> open5gs_2.6.5.tar.xz/src/mme/mme-fd-path.c Changed

open5gs_2.6.5.tar.xz/src/mme/mme-gn-build.c Added

@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2023 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "mme-context.h"
+
+#include "mme-gn-build.h"
+
+/* 3GPP TS 29.060 7.5.14.1 RAN Information Relay */
+ogs_pkbuf_t *mme_gn_build_ran_information_relay(
+                uint8_t type, const uint8_t *buf, size_t len,
+                const ogs_nas_rai_t *rai, uint16_t cell_id)
+{
+    ogs_gtp1_message_t gtp1_message;
+    ogs_gtp1_ran_information_relay_t *req = NULL;
+    uint8_t rt_addrsizeof(*rai) + sizeof(cell_id);
+
+    ogs_debug("Gn build RAN Information Relay");
+
+
+    req = &gtp1_message.ran_information_relay;
+    memset(&gtp1_message, 0, sizeof(ogs_gtp1_message_t));
+
+    /* 3GPP TS 29.060 7.7.43 RAN Transparent Container, Mandatory */
+    req->ran_transparent_container.presence = 1;
+    req->ran_transparent_container.data = (void*)buf;
+    req->ran_transparent_container.len = len;
+
+    /* 3GPP TS 29.060 7.7.57 RAN RIM Routing Address, Optional */
+    req->rim_routing_address.presence = !!rai;
+    if (req->rim_routing_address.presence) {
+        memcpy(&rt_addr0, rai, sizeof(*rai));
+        memcpy(&rt_addrsizeof(*rai), &cell_id, sizeof(cell_id));
+        req->rim_routing_address.data = &rt_addr0;
+        req->rim_routing_address.len = sizeof(rt_addr);
+    }
+
+    /* 3GPP TS 29.060 7.7.77 RIM Routing Address Discriminator, Optional */
+    /* 3GPP TS 48.018 11.3.70 RIM Routing Information IE: */
+    uint8_t rim_routing_address_disc = 0; /* "A Cell Identifier is used to identify a GERAN cell."" */
+    req->rim_routing_address_discriminator.presence = req->rim_routing_address.presence;
+    req->rim_routing_address_discriminator.data = &rim_routing_address_disc;
+    req->rim_routing_address_discriminator.len = 1;
+
+    gtp1_message.h.type = type;
+    return ogs_gtp1_build_msg(&gtp1_message);
+}
\ No newline at end of file

open5gs_2.6.5.tar.xz/src/mme/mme-gn-build.h Added

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2023 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef MME_GN_BUILD_H
+#define MME_GN_BUILD_H
+
+#include "ogs-nas-eps.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+ogs_pkbuf_t *mme_gn_build_ran_information_relay(
+                uint8_t type, const uint8_t *buf, size_t len,
+                const ogs_nas_rai_t *rai, uint16_t cell_id);
+
+#endif /* MME_S11_BUILD_H */

open5gs_2.6.5.tar.xz/src/mme/mme-gn-handler.c Added

@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2023 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "mme-event.h"
+#include "mme-sm.h"
+#include "mme-context.h"
+#include "mme-timer.h"
+
+#include "mme-gtp-path.h"
+#include "mme-fd-path.h"
+#include "mme-path.h"
+
+#include "mme-gn-build.h"
+#include "mme-gn-handler.h"
+
+#include "s1ap-path.h"
+
+void mme_gn_handle_echo_request(
+        ogs_gtp_xact_t *xact, ogs_gtp1_echo_request_t *req)
+{
+    ogs_assert(xact);
+    ogs_assert(req);
+
+    ogs_debug("Gn Receiving Echo Request");
+    /* FIXME : Implementing recovery counter correctly */
+    ogs_gtp1_send_echo_response(xact, 0);
+}
+
+void mme_gn_handle_echo_response(
+        ogs_gtp_xact_t *xact, ogs_gtp1_echo_response_t *req)
+{
+    /* Not Implemented */
+}
+
+static int decode_global_enb_id(S1AP_Global_ENB_ID_t *glob_enb_id, const uint8_t *buf, size_t buf_len)
+{
+    asn_dec_rval_t dec_ret = {0};
+
+    memset(glob_enb_id, 0, sizeof(S1AP_Global_ENB_ID_t));
+    dec_ret = aper_decode(NULL, &asn_DEF_S1AP_Global_ENB_ID, (void **)&glob_enb_id,
+            buf, buf_len, 0, 0);
+
+    if (dec_ret.code != RC_OK) {
+        ogs_warn("Failed to decode ASN-PDU code:%d,consumed:%d",
+                dec_ret.code, (int)dec_ret.consumed);
+        return OGS_ERROR;
+    }
+
+    if (ogs_log_get_domain_level(OGS_LOG_DOMAIN) >= OGS_LOG_TRACE)
+        asn_fprint(stdout, &asn_DEF_S1AP_Global_ENB_ID, glob_enb_id);
+
+    return OGS_OK;
+}
+
+/* TS 29.060 7.5.14.1 */
+void mme_gn_handle_ran_information_relay(
+        ogs_gtp_xact_t *xact, ogs_gtp1_ran_information_relay_t *req)
+{
+    uint8_t discr;
+    ogs_eps_tai_t *target_tai;
+    S1AP_Global_ENB_ID_t global_ENB_ID;
+    uint32_t target_enb_id;
+    mme_enb_t *target_enb = NULL;
+    int rv;
+
+    ogs_debug("Gn Receiving RAN Information Relay");
+
+    if (req->ran_transparent_container.len == 0 ||
+        req->ran_transparent_container.data == NULL) {
+        ogs_warn("Gn Receiving RAN Information Relay with empty container!");
+        return;
+    }
+
+    /* "If RIM Routing Address Discriminator IE is not included, the RIM Routing
+     * Address shall be processed as an RNC identifier". Hence, not for us! */
+    if (req->rim_routing_address_discriminator.presence == false) {
+        ogs_warn("Gn Rx RAN Information Relay: no RIM Routing Address Discriminator!");
+        return;
+    }
+
+    if (req->rim_routing_address_discriminator.len != 1) {
+        ogs_warn("Gn Rx RAN Information Relay: RIM Routing Address Discriminator len != 1");
+        return;
+    }
+
+    /* 3GPP TS 48.018 RIM Routing Information IE */
+    discr = *((uint8_t*)req->rim_routing_address_discriminator.data) & 0x0f;
+    if (discr != 2) {/* 2: An eNB identifier is used to identify an E-UTRAN eNodeB or HeNB */
+        ogs_warn("Gn Rx RAN Information Relay: RIM Routing Address Discriminator %u unexpected", discr);
+        return;
+    }
+
+    if (req->rim_routing_address.presence == false) {
+        ogs_warn("Gn Rx RAN Information Relay: no RIM Routing Address!");
+        return;
+    }
+
+    if (req->rim_routing_address.len < sizeof(ogs_eps_tai_t)) {
+        ogs_warn("Gn Rx RAN Information Relay: RIM Routing Address len < %zu", sizeof(ogs_eps_tai_t));
+        return;
+    }
+    target_tai = req->rim_routing_address.data;
+
+    rv = decode_global_enb_id(&global_ENB_ID,
+            ((uint8_t *)req->rim_routing_address.data) + sizeof(ogs_eps_tai_t),
+            req->rim_routing_address.len - sizeof(ogs_eps_tai_t));
+    if (rv != OGS_OK)
+        return;
+    ogs_s1ap_ENB_ID_to_uint32(&global_ENB_ID.eNB_ID, &target_enb_id);
+
+    ogs_debug("    Target : ENB_ID%s:%d, TAC%d",
+              global_ENB_ID.eNB_ID.present ==
+                  S1AP_ENB_ID_PR_homeENB_ID ? "Home" :
+              global_ENB_ID.eNB_ID.present ==
+                  S1AP_ENB_ID_PR_macroENB_ID ? "Macro" : "Others",
+              target_enb_id, target_tai->tac);
+
+    target_enb = mme_enb_find_by_enb_id(target_enb_id);
+    if (target_enb == NULL) {
+        ogs_warn("Gn Rx RAN Information Relay: cannot find target eNB-id0x%x", target_enb_id);
+        return;
+    }
+
+    s1ap_send_mme_direct_information_transfer(
+        target_enb,
+        req->ran_transparent_container.data,
+        req->ran_transparent_container.len);
+}

open5gs_2.6.5.tar.xz/src/mme/mme-gn-handler.h Added

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2023 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef MME_GN_HANDLER_H
+#define MME_GN_HANDLER_H
+
+#include "mme-context.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void mme_gn_handle_echo_request(
+        ogs_gtp_xact_t *xact, ogs_gtp1_echo_request_t *req);
+
+void mme_gn_handle_echo_response(
+        ogs_gtp_xact_t *xact, ogs_gtp1_echo_response_t *req);
+
+void mme_gn_handle_ran_information_relay(
+        ogs_gtp_xact_t *xact, ogs_gtp1_ran_information_relay_t *req);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MME_S11_HANDLER_H */

open5gs_2.6.4.tar.xz/src/mme/mme-gtp-path.c -> open5gs_2.6.5.tar.xz/src/mme/mme-gtp-path.c Changed

@@ -20,13 +20,14 @@
 #include "ogs-gtp.h"
 
 #include "mme-event.h"
+#include "mme-gn-build.h"
 #include "mme-gtp-path.h"
 #include "mme-path.h"
 #include "s1ap-path.h"
 #include "mme-s11-build.h"
 #include "mme-sm.h"
 
-static void _gtpv2_c_recv_cb(short when, ogs_socket_t fd, void *data)
+static void _gtpv1v2_c_recv_cb(short when, ogs_socket_t fd, void *data)
 {
     int rv;
     char bufOGS_ADDRSTRLEN;
@@ -36,6 +37,8 @@
     ogs_pkbuf_t *pkbuf = NULL;
     ogs_sockaddr_t from;
     mme_sgw_t *sgw = NULL;
+    mme_sgsn_t *sgsn = NULL;
+    uint8_t gtp_ver;
 
     ogs_assert(fd != INVALID_SOCKET);
 
@@ -53,17 +56,38 @@
 
     ogs_pkbuf_trim(pkbuf, size);
 
-    sgw = mme_sgw_find_by_addr(&from);
-    if (!sgw) {
-        ogs_error("Unknown SGW : %s", OGS_ADDR(&from, buf));
+    gtp_ver = ((ogs_gtp2_header_t *)pkbuf->data)->version;
+    switch (gtp_ver) {
+    case 1:
+        sgsn = mme_sgsn_find_by_addr(&from);
+        if (!sgsn) {
+            ogs_error("Unknown SGSN : %s", OGS_ADDR(&from, buf));
+            ogs_pkbuf_free(pkbuf);
+            return;
+        }
+        ogs_assert(sgsn);
+        e = mme_event_new(MME_EVENT_GN_MESSAGE);
+        ogs_assert(e);
+        e->gnode = &sgsn->gnode;
+        break;
+    case 2:
+        sgw = mme_sgw_find_by_addr(&from);
+        if (!sgw) {
+            ogs_error("Unknown SGW : %s", OGS_ADDR(&from, buf));
+            ogs_pkbuf_free(pkbuf);
+            return;
+        }
+        ogs_assert(sgw);
+        e = mme_event_new(MME_EVENT_S11_MESSAGE);
+        ogs_assert(e);
+        e->gnode = &sgw->gnode;
+        break;
+    default:
+        ogs_warn("Rx unexpected GTP version %u", gtp_ver);
         ogs_pkbuf_free(pkbuf);
         return;
     }
-    ogs_assert(sgw);
 
-    e = mme_event_new(MME_EVENT_S11_MESSAGE);
-    ogs_assert(e);
-    e->gnode = (ogs_gtp_node_t *)sgw;
     e->pkbuf = pkbuf;
 
     rv = ogs_queue_push(ogs_app()->queue, e);
@@ -159,13 +183,14 @@
     ogs_socknode_t *node = NULL;
     ogs_sock_t *sock = NULL;
     mme_sgw_t *sgw = NULL;
+    mme_sgsn_t *sgsn = NULL;
 
     ogs_list_for_each(&ogs_gtp_self()->gtpc_list, node) {
         sock = ogs_gtp_server(node);
         if (!sock) return OGS_ERROR;
 
         node->poll = ogs_pollset_add(ogs_app()->pollset,
-                OGS_POLLIN, sock->fd, _gtpv2_c_recv_cb, sock);
+                OGS_POLLIN, sock->fd, _gtpv1v2_c_recv_cb, sock);
         ogs_assert(node->poll);
     }
     ogs_list_for_each(&ogs_gtp_self()->gtpc_list6, node) {
@@ -173,7 +198,7 @@
         if (!sock) return OGS_ERROR;
 
         node->poll = ogs_pollset_add(ogs_app()->pollset,
-                OGS_POLLIN, sock->fd, _gtpv2_c_recv_cb, sock);
+                OGS_POLLIN, sock->fd, _gtpv1v2_c_recv_cb, sock);
         ogs_assert(node->poll);
     }
 
@@ -188,7 +213,14 @@
     ogs_list_for_each(&mme_self()->sgw_list, sgw) {
         rv = ogs_gtp_connect(
                 ogs_gtp_self()->gtpc_sock, ogs_gtp_self()->gtpc_sock6,
-                (ogs_gtp_node_t *)sgw);
+                &sgw->gnode);
+        ogs_assert(rv == OGS_OK);
+    }
+
+    ogs_list_for_each(&mme_self()->sgsn_list, sgsn) {
+        rv = ogs_gtp_connect(
+                ogs_gtp_self()->gtpc_sock, ogs_gtp_self()->gtpc_sock6,
+                &sgsn->gnode);
         ogs_assert(rv == OGS_OK);
     }
 
@@ -722,6 +754,44 @@
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
+
+    return rv;
+}
+
+
+int mme_gtp1_send_ran_information_relay(
+        mme_sgsn_t *sgsn, const uint8_t *buf, size_t len,
+        const ogs_nas_rai_t *rai, uint16_t cell_id)
+{
+    int rv;
+    ogs_gtp1_header_t h;
+    ogs_pkbuf_t *pkbuf = NULL;
+    ogs_gtp_xact_t *xact = NULL;
+
+    ogs_assert(sgsn);
+    ogs_assert(buf);
+
+    memset(&h, 0, sizeof(ogs_gtp1_header_t));
+    h.type = OGS_GTP1_RAN_INFORMATION_RELAY_TYPE;
+    h.teid = 0;
+
+    pkbuf = mme_gn_build_ran_information_relay(h.type, buf, len, rai, cell_id);
+    if (!pkbuf) {
+        ogs_error("mme_gn_build_ran_information_relay() failed");
+        return OGS_ERROR;
+    }
+
+    xact = ogs_gtp1_xact_local_create(&sgsn->gnode, &h, pkbuf, NULL, NULL);
+    if (!xact) {
+        ogs_error("ogs_gtp1_xact_local_create() failed");
+        return OGS_ERROR;
+    }
+    /* TS 29.060 8.2: "The RAN Information Relay message, where the Tunnel
+     * Endpoint Identifier shall be set to all zeroes." */
+    xact->local_teid = 0;
+
+    rv = ogs_gtp_xact_commit(xact);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }

open5gs_2.6.4.tar.xz/src/mme/mme-gtp-path.h -> open5gs_2.6.5.tar.xz/src/mme/mme-gtp-path.h Changed

open5gs_2.6.4.tar.xz/src/mme/mme-s11-handler.c -> open5gs_2.6.5.tar.xz/src/mme/mme-s11-handler.c Changed

@@ -103,6 +103,7 @@
     ogs_assert(rsp);
 
     ogs_debug("Create Session Response");
+    MME_UE_LIST_CHECK;
 
     /********************
      * Check Transaction
@@ -461,6 +462,7 @@
     ogs_assert(rsp);
 
     ogs_debug("Modify Bearer Response");
+    MME_UE_LIST_CHECK;
 
     /********************
      * Check Transaction
@@ -572,6 +574,7 @@
     ogs_assert(rsp);
 
     ogs_debug("Delete Session Response");
+    MME_UE_LIST_CHECK;
 
     /********************
      * Check Transaction
@@ -919,28 +922,11 @@
 
     if (OGS_FSM_CHECK(&default_bearer->sm, esm_state_active)) {
         if (ECM_IDLE(mme_ue)) {
-            if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
-                /*
-                * TS 24.301 5.3.7
-                * If ISR is not activated, the network behaviour upon expiry of
-                * the mobile reachable timer is network dependent, but typically
-                * the network stops sending paging messages to the UE on the
-                * first expiry, and may take other appropriate actions
-                */
-                ogs_debug("%s Paging stopped: Mobile Reachable timer expiry",
-                    mme_ue->imsi_bcd);
-
-                ogs_assert(OGS_OK ==
-                    mme_gtp_send_create_bearer_response(
-                        bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
-                MME_CLEAR_PAGING_INFO(mme_ue);
-            } else {
-                MME_STORE_PAGING_INFO(mme_ue,
-                    MME_PAGING_TYPE_CREATE_BEARER, bearer);
-                r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
-                ogs_expect(r == OGS_OK);
-                ogs_assert(r != OGS_ERROR);
-            }
+            MME_STORE_PAGING_INFO(mme_ue,
+                MME_PAGING_TYPE_CREATE_BEARER, bearer);
+            r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         } else {
             MME_CLEAR_PAGING_INFO(mme_ue);
             r = nas_eps_send_activate_dedicated_bearer_context_request(bearer);
@@ -1070,28 +1056,11 @@
     if (req->bearer_contexts.bearer_level_qos.presence == 1 ||
         req->bearer_contexts.tft.presence == 1) {
         if (ECM_IDLE(mme_ue)) {
-            if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
-                /*
-                * TS 24.301 5.3.7
-                * If ISR is not activated, the network behaviour upon expiry of
-                * the mobile reachable timer is network dependent, but typically
-                * the network stops sending paging messages to the UE on the
-                * first expiry, and may take other appropriate actions
-                */
-                ogs_debug("%s Paging stopped: Mobile Reachable timer expiry",
-                    mme_ue->imsi_bcd);
-
-                ogs_assert(OGS_OK ==
-                    mme_gtp_send_update_bearer_response(
-                        bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
-                MME_CLEAR_PAGING_INFO(mme_ue);
-            } else {
-                MME_STORE_PAGING_INFO(mme_ue,
-                    MME_PAGING_TYPE_UPDATE_BEARER, bearer);
-                r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
-                ogs_expect(r == OGS_OK);
-                ogs_assert(r != OGS_ERROR);
-            }
+            MME_STORE_PAGING_INFO(mme_ue,
+                MME_PAGING_TYPE_UPDATE_BEARER, bearer);
+            r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         } else {
             MME_CLEAR_PAGING_INFO(mme_ue);
             r = nas_eps_send_modify_bearer_context_request(bearer,
@@ -1228,28 +1197,11 @@
     bearer->delete.xact = xact;
 
     if (ECM_IDLE(mme_ue)) {
-        if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
-            /*
-            * TS 24.301 5.3.7
-            * If ISR is not activated, the network behaviour upon expiry of
-            * the mobile reachable timer is network dependent, but typically
-            * the network stops sending paging messages to the UE on the
-            * first expiry, and may take other appropriate actions
-            */
-            ogs_debug("%s Paging stopped: Mobile Reachable timer expiry",
-                mme_ue->imsi_bcd);
-
-            ogs_assert(OGS_OK ==
-                mme_gtp_send_delete_bearer_response(
-                    bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
-            MME_CLEAR_PAGING_INFO(mme_ue);
-        } else {
-            MME_STORE_PAGING_INFO(mme_ue,
-                MME_PAGING_TYPE_DELETE_BEARER, bearer);
-            r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
-            ogs_expect(r == OGS_OK);
-            ogs_assert(r != OGS_ERROR);
-        }
+        MME_STORE_PAGING_INFO(mme_ue,
+            MME_PAGING_TYPE_DELETE_BEARER, bearer);
+        r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     } else {
         MME_CLEAR_PAGING_INFO(mme_ue);
         r = nas_eps_send_deactivate_bearer_context_request(bearer);
@@ -1275,6 +1227,7 @@
     ogs_assert(rsp);
 
     ogs_debug("Release Access Bearers Response");
+    MME_UE_LIST_CHECK;
 
     /********************
      * Check Transaction
@@ -1511,27 +1464,11 @@
  * before step 9, the MME shall not send S1 interface paging messages
  */
     if (ECM_IDLE(mme_ue)) {
-        if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
-            /*
-            * TS 24.301 5.3.7
-            * If ISR is not activated, the network behaviour upon expiry of
-            * the mobile reachable timer is network dependent, but typically
-            * the network stops sending paging messages to the UE on the
-            * first expiry, and may take other appropriate actions
-            */
-            ogs_debug("%s Paging stopped: Mobile Reachable timer expiry",
-                mme_ue->imsi_bcd);
-            ogs_assert(OGS_OK ==
-                mme_gtp_send_downlink_data_notification_ack(
-                    bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
-            MME_CLEAR_PAGING_INFO(mme_ue);
-        } else {
-            MME_STORE_PAGING_INFO(mme_ue,
-                MME_PAGING_TYPE_DOWNLINK_DATA_NOTIFICATION, bearer);
-            r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
-            ogs_expect(r == OGS_OK);
-            ogs_assert(r != OGS_ERROR);
-        }
+        MME_STORE_PAGING_INFO(mme_ue,
+            MME_PAGING_TYPE_DOWNLINK_DATA_NOTIFICATION, bearer);
+        r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     } else if (ECM_CONNECTED(mme_ue)) {
         MME_CLEAR_PAGING_INFO(mme_ue);
         if (cause_value == OGS_GTP2_CAUSE_ERROR_INDICATION_RECEIVED) {

open5gs_2.6.4.tar.xz/src/mme/mme-s6a-handler.c -> open5gs_2.6.5.tar.xz/src/mme/mme-s6a-handler.c Changed

@@ -261,29 +261,11 @@
          * we need to check whether UE is IDLE or not.
          */
         if (ECM_IDLE(mme_ue)) {
-            if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
-                /*
-                * TS 24.301 5.3.7
-                * If ISR is not activated, the network behaviour upon expiry of
-                * the mobile reachable timer is network dependent, but typically
-                * the network stops sending paging messages to the UE on the
-                * first expiry, and may take other appropriate actions
-                */
-                ogs_debug("%s Paging stopped: Mobile Reachable timer expiry",
-                    mme_ue->imsi_bcd);
-                if (MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
-                    ogs_assert(OGS_OK == sgsap_send_detach_indication(mme_ue));
-                } else {
-                    mme_send_delete_session_or_detach(mme_ue);
-                }
-                MME_CLEAR_PAGING_INFO(mme_ue);
-            } else {
-                MME_STORE_PAGING_INFO(mme_ue,
-                    MME_PAGING_TYPE_DETACH_TO_UE, NULL);
-                r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
-                ogs_expect(r == OGS_OK);
-                ogs_assert(r != OGS_ERROR);
-            }
+            MME_STORE_PAGING_INFO(mme_ue,
+                MME_PAGING_TYPE_DETACH_TO_UE, NULL);
+            r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         } else {
             MME_CLEAR_PAGING_INFO(mme_ue);
             r = nas_eps_send_detach_request(mme_ue);

open5gs_2.6.4.tar.xz/src/mme/mme-sm.c -> open5gs_2.6.5.tar.xz/src/mme/mme-sm.c Changed

@@ -28,6 +28,7 @@
 #include "nas-path.h"
 #include "emm-handler.h"
 #include "esm-handler.h"
+#include "mme-gn-handler.h"
 #include "mme-gtp-path.h"
 #include "mme-s11-handler.h"
 #include "mme-fd-path.h"
@@ -79,6 +80,7 @@
     ogs_gtp_node_t *gnode = NULL;
     ogs_gtp_xact_t *xact = NULL;
     ogs_gtp2_message_t gtp_message;
+    ogs_gtp1_message_t gtp1_message;
 
     mme_vlr_t *vlr = NULL;
 
@@ -462,7 +464,7 @@
             break;
         case OGS_DIAM_S6A_CMD_CODE_INSERT_SUBSCRIBER_DATA:
             mme_s6a_handle_idr(mme_ue, s6a_message);
-            break;            
+            break;
         default:
             ogs_error("Invalid Type%d", s6a_message->cmd_code);
             break;
@@ -630,6 +632,41 @@
         }
         break;
 
+    case MME_EVENT_GN_MESSAGE:
+        pkbuf = e->pkbuf;
+        ogs_assert(pkbuf);
+
+        if (ogs_gtp1_parse_msg(&gtp1_message, pkbuf) != OGS_OK) {
+            ogs_error("ogs_gtp1_parse_msg() failed");
+            ogs_pkbuf_free(pkbuf);
+            break;
+        }
+
+        gnode = e->gnode;
+        ogs_assert(gnode);
+
+        rv = ogs_gtp1_xact_receive(gnode, &gtp1_message.h, &xact);
+        if (rv != OGS_OK) {
+            ogs_pkbuf_free(pkbuf);
+            break;
+        }
+
+        switch (gtp1_message.h.type) {
+        case OGS_GTP1_ECHO_REQUEST_TYPE:
+            mme_gn_handle_echo_request(xact, &gtp1_message.echo_request);
+            break;
+        case OGS_GTP1_ECHO_RESPONSE_TYPE:
+            mme_gn_handle_echo_response(xact, &gtp1_message.echo_response);
+            break;
+        case OGS_GTP1_RAN_INFORMATION_RELAY_TYPE:
+            mme_gn_handle_ran_information_relay(xact, &gtp1_message.ran_information_relay);
+            break;
+        default:
+            ogs_warn("Not implemented(type:%d)", gtp1_message.h.type);
+            break;
+        }
+        ogs_pkbuf_free(pkbuf);
+        break;
 
     case MME_EVENT_SGSAP_LO_SCTP_COMM_UP:
         sock = e->sock;

open5gs_2.6.4.tar.xz/src/mme/s1ap-build.c -> open5gs_2.6.5.tar.xz/src/mme/s1ap-build.c Changed

@@ -142,13 +142,13 @@
     S1AP_TimeToWait_t *TimeToWait = NULL;
 
     ogs_debug("S1SetupFailure");
-    
+
     ogs_debug("    Group%d Cause%d TimeToWait%ld",
             group, (int)cause, time_to_wait);
 
     memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));
     pdu.present = S1AP_S1AP_PDU_PR_unsuccessfulOutcome;
-    pdu.choice.unsuccessfulOutcome = 
+    pdu.choice.unsuccessfulOutcome =
         CALLOC(1, sizeof(S1AP_UnsuccessfulOutcome_t));
 
     unsuccessfulOutcome = pdu.choice.unsuccessfulOutcome;
@@ -188,6 +188,88 @@
     return ogs_s1ap_encode(&pdu);
 }
 
+ogs_pkbuf_t *s1ap_build_enb_configuration_update_ack(void)
+{
+    S1AP_S1AP_PDU_t pdu;
+    S1AP_SuccessfulOutcome_t *successfulOutcome = NULL;
+
+    ogs_debug("ENBConfigurationUpdateAcknowledge");
+
+    memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));
+    pdu.present = S1AP_S1AP_PDU_PR_successfulOutcome;
+    pdu.choice.successfulOutcome = CALLOC(1, sizeof(S1AP_SuccessfulOutcome_t));
+
+    successfulOutcome = pdu.choice.successfulOutcome;
+    successfulOutcome->procedureCode =
+        S1AP_ProcedureCode_id_ENBConfigurationUpdate;
+    successfulOutcome->criticality = S1AP_Criticality_reject;
+    successfulOutcome->value.present =
+        S1AP_SuccessfulOutcome__value_PR_ENBConfigurationUpdateAcknowledge;
+
+    return ogs_s1ap_encode(&pdu);
+}
+
+ogs_pkbuf_t *s1ap_build_enb_configuration_update_failure(
+    S1AP_Cause_PR group, long cause, long time_to_wait)
+{
+    S1AP_S1AP_PDU_t pdu;
+    S1AP_UnsuccessfulOutcome_t *unsuccessfulOutcome = NULL;
+    S1AP_ENBConfigurationUpdateFailure_t *ENBConfigurationUpdateFailure = NULL;
+
+    S1AP_ENBConfigurationUpdateFailureIEs_t *ie = NULL;
+    S1AP_Cause_t *Cause = NULL;
+    S1AP_TimeToWait_t *TimeToWait = NULL;
+
+    ogs_debug("ENBConfigurationUpdateFailure");
+
+    ogs_debug("    Group%d Cause%d TimeToWait%ld",
+            group, (int)cause, time_to_wait);
+
+    memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));
+    pdu.present = S1AP_S1AP_PDU_PR_unsuccessfulOutcome;
+    pdu.choice.unsuccessfulOutcome =
+        CALLOC(1, sizeof(S1AP_UnsuccessfulOutcome_t));
+
+    unsuccessfulOutcome = pdu.choice.unsuccessfulOutcome;
+    unsuccessfulOutcome->procedureCode =
+        S1AP_ProcedureCode_id_ENBConfigurationUpdate;
+    unsuccessfulOutcome->criticality = S1AP_Criticality_reject;
+    unsuccessfulOutcome->value.present =
+        S1AP_UnsuccessfulOutcome__value_PR_ENBConfigurationUpdateFailure;
+
+    ENBConfigurationUpdateFailure =
+        &unsuccessfulOutcome->value.choice.ENBConfigurationUpdateFailure;
+
+    ie = CALLOC(1, sizeof(S1AP_ENBConfigurationUpdateFailureIEs_t));
+    ASN_SEQUENCE_ADD(&ENBConfigurationUpdateFailure->protocolIEs, ie);
+
+    ie->id = S1AP_ProtocolIE_ID_id_Cause;
+    ie->criticality = S1AP_Criticality_ignore;
+    ie->value.present = S1AP_ENBConfigurationUpdateFailureIEs__value_PR_Cause;
+
+    Cause = &ie->value.choice.Cause;
+
+    if (time_to_wait > -1) {
+        ie = CALLOC(1, sizeof(S1AP_ENBConfigurationUpdateFailureIEs_t));
+        ASN_SEQUENCE_ADD(&ENBConfigurationUpdateFailure->protocolIEs, ie);
+
+        ie->id = S1AP_ProtocolIE_ID_id_TimeToWait;
+        ie->criticality = S1AP_Criticality_ignore;
+        ie->value.present =
+            S1AP_ENBConfigurationUpdateFailureIEs__value_PR_TimeToWait;
+
+        TimeToWait = &ie->value.choice.TimeToWait;
+    }
+
+    Cause->present = group;
+    Cause->choice.radioNetwork = cause;
+
+    if (TimeToWait)
+        *TimeToWait = time_to_wait;
+
+    return ogs_s1ap_encode(&pdu);
+}
+
 ogs_pkbuf_t *s1ap_build_downlink_nas_transport(
     enb_ue_t *enb_ue, ogs_pkbuf_t *emmbuf)
 {
@@ -240,7 +322,7 @@
 
     ie = CALLOC(1, sizeof(S1AP_DownlinkNASTransport_IEs_t));
     ASN_SEQUENCE_ADD(&DownlinkNASTransport->protocolIEs, ie);
-    
+
     ie->id = S1AP_ProtocolIE_ID_id_NAS_PDU;
     ie->criticality = S1AP_Criticality_reject;
     ie->value.present = S1AP_DownlinkNASTransport_IEs__value_PR_NAS_PDU;
@@ -355,10 +437,10 @@
         (long long)mme_ue->ambr.downlink, (long long)mme_ue->ambr.uplink);
 
     asn_uint642INTEGER(
-            &UEAggregateMaximumBitrate->uEaggregateMaximumBitRateUL, 
+            &UEAggregateMaximumBitrate->uEaggregateMaximumBitRateUL,
             mme_ue->ambr.uplink);
     asn_uint642INTEGER(
-            &UEAggregateMaximumBitrate->uEaggregateMaximumBitRateDL, 
+            &UEAggregateMaximumBitrate->uEaggregateMaximumBitRateDL,
             mme_ue->ambr.downlink);
 
     ogs_list_for_each(&mme_ue->sess_list, sess) {
@@ -447,7 +529,7 @@
                     (long long)bearer->qos.gbr.downlink,
                     (long long)bearer->qos.gbr.uplink);
 
-                gbrQosInformation = 
+                gbrQosInformation =
                         CALLOC(1, sizeof(struct S1AP_GBR_QosInformation));
                 asn_uint642INTEGER(&gbrQosInformation->e_RAB_MaximumBitrateDL,
                         bearer->qos.mbr.downlink);
@@ -541,7 +623,7 @@
     SecurityKey = &ie->value.choice.SecurityKey;
 
     SecurityKey->size = OGS_SHA256_DIGEST_SIZE;
-    SecurityKey->buf = 
+    SecurityKey->buf =
         CALLOC(SecurityKey->size, sizeof(uint8_t));
     SecurityKey->bits_unused = 0;
     memcpy(SecurityKey->buf, mme_ue->kenb, SecurityKey->size);
@@ -791,11 +873,11 @@
         UESecurityCapabilities = &ie->value.choice.UESecurityCapabilities;
 
         UESecurityCapabilities->encryptionAlgorithms.size = 2;
-        UESecurityCapabilities->encryptionAlgorithms.buf = 
-            CALLOC(UESecurityCapabilities->encryptionAlgorithms.size, 
+        UESecurityCapabilities->encryptionAlgorithms.buf =
+            CALLOC(UESecurityCapabilities->encryptionAlgorithms.size,
                         sizeof(uint8_t));
         UESecurityCapabilities->encryptionAlgorithms.bits_unused = 0;
-        UESecurityCapabilities->encryptionAlgorithms.buf0 = 
+        UESecurityCapabilities->encryptionAlgorithms.buf0 =
             (mme_ue->ue_network_capability.eea << 1);
 
         UESecurityCapabilities->integrityProtectionAlgorithms.size = 2;
@@ -817,7 +899,7 @@
         SecurityKey = &ie->value.choice.SecurityKey;
 
         SecurityKey->size = OGS_SHA256_DIGEST_SIZE;
-        SecurityKey->buf = 
+        SecurityKey->buf =
             CALLOC(SecurityKey->size, sizeof(uint8_t));
         SecurityKey->bits_unused = 0;
         memcpy(SecurityKey->buf, mme_ue->kenb, SecurityKey->size);
@@ -883,11 +965,11 @@
         UE_S1AP_IDs->choice.mME_UE_S1AP_ID = enb_ue->mme_ue_s1ap_id;
     } else {
         UE_S1AP_IDs->present = S1AP_UE_S1AP_IDs_PR_uE_S1AP_ID_pair;
-        UE_S1AP_IDs->choice.uE_S1AP_ID_pair = 
+        UE_S1AP_IDs->choice.uE_S1AP_ID_pair =
             CALLOC(1, sizeof(S1AP_UE_S1AP_ID_pair_t));
-        UE_S1AP_IDs->choice.uE_S1AP_ID_pair->mME_UE_S1AP_ID = 
+        UE_S1AP_IDs->choice.uE_S1AP_ID_pair->mME_UE_S1AP_ID =
             enb_ue->mme_ue_s1ap_id;
-        UE_S1AP_IDs->choice.uE_S1AP_ID_pair->eNB_UE_S1AP_ID = 
+        UE_S1AP_IDs->choice.uE_S1AP_ID_pair->eNB_UE_S1AP_ID =
             enb_ue->enb_ue_s1ap_id;
     }
 
@@ -1138,7 +1220,7 @@
         ogs_assert(bearer->qos.gbr.downlink);
         ogs_assert(bearer->qos.gbr.uplink);
 
-        gbrQosInformation = 
+        gbrQosInformation =
                 CALLOC(1, sizeof(S1AP_GBR_QosInformation_t));
         asn_uint642INTEGER(&gbrQosInformation->e_RAB_MaximumBitrateDL,
                 bearer->qos.mbr.downlink);
@@ -1161,7 +1243,7 @@
 }
 
 ogs_pkbuf_t *s1ap_build_e_rab_release_command(
-        mme_bearer_t *bearer, ogs_pkbuf_t *esmbuf, 
+        mme_bearer_t *bearer, ogs_pkbuf_t *esmbuf,
         S1AP_Cause_PR group, long cause)

open5gs_2.6.4.tar.xz/src/mme/s1ap-build.h -> open5gs_2.6.5.tar.xz/src/mme/s1ap-build.h Changed

open5gs_2.6.4.tar.xz/src/mme/s1ap-handler.c -> open5gs_2.6.5.tar.xz/src/mme/s1ap-handler.c Changed

@@ -34,6 +34,33 @@
 #include "mme-path.h"
 #include "mme-sm.h"
 
+static bool maximum_number_of_enbs_is_reached(void)
+{
+    mme_enb_t *enb = NULL, *next_enb = NULL;
+    int number_of_enbs_online = 0;
+
+    ogs_list_for_each_safe(&mme_self()->enb_list, next_enb, enb) {
+        if (enb->state.s1_setup_success) {
+            number_of_enbs_online++;
+        }
+    }
+
+    return number_of_enbs_online >= ogs_app()->max.peer;
+}
+
+static bool enb_plmn_id_is_foreign(mme_enb_t *enb)
+{
+    int i;
+
+    for (i = 0; i < enb->num_of_supported_ta_list; i++) {
+        if (memcmp(&enb->plmn_id, &enb->supported_ta_listi.plmn_id,
+                    OGS_PLMN_ID_LEN) == 0)
+            return false;
+    }
+
+    return true;
+}
+
 static bool served_tai_is_found(mme_enb_t *enb)
 {
     int i;
@@ -51,20 +78,6 @@
     return false;
 }
 
-static bool maximum_number_of_enbs_is_reached(void)
-{
-    mme_enb_t *enb = NULL, *next_enb = NULL;
-    int number_of_enbs_online = 0;
-
-    ogs_list_for_each_safe(&mme_self()->enb_list, next_enb, enb) {
-        if (enb->state.s1_setup_success) {
-            number_of_enbs_online++;
-        }
-    }
-
-    return number_of_enbs_online >= ogs_app()->max.peer;
-}
-
 void s1ap_handle_s1_setup_request(mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
@@ -110,17 +123,41 @@
         }
     }
 
-    ogs_assert(Global_ENB_ID);
+    if (!Global_ENB_ID) {
+        ogs_error("No Global_ENB_ID");
+        group = S1AP_Cause_PR_misc;
+        cause = S1AP_CauseProtocol_semantic_error;
+
+        r = s1ap_send_s1_setup_failure(enb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
+        return;
+    }
+
+    if (!SupportedTAs) {
+        ogs_error("No SupportedTAs");
+        group = S1AP_Cause_PR_misc;
+        cause = S1AP_CauseProtocol_semantic_error;
+
+        r = s1ap_send_s1_setup_failure(enb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
+        return;
+    }
 
     ogs_s1ap_ENB_ID_to_uint32(&Global_ENB_ID->eNB_ID, &enb_id);
     ogs_debug("    IP%s ENB_ID%d", OGS_ADDR(enb->sctp.addr, buf), enb_id);
 
+    mme_enb_set_enb_id(enb, enb_id);
+
+    memcpy(&enb->plmn_id,
+            Global_ENB_ID->pLMNidentity.buf, sizeof(enb->plmn_id));
+    ogs_debug("    PLMN_IDMCC:%d MNC:%d",
+            ogs_plmn_id_mcc(&enb->plmn_id), ogs_plmn_id_mnc(&enb->plmn_id));
+
     if (PagingDRX)
         ogs_debug("    PagingDRX%ld", *PagingDRX);
 
-    mme_enb_set_enb_id(enb, enb_id);
-
-    ogs_assert(SupportedTAs);
     /* Parse Supported TA */
     enb->num_of_supported_ta_list = 0;
     for (i = 0; i < SupportedTAs->list.count; i++) {
@@ -169,11 +206,21 @@
         return;
     }
 
-    if (enb->num_of_supported_ta_list == 0) {
+    /*
+     * TS36.413
+     * Section 8.7.3.4 Abnormal Conditions
+     *
+     * If the eNB initiates the procedure by sending a S1 SETUP REQUEST
+     * message including the PLMN Identity IEs and none of the PLMNs
+     * provided by the eNB is identified by the MME, then the MME shall
+     * reject the eNB S1 Setup Request procedure with the appropriate cause
+     * value, e.g., “Unknown PLMN”.
+     */
+    if (enb_plmn_id_is_foreign(enb)) {
         ogs_warn("S1-Setup failure:");
-        ogs_warn("    No supported TA exist in S1-Setup request");
+        ogs_warn("    Global-ENB-ID PLMN-ID is foreign");
         group = S1AP_Cause_PR_misc;
-        cause = S1AP_CauseMisc_unspecified;
+        cause = S1AP_CauseMisc_unknown_PLMN;
 
         r = s1ap_send_s1_setup_failure(enb, group, cause);
         ogs_expect(r == OGS_OK);
@@ -199,6 +246,129 @@
     ogs_assert(r != OGS_ERROR);
 }
 
+void s1ap_handle_enb_configuration_update(
+        mme_enb_t *enb, ogs_s1ap_message_t *message)
+{
+    int i, j, r;
+
+    S1AP_InitiatingMessage_t *initiatingMessage = NULL;
+    S1AP_ENBConfigurationUpdate_t *ENBConfigurationUpdate = NULL;
+
+    S1AP_ENBConfigurationUpdateIEs_t *ie = NULL;
+    S1AP_SupportedTAs_t *SupportedTAs = NULL;
+    S1AP_PagingDRX_t *PagingDRX = NULL;
+
+    ogs_assert(enb);
+    ogs_assert(enb->sctp.sock);
+
+    ogs_assert(message);
+    initiatingMessage = message->choice.initiatingMessage;
+    ogs_assert(initiatingMessage);
+    ENBConfigurationUpdate =
+        &initiatingMessage->value.choice.ENBConfigurationUpdate;
+    ogs_assert(ENBConfigurationUpdate);
+
+    ogs_debug("ENBConfigurationUpdate");
+
+    for (i = 0; i < ENBConfigurationUpdate->protocolIEs.list.count; i++) {
+        ie = ENBConfigurationUpdate->protocolIEs.list.arrayi;
+        switch (ie->id) {
+        case S1AP_ProtocolIE_ID_id_SupportedTAs:
+            SupportedTAs = &ie->value.choice.SupportedTAs;
+            break;
+        case S1AP_ProtocolIE_ID_id_DefaultPagingDRX:
+            PagingDRX = &ie->value.choice.PagingDRX;
+            break;
+        default:
+            break;
+        }
+    }
+
+    /* Parse Supported TA */
+    if (SupportedTAs) {
+        S1AP_Cause_PR group = S1AP_Cause_PR_NOTHING;
+        long cause = 0;
+
+        enb->num_of_supported_ta_list = 0;
+        for (i = 0; i < SupportedTAs->list.count; i++) {
+            S1AP_SupportedTAs_Item_t *SupportedTAs_Item = NULL;
+            S1AP_TAC_t *tAC = NULL;
+
+            SupportedTAs_Item =
+                (S1AP_SupportedTAs_Item_t *)SupportedTAs->list.arrayi;
+            ogs_assert(SupportedTAs_Item);
+            tAC = &SupportedTAs_Item->tAC;
+            ogs_assert(tAC);
+
+            for (j = 0; j < SupportedTAs_Item->broadcastPLMNs.list.count; j++) {
+                S1AP_PLMNidentity_t *pLMNidentity = NULL;
+                pLMNidentity = (S1AP_PLMNidentity_t *)
+                    SupportedTAs_Item->broadcastPLMNs.list.arrayj;
+                ogs_assert(pLMNidentity);
+
+                memcpy(&enb->supported_ta_list
+                        enb->num_of_supported_ta_list.tac,
+                        tAC->buf, sizeof(uint16_t));
+                enb->supported_ta_listenb->num_of_supported_ta_list.tac =
+                    be16toh(enb->supported_ta_list
+                            enb->num_of_supported_ta_list.tac);
+                memcpy(&enb->supported_ta_list
+                            enb->num_of_supported_ta_list.plmn_id,
+                        pLMNidentity->buf, sizeof(ogs_plmn_id_t));
+                ogs_debug("    PLMN_IDMCC:%d MNC:%d TAC%d",

open5gs_2.6.4.tar.xz/src/mme/s1ap-handler.h -> open5gs_2.6.5.tar.xz/src/mme/s1ap-handler.h Changed

open5gs_2.6.4.tar.xz/src/mme/s1ap-path.c -> open5gs_2.6.5.tar.xz/src/mme/s1ap-path.c Changed

@@ -309,6 +309,56 @@
     return rv;
 }
 
+int s1ap_send_enb_configuration_update_ack(mme_enb_t *enb)
+{
+    int rv;
+    ogs_pkbuf_t *s1ap_buffer;
+
+    ogs_debug("ENBConfigurationUpdateAcknowledge");
+
+    if (!mme_enb_cycle(enb)) {
+        ogs_error("eNB has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    s1ap_buffer = s1ap_build_enb_configuration_update_ack();
+    if (!s1ap_buffer) {
+        ogs_error("s1ap_build_setup_rsp() failed");
+        return OGS_ERROR;
+    }
+
+    rv = s1ap_send_to_enb(enb, s1ap_buffer, S1AP_NON_UE_SIGNALLING);
+    ogs_expect(rv == OGS_OK);
+
+    return rv;
+}
+
+int s1ap_send_enb_configuration_update_failure(
+        mme_enb_t *enb, S1AP_Cause_PR group, long cause)
+{
+    int rv;
+    ogs_pkbuf_t *s1ap_buffer;
+
+    ogs_debug("ENBConfigurationUpdateFailure");
+
+    if (!mme_enb_cycle(enb)) {
+        ogs_error("eNB has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    s1ap_buffer = s1ap_build_enb_configuration_update_failure(
+            group, cause, S1AP_TimeToWait_v10s);
+    if (!s1ap_buffer) {
+        ogs_error("s1ap_build_setup_failure() failed");
+        return OGS_ERROR;
+    }
+
+    rv = s1ap_send_to_enb(enb, s1ap_buffer, S1AP_NON_UE_SIGNALLING);
+    ogs_expect(rv == OGS_OK);
+
+    return rv;
+}
+
 int s1ap_send_initial_context_setup_request(mme_ue_t *mme_ue)
 {
     int rv;
@@ -419,8 +469,6 @@
         return OGS_NOTFOUND;
     }
 
-    ogs_assert(ogs_timer_running(mme_ue->t_implicit_detach.timer) == false);
-
     /* Find enB with matched TAI */
     ogs_list_for_each(&mme_self()->enb_list, enb) {
         for (i = 0; i < enb->num_of_supported_ta_list; i++) {
@@ -483,6 +531,31 @@
         return OGS_ERROR;
     }
 
+    rv = s1ap_send_to_enb(target_enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
+    ogs_expect(rv == OGS_OK);
+
+    return rv;
+}
+
+int s1ap_send_mme_direct_information_transfer(
+        mme_enb_t *target_enb, const uint8_t *buf, size_t buf_len)
+{
+    int rv;
+    ogs_pkbuf_t *s1apbuf = NULL;
+
+    ogs_debug("Tx MME Direct Information Transfer");
+
+    if (!mme_enb_cycle(target_enb)) {
+        ogs_error("eNB has already been removed");
+        return OGS_NOTFOUND;
+    }
+
+    s1apbuf = s1ap_build_direct_information_transfer(buf, buf_len);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_direct_information_transfer() failed");
+        return OGS_ERROR;
+    }
+
     rv = s1ap_send_to_enb(target_enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);

open5gs_2.6.4.tar.xz/src/mme/s1ap-path.h -> open5gs_2.6.5.tar.xz/src/mme/s1ap-path.h Changed

open5gs_2.6.4.tar.xz/src/mme/s1ap-sm.c -> open5gs_2.6.5.tar.xz/src/mme/s1ap-sm.c Changed

open5gs_2.6.4.tar.xz/src/mme/sgsap-handler.c -> open5gs_2.6.5.tar.xz/src/mme/sgsap-handler.c Changed

@@ -387,55 +387,19 @@
 
         if (ECM_IDLE(mme_ue)) {
             if (CS_CALL_SERVICE_INDICATOR(mme_ue)) {
-                if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
-                    /*
-                    * TS 24.301 5.3.7
-                    * If ISR is not activated, the network behaviour upon
-                    * expiry of the mobile reachable timer is network dependent,
-                    * but typically the network stops sending paging messages to
-                    * the UE on the first expiry, and may take other appropriate
-                    * actions
-                    */
-                    ogs_debug("%s Paging stopped: Mobile Reachable timeout",
-                        mme_ue->imsi_bcd);
-
-                    ogs_assert(OGS_OK ==
-                        sgsap_send_paging_reject(
-                            mme_ue, SGSAP_SGS_CAUSE_UE_UNREACHABLE));
-                    MME_CLEAR_PAGING_INFO(mme_ue);
-                } else {
-                    /* UE will respond Extended Service Request in PS CNDomain*/
-                    MME_STORE_PAGING_INFO(mme_ue,
-                        MME_PAGING_TYPE_CS_CALL_SERVICE, NULL);
-                    r = s1ap_send_paging(mme_ue, S1AP_CNDomain_cs);
-                    ogs_expect(r == OGS_OK);
-                    ogs_assert(r != OGS_ERROR);
-                }
+                /* UE will respond Extended Service Request in PS CNDomain*/
+                MME_STORE_PAGING_INFO(mme_ue,
+                    MME_PAGING_TYPE_CS_CALL_SERVICE, NULL);
+                r = s1ap_send_paging(mme_ue, S1AP_CNDomain_cs);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else if (SMS_SERVICE_INDICATOR(mme_ue)) {
-                if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
-                    /*
-                    * TS 24.301 5.3.7
-                    * If ISR is not activated, the network behaviour upon
-                    * expiry of the mobile reachable timer is network dependent,
-                    * but typically the network stops sending paging messages to
-                    * the UE on the first expiry, and may take other appropriate
-                    * actions
-                    */
-                    ogs_debug("%s Paging stopped: Mobile Reachable timer expiry",
-                        mme_ue->imsi_bcd);
-
-                    ogs_assert(OGS_OK ==
-                        sgsap_send_paging_reject(
-                            mme_ue, SGSAP_SGS_CAUSE_UE_UNREACHABLE));
-                    MME_CLEAR_PAGING_INFO(mme_ue);
-                } else {
-                    /* UE will respond Service Request in PS CNDomain*/
-                    MME_STORE_PAGING_INFO(mme_ue,
-                        MME_PAGING_TYPE_SMS_SERVICE, NULL);
-                    r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
-                    ogs_expect(r == OGS_OK);
-                    ogs_assert(r != OGS_ERROR);
-                }
+                /* UE will respond Service Request in PS CNDomain*/
+                MME_STORE_PAGING_INFO(mme_ue,
+                    MME_PAGING_TYPE_SMS_SERVICE, NULL);
+                r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else
                 goto paging_reject;

open5gs_2.6.4.tar.xz/src/nrf/nnrf-handler.c -> open5gs_2.6.5.tar.xz/src/nrf/nnrf-handler.c Changed

@@ -40,6 +40,33 @@
         return false;
     }
 
+    if (!NFProfile->nf_instance_id) {
+        ogs_error("No NFProfile.NFInstanceId");
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                recvmsg, "No NFProfile.NFInstanceId", NULL));
+        return false;
+    }
+
+    if (!NFProfile->nf_type) {
+        ogs_error("No NFProfile.NFType");
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                recvmsg, "No NFProfile.NFType", NULL));
+        return false;
+    }
+
+    if (!NFProfile->nf_status) {
+        ogs_error("No NFProfile.NFStatus");
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                recvmsg, "No NFProfile.NFStatus", NULL));
+        return false;
+    }
+
     ogs_nnrf_nfm_handle_nf_profile(nf_instance, NFProfile);
 
     if (OGS_FSM_CHECK(&nf_instance->sm, nrf_nf_state_will_register)) {
@@ -241,7 +268,7 @@
         if (!subscription_data->req_nf_instance_id) {
             ogs_error("ogs_strdup() failed");
             ogs_sbi_subscription_data_remove(subscription_data);
-            return NULL;
+            return false;
         }
     }
 
@@ -254,7 +281,7 @@
     if (!SubscriptionData->subscription_id) {
         ogs_error("ogs_strdup() failed");
         ogs_sbi_subscription_data_remove(subscription_data);
-        return NULL;
+        return false;
     }
 
     if (SubscriptionData->requester_features) {
@@ -275,15 +302,29 @@
     if (!SubscriptionData->nrf_supported_features) {
         ogs_error("ogs_strdup() failed");
         ogs_sbi_subscription_data_remove(subscription_data);
-        return NULL;
+        return false;
     }
 
     SubscrCond = SubscriptionData->subscr_cond;
     if (SubscrCond) {
-        subscription_data->subscr_cond.nf_type = SubscrCond->nf_type;
-        if (SubscrCond->service_name)
+
+    /* Issue #2630 : The format of subscrCond is invalid. Must be 'oneOf'. */
+        if (SubscrCond->nf_type && SubscrCond->service_name) {
+            ogs_error("SubscrCond must be 'oneOf'");
+            ogs_sbi_subscription_data_remove(subscription_data);
+            return false;
+        }
+
+        if (SubscrCond->nf_type)
+            subscription_data->subscr_cond.nf_type = SubscrCond->nf_type;
+        else if (SubscrCond->service_name)
             subscription_data->subscr_cond.service_name =
                 ogs_strdup(SubscrCond->service_name);
+        else {
+            ogs_error("No SubscrCond");
+            ogs_sbi_subscription_data_remove(subscription_data);
+            return false;
+        }
     }
 
     subscription_data->notification_uri =

open5gs_2.6.4.tar.xz/src/nrf/nrf-sm.c -> open5gs_2.6.5.tar.xz/src/nrf/nrf-sm.c Changed

@@ -99,9 +99,22 @@
                     }
                     break;
 
+                CASE(OGS_SBI_HTTP_METHOD_OPTIONS)
+                    ogs_assert(
+                        true ==
+                        ogs_sbi_server_send_error(
+                            stream,
+                            OGS_SBI_HTTP_STATUS_NOT_IMPLEMENTED,
+                            &message, "OPTIONS method is not implemented yet",
+                            NULL));
+                    break;
+
                 DEFAULT
-                    nf_instance = ogs_sbi_nf_instance_find(
-                            message.h.resource.component1);
+                    if (message.h.resource.component1) {
+                        nf_instance = ogs_sbi_nf_instance_find(
+                                message.h.resource.component1);
+                    }
+
                     if (!nf_instance) {
                         SWITCH(message.h.method)
                         CASE(OGS_SBI_HTTP_METHOD_PUT)
@@ -151,7 +164,6 @@
                                     nrf_nf_state_exception)) {
                             ogs_error("%s State machine exception",
                                     nf_instance->id);
-                            ogs_sbi_message_free(&message);
 
                             nrf_nf_fsm_fini(nf_instance);
                             ogs_sbi_nf_instance_remove(nf_instance);

open5gs_2.6.4.tar.xz/src/nrf/sbi-path.c -> open5gs_2.6.5.tar.xz/src/nrf/sbi-path.c Changed

@@ -121,16 +121,14 @@
             strcmp(subscription_data->req_nf_instance_id, nf_instance->id) == 0)
             continue;
 
-        if (subscription_data->subscr_cond.nf_type &&
-            subscription_data->subscr_cond.nf_type != nf_instance->nf_type)
-            continue;
+    /* Issue #2630 : The format of subscrCond is invalid. Must be 'oneOf'. */
+        if (subscription_data->subscr_cond.nf_type) {
 
-        if (subscription_data->req_nf_type &&
-            ogs_sbi_nf_instance_is_allowed_nf_type(
-                nf_instance, subscription_data->req_nf_type) == false)
-            continue;
+            if (subscription_data->subscr_cond.nf_type != nf_instance->nf_type)
+                continue;
+
+        } else if (subscription_data->subscr_cond.service_name) {
 
-        if (subscription_data->subscr_cond.service_name) {
             ogs_sbi_nf_service_t *nf_service =
                 ogs_sbi_nf_service_find_by_name(nf_instance,
                     subscription_data->subscr_cond.service_name);
@@ -142,6 +140,11 @@
                 continue;
         }
 
+        if (subscription_data->req_nf_type &&
+            ogs_sbi_nf_instance_is_allowed_nf_type(
+                nf_instance, subscription_data->req_nf_type) == false)
+            continue;
+
         rc = nrf_nnrf_nfm_send_nf_status_notify(
                 subscription_data, event, nf_instance);
         if (rc == false) {

open5gs_2.6.4.tar.xz/src/pcf/context.c -> open5gs_2.6.5.tar.xz/src/pcf/context.c Changed

open5gs_2.6.4.tar.xz/src/pcf/context.h -> open5gs_2.6.5.tar.xz/src/pcf/context.h Changed

open5gs_2.6.4.tar.xz/src/pcf/metrics.c -> open5gs_2.6.5.tar.xz/src/pcf/metrics.c Changed

@@ -63,87 +63,6 @@
     return pcf_metrics_free_inst(pcf_metrics_inst_global, _PCF_METR_GLOB_MAX);
 }
 
-/* BY_PLMN */
-const char *labels_plmn = {
-    "plmnid"
-};
-#define PCF_METR_BY_PLMN_CTR_ENTRY(_id, _name, _desc) \
-    _id = { \
-        .type = OGS_METRICS_METRIC_TYPE_COUNTER, \
-        .name = _name, \
-        .description = _desc, \
-        .num_labels = OGS_ARRAY_SIZE(labels_plmn), \
-        .labels = labels_plmn, \
-    },
-ogs_metrics_spec_t *pcf_metrics_spec_by_plmn_PCF_METR_BY_PLMN_MAX;
-ogs_hash_t *metrics_hash_by_plmn = NULL;   /* hash table for PLMN label */
-pcf_metrics_spec_def_t pcf_metrics_spec_def_by_plmn_PCF_METR_BY_PLMN_MAX = {
-/* Counters: */
-PCF_METR_BY_PLMN_CTR_ENTRY(
-    PCF_METR_CTR_PA_POLICYAMASSOREQ,
-    "fivegs_pcffunction_pa_policyamassoreq",
-    "Number of AM policy association requests")
-PCF_METR_BY_PLMN_CTR_ENTRY(
-    PCF_METR_CTR_PA_POLICYAMASSOSUCC,
-    "fivegs_pcffunction_pa_policyamassosucc",
-    "Number of successful AM policy associations")
-};
-void pcf_metrics_init_by_plmn(void);
-int pcf_metrics_free_inst_by_plmn(ogs_metrics_inst_t **inst);
-typedef struct pcf_metric_key_by_plmn_s {
-    ogs_plmn_id_t               plmn_id;
-    pcf_metric_type_by_plmn_t   t;
-} pcf_metric_key_by_plmn_t;
-
-void pcf_metrics_init_by_plmn(void)
-{
-    metrics_hash_by_plmn = ogs_hash_make();
-    ogs_assert(metrics_hash_by_plmn);
-}
-void pcf_metrics_inst_by_plmn_add(ogs_plmn_id_t *plmn,
-        pcf_metric_type_by_plmn_t t, int val)
-{
-    ogs_metrics_inst_t *metrics = NULL;
-    pcf_metric_key_by_plmn_t *plmn_key;
-
-    plmn_key = ogs_calloc(1, sizeof(*plmn_key));
-    ogs_assert(plmn_key);
-
-    if (plmn) {
-        plmn_key->plmn_id = *plmn;
-    }
-
-    plmn_key->t = t;
-
-    metrics = ogs_hash_get(metrics_hash_by_plmn,
-            plmn_key, sizeof(*plmn_key));
-
-    if (!metrics) {
-        char plmn_idOGS_PLMNIDSTRLEN = "";
-
-        if (plmn) {
-            ogs_plmn_id_to_string(plmn, plmn_id);
-        }
-
-        metrics = ogs_metrics_inst_new(pcf_metrics_spec_by_plmnt,
-                pcf_metrics_spec_def_by_plmn->num_labels,
-                (const char *){ plmn_id });
-
-        ogs_assert(metrics);
-        ogs_hash_set(metrics_hash_by_plmn,
-                plmn_key, sizeof(*plmn_key), metrics);
-    } else {
-        ogs_free(plmn_key);
-    }
-
-    ogs_metrics_inst_add(metrics, val);
-}
-
-int pcf_metrics_free_inst_by_plmn(ogs_metrics_inst_t **inst)
-{
-    return pcf_metrics_free_inst(inst, _PCF_METR_BY_PLMN_MAX);
-}
-
 /* BY_SLICE */
 const char *labels_slice = {
     "plmnid",
@@ -171,6 +90,14 @@
 pcf_metrics_spec_def_t pcf_metrics_spec_def_by_slice_PCF_METR_BY_SLICE_MAX = {
 /* Counters: */
 PCF_METR_BY_SLICE_CTR_ENTRY(
+    PCF_METR_CTR_PA_POLICYAMASSOREQ,
+    "fivegs_pcffunction_pa_policyamassoreq",
+    "Number of AM policy association requests")
+PCF_METR_BY_SLICE_CTR_ENTRY(
+    PCF_METR_CTR_PA_POLICYAMASSOSUCC,
+    "fivegs_pcffunction_pa_policyamassosucc",
+    "Number of successful AM policy associations")
+PCF_METR_BY_SLICE_CTR_ENTRY(
     PCF_METR_CTR_PA_POLICYSMASSOREQ,
     "fivegs_pcffunction_pa_policysmassoreq",
     "Number of SM policy association requests")
@@ -232,7 +159,7 @@
         }
 
         if (snssai) {
-            s_nssai = ogs_sbi_s_nssai_to_string_plain(snssai);
+            s_nssai = ogs_sbi_s_nssai_to_string(snssai);
         } else {
             s_nssai = ogs_strdup("");
         }
@@ -266,13 +193,10 @@
 
     pcf_metrics_init_spec(ctx, pcf_metrics_spec_global,
             pcf_metrics_spec_def_global, _PCF_METR_GLOB_MAX);
-    pcf_metrics_init_spec(ctx, pcf_metrics_spec_by_plmn,
-            pcf_metrics_spec_def_by_plmn, _PCF_METR_BY_PLMN_MAX);
     pcf_metrics_init_spec(ctx, pcf_metrics_spec_by_slice,
             pcf_metrics_spec_def_by_slice, _PCF_METR_BY_SLICE_MAX);
 
     pcf_metrics_init_inst_global();
-    pcf_metrics_init_by_plmn();
     pcf_metrics_init_by_slice();
 }
 
@@ -295,21 +219,6 @@
         }
         ogs_hash_destroy(metrics_hash_by_slice);
     }
-    if (metrics_hash_by_plmn) {
-        for (hi = ogs_hash_first(metrics_hash_by_plmn); hi; hi = ogs_hash_next(hi)) {
-            pcf_metric_key_by_plmn_t *key =
-                (pcf_metric_key_by_plmn_t *)ogs_hash_this_key(hi);
-            //void *val = ogs_hash_this_val(hi);
-
-            ogs_hash_set(metrics_hash_by_plmn, key, sizeof(*key), NULL);
-
-            ogs_free(key);
-            /* don't free val (metric ifself) -
-             * it will be free'd by ogs_metrics_context_final() */
-            //ogs_free(val);
-        }
-        ogs_hash_destroy(metrics_hash_by_plmn);
-    }
 
     ogs_metrics_context_final();
 }

open5gs_2.6.4.tar.xz/src/pcf/metrics.h -> open5gs_2.6.5.tar.xz/src/pcf/metrics.h Changed

open5gs_2.6.4.tar.xz/src/pcf/nbsf-handler.c -> open5gs_2.6.5.tar.xz/src/pcf/nbsf-handler.c Changed

open5gs_2.6.4.tar.xz/src/pcf/npcf-handler.c -> open5gs_2.6.5.tar.xz/src/pcf/npcf-handler.c Changed

@@ -29,6 +29,7 @@
 
     OpenAPI_policy_association_request_t *PolicyAssociationRequest = NULL;
     OpenAPI_guami_t *Guami = NULL;
+    OpenAPI_lnode_t *node = NULL;
 
     uint64_t supported_features = 0;
 
@@ -36,8 +37,6 @@
     OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
     ogs_sockaddr_t *addr = NULL;
 
-    pcf_metrics_inst_by_plmn_add(NULL, PCF_METR_CTR_PA_POLICYAMASSOREQ, 1);
-
     ogs_assert(pcf_ue);
     ogs_assert(stream);
     ogs_assert(message);
@@ -113,26 +112,9 @@
     pcf_ue->access_type = PolicyAssociationRequest->access_type;
 
     if (PolicyAssociationRequest->pei) {
-        char *type = NULL, *value = NULL;
         if (pcf_ue->pei)
             ogs_free(pcf_ue->pei);
         pcf_ue->pei = ogs_strdup(PolicyAssociationRequest->pei);
-
-        type = ogs_id_get_type(pcf_ue->pei);
-        ogs_assert(type);
-        value = ogs_id_get_value(pcf_ue->pei);
-        ogs_assert(value);
-
-        if (strcmp(type, "imeisv") == 0) {
-            ogs_assert(OGS_OK == ogs_dbi_update_imeisv(pcf_ue->supi, value));
-        } else {
-            ogs_fatal("Unknown Type = %s", type);
-            ogs_assert_if_reached();
-        }
-
-
-        ogs_free(type);
-        ogs_free(value);
     }
 
     Guami = PolicyAssociationRequest->guami;
@@ -141,8 +123,19 @@
         ogs_sbi_parse_guami(&pcf_ue->guami, PolicyAssociationRequest->guami);
     }
 
-    pcf_metrics_inst_by_plmn_add(&pcf_ue->guami.plmn_id,
-            PCF_METR_CTR_PA_POLICYAMASSOREQ, 1);
+    OpenAPI_list_for_each(PolicyAssociationRequest->allowed_snssais, node) {
+        struct OpenAPI_snssai_s *Snssai = node->data;
+        if (Snssai) {
+            ogs_s_nssai_t s_nssai;
+            s_nssai.sst = Snssai->sst;
+            s_nssai.sd = ogs_s_nssai_sd_from_string(Snssai->sd);
+
+            pcf_metrics_inst_by_slice_add(&pcf_ue->guami.plmn_id,
+                    &s_nssai, PCF_METR_CTR_PA_POLICYAMASSOREQ, 1);
+        } else {
+            ogs_error("%s No Snssai", pcf_ue->supi);
+        }
+    }
 
     if (PolicyAssociationRequest->rat_type)
         pcf_ue->rat_type = PolicyAssociationRequest->rat_type;
@@ -180,8 +173,6 @@
     OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
     ogs_sockaddr_t *addr = NULL;
 
-    pcf_metrics_inst_by_slice_add(NULL, NULL, PCF_METR_CTR_PA_POLICYSMASSOREQ, 1);
-
     ogs_assert(sess);
     pcf_ue = sess->pcf_ue;
     ogs_assert(stream);

open5gs_2.6.4.tar.xz/src/pcf/nudr-handler.c -> open5gs_2.6.5.tar.xz/src/pcf/nudr-handler.c Changed

@@ -48,6 +48,7 @@
         OpenAPI_policy_association_t PolicyAssociation;
         OpenAPI_ambr_t UeAmbr;
         OpenAPI_list_t *TriggerList = NULL;
+        OpenAPI_lnode_t *node = NULL;
 
         if (!recvmsg->AmPolicyData) {
             strerror = ogs_msprintf("%s No AmPolicyData", pcf_ue->supi);
@@ -97,10 +98,10 @@
                 subscribed_ue_ambr.downlink = ogs_sbi_bitrate_from_string(
                         pcf_ue->subscribed_ue_ambr->downlink);
 
-                if (((subscribed_ue_ambr.uplink / 1024) !=
-                     (subscription_data.ambr.uplink / 1024)) ||
-                    ((subscribed_ue_ambr.downlink / 1024) !=
-                     (subscription_data.ambr.downlink / 1024))) {
+                if (((subscribed_ue_ambr.uplink / 1000) !=
+                     (subscription_data.ambr.uplink / 1000)) ||
+                    ((subscribed_ue_ambr.downlink / 1000) !=
+                     (subscription_data.ambr.downlink / 1000))) {
 
                     OpenAPI_list_add(TriggerList,
                             (void *)OpenAPI_request_trigger_UE_AMBR_CH);
@@ -147,8 +148,19 @@
 
         ogs_subscription_data_free(&subscription_data);
 
-        pcf_metrics_inst_by_plmn_add(&pcf_ue->guami.plmn_id,
-                PCF_METR_CTR_PA_POLICYAMASSOSUCC, 1);
+        OpenAPI_list_for_each(PolicyAssociation.request->allowed_snssais, node) {
+            struct OpenAPI_snssai_s *Snssai = node->data;
+            if (Snssai) {
+                ogs_s_nssai_t s_nssai;
+                s_nssai.sst = Snssai->sst;
+                s_nssai.sd = ogs_s_nssai_sd_from_string(Snssai->sd);
+
+                pcf_metrics_inst_by_slice_add(&pcf_ue->guami.plmn_id,
+                        &s_nssai, PCF_METR_CTR_PA_POLICYAMASSOSUCC, 1);
+            } else {
+                ogs_error("%s No Snssai", pcf_ue->supi);
+            }
+        }
 
         return true;

open5gs_2.6.4.tar.xz/src/pcf/pcf-sm.c -> open5gs_2.6.5.tar.xz/src/pcf/pcf-sm.c Changed

open5gs_2.6.4.tar.xz/src/pcf/sbi-path.c -> open5gs_2.6.5.tar.xz/src/pcf/sbi-path.c Changed

open5gs_2.6.4.tar.xz/src/sgwc/gtp-path.c -> open5gs_2.6.5.tar.xz/src/sgwc/gtp-path.c Changed

open5gs_2.6.4.tar.xz/src/sgwc/pfcp-path.c -> open5gs_2.6.5.tar.xz/src/sgwc/pfcp-path.c Changed

open5gs_2.6.4.tar.xz/src/sgwc/sxa-build.c -> open5gs_2.6.5.tar.xz/src/sgwc/sxa-build.c Changed

open5gs_2.6.4.tar.xz/src/sgwu/gtp-path.c -> open5gs_2.6.5.tar.xz/src/sgwu/gtp-path.c Changed

@@ -38,11 +38,9 @@
     ogs_sockaddr_t from;
 
     ogs_gtp2_header_t *gtp_h = NULL;
+    ogs_gtp2_header_desc_t header_desc;
     ogs_pfcp_user_plane_report_t report;
 
-    uint32_t teid;
-    uint8_t qfi;
-
     ogs_assert(fd != INVALID_SOCKET);
     sock = data;
     ogs_assert(sock);
@@ -70,7 +68,13 @@
         goto cleanup;
     }
 
-    if (gtp_h->type == OGS_GTPU_MSGTYPE_ECHO_REQ) {
+    len = ogs_gtpu_parse_header(&header_desc, pkbuf);
+    if (len < 0) {
+        ogs_error("DROP Cannot decode GTPU packet");
+        ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
+        goto cleanup;
+    }
+    if (header_desc.type == OGS_GTPU_MSGTYPE_ECHO_REQ) {
         ogs_pkbuf_t *echo_rsp;
 
         ogs_debug("RECV Echo Request from %s", OGS_ADDR(&from, buf1));
@@ -91,57 +95,27 @@
         }
         goto cleanup;
     }
-
-    teid = be32toh(gtp_h->teid);
-
-    ogs_trace("RECV GPU-U Type %d from %s : TEID0x%x",
-            gtp_h->type, OGS_ADDR(&from, buf1), teid);
-
-    qfi = 0;
-    if (gtp_h->flags & OGS_GTPU_FLAGS_E) {
-        /*
-         * TS29.281
-         * 5.2.1 General format of the GTP-U Extension Header
-         * Figure 5.2.1-3: Definition of Extension Header Type
-         *
-         * Note 4 : For a GTP-PDU with several Extension Headers, the PDU
-         *          Session Container should be the first Extension Header
-         */
-        ogs_gtp2_extension_header_t *extension_header =
-            (ogs_gtp2_extension_header_t *)(pkbuf->data+OGS_GTPV1U_HEADER_LEN);
-        ogs_assert(extension_header);
-        if (extension_header->type ==
-                OGS_GTP2_EXTENSION_HEADER_TYPE_PDU_SESSION_CONTAINER) {
-            if (extension_header->pdu_type ==
-                OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_UL_PDU_SESSION_INFORMATION) {
-                    ogs_trace("   QFI 0x%x",
-                            extension_header->qos_flow_identifier);
-                    qfi = extension_header->qos_flow_identifier;
-            }
-        }
-    }
-
-    /* Remove GTP header and send packets to peer NF */
-    len = ogs_gtpu_header_len(pkbuf);
-    if (len < 0) {
-        ogs_error("DROP Cannot decode GTPU packet");
-        ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
-        goto cleanup;
-    }
-    if (gtp_h->type != OGS_GTPU_MSGTYPE_END_MARKER &&
+    if (header_desc.type != OGS_GTPU_MSGTYPE_END_MARKER &&
         pkbuf->len <= len) {
-        ogs_error("DROP Small GTPU packet(type:%d len:%d)", gtp_h->type, len);
+        ogs_error("DROP Small GTPU packet(type:%d len:%d)",
+                header_desc.type, len);
         ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
         goto cleanup;
     }
+
+    ogs_trace("RECV GPU-U Type %d from %s : TEID0x%x",
+            header_desc.type, OGS_ADDR(&from, buf1), header_desc.teid);
+
+    /* Remove GTP header and send packets to peer NF */
     ogs_assert(ogs_pkbuf_pull(pkbuf, len));
 
-    if (gtp_h->type == OGS_GTPU_MSGTYPE_END_MARKER) {
+    if (header_desc.type == OGS_GTPU_MSGTYPE_END_MARKER) {
         ogs_pfcp_object_t *pfcp_object = NULL;
         ogs_pfcp_pdr_t *pdr = NULL;
+        ogs_gtp2_header_desc_t sendhdr;
         ogs_pkbuf_t *sendbuf = NULL;
 
-        pfcp_object = ogs_pfcp_object_find_by_teid(teid);
+        pfcp_object = ogs_pfcp_object_find_by_teid(header_desc.teid);
         if (!pfcp_object) {
             /*
              * Refer to the following 5G standard
@@ -160,9 +134,10 @@
                         ogs_app()->time.message.pfcp.association_interval))) {
                 ogs_error("%s Send Error Indication TEID:0x%x to %s",
                         OGS_ADDR(&sock->local_addr, buf1),
-                        teid,
+                        header_desc.teid,
                         OGS_ADDR(&from, buf2));
-                ogs_gtp1_send_error_indication(sock, teid, 0, &from);
+                ogs_gtp1_send_error_indication(
+                        sock, header_desc.teid, 0, &from);
             }
             goto cleanup;
         }
@@ -183,9 +158,12 @@
         ogs_assert(sendbuf);
 
         /* Forward packet */
-        ogs_pfcp_send_g_pdu(pdr, gtp_h->type, sendbuf);
+        memset(&sendhdr, 0, sizeof(sendhdr));
+        sendhdr.type = header_desc.type;
+
+        ogs_pfcp_send_g_pdu(pdr, &sendhdr, sendbuf);
 
-    } else if (gtp_h->type == OGS_GTPU_MSGTYPE_ERR_IND) {
+    } else if (header_desc.type == OGS_GTPU_MSGTYPE_ERR_IND) {
         ogs_pfcp_far_t *far = NULL;
 
         far = ogs_pfcp_far_find_by_gtpu_error_indication(pkbuf);
@@ -205,7 +183,7 @@
             ogs_error("DROP Cannot find FAR by Error-Indication");
             ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
         }
-    } else if (gtp_h->type == OGS_GTPU_MSGTYPE_GPDU) {
+    } else if (header_desc.type == OGS_GTPU_MSGTYPE_GPDU) {
         struct ip *ip_h = NULL;
         ogs_pfcp_object_t *pfcp_object = NULL;
         ogs_pfcp_sess_t *pfcp_sess = NULL;
@@ -214,7 +192,7 @@
         ip_h = (struct ip *)pkbuf->data;
         ogs_assert(ip_h);
 
-        pfcp_object = ogs_pfcp_object_find_by_teid(teid);
+        pfcp_object = ogs_pfcp_object_find_by_teid(header_desc.teid);
         if (!pfcp_object) {
             /*
              * Refer to the following 5G standard
@@ -233,9 +211,10 @@
                         ogs_app()->time.message.pfcp.association_interval))) {
                 ogs_error("%s Send Error Indication TEID:0x%x to %s",
                         OGS_ADDR(&sock->local_addr, buf1),
-                        teid,
+                        header_desc.teid,
                         OGS_ADDR(&from, buf2));
-                ogs_gtp1_send_error_indication(sock, teid, 0, &from);
+                ogs_gtp1_send_error_indication(
+                        sock, header_desc.teid, 0, &from);
             }
             goto cleanup;
         }
@@ -253,11 +232,12 @@
 
             ogs_list_for_each(&pfcp_sess->pdr_list, pdr) {
                 /* Check if TEID */
-                if (teid != pdr->f_teid.teid)
+                if (header_desc.teid != pdr->f_teid.teid)
                     continue;
 
                 /* Check if QFI */
-                if (qfi && pdr->qfi != qfi)
+                if (header_desc.qos_flow_identifier &&
+                        pdr->qfi != header_desc.qos_flow_identifier)
                     continue;
 
                 /* Check if Rule List in PDR */
@@ -281,7 +261,7 @@
 
         ogs_assert(pdr);
         ogs_assert(true == ogs_pfcp_up_handle_pdr(
-                                pdr, gtp_h->type, pkbuf, &report));
+                    pdr, header_desc.type, &header_desc, pkbuf, &report));
 
         if (report.type.downlink_data_report) {
             ogs_assert(pdr->sess);
@@ -290,13 +270,14 @@
             ogs_assert(sess);
 
             report.downlink_data.pdr_id = pdr->id;
-            report.downlink_data.qfi = qfi; /* for 5GC */
+            report.downlink_data.qfi =
+                header_desc.qos_flow_identifier; /* for 5GC */
 
             ogs_assert(OGS_OK ==
                 sgwu_pfcp_send_session_report_request(sess, &report));
         }
     } else {
-        ogs_error("DROP Invalid GTPU Type %d", gtp_h->type);
+        ogs_error("DROP Invalid GTPU Type %d", header_desc.type);
         ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
     }

open5gs_2.6.4.tar.xz/src/sgwu/pfcp-path.c -> open5gs_2.6.5.tar.xz/src/sgwu/pfcp-path.c Changed

open5gs_2.6.4.tar.xz/src/sgwu/sxa-build.c -> open5gs_2.6.5.tar.xz/src/sgwu/sxa-build.c Changed

open5gs_2.6.4.tar.xz/src/smf/context.c -> open5gs_2.6.5.tar.xz/src/smf/context.c Changed

@@ -1018,8 +1018,10 @@
 
     ogs_assert(supi);
 
-    if ((smf_ue = smf_ue_add()) == NULL)
+    if ((smf_ue = smf_ue_add()) == NULL) {
+        ogs_error("smf_ue_add_by_supi() failed");
         return NULL;
+    }
 
     smf_ue->supi = ogs_strdup(supi);
     ogs_assert(smf_ue->supi);
@@ -1467,7 +1469,10 @@
 
     ogs_assert(message);
     SmContextCreateData = message->SmContextCreateData;
-    ogs_assert(SmContextCreateData);
+    if (!SmContextCreateData) {
+        ogs_error("No SmContextCreateData");
+        return NULL;
+    }
 
     if (!SmContextCreateData->supi) {
         ogs_error("No SUPI");
@@ -1482,14 +1487,18 @@
     smf_ue = smf_ue_find_by_supi(SmContextCreateData->supi);
     if (!smf_ue) {
         smf_ue = smf_ue_add_by_supi(SmContextCreateData->supi);
-        if (!smf_ue)
+        if (!smf_ue) {
+            ogs_error("smf_ue_add_by_supi() failed");
             return NULL;
+        }
     }
 
     sess = smf_sess_find_by_psi(smf_ue, SmContextCreateData->pdu_session_id);
     if (sess) {
         ogs_warn("OLD Session Will Release SUPI:%s,PDU Session identity:%d",
                 SmContextCreateData->supi, SmContextCreateData->pdu_session_id);
+        smf_metrics_inst_by_slice_add(&sess->plmn_id, &sess->s_nssai,
+                SMF_METR_GAUGE_SM_SESSIONNBR, -1);
         smf_sess_remove(sess);
     }
 
@@ -1555,7 +1564,6 @@
                 sess->session.name, (uint8_t *)&sess->session.ue_ip.addr);
         if (!sess->ipv4) {
             ogs_error("ogs_pfcp_ue_ip_alloc() failed%d", cause_value);
-            ogs_assert(cause_value != OGS_PFCP_CAUSE_REQUEST_ACCEPTED);
             return cause_value;
         }
         sess->session.paa.addr = sess->ipv4->addr0;
@@ -1566,7 +1574,6 @@
                 sess->session.name, sess->session.ue_ip.addr6);
         if (!sess->ipv6) {
             ogs_error("ogs_pfcp_ue_ip_alloc() failed%d", cause_value);
-            ogs_assert(cause_value != OGS_PFCP_CAUSE_REQUEST_ACCEPTED);
             return cause_value;
         }
 
@@ -1582,7 +1589,6 @@
                 sess->session.name, (uint8_t *)&sess->session.ue_ip.addr);
         if (!sess->ipv4) {
             ogs_error("ogs_pfcp_ue_ip_alloc() failed%d", cause_value);
-            ogs_assert(cause_value != OGS_PFCP_CAUSE_REQUEST_ACCEPTED);
             return cause_value;
         }
         sess->ipv6 = ogs_pfcp_ue_ip_alloc(&cause_value, AF_INET6,
@@ -3003,7 +3009,7 @@
 {
     ogs_assert(sess);
 
-    ogs_pool_init(&sess->qfi_pool, OGS_MAX_QOS_FLOW_ID);
+    ogs_pool_create(&sess->qfi_pool, OGS_MAX_QOS_FLOW_ID);
     ogs_pool_sequence_id_generate(&sess->qfi_pool);
 }
 
@@ -3011,14 +3017,14 @@
 {
     ogs_assert(sess);
 
-    ogs_pool_final(&sess->qfi_pool);
+    ogs_pool_destroy(&sess->qfi_pool);
 }
 
 void smf_pf_identifier_pool_init(smf_bearer_t *bearer)
 {
     ogs_assert(bearer);
 
-    ogs_pool_init(&bearer->pf_identifier_pool, OGS_MAX_NUM_OF_FLOW_IN_BEARER);
+    ogs_pool_create(&bearer->pf_identifier_pool, OGS_MAX_NUM_OF_FLOW_IN_BEARER);
     ogs_pool_sequence_id_generate(&bearer->pf_identifier_pool);
 }
 
@@ -3026,14 +3032,14 @@
 {
     ogs_assert(bearer);
 
-    ogs_pool_final(&bearer->pf_identifier_pool);
+    ogs_pool_destroy(&bearer->pf_identifier_pool);
 }
 
 void smf_pf_precedence_pool_init(smf_sess_t *sess)
 {
     ogs_assert(sess);
 
-    ogs_pool_init(&sess->pf_precedence_pool,
+    ogs_pool_create(&sess->pf_precedence_pool,
             OGS_MAX_NUM_OF_BEARER * OGS_MAX_NUM_OF_FLOW_IN_BEARER);
     ogs_pool_sequence_id_generate(&sess->pf_precedence_pool);
 }
@@ -3042,7 +3048,7 @@
 {
     ogs_assert(sess);
 
-    ogs_pool_final(&sess->pf_precedence_pool);
+    ogs_pool_destroy(&sess->pf_precedence_pool);
 }
 
 static void stats_add_smf_session(void)
@@ -3059,7 +3065,7 @@
     ogs_info("Removed Number of SMF-Sessions is now %d", num_of_smf_sess);
 }
 
-int get_sess_load(void)
+int smf_instance_get_load(void)
 {
     return (((ogs_pool_size(&smf_sess_pool) -
             ogs_pool_avail(&smf_sess_pool)) * 100) /

open5gs_2.6.4.tar.xz/src/smf/context.h -> open5gs_2.6.5.tar.xz/src/smf/context.h Changed

@@ -138,8 +138,10 @@
     do { \
         smf_ue_t *smf_ue = NULL; \
         ogs_assert(__sESS); \
-        smf_ue = __sESS->smf_ue; \
+        smf_ue = (__sESS)->smf_ue; \
         ogs_assert(smf_ue); \
+        smf_metrics_inst_by_slice_add(&(__sESS)->plmn_id, \
+                &(__sESS)->s_nssai, SMF_METR_GAUGE_SM_SESSIONNBR, -1); \
         if (SMF_UE_IS_LAST_SESSION(smf_ue)) \
             smf_ue_remove(smf_ue); \
         else \
@@ -378,6 +380,11 @@
         int pdu_session_resource_release;
     } ngap_state;
 
+#define SMF_UECM_STATE_NONE                                     0
+#define SMF_UECM_STATE_REGISTERED                               1
+#define SMF_UECM_STATE_DEREGISTERED_BY_AMF                      2
+#define SMF_UECM_STATE_DEREGISTERED_BY_N1_N2_RELEASE            3
+
     /* Handover */
     struct {
         bool prepared;
@@ -526,7 +533,7 @@
         const char *value);
 int smf_maximum_integrity_protected_data_rate_downlink_value2enum(
         const char *value);
-int get_sess_load(void);
+int smf_instance_get_load(void);
 
 #ifdef __cplusplus
 }

open5gs_2.6.4.tar.xz/src/smf/fd-path.c -> open5gs_2.6.5.tar.xz/src/smf/fd-path.c Changed

open5gs_2.6.4.tar.xz/src/smf/fd-path.h -> open5gs_2.6.5.tar.xz/src/smf/fd-path.h Changed

open5gs_2.6.4.tar.xz/src/smf/gn-handler.c -> open5gs_2.6.5.tar.xz/src/smf/gn-handler.c Changed

open5gs_2.6.4.tar.xz/src/smf/gsm-handler.c -> open5gs_2.6.5.tar.xz/src/smf/gsm-handler.c Changed

@@ -192,8 +192,6 @@
         ogs_nas_5gs_pdu_session_modification_request_t *
             pdu_session_modification_request)
 {
-    char *strerror = NULL;
-
     int i, j;
 
     uint64_t pfcp_flags = 0;
@@ -477,20 +475,17 @@
     }
 
     if (ogs_list_count(&sess->qos_flow_to_modify_list) != 1) {
-        strerror = ogs_msprintf("%s:%d Invalid modification request "
-                "modify:%d", smf_ue->supi, sess->psi,
+        ogs_error("%s:%d Invalid modification request modify:%d",
+                smf_ue->supi, sess->psi,
                 ogs_list_count(&sess->qos_flow_to_modify_list));
-        ogs_assert(strerror);
 
-        ogs_error("%s", strerror);
         n1smbuf = gsm_build_pdu_session_modification_reject(sess,
             OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
         ogs_assert(n1smbuf);
 
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                strerror, smf_ue->supi, n1smbuf, NULL);
-        ogs_free(strerror);
+        smf_sbi_send_sm_context_update_error_n1_n2_message(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                n1smbuf, OpenAPI_n2_sm_info_type_NULL, NULL);
 
         return OGS_ERROR;
     }

open5gs_2.6.4.tar.xz/src/smf/gsm-sm.c -> open5gs_2.6.5.tar.xz/src/smf/gsm-sm.c Changed

@@ -154,63 +154,6 @@
     return true;
 }
 
-static bool send_sbi_message_from_delete_trigger(
-        smf_sess_t *sess, ogs_sbi_stream_t *stream, int trigger)
-{
-    ogs_sbi_message_t sendmsg;
-    ogs_sbi_response_t *response = NULL;
-
-    if (trigger == OGS_PFCP_DELETE_TRIGGER_LOCAL_INITIATED) {
-
-        /* Nothing */
-
-    } else if (trigger == OGS_PFCP_DELETE_TRIGGER_UE_REQUESTED) {
-        ogs_pkbuf_t *n1smbuf = NULL, *n2smbuf = NULL;
-
-        n1smbuf = gsm_build_pdu_session_release_command(
-                sess, OGS_5GSM_CAUSE_REGULAR_DEACTIVATION);
-        ogs_assert(n1smbuf);
-
-        n2smbuf = ngap_build_pdu_session_resource_release_command_transfer(
-                sess, SMF_NGAP_STATE_DELETE_TRIGGER_UE_REQUESTED,
-                NGAP_Cause_PR_nas, NGAP_CauseNas_normal_release);
-        ogs_assert(n2smbuf);
-
-        ogs_assert(stream);
-        smf_sbi_send_sm_context_updated_data_n1_n2_message(sess, stream,
-                n1smbuf, OpenAPI_n2_sm_info_type_PDU_RES_REL_CMD, n2smbuf);
-    } else if (trigger == OGS_PFCP_DELETE_TRIGGER_AMF_UPDATE_SM_CONTEXT ||
-                trigger == OGS_PFCP_DELETE_TRIGGER_AMF_RELEASE_SM_CONTEXT) {
-        memset(&sendmsg, 0, sizeof(sendmsg));
-
-        response = ogs_sbi_build_response(
-                &sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT);
-        ogs_assert(response);
-
-        ogs_assert(stream);
-        ogs_assert(true == ogs_sbi_server_send_response(stream, response));
-    } else if (trigger == OGS_PFCP_DELETE_TRIGGER_PCF_INITIATED) {
-        smf_n1_n2_message_transfer_param_t param;
-
-        memset(&param, 0, sizeof(param));
-        param.state = SMF_NETWORK_REQUESTED_PDU_SESSION_RELEASE;
-        param.n2smbuf =
-            ngap_build_pdu_session_resource_release_command_transfer(
-                sess, SMF_NGAP_STATE_DELETE_TRIGGER_PCF_INITIATED,
-                NGAP_Cause_PR_nas, NGAP_CauseNas_normal_release);
-        ogs_assert(param.n2smbuf);
-
-        param.skip_ind = true;
-
-        smf_namf_comm_send_n1_n2_message_transfer(sess, &param);
-    } else {
-        ogs_fatal("Unknown trigger %d", trigger);
-        ogs_assert_if_reached();
-    }
-
-    return true;
-}
-
 void smf_gsm_state_initial(ogs_fsm_t *s, smf_event_t *e)
 {
     int rv;
@@ -449,7 +392,7 @@
             diam_err = sess->sm_data.gy_cca_init_err;
 
         if (diam_err == ER_DIAMETER_SUCCESS) {
-            OGS_FSM_TRAN(s, &smf_gsm_state_wait_pfcp_establishment);
+            OGS_FSM_TRAN(s, smf_gsm_state_wait_pfcp_establishment);
             ogs_assert(OGS_OK ==
                 smf_epc_pfcp_send_session_establishment_request(
                     sess, e->gtp_xact, 0));
@@ -545,74 +488,54 @@
             break;
 
         CASE(OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL)
-            stream = e->h.sbi.data;
+            /*
+             * By here, SMF has already sent a response to AMF in
+             * smf_nudm_sdm_handle_get. Therefore, 'stream = e->h.sbi.data'
+             * should not be used here. Instead of sending additional error
+             * replies to AMF over 'stream', SMF should send a
+             * Namf_Communication_N1N2MessageTransfer request by transitioning
+             * into smf_gsm_state_5gc_n1_n2_reject. This is according to
+             *
+             * TS23.502
+             * 6.3.1.7 4.3.2.2 UE Requested PDU Session Establishment
+             * p100
+             * 11.  ...
+             * If the PDU session establishment failed anywhere between step 5
+             * and step 11, then the Namf_Communication_N1N2MessageTransfer
+             * request shall include the N1 SM container with a PDU Session
+             * Establishment Reject message ...
+             */
             state = e->h.sbi.state;
 
             SWITCH(sbi_message->h.resource.component0)
             CASE(OGS_SBI_RESOURCE_NAME_SM_POLICIES)
                 if (sbi_message->h.resource.component1) {
-                    strerror = ogs_msprintf("%s:%d "
-                            "Unknown resource name %s",
+                    ogs_error("%s:%d Unknown resource name %s",
                             smf_ue->supi, sess->psi,
                             sbi_message->h.resource.component1);
-                    ogs_assert(strerror);
-
-                    ogs_error("%s", strerror);
-                    if (stream)
-                        ogs_assert(true ==
-                            ogs_sbi_server_send_error(stream,
-                                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                                sbi_message, strerror, NULL));
-                    ogs_free(strerror);
-
-                    OGS_FSM_TRAN(s, smf_gsm_state_exception);
+                    OGS_FSM_TRAN(s, smf_gsm_state_5gc_n1_n2_reject);
+                } else if (sbi_message->res_status !=
+                           OGS_SBI_HTTP_STATUS_CREATED) {
+                    ogs_error("%s:%d HTTP response error %d",
+                            smf_ue->supi, sess->psi,
+                            sbi_message->res_status);
+                    OGS_FSM_TRAN(s, smf_gsm_state_5gc_n1_n2_reject);
+                } else if (smf_npcf_smpolicycontrol_handle_create(
+                        sess, state, sbi_message) == true) {
+                    OGS_FSM_TRAN(s,
+                        &smf_gsm_state_wait_pfcp_establishment);
                 } else {
-                    ogs_assert(stream);
-                    if (sbi_message->res_status !=
-                            OGS_SBI_HTTP_STATUS_CREATED) {
-                        strerror = ogs_msprintf(
-                                "%s:%d HTTP response error %d",
-                                smf_ue->supi, sess->psi,
-                                sbi_message->res_status);
-                        ogs_assert(strerror);
-
-                        ogs_error("%s", strerror);
-                        ogs_assert(true ==
-                            ogs_sbi_server_send_error(stream,
-                                sbi_message->res_status,
-                                sbi_message, strerror, NULL));
-                        ogs_free(strerror);
-
-                        OGS_FSM_TRAN(s, smf_gsm_state_exception);
-                        break;
-                    }
-
-                    if (smf_npcf_smpolicycontrol_handle_create(
-                            sess, stream, state, sbi_message) == true) {
-                        OGS_FSM_TRAN(s,
-                            &smf_gsm_state_wait_pfcp_establishment);
-                    } else {
-                        ogs_error(
-                            "smf_npcf_smpolicycontrol_handle_create() failed");
-                        OGS_FSM_TRAN(s, smf_gsm_state_exception);
-                    }
+                    ogs_error(
+                        "smf_npcf_smpolicycontrol_handle_create() failed");
+                    OGS_FSM_TRAN(s, smf_gsm_state_5gc_n1_n2_reject);
                 }
                 break;
 
             DEFAULT
-                strerror = ogs_msprintf("%s:%d Invalid resource name %s",
+                ogs_error("%s:%d Invalid resource name %s",
                         smf_ue->supi, sess->psi,
                         sbi_message->h.resource.component0);
-                ogs_assert(strerror);
-
-                ogs_error("%s", strerror);
-                ogs_assert(true ==
-                    ogs_sbi_server_send_error(stream,
-                        OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                        sbi_message, strerror, NULL));
-                ogs_free(strerror);
-
-                OGS_FSM_TRAN(s, smf_gsm_state_exception);
+                OGS_FSM_TRAN(s, smf_gsm_state_5gc_n1_n2_reject);
             END
             break;
 
@@ -649,6 +572,9 @@
     ogs_assert(sess);
 
     switch (e->h.id) {
+    case OGS_FSM_ENTRY_SIG:
+        break;
+
     case SMF_EVT_N4_MESSAGE:
         pfcp_xact = e->pfcp_xact;
         ogs_assert(pfcp_xact);
@@ -690,7 +616,7 @@
                     /* If no CreatePDPCtxResp can be sent,
                      * then tear down the session: */
                     if (rv != OGS_OK) {
-                        OGS_FSM_TRAN(s, &smf_gsm_state_wait_pfcp_deletion);
+                        OGS_FSM_TRAN(s, smf_gsm_state_wait_pfcp_deletion);
                         return;
                     }

open5gs_2.6.4.tar.xz/src/smf/gtp-path.c -> open5gs_2.6.5.tar.xz/src/smf/gtp-path.c Changed

@@ -73,20 +73,6 @@
 
     ogs_pkbuf_trim(pkbuf, size);
 
-    gtp_ver = ((ogs_gtp2_header_t *)pkbuf->data)->version;
-    switch (gtp_ver) {
-    case 1:
-        e = smf_event_new(SMF_EVT_GN_MESSAGE);
-        break;
-    case 2:
-        e = smf_event_new(SMF_EVT_S5C_MESSAGE);
-        break;
-    default:
-        ogs_warn("Rx unexpected GTP version %u", gtp_ver);
-        ogs_pkbuf_free(pkbuf);
-        return;
-    }
-
     gnode = ogs_gtp_node_find_by_addr(&smf_self()->sgw_s5c_list, &from);
     if (!gnode) {
         gnode = ogs_gtp_node_add_by_addr(&smf_self()->sgw_s5c_list, &from);
@@ -100,6 +86,20 @@
         smf_gtp_node_new(gnode);
         smf_metrics_inst_global_inc(SMF_METR_GLOB_GAUGE_GTP_PEERS_ACTIVE);
     }
+
+    gtp_ver = ((ogs_gtp2_header_t *)pkbuf->data)->version;
+    switch (gtp_ver) {
+    case 1:
+        e = smf_event_new(SMF_EVT_GN_MESSAGE);
+        break;
+    case 2:
+        e = smf_event_new(SMF_EVT_S5C_MESSAGE);
+        break;
+    default:
+        ogs_warn("Rx unexpected GTP version %u", gtp_ver);
+        ogs_pkbuf_free(pkbuf);
+        return;
+    }
     ogs_assert(e);
     e->gnode = gnode->data_ptr; /* smf_gtp_node_t */
     e->pkbuf = pkbuf;
@@ -122,9 +122,7 @@
     ogs_sockaddr_t from;
 
     ogs_gtp2_header_t *gtp_h = NULL;
-
-    uint32_t teid;
-    uint8_t qfi;
+    ogs_gtp2_header_desc_t header_desc;
 
     ogs_assert(fd != INVALID_SOCKET);
 
@@ -151,7 +149,13 @@
         goto cleanup;
     }
 
-    if (gtp_h->type == OGS_GTPU_MSGTYPE_ECHO_REQ) {
+    len = ogs_gtpu_parse_header(&header_desc, pkbuf);
+    if (len < 0) {
+        ogs_error("DROP Cannot decode GTPU packet");
+        ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
+        goto cleanup;
+    }
+    if (header_desc.type == OGS_GTPU_MSGTYPE_ECHO_REQ) {
         ogs_pkbuf_t *echo_rsp;
 
         ogs_debug("RECV Echo Request from %s", OGS_ADDR(&from, buf));
@@ -172,58 +176,27 @@
         }
         goto cleanup;
     }
-
-    teid = be32toh(gtp_h->teid);
-
-    ogs_debug("RECV GPU-U Type %d from %s : TEID0x%x",
-            gtp_h->type, OGS_ADDR(&from, buf), teid);
-
-    qfi = 0;
-    if (gtp_h->flags & OGS_GTPU_FLAGS_E) {
-        /*
-         * TS29.281
-         * 5.2.1 General format of the GTP-U Extension Header
-         * Figure 5.2.1-3: Definition of Extension Header Type
-         *
-         * Note 4 : For a GTP-PDU with several Extension Headers, the PDU
-         *          Session Container should be the first Extension Header
-         */
-        ogs_gtp2_extension_header_t *extension_header =
-            (ogs_gtp2_extension_header_t *)(pkbuf->data + OGS_GTPV1U_HEADER_LEN);
-        ogs_assert(extension_header);
-        if (extension_header->type ==
-                OGS_GTP2_EXTENSION_HEADER_TYPE_PDU_SESSION_CONTAINER) {
-            if (extension_header->pdu_type ==
-                OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_UL_PDU_SESSION_INFORMATION) {
-                    ogs_debug("   QFI 0x%x",
-                            extension_header->qos_flow_identifier);
-                    qfi = extension_header->qos_flow_identifier;
-            }
-        }
-    }
-
-    /* Remove GTP header and send packets to TUN interface */
-    len = ogs_gtpu_header_len(pkbuf);
-    if (len < 0) {
-        ogs_error("DROP Cannot decode GTPU packet");
-        ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
-        goto cleanup;
-    }
-    if (gtp_h->type != OGS_GTPU_MSGTYPE_END_MARKER &&
+    if (header_desc.type != OGS_GTPU_MSGTYPE_END_MARKER &&
         pkbuf->len <= len) {
-        ogs_error("DROP Small GTPU packet(type:%d len:%d)", gtp_h->type, len);
+        ogs_error("DROP Small GTPU packet(type:%d len:%d)",
+                header_desc.type, len);
         ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
         goto cleanup;
     }
+
+    ogs_debug("RECV GPU-U Type %d from %s : TEID0x%x",
+            header_desc.type, OGS_ADDR(&from, buf), header_desc.teid);
+
+    /* Remove GTP header and send packets to TUN interface */
     ogs_assert(ogs_pkbuf_pull(pkbuf, len));
 
-    if (gtp_h->type == OGS_GTPU_MSGTYPE_GPDU) {
+    if (header_desc.type == OGS_GTPU_MSGTYPE_GPDU) {
         smf_sess_t *sess = NULL;
         ogs_pfcp_far_t *far = NULL;
 
-        far = ogs_pfcp_far_find_by_teid(teid);
+        far = ogs_pfcp_far_find_by_teid(header_desc.teid);
         if (!far) {
-            ogs_error("No FAR for TEID %d", teid);
+            ogs_error("No FAR for TEID %d", header_desc.teid);
             goto cleanup;
         }
 
@@ -232,8 +205,8 @@
             goto cleanup;
         }
 
-        if (qfi) {
-            ogs_error("QFI%d Found", qfi);
+        if (header_desc.qos_flow_identifier) {
+            ogs_error("QFI%d Found", header_desc.qos_flow_identifier);
             goto cleanup;
         }
 
@@ -247,7 +220,7 @@
             send_router_advertisement(sess, ip6_h->ip6_src.s6_addr);
         }
     } else {
-        ogs_error("DROP Invalid GTPU Type %d", gtp_h->type);
+        ogs_error("DROP Invalid GTPU Type %d", header_desc.type);
         ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
     }
 
@@ -718,20 +691,18 @@
 
     ogs_list_for_each(&sess->pfcp.pdr_list, pdr) {
         if (pdr->src_if == OGS_PFCP_INTERFACE_CP_FUNCTION && pdr->gnode) {
-            ogs_gtp2_header_t gtp_hdesc;
-            ogs_gtp2_extension_header_t ext_hdesc;
+            ogs_gtp2_header_desc_t header_desc;
             ogs_pkbuf_t *newbuf = NULL;
 
-            memset(&gtp_hdesc, 0, sizeof(gtp_hdesc));
-            memset(&ext_hdesc, 0, sizeof(ext_hdesc));
+            memset(&header_desc, 0, sizeof(header_desc));
 
-            gtp_hdesc.type = OGS_GTPU_MSGTYPE_GPDU;
-            gtp_hdesc.teid = pdr->f_teid.teid;
+            header_desc.type = OGS_GTPU_MSGTYPE_GPDU;
+            header_desc.teid = pdr->f_teid.teid;
 
             newbuf = ogs_pkbuf_copy(pkbuf);
             ogs_assert(newbuf);
 
-            ogs_gtp2_send_user_plane(pdr->gnode, &gtp_hdesc, &ext_hdesc, newbuf);
+            ogs_gtp2_send_user_plane(pdr->gnode, &header_desc, newbuf);
 
             ogs_debug("      Send Router Advertisement");
             break;

open5gs_2.6.4.tar.xz/src/smf/gx-path.c -> open5gs_2.6.5.tar.xz/src/smf/gx-path.c Changed

@@ -28,9 +28,12 @@
 
     os0_t       peer_host;          /* Peer Host */
 
-#define MAX_CC_REQUEST_NUMBER 64
+#define NUM_CC_REQUEST_SLOT 4
     smf_sess_t *sess;
-    ogs_gtp_xact_t *xactMAX_CC_REQUEST_NUMBER;
+    struct {
+        uint32_t cc_req_no;
+        ogs_gtp_xact_t *ptr;
+    } xact_dataNUM_CC_REQUEST_SLOT;
 
     uint32_t cc_request_type;
     uint32_t cc_request_number;
@@ -103,6 +106,7 @@
     struct sockaddr_in sin;
     struct sockaddr_in6 sin6;
     uint32_t charging_id;
+    uint32_t req_slot;
 
     ogs_assert(sess);
 
@@ -130,7 +134,7 @@
         ogs_assert(ret == 0);
         ogs_assert(new == 0);
 
-        ogs_debug("    Found GX Session-Id: %s", sess->gx_sid);
+        ogs_debug("    Found Gx Session-Id: %s", sess->gx_sid);
 
         /* Add Session-Id to the message */
         ret = ogs_diam_message_session_id_set(req, (os0_t)sess->gx_sid, sidlen);
@@ -191,11 +195,12 @@
 
     ogs_debug("    CC Request Type%d Number%d",
         sess_data->cc_request_type, sess_data->cc_request_number);
-    ogs_assert(sess_data->cc_request_number <= MAX_CC_REQUEST_NUMBER);
 
     /* Update session state */
     sess_data->sess = sess;
-    sess_data->xactsess_data->cc_request_number = xact;
+    req_slot = sess_data->cc_request_number % NUM_CC_REQUEST_SLOT;
+    sess_data->xact_datareq_slot.ptr = xact;
+    sess_data->xact_datareq_slot.cc_req_no = sess_data->cc_request_number;
 
     /* Set Origin-Host & Origin-Realm */
     ret = fd_msg_add_origin(req, 0);
@@ -499,7 +504,7 @@
         ogs_assert(ret == 0);
 
         /* 3GPP-User-Location-Info, 3GPP TS 29.061 16.4.7.2 22 */
-        smf_fd_msg_avp_add_3gpp_uli(sess, avpch1);
+        smf_fd_msg_avp_add_3gpp_uli(sess, req);
 
         /* Set 3GPP-MS-Timezone */
         if (sess->gtp.ue_timezone.presence &&
@@ -713,7 +718,7 @@
     ogs_gtp_xact_t *xact = NULL;
     smf_sess_t *sess = NULL;
     ogs_diam_gx_message_t *gx_message = NULL;
-    uint32_t cc_request_number = 0;
+    uint32_t req_slot, cc_request_number = 0;
 
     ogs_debug("Credit-Control-Answer");
 
@@ -755,11 +760,13 @@
     ret = fd_msg_avp_hdr(avp, &hdr);
     ogs_assert(ret == 0);
     cc_request_number = hdr->avp_value->i32;
+    req_slot = cc_request_number % NUM_CC_REQUEST_SLOT;
 
     ogs_debug("    CC-Request-Number%d", cc_request_number);
 
-    xact = sess_data->xactcc_request_number;
+    xact = sess_data->xact_datareq_slot.ptr;
     sess = sess_data->sess;
+    ogs_assert(sess_data->xact_datareq_slot.cc_req_no == cc_request_number);
     ogs_assert(sess);
 
     gx_message = ogs_calloc(1, sizeof(ogs_diam_gx_message_t));

open5gs_2.6.4.tar.xz/src/smf/gy-path.c -> open5gs_2.6.5.tar.xz/src/smf/gy-path.c Changed

@@ -29,12 +29,14 @@
 
     os0_t       peer_host;          /* Peer Host */
 
-#define MAX_CC_REQUEST_NUMBER 64
+#define NUM_CC_REQUEST_SLOT 4
+
     smf_sess_t *sess;
     struct {
+        uint32_t cc_req_no;
         bool pfcp;
         void *ptr; /* INITIAL: ogs_gtp_xact_t, UPDATE: ogs_pfcp_xact_t */
-    } xact_dataMAX_CC_REQUEST_NUMBER;
+    } xact_dataNUM_CC_REQUEST_SLOT;
     uint32_t cc_request_type;
     uint32_t cc_request_number;
 
@@ -512,7 +514,7 @@
     }
 
     /* 3GPP-User-Location-Info, 3GPP TS 29.061 16.4.7.2 22 */
-    smf_fd_msg_avp_add_3gpp_uli(sess, avpch1);
+    smf_fd_msg_avp_add_3gpp_uli(sess, (struct msg *)avpch1);
 
     if (sess->smf_ue->imeisv_len > 0) {
         /* User-Equipment-Info, 3GPP TS 32.299 7.1.17 */
@@ -567,7 +569,7 @@
     struct session *session = NULL;
     int new;
     const char *service_context_id = "32251@3gpp.org";
-    uint32_t timestamp;
+    uint32_t timestamp, req_slot;
 
     ogs_assert(xact);
     ogs_assert(sess);
@@ -657,15 +659,16 @@
 
     ogs_debug("    CC Request Type%d Number%d",
         sess_data->cc_request_type, sess_data->cc_request_number);
-    ogs_assert(sess_data->cc_request_number <= MAX_CC_REQUEST_NUMBER);
 
     /* Update session state */
     sess_data->sess = sess;
+    req_slot = sess_data->cc_request_number % NUM_CC_REQUEST_SLOT;
     if (cc_request_type == OGS_DIAM_GY_CC_REQUEST_TYPE_UPDATE_REQUEST)
-        sess_data->xact_datasess_data->cc_request_number.pfcp = true;
+        sess_data->xact_datareq_slot.pfcp = true;
     else
-        sess_data->xact_datasess_data->cc_request_number.pfcp = false;
-    sess_data->xact_datasess_data->cc_request_number.ptr = xact;
+        sess_data->xact_datareq_slot.pfcp = false;
+    sess_data->xact_datareq_slot.cc_req_no = sess_data->cc_request_number;
+    sess_data->xact_datareq_slot.ptr = xact;
 
     /* Origin-Host & Origin-Realm */
     ret = fd_msg_add_origin(req, 0);
@@ -902,7 +905,7 @@
     void *xact = NULL;
     smf_sess_t *sess = NULL;
     ogs_diam_gy_message_t *gy_message = NULL;
-    uint32_t cc_request_number = 0;
+    uint32_t req_slot, cc_request_number = 0;
 
     ogs_debug("GyCredit-Control-Answer");
 
@@ -944,11 +947,12 @@
     ret = fd_msg_avp_hdr(avp, &hdr);
     ogs_assert(ret == 0);
     cc_request_number = hdr->avp_value->i32;
+    req_slot = cc_request_number % NUM_CC_REQUEST_SLOT;
 
     ogs_debug("    CC-Request-Number%d", cc_request_number);
 
-    xact = sess_data->xact_datacc_request_number.ptr;
-    ogs_assert(xact);
+    xact = sess_data->xact_datareq_slot.ptr;
+    ogs_assert(sess_data->xact_datareq_slot.cc_req_no == cc_request_number);
     sess = sess_data->sess;
     ogs_assert(sess);
 
@@ -1106,10 +1110,10 @@
         e->sess = sess;
         e->gy_message = gy_message;
         if (gy_message->cc_request_type == OGS_DIAM_GY_CC_REQUEST_TYPE_UPDATE_REQUEST) {
-            ogs_assert(sess_data->xact_datasess_data->cc_request_number.pfcp == true);
+            ogs_assert(sess_data->xact_datareq_slot.pfcp == true);
             e->pfcp_xact = xact;
         } else {
-            ogs_assert(sess_data->xact_datasess_data->cc_request_number.pfcp == false);
+            ogs_assert(sess_data->xact_datareq_slot.pfcp == false);
             e->gtp_xact = xact;
         }
         rv = ogs_queue_push(ogs_app()->queue, e);

open5gs_2.6.4.tar.xz/src/smf/metrics.c -> open5gs_2.6.5.tar.xz/src/smf/metrics.c Changed

@@ -202,6 +202,14 @@
         .num_labels = OGS_ARRAY_SIZE(labels_slice), \
         .labels = labels_slice, \
     },
+#define SMF_METR_BY_SLICE_CTR_ENTRY(_id, _name, _desc) \
+    _id = { \
+        .type = OGS_METRICS_METRIC_TYPE_COUNTER, \
+        .name = _name, \
+        .description = _desc, \
+        .num_labels = OGS_ARRAY_SIZE(labels_slice), \
+        .labels = labels_slice, \
+    },
 ogs_metrics_spec_t *smf_metrics_spec_by_slice_SMF_METR_BY_SLICE_MAX;
 ogs_hash_t *metrics_hash_by_slice = NULL;   /* hash table for SLICE labels */
 smf_metrics_spec_def_t smf_metrics_spec_def_by_slice_SMF_METR_BY_SLICE_MAX = {
@@ -210,6 +218,14 @@
     SMF_METR_GAUGE_SM_SESSIONNBR,
     "fivegs_smffunction_sm_sessionnbr",
     "Active Sessions")
+SMF_METR_BY_SLICE_CTR_ENTRY(
+    SMF_METR_CTR_SM_PDUSESSIONCREATIONREQ,
+    "fivegs_smffunction_sm_pdusessioncreationreq",
+    "Number of PDU sessions requested to be created by the SMF")
+SMF_METR_BY_SLICE_CTR_ENTRY(
+    SMF_METR_CTR_SM_PDUSESSIONCREATIONSUCC,
+    "fivegs_smffunction_sm_pdusessioncreationsucc",
+    "Number of PDU sessions successfully created by the SMF")
 };
 void smf_metrics_init_by_slice(void);
 int smf_metrics_free_inst_by_slice(ogs_metrics_inst_t **inst);
@@ -259,7 +275,7 @@
         }
 
         if (snssai) {
-            s_nssai = ogs_sbi_s_nssai_to_string_plain(snssai);
+            s_nssai = ogs_sbi_s_nssai_to_string(snssai);
         } else {
             s_nssai = ogs_strdup("");
         }
@@ -361,7 +377,7 @@
         }
 
         if (snssai) {
-            s_nssai = ogs_sbi_s_nssai_to_string_plain(snssai);
+            s_nssai = ogs_sbi_s_nssai_to_string(snssai);
         } else {
             s_nssai = ogs_strdup("");
         }
@@ -411,11 +427,15 @@
     SMF_METR_CTR_SM_N4SESSIONESTABFAIL,
     "fivegs_smffunction_sm_n4sessionestabfail",
     "Number of failed N4 session establishments evidented by SMF")
+SMF_METR_BY_CAUSE_CTR_ENTRY(
+    SMF_METR_CTR_SM_PDUSESSIONCREATIONFAIL,
+    "fivegs_smffunction_sm_pdusessioncreationfail",
+    "Number of PDU sessions failed to be created by the SMF")
 };
 void smf_metrics_init_by_cause(void);
 int smf_metrics_free_inst_by_cause(ogs_metrics_inst_t **inst);
 typedef struct smf_metric_key_by_cause_s {
-    uint8_t                     cause;
+    int                         cause;
     smf_metric_type_by_cause_t  t;
 } smf_metric_key_by_cause_t;
 
@@ -425,7 +445,7 @@
     ogs_assert(metrics_hash_by_cause);
 }
 
-void smf_metrics_inst_by_cause_add(uint8_t cause,
+void smf_metrics_inst_by_cause_add(int cause,
         smf_metric_type_by_cause_t t, int val)
 {
     ogs_metrics_inst_t *metrics = NULL;

open5gs_2.6.4.tar.xz/src/smf/metrics.h -> open5gs_2.6.5.tar.xz/src/smf/metrics.h Changed

open5gs_2.6.4.tar.xz/src/smf/n4-build.c -> open5gs_2.6.5.tar.xz/src/smf/n4-build.c Changed

open5gs_2.6.4.tar.xz/src/smf/n4-handler.c -> open5gs_2.6.5.tar.xz/src/smf/n4-handler.c Changed

@@ -358,8 +358,8 @@
         char *strerror = ogs_msprintf(
                 "PFCP Cause %d : Not Accepted", rsp->cause.u8);
         if (stream)
-            smf_sbi_send_sm_context_update_error(
-                    stream, status, strerror, NULL, NULL, NULL);
+            smf_sbi_send_sm_context_update_error_log(
+                    stream, status, strerror, NULL);
         ogs_error("%s", strerror);
         ogs_free(strerror);
         return;
@@ -369,8 +369,8 @@
 
     if (sess->upf_n3_addr == NULL && sess->upf_n3_addr6 == NULL) {
         if (stream)
-            smf_sbi_send_sm_context_update_error(
-                    stream, status, "No UP F_TEID", NULL, NULL, NULL);
+            smf_sbi_send_sm_context_update_error_log(
+                    stream, status, "No UP F_TEID", NULL);
         return;
     }
 
@@ -401,7 +401,12 @@
                 smf_sbi_send_sm_context_updated_data_up_cnx_state(
                         sess, stream, OpenAPI_up_cnx_state_ACTIVATED);
             } else {
-                ogs_assert(true == ogs_sbi_send_http_status_no_content(stream));
+                int r = smf_sbi_discover_and_send(
+                        OGS_SBI_SERVICE_TYPE_NUDM_UECM, NULL,
+                        smf_nudm_uecm_build_registration,
+                        sess, stream, SMF_UECM_STATE_REGISTERED, NULL);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
         }
 
@@ -694,8 +699,8 @@
         } else if (trigger == OGS_PFCP_DELETE_TRIGGER_UE_REQUESTED ||
             trigger == OGS_PFCP_DELETE_TRIGGER_AMF_UPDATE_SM_CONTEXT) {
             ogs_assert(stream);
-            smf_sbi_send_sm_context_update_error(
-                stream, status, strerror, NULL, NULL, NULL);
+            smf_sbi_send_sm_context_update_error_log(
+                stream, status, strerror, NULL);
         } else if (trigger == OGS_PFCP_DELETE_TRIGGER_AMF_RELEASE_SM_CONTEXT) {
             ogs_assert(stream);
             ogs_assert(true ==

open5gs_2.6.4.tar.xz/src/smf/namf-handler.c -> open5gs_2.6.5.tar.xz/src/smf/namf-handler.c Changed

@@ -106,6 +106,7 @@
 
     case SMF_NETWORK_REQUESTED_PDU_SESSION_RELEASE:
     case SMF_ERROR_INDICATON_RECEIVED_FROM_5G_AN:
+
         N1N2MessageTransferRspData = recvmsg->N1N2MessageTransferRspData;
         if (!N1N2MessageTransferRspData) {
             ogs_error("No N1N2MessageTransferRspData status:%d",
@@ -113,7 +114,37 @@
             break;
         }
 
-        if (recvmsg->res_status == OGS_SBI_HTTP_STATUS_OK) {
+        if (recvmsg->res_status == OGS_SBI_HTTP_STATUS_ACCEPTED) {
+    /*
+     * OpenAPI_n1_n2_message_transfer_cause_ATTEMPTING_TO_REACH_UE and
+     * HTTP_STATUS_ACCEPTED should be handled here when removing PDU session
+     * due to the change of PDU Session Anchor.
+     *
+     * TS23.502
+     * 4.3.4 PDU Session Release
+     * 4.3.4.2 UE or network requested PDU Session Release for Non-Roaming
+     * and Roaming with Local Breakout
+     *
+     * 3b. ...
+     *
+     * The "skip indicator" tells the AMF whether it may skip sending
+     * the N1 SM container to the UE (e.g. when the UE is in CM-IDLE state).
+     * SMF includes the "skip indicator"
+     * in the Namf_Communication_N1N2MessageTransfer
+     * except when the procedure is triggered to change PDU Session Anchor
+     * of a PDU Session with SSC mode 2.
+     *
+     * Related Issue #2396
+     */
+            if (N1N2MessageTransferRspData->cause ==
+                OpenAPI_n1_n2_message_transfer_cause_ATTEMPTING_TO_REACH_UE) {
+                /* Nothing */
+            } else {
+                ogs_error("Not implemented cause:%d",
+                        N1N2MessageTransferRspData->cause);
+                ogs_assert_if_reached();
+            }
+        } else if (recvmsg->res_status == OGS_SBI_HTTP_STATUS_OK) {
             if (N1N2MessageTransferRspData->cause ==
                 OpenAPI_n1_n2_message_transfer_cause_N1_MSG_NOT_TRANSFERRED) {
                 smf_n1_n2_message_transfer_param_t param;

open5gs_2.6.4.tar.xz/src/smf/ngap-handler.c -> open5gs_2.6.5.tar.xz/src/smf/ngap-handler.c Changed

@@ -57,9 +57,9 @@
     if (rv != OGS_OK) {
         ogs_error("%s:%d Cannot decode NGAP message",
                 smf_ue->supi, sess->psi);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No N2 SM Info Type", smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No N2 SM Info Type", smf_ue->supi);
         goto cleanup;
     }
 
@@ -75,19 +75,19 @@
             "%s:%d Unknown NGAP_UPTransportLayerInformation.present %d",
             smf_ue->supi, sess->psi,
             uPTransportLayerInformation->present);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
                 "Unknown NGAP_UPTransportLayerInformation.present",
-                smf_ue->supi, NULL, NULL);
+                smf_ue->supi);
         goto cleanup;
     }
 
     gTPTunnel = uPTransportLayerInformation->choice.gTPTunnel;
     if (!gTPTunnel) {
         ogs_error("%s:%d No GTPTunnel", smf_ue->supi, sess->psi);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No GTPTunnel", smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No GTPTunnel", smf_ue->supi);
         goto cleanup;
     }
 
@@ -95,9 +95,9 @@
             &gTPTunnel->transportLayerAddress, &gnb_n3_ip);
     if (rv != OGS_OK) {
         ogs_error("%s:%d No transportLayerAddress", smf_ue->supi, sess->psi);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No transportLayerAddress", smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No transportLayerAddress", smf_ue->supi);
         goto cleanup;
     }
     ogs_asn_OCTET_STRING_to_uint32(&gTPTunnel->gTP_TEID, &gnb_n3_teid);
@@ -137,9 +137,9 @@
                 dl_far->outer_header_creation.teid = sess->gnb_n3_teid;
             } else {
                 ogs_error("%s:%d No QoS flow", smf_ue->supi, sess->psi);
-                smf_sbi_send_sm_context_update_error(stream,
-                        OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                        "No QoS flow", smf_ue->supi, NULL, NULL);
+                smf_sbi_send_sm_context_update_error_log(
+                        stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                        "No QoS flow", smf_ue->supi);
                 goto cleanup;
             }
         }
@@ -196,9 +196,9 @@
     if (rv != OGS_OK) {
         ogs_error("%s:%d Cannot decode NGAP message",
                 smf_ue->supi, sess->psi);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No N2 SM Info Type", smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No N2 SM Info Type", smf_ue->supi);
         goto cleanup;
     }
 
@@ -296,9 +296,9 @@
     if (rv != OGS_OK) {
         ogs_error("%s:%d Cannot decode NGAP message",
                 smf_ue->supi, sess->psi);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No N2 SM Info Type", smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No N2 SM Info Type", smf_ue->supi);
         goto cleanup;
     }
 
@@ -348,9 +348,9 @@
 
     if (ogs_list_count(&sess->qos_flow_to_modify_list) == 0) {
         ogs_error("%s:%d No QoS flow", smf_ue->supi, sess->psi);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No QoS flow", smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No QoS flow", smf_ue->supi);
         goto cleanup;
     }
 
@@ -400,9 +400,9 @@
     if (rv != OGS_OK) {
         ogs_error("%s:%d Cannot decode NGAP message",
                 smf_ue->supi, sess->psi);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No N2 SM Info Type", smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No N2 SM Info Type", smf_ue->supi);
         goto cleanup;
     }
 
@@ -414,19 +414,18 @@
         ogs_error(
             "%s:%d Unknown dL_NGU_UP_TNLInformation->present %d",
             smf_ue->supi, sess->psi, dL_NGU_UP_TNLInformation->present);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "Unknown dL_NGU_UP_TNLInformation->present",
-                smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "Unknown dL_NGU_UP_TNLInformation->present", smf_ue->supi);
         goto cleanup;
     }
 
     gTPTunnel = dL_NGU_UP_TNLInformation->choice.gTPTunnel;
     if (!gTPTunnel) {
         ogs_error("%s:%d No GTPTunnel", smf_ue->supi, sess->psi);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No GTPTunnel", smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No GTPTunnel", smf_ue->supi);
         goto cleanup;
     }
 
@@ -434,9 +433,9 @@
             &gTPTunnel->transportLayerAddress, &gnb_n3_ip);
     if (rv != OGS_OK) {
         ogs_error("%s:%d No transportLayerAddress", smf_ue->supi, sess->psi);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No transportLayerAddress", smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No transportLayerAddress", smf_ue->supi);
         goto cleanup;
     }
     ogs_asn_OCTET_STRING_to_uint32(&gTPTunnel->gTP_TEID, &gnb_n3_teid);
@@ -474,9 +473,9 @@
                 dl_far->outer_header_creation.teid = sess->gnb_n3_teid;
             } else {
                 ogs_error("%s:%d No QoS flow", smf_ue->supi, sess->psi);
-                smf_sbi_send_sm_context_update_error(stream,
-                        OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                        "No QoS flow", smf_ue->supi, NULL, NULL);
+                smf_sbi_send_sm_context_update_error_log(
+                        stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                        "No QoS flow", smf_ue->supi);
                 goto cleanup;
             }
         }
@@ -528,9 +527,9 @@
     if (rv != OGS_OK) {
         ogs_error("%s:%d Cannot decode NGAP message",
                 smf_ue->supi, sess->psi);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No N2 SM Info Type", smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No N2 SM Info Type", smf_ue->supi);
         goto cleanup;
     }
 
@@ -580,9 +579,9 @@
     if (rv != OGS_OK) {
         ogs_error("%s:%d Cannot decode NGAP message",
                 smf_ue->supi, sess->psi);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No N2 SM Info Type", smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No N2 SM Info Type", smf_ue->supi);
         goto cleanup;
     }
 
@@ -594,19 +593,18 @@
         ogs_error(
             "%s:%d Unknown dL_NGU_UP_TNLInformation->present %d",
             smf_ue->supi, sess->psi, dL_NGU_UP_TNLInformation->present);
-        smf_sbi_send_sm_context_update_error(stream,

open5gs_2.6.4.tar.xz/src/smf/npcf-handler.c -> open5gs_2.6.5.tar.xz/src/smf/npcf-handler.c Changed

@@ -269,16 +269,13 @@
 }
 
 bool smf_npcf_smpolicycontrol_handle_create(
-        smf_sess_t *sess, ogs_sbi_stream_t *stream, int state,
-        ogs_sbi_message_t *recvmsg)
+        smf_sess_t *sess, int state, ogs_sbi_message_t *recvmsg)
 {
     int rv;
     char buf1OGS_ADDRSTRLEN;
     char buf2OGS_ADDRSTRLEN;
 
-    char *strerror = NULL;
     smf_ue_t *smf_ue = NULL;
-
     smf_bearer_t *qos_flow = NULL;
     ogs_pfcp_pdr_t *dl_pdr = NULL;
     ogs_pfcp_pdr_t *ul_pdr = NULL;
@@ -297,23 +294,20 @@
     ogs_sbi_header_t header;
 
     ogs_assert(sess);
-    ogs_assert(stream);
     smf_ue = sess->smf_ue;
     ogs_assert(smf_ue);
 
     ogs_assert(recvmsg);
 
     if (!recvmsg->http.location) {
-        strerror = ogs_msprintf("%s:%d No http.location",
-                smf_ue->supi, sess->psi);
-        goto cleanup;
+        ogs_error("%s:%d No http.location", smf_ue->supi, sess->psi);
+        return false;
     }
 
     SmPolicyDecision = recvmsg->SmPolicyDecision;
     if (!SmPolicyDecision) {
-        strerror = ogs_msprintf("%s:%d No SmPolicyDecision",
-                smf_ue->supi, sess->psi);
-        goto cleanup;
+        ogs_error("%s:%d No SmPolicyDecision", smf_ue->supi, sess->psi);
+        return false;
     }
 
     memset(&header, 0, sizeof(header));
@@ -321,17 +315,17 @@
 
     rv = ogs_sbi_parse_header(&message, &header);
     if (rv != OGS_OK) {
-        strerror = ogs_msprintf("%s:%d Cannot parse http.location %s",
+        ogs_error("%s:%d Cannot parse http.location %s",
                 smf_ue->supi, sess->psi, recvmsg->http.location);
-        goto cleanup;
+        return false;
     }
 
     if (!message.h.resource.component1) {
-        strerror = ogs_msprintf("%s:%d No Assocication ID %s",
+        ogs_error("%s:%d No Assocication ID %s",
                 smf_ue->supi, sess->psi, recvmsg->http.location);
 
         ogs_sbi_header_free(&header);
-        goto cleanup;
+        return false;
     }
 
     if (sess->policy_association_id)
@@ -445,9 +439,8 @@
     /* Check if selected UPF is associated with SMF */
     ogs_assert(sess->pfcp_node);
     if (!OGS_FSM_CHECK(&sess->pfcp_node->sm, smf_pfcp_state_associated)) {
-        strerror = ogs_msprintf("%s:%d No associated UPF",
-                smf_ue->supi, sess->psi);
-        goto cleanup;
+        ogs_error("%s:%d No associated UPF", smf_ue->supi, sess->psi);
+        return false;
     }
 
     /* Remove all previous QoS flow */
@@ -499,6 +492,7 @@
         for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
             const char *route = sess->session.ipv4_framed_routesi;
             if (!route) break;
+
             if (!dl_pdr->ipv4_framed_routes) {
                 dl_pdr->ipv4_framed_routes =
                     ogs_calloc(OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI,
@@ -506,6 +500,14 @@
                 ogs_assert(dl_pdr->ipv4_framed_routes);
             }
             dl_pdr->ipv4_framed_routesi = ogs_strdup(route);
+
+            if (!ul_pdr->ipv4_framed_routes) {
+                ul_pdr->ipv4_framed_routes =
+                    ogs_calloc(OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI,
+                               sizeof(ul_pdr->ipv4_framed_routes0));
+                ogs_assert(ul_pdr->ipv4_framed_routes);
+            }
+            ul_pdr->ipv4_framed_routesi = ogs_strdup(route);
         }
     }
 
@@ -515,6 +517,7 @@
         for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
             const char *route = sess->session.ipv6_framed_routesi;
             if (!route) break;
+
             if (!dl_pdr->ipv6_framed_routes) {
                 dl_pdr->ipv6_framed_routes =
                     ogs_calloc(OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI,
@@ -522,6 +525,14 @@
                 ogs_assert(dl_pdr->ipv6_framed_routes);
             }
             dl_pdr->ipv6_framed_routesi = ogs_strdup(route);
+
+            if (!ul_pdr->ipv6_framed_routes) {
+                ul_pdr->ipv6_framed_routes =
+                    ogs_calloc(OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI,
+                               sizeof(ul_pdr->ipv6_framed_routes0));
+                ogs_assert(ul_pdr->ipv6_framed_routes);
+            }
+            ul_pdr->ipv6_framed_routesi = ogs_strdup(route);
         }
     }
 
@@ -633,17 +644,6 @@
             smf_5gc_pfcp_send_session_establishment_request(sess, 0));
 
     return true;
-
-cleanup:
-    ogs_assert(strerror);
-
-    ogs_error("%s", strerror);
-    ogs_assert(true ==
-        ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-            recvmsg, strerror, NULL));
-    ogs_free(strerror);
-
-    return false;
 }
 
 bool smf_npcf_smpolicycontrol_handle_update_notify(
@@ -713,13 +713,19 @@
 
     ogs_assert(true == ogs_sbi_send_http_status_no_content(stream));
 
-    memset(&param, 0, sizeof(param));
-    r = smf_sbi_discover_and_send(
-            OGS_SBI_SERVICE_TYPE_NPCF_SMPOLICYCONTROL, NULL,
-            smf_npcf_smpolicycontrol_build_delete,
-            sess, NULL, OGS_PFCP_DELETE_TRIGGER_PCF_INITIATED, &param);
-    ogs_expect(r == OGS_OK);
-    ogs_assert(r != OGS_ERROR);
+    if (sess->policy_association_id) {
+        memset(&param, 0, sizeof(param));
+        r = smf_sbi_discover_and_send(
+                OGS_SBI_SERVICE_TYPE_NPCF_SMPOLICYCONTROL, NULL,
+                smf_npcf_smpolicycontrol_build_delete,
+                sess, NULL, OGS_PFCP_DELETE_TRIGGER_PCF_INITIATED, &param);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
+    } else {
+        ogs_error("%s:%d No PolicyAssociationId. Forcibly remove SESSION",
+                smf_ue->supi, sess->psi);
+        SMF_SESS_CLEAR(sess);
+    }
 
     return true;
 }

open5gs_2.6.4.tar.xz/src/smf/npcf-handler.h -> open5gs_2.6.5.tar.xz/src/smf/npcf-handler.h Changed

open5gs_2.6.4.tar.xz/src/smf/nsmf-handler.c -> open5gs_2.6.5.tar.xz/src/smf/nsmf-handler.c Changed

@@ -55,7 +55,7 @@
         ogs_error("%s:%d No SmContextCreateData",
                 smf_ue->supi, sess->psi);
         smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
                 "No SmContextCreateData", smf_ue->supi, NULL);
         return false;
     }
@@ -64,7 +64,7 @@
     if (!n1SmMsg || !n1SmMsg->content_id) {
         ogs_error("%s:%d No n1SmMsg", smf_ue->supi, sess->psi);
         smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
                 "No n1SmMsg", smf_ue->supi, NULL);
         return false;
     }
@@ -74,7 +74,7 @@
         ogs_error("%s:%d No N1 SM Content %s",
                 smf_ue->supi, sess->psi, n1SmMsg->content_id);
         smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
                 "No N1 SM Content", smf_ue->supi, NULL);
         return false;
     }
@@ -86,7 +86,7 @@
     if (sess->pti == OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED) {
         ogs_error("%s:%d No PTI", smf_ue->supi, sess->psi);
         smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
                 "No PTI", smf_ue->supi, NULL);
         return false;
 
@@ -98,7 +98,7 @@
         n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
             OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
         smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
                 "No sNssai", smf_ue->supi, n1smbuf);
         return false;
     }
@@ -110,7 +110,7 @@
         n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
             OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
         smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
                 "No servingNetwork", smf_ue->supi, n1smbuf);
         return false;
     }
@@ -121,7 +121,7 @@
         n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
             OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
         smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
                 "No UeLocation", smf_ue->supi, n1smbuf);
         return false;
     }
@@ -135,7 +135,7 @@
         n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
             OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
         smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
                 "No UeLocation", smf_ue->supi, n1smbuf);
         return false;
     }
@@ -146,7 +146,7 @@
         n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
             OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
         smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
                 "No SmContextStatusNotification", smf_ue->supi, n1smbuf);
         return false;
     }
@@ -160,7 +160,8 @@
         n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
             OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
         smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST, "Invalid URI",
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
+                "Invalid URI",
                 SmContextCreateData->sm_context_status_uri, n1smbuf);
         return false;
     }
@@ -238,6 +239,8 @@
 
     smf_metrics_inst_by_slice_add(&sess->plmn_id, &sess->s_nssai,
             SMF_METR_GAUGE_SM_SESSIONNBR, 1);
+    smf_metrics_inst_by_slice_add(&sess->plmn_id, &sess->s_nssai,
+            SMF_METR_CTR_SM_PDUSESSIONCREATIONREQ, 1);
 
     if (sess->sm_context_status_uri)
         ogs_free(sess->sm_context_status_uri);
@@ -312,9 +315,9 @@
     if (!SmContextUpdateData) {
         ogs_error("%s:%d No SmContextUpdateData",
                 smf_ue->supi, sess->psi);
-        smf_sbi_send_sm_context_update_error(stream,
-                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                "No SmContextUpdateData", smf_ue->supi, NULL, NULL);
+        smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                "No SmContextUpdateData", smf_ue->supi);
         return false;
     }
 
@@ -344,9 +347,9 @@
         n1SmMsg = SmContextUpdateData->n1_sm_msg;
         if (!n1SmMsg || !n1SmMsg->content_id) {
             ogs_error("%s:%d No n1SmMsg", smf_ue->supi, sess->psi);
-            smf_sbi_send_sm_context_update_error(stream,
-                    OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                    "No n1SmMsg", smf_ue->supi, NULL, NULL);
+            smf_sbi_send_sm_context_update_error_log(
+                    stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                    "No n1SmMsg", smf_ue->supi);
             return false;
         }
 
@@ -354,9 +357,9 @@
         if (!n1smbuf) {
             ogs_error("%s:%d No N1 SM Content %s",
                     smf_ue->supi, sess->psi, n1SmMsg->content_id);
-            smf_sbi_send_sm_context_update_error(stream,
-                    OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                    "No N1 SM Content", smf_ue->supi, NULL, NULL);
+            smf_sbi_send_sm_context_update_error_log(
+                    stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                    "No N1 SM Content", smf_ue->supi);
             return false;
         }
 
@@ -383,9 +386,9 @@
 
         if (!SmContextUpdateData->n2_sm_info_type) {
             ogs_error("%s:%d No n2SmInfoType", smf_ue->supi, sess->psi);
-            smf_sbi_send_sm_context_update_error(stream,
-                    OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                    "No n2SmInfoType", smf_ue->supi, NULL, NULL);
+            smf_sbi_send_sm_context_update_error_log(
+                    stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                    "No n2SmInfoType", smf_ue->supi);
             return false;
         }
 
@@ -393,18 +396,18 @@
         if (!n2SmMsg || !n2SmMsg->content_id) {
             ogs_error("%s:%d No N2SmInfo.content_id",
                     smf_ue->supi, sess->psi);
-            smf_sbi_send_sm_context_update_error(stream,
-                    OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                    "No n2SmInfo.content_id", smf_ue->supi, NULL, NULL);
+            smf_sbi_send_sm_context_update_error_log(
+                    stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                    "No n2SmInfo.content_id", smf_ue->supi);
             return false;
         }
 
         n2smbuf = ogs_sbi_find_part_by_content_id(message, n2SmMsg->content_id);
         if (!n2smbuf) {
             ogs_error("%s:%d No N2 SM Content", smf_ue->supi, sess->psi);
-            smf_sbi_send_sm_context_update_error(stream,
-                    OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                    "No N2 SM Content", smf_ue->supi, NULL, NULL);
+            smf_sbi_send_sm_context_update_error_log(
+                    stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                    "No N2 SM Content", smf_ue->supi);
             return false;
         }
 
@@ -462,9 +465,8 @@
             OpenAPI_sm_context_updated_data_t SmContextUpdatedData;
             OpenAPI_ref_to_binary_data_t n2SmInfo;
 
+            if (!OGS_FSM_CHECK(&sess->sm, smf_gsm_state_operational)) {
             /*
-             * TODO :
-             *
              * TS29.502 5.2.2.3.2.2
              * Activation of User Plane connectivity of PDU session
              *
@@ -490,14 +492,23 @@
              * TS23.502 4.2.3
              * Service Request Procedures
              *
-             * 8a. If the SMF find the PDU Session is activated
-             * when receiving the Nsmf_PDUSession_UpdateSMContext Request
-             * in step 4 with Operation Type set to "UP activate"
-             * to indicate establishment of User Plane resources
-             * for the PDU Session(s), it deletes the AN Tunnel Info
-             * and initiates an N4 Session Modification procedure
-             * to remove Tunnel Info of AN in the UPF.
+             * 11. ...

open5gs_2.6.4.tar.xz/src/smf/nudm-build.c -> open5gs_2.6.5.tar.xz/src/smf/nudm-build.c Changed

@@ -49,3 +49,105 @@
 
     return request;
 }
+
+ogs_sbi_request_t *smf_nudm_uecm_build_registration(
+        smf_sess_t *sess, void *data)
+{
+    smf_ue_t *smf_ue = NULL;
+    ogs_sbi_message_t message;
+    ogs_sbi_request_t *request = NULL;
+
+    OpenAPI_smf_registration_t SmfRegistration;
+    OpenAPI_snssai_t single_nssai;
+
+    ogs_assert(sess);
+    ogs_assert(sess->psi);
+    smf_ue = sess->smf_ue;
+    ogs_assert(smf_ue);
+    ogs_assert(smf_ue->supi);
+
+    memset(&message, 0, sizeof(message));
+
+    memset(&SmfRegistration, 0, sizeof(SmfRegistration));
+    message.SmfRegistration = &SmfRegistration;
+
+    memset(&single_nssai, 0, sizeof(single_nssai));
+    SmfRegistration.single_nssai = &single_nssai;
+
+    message.h.method = (char *)OGS_SBI_HTTP_METHOD_PUT;
+    message.h.service.name = (char *)OGS_SBI_SERVICE_NAME_NUDM_UECM;
+    message.h.api.version = (char *)OGS_SBI_API_V1;
+    message.h.resource.component0 = smf_ue->supi;
+    message.h.resource.component1 =
+        (char *)OGS_SBI_RESOURCE_NAME_REGISTRATIONS;
+    message.h.resource.component2 =
+        (char *)OGS_SBI_RESOURCE_NAME_SMF_REGISTRATIONS;
+    message.h.resource.component3 = ogs_msprintf("%d", sess->psi);
+    if (!message.h.resource.component3) {
+        ogs_error("No memory : message.h.resource.component3");
+        goto end;
+    }
+
+    SmfRegistration.smf_instance_id =
+        NF_INSTANCE_ID(ogs_sbi_self()->nf_instance);
+    SmfRegistration.pdu_session_id = sess->psi;
+
+    single_nssai.sst = sess->s_nssai.sst;
+    single_nssai.sd = ogs_s_nssai_sd_to_string(sess->s_nssai.sd);
+
+    SmfRegistration.dnn = sess->session.name;
+
+    SmfRegistration.plmn_id = ogs_sbi_build_plmn_id(&sess->plmn_id);
+    if (!SmfRegistration.plmn_id) {
+        ogs_error("No memory : SmfRegistration.plmn_id");
+        goto end;
+    }
+
+    request = ogs_sbi_build_request(&message);
+    ogs_expect(request);
+
+end:
+    ogs_free(message.h.resource.component3);
+    ogs_free(single_nssai.sd);
+    ogs_sbi_free_plmn_id(SmfRegistration.plmn_id);
+
+    return request;
+}
+
+ogs_sbi_request_t *smf_nudm_uecm_build_deregistration(
+        smf_sess_t *sess, void *data)
+{
+    smf_ue_t *smf_ue = NULL;
+    ogs_sbi_message_t message;
+    ogs_sbi_request_t *request = NULL;
+
+    ogs_assert(sess);
+    ogs_assert(sess->psi);
+    smf_ue = sess->smf_ue;
+    ogs_assert(smf_ue);
+    ogs_assert(smf_ue->supi);
+
+    memset(&message, 0, sizeof(message));
+
+    message.h.method = (char *)OGS_SBI_HTTP_METHOD_DELETE;
+    message.h.service.name = (char *)OGS_SBI_SERVICE_NAME_NUDM_UECM;
+    message.h.api.version = (char *)OGS_SBI_API_V1;
+    message.h.resource.component0 = smf_ue->supi;
+    message.h.resource.component1 =
+        (char *)OGS_SBI_RESOURCE_NAME_REGISTRATIONS;
+    message.h.resource.component2 =
+        (char *)OGS_SBI_RESOURCE_NAME_SMF_REGISTRATIONS;
+    message.h.resource.component3 = ogs_msprintf("%d", sess->psi);
+    if (!message.h.resource.component3) {
+        ogs_error("No memory : message.h.resource.component3");
+        goto end;
+    }
+
+    request = ogs_sbi_build_request(&message);
+    ogs_expect(request);
+
+end:
+    ogs_free(message.h.resource.component3);
+
+    return request;
+}

open5gs_2.6.4.tar.xz/src/smf/nudm-build.h -> open5gs_2.6.5.tar.xz/src/smf/nudm-build.h Changed

open5gs_2.6.4.tar.xz/src/smf/nudm-handler.c -> open5gs_2.6.5.tar.xz/src/smf/nudm-handler.c Changed

@@ -25,6 +25,7 @@
 {
     int r;
     char *strerror = NULL;
+    uint8_t cause_value = 0;
     smf_ue_t *smf_ue = NULL;
     ogs_pkbuf_t *n1smbuf = NULL;
 
@@ -95,7 +96,8 @@
 
         ogs_warn("%s", strerror);
         smf_sbi_send_sm_context_create_error(stream,
-                OGS_SBI_HTTP_STATUS_NOT_FOUND, strerror, NULL, n1smbuf);
+                OGS_SBI_HTTP_STATUS_NOT_FOUND, OGS_SBI_APP_ERRNO_NULL,
+                strerror, NULL, n1smbuf);
         ogs_free(strerror);
 
         return false;
@@ -306,7 +308,27 @@
     }
 
     /* Set UE IP Address to the Default DL PDR */
-    ogs_assert(OGS_PFCP_CAUSE_REQUEST_ACCEPTED == smf_sess_set_ue_ip(sess));
+    cause_value = smf_sess_set_ue_ip(sess);
+
+    if (cause_value == OGS_PFCP_CAUSE_NO_RESOURCES_AVAILABLE) {
+        strerror = ogs_msprintf("%s:%d No IP addresses available",
+                smf_ue->supi, sess->psi);
+        ogs_assert(strerror);
+
+        n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
+            OGS_5GSM_CAUSE_INSUFFICIENT_RESOURCES_FOR_SPECIFIC_SLICE_AND_DNN);
+        ogs_assert(n1smbuf);
+
+        ogs_warn("%s", strerror);
+        smf_sbi_send_sm_context_create_error(stream,
+                OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR,
+                OGS_SBI_APP_ERRNO_NULL, strerror, NULL, n1smbuf);
+        ogs_free(strerror);
+
+        return false;
+    }
+
+    ogs_assert(cause_value == OGS_PFCP_CAUSE_REQUEST_ACCEPTED);
 
     /*********************************************************************
      * Send HTTP_STATUS_CREATED(/nsmf-pdusession/v1/sm-context) to the AMF
@@ -332,6 +354,9 @@
     ogs_assert(response);
     ogs_assert(true == ogs_sbi_server_send_response(stream, response));
 
+    smf_metrics_inst_by_slice_add(&sess->plmn_id, &sess->s_nssai,
+            SMF_METR_CTR_SM_PDUSESSIONCREATIONSUCC, 1);
+
     ogs_free(sendmsg.http.location);
 
     r = smf_sbi_discover_and_send(

open5gs_2.6.4.tar.xz/src/smf/pfcp-path.c -> open5gs_2.6.5.tar.xz/src/smf/pfcp-path.c Changed

@@ -145,7 +145,12 @@
     node = ogs_pfcp_node_find(&ogs_pfcp_self()->pfcp_peer_list, &from);
     if (!node) {
         node = ogs_pfcp_node_add(&ogs_pfcp_self()->pfcp_peer_list, &from);
-        ogs_assert(node);
+        if (!node) {
+            ogs_error("No memory: ogs_pfcp_node_add() failed");
+            ogs_pkbuf_free(e->pkbuf);
+            ogs_event_free(e);
+            return;
+        }
 
         node->sock = data;
         pfcp_node_fsm_init(node, false);
@@ -211,6 +216,8 @@
     uint8_t type;
     int trigger;
     char *strerror = NULL;
+    smf_event_t *e = NULL;
+    int rv;
 
     ogs_assert(xact);
     ogs_assert(data);
@@ -225,7 +232,19 @@
 
     switch (type) {
     case OGS_PFCP_SESSION_ESTABLISHMENT_REQUEST_TYPE:
-        ogs_error("No PFCP session establishment response");
+        ogs_warn("No PFCP session establishment response");
+
+        e = smf_event_new(SMF_EVT_N4_TIMER);
+        ogs_assert(e);
+        e->sess = sess;
+        e->h.timer_id = SMF_TIMER_PFCP_NO_ESTABLISHMENT_RESPONSE;
+        e->pfcp_node = sess->pfcp_node;
+
+        rv = ogs_queue_push(ogs_app()->queue, e);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_queue_push() failed:%d", (int)rv);
+            ogs_event_free(e);
+        }
         break;
     case OGS_PFCP_SESSION_MODIFICATION_REQUEST_TYPE:
         strerror = ogs_msprintf("%s:%d No PFCP session modification response",
@@ -234,9 +253,8 @@
 
         ogs_error("%s", strerror);
         if (stream) {
-            smf_sbi_send_sm_context_update_error(stream,
-                    OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT,
-                    strerror, NULL, NULL, NULL);
+            smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, strerror, NULL);
         }
         ogs_free(strerror);
         break;

open5gs_2.6.4.tar.xz/src/smf/pfcp-sm.c -> open5gs_2.6.5.tar.xz/src/smf/pfcp-sm.c Changed

@@ -73,6 +73,7 @@
     ogs_pfcp_message_t *message = NULL;
 
     ogs_sockaddr_t *addr = NULL;
+    smf_sess_t *sess;
 
     ogs_assert(s);
     ogs_assert(e);
@@ -115,6 +116,15 @@
 
             ogs_pfcp_cp_send_association_setup_request(node, node_timeout);
             break;
+        case SMF_TIMER_PFCP_NO_ESTABLISHMENT_RESPONSE:
+            sess = e->sess;
+            sess = smf_sess_cycle(sess);
+            if (!sess) {
+                ogs_warn("Session has already been removed");
+                break;
+            }
+            ogs_fsm_dispatch(&sess->sm, e);
+            break;
         default:
             ogs_error("Unknown timer%s:%d",
                     smf_timer_get_name(e->h.timer_id), e->h.timer_id);
@@ -373,6 +383,15 @@
             ogs_assert(OGS_OK ==
                 ogs_pfcp_send_heartbeat_request(node, node_timeout));
             break;
+        case SMF_TIMER_PFCP_NO_ESTABLISHMENT_RESPONSE:
+            sess = e->sess;
+            sess = smf_sess_cycle(sess);
+            if (!sess) {
+                ogs_warn("Session has already been removed");
+                break;
+            }
+            ogs_fsm_dispatch(&sess->sm, e);
+            break;
         default:
             ogs_error("Unknown timer%s:%d",
                     smf_timer_get_name(e->h.timer_id), e->h.timer_id);
@@ -480,30 +499,36 @@
     }
 
     ogs_list_for_each(&smf_self()->smf_ue_list, smf_ue) {
-        smf_sess_t *sess = NULL;
-        ogs_assert(smf_ue);
+        smf_sess_t *sess = NULL, *next_sess = NULL;
 
-        ogs_list_for_each(&smf_ue->sess_list, sess) {
-            ogs_assert(sess);
+        ogs_list_for_each_safe(&smf_ue->sess_list, next_sess, sess) {
 
             if (node == sess->pfcp_node) {
                 if (sess->epc) {
                     ogs_error("%s:%s EPC restoration is not implemented",
                             smf_ue->imsi_bcd, sess->session.name);
                 } else {
-                    smf_npcf_smpolicycontrol_param_t param;
+                    if (sess->policy_association_id) {
+                        smf_npcf_smpolicycontrol_param_t param;
 
-                    ogs_info("%s:%d SMF-initiated Deletion",
-                            smf_ue->supi, sess->psi);
-                    ogs_assert(sess->sm_context_ref);
-                    memset(&param, 0, sizeof(param));
-                    r = smf_sbi_discover_and_send(
-                            OGS_SBI_SERVICE_TYPE_NPCF_SMPOLICYCONTROL, NULL,
-                            smf_npcf_smpolicycontrol_build_delete,
-                            sess, NULL, OGS_PFCP_DELETE_TRIGGER_SMF_INITIATED,
-                            &param);
-                    ogs_expect(r == OGS_OK);
-                    ogs_assert(r != OGS_ERROR);
+                        ogs_info("%s:%d SMF-initiated Deletion",
+                                smf_ue->supi, sess->psi);
+                        ogs_assert(sess->sm_context_ref);
+                        memset(&param, 0, sizeof(param));
+                        r = smf_sbi_discover_and_send(
+                                OGS_SBI_SERVICE_TYPE_NPCF_SMPOLICYCONTROL, NULL,
+                                smf_npcf_smpolicycontrol_build_delete,
+                                sess, NULL,
+                                OGS_PFCP_DELETE_TRIGGER_SMF_INITIATED,
+                                &param);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
+                    } else {
+                        ogs_error("%s:%d No PolicyAssociationId. "
+                                "Forcibly remove SESSION",
+                                smf_ue->supi, sess->psi);
+                        SMF_SESS_CLEAR(sess);
+                    }
                 }
             }
         }

open5gs_2.6.4.tar.xz/src/smf/sbi-path.c -> open5gs_2.6.5.tar.xz/src/smf/sbi-path.c Changed

@@ -62,11 +62,13 @@
 
     /* Setup Subscription-Data */
     ogs_sbi_subscription_spec_add(
-            OpenAPI_nf_type_AMF, OGS_SBI_SERVICE_NAME_NAMF_COMM);
+            OpenAPI_nf_type_NULL, OGS_SBI_SERVICE_NAME_NAMF_COMM);
     ogs_sbi_subscription_spec_add(
-            OpenAPI_nf_type_PCF, OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL);
+            OpenAPI_nf_type_NULL, OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL);
     ogs_sbi_subscription_spec_add(
-            OpenAPI_nf_type_UDM, OGS_SBI_SERVICE_NAME_NUDM_SDM);
+            OpenAPI_nf_type_NULL, OGS_SBI_SERVICE_NAME_NUDM_SDM);
+    ogs_sbi_subscription_spec_add(
+            OpenAPI_nf_type_NULL, OGS_SBI_SERVICE_NAME_NUDM_UECM);
 
     if (ogs_sbi_server_start_all(ogs_sbi_server_handler) != OGS_OK)
         return OGS_ERROR;
@@ -109,10 +111,11 @@
             (ogs_sbi_build_f)build, sess, data);
     if (!xact) {
         ogs_error("smf_sbi_discover_and_send() failed");
-        ogs_assert(true ==
-            ogs_sbi_server_send_error(stream,
-                OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL,
-                "Cannot discover", smf_ue->supi));
+        if (stream)
+            ogs_assert(true ==
+                ogs_sbi_server_send_error(stream,
+                    OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL,
+                    "Cannot discover", smf_ue->supi));
         return OGS_ERROR;
     }
 
@@ -175,9 +178,24 @@
     }
 }
 
+void smf_namf_comm_send_n1_n2_pdu_establishment_reject(
+        smf_sess_t *sess)
+{
+    smf_n1_n2_message_transfer_param_t param;
+
+    memset(&param, 0, sizeof(param));
+    param.state = SMF_NETWORK_REQUESTED_PDU_SESSION_RELEASE;
+    param.n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
+        OGS_5GSM_CAUSE_NETWORK_FAILURE);
+    ogs_assert(param.n1smbuf);
+
+    smf_namf_comm_send_n1_n2_message_transfer(sess, &param);
+}
+
 void smf_sbi_send_sm_context_create_error(
         ogs_sbi_stream_t *stream,
-        int status, const char *title, const char *detail,
+        int status, ogs_sbi_app_errno_e err,
+        const char *title, const char *detail,
         ogs_pkbuf_t *n1smbuf)
 {
     ogs_sbi_message_t sendmsg;
@@ -196,6 +214,8 @@
     }
     problem.title = (char*)title;
     problem.detail = (char*)detail;
+    if (err > OGS_SBI_APP_ERRNO_NULL && err < OGS_SBI_MAX_NUM_OF_APP_ERRNO)
+        problem.cause = (char*)ogs_sbi_app_strerror(err);
 
     memset(&sendmsg, 0, sizeof(sendmsg));
     sendmsg.SmContextCreateError = &SmContextCreateError;
@@ -216,6 +236,9 @@
     ogs_assert(response);
     ogs_assert(true == ogs_sbi_server_send_response(stream, response));
 
+    smf_metrics_inst_by_cause_add(problem.status,
+            SMF_METR_CTR_SM_PDUSESSIONCREATIONFAIL, 1);
+
     if (n1smbuf)
         ogs_pkbuf_free(n1smbuf);
 }
@@ -294,8 +317,11 @@
 
 void smf_sbi_send_sm_context_update_error(
         ogs_sbi_stream_t *stream,
-        int status, const char *title, const char *detail,
-        ogs_pkbuf_t *n1smbuf, ogs_pkbuf_t *n2smbuf)
+        int status, ogs_sbi_app_errno_e err,
+        const char *title, const char *detail,
+        ogs_pkbuf_t *n1smbuf, ogs_pkbuf_t *n2smbuf,
+        OpenAPI_n2_sm_info_type_e n2_sm_info_type,
+        OpenAPI_up_cnx_state_e up_cnx_state)
 {
     ogs_sbi_message_t sendmsg;
     ogs_sbi_response_t *response = NULL;
@@ -314,6 +340,8 @@
     }
     problem.title = (char*)title;
     problem.detail = (char*)detail;
+    if (err > OGS_SBI_APP_ERRNO_NULL && err < OGS_SBI_MAX_NUM_OF_APP_ERRNO)
+        problem.cause = (char*)ogs_sbi_app_strerror(err);
 
     memset(&sendmsg, 0, sizeof(sendmsg));
     sendmsg.SmContextUpdateError = &SmContextUpdateError;
@@ -343,6 +371,9 @@
         sendmsg.num_of_part++;
     }
 
+    SmContextUpdateError.n2_sm_info_type = n2_sm_info_type;
+    SmContextUpdateError.up_cnx_state = up_cnx_state;
+
     response = ogs_sbi_build_response(&sendmsg, problem.status);
     ogs_assert(response);
     ogs_assert(true == ogs_sbi_server_send_response(stream, response));

open5gs_2.6.4.tar.xz/src/smf/sbi-path.h -> open5gs_2.6.5.tar.xz/src/smf/sbi-path.h Changed

@@ -43,10 +43,13 @@
 
 void smf_namf_comm_send_n1_n2_message_transfer(
         smf_sess_t *sess, smf_n1_n2_message_transfer_param_t *param);
+void smf_namf_comm_send_n1_n2_pdu_establishment_reject(
+        smf_sess_t *sess);
 
 void smf_sbi_send_sm_context_create_error(
         ogs_sbi_stream_t *stream,
-        int status, const char *title, const char *detail,
+        int status, ogs_sbi_app_errno_e err,
+        const char *title, const char *detail,
         ogs_pkbuf_t *n1smbuf);
 
 #define smf_sbi_send_sm_context_updated_data_up_cnx_state( \
@@ -72,10 +75,31 @@
         ogs_pkbuf_t *n1smbuf,
         OpenAPI_n2_sm_info_type_e n2type, ogs_pkbuf_t *n2smbuf);
 
+#define smf_sbi_send_sm_context_update_error_log( \
+        __sTREAM,  __sTATUS, __tITLE, __dETAIL) \
+        smf_sbi_send_sm_context_update_error( \
+                __sTREAM, __sTATUS, OGS_SBI_APP_ERRNO_NULL, \
+                __tITLE, __dETAIL, NULL, NULL, \
+                OpenAPI_n2_sm_info_type_NULL, OpenAPI_up_cnx_state_NULL)
+#define smf_sbi_send_sm_context_update_error_n1_n2_message( \
+        __sTREAM,  __sTATUS, __n1SmBuf, __n2Type, __n2SmBuf) \
+        smf_sbi_send_sm_context_update_error( \
+                __sTREAM, __sTATUS, OGS_SBI_APP_ERRNO_NULL, \
+                NULL, NULL, __n1SmBuf, __n2SmBuf, __n2Type, \
+                OpenAPI_up_cnx_state_NULL)
+#define smf_sbi_send_sm_context_update_app_error( \
+        __sTREAM,  __sTATUS, __aPPError, __uPCnxState) \
+        smf_sbi_send_sm_context_update_error( \
+                __sTREAM, __sTATUS, __aPPError, \
+                NULL, NULL, NULL, NULL, \
+                OpenAPI_n2_sm_info_type_NULL, __uPCnxState);
 void smf_sbi_send_sm_context_update_error(
         ogs_sbi_stream_t *stream,
-        int status, const char *title, const char *detail,
-        ogs_pkbuf_t *n1smbuf, ogs_pkbuf_t *n2smbuf);
+        int status, ogs_sbi_app_errno_e err,
+        const char *title, const char *detail,
+        ogs_pkbuf_t *n1smbuf, ogs_pkbuf_t *n2smbuf,
+        OpenAPI_n2_sm_info_type_e n2_sm_info_type,
+        OpenAPI_up_cnx_state_e up_cnx_state);
 
 bool smf_sbi_send_sm_context_status_notify(smf_sess_t *sess);

open5gs_2.6.4.tar.xz/src/smf/smf-sm.c -> open5gs_2.6.5.tar.xz/src/smf/smf-sm.c Changed

@@ -508,11 +508,10 @@
                         if (!sbi_message.h.resource.component1) {
                             ogs_error("No smContextRef %s",
                                     sbi_message.h.resource.component1);
-                            smf_sbi_send_sm_context_update_error(stream,
-                                    OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                            smf_sbi_send_sm_context_update_error_log(
+                                    stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
                                     "No smContextRef",
-                                    sbi_message.h.resource.component1,
-                                    NULL, NULL);
+                                    sbi_message.h.resource.component1);
                             break;
                         }
 
@@ -521,15 +520,26 @@
 
                         if (!sess) {
                             ogs_warn("Not found %s", sbi_message.h.uri);
-                            smf_sbi_send_sm_context_update_error(stream,
-                                    OGS_SBI_HTTP_STATUS_NOT_FOUND, "Not found",
-                                    sbi_message.h.uri, NULL, NULL);
+                            smf_sbi_send_sm_context_update_error_log(
+                                    stream, OGS_SBI_HTTP_STATUS_NOT_FOUND,
+                                    "Not found", sbi_message.h.uri);
                         }
                         break;
 
                     DEFAULT
                         sess = smf_sess_add_by_sbi_message(&sbi_message);
-                        ogs_assert(sess);
+                        if (!sess) {
+                            ogs_error("smf_sess_add_by_sbi_message() failed");
+                            smf_sbi_send_sm_context_create_error(stream,
+                                    OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                                    OGS_SBI_APP_ERRNO_NULL,
+                                    "smf_sess_add_by_sbi_message() failed",
+                                    NULL, NULL);
+                            break;
+                        }
+
+                        smf_metrics_inst_by_slice_add(NULL, NULL,
+                                SMF_METR_CTR_SM_PDUSESSIONCREATIONREQ, 1);
                     END
                     break;
 
@@ -789,9 +799,7 @@
                 ogs_error("Session has already been removed");
                 break;
             }
-            smf_ue = sess->smf_ue;
-            ogs_assert(smf_ue);
-            smf_ue = smf_ue_cycle(smf_ue);
+            smf_ue = smf_ue_cycle(sess->smf_ue);
             ogs_assert(smf_ue);
             ogs_assert(OGS_FSM_STATE(&sess->sm));
 
@@ -801,6 +809,88 @@
             ogs_fsm_dispatch(&sess->sm, e);
             break;
 
+        CASE(OGS_SBI_SERVICE_NAME_NUDM_UECM)
+            int state = 0;
+            bool unknown_res_status = false;
+
+            sbi_xact = e->h.sbi.data;
+            ogs_assert(sbi_xact);
+
+            sbi_xact = ogs_sbi_xact_cycle(sbi_xact);
+            if (!sbi_xact) {
+                /* CLIENT_WAIT timer could remove SBI transaction
+                 * before receiving SBI message */
+                ogs_error("SBI transaction has already been removed");
+                break;
+            }
+
+            sess = (smf_sess_t *)sbi_xact->sbi_object;
+            ogs_assert(sess);
+
+            stream = sbi_xact->assoc_stream;
+            state = sbi_xact->state;
+            ogs_assert(state);
+
+            ogs_sbi_xact_remove(sbi_xact);
+
+            sess = smf_sess_cycle(sess);
+            if (!sess) {
+                ogs_error("Session has already been removed");
+                break;
+            }
+            smf_ue = smf_ue_cycle(sess->smf_ue);
+            ogs_assert(smf_ue);
+
+            if (state == SMF_UECM_STATE_REGISTERED) {
+                /* SMF Registration */
+                if (sbi_message.res_status != OGS_SBI_HTTP_STATUS_OK &&
+                    sbi_message.res_status != OGS_SBI_HTTP_STATUS_CREATED)
+                    unknown_res_status = true;
+            } else if (state == SMF_UECM_STATE_DEREGISTERED_BY_AMF ||
+                        state == SMF_UECM_STATE_DEREGISTERED_BY_N1_N2_RELEASE) {
+                /* SMF Deregistration */
+                if (sbi_message.res_status != OGS_SBI_HTTP_STATUS_NO_CONTENT)
+                    unknown_res_status = true;
+            } else {
+                ogs_fatal("Unknown state %d", state);
+                ogs_assert_if_reached();
+            }
+
+            if (unknown_res_status == true) {
+                char *strerror = ogs_msprintf(
+                    "%s:%d HTTP response error %d state %d",
+                    smf_ue->supi, sess->psi, sbi_message.res_status, state);
+                ogs_assert(strerror);
+
+                ogs_error("%s", strerror);
+                if (stream)
+                    ogs_assert(true ==
+                        ogs_sbi_server_send_error(stream,
+                            OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                            NULL, strerror, NULL));
+                ogs_free(strerror);
+
+                OGS_FSM_TRAN(s, smf_gsm_state_exception);
+                break;
+            }
+
+            if (state == SMF_UECM_STATE_REGISTERED) {
+                /* SMF Registration */
+                ogs_assert(stream);
+                ogs_assert(true == ogs_sbi_send_http_status_no_content(stream));
+            } else if (state == SMF_UECM_STATE_DEREGISTERED_BY_AMF) {
+                /* SMF Deregistration */
+                ogs_assert(stream);
+                ogs_assert(true == ogs_sbi_send_http_status_no_content(stream));
+                SMF_SESS_CLEAR(sess);
+            } else if (state == SMF_UECM_STATE_DEREGISTERED_BY_N1_N2_RELEASE) {
+                /* SMF Deregistration */
+                ogs_assert(true == smf_sbi_send_sm_context_status_notify(sess));
+                SMF_SESS_CLEAR(sess);
+            }
+
+            break;
+
         DEFAULT
             ogs_error("Invalid service name %s", sbi_message.h.service.name);
             ogs_assert_if_reached();
@@ -822,7 +912,7 @@
             ogs_assert(nf_instance);
             ogs_assert(OGS_FSM_STATE(&nf_instance->sm));
 
-            ogs_sbi_self()->nf_instance->load = get_sess_load();
+            ogs_sbi_self()->nf_instance->load = smf_instance_get_load();
 
             ogs_fsm_dispatch(&nf_instance->sm, e);
             if (OGS_FSM_CHECK(&nf_instance->sm, ogs_sbi_nf_state_exception))

open5gs_2.6.4.tar.xz/src/smf/smf-sm.h -> open5gs_2.6.5.tar.xz/src/smf/smf-sm.h Changed

open5gs_2.6.4.tar.xz/src/smf/timer.c -> open5gs_2.6.5.tar.xz/src/smf/timer.c Changed

open5gs_2.6.4.tar.xz/src/smf/timer.h -> open5gs_2.6.5.tar.xz/src/smf/timer.h Changed

open5gs_2.6.4.tar.xz/src/udm/context.c -> open5gs_2.6.5.tar.xz/src/udm/context.c Changed

@@ -24,6 +24,7 @@
 int __udm_log_domain;
 
 static OGS_POOL(udm_ue_pool, udm_ue_t);
+static OGS_POOL(udm_sess_pool, udm_sess_t);
 
 static int context_initialized = 0;
 
@@ -37,6 +38,7 @@
     ogs_log_install_domain(&__udm_log_domain, "udm", ogs_core()->log.level);
 
     ogs_pool_init(&udm_ue_pool, ogs_app()->max.ue);
+    ogs_pool_init(&udm_sess_pool, ogs_app()->pool.sess);
 
     ogs_list_init(&self.udm_ue_list);
     self.suci_hash = ogs_hash_make();
@@ -59,6 +61,7 @@
     ogs_hash_destroy(self.supi_hash);
 
     ogs_pool_final(&udm_ue_pool);
+    ogs_pool_final(&udm_sess_pool);
 
     context_initialized = 0;
 }
@@ -129,19 +132,41 @@
     ogs_assert(suci);
 
     ogs_pool_alloc(&udm_ue_pool, &udm_ue);
-    ogs_assert(udm_ue);
+    if (!udm_ue) {
+        ogs_error("No memory pool %s", suci);
+        return NULL;
+    }
     memset(udm_ue, 0, sizeof *udm_ue);
 
+    /* SBI Type */
+    udm_ue->sbi.type = OGS_SBI_OBJ_UE_TYPE;
+
     udm_ue->ctx_id = ogs_msprintf("%d",
             (int)ogs_pool_index(&udm_ue_pool, udm_ue));
-    ogs_assert(udm_ue->ctx_id);
+    if (!udm_ue->ctx_id) {
+        ogs_error("No memory for udm_ue->ctx_id %s", suci);
+        ogs_pool_free(&udm_ue_pool, udm_ue);
+        return NULL;
+    }
 
     udm_ue->suci = ogs_strdup(suci);
-    ogs_assert(udm_ue->suci);
-    ogs_hash_set(self.suci_hash, udm_ue->suci, strlen(udm_ue->suci), udm_ue);
+    if (!udm_ue->suci) {
+        ogs_error("No memory for udm_ue->suci %s", suci);
+        ogs_free(udm_ue->ctx_id);
+        ogs_pool_free(&udm_ue_pool, udm_ue);
+        return NULL;
+    }
 
     udm_ue->supi = ogs_supi_from_supi_or_suci(udm_ue->suci);
-    ogs_assert(udm_ue->supi);
+    if (!udm_ue->supi) {
+        ogs_error("No memory for udm_ue->supi %s", suci);
+        ogs_free(udm_ue->suci);
+        ogs_free(udm_ue->ctx_id);
+        ogs_pool_free(&udm_ue_pool, udm_ue);
+        return NULL;
+    }
+
+    ogs_hash_set(self.suci_hash, udm_ue->suci, strlen(udm_ue->suci), udm_ue);
     ogs_hash_set(self.supi_hash, udm_ue->supi, strlen(udm_ue->supi), udm_ue);
 
     memset(&e, 0, sizeof(e));
@@ -168,6 +193,8 @@
     /* Free SBI object memory */
     ogs_sbi_object_free(&udm_ue->sbi);
 
+    udm_sess_remove_all(udm_ue);
+
     OpenAPI_auth_event_free(udm_ue->auth_event);
     OpenAPI_amf3_gpp_access_registration_free(
             udm_ue->amf_3gpp_access_registration);
@@ -232,11 +259,90 @@
     return ogs_pool_find(&udm_ue_pool, atoll(ctx_id));
 }
 
+udm_sess_t *udm_sess_add(udm_ue_t *udm_ue, uint8_t psi)
+{
+    udm_event_t e;
+    udm_sess_t *sess = NULL;
+
+    ogs_assert(udm_ue);
+    ogs_assert(psi != OGS_NAS_PDU_SESSION_IDENTITY_UNASSIGNED);
+
+    ogs_pool_alloc(&udm_sess_pool, &sess);
+    ogs_assert(sess);
+    memset(sess, 0, sizeof *sess);
+
+    /* SBI Type */
+    sess->sbi.type = OGS_SBI_OBJ_SESS_TYPE;
+
+    sess->udm_ue = udm_ue;
+    sess->psi = psi;
+
+    memset(&e, 0, sizeof(e));
+    e.sess = sess;
+    ogs_fsm_init(&sess->sm, udm_sess_state_initial, udm_sess_state_final, &e);
+
+    ogs_list_add(&udm_ue->sess_list, sess);
+
+    return sess;
+}
+
+void udm_sess_remove(udm_sess_t *sess)
+{
+    udm_event_t e;
+
+    ogs_assert(sess);
+    ogs_assert(sess->udm_ue);
+
+    ogs_list_remove(&sess->udm_ue->sess_list, sess);
+
+    memset(&e, 0, sizeof(e));
+    e.sess = sess;
+    ogs_fsm_fini(&sess->sm, &e);
+
+    /* Free SBI object memory */
+    if (ogs_list_count(&sess->sbi.xact_list))
+        ogs_error("Session transaction %d",
+                ogs_list_count(&sess->sbi.xact_list));
+    ogs_sbi_object_free(&sess->sbi);
+
+    OpenAPI_smf_registration_free(sess->smf_registration);
+
+    if (sess->smf_instance_id)
+        ogs_free(sess->smf_instance_id);
+
+    ogs_pool_free(&udm_sess_pool, sess);
+}
+
+void udm_sess_remove_all(udm_ue_t *udm_ue)
+{
+    udm_sess_t *sess = NULL, *next_sess = NULL;
+
+    ogs_assert(udm_ue);
+
+    ogs_list_for_each_safe(&udm_ue->sess_list, next_sess, sess)
+        udm_sess_remove(sess);
+}
+
+udm_sess_t *udm_sess_find_by_psi(udm_ue_t *udm_ue, uint8_t psi)
+{
+    udm_sess_t *sess = NULL;
+
+    ogs_list_for_each(&udm_ue->sess_list, sess)
+        if (psi == sess->psi) return sess;
+
+    return NULL;
+}
+
 udm_ue_t *udm_ue_cycle(udm_ue_t *udm_ue)
 {
     return ogs_pool_cycle(&udm_ue_pool, udm_ue);
 }
 
+udm_sess_t *udm_sess_cycle(udm_sess_t *sess)
+{
+    return ogs_pool_cycle(&udm_sess_pool, sess);
+}
+
 int get_ue_load(void)
 {
     return (((ogs_pool_size(&udm_ue_pool) -

open5gs_2.6.4.tar.xz/src/udm/context.h -> open5gs_2.6.5.tar.xz/src/udm/context.h Changed

open5gs_2.6.4.tar.xz/src/udm/event.h -> open5gs_2.6.5.tar.xz/src/udm/event.h Changed

open5gs_2.6.4.tar.xz/src/udm/meson.build -> open5gs_2.6.5.tar.xz/src/udm/meson.build Changed

open5gs_2.6.4.tar.xz/src/udm/nnrf-handler.c -> open5gs_2.6.5.tar.xz/src/udm/nnrf-handler.c Changed

@@ -28,6 +28,9 @@
     ogs_sbi_service_type_e service_type = OGS_SBI_SERVICE_TYPE_NULL;
     ogs_sbi_discovery_option_t *discovery_option = NULL;
 
+    udm_ue_t *udm_ue = NULL;
+    udm_sess_t *sess = NULL;
+
     OpenAPI_nf_type_e target_nf_type = OpenAPI_nf_type_NULL;
     OpenAPI_nf_type_e requester_nf_type = OpenAPI_nf_type_NULL;
     OpenAPI_search_result_t *SearchResult = NULL;
@@ -51,12 +54,28 @@
         return;
     }
 
+    if (sbi_object->type == OGS_SBI_OBJ_UE_TYPE) {
+        udm_ue = (udm_ue_t *)sbi_object;
+        ogs_assert(udm_ue);
+    } else if (sbi_object->type == OGS_SBI_OBJ_SESS_TYPE) {
+        sess = (udm_sess_t *)sbi_object;
+        ogs_assert(sess);
+        udm_ue = sess->udm_ue;
+        ogs_assert(udm_ue);
+    } else {
+        ogs_fatal("(NF discover) Not implemented %s:%d",
+            ogs_sbi_service_type_to_name(service_type), sbi_object->type);
+        ogs_assert_if_reached();
+    }
+
     ogs_nnrf_disc_handle_nf_discover_search_result(SearchResult);
 
     nf_instance = ogs_sbi_nf_instance_find_by_discovery_param(
                     target_nf_type, requester_nf_type, discovery_option);
     if (!nf_instance) {
-        ogs_error("(NF discover) No %s:%s",
+        ogs_error("%s:%d (NF discover) No %s:%s",
+                    udm_ue ? udm_ue->supi : "Unknown",
+                    sess ? sess->psi : 0,
                     ogs_sbi_service_type_to_name(service_type),
                     OpenAPI_nf_type_ToString(requester_nf_type));
         return;

open5gs_2.6.4.tar.xz/src/udm/nudm-handler.c -> open5gs_2.6.5.tar.xz/src/udm/nudm-handler.c Changed

@@ -26,8 +26,6 @@
 {
     OpenAPI_authentication_info_request_t *AuthenticationInfoRequest = NULL;
     OpenAPI_resynchronization_info_t *ResynchronizationInfo = NULL;
-    char *serving_network_name = NULL;
-    char *ausf_instance_id = NULL;
     int r;
 
     ogs_assert(udm_ue);
@@ -43,8 +41,7 @@
         return false;
     }
 
-    serving_network_name = AuthenticationInfoRequest->serving_network_name;
-    if (!AuthenticationInfoRequest) {
+    if (!AuthenticationInfoRequest->serving_network_name) {
         ogs_error("%s No servingNetworkName", udm_ue->suci);
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
@@ -52,13 +49,7 @@
         return false;
     }
 
-    if (udm_ue->serving_network_name)
-        ogs_free(udm_ue->serving_network_name);
-    udm_ue->serving_network_name = ogs_strdup(serving_network_name);
-    ogs_assert(udm_ue->serving_network_name);
-
-    ausf_instance_id = AuthenticationInfoRequest->ausf_instance_id;
-    if (!AuthenticationInfoRequest) {
+    if (!AuthenticationInfoRequest->ausf_instance_id) {
         ogs_error("%s No ausfInstanceId", udm_ue->suci);
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
@@ -66,15 +57,22 @@
         return false;
     }
 
+    if (udm_ue->serving_network_name)
+        ogs_free(udm_ue->serving_network_name);
+    udm_ue->serving_network_name =
+        ogs_strdup(AuthenticationInfoRequest->serving_network_name);
+    ogs_assert(udm_ue->serving_network_name);
+
     if (udm_ue->ausf_instance_id)
         ogs_free(udm_ue->ausf_instance_id);
-    udm_ue->ausf_instance_id = ogs_strdup(ausf_instance_id);
+    udm_ue->ausf_instance_id =
+        ogs_strdup(AuthenticationInfoRequest->ausf_instance_id);
     ogs_assert(udm_ue->ausf_instance_id);
 
     ResynchronizationInfo = AuthenticationInfoRequest->resynchronization_info;
     if (!ResynchronizationInfo) {
 
-        r = udm_sbi_discover_and_send(OGS_SBI_SERVICE_TYPE_NUDR_DR, NULL,
+        r = udm_ue_sbi_discover_and_send(OGS_SBI_SERVICE_TYPE_NUDR_DR, NULL,
                 udm_nudr_dr_build_authentication_subscription,
                 udm_ue, stream, NULL);
         ogs_expect(r == OGS_OK);
@@ -164,7 +162,7 @@
 
         ogs_uint64_to_buffer(sqn, OGS_SQN_LEN, udm_ue->sqn);
 
-        r = udm_sbi_discover_and_send(OGS_SBI_SERVICE_TYPE_NUDR_DR, NULL,
+        r = udm_ue_sbi_discover_and_send(OGS_SBI_SERVICE_TYPE_NUDR_DR, NULL,
                 udm_nudr_dr_build_authentication_subscription,
                 udm_ue, stream, udm_ue->sqn);
         ogs_expect(r == OGS_OK);
@@ -236,7 +234,7 @@
     udm_ue->auth_event = OpenAPI_auth_event_copy(
             udm_ue->auth_event, message->AuthEvent);
 
-    r = udm_sbi_discover_and_send(OGS_SBI_SERVICE_TYPE_NUDR_DR, NULL,
+    r = udm_ue_sbi_discover_and_send(OGS_SBI_SERVICE_TYPE_NUDR_DR, NULL,
             udm_nudr_dr_build_update_authentication_status,
             udm_ue, stream, NULL);
     ogs_expect(r == OGS_OK);
@@ -245,7 +243,7 @@
     return true;
 }
 
-bool udm_nudm_uecm_handle_registration(
+bool udm_nudm_uecm_handle_amf_registration(
     udm_ue_t *udm_ue, ogs_sbi_stream_t *stream, ogs_sbi_message_t *message)
 {
     OpenAPI_amf3_gpp_access_registration_t *Amf3GppAccessRegistration = NULL;
@@ -265,6 +263,14 @@
         return false;
     }
 
+    if (!Amf3GppAccessRegistration->amf_instance_id) {
+        ogs_error("%s No amfInstanceId", udm_ue->suci);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                message, "No amfInstanceId", udm_ue->supi));
+        return false;
+    }
+
     if (!Amf3GppAccessRegistration->dereg_callback_uri) {
         ogs_error("%s No dregCallbackUri", udm_ue->supi);
         ogs_assert(true ==
@@ -337,7 +343,7 @@
             udm_ue->amf_3gpp_access_registration,
                 message->Amf3GppAccessRegistration);
 
-    r = udm_sbi_discover_and_send(OGS_SBI_SERVICE_TYPE_NUDR_DR, NULL,
+    r = udm_ue_sbi_discover_and_send(OGS_SBI_SERVICE_TYPE_NUDR_DR, NULL,
             udm_nudr_dr_build_update_amf_context, udm_ue, stream, NULL);
     ogs_expect(r == OGS_OK);
     ogs_assert(r != OGS_ERROR);
@@ -345,7 +351,7 @@
     return true;
 }
 
-bool udm_nudm_uecm_handle_registration_update(
+bool udm_nudm_uecm_handle_amf_registration_update(
     udm_ue_t *udm_ue, ogs_sbi_stream_t *stream, ogs_sbi_message_t *message)
 {
     OpenAPI_amf3_gpp_access_registration_modification_t
@@ -446,12 +452,108 @@
         OpenAPI_list_add(PatchItemList, &item);
     }
 
-    r = udm_sbi_discover_and_send(OGS_SBI_SERVICE_TYPE_NUDR_DR, NULL,
+    r = udm_ue_sbi_discover_and_send(OGS_SBI_SERVICE_TYPE_NUDR_DR, NULL,
             udm_nudr_dr_build_patch_amf_context,
             udm_ue, stream, PatchItemList);
     ogs_expect(r == OGS_OK);
     ogs_assert(r != OGS_ERROR);
 
+    return true;
+}
+
+bool udm_nudm_uecm_handle_smf_registration(
+    udm_sess_t *sess, ogs_sbi_stream_t *stream, ogs_sbi_message_t *message)
+{
+    udm_ue_t *udm_ue = NULL;
+    OpenAPI_smf_registration_t *SmfRegistration = NULL;
+    int r;
+
+    ogs_assert(stream);
+    ogs_assert(message);
+
+    ogs_assert(sess);
+    udm_ue = sess->udm_ue;
+    ogs_assert(udm_ue);
+
+    SmfRegistration = message->SmfRegistration;
+    if (!SmfRegistration) {
+        ogs_error("%s:%d No SmfRegistration", udm_ue->supi, sess->psi);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                message, "No SmfRegistration", udm_ue->supi));
+        return false;
+    }
+
+    if (!SmfRegistration->smf_instance_id) {
+        ogs_error("%s:%d No smfInstanceId", udm_ue->supi, sess->psi);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                message, "No smfInstanceId", udm_ue->supi));
+        return false;
+    }
+
+    if (!SmfRegistration->pdu_session_id) {
+        ogs_error("%s:%d No pduSessionId", udm_ue->supi, sess->psi);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                message, "No pduSessionId", udm_ue->supi));
+        return false;
+    }
+
+    if (!SmfRegistration->single_nssai || !SmfRegistration->single_nssai->sst) {
+        ogs_error("%s:%d No singleNssai", udm_ue->supi, sess->psi);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                message, "No singleNssai", udm_ue->supi));
+        return false;
+    }
+
+    if (!SmfRegistration->dnn) {
+        ogs_error("%s:%d No dnn", udm_ue->supi, sess->psi);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                message, "No dnn", udm_ue->supi));
+        return false;
+    }
+
+    if (!SmfRegistration->plmn_id ||
+            !SmfRegistration->plmn_id->mcc || !SmfRegistration->plmn_id->mnc) {
+        ogs_error("%s:%d No plmnId", udm_ue->supi, sess->psi);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                message, "No plmnId", udm_ue->supi));
+        return false;
+    }
+
+    sess->smf_registration =
+        OpenAPI_smf_registration_copy(sess->smf_registration, SmfRegistration);
+

open5gs_2.6.4.tar.xz/src/udm/nudm-handler.h -> open5gs_2.6.5.tar.xz/src/udm/nudm-handler.h Changed

open5gs_2.6.4.tar.xz/src/udm/nudr-build.c -> open5gs_2.6.5.tar.xz/src/udm/nudr-build.c Changed

@@ -247,3 +247,85 @@
 
     return request;
 }
+
+ogs_sbi_request_t *udm_nudr_dr_build_update_smf_context(
+        udm_sess_t *sess, void *data)
+{
+    udm_ue_t *udm_ue = NULL;
+    ogs_sbi_message_t message;
+    ogs_sbi_request_t *request = NULL;
+
+    ogs_assert(sess);
+    udm_ue = sess->udm_ue;
+    ogs_assert(udm_ue);
+
+    memset(&message, 0, sizeof(message));
+    message.h.method = (char *)OGS_SBI_HTTP_METHOD_PUT;
+    message.h.service.name = (char *)OGS_SBI_SERVICE_NAME_NUDR_DR;
+    message.h.api.version = (char *)OGS_SBI_API_V1;
+    message.h.resource.component0 =
+        (char *)OGS_SBI_RESOURCE_NAME_SUBSCRIPTION_DATA;
+    message.h.resource.component1 = udm_ue->supi;
+    message.h.resource.component2 =
+        (char *)OGS_SBI_RESOURCE_NAME_CONTEXT_DATA;
+    message.h.resource.component3 =
+        (char *)OGS_SBI_RESOURCE_NAME_SMF_REGISTRATIONS;
+    message.h.resource.component4 = ogs_msprintf("%d", sess->psi);
+    if (!message.h.resource.component4) {
+        ogs_error("No memory : message.h.resource.component4");
+        goto end;
+    }
+
+    message.SmfRegistration = OpenAPI_smf_registration_copy(
+            message.SmfRegistration, sess->smf_registration);
+    if (!message.SmfRegistration) {
+        ogs_error("OpenAPI_smf_registration_copy() failed");
+        goto end;
+    }
+
+    request = ogs_sbi_build_request(&message);
+    ogs_assert(request);
+
+end:
+    ogs_free(message.h.resource.component4);
+    OpenAPI_smf_registration_free(message.SmfRegistration);
+
+    return request;
+}
+
+ogs_sbi_request_t *udm_nudr_dr_build_delete_smf_context(
+        udm_sess_t *sess, void *data)
+{
+    udm_ue_t *udm_ue = NULL;
+    ogs_sbi_message_t message;
+    ogs_sbi_request_t *request = NULL;
+
+    ogs_assert(sess);
+    udm_ue = sess->udm_ue;
+    ogs_assert(udm_ue);
+
+    memset(&message, 0, sizeof(message));
+    message.h.method = (char *)OGS_SBI_HTTP_METHOD_DELETE;
+    message.h.service.name = (char *)OGS_SBI_SERVICE_NAME_NUDR_DR;
+    message.h.api.version = (char *)OGS_SBI_API_V1;
+    message.h.resource.component0 =
+        (char *)OGS_SBI_RESOURCE_NAME_SUBSCRIPTION_DATA;
+    message.h.resource.component1 = udm_ue->supi;
+    message.h.resource.component2 =
+        (char *)OGS_SBI_RESOURCE_NAME_CONTEXT_DATA;
+    message.h.resource.component3 =
+        (char *)OGS_SBI_RESOURCE_NAME_SMF_REGISTRATIONS;
+    message.h.resource.component4 = ogs_msprintf("%d", sess->psi);
+    if (!message.h.resource.component4) {
+        ogs_error("No memory : message.h.resource.component4");
+        goto end;
+    }
+
+    request = ogs_sbi_build_request(&message);
+    ogs_assert(request);
+
+end:
+    ogs_free(message.h.resource.component4);
+
+    return request;
+}

open5gs_2.6.4.tar.xz/src/udm/nudr-build.h -> open5gs_2.6.5.tar.xz/src/udm/nudr-build.h Changed

open5gs_2.6.4.tar.xz/src/udm/nudr-handler.c -> open5gs_2.6.5.tar.xz/src/udm/nudr-handler.c Changed

@@ -396,8 +396,6 @@
 
     int status;
 
-    OpenAPI_amf3_gpp_access_registration_t *Amf3GppAccessRegistration = NULL;
-
     ogs_assert(udm_ue);
     ogs_assert(stream);
     server = ogs_sbi_server_from_stream(stream);
@@ -441,12 +439,14 @@
         END
     END
 
-
     SWITCH(recvmsg->h.resource.component3)
     CASE(OGS_SBI_RESOURCE_NAME_AMF_3GPP_ACCESS)
-        Amf3GppAccessRegistration = udm_ue->amf_3gpp_access_registration;
+        OpenAPI_amf3_gpp_access_registration_t
+            *Amf3GppAccessRegistration = NULL;
         OpenAPI_guami_t *Guami = NULL;
 
+        Amf3GppAccessRegistration = udm_ue->amf_3gpp_access_registration;
+
         if (!Amf3GppAccessRegistration) {
             ogs_error("%s No Amf3GppAccessRegistration", udm_ue->supi);
             ogs_assert(true ==
@@ -542,10 +542,21 @@
 
         if (udm_ue->amf_instance_id &&
             strcmp(udm_ue->amf_instance_id,
-                Amf3GppAccessRegistration->amf_instance_id) == 0)
+                Amf3GppAccessRegistration->amf_instance_id) == 0) {
+
             status = OGS_SBI_HTTP_STATUS_OK;
-        else
+
+        } else {
+
+            if (udm_ue->amf_instance_id)
+                ogs_free(udm_ue->amf_instance_id);
+            udm_ue->amf_instance_id =
+                ogs_strdup(Amf3GppAccessRegistration->amf_instance_id);
+            ogs_assert(udm_ue->amf_instance_id);
+
             status = OGS_SBI_HTTP_STATUS_CREATED;
+        }
+
 
         if (status == OGS_SBI_HTTP_STATUS_CREATED)
             sendmsg.http.location = ogs_sbi_server_uri(server, &header);
@@ -704,6 +715,178 @@
         ogs_assert(strerror);
 
         ogs_error("%s", strerror);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                recvmsg, strerror, NULL));
+        ogs_free(strerror);
+        return false;
+    END
+
+    return true;
+}
+
+bool udm_nudr_dr_handle_smf_registration(
+    udm_sess_t *sess, ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
+{
+    udm_ue_t *udm_ue = NULL;
+
+    char *strerror = NULL;
+    ogs_sbi_server_t *server = NULL;
+
+    ogs_sbi_message_t sendmsg;
+    ogs_sbi_header_t header;
+    ogs_sbi_response_t *response = NULL;
+
+    int status;
+
+    ogs_assert(sess);
+    udm_ue = sess->udm_ue;
+    ogs_assert(udm_ue);
+    ogs_assert(stream);
+    server = ogs_sbi_server_from_stream(stream);
+    ogs_assert(server);
+
+    ogs_assert(recvmsg);
+
+    if (recvmsg->res_status != OGS_SBI_HTTP_STATUS_NO_CONTENT) {
+        ogs_error("%s:%d HTTP response error %d",
+            udm_ue->supi, sess->psi, recvmsg->res_status);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream, recvmsg->res_status,
+                NULL, "HTTP response error", udm_ue->supi));
+        return false;
+    }
+
+    SWITCH(recvmsg->h.resource.component3)
+    CASE(OGS_SBI_RESOURCE_NAME_SMF_REGISTRATIONS)
+        SWITCH(recvmsg->h.method)
+        CASE(OGS_SBI_HTTP_METHOD_PUT)
+            OpenAPI_smf_registration_t *SmfRegistration = NULL;
+
+            SmfRegistration = sess->smf_registration;
+
+            if (!SmfRegistration) {
+                ogs_error("%s:%d No SmfRegistration", udm_ue->supi, sess->psi);
+                ogs_assert(true ==
+                    ogs_sbi_server_send_error(
+                        stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                        recvmsg, "No SmfRegistration", udm_ue->supi));
+                return false;
+            }
+
+            if (!SmfRegistration->smf_instance_id) {
+                ogs_error("%s:%d No smfInstanceId", udm_ue->supi, sess->psi);
+                ogs_assert(true ==
+                    ogs_sbi_server_send_error(
+                        stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                        recvmsg, "No smfInstanceId", udm_ue->supi));
+                return false;
+            }
+
+            if (!SmfRegistration->pdu_session_id) {
+                ogs_error("%s:%d No pduSessionId", udm_ue->supi, sess->psi);
+                ogs_assert(true ==
+                    ogs_sbi_server_send_error(
+                        stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                        recvmsg, "No pduSessionId", udm_ue->supi));
+                return false;
+            }
+
+            if (!SmfRegistration->single_nssai ||
+                    !SmfRegistration->single_nssai->sst) {
+                ogs_error("%s:%d No singleNssai", udm_ue->supi, sess->psi);
+                ogs_assert(true ==
+                    ogs_sbi_server_send_error(
+                        stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                        recvmsg, "No singleNssai", udm_ue->supi));
+                return false;
+            }
+
+            if (!SmfRegistration->dnn) {
+                ogs_error("%s:%d No dnn", udm_ue->supi, sess->psi);
+                ogs_assert(true ==
+                    ogs_sbi_server_send_error(
+                        stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                        recvmsg, "No dnn", udm_ue->supi));
+                return false;
+            }
+
+            if (!SmfRegistration->plmn_id ||
+                    !SmfRegistration->plmn_id->mcc ||
+                    !SmfRegistration->plmn_id->mnc) {
+                ogs_error("%s:%d No plmnId", udm_ue->supi, sess->psi);
+                ogs_assert(true ==
+                    ogs_sbi_server_send_error(
+                        stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                        recvmsg, "No plmnId", udm_ue->supi));
+                return false;
+            }
+
+            memset(&sendmsg, 0, sizeof(sendmsg));
+
+            memset(&header, 0, sizeof(header));
+            header.service.name = (char *)OGS_SBI_SERVICE_NAME_NUDM_UECM;
+            header.api.version = (char *)OGS_SBI_API_V1;
+            header.resource.component0 = udm_ue->supi;
+            header.resource.component1 =
+                (char *)OGS_SBI_RESOURCE_NAME_REGISTRATIONS;
+            header.resource.component2 =
+                (char *)OGS_SBI_RESOURCE_NAME_SMF_REGISTRATIONS;
+            header.resource.component3 = ogs_msprintf("%d", sess->psi);
+
+            if (sess->smf_instance_id &&
+                strcmp(sess->smf_instance_id,
+                    SmfRegistration->smf_instance_id) == 0) {
+
+                status = OGS_SBI_HTTP_STATUS_OK;
+
+            } else {
+
+                if (sess->smf_instance_id)
+                    ogs_free(sess->smf_instance_id);
+                sess->smf_instance_id =
+                    ogs_strdup(SmfRegistration->smf_instance_id);
+                ogs_assert(sess->smf_instance_id);
+
+                status = OGS_SBI_HTTP_STATUS_CREATED;
+            }
+
+            if (status == OGS_SBI_HTTP_STATUS_CREATED)
+                sendmsg.http.location = ogs_sbi_server_uri(server, &header);
+
+            sendmsg.SmfRegistration = OpenAPI_smf_registration_copy(
+                    sendmsg.SmfRegistration, sess->smf_registration);
+
+            response = ogs_sbi_build_response(&sendmsg, status);
+            ogs_assert(response);
+            ogs_assert(true == ogs_sbi_server_send_response(stream, response));

open5gs_2.6.4.tar.xz/src/udm/nudr-handler.h -> open5gs_2.6.5.tar.xz/src/udm/nudr-handler.h Changed

open5gs_2.6.4.tar.xz/src/udm/sbi-path.c -> open5gs_2.6.5.tar.xz/src/udm/sbi-path.c Changed

@@ -53,6 +53,7 @@
         ogs_sbi_nf_service_add_version(
                     service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL);
         ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF);
+        ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_SMF);
     }
 
     if (ogs_sbi_nf_service_is_available(OGS_SBI_SERVICE_NAME_NUDM_SDM)) {
@@ -93,29 +94,26 @@
     return ogs_sbi_send_request_to_nf_instance(nf_instance, xact);
 }
 
-int udm_sbi_discover_and_send(
+static int udm_sbi_discover_and_send(
+        ogs_sbi_object_t *sbi_object,
         ogs_sbi_service_type_e service_type,
         ogs_sbi_discovery_option_t *discovery_option,
-        ogs_sbi_request_t *(*build)(udm_ue_t *udm_ue, void *data),
-        udm_ue_t *udm_ue, ogs_sbi_stream_t *stream, void *data)
+        ogs_sbi_build_f build,
+        void *context, ogs_sbi_stream_t *stream, void *data)
 {
     ogs_sbi_xact_t *xact = NULL;
     int r;
 
     ogs_assert(service_type);
-    ogs_assert(udm_ue);
+    ogs_assert(sbi_object);
     ogs_assert(stream);
     ogs_assert(build);
 
     xact = ogs_sbi_xact_add(
-            &udm_ue->sbi, service_type, discovery_option,
-            (ogs_sbi_build_f)build, udm_ue, data);
+            sbi_object, service_type, discovery_option,
+            (ogs_sbi_build_f)build, context, data);
     if (!xact) {
         ogs_error("udm_sbi_discover_and_send() failed");
-        ogs_assert(true ==
-            ogs_sbi_server_send_error(stream,
-                OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL,
-                "Cannot discover", udm_ue->suci));
         return OGS_ERROR;
     }
 
@@ -125,6 +123,25 @@
     if (r != OGS_OK) {
         ogs_error("udm_sbi_discover_and_send() failed");
         ogs_sbi_xact_remove(xact);
+        return r;
+    }
+
+    return OGS_OK;
+}
+
+int udm_ue_sbi_discover_and_send(
+        ogs_sbi_service_type_e service_type,
+        ogs_sbi_discovery_option_t *discovery_option,
+        ogs_sbi_request_t *(*build)(udm_ue_t *udm_ue, void *data),
+        udm_ue_t *udm_ue, ogs_sbi_stream_t *stream, void *data)
+{
+    int r;
+
+    r = udm_sbi_discover_and_send(
+                &udm_ue->sbi, service_type, discovery_option,
+                (ogs_sbi_build_f)build, udm_ue, stream, data);
+    if (r != OGS_OK) {
+        ogs_error("udm_ue_sbi_discover_and_send() failed");
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream,
                 OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL,
@@ -132,5 +149,28 @@
         return r;
     }
 
+    return OGS_OK;
+}
+
+int udm_sess_sbi_discover_and_send(
+        ogs_sbi_service_type_e service_type,
+        ogs_sbi_discovery_option_t *discovery_option,
+        ogs_sbi_request_t *(*build)(udm_sess_t *sess, void *data),
+        udm_sess_t *sess, ogs_sbi_stream_t *stream, void *data)
+{
+    int r;
+
+    r = udm_sbi_discover_and_send(
+                &sess->sbi, service_type, discovery_option,
+                (ogs_sbi_build_f)build, sess, stream, data);
+    if (r != OGS_OK) {
+        ogs_error("udm_sess_sbi_discover_and_send() failed");
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream,
+                OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL,
+                "Cannot discover", NULL));
+        return r;
+    }
+
     return OGS_OK;
 }

open5gs_2.6.4.tar.xz/src/udm/sbi-path.h -> open5gs_2.6.5.tar.xz/src/udm/sbi-path.h Changed

open5gs_2.6.5.tar.xz/src/udm/sess-sm.c Added

@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "sbi-path.h"
+#include "nnrf-handler.h"
+
+#include "nudm-handler.h"
+#include "nudr-handler.h"
+
+void udm_sess_state_initial(ogs_fsm_t *s, udm_event_t *e)
+{
+    ogs_assert(s);
+
+    OGS_FSM_TRAN(s, &udm_sess_state_operational);
+}
+
+void udm_sess_state_final(ogs_fsm_t *s, udm_event_t *e)
+{
+}
+
+void udm_sess_state_operational(ogs_fsm_t *s, udm_event_t *e)
+{
+    udm_ue_t *udm_ue = NULL;
+    udm_sess_t *sess = NULL;
+
+    ogs_sbi_stream_t *stream = NULL;
+    ogs_sbi_message_t *message = NULL;
+
+    ogs_assert(s);
+    ogs_assert(e);
+
+    udm_sm_debug(e);
+
+    sess = e->sess;
+    ogs_assert(sess);
+    udm_ue = sess->udm_ue;
+    ogs_assert(udm_ue);
+
+    switch (e->h.id) {
+    case OGS_FSM_ENTRY_SIG:
+        break;
+
+    case OGS_FSM_EXIT_SIG:
+        break;
+
+    case OGS_EVENT_SBI_SERVER:
+        message = e->h.sbi.message;
+        ogs_assert(message);
+        stream = e->h.sbi.data;
+        ogs_assert(stream);
+
+        SWITCH(message->h.service.name)
+        CASE(OGS_SBI_SERVICE_NAME_NUDM_UECM)
+            SWITCH(message->h.resource.component1)
+            CASE(OGS_SBI_RESOURCE_NAME_REGISTRATIONS)
+                SWITCH(message->h.method)
+                CASE(OGS_SBI_HTTP_METHOD_PUT)
+                    udm_nudm_uecm_handle_smf_registration(
+                            sess, stream, message);
+                    break;
+                CASE(OGS_SBI_HTTP_METHOD_DELETE)
+                    udm_nudm_uecm_handle_smf_deregistration(
+                            sess, stream, message);
+                    break;
+
+                DEFAULT
+                    ogs_error("%s:%d Invalid HTTP method %s",
+                            udm_ue->suci, sess->psi, message->h.method);
+                    ogs_assert(true ==
+                        ogs_sbi_server_send_error(stream,
+                            OGS_SBI_HTTP_STATUS_FORBIDDEN, message,
+                            "Invalid HTTP method", message->h.method));
+                END
+                break;
+            DEFAULT
+                ogs_error("%s:%d Invalid resource name %s",
+                        udm_ue->suci, sess->psi,
+                        message->h.resource.component1);
+                ogs_assert(true ==
+                    ogs_sbi_server_send_error(stream,
+                        OGS_SBI_HTTP_STATUS_BAD_REQUEST, message,
+                        "Invalid HTTP method", message->h.method));
+            END
+            break;
+
+        DEFAULT
+            ogs_error("Invalid API name %s", message->h.service.name);
+            ogs_assert(true ==
+                ogs_sbi_server_send_error(stream,
+                    OGS_SBI_HTTP_STATUS_BAD_REQUEST, message,
+                    "Invalid API name", message->h.service.name));
+        END
+        break;
+
+    case OGS_EVENT_SBI_CLIENT:
+        message = e->h.sbi.message;
+        ogs_assert(message);
+        stream = e->h.sbi.data;
+        ogs_assert(stream);
+
+        SWITCH(message->h.service.name)
+        CASE(OGS_SBI_SERVICE_NAME_NUDR_DR)
+            SWITCH(message->h.resource.component0)
+            CASE(OGS_SBI_RESOURCE_NAME_SUBSCRIPTION_DATA)
+                SWITCH(message->h.resource.component2)
+                CASE(OGS_SBI_RESOURCE_NAME_CONTEXT_DATA)
+                    udm_nudr_dr_handle_smf_registration(
+                            sess, stream, message);
+                    break;
+
+                DEFAULT
+                    ogs_error("Invalid resource name %s",
+                            message->h.resource.component2);
+                    ogs_assert_if_reached();
+                END
+                break;
+            DEFAULT
+                ogs_error("Invalid resource name %s",
+                        message->h.resource.component0);
+                ogs_assert_if_reached();
+            END
+            break;
+
+        DEFAULT
+            ogs_error("%s:%d Invalid API name %s",
+                        udm_ue->supi, sess->psi, message->h.service.name);
+            ogs_assert_if_reached();
+        END
+        break;
+
+    default:
+        ogs_error("%s:%d Unknown event %s",
+                udm_ue->supi, sess->psi, udm_event_get_name(e));
+        break;
+    }
+}
+
+void udm_sess_state_exception(ogs_fsm_t *s, udm_event_t *e)
+{
+    udm_ue_t *udm_ue = NULL;
+    udm_sess_t *sess = NULL;
+
+    ogs_assert(s);
+    ogs_assert(e);
+
+    udm_sm_debug(e);
+
+    sess = e->sess;
+    ogs_assert(sess);
+    udm_ue = sess->udm_ue;
+    ogs_assert(udm_ue);
+
+    switch (e->h.id) {
+    case OGS_FSM_ENTRY_SIG:
+        break;
+
+    case OGS_FSM_EXIT_SIG:
+        break;
+
+    default:
+        ogs_error("%s:%d Unknown event %s",
+                udm_ue->supi, sess->psi, udm_event_get_name(e));
+        break;
+    }
+}

open5gs_2.6.4.tar.xz/src/udm/udm-sm.c -> open5gs_2.6.5.tar.xz/src/udm/udm-sm.c Changed

@@ -49,6 +49,7 @@
     ogs_sbi_xact_t *sbi_xact = NULL;
 
     udm_ue_t *udm_ue = NULL;
+    udm_sess_t *sess = NULL;
 
     udm_sm_debug(e);
 
@@ -162,7 +163,15 @@
                         message.h.resource.component0);
                 if (!udm_ue) {
                     udm_ue = udm_ue_add(message.h.resource.component0);
-                    ogs_assert(udm_ue);
+                    if (!udm_ue) {
+                        ogs_error("Invalid Request %s",
+                                message.h.resource.component0);
+                        ogs_assert(true ==
+                            ogs_sbi_server_send_error(stream,
+                                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                                &message, NULL, NULL));
+                        break;
+                    }
                 }
             }
 
@@ -175,15 +184,44 @@
                 break;
             }
 
-            ogs_assert(OGS_FSM_STATE(&udm_ue->sm));
+            SWITCH(message.h.resource.component2)
+            CASE(OGS_SBI_RESOURCE_NAME_SMF_REGISTRATIONS)
+                if (message.h.resource.component3) {
+                    uint8_t psi = atoi(message.h.resource.component3);
+
+                    sess = udm_sess_find_by_psi(udm_ue, psi);
+                    if (!sess) {
+                        sess = udm_sess_add(udm_ue, psi);
+                        ogs_assert(sess);
+                        ogs_debug("%s:%d UDM session added",
+                                udm_ue->supi, sess->psi);
+                    }
+                }
 
-            e->udm_ue = udm_ue;
-            e->h.sbi.message = &message;
-            ogs_fsm_dispatch(&udm_ue->sm, e);
-            if (OGS_FSM_CHECK(&udm_ue->sm, udm_ue_state_exception)) {
-                ogs_error("%s State machine exception", udm_ue->suci);
-                udm_ue_remove(udm_ue);
-            }
+                ogs_assert(sess);
+                ogs_assert(OGS_FSM_STATE(&sess->sm));
+
+                e->sess = sess;
+                e->h.sbi.message = &message;
+                ogs_fsm_dispatch(&sess->sm, e);
+                if (OGS_FSM_CHECK(&sess->sm, udm_sess_state_exception)) {
+                    ogs_error("%s:%d State machine exception",
+                            udm_ue->suci, sess->psi);
+                    udm_sess_remove(sess);
+                }
+                break;
+
+            DEFAULT
+                ogs_assert(OGS_FSM_STATE(&udm_ue->sm));
+
+                e->udm_ue = udm_ue;
+                e->h.sbi.message = &message;
+                ogs_fsm_dispatch(&udm_ue->sm, e);
+                if (OGS_FSM_CHECK(&udm_ue->sm, udm_ue_state_exception)) {
+                    ogs_error("%s State machine exception", udm_ue->suci);
+                    udm_ue_remove(udm_ue);
+                }
+            END
             break;
 
         DEFAULT
@@ -325,39 +363,83 @@
         CASE(OGS_SBI_SERVICE_NAME_NUDR_DR)
             SWITCH(message.h.resource.component0)
             CASE(OGS_SBI_RESOURCE_NAME_SUBSCRIPTION_DATA)
-                sbi_xact = e->h.sbi.data;
-                ogs_assert(sbi_xact);
+                SWITCH(message.h.resource.component3)
+                CASE(OGS_SBI_RESOURCE_NAME_SMF_REGISTRATIONS)
+                    sbi_xact = e->h.sbi.data;
+                    ogs_assert(sbi_xact);
+
+                    sbi_xact = ogs_sbi_xact_cycle(sbi_xact);
+                    if (!sbi_xact) {
+                        /* CLIENT_WAIT timer could remove SBI transaction
+                         * before receiving SBI message */
+                        ogs_error("SBI transaction has already been removed");
+                        break;
+                    }
 
-                sbi_xact = ogs_sbi_xact_cycle(sbi_xact);
-                if (!sbi_xact) {
-                    /* CLIENT_WAIT timer could remove SBI transaction
-                     * before receiving SBI message */
-                    ogs_error("SBI transaction has already been removed");
-                    break;
-                }
+                    sess = (udm_sess_t *)sbi_xact->sbi_object;
+                    ogs_assert(sess);
 
-                udm_ue = (udm_ue_t *)sbi_xact->sbi_object;
-                ogs_assert(udm_ue);
+                    e->h.sbi.data = sbi_xact->assoc_stream;
 
-                e->h.sbi.data = sbi_xact->assoc_stream;
+                    ogs_sbi_xact_remove(sbi_xact);
 
-                ogs_sbi_xact_remove(sbi_xact);
+                    sess = udm_sess_cycle(sess);
+                    if (!sess) {
+                        ogs_error("SESS Context has already been removed");
+                        break;
+                    }
 
-                udm_ue = udm_ue_cycle(udm_ue);
-                if (!udm_ue) {
-                    ogs_error("UE(udm_ue) Context has already been removed");
+                    udm_ue = udm_ue_cycle(sess->udm_ue);
+                    if (!udm_ue) {
+                        ogs_error("UE Context has already been removed");
+                        break;
+                    }
+
+                    e->sess = sess;
+                    e->h.sbi.message = &message;
+
+                    ogs_fsm_dispatch(&sess->sm, e);
+                    if (OGS_FSM_CHECK(&sess->sm, udm_sess_state_exception)) {
+                        ogs_error("%s:%d State machine exception",
+                                udm_ue->suci, sess->psi);
+                        udm_sess_remove(sess);
+                    }
                     break;
-                }
 
-                e->udm_ue = udm_ue;
-                e->h.sbi.message = &message;
+                DEFAULT
+                    sbi_xact = e->h.sbi.data;
+                    ogs_assert(sbi_xact);
 
-                ogs_fsm_dispatch(&udm_ue->sm, e);
-                if (OGS_FSM_CHECK(&udm_ue->sm, udm_ue_state_exception)) {
-                    ogs_error("%s State machine exception", udm_ue->suci);
-                    udm_ue_remove(udm_ue);
-                }
+                    sbi_xact = ogs_sbi_xact_cycle(sbi_xact);
+                    if (!sbi_xact) {
+                        /* CLIENT_WAIT timer could remove SBI transaction
+                         * before receiving SBI message */
+                        ogs_error("SBI transaction has already been removed");
+                        break;
+                    }
+
+                    udm_ue = (udm_ue_t *)sbi_xact->sbi_object;
+                    ogs_assert(udm_ue);
+
+                    e->h.sbi.data = sbi_xact->assoc_stream;
 
+                    ogs_sbi_xact_remove(sbi_xact);
+
+                    udm_ue = udm_ue_cycle(udm_ue);
+                    if (!udm_ue) {
+                        ogs_error("UE Context has already been removed");
+                        break;
+                    }
+
+                    e->udm_ue = udm_ue;
+                    e->h.sbi.message = &message;
+
+                    ogs_fsm_dispatch(&udm_ue->sm, e);
+                    if (OGS_FSM_CHECK(&udm_ue->sm, udm_ue_state_exception)) {
+                        ogs_error("%s State machine exception", udm_ue->suci);
+                        udm_ue_remove(udm_ue);
+                    }
+                END
                 break;
 
             DEFAULT

open5gs_2.6.4.tar.xz/src/udm/udm-sm.h -> open5gs_2.6.5.tar.xz/src/udm/udm-sm.h Changed

open5gs_2.6.4.tar.xz/src/udm/ue-sm.c -> open5gs_2.6.5.tar.xz/src/udm/ue-sm.c Changed

@@ -115,7 +115,8 @@
             CASE(OGS_SBI_HTTP_METHOD_PUT)
                 SWITCH(message->h.resource.component1)
                 CASE(OGS_SBI_RESOURCE_NAME_REGISTRATIONS)
-                    udm_nudm_uecm_handle_registration(udm_ue, stream, message);
+                    udm_nudm_uecm_handle_amf_registration(
+                            udm_ue, stream, message);
                     break;
 
                 DEFAULT
@@ -130,7 +131,8 @@
             CASE(OGS_SBI_HTTP_METHOD_PATCH)
                 SWITCH(message->h.resource.component1)
                 CASE(OGS_SBI_RESOURCE_NAME_REGISTRATIONS)
-                    udm_nudm_uecm_handle_registration_update(udm_ue, stream, message);
+                    udm_nudm_uecm_handle_amf_registration_update(
+                            udm_ue, stream, message);
                     break;
 
                 DEFAULT
@@ -159,7 +161,7 @@
                 CASE(OGS_SBI_RESOURCE_NAME_AM_DATA)
                 CASE(OGS_SBI_RESOURCE_NAME_SMF_SELECT_DATA)
                 CASE(OGS_SBI_RESOURCE_NAME_SM_DATA)
-                    r = udm_sbi_discover_and_send(
+                    r = udm_ue_sbi_discover_and_send(
                             OGS_SBI_SERVICE_TYPE_NUDR_DR, NULL,
                             udm_nudr_dr_build_query_subscription_provisioned,
                             udm_ue, stream, message);

open5gs_2.6.4.tar.xz/src/udr/nudr-handler.c -> open5gs_2.6.5.tar.xz/src/udr/nudr-handler.c Changed

@@ -294,6 +294,30 @@
                 return false;
             }
 
+            if (Amf3GppAccessRegistration->pei) {
+                char *type = NULL, *value = NULL;
+                char *pei = NULL;
+
+                pei = ogs_strdup(Amf3GppAccessRegistration->pei);
+                ogs_assert(pei);
+
+                type = ogs_id_get_type(pei);
+                ogs_assert(type);
+                value = ogs_id_get_value(pei);
+                ogs_assert(value);
+
+                if (strcmp(type, "imeisv") == 0) {
+                    ogs_assert(OGS_OK == ogs_dbi_update_imeisv(supi, value));
+                } else {
+                    ogs_fatal("Unknown Type = %s", type);
+                    ogs_assert_if_reached();
+                }
+
+                ogs_free(pei);
+                ogs_free(type);
+                ogs_free(value);
+            }
+
             memset(&sendmsg, 0, sizeof(sendmsg));
 
             response = ogs_sbi_build_response(
@@ -321,6 +345,48 @@
             memset(&sendmsg, 0, sizeof(sendmsg));
 
             response = ogs_sbi_build_response(
+                    &sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT);
+            ogs_assert(response);
+            ogs_assert(true == ogs_sbi_server_send_response(stream, response));
+
+            return true;
+
+        DEFAULT
+            ogs_error("Invalid HTTP method %s", recvmsg->h.method);
+            ogs_assert(true ==
+                ogs_sbi_server_send_error(stream,
+                    OGS_SBI_HTTP_STATUS_MEHTOD_NOT_ALLOWED,
+                    recvmsg, "Invalid HTTP method", recvmsg->h.method));
+        END
+        break;
+    CASE(OGS_SBI_RESOURCE_NAME_SMF_REGISTRATIONS)
+        SWITCH(recvmsg->h.method)
+        CASE(OGS_SBI_HTTP_METHOD_PUT)
+            OpenAPI_smf_registration_t *SmfRegistration;
+
+            SmfRegistration = recvmsg->SmfRegistration;
+            if (!SmfRegistration) {
+                ogs_error("%s No SmfRegistration", supi);
+                ogs_assert(true ==
+                    ogs_sbi_server_send_error(
+                        stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                        recvmsg, "No SmfRegistration", supi));
+                return false;
+            }
+
+            memset(&sendmsg, 0, sizeof(sendmsg));
+
+            response = ogs_sbi_build_response(
+                    &sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT);
+            ogs_assert(response);
+            ogs_assert(true == ogs_sbi_server_send_response(stream, response));
+
+            return true;
+
+        CASE(OGS_SBI_HTTP_METHOD_DELETE)
+            memset(&sendmsg, 0, sizeof(sendmsg));
+
+            response = ogs_sbi_build_response(
                     &sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT);
             ogs_assert(response);
             ogs_assert(true == ogs_sbi_server_send_response(stream, response));

open5gs_2.6.4.tar.xz/src/upf/arp-nd.cpp -> open5gs_2.6.5.tar.xz/src/upf/arp-nd.cpp Changed

@@ -17,10 +17,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <cstdint>
+
 #include <tins/arp.h>
 #include <tins/ethernetII.h>
 #include <tins/hw_address.h>
 #include <tins/icmpv6.h>
+#include <tins/exceptions.h>
 
 #include "arp-nd.h"
 
@@ -49,6 +52,16 @@
     return _parse_arp(pdu);
 }
 
+uint32_t arp_parse_target_addr(uint8_t *data, uint len)
+{
+    EthernetII pdu(data, len);
+    if (pdu.payload_type() == ETHERTYPE_ARP) {
+        const ARP& arp = pdu.rfind_pdu<ARP>();
+        return arp.target_ip_addr();
+    }
+    return 0x0;
+}
+
 uint8_t arp_reply(uint8_t *reply_data, uint8_t *request_data, uint len,
         const uint8_t *mac)
 {
@@ -69,8 +82,14 @@
 bool _parse_nd(EthernetII &pdu)
 {
     if (pdu.payload_type() == ETHERTYPE_IPV6) {
-        const ICMPv6& icmp6 = pdu.rfind_pdu<ICMPv6>();
-        return icmp6.type() == ICMPv6::NEIGHBOUR_SOLICIT;
+        try {
+            const ICMPv6& icmp6 = pdu.rfind_pdu<ICMPv6>();
+            return icmp6.type() == ICMPv6::NEIGHBOUR_SOLICIT;
+        }
+        catch (Tins::pdu_not_found& e) {
+            /* If it is not an ICMPv6 message, it can not be a NEIGHBOUR_SOLICIT */
+            return false;
+        }
     }
     return false;
 }

open5gs_2.6.4.tar.xz/src/upf/arp-nd.h -> open5gs_2.6.5.tar.xz/src/upf/arp-nd.h Changed

open5gs_2.6.4.tar.xz/src/upf/gtp-path.c -> open5gs_2.6.5.tar.xz/src/upf/gtp-path.c Changed

@@ -123,7 +123,9 @@
         uint8_t size;
 
         if (eth_type == ETHERTYPE_ARP) {
-            if (is_arp_req(recvbuf->data, recvbuf->len)) {
+            if (is_arp_req(recvbuf->data, recvbuf->len) &&
+                    upf_sess_find_by_ipv4(
+                        arp_parse_target_addr(recvbuf->data, recvbuf->len))) {
                 replybuf = ogs_pkbuf_alloc(packet_pool, OGS_MAX_PKT_LEN);
                 ogs_assert(replybuf);
                 ogs_pkbuf_reserve(replybuf, OGS_TUN_MAX_HEADROOM);
@@ -212,7 +214,7 @@
         upf_sess_urr_acc_add(sess, pdr->urri, recvbuf->len, false);
 
     ogs_assert(true == ogs_pfcp_up_handle_pdr(
-                pdr, OGS_GTPU_MSGTYPE_GPDU, recvbuf, &report));
+                pdr, OGS_GTPU_MSGTYPE_GPDU, NULL, recvbuf, &report));
 
     /*
      * Issue #2210, Discussion #2208, #2209
@@ -268,11 +270,9 @@
     ogs_sockaddr_t from;
 
     ogs_gtp2_header_t *gtp_h = NULL;
+    ogs_gtp2_header_desc_t header_desc;
     ogs_pfcp_user_plane_report_t report;
 
-    uint32_t teid;
-    uint8_t qfi;
-
     ogs_assert(fd != INVALID_SOCKET);
     sock = data;
     ogs_assert(sock);
@@ -301,7 +301,13 @@
         goto cleanup;
     }
 
-    if (gtp_h->type == OGS_GTPU_MSGTYPE_ECHO_REQ) {
+    len = ogs_gtpu_parse_header(&header_desc, pkbuf);
+    if (len < 0) {
+        ogs_error("DROP Cannot decode GTPU packet");
+        ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
+        goto cleanup;
+    }
+    if (header_desc.type == OGS_GTPU_MSGTYPE_ECHO_REQ) {
         ogs_pkbuf_t *echo_rsp;
 
         ogs_debug("RECV Echo Request from %s", OGS_ADDR(&from, buf1));
@@ -322,55 +328,24 @@
         }
         goto cleanup;
     }
-
-    teid = be32toh(gtp_h->teid);
-
-    ogs_trace("RECV GPU-U Type %d from %s : TEID0x%x",
-            gtp_h->type, OGS_ADDR(&from, buf1), teid);
-
-    qfi = 0;
-    if (gtp_h->flags & OGS_GTPU_FLAGS_E) {
-        /*
-         * TS29.281
-         * 5.2.1 General format of the GTP-U Extension Header
-         * Figure 5.2.1-3: Definition of Extension Header Type
-         *
-         * Note 4 : For a GTP-PDU with several Extension Headers, the PDU
-         *          Session Container should be the first Extension Header
-         */
-        ogs_gtp2_extension_header_t *extension_header =
-            (ogs_gtp2_extension_header_t *)(pkbuf->data+OGS_GTPV1U_HEADER_LEN);
-        ogs_assert(extension_header);
-        if (extension_header->type ==
-                OGS_GTP2_EXTENSION_HEADER_TYPE_PDU_SESSION_CONTAINER) {
-            if (extension_header->pdu_type ==
-                OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_UL_PDU_SESSION_INFORMATION) {
-                    ogs_trace("   QFI 0x%x",
-                            extension_header->qos_flow_identifier);
-                    qfi = extension_header->qos_flow_identifier;
-            }
-        }
-    }
-
-    /* Remove GTP header and send packets to TUN interface */
-    len = ogs_gtpu_header_len(pkbuf);
-    if (len < 0) {
-        ogs_error("DROP Cannot decode GTPU packet");
-        ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
-        goto cleanup;
-    }
-    if (gtp_h->type != OGS_GTPU_MSGTYPE_END_MARKER &&
+    if (header_desc.type != OGS_GTPU_MSGTYPE_END_MARKER &&
         pkbuf->len <= len) {
-        ogs_error("DROP Small GTPU packet(type:%d len:%d)", gtp_h->type, len);
+        ogs_error("DROP Small GTPU packet(type:%d len:%d)",
+                header_desc.type, len);
         ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
         goto cleanup;
     }
+
+    ogs_trace("RECV GPU-U Type %d from %s : TEID0x%x",
+            header_desc.type, OGS_ADDR(&from, buf1), header_desc.teid);
+
+    /* Remove GTP header and send packets to TUN interface */
     ogs_assert(ogs_pkbuf_pull(pkbuf, len));
 
-    if (gtp_h->type == OGS_GTPU_MSGTYPE_END_MARKER) {
+    if (header_desc.type == OGS_GTPU_MSGTYPE_END_MARKER) {
         /* Nothing */
 
-    } else if (gtp_h->type == OGS_GTPU_MSGTYPE_ERR_IND) {
+    } else if (header_desc.type == OGS_GTPU_MSGTYPE_ERR_IND) {
         ogs_pfcp_far_t *far = NULL;
 
         far = ogs_pfcp_far_find_by_gtpu_error_indication(pkbuf);
@@ -392,7 +367,7 @@
             ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
         }
 
-    } else if (gtp_h->type == OGS_GTPU_MSGTYPE_GPDU) {
+    } else if (header_desc.type == OGS_GTPU_MSGTYPE_GPDU) {
         uint16_t eth_type = 0;
         struct ip *ip_h = NULL;
         uint32_t *src_addr = NULL;
@@ -417,11 +392,11 @@
          */
 #if 0
         upf_metrics_inst_global_inc(UPF_METR_GLOB_CTR_GTP_INDATAPKTN3UPF);
-        upf_metrics_inst_by_qfi_add(qfi,
+        upf_metrics_inst_by_qfi_add(header_desc.qos_flow_identifier,
                 UPF_METR_CTR_GTP_INDATAVOLUMEQOSLEVELN3UPF, pkbuf->len);
 #endif
 
-        pfcp_object = ogs_pfcp_object_find_by_teid(teid);
+        pfcp_object = ogs_pfcp_object_find_by_teid(header_desc.teid);
         if (!pfcp_object) {
             /*
              * TS23.527 Restoration procedures
@@ -438,9 +413,11 @@
                         ogs_app()->time.message.pfcp.association_interval))) {
                 ogs_error("%s Send Error Indication TEID:0x%x to %s",
                         OGS_ADDR(&sock->local_addr, buf1),
-                        teid,
+                        header_desc.teid,
                         OGS_ADDR(&from, buf2));
-                ogs_gtp1_send_error_indication(sock, teid, qfi, &from);
+                ogs_gtp1_send_error_indication(
+                        sock, header_desc.teid,
+                        header_desc.qos_flow_identifier, &from);
             }
             goto cleanup;
         }
@@ -464,11 +441,12 @@
                     continue;
 
                 /* Check if TEID */
-                if (teid != pdr->f_teid.teid)
+                if (header_desc.teid != pdr->f_teid.teid)
                     continue;
 
                 /* Check if QFI */
-                if (qfi && pdr->qfi != qfi)
+                if (header_desc.qos_flow_identifier &&
+                    pdr->qfi != header_desc.qos_flow_identifier)
                     continue;
 
                 /* Check if Rule List in PDR */
@@ -491,14 +469,16 @@
                  */
                 if (ogs_time_ntp32_now() >
                        (ogs_pfcp_self()->local_recovery +
-                        ogs_time_sec(
-                            ogs_app()->time.message.pfcp.association_interval))) {
+                        ogs_time_sec(ogs_app()->time.message.pfcp.
+                            association_interval))) {
                     ogs_error(
                             "%s Send Error Indication TEID:0x%x to %s",
                             OGS_ADDR(&sock->local_addr, buf1),
-                            teid,
+                            header_desc.teid,
                             OGS_ADDR(&from, buf2));
-                    ogs_gtp1_send_error_indication(sock, teid, qfi, &from);
+                    ogs_gtp1_send_error_indication(
+                            sock, header_desc.teid,
+                            header_desc.qos_flow_identifier, &from);
                 }
                 goto cleanup;
             }
@@ -538,7 +518,7 @@
                     /* Or source IP address should match a framed route */
                 } else {
                     ogs_error("DROP Source IP-%d Spoofing APN:%s SrcIf:%d DstIf:%d TEID:0x%x",
-                                ip_h->ip_v, pdr->dnn, pdr->src_if, far->dst_if, teid);
+                                ip_h->ip_v, pdr->dnn, pdr->src_if, far->dst_if, header_desc.teid);
                     ogs_error("       SRC:%08X, UE:%08X",
                         be32toh(src_addr0), be32toh(sess->ipv4->addr0));
                     ogs_log_hexdump(OGS_LOG_ERROR, pkbuf->data, pkbuf->len);
@@ -616,7 +596,7 @@
                     /* Or source IP address should match a framed route */
                 } else {
                     ogs_error("DROP Source IP-%d Spoofing APN:%s SrcIf:%d DstIf:%d TEID:0x%x",

open5gs_2.6.4.tar.xz/src/upf/n4-build.c -> open5gs_2.6.5.tar.xz/src/upf/n4-build.c Changed

open5gs_2.6.4.tar.xz/src/upf/n4-handler.c -> open5gs_2.6.5.tar.xz/src/upf/n4-handler.c Changed

open5gs_2.6.4.tar.xz/src/upf/pfcp-path.c -> open5gs_2.6.5.tar.xz/src/upf/pfcp-path.c Changed

open5gs_2.6.5.tar.xz/subprojects/freeDiameter/.meson-subproject-wrap-hash.txt Added

open5gs_2.6.5.tar.xz/subprojects/libtins/.meson-subproject-wrap-hash.txt Added

open5gs_2.6.5.tar.xz/subprojects/prometheus-client-c/.meson-subproject-wrap-hash.txt Added

open5gs_2.6.5.tar.xz/subprojects/usrsctp/.meson-subproject-wrap-hash.txt Added

open5gs_2.6.4.tar.xz/tests/af/sbi-path.c -> open5gs_2.6.5.tar.xz/tests/af/sbi-path.c Changed

open5gs_2.6.4.tar.xz/tests/app/5gc-init.c -> open5gs_2.6.5.tar.xz/tests/app/5gc-init.c Changed

open5gs_2.6.4.tar.xz/tests/app/app-init.c -> open5gs_2.6.5.tar.xz/tests/app/app-init.c Changed

open5gs_2.6.4.tar.xz/tests/app/epc-init.c -> open5gs_2.6.5.tar.xz/tests/app/epc-init.c Changed

open5gs_2.6.4.tar.xz/tests/attach/abts-main.c -> open5gs_2.6.5.tar.xz/tests/attach/abts-main.c Changed

open5gs_2.6.5.tar.xz/tests/attach/crash-test.c Added

@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2023 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "test-common.h"
+
+static void test1_func(abts_case *tc, void *data)
+{
+    int rv;
+    ogs_socknode_t *s1ap;
+    ogs_pkbuf_t *sendbuf;
+    ogs_pkbuf_t *recvbuf;
+
+    s1ap = tests1ap_client(AF_INET);
+    ABTS_PTR_NOTNULL(tc, s1ap);
+
+    sendbuf = test_s1ap_build_malformed_s1_setup_request(0);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+
+    rv = testenb_s1ap_send(s1ap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    recvbuf = testenb_s1ap_read(s1ap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    ogs_pkbuf_free(recvbuf);
+
+    testenb_s1ap_close(s1ap);
+}
+
+static void test2_func(abts_case *tc, void *data)
+{
+    int rv;
+    ogs_socknode_t *s1ap;
+    ogs_pkbuf_t *sendbuf;
+    ogs_pkbuf_t *recvbuf = NULL;
+    ogs_s1ap_message_t message;
+    int i;
+
+    s1ap = tests1ap_client(AF_INET);
+    ABTS_PTR_NOTNULL(tc, s1ap);
+
+    sendbuf = test_s1ap_build_s1_setup_request(
+            S1AP_ENB_ID_PR_macroENB_ID, 0x54f64);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+
+    rv = testenb_s1ap_send(s1ap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    recvbuf = testenb_s1ap_read(s1ap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    ogs_pkbuf_free(recvbuf);
+
+    sendbuf = test_s1ap_build_malformed_enb_status_transfer(0);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+
+    rv = testenb_s1ap_send(s1ap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    recvbuf = testenb_s1ap_read(s1ap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    ogs_pkbuf_free(recvbuf);
+
+    testenb_s1ap_close(s1ap);
+}
+
+#if 0
+static void test3_func(abts_case *tc, void *data)
+{
+    int rv;
+    ogs_socknode_t *s1ap;
+    ogs_pkbuf_t *sendbuf;
+    ogs_pkbuf_t *recvbuf;
+
+    s1ap = tests1ap_client(AF_INET);
+    ABTS_PTR_NOTNULL(tc, s1ap);
+
+    sendbuf = test_s1ap_build_oversized_message(0);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+
+    rv = testenb_s1ap_send(s1ap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    recvbuf = testenb_s1ap_read(s1ap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    ogs_pkbuf_free(recvbuf);
+
+    testenb_s1ap_close(s1ap);
+}
+#endif
+
+abts_suite *test_crash(abts_suite *suite)
+{
+    suite = ADD_SUITE(suite)
+
+    abts_run_test(suite, test1_func, NULL);
+    abts_run_test(suite, test2_func, NULL);
+#if 0
+    abts_run_test(suite, test3_func, NULL);
+#endif
+
+    return suite;
+}

open5gs_2.6.4.tar.xz/tests/attach/issues-test.c -> open5gs_2.6.5.tar.xz/tests/attach/issues-test.c Changed

@@ -362,11 +362,1513 @@
     test_ue_remove(test_ue);
 }
 
+/*
+- v2.6.3 Analysis
+05/03 13:01:08.318 1101136515 486875/209 12/322  Attach request
+05/03 13:01:08.318 1101136515 486875/209 12/322  emm_state_initial_context_setup(): ENTRY
+05/03 13:01:08.318 1101136515 486875/209 12/322  mme_bearer_find_or_add_by_message() PTI:7, EBI:0
+05/03 13:01:08.318 1101136515 486875/209 12/322  esm_state_inactive(): ENTRY
+05/03 13:01:08.318 1101136515 486875/209 12/322  PDN Connectivity request
+05/03 13:01:08.318 1101136515 486875/209 12/322  ESM information request
+05/03 13:01:08.331 1101133226 486874/881 582/1029  mme_bearer_find_or_add_by_message() PTI:2, EBI:0
+05/03 13:01:08.331 1101133226 486874/881 582/1029  esm_state_inactive(): ENTRY
+05/03 13:01:08.331 1101133226 486874/881 582/1029  PDN Connectivity request
+05/03 13:01:08.331 1101133226 486874/881 582/1029  PDN connectivity reject(ims)
+05/03 13:01:08.331 1101133226 486874/881 582/1029  esm_state_exception(): ENTRY
+05/03 13:01:08.331 1101133226 486874/881 582/1029  Removed Number of MME-Sessions is now 28
+05/03 13:01:08.335 1101136515 486875/209 12/322  mme_bearer_find_or_add_by_message() PTI:7, EBI:0
+05/03 13:01:08.335 1101136515 486875/209 12/322  ESM information response
+05/03 13:01:08.338 1101136515 486875/209 12/322  Attach accept
+05/03 13:01:08.338 1101136515 486875/209 12/322  Activate default bearer context request
+05/03 13:01:08.338 1101136515 486875/209 12/322  InitialContextSetupRequest
+05/03 13:01:08.631 1101136515 486875/209 12/322  InitialContextSetupResponse
+05/03 13:01:08.633 1101136515 486875/209 12/322  UECapabilityInfoIndication
+05/03 13:01:08.636 1101136515 486875/209 12/322  emm_state_initial_context_setup(): MME_EVENT_EMM_MESSAGE
+05/03 13:01:08.636 1101136515 486875/209 12/322  Attach complete
+05/03 13:01:08.636 1101136515 486875/209 12/322  EMM information
+05/03 13:01:08.636 1101136515 486875/209 12/322  mme_bearer_find_or_add_by_message() PTI:0, EBI:5
+05/03 13:01:08.636 1101136515 486875/209 12/322  esm_state_inactive(): MME_EVENT_ESM_MESSAGE
+05/03 13:01:08.636 1101136515 486875/209 12/322  Activate default EPS bearer context accept
+05/03 13:01:08.636 1101136515 486875/209 12/322  esm_state_active(): ENTRY
+05/03 13:01:08.671 1101136515 486875/209 12/322  mme_bearer_find_or_add_by_message() PTI:8, EBI:0
+05/03 13:01:08.671 1101136515 486875/209 12/322  esm_state_inactive(): ENTRY
+05/03 13:01:08.671 1101136515 486875/209 12/322  PDN Connectivity request
+05/03 13:01:08.671 1101136515 486875/209 12/322  PDN connectivity reject(ims)
+05/03 13:01:08.671 1101136515 486875/209 12/322  esm_state_exception(): ENTRY
+05/03 13:01:08.671 1101136515 486875/209 12/322  Removed Number of MME-Sessions is now 28
+05/03 13:02:09.026 1101136515 655305/195 798/839 Attach request
+05/03 13:02:09.026 1101136515 655305/195 798/839 emm_state_initial_context_setup() : ENTRY
+05/03 13:02:09.026 1101136515 655305/195 798/839 mme_bearer_find_or_add_by_message() PTI:21, EBI:0
+05/03 13:02:09.026 1101136515 655305/195 798/839 esm_state_inactive(): ENTRY
+05/03 13:02:09.026 1101136515 655305/195 798/839 PDN Connectivity request
+05/03 13:02:09.026 1101136515 655305/195 798/839 ESM information request
+05/03 13:02:09.042 1101136515 655305/195 798/839 ESM information response
+05/03 13:02:09.046 1101136515 655305/195 798/839 Attach accept
+05/03 13:02:09.046 1101136515 655305/195 798/839 Activate default bearer context request
+05/03 13:02:09.046 1101136515 655305/195 798/839 InitialContextSetupRequest
+05/03 13:02:09.289 1101136515 655305/195 798/839 Attach complete
+05/03 13:02:09.290 1101136515 655305/195 798/839 mme_bearer_find_or_add_by_message() PTI:0, EBI:5
+05/03 13:02:09.290 1101136515 655305/195 798/839 Activate default EPS bearer context accept
+05/03 13:02:09.290 1101136515 655305/195 798/839 esm_state_active(): ENTRY
+05/03 13:02:09.290 1101136515 655305/195 798/839 InitialContextSetupResponse
+05/03 13:02:09.209 1101136515 655305/195 798/839 UECapabilityInfoIndication
+05/03 13:02:17.442 1101136515 655305/195 798/839 Detach request
+05/03 13:02:17.445 1101136515 655305/195 798/839 Detach accept
+05/03 13:02:17.445 1101136515 655305/195 798/839 UEContextReleaseCommand
+05/03 13:02:17.463 1101136515 655305/195 798/839 UEContextReleaseComplete
+05/03 13:02:26.537 1101136519 486875/209 12/322  Detach request
+05/03 13:02:26.540 1101136519 486875/209 12/322  Detach accept
+05/03 13:02:26.540 1101136519 486875/209 12/322  UEContextReleaseCommand
+05/03 13:02:26.542 1101136519 486875/209 12/322  UEContextReleaseComplete
+05/03 13:02:27.706 1101136515 655308/176 798/17  Attach request
+05/03 13:02:27.706 1101136515 655308/176 798/17  emm_state_initial_context_setup(): ENTRY
+05/03 13:02:27.706 1101136515 655308/176 798/17  mme_bearer_find_or_add_by_message() PTI:22, EBI:0
+05/03 13:02:27.706 1101136515 655308/176 798/17  esm_state_inactive(): ENTRY
+05/03 13:02:27.706 1101136515 655308/176 798/17  PDN Connectivity request
+05/03 13:02:27.706 1101136515 655308/176 798/17  ESM information request
+05/03 13:02:27.918 1101136517 486880/200 995/841 UEContextReleaseRequest
+05/03 13:02:27.918 1101136517 486880/200 995/841 UEContextReleaseCommand
+05/03 13:02:27.921 1101136517 486880/200 995/841 UEContextReleaseComplete
+05/03 13:02:27.936 1101122519 655307/192 314/424 UEContextReleaseRequest
+05/03 13:02:27.936 1101122519 655307/192 314/424 UEContextReleaseCommand
+05/03 13:02:29.249 1101122519 655307/192 314/424 Detach request
+05/03 13:02:29.251 1101122519 655307/192 314/424 Detach accept
+05/03 13:02:30.130 1101136512 486719/913 881/969 Implicit MME Detach
+05/03 13:02:30.134 1101136512 486719/913 881/969 MME Purge-UE-Request
+05/03 13:02:30.134 1101136512 486719/913 881/969 MME Purge-UE-Answer
+05/03 13:02:30.740 1101226519 655307/192 314/424 UEContextReleaseComplete
+
+
+05/03 13:02:30.756 1101136515 655308/176 798/17  mme_bearer_find_or_add_by_message() PTI:22, EBI:0
+05/03 13:02:30.756 1101136515 655308/176 798/17  esm_state_inactive(): MME_EVENT_ESM_MESSAGE
+05/03 13:02:30.756 1101136515 655308/176 798/17  ESM information response
+05/03 13:02:30.756 1101136515 655308/176 798/0/0/47960/22915 Create Session Response
+05/03 13:02:30.760 1101136515 655308/176 798/17  Attach accept
+05/03 13:02:30.760 1101136515 655308/176 798/17  Activate default bearer context request
+05/03 13:02:30.760 1101136515 655308/176 798/0/0/47960 InitialContextSetupRequest
+
+
+05/03 13:02:32.118 1101136519 486882/214 12/656  InitialUEMessage(M_TMSI:0xc0000428)
+05/03 13:02:32.118 1101136519 486882/214 12/656  Attach request
+05/03 13:02:32.118 1101136519 486882/214 12/656  emm_state_initial_context_setup(): ENTRY
+05/03 13:02:32.118 1101136519 486882/214 12/656  mme_bearer_find_or_add_by_message() PTI:9, EBI:0
+05/03 13:02:32.118 1101136519 486882/214 12/656  esm_state_inactive(): ENTRY
+05/03 13:02:32.118 1101136519 486882/214 12/656  PDN Connectivity request
+05/03 13:02:32.118 1101136519 486882/214 12/656  ESM information request
+05/03 13:02:32.135 1101136519 486882/214 12/656  mme_bearer_find_or_add_by_message() PTI:9, EBI:0
+05/03 13:02:32.135 1101136519 486882/214 12/656  esm_state_inactive(): MME_EVENT_ESM_MESSAGE
+05/03 13:02:32.135 1101136519 486882/214 12/656  ESM information response
+05/03 13:02:32.135 1101136519 486882/214 12/0/0/26037/17607 Create Session Response
+05/03 13:02:32.138 1101136519 486882/214 12/656  Attch accept
+05/03 13:02:32.138 1101136519 486882/214 12/656  Activate default bearer context request
+05/03 13:02:32.139 1101136519 486882/214 12/0/0/26037 InitialContextSetupRequest
+05/03 13:02:32.433 1101136519 486882/214 12/656  InitialContextSetupResponse
+05/03 13:02:32.434 1101136519 486882/214 12/656  UECapabilityInfoIndication
+05/03 13:02:32.455 1101136519 486882/214 12/656  Attach complete
+05/03 13:02:32.455 1101136519 486882/214 12/656  mme_bearer_find_or_add_by_message() PTI:0, EBI:5
+05/03 13:02:32.455 1101136519 486882/214 12/656  esm_state_inactive(): MME_EVENT_ESM_MESSAGE
+05/03 13:02:32.455 1101136519 486882/214 12/656/4154952/26037 Activate default EPS bearer context accept
+05/03 13:02:32.455 1101136519 486882/214 12/656  esm_state_active(): ENTRY
+05/03 13:02:32.511 1101136519 486882/214 12/656  mme_bearer_find_or_add_by_message() PTI:10, EBI:0
+05/03 13:02:32.511 1101136519 486882/214 12/656  esm_state_inactive(): ENTRY
+05/03 13:02:32.511 1101136519 486882/214 12/656  PDN Connectivity request
+05/03 13:02:32.511 1101136519 486882/214 12/656  PDN Connectivity reject(ims)
+05/03 13:02:32.511 1101136519 486882/214 12/656  esm_state_exception(): ENTRY
+05/03 13:02:32.511 1101136519 486882/214 12/656  Removed Number of MME-Sessions is now 27
+
+
+05/03 13:02:33.190 1101136515 655308/176 798/17/55919304/26037 InitialContextSetupResponse
+05/03 13:02:33.191 1101136515 655308/176 798/17  UECapabilityInfoIndication
+05/03 13:02:33.209 1101136515 655308/176 798/17  Attach complete
+05/03 13:02:33.209 1101136515 655308/176 798/17  mme_bearer_find_or_add_by_message() PTI:0, EBI:5
+05/03 13:02:33.209 1101136515 655308/176 798/17  esm_state_active(): MME_EVENT_ESM_MESSAGE
+05/03 13:02:33.209 1101136515 655308/176 798/17  ERROR: Unknown message(type:194)
+
+
+05/03 13:02:33.636 1101136519 486882/214 12/656  UECapabilityInfoIndication
+05/03 13:02:33.713 1101136519 486882/214 12/656  E_RABModificationIndication
+05/03 13:02:33.713 1101136519 486882/214 12/656  E-RABModificationConfirm
+05/03 13:02:36.067 1101136515 655308/176 798/17  UECapabilityInfoIndication
+05/03 13:02:36.067 1101136515 655308/176 798/17  Detach request
+05/03 13:02:36.069 1101136519 486882/214 12/656  Detach accept
+05/03 13:02:36.069 1101136519 486882/214 12/656  UEContextReleaseCommand
+05/03 13:02:36.072 1101136519 486882/214 12/656  UEContextReleaseComplete
+05/03 13:02:36.178 1101122519 655309/223 314/412 Attach request
+05/03 13:02:36.178 1101122519 655309/223 314/412 emm_state_initial_context_setup(): ENTRY
+05/03 13:02:36.178 1101122519 655309/223 314/412 mme_bearer_find_or_add_by_message() PTI:15, EBI:0
+05/03 13:02:36.178 1101122519 655309/223 314/412 esm_state_inactive()
+05/03 13:02:36.178 1101122519 655309/223 314/412 PDN Connectivity request
+05/03 13:02:36.178 1101122519 655309/223 314/412 ESM information request
+05/03 13:02:36.194 1101122519 655309/223 314/412 ESM information response
+05/03 13:02:36.197 1101122519 655309/223 314/412 Attach accept
+05/03 13:02:36.197 1101122519 655309/223 314/412 Activate default bearer context request
+05/03 13:02:36.197 1101122519 655309/223 314/412 InitialContextSetupRequest
+05/03 13:02:36.254 1101136515 655308/176 798/17  E_RABModificationIndication
+05/03 13:02:36.254 1101136515 655308/176 798/17  ERROR: No Bearer 5
+05/03 13:02:36.408 1101136519 486883/907  Service request
+05/03 13:02:36.408 1101136519 486883/907  ERROR: No Session Context
+05/03 13:02:36.408 1101136519 486883/907  Service reject
+05/03 13:02:36.408 1101136519 486883/907  UEContextReleaseCommand
+05/03 13:02:36.410 1101136519 486883/907  UEContextReleaseComplete
+05/03 13:02:36.410 1101122519 655309/223 314/412 MME Purge-UE-Request
+05/03 13:02:36.413 1101122519 655309/223 314/412 MME Purge-UE-Answer
+05/03 13:02:36.514 1101122519 655309/223 314/412 InitialContextSetupResponse
+05/03 13:02:36.515 1101122519 655309/223 314/412 UECapabilityInfoIndication
+05/03 13:02:36.545 1101122519 655309/223 314/412 Attach complete
+05/03 13:02:36.545 1101122519 655309/223 314/412 mme_bearer_find_or_add_by_message() PTI:0, EBI:5
+05/03 13:02:36.545 1101122519 655309/223 314/412 Activate default EPS bearer context accept
+05/03 13:02:36.545 1101122519 655309/223 314/412 esm_state_active()
+05/03 13:02:36.584 1101136519 486884/261 473/992 Attach request
+05/03 13:02:36.587 1101136519 486884/261 473/992 Authentication request
+05/03 13:02:36.639 1101136519 486884/261 473/992 Authentication response
+05/03 13:02:36.639 1101136519 486884/261 473/992 Security mode command
+05/03 13:02:36.656 1101136519 486884/261 473/992 Security mode complete
+05/03 13:02:36.661 1101136519 486884/261 473/992 mme_bearer_find_or_add_by_message() PTI:11, EBI:0
+05/03 13:02:36.661 1101136519 486884/261 473/992 esm_state_inactive()
+05/03 13:02:36.661 1101136519 486884/261 473/992 PDN connection request
+05/03 13:02:36.661 1101136519 486884/261 473/992 ESM information request
+05/03 13:02:36.678 1101136519 486884/261 473/992 ESM information response
+05/03 13:02:36.680 1101136519 486884/261 473/992 Attach accept
+05/03 13:02:36.680 1101136519 486884/261 473/992 InitialContextSetupRequest
+05/03 13:02:36.968 1101136519 486884/261 473/992 InitialContextSetupResponse
+05/03 13:02:36.969 1101136519 486884/261 473/992 UECapabilityInfoIndication
+05/03 13:02:36.991 1101136519 486884/261 473/992 Attach complete
+05/03 13:02:36.991 1101136519 486884/261 473/992 Activate default EPS bearer context accept
+05/03 13:02:36.991 1101136519 486884/261 473/992 esm_state_inactive()
+05/03 13:02:37.253 1101136515 655308/176 798/17  UECapabilityInfoIndication
+05/03 13:02:38.162 1101136519 486884/261 473/992 UECapabilityInfoIndication
+05/03 13:02:38.232 1101136519 486884/261 473/992 E_RABModificationIndication
+05/03 13:02:38.232 1101136519 486884/261 473/992 E-RABModificationConfirm
+05/03 13:02:38.260 1101136515 655308/176 798/17  UEContextReleaseRequest
+05/03 13:02:38.767 1101136514 486877/270 874/207 UEContextReleaseRequest
+05/03 13:02:38.768 1101136514 486877/270 874/207 UEContextReleaseCommand
+05/03 13:02:38.769 1101136514 486877/270 874/207 UEContextReleaseComplete
+05/03 13:02:45.768 1101136515 655308/176 798/17  LOCAL  No Response. Give up! for step 1 type 170 peer
+05/03 13:02:45.768 1101136515 655308/176 798/17  UEContextReleaseCommand
+05/03 13:02:45.768 1101136515 655308/176 798/17  GTP Timeout : IMSI1101136515 Message-Type170
+05/03 13:02:45.996 1101136515 655310/123         Attach Request
+05/03 13:02:45.966 1101136515 655310/123         FATAL
+*/
+
+#define NUM_OF_TEST_UE 3
+
+static void issues_2287_v263_func(abts_case *tc, void *data)
+{
+    int rv, i;
+    ogs_socknode_t *s1ap;
+    ogs_socknode_t *gtpu;
+    ogs_pkbuf_t *emmbuf;

open5gs_2.6.4.tar.xz/tests/attach/meson.build -> open5gs_2.6.5.tar.xz/tests/attach/meson.build Changed

open5gs_2.6.4.tar.xz/tests/attach/s1setup-test.c -> open5gs_2.6.5.tar.xz/tests/attach/s1setup-test.c Changed

@@ -100,24 +100,48 @@
 static void s1setup_test3(abts_case *tc, void *data)
 {
     int rv;
-    ogs_socknode_t *s1ap;
+    ogs_socknode_t *nodeNUM_OF_TEST_ENB;
     ogs_pkbuf_t *sendbuf;
     ogs_pkbuf_t *recvbuf;
+    ogs_s1ap_message_t message;
+    int i;
 
-    s1ap = tests1ap_client(AF_INET);
-    ABTS_PTR_NOTNULL(tc, s1ap);
+    i = 0;
+    nodei = tests1ap_client(AF_INET);
+    ABTS_PTR_NOTNULL(tc, nodei);
 
-    sendbuf = test_s1ap_build_invalid_packet(0);
+    sendbuf = test_s1ap_build_s1_setup_request(
+            S1AP_ENB_ID_PR_macroENB_ID, 0x54f64+i);
     ABTS_PTR_NOTNULL(tc, sendbuf);
 
-    rv = testenb_s1ap_send(s1ap, sendbuf);
+    rv = testenb_s1ap_send(nodei, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
-    recvbuf = testenb_s1ap_read(s1ap);
+    recvbuf = testenb_s1ap_read(nodei);
     ABTS_PTR_NOTNULL(tc, recvbuf);
+
+    rv = ogs_s1ap_decode(&message, recvbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    ogs_s1ap_free(&message);
+    ogs_pkbuf_free(recvbuf);
+
+    sendbuf = test_s1ap_build_enb_configuration_update(0);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+
+    rv = testenb_s1ap_send(nodei, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    recvbuf = testenb_s1ap_read(nodei);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+
+    rv = ogs_s1ap_decode(&message, recvbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    ogs_s1ap_free(&message);
     ogs_pkbuf_free(recvbuf);
 
-    testenb_s1ap_close(s1ap);
+    testenb_s1ap_close(nodei);
 }
 
 abts_suite *test_s1setup(abts_suite *suite)

open5gs_2.6.4.tar.xz/tests/common/application.c -> open5gs_2.6.5.tar.xz/tests/common/application.c Changed

open5gs_2.6.4.tar.xz/tests/common/context.c -> open5gs_2.6.5.tar.xz/tests/common/context.c Changed

@@ -127,7 +127,8 @@
 
     if (test_self()->nr_served_taiindex.list2.num) {
         memcpy(&test_self()->nr_tai,
-            &test_self()->nr_served_taiindex.list2.tai0, sizeof(ogs_5gs_tai_t));
+            &test_self()->nr_served_taiindex.list2.tai0,
+            sizeof(ogs_5gs_tai_t));
     } else if (test_self()->nr_served_taiindex.list1.tai0.num) {
         test_self()->nr_tai.tac =
             test_self()->nr_served_taiindex.list1.tai0.tac;
@@ -293,7 +294,7 @@
                                 NULL, self.ngap_port, NULL);
                         ogs_assert(rv == OGS_OK);
                     }
-                } if (!strcmp(amf_key, "tai")) {
+                } else if (!strcmp(amf_key, "tai")) {
                     int num_of_list0 = 0;
                     int num_of_list1 = 0;
                     ogs_5gs_tai0_list_t *list0 = NULL;
@@ -620,10 +621,7 @@
                         }
                     } while (ogs_yaml_iter_type(&plmn_support_array) ==
                             YAML_SEQUENCE_NODE);
-                } else if (!strcmp(amf_key, "sbi")) {
-                    /* handle config in sbi library */
-                } else
-                    ogs_warn("unknown key `%s`", amf_key);
+                }
             }
         } else if (!strcmp(root_key, "mme")) {
             ogs_yaml_iter_t mme_iter;

open5gs_2.6.4.tar.xz/tests/common/context.h -> open5gs_2.6.5.tar.xz/tests/common/context.h Changed

open5gs_2.6.4.tar.xz/tests/common/gsm-build.c -> open5gs_2.6.5.tar.xz/tests/common/gsm-build.c Changed

@@ -242,7 +242,7 @@
                 sizeof(qos_flow_description0.paramnum_of_param.br);
             ogs_nas_bitrate_from_uint64(
                     &qos_flow_description0.paramnum_of_param.br,
-                    32*1024);
+                    32*1000);
             num_of_param++;
             qos_flow_description0.paramnum_of_param.identifier =
                 OGS_NAX_QOS_FLOW_PARAMETER_ID_GFBR_DOWNLINK;
@@ -250,7 +250,7 @@
                 sizeof(qos_flow_description0.paramnum_of_param.br);
             ogs_nas_bitrate_from_uint64(
                     &qos_flow_description0.paramnum_of_param.br,
-                    48*1024);
+                    48*1000);
             num_of_param++;
             qos_flow_description0.paramnum_of_param.identifier =
                 OGS_NAX_QOS_FLOW_PARAMETER_ID_MFBR_UPLINK;
@@ -258,7 +258,7 @@
                 sizeof(qos_flow_description0.paramnum_of_param.br);
             ogs_nas_bitrate_from_uint64(
                     &qos_flow_description0.paramnum_of_param.br,
-                    16*1024);
+                    16*1000);
             num_of_param++;
             qos_flow_description0.paramnum_of_param.identifier =
                 OGS_NAX_QOS_FLOW_PARAMETER_ID_MFBR_DOWNLINK;
@@ -266,7 +266,7 @@
                 sizeof(qos_flow_description0.paramnum_of_param.br);
             ogs_nas_bitrate_from_uint64(
                     &qos_flow_description0.paramnum_of_param.br,
-                    64*1024);
+                    64*1000);
             num_of_param++;
         }

open5gs_2.6.4.tar.xz/tests/common/gtpu.c -> open5gs_2.6.5.tar.xz/tests/common/gtpu.c Changed

@@ -61,7 +61,8 @@
     ogs_sockaddr_t from;
     ogs_pkbuf_t *recvbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(recvbuf);
-    ogs_pkbuf_put(recvbuf, OGS_MAX_SDU_LEN);
+    ogs_pkbuf_reserve(recvbuf, 4); /* For additional extension header */
+    ogs_pkbuf_put(recvbuf, OGS_MAX_SDU_LEN-4);
 
     ogs_assert(node);
     ogs_assert(node->sock);
@@ -149,7 +150,7 @@
 found:
     ogs_assert(sess);
 
-    ip6_h = pkbuf->data + ogs_gtpu_header_len(pkbuf);
+    ip6_h = pkbuf->data + ogs_gtpu_parse_header(NULL, pkbuf);
     ogs_assert(ip6_h);
     if (ip6_h->ip6_nxt == IPPROTO_ICMPV6) {
         struct nd_router_advert *advert_h = (struct nd_router_advert *)
@@ -172,14 +173,12 @@
 
 int test_gtpu_send(
         ogs_socknode_t *node, test_bearer_t *bearer,
-        ogs_gtp2_header_t *gtp_hdesc, ogs_gtp2_extension_header_t *ext_hdesc,
-        ogs_pkbuf_t *pkbuf)
+        ogs_gtp2_header_desc_t *header_desc, ogs_pkbuf_t *pkbuf)
 {
     ogs_gtp_node_t gnode;
     test_sess_t *sess = NULL;
 
-    ogs_assert(gtp_hdesc);
-    ogs_assert(ext_hdesc);
+    ogs_assert(header_desc);
     ogs_assert(pkbuf);
 
     ogs_assert(bearer);
@@ -221,10 +220,7 @@
         ogs_assert_if_reached();
     }
 
-    ext_hdesc->pdu_type =
-        OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_UL_PDU_SESSION_INFORMATION;
-
-    return ogs_gtp2_send_user_plane(&gnode, gtp_hdesc, ext_hdesc, pkbuf);
+    return ogs_gtp2_send_user_plane(&gnode, header_desc, pkbuf);
 }
 
 int test_gtpu_send_ping(
@@ -233,8 +229,7 @@
     int rv;
     test_sess_t *sess = NULL;
 
-    ogs_gtp2_header_t gtp_hdesc;
-    ogs_gtp2_extension_header_t ext_hdesc;
+    ogs_gtp2_header_desc_t header_desc;
 
     ogs_pkbuf_t *pkbuf = NULL;
     ogs_ipsubnet_t dst_ipsub;
@@ -322,32 +317,31 @@
         ogs_assert_if_reached();
     }
 
-    memset(&gtp_hdesc, 0, sizeof(gtp_hdesc));
-    memset(&ext_hdesc, 0, sizeof(ext_hdesc));
+    memset(&header_desc, 0, sizeof(header_desc));
 
-    gtp_hdesc.type = OGS_GTPU_MSGTYPE_GPDU;
+    header_desc.type = OGS_GTPU_MSGTYPE_GPDU;
 
     if (bearer->qfi) {
-        gtp_hdesc.teid = sess->upf_n3_teid;
-        ext_hdesc.qos_flow_identifier = bearer->qfi;
-
+        header_desc.teid = sess->upf_n3_teid;
+        header_desc.pdu_type =
+            OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_UL_PDU_SESSION_INFORMATION;
+        header_desc.qos_flow_identifier = bearer->qfi;
     } else if (bearer->ebi) {
-        gtp_hdesc.teid = bearer->sgw_s1u_teid;
+        header_desc.teid = bearer->sgw_s1u_teid;
 
     } else {
         ogs_fatal("No QFI%d and EBI%d", bearer->qfi, bearer->ebi);
         ogs_assert_if_reached();
     }
 
-    return test_gtpu_send(node, bearer, &gtp_hdesc, &ext_hdesc, pkbuf);
+    return test_gtpu_send(node, bearer, &header_desc, pkbuf);
 }
 
 int test_gtpu_send_slacc_rs(ogs_socknode_t *node, test_bearer_t *bearer)
 {
     test_sess_t *sess = NULL;
 
-    ogs_gtp2_header_t gtp_hdesc;
-    ogs_gtp2_extension_header_t ext_hdesc;
+    ogs_gtp2_header_desc_t header_desc;
 
     ogs_pkbuf_t *pkbuf = NULL;
     struct ip6_hdr *ip6_h = NULL;
@@ -383,30 +377,30 @@
 
     ogs_pkbuf_trim(pkbuf, payload_len);
 
-    memset(&gtp_hdesc, 0, sizeof(gtp_hdesc));
-    memset(&ext_hdesc, 0, sizeof(ext_hdesc));
+    memset(&header_desc, 0, sizeof(header_desc));
 
-    gtp_hdesc.type = OGS_GTPU_MSGTYPE_GPDU;
-    gtp_hdesc.flags = OGS_GTPU_FLAGS_S;
+    header_desc.type = OGS_GTPU_MSGTYPE_GPDU;
+    header_desc.flags = OGS_GTPU_FLAGS_S;
 
     if (bearer->qfi) {
-        gtp_hdesc.teid = sess->upf_n3_teid;
-
 /*
  * Discussion #1506
  * Router Soliciation should include QFI in 5G Core
  */
-        ext_hdesc.qos_flow_identifier = bearer->qfi;
+        header_desc.teid = sess->upf_n3_teid;
+        header_desc.pdu_type =
+            OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_UL_PDU_SESSION_INFORMATION;
+        header_desc.qos_flow_identifier = bearer->qfi;
 
     } else if (bearer->ebi) {
-        gtp_hdesc.teid = bearer->sgw_s1u_teid;
+        header_desc.teid = bearer->sgw_s1u_teid;
 
     } else {
         ogs_fatal("No QFI%d and EBI%d", bearer->qfi, bearer->ebi);
         ogs_assert_if_reached();
     }
 
-    return test_gtpu_send(node, bearer, &gtp_hdesc, &ext_hdesc, pkbuf);
+    return test_gtpu_send(node, bearer, &header_desc, pkbuf);
 }
 
 int test_gtpu_send_slacc_rs_with_unspecified_source_address(
@@ -414,8 +408,7 @@
 {
     test_sess_t *sess = NULL;
 
-    ogs_gtp2_header_t gtp_hdesc;
-    ogs_gtp2_extension_header_t ext_hdesc;
+    ogs_gtp2_header_desc_t header_desc;
 
     ogs_pkbuf_t *pkbuf = NULL;
     struct ip6_hdr *ip6_h = NULL;
@@ -444,30 +437,31 @@
 
     ogs_pkbuf_trim(pkbuf, payload_len);
 
-    memset(&gtp_hdesc, 0, sizeof(gtp_hdesc));
-    memset(&ext_hdesc, 0, sizeof(ext_hdesc));
+    memset(&header_desc, 0, sizeof(header_desc));
 
-    gtp_hdesc.type = OGS_GTPU_MSGTYPE_GPDU;
-    gtp_hdesc.flags = OGS_GTPU_FLAGS_S;
+    header_desc.type = OGS_GTPU_MSGTYPE_GPDU;
+    header_desc.flags = OGS_GTPU_FLAGS_S;
 
     if (bearer->qfi) {
-        gtp_hdesc.teid = sess->upf_n3_teid;
-
+        header_desc.teid = sess->upf_n3_teid;
 /*
  * Discussion #1506
  * Router Soliciation should include QFI in 5G Core
  */
-        ext_hdesc.qos_flow_identifier = bearer->qfi;
+        header_desc.teid = sess->upf_n3_teid;
+        header_desc.pdu_type =
+            OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_UL_PDU_SESSION_INFORMATION;
+        header_desc.qos_flow_identifier = bearer->qfi;
 
     } else if (bearer->ebi) {
-        gtp_hdesc.teid = bearer->sgw_s1u_teid;
+        header_desc.teid = bearer->sgw_s1u_teid;
 
     } else {
         ogs_fatal("No QFI%d and EBI%d", bearer->qfi, bearer->ebi);
         ogs_assert_if_reached();
     }
 
-    return test_gtpu_send(node, bearer, &gtp_hdesc, &ext_hdesc, pkbuf);
+    return test_gtpu_send(node, bearer, &header_desc, pkbuf);
 }
 
 
@@ -477,8 +471,7 @@
     test_sess_t *sess = NULL;
     uint32_t teid = 0;
 
-    ogs_gtp2_header_t gtp_hdesc;
-    ogs_gtp2_extension_header_t ext_hdesc;
+    ogs_gtp2_header_desc_t header_desc;
 
     ogs_pkbuf_t *pkbuf = NULL;

open5gs_2.6.4.tar.xz/tests/common/gtpu.h -> open5gs_2.6.5.tar.xz/tests/common/gtpu.h Changed

open5gs_2.6.4.tar.xz/tests/common/ngap-build.c -> open5gs_2.6.5.tar.xz/tests/common/ngap-build.c Changed

@@ -37,7 +37,7 @@
 ogs_pkbuf_t *testngap_build_ng_setup_request(uint32_t gnb_id, uint8_t bitsize)
 {
     ogs_pkbuf_t *pkbuf = NULL;
-    int i, j;
+    int i, j, k, num = 0;
     ogs_plmn_id_t *plmn_id = NULL;
     const char *ran_node_name = "5G gNB-CU";
 
@@ -118,48 +118,58 @@
     ogs_asn_buffer_to_OCTET_STRING((char*)ran_node_name,
             strlen(ran_node_name), RANNodeName);
 
-    SupportedTAItem = CALLOC(1, sizeof(NGAP_SupportedTAItem_t));
     if (test_self()->nr_served_tai0.list2.num)
-        ogs_asn_uint24_to_OCTET_STRING(
-            test_self()->nr_served_tai0.list2.tai0.tac,
-            &SupportedTAItem->tAC);
+        num = test_self()->nr_served_tai0.list2.num;
     else if (test_self()->nr_served_tai0.list0.tai0.num)
-        ogs_asn_uint24_to_OCTET_STRING(
-            test_self()->nr_served_tai0.list0.tai0.tac0,
-                &SupportedTAItem->tAC);
+        num = test_self()->nr_served_tai0.list0.tai0.num;
     else
         ogs_assert_if_reached();
 
-    for (i = 0; i < test_self()->num_of_plmn_support; i++) {
-        plmn_id = &test_self()->plmn_supporti.plmn_id;
+    for (i = 0; i < num; i++) {
+        SupportedTAItem = CALLOC(1, sizeof(NGAP_SupportedTAItem_t));
+        if (test_self()->nr_served_tai0.list2.num)
+            ogs_asn_uint24_to_OCTET_STRING(
+                test_self()->nr_served_tai0.list2.taii.tac,
+                &SupportedTAItem->tAC);
+        else if (test_self()->nr_served_tai0.list0.tai0.num)
+            ogs_asn_uint24_to_OCTET_STRING(
+                test_self()->nr_served_tai0.list0.tai0.taci,
+                    &SupportedTAItem->tAC);
+        else
+            ogs_assert_if_reached();
+
+        for (j = 0; j < test_self()->num_of_plmn_support; j++) {
+            plmn_id = &test_self()->plmn_supportj.plmn_id;
 
-        BroadcastPLMNItem = CALLOC(1, sizeof(NGAP_BroadcastPLMNItem_t));
+            BroadcastPLMNItem = CALLOC(1, sizeof(NGAP_BroadcastPLMNItem_t));
 
-        ogs_asn_buffer_to_OCTET_STRING(
-                plmn_id, OGS_PLMN_ID_LEN, &BroadcastPLMNItem->pLMNIdentity);
+            ogs_asn_buffer_to_OCTET_STRING(
+                    plmn_id, OGS_PLMN_ID_LEN, &BroadcastPLMNItem->pLMNIdentity);
 
-        for (j = 0; j < test_self()->plmn_supporti.num_of_s_nssai; j++) {
-            ogs_s_nssai_t *s_nssai = &test_self()->plmn_supporti.s_nssaij;
-
-            SliceSupportItem = CALLOC(1, sizeof(NGAP_SliceSupportItem_t));
-            ogs_asn_uint8_to_OCTET_STRING(s_nssai->sst,
-                    &SliceSupportItem->s_NSSAI.sST);
-            if (s_nssai->sd.v != OGS_S_NSSAI_NO_SD_VALUE) {
-                SliceSupportItem->s_NSSAI.sD = CALLOC(1, sizeof(NGAP_SD_t));
-                ogs_asn_uint24_to_OCTET_STRING(
-                        s_nssai->sd, SliceSupportItem->s_NSSAI.sD);
+            for (k = 0; k < test_self()->plmn_supportj.num_of_s_nssai; k++) {
+                ogs_s_nssai_t *s_nssai =
+                    &test_self()->plmn_supportj.s_nssaik;
+
+                SliceSupportItem = CALLOC(1, sizeof(NGAP_SliceSupportItem_t));
+                ogs_asn_uint8_to_OCTET_STRING(s_nssai->sst,
+                        &SliceSupportItem->s_NSSAI.sST);
+                if (s_nssai->sd.v != OGS_S_NSSAI_NO_SD_VALUE) {
+                    SliceSupportItem->s_NSSAI.sD = CALLOC(1, sizeof(NGAP_SD_t));
+                    ogs_asn_uint24_to_OCTET_STRING(
+                            s_nssai->sd, SliceSupportItem->s_NSSAI.sD);
+                }
+
+                ASN_SEQUENCE_ADD(&BroadcastPLMNItem->tAISliceSupportList.list,
+                                SliceSupportItem);
             }
 
-            ASN_SEQUENCE_ADD(&BroadcastPLMNItem->tAISliceSupportList.list,
-                            SliceSupportItem);
+            ASN_SEQUENCE_ADD(&SupportedTAItem->broadcastPLMNList.list,
+                    BroadcastPLMNItem);
         }
 
-        ASN_SEQUENCE_ADD(&SupportedTAItem->broadcastPLMNList.list,
-                BroadcastPLMNItem);
+        ASN_SEQUENCE_ADD(&SupportedTAList->list, SupportedTAItem);
     }
 
-    ASN_SEQUENCE_ADD(&SupportedTAList->list, SupportedTAItem);
-
     *PagingDRX = NGAP_PagingDRX_v32;
 
     return ogs_ngap_encode(&pdu);
@@ -168,7 +178,7 @@
 ogs_pkbuf_t *testngap_build_ran_configuration_update(bool supported_ta_list)
 {
     ogs_pkbuf_t *pkbuf = NULL;
-    int i, j;
+    int i, j, k, num;
     ogs_plmn_id_t *plmn_id = NULL;
 
     NGAP_NGAP_PDU_t pdu;
@@ -210,48 +220,62 @@
 
         SupportedTAList = &ie->value.choice.SupportedTAList;
 
-        SupportedTAItem = CALLOC(1, sizeof(NGAP_SupportedTAItem_t));
         if (test_self()->nr_served_tai0.list2.num)
-            ogs_asn_uint24_to_OCTET_STRING(
-                test_self()->nr_served_tai0.list2.tai0.tac,
-                &SupportedTAItem->tAC);
+            num = test_self()->nr_served_tai0.list2.num;
         else if (test_self()->nr_served_tai0.list0.tai0.num)
-            ogs_asn_uint24_to_OCTET_STRING(
-                test_self()->nr_served_tai0.list0.tai0.tac0,
-                    &SupportedTAItem->tAC);
+            num = test_self()->nr_served_tai0.list0.tai0.num;
         else
             ogs_assert_if_reached();
 
-        for (i = 0; i < test_self()->num_of_plmn_support; i++) {
-            plmn_id = &test_self()->plmn_supporti.plmn_id;
-
-            BroadcastPLMNItem = CALLOC(1, sizeof(NGAP_BroadcastPLMNItem_t));
-
-            ogs_asn_buffer_to_OCTET_STRING(
-                    plmn_id, OGS_PLMN_ID_LEN, &BroadcastPLMNItem->pLMNIdentity);
-
-            for (j = 0; j < test_self()->plmn_supporti.num_of_s_nssai; j++) {
-                ogs_s_nssai_t *s_nssai =
-                    &test_self()->plmn_supporti.s_nssaij;
+        for (i = 0; i < num; i++) {
+            SupportedTAItem = CALLOC(1, sizeof(NGAP_SupportedTAItem_t));
+            if (test_self()->nr_served_tai0.list2.num)
+                ogs_asn_uint24_to_OCTET_STRING(
+                    test_self()->nr_served_tai0.list2.taii.tac,
+                    &SupportedTAItem->tAC);
+            else if (test_self()->nr_served_tai0.list0.tai0.num)
+                ogs_asn_uint24_to_OCTET_STRING(
+                    test_self()->nr_served_tai0.list0.tai0.taci,
+                        &SupportedTAItem->tAC);
+            else
+                ogs_assert_if_reached();
+
+            for (j = 0; j < test_self()->num_of_plmn_support; j++) {
+                plmn_id = &test_self()->plmn_supportj.plmn_id;
+
+                BroadcastPLMNItem = CALLOC(1, sizeof(NGAP_BroadcastPLMNItem_t));
+
+                ogs_asn_buffer_to_OCTET_STRING(
+                        plmn_id, OGS_PLMN_ID_LEN,
+                        &BroadcastPLMNItem->pLMNIdentity);
+
+                for (k = 0; k < test_self()->plmn_supportj.num_of_s_nssai;
+                        k++) {
+                    ogs_s_nssai_t *s_nssai =
+                        &test_self()->plmn_supportj.s_nssaik;
+
+                    SliceSupportItem = CALLOC(1,
+                            sizeof(NGAP_SliceSupportItem_t));
+                    ogs_asn_uint8_to_OCTET_STRING(s_nssai->sst,
+                            &SliceSupportItem->s_NSSAI.sST);
+                    if (s_nssai->sd.v != OGS_S_NSSAI_NO_SD_VALUE) {
+                        SliceSupportItem->s_NSSAI.sD = CALLOC(
+                                1, sizeof(NGAP_SD_t));
+                        ogs_asn_uint24_to_OCTET_STRING(
+                                s_nssai->sd, SliceSupportItem->s_NSSAI.sD);
+                    }
 
-                SliceSupportItem = CALLOC(1, sizeof(NGAP_SliceSupportItem_t));
-                ogs_asn_uint8_to_OCTET_STRING(s_nssai->sst,
-                        &SliceSupportItem->s_NSSAI.sST);
-                if (s_nssai->sd.v != OGS_S_NSSAI_NO_SD_VALUE) {
-                    SliceSupportItem->s_NSSAI.sD = CALLOC(1, sizeof(NGAP_SD_t));
-                    ogs_asn_uint24_to_OCTET_STRING(
-                            s_nssai->sd, SliceSupportItem->s_NSSAI.sD);
+                    ASN_SEQUENCE_ADD(
+                            &BroadcastPLMNItem->tAISliceSupportList.list,
+                            SliceSupportItem);
                 }
 
-                ASN_SEQUENCE_ADD(&BroadcastPLMNItem->tAISliceSupportList.list,
-                                SliceSupportItem);
+                ASN_SEQUENCE_ADD(&SupportedTAItem->broadcastPLMNList.list,
+                        BroadcastPLMNItem);
             }
 
-            ASN_SEQUENCE_ADD(&SupportedTAItem->broadcastPLMNList.list,
-                    BroadcastPLMNItem);
+            ASN_SEQUENCE_ADD(&SupportedTAList->list, SupportedTAItem);
         }
-
-        ASN_SEQUENCE_ADD(&SupportedTAList->list, SupportedTAItem);
     }
 
     return ogs_ngap_encode(&pdu);

open5gs_2.6.4.tar.xz/tests/common/s1ap-build.c -> open5gs_2.6.5.tar.xz/tests/common/s1ap-build.c Changed

@@ -1997,20 +1997,40 @@
 
 #define TEST_S1AP_MAX_MESSAGE 64
 
-ogs_pkbuf_t *test_s1ap_build_invalid_packet(int i)
+ogs_pkbuf_t *test_s1ap_build_enb_configuration_transfer(int i)
 {
     ogs_pkbuf_t *pkbuf = NULL;
     const char *payloadTEST_S1AP_MAX_MESSAGE = {
-        "0011002100000300 3b40080062f22400 0001700040000700 00004062f224002c"
-        "00030a0100",
+        "0028"
+        "403b000001008140 3440049699000004 3004969900020004 969900001f200496"
+        "9900020000000098 401341f0ac110e02 0000009940070200 f8ac110e02",
+        "0028"
+        "403b000001008140 344004969900001f 2004969900020004 9699000004300496"
+        "9900020000000098 401341f0ac110e02 0000009940070200 f8ac110e02",
+        "",
+
+        "",
+        "",
         "",
-    };
 
+        "",
+        "",
+        "",
+
+    };
     uint16_t lenTEST_S1AP_MAX_MESSAGE = {
-        37,
+        63,
+        63,
+        0,
+
+        0,
+        0,
         0,
-    };
 
+        0,
+        0,
+        0,
+    };
     char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
@@ -2021,16 +2041,14 @@
     return pkbuf;
 }
 
-ogs_pkbuf_t *test_s1ap_build_enb_configuration_transfer(int i)
+ogs_pkbuf_t *test_s1ap_build_enb_configuration_update(int i)
 {
     ogs_pkbuf_t *pkbuf = NULL;
     const char *payloadTEST_S1AP_MAX_MESSAGE = {
-        "0028"
-        "403b000001008140 3440049699000004 3004969900020004 969900001f200496"
-        "9900020000000098 401341f0ac110e02 0000009940070200 f8ac110e02",
-        "0028"
-        "403b000001008140 344004969900001f 2004969900020004 9699000004300496"
-        "9900020000000098 401341f0ac110e02 0000009940070200 f8ac110e02",
+        "001d002a0000"
+        "04003c4003000031 0040000700000040 34f2990089400140 0124400c00004ced"
+        "a80000004034f299",
+        "",
         "",
 
         "",
@@ -2043,8 +2061,8 @@
 
     };
     uint16_t lenTEST_S1AP_MAX_MESSAGE = {
-        63,
-        63,
+        46,
+        0,
         0,
 
         0,
@@ -2064,3 +2082,117 @@
 
     return pkbuf;
 }
+
+ogs_pkbuf_t *test_s1ap_build_malformed_s1_setup_request(int i)
+{
+    ogs_pkbuf_t *pkbuf = NULL;
+    const char *payloadTEST_S1AP_MAX_MESSAGE = {
+        "0011002100000300 3b40080062f22400 0001700040000700 00004062f224002c"
+        "00030a0100",
+        "",
+    };
+
+    uint16_t lenTEST_S1AP_MAX_MESSAGE = {
+        37,
+        0,
+    };
+
+    char hexbufOGS_HUGE_LEN;
+
+    pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
+    ogs_assert(pkbuf);
+    ogs_pkbuf_put_data(pkbuf,
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
+
+    return pkbuf;
+}
+
+ogs_pkbuf_t *test_s1ap_build_malformed_enb_status_transfer(int i)
+{
+    ogs_pkbuf_t *pkbuf = NULL;
+    const char *payloadTEST_S1AP_MAX_MESSAGE = {
+        "0018406100000a00b0400e05c000e815b337606bcf9ab42f180043400600bb31"
+        "1d84c000f54001300058400480249995009240010000b0400e44d089e4b2a9d1"
+        "a7e369b61c000a000840048036d48c000840048020cd4df30040014300084005"
+        "c0d27e885a5001120c2b7d9501034007500198b6010101010101010101010101"
+        "0101010101010101010101010101010101010101010101010101010101010101"
+        "01230101010101010101010101010101010101100101010101fe010101010101"
+        "0101010101010101010101010101010101010101010101010101010101010101"
+        "0101010101010101010105010101010101010101010101010101010101010101"
+
+        "0101010101010101010101010101010101010101010101010101010101010101"
+        "0101016f40020110000240013600004005c0fe6eba000a8000df00d73c084000"
+        "084000800d02800000400500000200afffff0504800b0e9c00004005c070217c"
+        "db000840048042c1431702400110000101010101010101010101010101010101"
+        "0101010101010101010101010101010101010101010101010101010101010101"
+        "0101010101010101010101010101010101010101010101010101010101010901"
+        "0101010101010101010101010101010101010101010101010101010101010101"
+        "0101f80001010101010101010101010101010101010101010101010101010101"
+
+        "0101010101010101010101010101010101010101010101010101010101010101"
+        "0101010201010101010101010101010101010101010101010101010101010101"
+        "010101011c010101010101010101010101010101010101010101010101010101"
+        "010101010101010101010101010101010101010101010101ffffff7f01010101"
+        "0101010101010101010101010101010101010101010101010101010101010101"
+        "01010101ef010101010101010101010101010101010101010101010101010101"
+        "0101010101010101010101010101010101010101010101010101010101020101"
+        "0101010101800000000101010101010101010101010101010101010101010101"
+
+        "0101010101010101010101010101010101010101010101010101010101010101"
+        "01010101010101010101010101010101010101010101010302bb9a0042407901"
+        "00dc721f8001f9f47b0a00054082cc802f48e000004005c098627f8800004005"
+        "c06f86cead00084004803d7ca200004005c0db1ec0c10019408278408c010101"
+        "0101010101010101010101010101010101000000000101010101010101010101"
+        "0101010101010101010101010101010101010101010101010101010101010101"
+        "0101010101010101010101010101010101010101010201010101010101010101"
+        "0101010101010101010101010101010101010101010101010101010101010101"
+
+        "0101010101010101010101010101010101010101010101010101010101010101"
+        "0101010101010101010101010101010101010101010101010101010101010101"
+        "010501010101010101010101010101",
+        "",
+    };
+
+    uint16_t lenTEST_S1AP_MAX_MESSAGE = {
+        1103,
+        0,
+    };
+
+    char hexbufOGS_HUGE_LEN;
+
+    pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
+    ogs_assert(pkbuf);
+    ogs_pkbuf_put_data(pkbuf,
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
+
+    return pkbuf;
+}
+
+ogs_pkbuf_t *test_s1ap_build_oversized_message(int i)
+{
+#define OVERSIZE 52170
+    ogs_pkbuf_t *pkbuf = NULL;
+    const char *payloadTEST_S1AP_MAX_MESSAGE = {
+        "000808080800244080d500000a007740030000ed00754032953382b4d330d07a0cb8f03b189d6b2c3ced65ce2c7ac9c45f738edd8ec89e921dd700eba23ec48ee91c3ae85652000001000052141c50182e0123810f99d6782a05c9d4a48ffe7fc7a0d252141c50182e022300244061d500000a007740030000ed00754032913382b4d330d07a1cb8f03b189d6b2c3ced65ce2c7ac9c45f7371dd8ec89e921dd700eba235c48ee91c3afc564eb37c9776006f4002204f00754032f363d6782a7faad4a48ffe7fc7a0d252141c50182e02238191f2fcc95b330c2b97173272f3822e2050eb13c7aee0281463e5011e0030404500000a004a400100004a400101ad013a4003021199004a4001013a4001000176040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404f4040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040450505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050504d50505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505000020000505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050507f505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050507f5050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050509240010000b0400e44d089e4b2a9400e05c000e838b337606bcf9ab42f180043400600bb311d84c000f54001400008400480505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050504f50505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050455050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050504a505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050ffff7fff5050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050506a505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050ff5050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404ee03040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404170404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404046262626262626262626262626262626262626262626262626262626204040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404e20404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404045050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050504c5050505050505050000a0002400200a0005c40010000024002000000024001340002400130005c400100005c400100005c405a4009005b400448f6d327005b400428210359005b400428f3e848005b40096cfb44465080f8bc41005b40054c04a134ae005b40096c523cc91d80c01ffa005b400428e68e9d005b400428354c58005b400428332ab6005b400100000a400114005c4001005050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050509240010000b0400e44d089e4b2a9400e05c000e838b337606bcf9ab42f180043400600bb311d84c000f54001400008400480505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050504f50505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050504a505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050",
+        "",
+    };
+
+    uint16_t lenTEST_S1AP_MAX_MESSAGE = {
+        OVERSIZE,
+        0,
+    };
+
+    char *hexbuf = NULL;
+
+    hexbuf = ogs_calloc(1, OVERSIZE);
+    ogs_assert(hexbuf);
+
+    pkbuf = ogs_pkbuf_alloc(NULL, OVERSIZE);
+    ogs_assert(pkbuf);
+    ogs_pkbuf_put_data(pkbuf,
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
+
+    ogs_free(hexbuf);
+
+    return pkbuf;
+}

open5gs_2.6.4.tar.xz/tests/common/s1ap-build.h -> open5gs_2.6.5.tar.xz/tests/common/s1ap-build.h Changed

open5gs_2.6.4.tar.xz/tests/common/s1ap-handler.c -> open5gs_2.6.5.tar.xz/tests/common/s1ap-handler.c Changed

@@ -479,6 +479,7 @@
     char bufOGS_ADDRSTRLEN;
 
     test_sess_t *sess = NULL;
+    test_bearer_t *bearer = NULL;
 
     S1AP_S1AP_PDU_t pdu;
     S1AP_SuccessfulOutcome_t *successfulOutcome = NULL;
@@ -487,6 +488,8 @@
     S1AP_HandoverCommandIEs_t *ie = NULL;
     S1AP_MME_UE_S1AP_ID_t *MME_UE_S1AP_ID = NULL;
     S1AP_ENB_UE_S1AP_ID_t *ENB_UE_S1AP_ID = NULL;
+    S1AP_E_RABSubjecttoDataForwardingList_t
+        *E_RABSubjecttoDataForwardingList = NULL;
 
     ogs_assert(test_ue);
     ogs_assert(message);
@@ -505,6 +508,10 @@
         case S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID:
             ENB_UE_S1AP_ID = &ie->value.choice.ENB_UE_S1AP_ID;
             break;
+        case S1AP_ProtocolIE_ID_id_E_RABSubjecttoDataForwardingList:
+            E_RABSubjecttoDataForwardingList =
+                &ie->value.choice.E_RABSubjecttoDataForwardingList;
+            break;
         default:
             break;
         }
@@ -514,6 +521,44 @@
         test_ue->mme_ue_s1ap_id = *MME_UE_S1AP_ID;
     if (ENB_UE_S1AP_ID)
         test_ue->enb_ue_s1ap_id = *ENB_UE_S1AP_ID;
+
+    if (E_RABSubjecttoDataForwardingList) {
+        for (i = 0; i < E_RABSubjecttoDataForwardingList->list.count; i++) {
+            S1AP_E_RABDataForwardingItemIEs_t *ie = NULL;
+            S1AP_E_RABDataForwardingItem_t *e_rab = NULL;
+
+            ie = (S1AP_E_RABDataForwardingItemIEs_t *)
+                    E_RABSubjecttoDataForwardingList->list.arrayi;
+            ogs_assert(ie);
+            e_rab = &ie->value.choice.E_RABDataForwardingItem;
+
+            bearer = test_bearer_find_by_ue_ebi(test_ue, e_rab->e_RAB_ID);
+            ogs_assert(bearer);
+
+            if (e_rab->dL_gTP_TEID) {
+                memcpy(&bearer->handover.dl_teid, e_rab->dL_gTP_TEID->buf,
+                        sizeof(bearer->handover.dl_teid));
+                bearer->handover.dl_teid = be32toh(bearer->handover.dl_teid);
+            }
+            if (e_rab->dL_transportLayerAddress) {
+                ogs_assert(OGS_OK ==
+                        ogs_asn_BIT_STRING_to_ip(
+                            e_rab->dL_transportLayerAddress,
+                            &bearer->handover.dl_ip));
+            }
+            if (e_rab->uL_GTP_TEID) {
+                memcpy(&bearer->handover.ul_teid, e_rab->uL_GTP_TEID->buf,
+                        sizeof(bearer->handover.ul_teid));
+                bearer->handover.ul_teid = be32toh(bearer->handover.ul_teid);
+            }
+            if (e_rab->uL_TransportLayerAddress) {
+                ogs_assert(OGS_OK ==
+                        ogs_asn_BIT_STRING_to_ip(
+                            e_rab->uL_TransportLayerAddress,
+                            &bearer->handover.ul_ip));
+            }
+        }
+    }
 }
 
 void tests1ap_handle_handover_preparation_failure(

open5gs_2.6.4.tar.xz/tests/core/abts-main.c -> open5gs_2.6.5.tar.xz/tests/core/abts-main.c Changed

open5gs_2.6.4.tar.xz/tests/crypt/abts-main.c -> open5gs_2.6.5.tar.xz/tests/crypt/abts-main.c Changed

open5gs_2.6.4.tar.xz/tests/fuzzing/gtp-message-fuzz.c -> open5gs_2.6.5.tar.xz/tests/fuzzing/gtp-message-fuzz.c Changed

open5gs_2.6.4.tar.xz/tests/handover/epc-s1-test.c -> open5gs_2.6.5.tar.xz/tests/handover/epc-s1-test.c Changed

@@ -28,6 +28,7 @@
     ogs_pkbuf_t *esmbuf;
     ogs_pkbuf_t *sendbuf;
     ogs_pkbuf_t *recvbuf;
+    ogs_pkbuf_t *pkbuf;
     ogs_s1ap_message_t message;
 
     ogs_nas_5gs_mobile_identity_suci_t mobile_identity_suci;
@@ -329,6 +330,35 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     tests1ap_recv(test_ue, recvbuf);
 
+    /* Send GTP-U ICMP Packet */
+    bearer = test_bearer_find_by_ue_ebi(test_ue, 5);
+    ogs_assert(bearer);
+    rv = test_gtpu_send_ping(gtpu1, bearer, TEST_PING_IPV4);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive GTP-U ICMP Packet */
+    recvbuf = test_gtpu_read(gtpu1);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+
+    /* Copy ICMP Packet */
+    pkbuf = ogs_pkbuf_alloc(NULL, 200);
+    ogs_assert(pkbuf);
+    ogs_pkbuf_reserve(pkbuf, OGS_GTPV1U_5GC_HEADER_LEN);
+    ogs_pkbuf_put(pkbuf, 200-OGS_GTPV1U_5GC_HEADER_LEN);
+    memset(pkbuf->data, 0, pkbuf->len);
+    memcpy(pkbuf->data, recvbuf->data + 8, recvbuf->len - 8);
+
+    ogs_pkbuf_free(recvbuf);
+
+    /* Send GTP-U Packet with Indirect Data Forwarding */
+    rv = test_gtpu_send_indirect_data_forwarding(gtpu1, bearer, pkbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive GTP-U ICMP Packet */
+    recvbuf = testgnb_gtpu_read(gtpu2);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    ogs_pkbuf_free(recvbuf);
+
     /* Send eNB Status Transfer */
     sendbuf = test_s1ap_build_enb_status_transfer(test_ue);
     ABTS_PTR_NOTNULL(tc, sendbuf);

open5gs_2.6.4.tar.xz/tests/sctp/abts-main.c -> open5gs_2.6.5.tar.xz/tests/sctp/abts-main.c Changed

open5gs_2.6.4.tar.xz/tests/unit/abts-main.c -> open5gs_2.6.5.tar.xz/tests/unit/abts-main.c Changed

open5gs_2.6.4.tar.xz/tests/unit/nas-message-test.c -> open5gs_2.6.5.tar.xz/tests/unit/nas-message-test.c Changed

@@ -373,19 +373,19 @@
     ABTS_INT_EQUAL(tc, 31, gprs_timer.value);
     rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*32);
     ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
-    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*10*4);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*6*8);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
     ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_DECI_HH,
             gprs_timer.unit);
-    ABTS_INT_EQUAL(tc, 4, gprs_timer.value);
-    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*10*4+1);
+    ABTS_INT_EQUAL(tc, 8, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*6*8+1);
     ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
-    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*10*31);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*6*31);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
     ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_DECI_HH,
             gprs_timer.unit);
     ABTS_INT_EQUAL(tc, 31, gprs_timer.value);
-    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*10*32);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*6*32);
     ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
 
     rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 1);

open5gs_2.6.4.tar.xz/tests/unit/s1ap-message-test.c -> open5gs_2.6.5.tar.xz/tests/unit/s1ap-message-test.c Changed

@@ -23,7 +23,7 @@
 static void s1ap_message_test1(abts_case *tc, void *data)
 {
     /* S1SetupRequest */
-    const char *payload = 
+    const char *payload =
         "0011002d000004003b00090000f11040"
         "54f64010003c400903004a4c542d3632"
         "3100400007000c0e4000f11000894001"
@@ -49,7 +49,7 @@
 static void s1ap_message_test2(abts_case *tc, void *data)
 {
     /* InitialUE(Attach Request) */
-    const char *payload = 
+    const char *payload =
         "000c406f000006000800020001001a00"
         "3c3b17df675aa8050741020bf600f110"
         "000201030003e605f070000010000502"
@@ -79,7 +79,7 @@
 static void s1ap_message_test3(abts_case *tc, void *data)
 {
     /* initial context setup response */
-    const char *payload = 
+    const char *payload =
         "2009002500000300004005c0020000bf"
         "0008400200010033400f000032400a0a"
         "1f0a0123c601000908";
@@ -104,7 +104,7 @@
 static void s1ap_message_test4(abts_case *tc, void *data)
 {
     /* InitialUE(Service Request) */
-    const char *payload = 
+    const char *payload =
         "000c402d000005000800020071001a00 0504c706b410004300060013f1890001"
         "006440080013f189400bb75000864001 40006440080013f189400bb750004340"
         "060013f18900014300060013f1890001 006440080013f189400db09000864001"

open5gs_2.6.4.tar.xz/tests/unit/sbi-message-test.c -> open5gs_2.6.5.tar.xz/tests/unit/sbi-message-test.c Changed

@@ -506,6 +506,43 @@
 
 static void sbi_message_test6(abts_case *tc, void *data)
 {
+    ogs_s_nssai_t s_nssai1, s_nssai2;
+    char *string = NULL;
+    bool rc = false;
+
+    memset(&s_nssai1, 0, sizeof(ogs_s_nssai_t));
+
+    s_nssai1.sst = 255;
+    s_nssai1.sd.v = 0x19cde0;
+
+    string = ogs_sbi_s_nssai_to_string(&s_nssai1);
+    ABTS_PTR_NOTNULL(tc, string);
+
+    rc = ogs_sbi_s_nssai_from_string(&s_nssai2, string);
+    ABTS_TRUE(tc, rc == true);
+
+    ogs_free(string);
+
+    ABTS_INT_EQUAL(tc, s_nssai1.sst, s_nssai2.sst);
+    ABTS_INT_EQUAL(tc, s_nssai1.sd.v, s_nssai2.sd.v);
+
+    s_nssai1.sst = 1;
+    s_nssai1.sd.v = OGS_S_NSSAI_NO_SD_VALUE;
+
+    string = ogs_sbi_s_nssai_to_string(&s_nssai1);
+    ABTS_PTR_NOTNULL(tc, string);
+
+    rc = ogs_sbi_s_nssai_from_string(&s_nssai2, string);
+    ABTS_TRUE(tc, rc == true);
+
+    ogs_free(string);
+
+    ABTS_INT_EQUAL(tc, s_nssai1.sst, s_nssai2.sst);
+    ABTS_INT_EQUAL(tc, s_nssai1.sd.v, s_nssai2.sd.v);
+}
+
+static void sbi_message_test7(abts_case *tc, void *data)
+{
     cJSON *item = NULL, *item2 = NULL;
     char *content = NULL;
     OpenAPI_smf_selection_subscription_data_t SmfSelectionSubscriptionData;
@@ -553,12 +590,11 @@
             OpenAPI_list_free(DnnInfoList);
 
         memset(&s_nssai, 0, sizeof(s_nssai));
-        s_nssai.sst = 1;
-        s_nssai.sd.v = OGS_S_NSSAI_NO_SD_VALUE;
+        s_nssai.sst = 255;
+        s_nssai.sd.v = 0x19cde0;
 
         SubscribedSnssaiInfoMap = OpenAPI_map_create(
-                ogs_sbi_s_nssai_to_string(&s_nssai),
-                SubscribedSnssaiInfo);
+                ogs_sbi_s_nssai_to_string(&s_nssai), SubscribedSnssaiInfo);
         ogs_assert(SubscribedSnssaiInfoMap);
         ogs_assert(SubscribedSnssaiInfoMap->key);
 
@@ -611,8 +647,8 @@
         if (SubscribedSnssaiInfoMap) {
             memset(&s_nssai, 0, sizeof(s_nssai));
             ogs_sbi_s_nssai_from_string(&s_nssai, SubscribedSnssaiInfoMap->key);
-            ABTS_INT_EQUAL(tc, 1, s_nssai.sst);
-            ABTS_INT_EQUAL(tc, OGS_S_NSSAI_NO_SD_VALUE, s_nssai.sd.v);
+            ABTS_INT_EQUAL(tc, 255, s_nssai.sst);
+            ABTS_INT_EQUAL(tc, 0x19cde0, s_nssai.sd.v);
         }
     }
 
@@ -621,11 +657,11 @@
     content = cJSON_Print(item);
     cJSON_Delete(item);
     ogs_assert(content);
-    ABTS_INT_EQUAL(tc, 148, (int)strlen(content));
+    ABTS_INT_EQUAL(tc, 139, (int)strlen(content));
     ogs_free(content);
 }
 
-static void sbi_message_test7(abts_case *tc, void *data)
+static void sbi_message_test8(abts_case *tc, void *data)
 {
     ABTS_INT_EQUAL(tc, OpenAPI_nf_type_NRF,
         ogs_sbi_service_type_to_nf_type(OGS_SBI_SERVICE_TYPE_NNRF_NFM));
@@ -795,6 +831,7 @@
     abts_run_test(suite, sbi_message_test5, NULL);
     abts_run_test(suite, sbi_message_test6, NULL);
     abts_run_test(suite, sbi_message_test7, NULL);
+    abts_run_test(suite, sbi_message_test8, NULL);
 
     return suite;
 }

open5gs_2.6.4.tar.xz/tests/unit/security-test.c -> open5gs_2.6.5.tar.xz/tests/unit/security-test.c Changed

open5gs_2.6.4.tar.xz/tests/vonr/af-test.c -> open5gs_2.6.5.tar.xz/tests/vonr/af-test.c Changed

open5gs_2.6.4.tar.xz/tests/vonr/session-test.c -> open5gs_2.6.5.tar.xz/tests/vonr/session-test.c Changed

@@ -2301,6 +2301,368 @@
     test_ue_remove(test_ue);
 }
 
+static void test7_func(abts_case *tc, void *data)
+{
+    int rv;
+    ogs_socknode_t *ngap;
+    ogs_socknode_t *gtpu;
+    ogs_pkbuf_t *gmmbuf;
+    ogs_pkbuf_t *gsmbuf;
+    ogs_pkbuf_t *nasbuf;
+    ogs_pkbuf_t *sendbuf;
+    ogs_pkbuf_t *recvbuf;
+    ogs_ngap_message_t message;
+    int i;
+
+    uint8_t tmpOGS_HUGE_LEN;
+    char *_gtp_payload = "34ff0024"
+        "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
+        "00000964cd7c291f";
+
+    ogs_nas_5gs_mobile_identity_suci_t mobile_identity_suci;
+    test_ue_t *test_ue = NULL;
+    test_sess_t *sess5 = NULL, *sess6 = NULL;
+    test_bearer_t *qos_flow = NULL;
+
+    bson_t *doc = NULL;
+
+    /* Setup Test UE & Session Context */
+    memset(&mobile_identity_suci, 0, sizeof(mobile_identity_suci));
+
+    mobile_identity_suci.h.supi_format = OGS_NAS_5GS_SUPI_FORMAT_IMSI;
+    mobile_identity_suci.h.type = OGS_NAS_5GS_MOBILE_IDENTITY_SUCI;
+    mobile_identity_suci.routing_indicator1 = 0;
+    mobile_identity_suci.routing_indicator2 = 0xf;
+    mobile_identity_suci.routing_indicator3 = 0xf;
+    mobile_identity_suci.routing_indicator4 = 0xf;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
+    mobile_identity_suci.home_network_pki_value = 0;
+
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
+    ogs_assert(test_ue);
+
+    test_ue->nr_cgi.cell_id = 0x40001;
+
+    test_ue->nas.registration.tsc = 0;
+    test_ue->nas.registration.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
+    test_ue->nas.registration.follow_on_request = 1;
+    test_ue->nas.registration.value = OGS_NAS_5GS_REGISTRATION_TYPE_INITIAL;
+
+    test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
+    test_ue->opc_string = "e8ed289deba952e4283b54e88e6183ca";
+
+    /* gNB connects to AMF */
+    ngap = testngap_client(AF_INET);
+    ABTS_PTR_NOTNULL(tc, ngap);
+
+    /* gNB connects to UPF */
+    gtpu = test_gtpu_server(1, AF_INET);
+    ABTS_PTR_NOTNULL(tc, gtpu);
+
+    /* Send NG-Setup Reqeust */
+    sendbuf = testngap_build_ng_setup_request(0x4000, 22);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive NG-Setup Response */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /********** Insert Subscriber in Database */
+    doc = test_db_new_ims(test_ue);
+    ABTS_PTR_NOTNULL(tc, doc);
+    ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc));
+
+    /* Send Registration request */
+    test_ue->registration_request_param.guti = 1;
+    gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+
+    test_ue->registration_request_param.gmm_capability = 1;
+    test_ue->registration_request_param.requested_nssai = 1;
+    test_ue->registration_request_param.last_visited_registered_tai = 1;
+    test_ue->registration_request_param.ue_usage_setting = 1;
+    nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false);
+    ABTS_PTR_NOTNULL(tc, nasbuf);
+
+    sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf,
+                NGAP_RRCEstablishmentCause_mo_Signalling, false, true);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Identity request */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Identity response */
+    gmmbuf = testgmm_build_identity_response(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Authentication request */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Authentication response */
+    gmmbuf = testgmm_build_authentication_response(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Security mode command */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Security mode complete */
+    gmmbuf = testgmm_build_security_mode_complete(test_ue, nasbuf);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive InitialContextSetupRequest +
+     * Registration accept */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_InitialContextSetup,
+            test_ue->ngap_procedure_code);
+
+    /* Send UERadioCapabilityInfoIndication */
+    sendbuf = testngap_build_ue_radio_capability_info_indication(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Send InitialContextSetupResponse */
+    sendbuf = testngap_build_initial_context_setup_response(test_ue, false);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Send Registration complete */
+    gmmbuf = testgmm_build_registration_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Configuration update command */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send PDU session establishment request */
+    sess5 = test_sess_add_by_dnn_and_psi(test_ue, "internet", 5);
+    ogs_assert(sess5);
+
+    sess5->ul_nas_transport_param.request_type =
+        OGS_NAS_5GS_REQUEST_TYPE_INITIAL;
+    sess5->ul_nas_transport_param.dnn = 1;
+    sess5->ul_nas_transport_param.s_nssai = 1;
+
+    sess5->pdu_session_establishment_param.ssc_mode = 1;
+    sess5->pdu_session_establishment_param.epco = 1;
+
+    gsmbuf = testgsm_build_pdu_session_establishment_request(sess5);
+    ABTS_PTR_NOTNULL(tc, gsmbuf);
+    gmmbuf = testgmm_build_ul_nas_transport(sess5,
+            OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, gsmbuf);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive PDUSessionResourceSetupRequest +
+     * DL NAS transport +
+     * PDU session establishment accept */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_PDUSessionResourceSetup,
+            test_ue->ngap_procedure_code);

open5gs_2.6.4.tar.xz/vagrant/centos/Vagrantfile -> open5gs_2.6.5.tar.xz/vagrant/centos/Vagrantfile Changed

open5gs_2.6.4.tar.xz/webui/package-lock.json -> open5gs_2.6.5.tar.xz/webui/package-lock.json Changed

@@ -1,1060 +1,55 @@
 {
   "name": "open5gs",
-  "version": "2.6.3",
-  "lockfileVersion": 2,
+  "version": "2.6.5",
+  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "open5gs",
-      "version": "2.6.1",
+      "version": "2.6.5",
       "license": "AGPL-3.0",
       "dependencies": {
-        "axios": "^0.27.2",
+        "axios": "^1.4.0",
         "babel-plugin-polished": "^1.1.0",
         "babel-plugin-styled-components": "^2.0.7",
-        "body-parser": "^1.20.1",
-        "connect-mongo": "^4.6.0",
+        "body-parser": "^1.20.2",
+        "connect-mongo": "^5.0.0",
         "express": "^4.18.2",
-        "express-restify-mongoose": "^7.0.2",
+        "express-restify-mongoose": "^6.1.2",
         "express-session": "^1.17.3",
-        "immutable": "^4.1.0",
-        "jsonwebtoken": "^8.5.1",
+        "immutable": "^4.3.3",
+        "jsonwebtoken": "^9.0.1",
         "lodash": "^4.17.21",
         "lusca": "^1.7.0",
         "method-override": "^3.0.0",
-        "mongoose": "^6.7.0",
-        "mongoose-long": "^0.6.0",
+        "mongoose": "^5.13.20",
+        "mongoose-long": "^0.7.1",
         "morgan": "^1.10.0",
         "next": "^3.2.3",
         "next-redux-wrapper": "^1.3.5",
         "nprogress": "^0.2.0",
         "open-color": "^1.9.1",
         "passport": "^0.6.0",
-        "passport-jwt": "^4.0.0",
+        "passport-jwt": "^4.0.1",
         "passport-local": "^1.0.0",
-        "passport-local-mongoose": "^7.1.2",
+        "passport-local-mongoose": "^8.0.0",
         "prop-types": "^15.8.1",
-        "react": "^15.6.1",
-        "react-dom": "^15.6.1",
+        "react": "^15.7.0",
+        "react-dom": "^15.7.0",
         "react-event-listener": "^0.5.9",
         "react-icons": "^2.2.5",
         "react-jsonschema-form": "^0.50.1",
-        "react-notification-system": "^0.2.17",
-        "react-onclickoutside": "^6.7.1",
-        "react-redux": "^5.0.7",
+        "react-notification-system": "^0.4.0",
+        "react-onclickoutside": "^6.13.0",
+        "react-redux": "^5.1.2",
         "react-transition-group": "^1.1.3",
-        "redux": "^3.7.2",
-        "redux-actions": "^2.4.0",
-        "redux-saga": "^0.15.6",
+        "redux": "^4.2.1",
+        "redux-actions": "^2.6.5",
+        "redux-saga": "^1.2.3",
         "styled-components": "^2.4.1",
         "traverse": "^0.6.7"
       }
     },
-    "node_modules/@aws-crypto/ie11-detection": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz",
-      "integrity": "sha512-5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw==",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^1.11.1"
-      }
-    },
-    "node_modules/@aws-crypto/ie11-detection/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "optional": true
-    },
-    "node_modules/@aws-crypto/sha256-browser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz",
-      "integrity": "sha512-rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A==",
-      "optional": true,
-      "dependencies": {
-        "@aws-crypto/ie11-detection": "^2.0.0",
-        "@aws-crypto/sha256-js": "^2.0.0",
-        "@aws-crypto/supports-web-crypto": "^2.0.0",
-        "@aws-crypto/util": "^2.0.0",
-        "@aws-sdk/types": "^3.1.0",
-        "@aws-sdk/util-locate-window": "^3.0.0",
-        "@aws-sdk/util-utf8-browser": "^3.0.0",
-        "tslib": "^1.11.1"
-      }
-    },
-    "node_modules/@aws-crypto/sha256-browser/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "optional": true
-    },
-    "node_modules/@aws-crypto/sha256-js": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz",
-      "integrity": "sha512-VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig==",
-      "optional": true,
-      "dependencies": {
-        "@aws-crypto/util": "^2.0.0",
-        "@aws-sdk/types": "^3.1.0",
-        "tslib": "^1.11.1"
-      }
-    },
-    "node_modules/@aws-crypto/sha256-js/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "optional": true
-    },
-    "node_modules/@aws-crypto/supports-web-crypto": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz",
-      "integrity": "sha512-6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ==",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^1.11.1"
-      }
-    },
-    "node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "optional": true
-    },
-    "node_modules/@aws-crypto/util": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-2.0.2.tgz",
-      "integrity": "sha512-Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA==",
-      "optional": true,
-      "dependencies": {
-        "@aws-sdk/types": "^3.110.0",
-        "@aws-sdk/util-utf8-browser": "^3.0.0",
-        "tslib": "^1.11.1"
-      }
-    },
-    "node_modules/@aws-crypto/util/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "optional": true
-    },
-    "node_modules/@aws-sdk/abort-controller": {
-      "version": "3.197.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.197.0.tgz",
-      "integrity": "sha512-ROuuIICJmkF/VxfOjoPgp79PXjqwXU/z2HmXB+gtYPzwPCyMhb8WwclevyxG3E/t5VflYvPv0NDxQMiU0obOqw==",
-      "optional": true,
-      "dependencies": {
-        "@aws-sdk/types": "3.197.0",
-        "tslib": "^2.3.1"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/client-cognito-identity": {
-      "version": "3.197.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.197.0.tgz",
-      "integrity": "sha512-lvOhLhHTSRhS3bArzlMK18ldcJ0DhPb2belrE9KeY2Z+86P4prH02jwgi3EdFHizsKz2FmVelMdD3VWk8BxTzg==",
-      "optional": true,
-      "dependencies": {
-        "@aws-crypto/sha256-browser": "2.0.0",
-        "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/client-sts": "3.197.0",
-        "@aws-sdk/config-resolver": "3.197.0",
-        "@aws-sdk/credential-provider-node": "3.197.0",
-        "@aws-sdk/fetch-http-handler": "3.197.0",
-        "@aws-sdk/hash-node": "3.197.0",
-        "@aws-sdk/invalid-dependency": "3.197.0",
-        "@aws-sdk/middleware-content-length": "3.197.0",
-        "@aws-sdk/middleware-endpoint": "3.197.0",
-        "@aws-sdk/middleware-host-header": "3.197.0",
-        "@aws-sdk/middleware-logger": "3.197.0",
-        "@aws-sdk/middleware-recursion-detection": "3.197.0",
-        "@aws-sdk/middleware-retry": "3.197.0",
-        "@aws-sdk/middleware-serde": "3.197.0",
-        "@aws-sdk/middleware-signing": "3.197.0",
-        "@aws-sdk/middleware-stack": "3.197.0",
-        "@aws-sdk/middleware-user-agent": "3.197.0",
-        "@aws-sdk/node-config-provider": "3.197.0",
-        "@aws-sdk/node-http-handler": "3.197.0",
-        "@aws-sdk/protocol-http": "3.197.0",

open5gs_2.6.4.tar.xz/webui/package.json -> open5gs_2.6.5.tar.xz/webui/package.json Changed

@@ -1,49 +1,49 @@
 {
   "name": "open5gs",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "description": "Open5gs",
   "main": "index.js",
   "repository": "https://github.com/open5gs/open5gs/webui",
   "author": "Open5gs Group",
   "license": "AGPL-3.0",
   "dependencies": {
-    "axios": "^0.27.2",
+    "axios": "^1.4.0",
     "babel-plugin-polished": "^1.1.0",
     "babel-plugin-styled-components": "^2.0.7",
-    "body-parser": "^1.20.1",
-    "connect-mongo": "^4.6.0",
+    "body-parser": "^1.20.2",
+    "connect-mongo": "^5.0.0",
     "express": "^4.18.2",
-    "express-restify-mongoose": "^7.0.2",
+    "express-restify-mongoose": "^6.1.2",
     "express-session": "^1.17.3",
-    "immutable": "^4.1.0",
-    "jsonwebtoken": "^8.5.1",
+    "immutable": "^4.3.3",
+    "jsonwebtoken": "^9.0.1",
     "lodash": "^4.17.21",
     "lusca": "^1.7.0",
     "method-override": "^3.0.0",
-    "mongoose": "^6.7.0",
-    "mongoose-long": "^0.6.0",
+    "mongoose": "^5.13.20",
+    "mongoose-long": "^0.7.1",
     "morgan": "^1.10.0",
     "next": "^3.2.3",
     "next-redux-wrapper": "^1.3.5",
     "nprogress": "^0.2.0",
     "open-color": "^1.9.1",
     "passport": "^0.6.0",
-    "passport-jwt": "^4.0.0",
+    "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
-    "passport-local-mongoose": "^7.1.2",
+    "passport-local-mongoose": "^8.0.0",
     "prop-types": "^15.8.1",
-    "react": "^15.6.1",
-    "react-dom": "^15.6.1",
+    "react": "^15.7.0",
+    "react-dom": "^15.7.0",
     "react-event-listener": "^0.5.9",
     "react-icons": "^2.2.5",
     "react-jsonschema-form": "^0.50.1",
-    "react-notification-system": "^0.2.17",
-    "react-onclickoutside": "^6.7.1",
-    "react-redux": "^5.0.7",
+    "react-notification-system": "^0.4.0",
+    "react-onclickoutside": "^6.13.0",
+    "react-redux": "^5.1.2",
     "react-transition-group": "^1.1.3",
-    "redux": "^3.7.2",
-    "redux-actions": "^2.4.0",
-    "redux-saga": "^0.15.6",
+    "redux": "^4.2.1",
+    "redux-actions": "^2.6.5",
+    "redux-saga": "^1.2.3",
     "styled-components": "^2.4.1",
     "traverse": "^0.6.7"
   },

open5gs_2.6.4.tar.xz/webui/src/components/Account/Edit.js -> open5gs_2.6.5.tar.xz/webui/src/components/Account/Edit.js Changed

open5gs_2.6.4.tar.xz/webui/src/components/Profile/Edit.js -> open5gs_2.6.5.tar.xz/webui/src/components/Profile/Edit.js Changed

open5gs_2.6.4.tar.xz/webui/src/components/Subscriber/Edit.js -> open5gs_2.6.5.tar.xz/webui/src/components/Subscriber/Edit.js Changed

open5gs_2.6.4.tar.xz/webui/src/components/Subscriber/List.js -> open5gs_2.6.5.tar.xz/webui/src/components/Subscriber/List.js Changed

Changes of Revision 18