Osmocom Open Build Service

open5gs_2.4.10.tar.xz/docs/assets/favicon.ico Deleted

open5gs_2.4.10.dsc -> open5gs_2.4.11.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-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
 Architecture: any
-Version: 2.4.10
+Version: 2.4.11
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Uploaders: Sukchan Lee <acetcom@gmail.com>
 Homepage: https://open5gs.org
@@ -30,8 +30,8 @@
  open5gs-udr deb net optional arch=any
  open5gs-upf deb net optional arch=any
 Checksums-Sha1:
- 3106956d8fb9841c8b7c7d9e1b7901ff17f70ef5 11462572 open5gs_2.4.10.tar.xz
+ 025adfa9aa77acd9427c62d403010c22ba7564bf 11467980 open5gs_2.4.11.tar.xz
 Checksums-Sha256:
- 2982479e69c668310146534d924ae99b1563bd523afda4c586857dbee8e535eb 11462572 open5gs_2.4.10.tar.xz
+ f882f44b40969661e0d37b273104da6beac564990a2402d0fd742f806611d649 11467980 open5gs_2.4.11.tar.xz
 Files:
- 8e05392e534352b5a950bc8b575bd0ce 11462572 open5gs_2.4.10.tar.xz
+ d1e47814afea5b780b3825c5efadf83b 11467980 open5gs_2.4.11.tar.xz

open5gs_2.4.10.tar.xz/.tarball-version -> open5gs_2.4.11.tar.xz/.tarball-version Changed

open5gs_2.4.10.tar.xz/README.md -> open5gs_2.4.11.tar.xz/README.md Changed

@@ -1,88 +1,18 @@
-<h1 align="center">Open5GS</h1>
+<p align="center"><a href="https://open5gs.org" target="_blank" rel="noopener noreferrer"><img width="100" src="https://open5gs.org/assets/img/open5gs-logo-only.png" alt="Open5GS logo"></a></p>
 
-If you find Open5GS useful for work, please consider supporting this Open Source project by Becoming a sponsor(https://github.com/sponsors/acetcom). To manage the funding transactions transparently, you can donate through OpenCollective(https://opencollective.com/open5gs).
+## Getting Started
 
-<h3 align="center">Platinum Sponsors</h3>
-<table align="center">
-  <tbody>
-    <tr>
-      <td align="center" valign="middle">
-  <a href="https://teletresearch.com/" target="_blank">
-    <img width="400px" src="https://open5gs.org/assets/img/Telet-logo-v2.png">
-  </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-<h3 align="center">Gold Sponsors</h3>
-<table align="center">
-  <tbody>
-    <tr>
-      <td align="center" valign="middle">
-  <a href="http://wavemobile.com/" target="_blank">
-    <img width="222px" src="https://open5gs.org/assets/img/Wavemobile-Logo-Mark-RGB.png">
-  </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-<h3 align="center">Silver Sponsors</h3>
-<table align="center">
-  <tbody>
-    <tr>
-      <td align="center" valign="middle" width="222px">
-        <a href="https://nextepc.com/" target="_blank">
-          <img src="https://open5gs.org/assets/img/nextepc_logo.jpg">
-        </a>
-      </td>
-      <td align="center" valign="middle" width="222px">
-        <a href="https://www.wearetriple.com/" target="_blank">
-          <img src="https://open5gs.org/assets/img/triple_logo.png">
-        </a>
-      </td>
-      <td align="center" valign="middle" width="222px">
-        <a href="https://sdr.eee.strath.ac.uk/" target="_blank">
-          <img src="https://open5gs.org/assets/img/strath.png">
-        </a>
-      </td>
-    </tr>
-    <tr>
-      <td align="center" valign="middle" width="222px">
-        <a href="https://skylarkwireless.com/" target="_blank">
-          <img src="https://open5gs.org/assets/img/SkylarkWireless-420x78-Web2-R.png">
-        </a>
-      </td>
-      <td align="center" valign="middle" width="222px">
-        <a href="https://sysmocom.de/" target="_blank">
-          <img src="https://open5gs.org/assets/img/sysmocom-logo-only.png">
-        </a>
-      </td>
-      <td align="center" valign="middle" width="222px">
-        <a href="https://www.p1sec.com/" target="_blank">
-          <img src="https://open5gs.org/assets/img/2021-logo-P1.svg">
-        </a>
-      </td>
-    </tr>
-    <tr>
-      <td align="center" valign="middle" width="222px">
-        <a href="https://www.ng-voice.com/" target="_blank">
-          <img src="https://open5gs.org/assets/img/ng-voice-logo_color.png">
-        </a>
-      </td>
-      <td align="center" valign="middle" width="222px">
-        <a href="http://www.bristol.ac.uk/engineering/research/smart/" target="_blank">
-          <img src="https://open5gs.org/assets/img/smart-internet-lab.png">
-        </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
+If you don't understand something about Open5GS, the https://open5gs.org/open5gs/docs/(https://open5gs.org/open5gs/docs/) is a great place to look for answers.
 
-## Documentation
+## Sponsors
 
-If you don't understand something about Open5GS, the https://open5gs.org/open5gs/docs/(https://open5gs.org/open5gs/docs/) is a great place to look for answers.
+If you find Open5GS useful for work, please consider supporting this Open Source project by Becoming a sponsor(https://github.com/sponsors/acetcom). To manage the funding transactions transparently, you can donate through OpenCollective(https://opencollective.com/open5gs).
+
+<p align="center">
+  <a target="_blank" href="https://open5gs.org/#sponsors">
+      <img alt="sponsors" src="https://open5gs.org/assets/img/sponsors.svg">
+  </a>
+</p>
 
 ## Community
 
@@ -97,4 +27,4 @@
 ## License
 
 - Open5GS Open Source files are made available under the terms of the GNU Affero General Public License (GNU AGPL v3.0(https://www.gnu.org/licenses/agpl-3.0.html)).
-- Commercial licenses(https://open5gs.org/open5gs/support/) are also available from NextEPC, Inc.(https://nextepc.com)
+- Commercial licenses(https://open5gs.org/open5gs/support/) are also available from NeoPlane(https://neoplane.io/)

open5gs_2.4.10.tar.xz/configs/310014.yaml.in -> open5gs_2.4.11.tar.xz/configs/310014.yaml.in Changed

open5gs_2.4.10.tar.xz/configs/csfb.yaml.in -> open5gs_2.4.11.tar.xz/configs/csfb.yaml.in Changed

open5gs_2.4.10.tar.xz/configs/non3gpp.yaml.in -> open5gs_2.4.11.tar.xz/configs/non3gpp.yaml.in Changed

open5gs_2.4.10.tar.xz/configs/open5gs/amf.yaml.in -> open5gs_2.4.11.tar.xz/configs/open5gs/amf.yaml.in Changed

open5gs_2.4.10.tar.xz/configs/open5gs/hss.yaml.in -> open5gs_2.4.11.tar.xz/configs/open5gs/hss.yaml.in Changed

open5gs_2.4.10.tar.xz/configs/open5gs/mme.yaml.in -> open5gs_2.4.11.tar.xz/configs/open5gs/mme.yaml.in Changed

open5gs_2.4.10.tar.xz/configs/open5gs/smf.yaml.in -> open5gs_2.4.11.tar.xz/configs/open5gs/smf.yaml.in Changed

open5gs_2.4.10.tar.xz/configs/sample.yaml.in -> open5gs_2.4.11.tar.xz/configs/sample.yaml.in Changed

open5gs_2.4.10.tar.xz/configs/slice.yaml.in -> open5gs_2.4.11.tar.xz/configs/slice.yaml.in Changed

open5gs_2.4.10.tar.xz/configs/srslte.yaml.in -> open5gs_2.4.11.tar.xz/configs/srslte.yaml.in Changed

open5gs_2.4.10.tar.xz/configs/volte.yaml.in -> open5gs_2.4.11.tar.xz/configs/volte.yaml.in Changed

open5gs_2.4.10.tar.xz/configs/vonr.yaml.in -> open5gs_2.4.11.tar.xz/configs/vonr.yaml.in Changed

open5gs_2.4.10.tar.xz/debian/changelog -> open5gs_2.4.11.tar.xz/debian/changelog Changed

open5gs_2.4.10.tar.xz/docs/_config.yml -> open5gs_2.4.11.tar.xz/docs/_config.yml Changed

open5gs_2.4.10.tar.xz/docs/_docs/guide/01-quickstart.md -> open5gs_2.4.11.tar.xz/docs/_docs/guide/01-quickstart.md Changed

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

open5gs_2.4.10.tar.xz/docs/_docs/hardware/01-genodebs.md -> open5gs_2.4.11.tar.xz/docs/_docs/hardware/01-genodebs.md Changed

@@ -12,11 +12,16 @@
  * Airspan 5G OpenRange vCU + Airspan 5G OpenRange vDU + Airspan 5G OpenRANGE06 AirVelocity 2700 RU
  * Airspan AirSpeed 2900
  * Airspan AirStrand 2200
+ * CableFree Small Cell Outdoor radios (5G n77, n78 and other bands)
+ * CableFree Small Cell Indoor radios (5G n77, n78 and other bands)
+ * CableFree Macro (BBU+RRH) radios (4G and 5G, various bands)
+ * Ericsson Baseband 6630 (21.Q3 Software) + Radio 2217, Radio 2219 (4G and 5G, various bands)
+ * Ericsson StreetMacro 6701 (21.Q3 Software) (5G mmWave, n261) (Baseband 6318 and AIR 1281 packaged together)
+ * Huawei BTS5900
  * LIONS RANathon O-CU and O-DU + RANathon RS8601 Indoor O-RU + RANathon XG8600 Fronthaul Gateway
  * NOKIA AEQE (SW: 5G20A)
  * NOKIA AEQD (SW: 5G20A)
  * NOKIA AEQP (SW: 5G21A)
- * Huawei BTS5900
 
 ### Commercial 4G
 ---
@@ -34,7 +39,8 @@
  * Baicells Nova 436Q
  * Baicells Nova 227 (EBS & CBRS)
  * Baicells Nova 233
- * Ericsson BaseBand 6630 (21Q1 Software)
+ * Ericsson Baseband 6630 (21Q1 Software)
+ * Ericsson RBS 6402 (18.Q1 software, B2 B25 B4 B7 B252 B255)
  * Ericsson RBS 6601 + DUL 20 01 + RUS 01 B8 
  * Gemtek WLTGFC-101 (S/W version 2.1.1746.1116)
  * Huawei BTS3900 (S/W version V100R011C10SPC230)
@@ -50,8 +56,8 @@
 ---
 
  * Amarisoft(https://www.amarisoft.com/) + LimeSDR, USRP, Amarisoft PCI Express Card
- * srsLTE / srsENB(https://github.com/srsLTE/srsLTE) + LimeSDR, USRP, BladeRF x40 (BladeRF Not stable)
  * Open Air Interface 5G (NR_SA_F1AP_5GRECORDS branch(https://gitlab.eurecom.fr/oai/openairinterface5g/-/tree/NR_SA_F1AP_5GRECORDS)) + USRP B210
+ * srsLTE / srsENB(https://github.com/srsLTE/srsLTE) + LimeSDR, USRP, BladeRF x40 (BladeRF Not stable)
 
 ### Misc Radio Hardware
 ---

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

open5gs_2.4.10.tar.xz/docs/_docs/platform/06-macosx-intel.md -> open5gs_2.4.11.tar.xz/docs/_docs/platform/06-macosx-intel.md Changed

open5gs_2.4.10.tar.xz/docs/_docs/platform/07-freebsd.md -> open5gs_2.4.11.tar.xz/docs/_docs/platform/07-freebsd.md Changed

open5gs_2.4.10.tar.xz/docs/_includes/google-analytics.html -> open5gs_2.4.11.tar.xz/docs/_includes/google-analytics.html Changed

open5gs_2.4.10.tar.xz/docs/_includes/head.html -> open5gs_2.4.11.tar.xz/docs/_includes/head.html Changed

open5gs_2.4.10.tar.xz/docs/_pages/support.md -> open5gs_2.4.11.tar.xz/docs/_pages/support.md Changed

@@ -4,23 +4,26 @@
 permalink: /support/
 ---
 
-###### Updated Sep, 2020
+###### Updated Sep, 2022
 
 ### Open5GS Licensing
 
 Open5GS is licensed under a dual licensing model designed to meet the development and distribution needs of both commercial and open source projects.
 
-### For Commercial Projects
+The commercial Open5GS license gives you the full rights to create and distribute software on your own terms without any open source license obligations. With the commercial license, you also have access to the official NeoPlane Support and close strategic relationship with NeoPlane(https://neoplane.io) to make sure your development goals are met.
 
-Commercial distributors that develop and distribute commercially licensed Open5GS software and do not wish their software under version 3 of the GNU Affero General Public License (the “AGPL-3.0”) must enter into a commercial license agreement with NextEPC, Inc.(https://nextepc.com)
+Open5GS is also available under AGPL-3.0 open source licenses. The Open5GS open source licensing is ideal for use cases such as open source projects with open source distribution, student/academic purposes, hobby projects, internal research projects without external distribution, or other projects where all AGPL-3.0 obligations can be met.
 
-Please contact sales@nextepc.com(mailto:sales@nextepc.com) for more informations.
+If your legal department has policies regarding use of software licensed under the AGPL, you may prefer to have a commercial license. Contact Sukchan Lee \<sales@neoplane.io\>(mailto:sales@neoplane.io) for more information on commercial licenses.
+
+### Our Partners
 
-### For Open Source Projects
+We work with leading partners in mobile communications to offer our customers complete solutions.
 
-For developers of Free Open Source Software ("FOSS") applications under the AGPL-3.0 that want to combine and distribute those FOSS applications with Open5GS software, Open5GS open source software licensed under the AGPL-3.0 is the best option.
+**NextEPC(https://nextepc.com/)**: Established in U.S. in 2019, NextEPC Inc. provides the latest wireless telecommunications technologies and outstanding support to wireless solution providers and vendors around the world. Their solutions include scalable and versatile 4G/5G core network systems. They also offer professional development and customization services for Enterprise users.
+
+Please contact sales@nextepc.com(mailto:sales@nextepc.com) for more informations.
 
-sysmocom(https://sysmocom.de/) is providing commercial services around Open5GS
- open source software including support, development, consulting, training and system integration.
+**sysmocom(https://sysmocom.de/)**: Sysmocom was founded in Berlin, Germany by two veterans of the Free / Open Source Software (FOSS) community. They are providing commercial services around Open5GS open source software including support, development, consulting, training and system integration.
 
 Please contact Harald Welte \<sales@sysmocom.de\>(mailto:sales@sysmocom.de) for any related inquiries.

open5gs_2.4.10.tar.xz/docs/assets/webui/install -> open5gs_2.4.11.tar.xz/docs/assets/webui/install Changed

open5gs_2.4.10.tar.xz/lib/app/ogs-context.c -> open5gs_2.4.11.tar.xz/lib/app/ogs-context.c Changed

open5gs_2.4.10.tar.xz/lib/app/ogs-context.h -> open5gs_2.4.11.tar.xz/lib/app/ogs-context.h Changed

open5gs_2.4.10.tar.xz/lib/core/ogs-time.c -> open5gs_2.4.11.tar.xz/lib/core/ogs-time.c Changed

@@ -125,7 +125,7 @@
     rc = ogs_gettimeofday(&tv);
     ogs_assert(rc == 0);
 
-    return tv.tv_sec * OGS_USEC_PER_SEC + tv.tv_usec;
+    return ogs_time_from_sec(tv.tv_sec) + tv.tv_usec;
 }
 
 /* The following code is stolen from APR library */
@@ -188,13 +188,13 @@
     rc = ogs_gettimeofday(&tv);
     ogs_assert(rc == 0);
 
-    return ogs_time_to_ntp32(tv.tv_sec * OGS_USEC_PER_SEC + tv.tv_usec);
+    return ogs_time_to_ntp32(ogs_time_from_sec(tv.tv_sec) + tv.tv_usec);
 }
 ogs_time_t ogs_time_from_ntp32(uint32_t ntp_timestamp)
 {
     if (ntp_timestamp < OGS_1970_1900_SEC_DIFF)
         return 0;
-    return (ntp_timestamp - OGS_1970_1900_SEC_DIFF) * OGS_USEC_PER_SEC;
+    return ogs_time_from_sec(ntp_timestamp - OGS_1970_1900_SEC_DIFF);
 }
 uint32_t ogs_time_to_ntp32(ogs_time_t time)
 {
@@ -242,7 +242,7 @@
 #if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
     struct timespec ts;
     clock_gettime(CLOCK_MONOTONIC, &ts);
-    return ((ts.tv_sec * 1000000UL) + (ts.tv_nsec / 1000UL));
+    return ogs_time_from_sec(ts.tv_sec) + ts.tv_nsec / 1000UL;
 #elif defined(__APPLE__)
     static mach_timebase_info_data_t info = {0};
     static double ratio = 0.0;
@@ -268,7 +268,7 @@
     struct timeval tv;
 
     ogs_gettimeofday(&tv);
-    return (tv.tv_sec * 1000000UL) + tv.tv_usec;
+    return ogs_time_from_sec(tv.tv_sec) + tv.tv_usec;
 #endif
 }

open5gs_2.4.10.tar.xz/lib/core/ogs-tlv-msg.c -> open5gs_2.4.11.tar.xz/lib/core/ogs-tlv-msg.c Changed

@@ -412,8 +412,7 @@
     {
         ogs_tlv_uint8_t *v = (ogs_tlv_uint8_t *)msg;
 
-        if (tlv->length != 1)
-        {
+        if (tlv->length != 1) {
             ogs_error("Invalid TLV length %d. It should be 1", tlv->length);
             return OGS_ERROR;
         }
@@ -427,9 +426,8 @@
     {
         ogs_tlv_uint16_t *v = (ogs_tlv_uint16_t *)msg;
 
-        if (tlv->length != 2)
-        {
-            ogs_error("Invalid TLV length %d. It should be 2", tlv->length);
+        if (tlv->length < 1 || tlv->length > 2) {
+            ogs_error("Invalid TLV length %d.", tlv->length);
             return OGS_ERROR;
         }
         v->u16 = ((((uint8_t*)tlv->value)0<< 8)&0xff00) |
@@ -443,9 +441,8 @@
     {
         ogs_tlv_uint24_t *v = (ogs_tlv_uint24_t *)msg;
 
-        if (tlv->length != 3)
-        {
-            ogs_error("Invalid TLV length %d. It should be 3", tlv->length);
+        if (tlv->length < 1 || tlv->length > 3) {
+            ogs_error("Invalid TLV length %d.", tlv->length);
             return OGS_ERROR;
         }
         v->u24 = ((((uint8_t*)tlv->value)0<<16)&0x00ff0000) |
@@ -460,9 +457,8 @@
     {
         ogs_tlv_uint32_t *v = (ogs_tlv_uint32_t *)msg;
 
-        if (tlv->length != 4)
-        {
-            ogs_error("Invalid TLV length %d. It should be 4", tlv->length);
+        if (tlv->length < 1 || tlv->length > 4) {
+            ogs_error("Invalid TLV length %d.", tlv->length);
             return OGS_ERROR;
         }
         v->u32 = ((((uint8_t*)tlv->value)0<<24)&0xff000000) |
@@ -763,7 +759,15 @@
         ogs_assert(pos);
     }
 
-    ogs_assert(length == (pos - blk));
+    if (length != (pos - blk)) {
+        ogs_error("ogs_tlv_parse_block() failedLEN:%d,MODE:%d",
+                length, msg_mode);
+        ogs_error("POS%p BLK%p POS-BLK%d", pos, blk, (int)(pos - blk));
+        ogs_log_hexdump(OGS_LOG_FATAL, data, length);
+
+        ogs_tlv_free_all(root);
+        return NULL;
+    }
 
     return root;
 }

open5gs_2.4.10.tar.xz/lib/core/ogs-tlv.c -> open5gs_2.4.11.tar.xz/lib/core/ogs-tlv.c Changed

open5gs_2.4.10.tar.xz/lib/core/ogs-uuid.c -> open5gs_2.4.11.tar.xz/lib/core/ogs-uuid.c Changed

open5gs_2.4.10.tar.xz/lib/dbi/meson.build -> open5gs_2.4.11.tar.xz/lib/dbi/meson.build Changed

open5gs_2.4.10.tar.xz/lib/dbi/ogs-dbi.h -> open5gs_2.4.11.tar.xz/lib/dbi/ogs-dbi.h Changed

open5gs_2.4.10.tar.xz/lib/dbi/ogs-mongoc.c -> open5gs_2.4.11.tar.xz/lib/dbi/ogs-mongoc.c Changed

@@ -182,5 +182,62 @@
         mongoc_collection_destroy(self.collection.subscriber);
     }
 
+    if (self.stream) {
+        mongoc_change_stream_destroy(self.stream);
+    }
+
     ogs_mongoc_final();
 }
+
+int ogs_dbi_collection_watch_init(void)
+{
+    bson_t empty = BSON_INITIALIZER;    
+    const bson_t *err_doc;
+    bson_error_t error;
+    bson_t *options = BCON_NEW("fullDocument", "updateLookup");
+   
+    ogs_mongoc()->stream = mongoc_collection_watch(self.collection.subscriber,
+        &empty, options);
+
+    if (mongoc_change_stream_error_document(ogs_mongoc()->stream, &error,
+            &err_doc)) {
+        if (!bson_empty (err_doc)) {
+            ogs_error("Change Stream Error.  Enable replica sets to "
+                "enable database updates to be sent to MME.");
+        } else {
+            ogs_error("Client Error: %s\n", error.message);
+        }
+        return OGS_ERROR;
+    } else {
+        ogs_info("Change Streams are Enabled.");
+    }
+
+    return OGS_OK;
+}
+
+int ogs_dbi_poll_change_stream(void)
+{
+    int rv;
+    
+    const bson_t *document;
+    const bson_t *err_document;
+    bson_error_t error;
+
+    while (mongoc_change_stream_next(ogs_mongoc()->stream, &document)) {
+        rv = ogs_dbi_process_change_stream(document);
+        if (rv != OGS_OK) return rv;
+    }
+
+    if (mongoc_change_stream_error_document(ogs_mongoc()->stream, &error, 
+            &err_document)) {
+        if (!bson_empty (err_document)) {
+            ogs_debug("Server Error: %s\n",
+            bson_as_relaxed_extended_json(err_document, NULL));
+        } else {
+            ogs_debug("Client Error: %s\n", error.message);
+        }
+        return OGS_ERROR;
+    }
+
+    return OGS_OK;
+}

open5gs_2.4.10.tar.xz/lib/dbi/ogs-mongoc.h -> open5gs_2.4.11.tar.xz/lib/dbi/ogs-mongoc.h Changed

open5gs_2.4.11.tar.xz/lib/dbi/path.c Added

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2019,2020 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 "ogs-dbi.h"
+
+int ogs_dbi_process_change_stream(const bson_t *document)
+{
+    int rv;
+
+    ogs_event_t *e = NULL;
+
+    e = ogs_event_new(OGS_EVENT_DBI_MESSAGE);
+    ogs_assert(e);
+    e->dbi.document = bson_copy(document);
+    rv = ogs_queue_push(ogs_app()->queue, e);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_queue_push() failed:%d", (int)rv);
+        bson_destroy((bson_t*)e->dbi.document);
+        ogs_event_free(e);
+    } else {
+        ogs_pollset_notify(ogs_app()->pollset);
+    }
+
+    return OGS_OK;
+}

open5gs_2.4.11.tar.xz/lib/dbi/path.h Added

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2019,2020 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/>.
+ */
+
+#ifndef OGS_DBI_PATH_H
+#define OGS_DBI_PATH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int ogs_dbi_process_change_stream(const bson_t *document);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OGS_DBI_PATH_H */

open5gs_2.4.10.tar.xz/lib/dbi/subscription.c -> open5gs_2.4.11.tar.xz/lib/dbi/subscription.c Changed

@@ -189,6 +189,51 @@
     return rv;
 }
 
+int ogs_dbi_update_mme(char *supi, char *mme_host, char *mme_realm, 
+    bool purge_flag)
+{
+    int rv = OGS_OK;
+    bson_t *query = NULL;
+    bson_t *update = NULL;
+    bson_error_t error;
+
+    char *supi_type = NULL;
+    char *supi_id = NULL;
+
+    ogs_assert(supi);
+
+    supi_type = ogs_id_get_type(supi);
+    ogs_assert(supi_type);
+    supi_id = ogs_id_get_value(supi);
+    ogs_assert(supi_id);
+
+    ogs_debug("SUPI type: %s, SUPI id: %s, mme_host: %s, mme_realm: %s",
+            supi_type, supi_id, mme_host, mme_realm);
+
+    query = BCON_NEW(supi_type, BCON_UTF8(supi_id));
+    update = BCON_NEW("$set",
+            "{",
+                "mme_host", BCON_UTF8(mme_host),
+                "mme_realm", BCON_UTF8(mme_realm),
+                "mme_timestamp", BCON_INT64(ogs_time_now()),
+                "purge_flag", BCON_BOOL(purge_flag),
+            "}");
+    if (!mongoc_collection_update(ogs_mongoc()->collection.subscriber,
+            MONGOC_UPDATE_UPSERT, query, update, NULL, &error)) {
+        ogs_error("mongoc_collection_update() failure: %s", error.message);
+
+        rv = OGS_ERROR;
+    }
+
+    if (query) bson_destroy(query);
+    if (update) bson_destroy(update);
+
+    ogs_free(supi_type);
+    ogs_free(supi_id);
+
+    return rv;
+}
+
 int ogs_dbi_increment_sqn(char *supi)
 {
     int rv = OGS_OK;
@@ -329,6 +374,12 @@
             }
             subscription_data->num_of_msisdn = msisdn_index;
 
+        } else if (!strcmp(key, "imsi") &&
+            BSON_ITER_HOLDS_UTF8(&iter)) {
+            utf8 = bson_iter_utf8(&iter, &length);
+            subscription_data->imsi =
+                ogs_strndup(utf8, ogs_min(length, OGS_MAX_IMSI_BCD_LEN) + 1);
+            ogs_assert(subscription_data->imsi);
         } else if (!strcmp(key, "access_restriction_data") &&
             BSON_ITER_HOLDS_INT32(&iter)) {
             subscription_data->access_restriction_data =
@@ -649,6 +700,21 @@
                 }
                 subscription_data->num_of_slice++;
             }
+        } else if (!strcmp(key, "mme_host") &&
+            BSON_ITER_HOLDS_UTF8(&iter)) {
+            utf8 = bson_iter_utf8(&iter, &length);
+            subscription_data->mme_host =
+                ogs_strndup(utf8, ogs_min(length, OGS_MAX_FQDN_LEN) + 1);
+            ogs_assert(subscription_data->mme_host);
+        } else if (!strcmp(key, "mme_realm") &&
+            BSON_ITER_HOLDS_UTF8(&iter)) {
+            utf8 = bson_iter_utf8(&iter, &length);
+            subscription_data->mme_realm =
+                ogs_strndup(utf8, ogs_min(length, OGS_MAX_FQDN_LEN) + 1);
+            ogs_assert(subscription_data->mme_realm);
+        } else if (!strcmp(key, "purge_flag") &&
+            BSON_ITER_HOLDS_BOOL(&iter)) {
+            subscription_data->purge_flag = bson_iter_bool(&iter);
         }
     }

open5gs_2.4.10.tar.xz/lib/dbi/subscription.h -> open5gs_2.4.11.tar.xz/lib/dbi/subscription.h Changed

open5gs_2.4.11.tar.xz/lib/dbi/timer.c Added

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2019 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 "ogs-dbi.h"
+
+static void timer_send_event(int timer_id, void *data)
+{
+    int rv;
+    ogs_event_t *e = NULL;
+
+    e = ogs_event_new(OGS_EVENT_DBI_POLL_TIMER);
+    ogs_assert(e);
+    e->timer_id = timer_id;
+
+    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);
+    }
+}
+
+void ogs_timer_dbi_poll_change_stream(void *data)
+{
+    timer_send_event(OGS_TIMER_DBI_POLL_CHANGE_STREAM, data);
+}

open5gs_2.4.11.tar.xz/lib/dbi/timer.h Added

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2019 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/>.
+ */
+
+#ifndef OGS_DBI_TIMER_H
+#define OGS_DBI_TIMER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void ogs_timer_dbi_poll_change_stream(void *data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OGS_DBI_TIMER_H */

open5gs_2.4.10.tar.xz/lib/diameter/s6a/message.c -> open5gs_2.4.11.tar.xz/lib/diameter/s6a/message.c Changed

open5gs_2.4.10.tar.xz/lib/diameter/s6a/message.h -> open5gs_2.4.11.tar.xz/lib/diameter/s6a/message.h Changed

@@ -59,6 +59,9 @@
 #define OGS_DIAM_S6A_ULR_INITIAL_ATTACH_IND             (1 << 5)
 #define OGS_DIAM_S6A_ULR_PS_LCS_SUPPORTED_BY_UE         (1 << 6)
 
+#define OGS_DIAM_S6A_PUA_FLAGS_FREEZE_MTMSI             (1)
+#define OGS_DIAM_S6A_PUA_FLAGS_FREEZE_PTMSI             (1 << 1)
+
 #define OGS_DIAM_S6A_UE_SRVCC_NOT_SUPPORTED             (0)
 #define OGS_DIAM_S6A_UE_SRVCC_SUPPORTED                 (1)
 
@@ -68,6 +71,12 @@
 #define OGS_DIAM_S6A_VPLMN_DYNAMIC_ADDRESS_NOTALLOWED   (0)
 #define OGS_DIAM_S6A_VPLMN_DYNAMIC_ADDRESS_ALLOWED      (1)
 
+#define OGS_DIAM_S6A_CT_MME_UPDATE_PROCEDURE            (0)
+#define OGS_DIAM_S6A_CT_SGSN_UPDATE_PROCEDURE           (1)
+#define OGS_DIAM_S6A_CT_SUBSCRIPTION_WITHDRAWL          (2)
+#define OGS_DIAM_S6A_CT_UPDATE_PROCEDURE_IWF            (3)
+#define OGS_DIAM_S6A_CT_INITIAL_ATTACH_PROCEDURE        (4)
+
 extern struct dict_object *ogs_diam_s6a_application;
 
 extern struct dict_object *ogs_diam_s6a_cmd_air;
@@ -83,6 +92,7 @@
 
 extern struct dict_object *ogs_diam_s6a_ulr_flags;
 extern struct dict_object *ogs_diam_s6a_ula_flags;
+extern struct dict_object *ogs_diam_s6a_pua_flags;
 extern struct dict_object *ogs_diam_s6a_clr_flags;
 extern struct dict_object *ogs_diam_s6a_idr_flags;
 extern struct dict_object *ogs_diam_s6a_cancellation_type;

open5gs_2.4.10.tar.xz/lib/metrics/context.h -> open5gs_2.4.11.tar.xz/lib/metrics/context.h Changed

open5gs_2.4.10.tar.xz/lib/metrics/prometheus/context.c -> open5gs_2.4.11.tar.xz/lib/metrics/prometheus/context.c Changed

@@ -104,7 +104,7 @@
     return &self;
 }
 
-int ogs_metrics_context_parse_config(void)
+int ogs_metrics_context_parse_config(const char *local)
 {
     int family = AF_UNSPEC;
     const char *hostname = NULL;
@@ -121,17 +121,26 @@
     while (ogs_yaml_iter_next(&root_iter)) {
         const char *root_key = ogs_yaml_iter_key(&root_iter);
         ogs_assert(root_key);
-        if (!strcmp(root_key, "metrics")) {
+        if (local && !strcmp(root_key, local)) {
             ogs_yaml_iter_t local_iter;
             ogs_yaml_iter_recurse(&root_iter, &local_iter);
             while (ogs_yaml_iter_next(&local_iter)) {
                 const char *local_key = ogs_yaml_iter_key(&local_iter);
-                if (!strcmp(local_key, "addr")) {
-                    if ((v = ogs_yaml_iter_value(&local_iter)))
-                        hostname = v;
-                } else if (!strcmp(local_key, "port")) {
-                    if ((v = ogs_yaml_iter_value(&local_iter)))
-                        port = atoi(v);
+                ogs_assert(local_key);
+                if (!strcmp(local_key, "metrics")) {
+                    ogs_yaml_iter_t metrics_iter;
+                    ogs_yaml_iter_recurse(&local_iter, &metrics_iter);
+                    while (ogs_yaml_iter_next(&metrics_iter)) {
+                        const char *metrics_key = ogs_yaml_iter_key(&metrics_iter);
+                        ogs_assert(metrics_key);
+                        if (!strcmp(metrics_key, "addr")) {
+                            if ((v = ogs_yaml_iter_value(&metrics_iter)))
+                                hostname = v;
+                        } else if (!strcmp(metrics_key, "port")) {
+                            if ((v = ogs_yaml_iter_value(&metrics_iter)))
+                                port = atoi(v);
+                        }
+                    }
                 }
             }
         }

open5gs_2.4.10.tar.xz/lib/metrics/void/context.c -> open5gs_2.4.11.tar.xz/lib/metrics/void/context.c Changed

open5gs_2.4.10.tar.xz/lib/proto/event.c -> open5gs_2.4.11.tar.xz/lib/proto/event.c Changed

open5gs_2.4.10.tar.xz/lib/proto/event.h -> open5gs_2.4.11.tar.xz/lib/proto/event.h Changed

open5gs_2.4.10.tar.xz/lib/proto/timer.c -> open5gs_2.4.11.tar.xz/lib/proto/timer.c Changed

open5gs_2.4.10.tar.xz/lib/proto/timer.h -> open5gs_2.4.11.tar.xz/lib/proto/timer.h Changed

open5gs_2.4.10.tar.xz/lib/proto/types.c -> open5gs_2.4.11.tar.xz/lib/proto/types.c Changed

open5gs_2.4.10.tar.xz/lib/proto/types.h -> open5gs_2.4.11.tar.xz/lib/proto/types.h Changed

open5gs_2.4.10.tar.xz/lib/sbi/client.c -> open5gs_2.4.11.tar.xz/lib/sbi/client.c Changed

@@ -44,6 +44,7 @@
 
     char *memory;
     size_t size;
+    bool memory_overflow;
 
     char *location;
 
@@ -533,6 +534,8 @@
 
             res = resource->data.result;
             if (res == CURLE_OK) {
+                ogs_log_level_e level = OGS_LOG_DEBUG;
+
                 response = ogs_sbi_response_new();
                 ogs_assert(response);
 
@@ -546,7 +549,17 @@
                 response->h.uri = ogs_strdup(url);
                 ogs_assert(response->h.uri);
 
-                ogs_debug("%d:%s %s",
+                if (content_type)
+                    ogs_sbi_header_set(response->http.headers,
+                            OGS_SBI_CONTENT_TYPE, content_type);
+                if (conn->location)
+                    ogs_sbi_header_set(response->http.headers,
+                            OGS_SBI_LOCATION, conn->location);
+
+                if (conn->memory_overflow == true)
+                    level = OGS_LOG_ERROR;
+
+                ogs_log_message(level, 0, "%d:%s %s",
                         response->status, response->h.method, response->h.uri);
 
                 if (conn->memory) {
@@ -557,16 +570,17 @@
                     ogs_assert(response->http.content_length);
                 }
 
-                ogs_debug("RECEIVED%d", (int)response->http.content_length);
+                ogs_log_message(level, 0, "RECEIVED%d",
+                        (int)response->http.content_length);
                 if (response->http.content_length && response->http.content)
-                    ogs_debug("%s", response->http.content);
+                    ogs_log_message(level, 0, "%s", response->http.content);
+
+                if (conn->memory_overflow == true) {
+                    ogs_sbi_response_free(response);
+                    connection_remove(conn);
+                    break;
+                }
 
-                if (content_type)
-                    ogs_sbi_header_set(response->http.headers,
-                            OGS_SBI_CONTENT_TYPE, content_type);
-                if (conn->location)
-                    ogs_sbi_header_set(response->http.headers,
-                            OGS_SBI_LOCATION, conn->location);
             } else
                 ogs_warn("%d %s", res, conn->error);
 
@@ -727,8 +741,12 @@
     realsize = size * nmemb;
     ptr = ogs_realloc(conn->memory, conn->size + realsize + 1);
     if(!ptr) {
-        ogs_fatal("not enough memory (realloc returned NULL)");
-        ogs_assert_if_reached();
+        conn->memory_overflow = true;
+
+        ogs_error("Overflow : conn->size%d, realsize%d",
+                    (int)conn->size, (int)realsize);
+        ogs_log_hexdump(OGS_LOG_ERROR, contents, realsize);
+
         return 0;
     }

open5gs_2.4.10.tar.xz/lib/sbi/context.c -> open5gs_2.4.11.tar.xz/lib/sbi/context.c Changed

open5gs_2.4.10.tar.xz/lib/sbi/context.h -> open5gs_2.4.11.tar.xz/lib/sbi/context.h Changed

open5gs_2.4.10.tar.xz/lib/sbi/nghttp2-server.c -> open5gs_2.4.11.tar.xz/lib/sbi/nghttp2-server.c Changed

@@ -82,6 +82,7 @@
 
     int32_t                 stream_id;
     ogs_sbi_request_t       *request;
+    bool                    memory_overflow;
 
     ogs_sbi_session_t       *session;
 } ogs_sbi_stream_t;
@@ -791,12 +792,23 @@
     case NGHTTP2_DATA:
         /* HEADERS or DATA frame with +END_STREAM flag */
         if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
+            ogs_log_level_e level = OGS_LOG_DEBUG;
 
-            ogs_debug("%s %s", request->h.method, request->h.uri);
+            if (stream->memory_overflow == true)
+                level = OGS_LOG_ERROR;
+
+            ogs_log_message(level, 0,
+                    "%s %s", request->h.method, request->h.uri);
 
             if (request->http.content_length && request->http.content) {
-                ogs_debug("RECEIVED: %d", (int)request->http.content_length);
-                ogs_debug("%s", request->http.content);
+                ogs_log_message(level, 0,
+                        "RECEIVED: %d", (int)request->http.content_length);
+                ogs_log_message(level, 0, "%s", request->http.content);
+            }
+
+            if (stream->memory_overflow == true) {
+                ogs_error("DROP Overflow");
+                break;
             }
 
             if (server->cb(request, stream) != OGS_OK) {
@@ -967,23 +979,30 @@
     ogs_assert(len);
 
     if (request->http.content == NULL) {
-        request->http.content_length = len;
-        request->http.content =
-            (char*)ogs_malloc(request->http.content_length + 1);
-        ogs_assert(request->http.content);
+        ogs_assert(request->http.content_length == 0);
+        ogs_assert(offset == 0);
+
+        request->http.content = (char*)ogs_malloc(len + 1);
     } else {
-        offset = request->http.content_length;
-        if ((request->http.content_length + len) > OGS_HUGE_LEN) {
-            ogs_error("Overflow : Content-Length%d, len%d",
-                        (int)request->http.content_length, (int)len);
-            ogs_assert_if_reached();
-        }
-        request->http.content_length += len;
-        request->http.content = (char *)ogs_realloc(
-                request->http.content, request->http.content_length + 1);
-        ogs_assert(request->http.content);
+        ogs_assert(request->http.content_length != 0);
+
+        request->http.content = (char*)ogs_realloc(
+                request->http.content, request->http.content_length + len + 1);
     }
 
+    if (!request->http.content) {
+        stream->memory_overflow = true;
+
+        ogs_error("Overflow : Content-Length%d, len%d",
+                    (int)request->http.content_length, (int)len);
+        ogs_log_hexdump(OGS_LOG_ERROR, data, len);
+
+        return 0;
+    }
+
+    offset = request->http.content_length;
+    request->http.content_length += len;
+
     memcpy(request->http.content + offset, data, len);
     request->http.contentrequest->http.content_length = '\0';

open5gs_2.4.10.tar.xz/lib/sbi/nnrf-build.c -> open5gs_2.4.11.tar.xz/lib/sbi/nnrf-build.c Changed

@@ -23,7 +23,9 @@
         ogs_sbi_nf_service_t *nf_service);
 static void free_nf_service(OpenAPI_nf_service_t *NFService);
 static OpenAPI_smf_info_t *build_smf_info(ogs_sbi_nf_info_t *nf_info);
+static OpenAPI_amf_info_t *build_amf_info(ogs_sbi_nf_info_t *nf_info);
 static void free_smf_info(OpenAPI_smf_info_t *SmfInfo);
+static void free_amf_info(OpenAPI_amf_info_t *AmfInfo);
 
 ogs_sbi_request_t *ogs_nnrf_nfm_build_register(void)
 {
@@ -79,13 +81,15 @@
     OpenAPI_list_t *AllowedNfTypeList = NULL;
     OpenAPI_list_t *NFServiceList = NULL;
     OpenAPI_map_t *NFServiceMap = NULL;
-    OpenAPI_list_t *SmfInfoList = NULL;
-    OpenAPI_map_t *SmfInfoMap = NULL;
+    OpenAPI_list_t *InfoList = NULL;
+    OpenAPI_map_t *InfoMap = NULL;
     OpenAPI_smf_info_t *SmfInfo = NULL;
-    int SmfInfoMapKey;
+    int InfoMapKey;
 
     OpenAPI_lnode_t *node = NULL;
 
+    OpenAPI_amf_info_t *AmfInfo = NULL;
+
     int i = 0;
     char *ipstr = NULL;
 
@@ -222,10 +226,10 @@
     } else
         OpenAPI_list_free(NFServiceList);
 
-    SmfInfoList = OpenAPI_list_create();
-    ogs_assert(SmfInfoList);
+    InfoList = OpenAPI_list_create();
+    ogs_assert(InfoList);
 
-    SmfInfoMapKey = 0;
+    InfoMapKey = 0;
 
     ogs_list_for_each(&nf_instance->nf_info_list, nf_info) {
         if (nf_info->nf_type == OpenAPI_nf_type_SMF) {
@@ -238,11 +242,21 @@
             SmfInfo = build_smf_info(nf_info);
             ogs_expect_or_return_val(SmfInfo, NULL);
 
-            SmfInfoMap = OpenAPI_map_create(
-                    ogs_msprintf("%d", ++SmfInfoMapKey), SmfInfo);
-            ogs_assert(SmfInfoMap);
+            InfoMap = OpenAPI_map_create(
+                    ogs_msprintf("%d", ++InfoMapKey), SmfInfo);
+            ogs_assert(InfoMap);
+
+            OpenAPI_list_add(InfoList, InfoMap);
+
+        } else if (nf_info->nf_type == OpenAPI_nf_type_AMF) {
+            AmfInfo = build_amf_info(nf_info);
+            ogs_expect_or_return_val(AmfInfo, NULL);
+
+            InfoMap = OpenAPI_map_create(
+                    ogs_msprintf("%d", ++InfoMapKey), AmfInfo);
+            ogs_assert(InfoMap);
 
-            OpenAPI_list_add(SmfInfoList, SmfInfoMap);
+            OpenAPI_list_add(InfoList, InfoMap);
 
         } else {
             ogs_fatal("Not implemented NF-type%s",
@@ -250,23 +264,37 @@
             ogs_assert_if_reached();
         }
     }
-
-    if (SmfInfoList->count == 1) {
-        NFProfile->smf_info = SmfInfo;
-
-        OpenAPI_list_for_each(SmfInfoList, node) {
-            SmfInfoMap = node->data;
-            if (SmfInfoMap) {
-                if (SmfInfoMap->key)
-                    ogs_free(SmfInfoMap->key);
-                ogs_free(SmfInfoMap);
+    if (InfoList->count == 1) {
+        if (nf_instance->nf_type == OpenAPI_nf_type_SMF) {
+            NFProfile->smf_info = SmfInfo;
+        } else if (nf_instance->nf_type == OpenAPI_nf_type_AMF) {
+            NFProfile->amf_info = AmfInfo;
+        } else {
+            ogs_fatal("Not implemented NF-type%s",
+                    OpenAPI_nf_type_ToString(nf_instance->nf_type));
+            ogs_assert_if_reached();
+        }
+        OpenAPI_list_for_each(InfoList, node) {
+            InfoMap = node->data;
+            if (InfoMap) {
+                if (InfoMap->key)
+                    ogs_free(InfoMap->key);
+                ogs_free(InfoMap);
             }
         }
-        OpenAPI_list_free(SmfInfoList);
-    } else if (SmfInfoList->count > 1) {
-        NFProfile->smf_info_list = SmfInfoList;
+        OpenAPI_list_free(InfoList);
+    } else if (InfoList->count > 1) {
+        if (nf_instance->nf_type == OpenAPI_nf_type_SMF) {
+            NFProfile->smf_info_list = InfoList;
+        } else if (nf_instance->nf_type == OpenAPI_nf_type_AMF) {
+            NFProfile->amf_info_list = InfoList;
+        } else {
+            ogs_fatal("Not implemented NF-type%s",
+                    OpenAPI_nf_type_ToString(nf_instance->nf_type));
+            ogs_assert_if_reached();
+        }
     } else
-        OpenAPI_list_free(SmfInfoList);
+        OpenAPI_list_free(InfoList);
 
     return NFProfile;
 }
@@ -277,6 +305,8 @@
     OpenAPI_nf_service_t *NFService = NULL;
     OpenAPI_map_t *SmfInfoMap = NULL;
     OpenAPI_smf_info_t *SmfInfo = NULL;
+    OpenAPI_map_t *AmfInfoMap = NULL;
+    OpenAPI_amf_info_t *AmfInfo = NULL;
     OpenAPI_lnode_t *node = NULL;
 
     ogs_assert(NFProfile);
@@ -327,6 +357,22 @@
     if (NFProfile->smf_info)
         free_smf_info(NFProfile->smf_info);
 
+    OpenAPI_list_for_each(NFProfile->amf_info_list, node) {
+        AmfInfoMap = node->data;
+        if (AmfInfoMap) {
+            AmfInfo = AmfInfoMap->value;
+            if (AmfInfo)
+                free_amf_info(AmfInfo);
+            if (AmfInfoMap->key)
+                ogs_free(AmfInfoMap->key);
+            ogs_free(AmfInfoMap);
+        }
+    }
+    OpenAPI_list_free(NFProfile->amf_info_list);
+
+    if (NFProfile->amf_info)
+        free_amf_info(NFProfile->amf_info);
+
     ogs_free(NFProfile);
 }
 
@@ -622,6 +668,124 @@
     return SmfInfo;
 }
 
+static OpenAPI_amf_info_t *build_amf_info(ogs_sbi_nf_info_t *nf_info)
+{
+    int i, j;
+    OpenAPI_amf_info_t *AmfInfo = NULL;
+
+    OpenAPI_list_t *guamiAmfInfoList = NULL;
+    OpenAPI_guami_t *guamiAmfInfoItem = NULL;
+
+    OpenAPI_list_t *TaiList = NULL;
+    OpenAPI_tai_t *TaiItem = NULL;
+    OpenAPI_list_t *TaiRangeList = NULL;
+    OpenAPI_tai_range_t *TaiRangeItem = NULL;
+    OpenAPI_list_t *TacRangeList = NULL;
+    OpenAPI_tac_range_t *TacRangeItem = NULL;
+
+    ogs_assert(nf_info);
+
+    AmfInfo = ogs_calloc(1, sizeof(*AmfInfo));
+    ogs_expect_or_return_val(AmfInfo, NULL);
+
+    AmfInfo->amf_set_id = ogs_msprintf("%03x", nf_info->amf.amf_set_id);
+    AmfInfo->amf_region_id = ogs_msprintf("%02x", nf_info->amf.amf_region_id);
+
+    guamiAmfInfoList = OpenAPI_list_create();
+    ogs_assert(guamiAmfInfoList);
+
+    for (i = 0; i < nf_info->amf.num_of_guami; i++) {
+
+        guamiAmfInfoItem = ogs_calloc(1, sizeof(*guamiAmfInfoItem));
+        ogs_expect_or_return_val(guamiAmfInfoItem, NULL);
+
+        guamiAmfInfoItem->plmn_id =
+                ogs_sbi_build_plmn_id_nid(&nf_info->amf.guamii.plmn_id);
+        ogs_expect_or_return_val(guamiAmfInfoItem->plmn_id, NULL);
+        guamiAmfInfoItem->amf_id =
+                ogs_amf_id_to_string(&nf_info->amf.guamii.amf_id);
+        ogs_expect_or_return_val(guamiAmfInfoItem->amf_id, NULL);
+
+        OpenAPI_list_add(guamiAmfInfoList, guamiAmfInfoItem);
+    }
+
+    if (guamiAmfInfoList->count)
+        AmfInfo->guami_list = guamiAmfInfoList;
+    else
+        OpenAPI_list_free(guamiAmfInfoList);
+
+    TaiList = OpenAPI_list_create();
+    ogs_assert(TaiList);
+
+    for (i = 0; i < nf_info->amf.num_of_nr_tai; i++) {
+        TaiItem = ogs_calloc(1, sizeof(*TaiItem));
+        ogs_expect_or_return_val(TaiItem, NULL);
+        TaiItem->plmn_id = ogs_sbi_build_plmn_id(
+                &nf_info->amf.nr_taii.plmn_id);
+        ogs_expect_or_return_val(TaiItem->plmn_id, NULL);
+        TaiItem->tac =
+            ogs_uint24_to_0string(nf_info->amf.nr_taii.tac);
+        ogs_expect_or_return_val(TaiItem->tac, NULL);
+
+        OpenAPI_list_add(TaiList, TaiItem);
+    }
+
+    if (TaiList->count)
+        AmfInfo->tai_list = TaiList;
+    else
+        OpenAPI_list_free(TaiList);
+
+    TaiRangeList = OpenAPI_list_create();
+    ogs_assert(TaiRangeList);
+
+    for (i = 0; i < nf_info->amf.num_of_nr_tai_range; i++) {
+        TacRangeList = OpenAPI_list_create();
+        ogs_assert(TacRangeList);
+
+        for (j = 0;
+                j < nf_info->amf.nr_tai_rangei.num_of_tac_range;
+                j++) {
+            TacRangeItem = ogs_calloc(1, sizeof(*TacRangeItem));
+            ogs_expect_or_return_val(TacRangeItem, NULL);
+
+            TacRangeItem->start = ogs_uint24_to_0string(
+                    nf_info->amf.nr_tai_rangei.startj);
+            ogs_expect_or_return_val(TacRangeItem->start, NULL);
+            TacRangeItem->end =
+                ogs_uint24_to_0string(
+                        nf_info->amf.nr_tai_rangei.endj);
+            ogs_expect_or_return_val(TacRangeItem->end, NULL);
+
+            OpenAPI_list_add(TacRangeList, TacRangeItem);
+        }
+
+        if (!TacRangeList->count) {
+            OpenAPI_list_free(TacRangeList);
+
+            ogs_error("CHECK CONFIGURATION: No Start/End in TacRange");
+            ogs_expect_or_return_val(0, NULL);
+        }
+
+        TaiRangeItem = ogs_calloc(1, sizeof(*TaiRangeItem));
+        ogs_expect_or_return_val(TaiRangeItem, NULL);
+
+        TaiRangeItem->plmn_id = ogs_sbi_build_plmn_id(
+                &nf_info->amf.nr_tai_rangei.plmn_id);
+        ogs_expect_or_return_val(TaiRangeItem->plmn_id, NULL);
+
+        TaiRangeItem->tac_range_list = TacRangeList;
+
+        OpenAPI_list_add(TaiRangeList, TaiRangeItem);
+    }
+
+    if (TaiRangeList->count)
+        AmfInfo->tai_range_list = TaiRangeList;
+    else
+        OpenAPI_list_free(TaiRangeList);
+
+    return AmfInfo;
+}
+
 static void free_smf_info(OpenAPI_smf_info_t *SmfInfo)
 {
     OpenAPI_list_t *sNssaiSmfInfoList = NULL;
@@ -705,6 +869,84 @@
     ogs_free(SmfInfo);
 }
 
+static void free_amf_info(OpenAPI_amf_info_t *AmfInfo)
+{
+    OpenAPI_list_t *guamiAmfInfoList = NULL;
+    OpenAPI_guami_t *guamiAmfInfoItem = NULL;
+
+    OpenAPI_list_t *TaiList = NULL;
+    OpenAPI_tai_t *TaiItem = NULL;
+    OpenAPI_list_t *TaiRangeList = NULL;
+    OpenAPI_tai_range_t *TaiRangeItem = NULL;
+    OpenAPI_list_t *TacRangeList = NULL;
+    OpenAPI_tac_range_t *TacRangeItem = NULL;
+
+    OpenAPI_lnode_t *node = NULL, *node2 = NULL;
+
+    ogs_assert(AmfInfo);
+
+    ogs_free(AmfInfo->amf_set_id);
+    ogs_free(AmfInfo->amf_region_id);
+
+    guamiAmfInfoList = AmfInfo->guami_list;
+    OpenAPI_list_for_each(guamiAmfInfoList, node) {
+        guamiAmfInfoItem = node->data;
+        if (guamiAmfInfoItem) {
+            if (guamiAmfInfoItem->plmn_id) {
+                if (guamiAmfInfoItem->plmn_id->mcc)
+                    ogs_free(guamiAmfInfoItem->plmn_id->mcc);
+                if (guamiAmfInfoItem->plmn_id->mnc)
+                    ogs_free(guamiAmfInfoItem->plmn_id->mnc);
+                ogs_free(guamiAmfInfoItem->plmn_id);
+            }
+            if (guamiAmfInfoItem->amf_id)
+                ogs_free(guamiAmfInfoItem->amf_id);
+        }
+        ogs_free(guamiAmfInfoItem);
+    }
+
+    OpenAPI_list_free(guamiAmfInfoList);
+
+    TaiList = AmfInfo->tai_list;
+    OpenAPI_list_for_each(TaiList, node) {
+        TaiItem = node->data;
+        ogs_assert(TaiItem);
+        if (TaiItem->plmn_id)
+            ogs_sbi_free_plmn_id(TaiItem->plmn_id);
+        if (TaiItem->tac)
+            ogs_free(TaiItem->tac);
+        ogs_free(TaiItem);
+    }
+    OpenAPI_list_free(TaiList);
+
+    TaiRangeList = AmfInfo->tai_range_list;
+    OpenAPI_list_for_each(TaiRangeList, node) {
+        TaiRangeItem = node->data;
+        ogs_assert(TaiRangeItem);
+
+        if (TaiRangeItem->plmn_id)
+            ogs_sbi_free_plmn_id(TaiRangeItem->plmn_id);
+
+        TacRangeList = TaiRangeItem->tac_range_list;
+        OpenAPI_list_for_each(TacRangeList, node2) {
+            TacRangeItem = node2->data;
+            ogs_assert(TacRangeItem);
+            if (TacRangeItem->start)
+                ogs_free(TacRangeItem->start);
+            if (TacRangeItem->end)
+                ogs_free(TacRangeItem->end);
+
+            ogs_free(TacRangeItem);
+        }
+        OpenAPI_list_free(TacRangeList);
+
+        ogs_free(TaiRangeItem);
+    }
+    OpenAPI_list_free(TaiRangeList);
+
+    ogs_free(AmfInfo);
+}
+
 ogs_sbi_request_t *ogs_nnrf_nfm_build_update(void)
 {
     ogs_sbi_nf_instance_t *nf_instance = NULL;

open5gs_2.4.10.tar.xz/meson.build -> open5gs_2.4.11.tar.xz/meson.build Changed

open5gs_2.4.10.tar.xz/src/amf/context.c -> open5gs_2.4.11.tar.xz/src/amf/context.c Changed

@@ -330,7 +330,7 @@
                         const char *region = NULL, *set = NULL;
                         const char *pointer = NULL;
                         ogs_assert(self.num_of_served_guami <
-                                MAX_NUM_OF_SERVED_GUAMI);
+                                OGS_MAX_NUM_OF_SERVED_GUAMI);
 
                         if (ogs_yaml_iter_type(&guami_array) ==
                                 YAML_MAPPING_NODE) {
@@ -825,6 +825,8 @@
                     /* handle config in sbi library */
                 } else if (!strcmp(amf_key, "discovery")) {
                     /* handle config in sbi library */
+                } else if (!strcmp(amf_key, "metrics")) {
+                    /* handle config in metrics library */
                 } else
                     ogs_warn("unknown key `%s`", amf_key);
             }
@@ -836,6 +838,97 @@
 
     return OGS_OK;
 }
+
+int amf_context_nf_info(void)
+{
+    ogs_sbi_nf_instance_t *nf_instance = NULL;
+    ogs_sbi_nf_info_t *nf_info = NULL;
+
+    int served_i, next_new_i, info_i;
+    bool next_found;
+    served_i = 0;
+    next_new_i = 0;
+    next_found = false;
+    do {
+        nf_instance = ogs_sbi_self()->nf_instance;
+        ogs_assert(nf_instance);
+
+        nf_info = ogs_sbi_nf_info_add(
+                &nf_instance->nf_info_list, OpenAPI_nf_type_AMF);
+        ogs_assert(nf_info);
+        nf_info->amf.amf_set_id = self.served_guaminext_new_i.amf_id.set2;
+        nf_info->amf.amf_region_id = self.served_guaminext_new_i.amf_id.region;
+        next_found = false;
+        info_i = 0;
+        for (served_i = next_new_i; served_i <
+                self.num_of_served_guami; served_i++) {
+            if (self.served_guamiserved_i.amf_id.set2 ==
+                    nf_info->amf.amf_set_id &&
+                    self.served_guamiserved_i.amf_id.region ==
+                nf_info->amf.amf_region_id) {
+                nf_info->amf.guamiinfo_i = self.served_guamiserved_i;
+                nf_info->amf.num_of_guami++;
+                info_i++;
+            } else {
+                if (!next_found) {
+                    int handled_i;
+                    for (handled_i = 0; handled_i < served_i; handled_i++) {
+                        if (self.served_guamihandled_i.amf_id.set2 ==
+                                self.served_guamiserved_i.amf_id.set2 &&
+                            self.served_guamihandled_i.amf_id.region ==
+                                    self.served_guamiserved_i.amf_id.region) {
+                            break;
+                        }
+                    next_found = true;
+                    next_new_i = served_i;
+                    }
+                }
+            }
+        }
+
+        nf_info->amf.num_of_nr_tai = 0;
+        int i = 0, j = 0, info_tai_i = 0;
+        for (i = 0; i < self.num_of_served_tai; i++) {
+            if (self.served_taii.list2.num) {
+                for (j = 0; j < self.served_taii.list2.num; j++) {
+                    for (served_i = 0; served_i < info_i; served_i++) {
+                        if (ogs_plmn_id_hexdump
+                                (&self.served_taii.list2.taij.plmn_id) ==
+                                ogs_plmn_id_hexdump
+                                (&nf_info->amf.guamiserved_i.plmn_id)) {
+                            nf_info->amf.nr_taiinfo_tai_i.plmn_id =
+                                    self.served_taii.list2.taij.plmn_id;
+                            nf_info->amf.nr_taiinfo_tai_i.tac =
+                                    self.served_taii.list2.taij.tac;
+                            nf_info->amf.num_of_nr_tai++;
+                            info_tai_i++;
+                        }
+                    }
+                }
+            }
+            for (j = 0; self.served_taii.list0.taij.num; j++) {
+                int k = 0;
+                for (k = 0; k < self.served_taii.list0.taij.num; k++) {
+                    for (served_i = 0; served_i < info_i; served_i++) {
+                        if (ogs_plmn_id_hexdump
+                                (&self.served_taii.list0.taij.plmn_id) ==
+                                ogs_plmn_id_hexdump
+                                (&nf_info->amf.guamiserved_i.plmn_id)) {
+                            nf_info->amf.nr_taiinfo_tai_i.plmn_id =
+                                    self.served_taii.list0.taij.plmn_id;
+                            nf_info->amf.nr_taiinfo_tai_i.tac =
+                                    self.served_taii.list0.taij.tack;
+                            nf_info->amf.num_of_nr_tai++;
+                            info_tai_i++;
+                        }
+                    }
+                }
+            }
+        }
+    } while (next_found);
+
+    return OGS_OK;
+}
 
 amf_gnb_t *amf_gnb_add(ogs_sock_t *sock, ogs_sockaddr_t *addr)
 {

open5gs_2.4.10.tar.xz/src/amf/context.h -> open5gs_2.4.11.tar.xz/src/amf/context.h Changed

open5gs_2.4.10.tar.xz/src/amf/gmm-sm.c -> open5gs_2.4.11.tar.xz/src/amf/gmm-sm.c Changed

open5gs_2.4.10.tar.xz/src/amf/init.c -> open5gs_2.4.11.tar.xz/src/amf/init.c Changed

open5gs_2.4.10.tar.xz/src/ausf/context.h -> open5gs_2.4.11.tar.xz/src/ausf/context.h Changed

open5gs_2.4.10.tar.xz/src/bsf/bsf-sm.c -> open5gs_2.4.11.tar.xz/src/bsf/bsf-sm.c Changed

@@ -130,25 +130,26 @@
                     SWITCH(message.h.method)
                     CASE(OGS_SBI_HTTP_METHOD_POST)
                         if (message.PcfBinding &&
-                            message.PcfBinding->snssai &&
-                            message.PcfBinding->dnn) {
-                            ogs_s_nssai_t s_nssai;
+                            (message.PcfBinding->ipv4_addr ||
+                             message.PcfBinding->ipv6_prefix)) {
 
-                            s_nssai.sst = message.PcfBinding->snssai->sst;
-                            s_nssai.sd = ogs_s_nssai_sd_from_string(
-                                    message.PcfBinding->snssai->sd);
+                            if (message.PcfBinding->ipv4_addr)
+                                sess = bsf_sess_find_by_ipv4addr(
+                                            message.PcfBinding->ipv4_addr);
+                            if (!sess && message.PcfBinding->ipv6_prefix)
+                                sess = bsf_sess_find_by_ipv6prefix(
+                                            message.PcfBinding->ipv6_prefix);
 
-                            sess = bsf_sess_find_by_snssai_and_dnn(
-                                    &s_nssai, message.PcfBinding->dnn);
                             if (!sess) {
-                                sess = bsf_sess_add_by_snssai_and_dnn(
-                                        &s_nssai, message.PcfBinding->dnn);
+                                sess = bsf_sess_add_by_ip_address(
+                                            message.PcfBinding->ipv4_addr,
+                                            message.PcfBinding->ipv6_prefix);
                                 ogs_assert(sess);
                             }
                         }
                         break;
                     CASE(OGS_SBI_HTTP_METHOD_GET)
-                        if (!sess && message.param.ipv4addr)
+                        if (message.param.ipv4addr)
                             sess = bsf_sess_find_by_ipv4addr(
                                         message.param.ipv4addr);
                         if (!sess && message.param.ipv6prefix)

open5gs_2.4.10.tar.xz/src/bsf/context.c -> open5gs_2.4.11.tar.xz/src/bsf/context.c Changed

@@ -27,9 +27,6 @@
 
 static int context_initialized = 0;
 
-static void clear_ipv4addr(bsf_sess_t *sess);
-static void clear_ipv6prefix(bsf_sess_t *sess);
-
 void bsf_context_init(void)
 {
     ogs_assert(context_initialized == 0);
@@ -120,13 +117,12 @@
     return OGS_OK;
 }
 
-bsf_sess_t *bsf_sess_add_by_snssai_and_dnn(ogs_s_nssai_t *s_nssai, char *dnn)
+bsf_sess_t *bsf_sess_add_by_ip_address(
+            char *ipv4addr_string, char *ipv6prefix_string)
 {
     bsf_sess_t *sess = NULL;
 
-    ogs_assert(s_nssai);
-    ogs_assert(s_nssai->sst);
-    ogs_assert(dnn);
+    ogs_assert(ipv4addr_string || ipv6prefix_string);
 
     ogs_pool_alloc(&bsf_sess_pool, &sess);
     if (!sess) {
@@ -136,16 +132,23 @@
     }
     memset(sess, 0, sizeof *sess);
 
+    if (ipv4addr_string &&
+        bsf_sess_set_ipv4addr(sess, ipv4addr_string) == false) {
+        ogs_error("bsf_sess_set_ipv4addr%s failed", ipv4addr_string);
+        ogs_pool_free(&bsf_sess_pool, sess);
+        return NULL;
+    }
+    if (ipv6prefix_string &&
+        bsf_sess_set_ipv6prefix(sess, ipv6prefix_string) == false) {
+        ogs_error("bsf_sess_set_ipv6prefix%s failed", ipv4addr_string);
+        ogs_pool_free(&bsf_sess_pool, sess);
+        return NULL;
+    }
+
     /* SBI Features */
     OGS_SBI_FEATURES_SET(sess->management_features,
             OGS_SBI_NBSF_MANAGEMENT_BINDING_UPDATE);
 
-    sess->s_nssai.sst = s_nssai->sst;
-    sess->s_nssai.sd.v = s_nssai->sd.v;
-
-    sess->dnn = ogs_strdup(dnn);
-    ogs_assert(sess->dnn);
-
     sess->binding_id = ogs_msprintf("%d",
             (int)ogs_pool_index(&bsf_sess_pool, sess));
     ogs_assert(sess->binding_id);
@@ -174,8 +177,16 @@
     if (sess->gpsi)
         ogs_free(sess->gpsi);
 
-    clear_ipv4addr(sess);
-    clear_ipv6prefix(sess);
+    if (sess->ipv4addr_string) {
+        ogs_hash_set(self.ipv4addr_hash,
+                &sess->ipv4addr, sizeof(sess->ipv4addr), NULL);
+        ogs_free(sess->ipv4addr_string);
+    }
+    if (sess->ipv6prefix_string) {
+        ogs_hash_set(self.ipv6prefix_hash,
+                &sess->ipv6prefix, (sess->ipv6prefix.len >> 3) + 1, NULL);
+        ogs_free(sess->ipv6prefix_string);
+    }
 
     ogs_assert(sess->dnn);
     ogs_free(sess->dnn);
@@ -202,37 +213,18 @@
         bsf_sess_remove(sess);
 }
 
-static void clear_ipv4addr(bsf_sess_t *sess)
+bool bsf_sess_set_ipv4addr(bsf_sess_t *sess, char *ipv4addr_string)
 {
+    int rv;
+
     ogs_assert(sess);
+    ogs_assert(ipv4addr_string);
 
     if (sess->ipv4addr_string) {
         ogs_hash_set(self.ipv4addr_hash,
                 &sess->ipv4addr, sizeof(sess->ipv4addr), NULL);
         ogs_free(sess->ipv4addr_string);
     }
-}
-
-static void clear_ipv6prefix(bsf_sess_t *sess)
-{
-    ogs_assert(sess);
-
-    if (sess->ipv6prefix_string) {
-        ogs_hash_set(self.ipv6prefix_hash,
-                &sess->ipv6prefix, (sess->ipv6prefix.len >> 3) + 1, NULL);
-        ogs_free(sess->ipv6prefix_string);
-    }
-}
-
-bool bsf_sess_set_ipv4addr(bsf_sess_t *sess, char *ipv4addr_string)
-{
-    int rv;
-
-    ogs_assert(sess);
-    ogs_assert(ipv4addr_string);
-
-    clear_ipv4addr(sess);
-
     rv = ogs_ipv4_from_string(&sess->ipv4addr, ipv4addr_string);
     ogs_expect_or_return_val(rv == OGS_OK, false);
 
@@ -252,8 +244,11 @@
     ogs_assert(sess);
     ogs_assert(ipv6prefix_string);
 
-    clear_ipv6prefix(sess);
-
+    if (sess->ipv6prefix_string) {
+        ogs_hash_set(self.ipv6prefix_hash,
+                &sess->ipv6prefix, (sess->ipv6prefix.len >> 3) + 1, NULL);
+        ogs_free(sess->ipv6prefix_string);
+    }
     rv = ogs_ipv6prefix_from_string(
             sess->ipv6prefix.addr6, &sess->ipv6prefix.len, ipv6prefix_string);
     ogs_expect_or_return_val(rv == OGS_OK, false);

open5gs_2.4.10.tar.xz/src/bsf/context.h -> open5gs_2.4.11.tar.xz/src/bsf/context.h Changed

open5gs_2.4.10.tar.xz/src/bsf/nbsf-handler.c -> open5gs_2.4.11.tar.xz/src/bsf/nbsf-handler.c Changed

@@ -75,11 +75,14 @@
             RecvPcfBinding = recvmsg->PcfBinding;
             ogs_assert(RecvPcfBinding);
 
-            if (!RecvPcfBinding->ipv4_addr && !RecvPcfBinding->ipv6_prefix) {
-                strerror = ogs_msprintf(
-                            "No IPv4 address or IPv6 prefix%p:%p",
-                            RecvPcfBinding->ipv4_addr,
-                            RecvPcfBinding->ipv6_prefix);
+            if (!RecvPcfBinding->snssai) {
+                strerror = ogs_msprintf("No S-NSSAI");
+                status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+                goto cleanup;
+            }
+
+            if (!RecvPcfBinding->dnn) {
+                strerror = ogs_msprintf("No DNN");
                 status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
                 goto cleanup;
             }
@@ -93,11 +96,6 @@
                 goto cleanup;
             }
 
-            if (RecvPcfBinding->ipv4_addr)
-                bsf_sess_set_ipv4addr(sess, RecvPcfBinding->ipv4_addr);
-            if (RecvPcfBinding->ipv6_prefix)
-                bsf_sess_set_ipv6prefix(sess, RecvPcfBinding->ipv6_prefix);
-
             if (RecvPcfBinding->pcf_fqdn) {
                 if (sess->pcf_fqdn)
                     ogs_free(sess->pcf_fqdn);
@@ -105,6 +103,13 @@
                 ogs_assert(sess->pcf_fqdn);
             }
 
+            sess->s_nssai.sst = RecvPcfBinding->snssai->sst;
+            sess->s_nssai.sd =
+                ogs_s_nssai_sd_from_string(RecvPcfBinding->snssai->sd);
+
+            sess->dnn = ogs_strdup(RecvPcfBinding->dnn);
+            ogs_assert(sess->dnn);
+
             PcfIpEndPointList = RecvPcfBinding->pcf_ip_end_points;
 
             if (PcfIpEndPointList) {

open5gs_2.4.10.tar.xz/src/hss/hss-context.c -> open5gs_2.4.11.tar.xz/src/hss/hss-context.c Changed

@@ -19,6 +19,9 @@
 
 #include "ogs-dbi.h"
 #include "hss-context.h"
+#include "hss-event.h"
+#include "hss-s6a-path.h"
+
 
 typedef struct hss_impi_s hss_impi_t;
 
@@ -396,6 +399,26 @@
     return rv;
 }
 
+int hss_db_update_mme(char *imsi_bcd, char *mme_host, char *mme_realm,
+    bool purge_flag)
+{
+    int rv;
+    char *supi = NULL;
+
+    ogs_assert(imsi_bcd);
+
+    ogs_thread_mutex_lock(&self.db_lock);
+    supi = ogs_msprintf("%s-%s", OGS_ID_SUPI_TYPE_IMSI, imsi_bcd);
+    ogs_assert(supi);
+
+    rv = ogs_dbi_update_mme(supi, mme_host, mme_realm, purge_flag);
+
+    ogs_free(supi);
+    ogs_thread_mutex_unlock(&self.db_lock);
+
+    return rv;
+}
+
 int hss_db_increment_sqn(char *imsi_bcd)
 {
     int rv;
@@ -660,7 +683,7 @@
 {
     hss_impi_t *impi = NULL;
     hss_impu_t *impu = NULL;
-    
+
     ogs_assert(user_name);
     ogs_assert(public_identity);
 
@@ -1151,3 +1174,134 @@
 
     return user_data;
 }
+
+int hss_db_poll_change_stream(void)
+{
+    int rv;
+
+    ogs_thread_mutex_lock(&self.db_lock);
+
+    rv = ogs_dbi_poll_change_stream();
+
+    ogs_thread_mutex_unlock(&self.db_lock);
+
+    return rv;
+}
+
+int hss_handle_change_event(const bson_t *document)
+{
+    bson_iter_t iter, child1_iter, child2_iter, child3_iter;
+
+    char *utf8 = NULL;
+    uint32_t length = 0;
+
+    bool send_clr_flag = false;
+    bool send_idr_flag = false;
+    uint32_t subdatamask = 0;
+
+    char *imsi_bcd;
+
+    char *as_json = bson_as_relaxed_extended_json(document, NULL);
+    ogs_debug("Got document: %s\n", as_json);
+    if (!bson_iter_init_find(&iter, document, "fullDocument")) {
+        ogs_error("No 'imsi' field in this document.");
+        return OGS_ERROR;
+    } else {
+        bson_iter_recurse(&iter, &child1_iter);
+        while (bson_iter_next(&child1_iter)) {
+            const char *key = bson_iter_key(&child1_iter);
+            if (!strcmp(key, "imsi") && 
+                    BSON_ITER_HOLDS_UTF8(&child1_iter)) {
+                utf8 = (char *)bson_iter_utf8(&child1_iter, &length);
+                imsi_bcd = ogs_strndup(utf8,
+                    ogs_min(length, OGS_MAX_IMSI_BCD_LEN) + 1);
+                ogs_assert(imsi_bcd);
+            }
+        }
+    }
+
+    if (!imsi_bcd) {
+        ogs_error("No 'imsi' field in this document.");
+        return OGS_ERROR;
+    }
+
+    if (bson_iter_init_find(&iter, document, "updateDescription")) {
+        bson_iter_recurse(&iter, &child1_iter);
+        while (bson_iter_next(&child1_iter)) {
+            const char *key = bson_iter_key(&child1_iter);
+            if (!strcmp(key, "updatedFields") && 
+                    BSON_ITER_HOLDS_DOCUMENT(&child1_iter)) {
+                bson_iter_recurse(&child1_iter, &child2_iter);
+                while (bson_iter_next(&child2_iter)) {
+                    const char *child2_key = bson_iter_key(&child2_iter);
+                    if (!strcmp(child2_key, 
+                            "request_cancel_location") && 
+                            BSON_ITER_HOLDS_BOOL(&child2_iter)) {
+                        send_clr_flag = (char *)bson_iter_bool(&child2_iter);
+                    } else if (!strncmp(child2_key, "msisdn",
+                            strlen("msisdn"))) {
+                        int msisdn_count = 0;
+                        bson_iter_recurse(&child2_iter, &child3_iter);
+                        while (bson_iter_next(&child3_iter)) {
+                            if (BSON_ITER_HOLDS_UTF8(&child3_iter)) {
+                                msisdn_count++;
+                            }
+                        }
+                        if (msisdn_count) {
+                            send_idr_flag = true;
+                            subdatamask = (subdatamask | 
+                                OGS_HSS_SUBDATA_MSISDN);
+                        } else {
+                            send_clr_flag = true;
+                        }
+                    } else if (!strncmp(child2_key, 
+                            "access_restriction_data",
+                            strlen("access_restriction_data"))) {
+                        send_idr_flag = true;
+                        subdatamask = (subdatamask | OGS_HSS_SUBDATA_ARD);
+                    } else if (!strncmp(child2_key, 
+                            "subscriber_status", 
+                            strlen("subscriber_status"))) {
+                        send_idr_flag = true;
+                        subdatamask = (subdatamask | 
+                            OGS_HSS_SUBDATA_SUB_STATUS);
+                    } else if (!strncmp(child2_key, 
+                            "network_access_mode",
+                            strlen("network_access_mode"))) {
+                        send_idr_flag = true;
+                        subdatamask = (subdatamask | OGS_HSS_SUBDATA_NAM);
+                    } else if (!strncmp(child2_key, "ambr", strlen("ambr"))) {
+                        send_idr_flag = true;
+                        subdatamask = (subdatamask | OGS_HSS_SUBDATA_UEAMBR);
+                    } else if (!strncmp(child2_key, 
+                            "subscribed_rau_tau_timer",
+                            strlen("subscribed_rau_tau_timer"))) {
+                        send_idr_flag = true;
+                        subdatamask = (subdatamask | 
+                            OGS_HSS_SUBDATA_RAU_TAU_TIMER);
+                    } else if (!strncmp(child2_key, "slice", strlen("slice"))) {
+                        send_idr_flag = true;
+                        subdatamask = (subdatamask | OGS_HSS_SUBDATA_SLICE);
+                    }
+                }
+            }
+        }
+    } else {
+        ogs_debug("No 'updateDescription' field in this document");
+    }
+
+    bson_free (as_json);
+
+    if (send_clr_flag) {
+        ogs_info("%s Cancel Location Requested", imsi_bcd);
+        hss_s6a_send_clr(imsi_bcd, NULL, NULL,
+            OGS_DIAM_S6A_CT_SUBSCRIPTION_WITHDRAWL);
+    } else if (send_idr_flag) {
+        ogs_info("%s Subscription-Data Changed", imsi_bcd);
+        hss_s6a_send_idr(imsi_bcd, 0, subdatamask);
+    }
+
+    ogs_free(imsi_bcd);
+
+    return OGS_OK;
+}

open5gs_2.4.10.tar.xz/src/hss/hss-context.h -> open5gs_2.4.11.tar.xz/src/hss/hss-context.h Changed

open5gs_2.4.11.tar.xz/src/hss/hss-event.c Added

open5gs_2.4.11.tar.xz/src/hss/hss-event.h Added

open5gs_2.4.10.tar.xz/src/hss/hss-fd-path.h -> open5gs_2.4.11.tar.xz/src/hss/hss-fd-path.h Changed

open5gs_2.4.10.tar.xz/src/hss/hss-init.c -> open5gs_2.4.11.tar.xz/src/hss/hss-init.c Changed

@@ -19,6 +19,11 @@
 
 #include "hss-context.h"
 #include "hss-fd-path.h"
+#include "hss-sm.h"
+
+
+static ogs_thread_t *thread;
+static void hss_main(void *data);
 
 static int initialized = 0;
 
@@ -41,6 +46,9 @@
     rv = hss_fd_init();
     if (rv != OGS_OK) return OGS_ERROR;
 
+    thread = ogs_thread_create(hss_main, NULL);
+    if (!thread) return OGS_ERROR;
+
     initialized = 1;
 
     return OGS_OK;
@@ -50,6 +58,9 @@
 {
     if (!initialized) return;
 
+    hss_event_term();
+    ogs_thread_destroy(thread);
+
     hss_fd_final();
 
     ogs_dbi_final();
@@ -57,3 +68,49 @@
 
     return;
 }
+
+static void hss_main(void *data)
+{
+    ogs_fsm_t hss_sm;
+    int rv;
+
+    ogs_fsm_init(&hss_sm, hss_state_initial, hss_state_final, 0);
+
+    for ( ;; ) {
+        ogs_pollset_poll(ogs_app()->pollset,
+                ogs_timer_mgr_next(ogs_app()->timer_mgr));
+
+        /*
+         * After ogs_pollset_poll(), ogs_timer_mgr_expire() must be called.
+         *
+         * The reason is why ogs_timer_mgr_next() can get the corrent value
+         * when ogs_timer_stop() is called internally in ogs_timer_mgr_expire().
+         *
+         * You should not use event-queue before ogs_timer_mgr_expire().
+         * In this case, ogs_timer_mgr_expire() does not work
+         * because 'if rv == OGS_DONE' statement is exiting and
+         * not calling ogs_timer_mgr_expire().
+         */
+        ogs_timer_mgr_expire(ogs_app()->timer_mgr);
+
+        for ( ;; ) {
+            ogs_event_t *e = NULL;
+
+            rv = ogs_queue_trypop(ogs_app()->queue, (void**)&e);
+            ogs_assert(rv != OGS_ERROR);
+
+            if (rv == OGS_DONE)
+                goto done;
+
+            if (rv == OGS_RETRY)
+                break;
+
+            ogs_assert(e);
+            ogs_fsm_dispatch(&hss_sm, e);
+            ogs_event_free(e);
+        }
+    }
+done:
+
+    ogs_fsm_fini(&hss_sm, 0);
+}

open5gs_2.4.10.tar.xz/src/hss/hss-s6a-path.c -> open5gs_2.4.11.tar.xz/src/hss/hss-s6a-path.c Changed

@@ -21,6 +21,7 @@
 
 #include "hss-context.h"
 #include "hss-fd-path.h"
+#include "hss-s6a-path.h"
 
 /* handler for fallback cb */
 static struct disp_hdl *hdl_s6a_fb = NULL;
@@ -28,6 +29,28 @@
 static struct disp_hdl *hdl_s6a_air = NULL;
 /* handler for Update-Location-Request cb */
 static struct disp_hdl *hdl_s6a_ulr = NULL;
+/* handler for Purge-UE-Request cb */
+static struct disp_hdl *hdl_s6a_pur = NULL;
+/* handler for Cancel-Location-Answer cb */
+static void hss_s6a_cla_cb(void *data, struct msg **msg);
+/* handler for Insert-Subscriber-Data-Answer cb */
+static void hss_s6a_ida_cb(void *data, struct msg **msg);
+/* handler for Sessions */
+static struct session_handler *hss_s6a_reg = NULL;
+
+/* s6a Subscription-Data builder */
+static int hss_s6a_avp_add_subscription_data(
+    ogs_subscription_data_t *subscription_data, struct avp *avp, 
+    uint32_t subdatamask);
+
+struct sess_state {
+    char imsi_bcdOGS_MAX_IMSI_BCD_LEN+1;
+};
+
+static void state_cleanup(struct sess_state *sess_data, os0_t sid, void *opaque)
+{
+    ogs_free(sess_data);
+}
 
 /* Default callback for the application. */
 static int hss_ogs_diam_s6a_fb_cb(struct msg **msg, struct avp *avp,
@@ -211,7 +234,7 @@
     ret = fd_msg_avp_add(ans, MSG_BRW_LAST_CHILD, avp);
     ogs_assert(ret == 0);
 
-    /* Set the Origin-Host, Origin-Realm, andResult-Code AVPs */
+    /* Set the Origin-Host, Origin-Realm, and Result-Code AVPs */
     ret = fd_msg_rescode_set(ans, (char*)"DIAMETER_SUCCESS", NULL, NULL, 1);
     ogs_assert(ret == 0);
 
@@ -266,133 +289,32 @@
     return 0;
 }
 
-/* Callback for incoming Update-Location-Request messages */
-static int hss_ogs_diam_s6a_ulr_cb( struct msg **msg, struct avp *avp,
-        struct session *session, void *opaque, enum disp_action *act)
+/* s6a Subscription-Data builder */
+static int hss_s6a_avp_add_subscription_data(
+    ogs_subscription_data_t *subscription_data, struct avp *avp,
+    uint32_t subdatamask)
 {
     int ret;
-    struct msg *ans, *qry;
-
-    struct avp_hdr *hdr;
-    struct avp *avpch1;
     union avp_value val;
 
-    char imsi_bcdOGS_MAX_IMSI_BCD_LEN+1;
-    char imeisv_bcdOGS_MAX_IMEISV_BCD_LEN+1;
-
-    int rv;
-    uint32_t result_code = 0;
-    ogs_subscription_data_t subscription_data;
     ogs_slice_data_t *slice_data = NULL;
     struct sockaddr_in sin;
     struct sockaddr_in6 sin6;
 
-    ogs_plmn_id_t visited_plmn_id;
-
-    ogs_assert(msg);
-
-    ogs_debug("Update-Location-Request");
-
-    memset(&subscription_data, 0, sizeof(ogs_subscription_data_t));
-
-    /* Create answer header */
-    qry = *msg;
-    ret = fd_msg_new_answer_from_req(fd_g_config->cnf_dict, msg, 0);
-    ogs_assert(ret == 0);
-    ans = *msg;
-
-    ret = fd_msg_search_avp(qry, ogs_diam_user_name, &avp);
-    ogs_assert(ret == 0);
-    ret = fd_msg_avp_hdr(avp, &hdr);
-    ogs_assert(ret == 0);
-    ogs_cpystrn(imsi_bcd, (char*)hdr->avp_value->os.data,
-        ogs_min(hdr->avp_value->os.len, OGS_MAX_IMSI_BCD_LEN)+1);
-
-    rv = hss_db_subscription_data(imsi_bcd, &subscription_data);
-    if (rv != OGS_OK) {
-        ogs_error("Cannot get Subscription-Data for IMSI:'%s'", imsi_bcd);
-        result_code = OGS_DIAM_S6A_ERROR_USER_UNKNOWN;
-        goto out;
-    }
-
-    ret = fd_msg_search_avp(qry, ogs_diam_s6a_terminal_information, &avp);
-    ogs_assert(ret == 0);
-    if (avp) {
-        char *p, *last;
-
-        p = imeisv_bcd;
-        last = imeisv_bcd + OGS_MAX_IMEISV_BCD_LEN + 1;
-
-        ret = fd_avp_search_avp(avp, ogs_diam_s6a_imei, &avpch1);
-        ogs_assert(ret == 0);
-        if (avpch1) {
-            ret = fd_msg_avp_hdr(avpch1, &hdr);
-            ogs_assert(ret == 0);
-            if (hdr->avp_value->os.len) {
-                char *s = NULL;
-
-                ogs_assert(hdr->avp_value->os.data);
-                s = ogs_strndup(
-                        (const char *)hdr->avp_value->os.data,
-                        hdr->avp_value->os.len);
-                ogs_assert(s);
-                p = ogs_slprintf(p, last, "%s", s);
-
-                ogs_free(s);
-            }
-        }
-
-        ret = fd_avp_search_avp(avp, ogs_diam_s6a_software_version, &avpch1);
-        ogs_assert(ret == 0);
-        if (avpch1) {
-            ret = fd_msg_avp_hdr(avpch1, &hdr);
-            ogs_assert(ret == 0);
-            if (hdr->avp_value->os.len) {
-                char *s = NULL;
-
-                ogs_assert(hdr->avp_value->os.data);
-                s = ogs_strndup(
-                        (const char *)hdr->avp_value->os.data,
-                        hdr->avp_value->os.len);
-                ogs_assert(s);
-                p = ogs_slprintf(p, last, "%s", s);
-
-                ogs_free(s);
-            }
-        }
-
-        ogs_assert(OGS_OK == hss_db_update_imeisv(imsi_bcd, imeisv_bcd));
-    }
-
-    ret = fd_msg_search_avp(qry, ogs_diam_visited_plmn_id, &avp);
-    ogs_assert(ret == 0);
-    ret = fd_msg_avp_hdr(avp, &hdr);
-    ogs_assert(ret == 0);
-    memcpy(&visited_plmn_id, hdr->avp_value->os.data, hdr->avp_value->os.len);
-
-    ret = fd_msg_search_avp(qry, ogs_diam_s6a_ulr_flags, &avp);
-    ogs_assert(ret == 0);
-    ret = fd_msg_avp_hdr(avp, &hdr);
-    ogs_assert(ret == 0);
-    if (!(hdr->avp_value->u32 & OGS_DIAM_S6A_ULR_SKIP_SUBSCRIBER_DATA)) {
-        struct avp *avp_msisdn, *avp_a_msisdn;
-        struct avp *avp_access_restriction_data;
-        struct avp *avp_subscriber_status, *avp_network_access_mode;
-        struct avp *avp_ambr, *avp_max_bandwidth_ul, *avp_max_bandwidth_dl;
-        struct avp *avp_rau_tau_timer;
-
-        /* Set the APN Configuration Profile */
-        struct avp *apn_configuration_profile;
-        struct avp *context_identifier;
-        struct avp *all_apn_configuration_included_indicator;
-
-        int i;
+    struct avp *avp_msisdn, *avp_a_msisdn;
+    struct avp *avp_access_restriction_data;
+    struct avp *avp_subscriber_status, *avp_network_access_mode;
+    struct avp *avp_ambr, *avp_max_bandwidth_ul, *avp_max_bandwidth_dl;
+    struct avp *avp_rau_tau_timer;
+
+    /* Set the APN Configuration Profile */
+    struct avp *apn_configuration_profile;
+    struct avp *context_identifier;
+    struct avp *all_apn_configuration_included_indicator;
 
-        /* Set the Subscription Data */
-
-        ret = fd_msg_avp_new(ogs_diam_s6a_subscription_data, 0, &avp);
-        ogs_assert(ret == 0);
+    int i;
 
+    if (subdatamask & OGS_HSS_SUBDATA_MSISDN) {
         /*
          * TS29.328
          * 6.3.2 MSISDN AVP
@@ -405,65 +327,73 @@
          * bits 8 to 5 of octet n encode digit 2n;
          * bits 4 to 1 of octet n encode digit 2(n-1)+1.
          */
-        if (subscription_data.num_of_msisdn >= 1)  {
+        if (subscription_data->num_of_msisdn >= 1)  {
             ret = fd_msg_avp_new(ogs_diam_s6a_msisdn, 0, &avp_msisdn);
             ogs_assert(ret == 0);
-            val.os.data = subscription_data.msisdn0.buf;
-            val.os.len = subscription_data.msisdn0.len;
+            val.os.data = subscription_data->msisdn0.buf;
+            val.os.len = subscription_data->msisdn0.len;
             ret = fd_msg_avp_setvalue(avp_msisdn, &val);
             ogs_assert(ret == 0);
             ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avp_msisdn);
             ogs_assert(ret == 0);
         }
 
-        if (subscription_data.num_of_msisdn >= 2)  {
+        if (subscription_data->num_of_msisdn >= 2)  {
             ret = fd_msg_avp_new(ogs_diam_s6a_a_msisdn, 0, &avp_a_msisdn);
             ogs_assert(ret == 0);
-            val.os.data = subscription_data.msisdn1.buf;
-            val.os.len = subscription_data.msisdn1.len;
+            val.os.data = subscription_data->msisdn1.buf;
+            val.os.len = subscription_data->msisdn1.len;
             ret = fd_msg_avp_setvalue(avp_a_msisdn, &val);
             ogs_assert(ret == 0);
             ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avp_a_msisdn);
             ogs_assert(ret == 0);
         }
+    }
 
-        if (subscription_data.access_restriction_data) {
+    if (subdatamask & OGS_HSS_SUBDATA_ARD) {
+        if (subscription_data->access_restriction_data) {
             ret = fd_msg_avp_new(ogs_diam_s6a_access_restriction_data, 0,
                     &avp_access_restriction_data);
             ogs_assert(ret == 0);
-            val.i32 = subscription_data.access_restriction_data;
+            val.i32 = subscription_data->access_restriction_data;
             ret = fd_msg_avp_setvalue( avp_access_restriction_data, &val);
             ogs_assert(ret == 0);
             ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD,
                     avp_access_restriction_data);
             ogs_assert(ret == 0);
         }
+    }
 
+    if (subdatamask & OGS_HSS_SUBDATA_SUB_STATUS) {
         ret = fd_msg_avp_new(
                 ogs_diam_s6a_subscriber_status, 0, &avp_subscriber_status);
         ogs_assert(ret == 0);
-        val.i32 = subscription_data.subscriber_status;
+        val.i32 = subscription_data->subscriber_status;
         ret = fd_msg_avp_setvalue(avp_subscriber_status, &val);
         ogs_assert(ret == 0);
         ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avp_subscriber_status);
         ogs_assert(ret == 0);
+    }
 
+    if (subdatamask & OGS_HSS_SUBDATA_NAM) {
         ret = fd_msg_avp_new(ogs_diam_s6a_network_access_mode, 0,
                     &avp_network_access_mode);
         ogs_assert(ret == 0);
-        val.i32 = subscription_data.network_access_mode;
+        val.i32 = subscription_data->network_access_mode;
         ret = fd_msg_avp_setvalue(avp_network_access_mode, &val);
         ogs_assert(ret == 0);
         ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avp_network_access_mode);
         ogs_assert(ret == 0);
+    }
 
+    if (subdatamask & OGS_HSS_SUBDATA_UEAMBR) {
         /* Set the AMBR */
         ret = fd_msg_avp_new(ogs_diam_s6a_ambr, 0, &avp_ambr);
         ogs_assert(ret == 0);
         ret = fd_msg_avp_new(
                 ogs_diam_s6a_max_bandwidth_ul, 0, &avp_max_bandwidth_ul);
         ogs_assert(ret == 0);
-        val.u32 = ogs_uint64_to_uint32(subscription_data.ambr.uplink);
+        val.u32 = ogs_uint64_to_uint32(subscription_data->ambr.uplink);
         ret = fd_msg_avp_setvalue(avp_max_bandwidth_ul, &val);
         ogs_assert(ret == 0);
         ret = fd_msg_avp_add(
@@ -472,7 +402,7 @@
         ret = fd_msg_avp_new(
                 ogs_diam_s6a_max_bandwidth_dl, 0, &avp_max_bandwidth_dl);
         ogs_assert(ret == 0);
-        val.u32 = ogs_uint64_to_uint32(subscription_data.ambr.downlink);
+        val.u32 = ogs_uint64_to_uint32(subscription_data->ambr.downlink);
         ret = fd_msg_avp_setvalue(avp_max_bandwidth_dl, &val);
         ogs_assert(ret == 0);
         ret = fd_msg_avp_add(
@@ -480,31 +410,34 @@
         ogs_assert(ret == 0);
         ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avp_ambr);
         ogs_assert(ret == 0);
+    }
 
+    if (subdatamask & OGS_HSS_SUBDATA_RAU_TAU_TIMER) {
         /* Set the Subscribed RAU TAU Timer */
         ret = fd_msg_avp_new(
                 ogs_diam_s6a_subscribed_rau_tau_timer, 0, &avp_rau_tau_timer);
         ogs_assert(ret == 0);
-        val.i32 = subscription_data.subscribed_rau_tau_timer * 60; /* seconds */
+        /* seconds */
+        val.i32 = subscription_data->subscribed_rau_tau_timer * 60;
         ret = fd_msg_avp_setvalue(avp_rau_tau_timer, &val);
         ogs_assert(ret == 0);
         ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avp_rau_tau_timer);
         ogs_assert(ret == 0);
+    }
 
+    if (subdatamask & OGS_HSS_SUBDATA_SLICE) {
         /* For EPC, we'll use first Slice in Subscription */
-        if (subscription_data.num_of_slice)
-            slice_data = &subscription_data.slice0;
+        if (subscription_data->num_of_slice)
+            slice_data = &subscription_data->slice0;
 
         if (!slice_data) {
-            ogs_error("%s Cannot find S-NSSAI", imsi_bcd);
-            result_code = OGS_DIAM_S6A_ERROR_UNKNOWN_EPS_SUBSCRIPTION;
-            goto out;
+            ogs_error("%s Cannot find S-NSSAI", subscription_data->imsi);
+            return OGS_ERROR;
         }
 
         if (!slice_data->num_of_session) {
-            ogs_error("%s No PDN", imsi_bcd);
-            result_code = OGS_DIAM_S6A_ERROR_UNKNOWN_EPS_SUBSCRIPTION;
-            goto out;
+            ogs_error("%s No PDN", subscription_data->imsi);
+            return OGS_ERROR;
         }
 
         ret = fd_msg_avp_new(ogs_diam_s6a_apn_configuration_profile, 0,
@@ -583,7 +516,7 @@
 
             /* Set Served-Party-IP-Address */
             if ((session->session_type == OGS_PDU_SESSION_TYPE_IPV4 ||
-                 session->session_type == OGS_PDU_SESSION_TYPE_IPV4V6) &&
+                    session->session_type == OGS_PDU_SESSION_TYPE_IPV4V6) &&
                 session->ue_ip.ipv4) {
                 ret = fd_msg_avp_new(ogs_diam_s6a_served_party_ip_address,
                         0, &served_party_ip_address);
@@ -598,7 +531,7 @@
             }
 
             if ((session->session_type == OGS_PDU_SESSION_TYPE_IPV6 ||
-                 session->session_type == OGS_PDU_SESSION_TYPE_IPV4V6) &&
+                    session->session_type == OGS_PDU_SESSION_TYPE_IPV4V6) &&
                 session->ue_ip.ipv6) {
                 ret = fd_msg_avp_new(ogs_diam_s6a_served_party_ip_address,
                         0, &served_party_ip_address);
@@ -786,16 +719,207 @@
             ret = fd_msg_avp_add(apn_configuration_profile,
                     MSG_BRW_LAST_CHILD, apn_configuration);
             ogs_assert(ret == 0);
+
         }
         ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD,
                 apn_configuration_profile);
         ogs_assert(ret == 0);
+    }
 
+    return OGS_OK;
+}
+
+/* Callback for incoming Update-Location-Request messages */
+static int hss_ogs_diam_s6a_ulr_cb( struct msg **msg, struct avp *avp,
+        struct session *session, void *opaque, enum disp_action *act)
+{
+    int ret;
+    struct msg *ans, *qry;
+
+    struct avp_hdr *hdr;
+    struct avp *avpch1;
+    union avp_value val;
+
+    char *imsi_bcd = NULL;
+    char imeisv_bcdOGS_MAX_IMEISV_BCD_LEN+1;
+
+    char *mme_host = NULL;
+    char *mme_realm = NULL;
+
+    int rv;
+    uint32_t result_code = 0;
+    ogs_subscription_data_t subscription_data;
+
+    ogs_plmn_id_t visited_plmn_id;
+
+    ogs_assert(msg);
+
+    ogs_debug("Update-Location-Request");
+
+    memset(&subscription_data, 0, sizeof(ogs_subscription_data_t));
+
+    /* Create answer header */
+    qry = *msg;
+    ret = fd_msg_new_answer_from_req(fd_g_config->cnf_dict, msg, 0);
+    ogs_assert(ret == 0);
+    ans = *msg;
+
+    /* Get User-Name AVP */
+    ret = fd_msg_search_avp(qry, ogs_diam_user_name, &avp);
+    ogs_assert(ret == 0);
+    if (avp) {
+        ret = fd_msg_avp_hdr(avp, &hdr);
+        ogs_assert(ret == 0);
+
+        imsi_bcd = ogs_strndup(
+            (char*)hdr->avp_value->os.data,
+            ogs_min(hdr->avp_value->os.len, OGS_MAX_IMSI_BCD_LEN) + 1);
+        ogs_assert(imsi_bcd);
+    } else {
+        ogs_error("no_User-Name");
+        result_code = OGS_DIAM_MISSING_AVP;
+        goto out;
+    }
+
+    rv = hss_db_subscription_data(imsi_bcd, &subscription_data);
+    if (rv != OGS_OK) {
+        ogs_error("Cannot get Subscription-Data for IMSI:'%s'", imsi_bcd);
+        result_code = OGS_DIAM_S6A_ERROR_USER_UNKNOWN;
+        goto out;
+    }
+
+    /* Get Origin-Host */
+    ret = fd_msg_search_avp(qry, ogs_diam_origin_host, &avp);
+    ogs_assert(ret == 0);
+    if (avp) {
+        ret = fd_msg_avp_hdr(avp, &hdr);
+        ogs_assert(ret == 0);
+
+        mme_host = ogs_strndup(
+            (char*)hdr->avp_value->os.data,
+            ogs_min(hdr->avp_value->os.len, OGS_MAX_FQDN_LEN) + 1);
+        ogs_assert(mme_host);
+    } else {
+        ogs_error("no_Origin-Host");
+        result_code = OGS_DIAM_MISSING_AVP;
+        goto out;
+    }
+
+    /* Get Origin-Realm */
+    ret = fd_msg_search_avp(qry, ogs_diam_origin_realm, &avp);
+    ogs_assert(ret == 0);
+    if (avp) {
+        ret = fd_msg_avp_hdr(avp, &hdr);
+        ogs_assert(ret == 0);
+
+        mme_realm = ogs_strndup(
+            (char*)hdr->avp_value->os.data,
+            ogs_min(hdr->avp_value->os.len, OGS_MAX_FQDN_LEN) + 1);
+        ogs_assert(mme_realm);
+    } else {
+        ogs_error("no_Origin-Realm");
+        result_code = OGS_DIAM_MISSING_AVP;
+        goto out;
+    }
+
+    ogs_assert(mme_host);
+    ogs_assert(mme_realm);
+
+    /* If UE is not purged at MME, determine if the MME sending the ULR 
+     * is different from the one that was last used.  if so, send CLR.
+     */
+    if (subscription_data.mme_host != NULL &&
+            subscription_data.mme_realm != NULL) {
+        if (!subscription_data.purge_flag) {
+            if (strcmp(subscription_data.mme_host, mme_host) ||
+                strcmp(subscription_data.mme_realm, mme_realm)) {
+                hss_s6a_send_clr(imsi_bcd, subscription_data.mme_host,
+                    subscription_data.mme_realm,
+                    OGS_DIAM_S6A_CT_MME_UPDATE_PROCEDURE);
+                ogs_info("%s Sending Cancel Location to previous MME",
+                        imsi_bcd);
+            }
+        }
+    }
+
+    /* Update database with current MME and timestamp */
+    ogs_assert(OGS_OK == hss_db_update_mme(imsi_bcd, mme_host, mme_realm, 
+        false));
+
+    ret = fd_msg_search_avp(qry, ogs_diam_s6a_terminal_information, &avp);
+    ogs_assert(ret == 0);
+    if (avp) {
+        char *p, *last;
+
+        p = imeisv_bcd;
+        last = imeisv_bcd + OGS_MAX_IMEISV_BCD_LEN + 1;
+
+        ret = fd_avp_search_avp(avp, ogs_diam_s6a_imei, &avpch1);
+        ogs_assert(ret == 0);
+        if (avpch1) {
+            ret = fd_msg_avp_hdr(avpch1, &hdr);
+            ogs_assert(ret == 0);
+            if (hdr->avp_value->os.len) {
+                char *s = NULL;
+
+                ogs_assert(hdr->avp_value->os.data);
+                s = ogs_strndup(
+                        (const char *)hdr->avp_value->os.data,
+                        hdr->avp_value->os.len);
+                ogs_assert(s);
+                p = ogs_slprintf(p, last, "%s", s);
+
+                ogs_free(s);
+            }
+        }
+
+        ret = fd_avp_search_avp(avp, ogs_diam_s6a_software_version, &avpch1);
+        ogs_assert(ret == 0);
+        if (avpch1) {
+            ret = fd_msg_avp_hdr(avpch1, &hdr);
+            ogs_assert(ret == 0);
+            if (hdr->avp_value->os.len) {
+                char *s = NULL;
+
+                ogs_assert(hdr->avp_value->os.data);
+                s = ogs_strndup(
+                        (const char *)hdr->avp_value->os.data,
+                        hdr->avp_value->os.len);
+                ogs_assert(s);
+                p = ogs_slprintf(p, last, "%s", s);
+
+                ogs_free(s);
+            }
+        }
+
+        ogs_assert(OGS_OK == hss_db_update_imeisv(imsi_bcd, imeisv_bcd));
+    }
+
+    ret = fd_msg_search_avp(qry, ogs_diam_visited_plmn_id, &avp);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_hdr(avp, &hdr);
+    ogs_assert(ret == 0);
+    memcpy(&visited_plmn_id, hdr->avp_value->os.data, hdr->avp_value->os.len);
+
+    ret = fd_msg_search_avp(qry, ogs_diam_s6a_ulr_flags, &avp);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_hdr(avp, &hdr);
+    ogs_assert(ret == 0);
+    if (!(hdr->avp_value->u32 & OGS_DIAM_S6A_ULR_SKIP_SUBSCRIBER_DATA)) {
+        /* Set the Subscription Data */
+        ret = fd_msg_avp_new(ogs_diam_s6a_subscription_data, 0, &avp);
+        ogs_assert(ret == 0);
+        rv = hss_s6a_avp_add_subscription_data(&subscription_data, 
+            avp, OGS_HSS_SUBDATA_ALL);
+        if (rv != OGS_OK) {
+            result_code = OGS_DIAM_S6A_ERROR_UNKNOWN_EPS_SUBSCRIPTION;
+            goto out;
+        }
         ret = fd_msg_avp_add(ans, MSG_BRW_LAST_CHILD, avp);
         ogs_assert(ret == 0);
     }
 
-    /* Set the Origin-Host, Origin-Realm, andResult-Code AVPs */
+    /* Set the Origin-Host, Origin-Realm, and Result-Code AVPs */
     ret = fd_msg_rescode_set(ans, (char*)"DIAMETER_SUCCESS", NULL, NULL, 1);
     ogs_assert(ret == 0);
 
@@ -835,6 +959,13 @@
 
     ogs_subscription_data_free(&subscription_data);
 
+    if (imsi_bcd)
+        ogs_free(imsi_bcd);
+    if (mme_host)
+        ogs_free(mme_host);
+    if (mme_realm)
+        ogs_free(mme_realm);
+
     return 0;
 
 out:
@@ -860,9 +991,494 @@
 
     ogs_subscription_data_free(&subscription_data);
 
+    if (imsi_bcd)
+        ogs_free(imsi_bcd);
+    if (mme_host)
+        ogs_free(mme_host);
+    if (mme_realm)
+        ogs_free(mme_realm);
+
     return 0;
 }
 
+/* Callback for incoming Purge-UE-Request messages */
+static int hss_ogs_diam_s6a_pur_cb( struct msg **msg, struct avp *avp,
+        struct session *session, void *opaque, enum disp_action *act)
+{
+    int ret, rv;
+
+    struct msg *ans, *qry;
+    struct avp_hdr *hdr;
+    union avp_value val;
+
+    ogs_subscription_data_t subscription_data;
+
+    char imsi_bcdOGS_MAX_IMSI_BCD_LEN+1;
+    char mme_hostOGS_MAX_FQDN_LEN+1;
+    char mme_realmOGS_MAX_FQDN_LEN+1;
+
+    uint32_t result_code = 0;
+
+    ogs_assert(msg);
+
+    ogs_debug("Purge-UE-Request");
+
+    memset(&subscription_data, 0, sizeof(ogs_subscription_data_t));
+
+    /* Create answer header */
+    qry = *msg;
+    ret = fd_msg_new_answer_from_req(fd_g_config->cnf_dict, msg, 0);
+    ogs_assert(ret == 0);
+    ans = *msg;
+
+    ret = fd_msg_search_avp(qry, ogs_diam_user_name, &avp);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_hdr(avp, &hdr);
+    ogs_assert(ret == 0);
+    ogs_cpystrn(imsi_bcd, (char*)hdr->avp_value->os.data,
+        ogs_min(hdr->avp_value->os.len, OGS_MAX_IMSI_BCD_LEN)+1);
+
+    rv = hss_db_subscription_data(imsi_bcd, &subscription_data);
+    if (rv != OGS_OK) {
+        ogs_error("Cannot get Subscription-Data for IMSI:'%s'", imsi_bcd);
+        result_code = OGS_DIAM_S6A_ERROR_USER_UNKNOWN;
+        goto out;
+    }
+
+    ret = fd_msg_search_avp(qry, ogs_diam_origin_host, &avp);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_hdr(avp, &hdr);
+    ogs_assert(ret == 0);
+    ogs_cpystrn(mme_host, (char*)hdr->avp_value->os.data,
+        ogs_min(hdr->avp_value->os.len, OGS_MAX_FQDN_LEN)+1);
+
+    ret = fd_msg_search_avp(qry, ogs_diam_origin_realm, &avp);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_hdr(avp, &hdr);
+    ogs_assert(ret == 0);
+    ogs_cpystrn(mme_realm, (char*)hdr->avp_value->os.data,
+        ogs_min(hdr->avp_value->os.len, OGS_MAX_FQDN_LEN)+1);
+
+    if (!strcmp(subscription_data.mme_host, mme_host) && 
+            !strcmp(subscription_data.mme_realm, mme_realm)) {
+        rv = hss_db_update_mme(imsi_bcd, mme_host, mme_realm, true);
+        if (rv != OGS_OK) {
+            ogs_error("Cannot update UE Purged at MME flag:'%s'", imsi_bcd);
+            ret = fd_msg_rescode_set(ans,
+                    (char*)"DIAMETER_UNABLE_TO_COMPLY", NULL, NULL, 1);
+            ogs_assert(ret == 0);
+            goto outnoexp;
+        }
+    }
+
+    /* Set the PUA Flags */
+    ret = fd_msg_avp_new(ogs_diam_s6a_pua_flags, 0, &avp);
+    ogs_assert(ret == 0);
+    if (!strcmp(subscription_data.mme_host, mme_host) && 
+            !strcmp(subscription_data.mme_realm, mme_realm)) {
+        val.i32 = OGS_DIAM_S6A_PUA_FLAGS_FREEZE_MTMSI;
+    } else {
+        val.i32 = 0;
+    }
+    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 Origin-Host, Origin-Realm, and Result-Code AVPs */
+    ret = fd_msg_rescode_set(ans, (char*)"DIAMETER_SUCCESS", NULL, NULL, 1);
+    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);
+    val.i32 = OGS_DIAM_AUTH_SESSION_NO_STATE_MAINTAINED;
+    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 Vendor-Specific-Application-Id AVP */
+    ret = ogs_diam_message_vendor_specific_appid_set(
+            ans, OGS_DIAM_S6A_APPLICATION_ID);
+    ogs_assert(ret == 0);
+
+    /* Send the answer */
+    ret = fd_msg_send(msg, NULL, NULL);
+    ogs_assert(ret == 0);
+
+    ogs_debug("Purge-UE-Answer");
+
+    /* Add this value to the stats */
+    ogs_assert(pthread_mutex_lock(&ogs_diam_logger_self()->stats_lock) == 0);
+    ogs_diam_logger_self()->stats.nb_echoed++;
+    ogs_assert(pthread_mutex_unlock(&ogs_diam_logger_self()->stats_lock) == 0);
+
+    ogs_subscription_data_free(&subscription_data);
+
+    return 0;
+
+out:
+    ret = ogs_diam_message_experimental_rescode_set(ans, result_code);
+    ogs_assert(ret == 0);
+outnoexp:
+    /* Set the Auth-Session-State AVP */
+    ret = fd_msg_avp_new(ogs_diam_auth_session_state, 0, &avp);
+    ogs_assert(ret == 0);
+    val.i32 = OGS_DIAM_AUTH_SESSION_NO_STATE_MAINTAINED;
+    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 Vendor-Specific-Application-Id AVP */
+    ret = ogs_diam_message_vendor_specific_appid_set(
+            ans, OGS_DIAM_S6A_APPLICATION_ID);
+    ogs_assert(ret == 0);
+
+    ret = fd_msg_send(msg, NULL, NULL);
+    ogs_assert(ret == 0);
+
+    ogs_subscription_data_free(&subscription_data);
+
+    return 0;
+}
+
+/* HSS Sends Cancel Location Request to MME */
+void hss_s6a_send_clr(char *imsi_bcd, char *mme_host, char *mme_realm, 
+    uint32_t cancellation_type)
+{
+    int ret;
+
+    struct msg *req = NULL;
+    struct avp *avp;
+    union avp_value val;
+    struct sess_state *sess_data = NULL, *svg;
+    struct session *session = NULL;
+
+    ogs_debug("HSS Cancel-Location-Request");
+
+    /* Create the random value to store with the session */
+    sess_data = ogs_calloc(1, sizeof(*sess_data));
+    ogs_assert(sess_data);
+
+    /* Create the request */
+    ret = fd_msg_new(ogs_diam_s6a_cmd_clr, MSGFL_ALLOC_ETEID, &req);
+    ogs_assert(ret == 0);
+
+    /* Create a new session */
+    #define OGS_DIAM_S6A_APP_SID_OPT  "app_s6a"
+    ret = fd_msg_new_session(req, (os0_t)OGS_DIAM_S6A_APP_SID_OPT, 
+            CONSTSTRLEN(OGS_DIAM_S6A_APP_SID_OPT));
+    ogs_assert(ret == 0);
+    ret = fd_msg_sess_get(fd_g_config->cnf_dict, req, &session, NULL);
+    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);
+    val.i32 = OGS_DIAM_AUTH_SESSION_NO_STATE_MAINTAINED;
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+    ogs_assert(ret == 0);
+
+    /* Set Origin-Host & Origin-Realm */
+    ret = fd_msg_add_origin(req, 0);
+    ogs_assert(ret == 0);
+
+    /* Set the Destination-Host AVP */
+    if (mme_host != NULL) {
+        ret = fd_msg_avp_new(ogs_diam_destination_host, 0, &avp);
+        ogs_assert(ret == 0);
+        val.os.data = (uint8_t *)mme_host;
+        val.os.len  = strlen(mme_host);
+        ret = fd_msg_avp_setvalue(avp, &val);
+        ogs_assert(ret == 0);
+        ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+        ogs_assert(ret == 0);
+    }
+
+    /* Set the Destination-Realm AVP */
+    ret = fd_msg_avp_new(ogs_diam_destination_realm, 0, &avp);
+    ogs_assert(ret == 0);
+    if (mme_realm == NULL) {
+        val.os.data = (unsigned char *)(fd_g_config->cnf_diamrlm);
+        val.os.len  = strlen(fd_g_config->cnf_diamrlm);
+    } else {
+        val.os.data = (unsigned char *)mme_realm;
+        val.os.len  = strlen(mme_realm);
+    }
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(req, 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 *)imsi_bcd;
+    val.os.len  = strlen(imsi_bcd);
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+    ogs_assert(ret == 0);
+
+    /* Set the CLR-Flags */
+    ret = fd_msg_avp_new(ogs_diam_s6a_clr_flags, 0, &avp);
+    ogs_assert(ret == 0);
+    if (cancellation_type == OGS_DIAM_S6A_CT_SUBSCRIPTION_WITHDRAWL) {
+        val.u32 = (OGS_DIAM_S6A_CLR_FLAGS_REATTACH_REQUIRED | 
+            OGS_DIAM_S6A_CLR_FLAGS_S6A_S6D_INDICATOR);
+    } else {
+        val.u32 = OGS_DIAM_S6A_CLR_FLAGS_S6A_S6D_INDICATOR;
+    }
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+    ogs_assert(ret == 0);
+
+    /* Set the Cancellation-Type */
+    ret = fd_msg_avp_new(ogs_diam_s6a_cancellation_type, 0, &avp);
+    ogs_assert(ret == 0);
+    val.u32 = cancellation_type;
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+    ogs_assert(ret == 0);
+
+    /* Set Vendor-Specific-Application-Id AVP */
+    ret = ogs_diam_message_vendor_specific_appid_set(
+            req, OGS_DIAM_S6A_APPLICATION_ID);
+    ogs_assert(ret == 0);
+
+    /* Keep a pointer to the session data for debug purpose,
+     * in real life we would not need it */
+    svg = sess_data;
+
+    /* Store this value in the session */
+    ret = fd_sess_state_store(hss_s6a_reg, session, &sess_data); 
+    ogs_assert(ret == 0);
+    ogs_assert(sess_data == 0);
+
+    /* Send the request */
+    ret = fd_msg_send(&req, hss_s6a_cla_cb, svg);
+    ogs_assert(ret == 0);
+
+    /* Increment the counter */
+    ogs_assert(pthread_mutex_lock(&ogs_diam_logger_self()->stats_lock) == 0);
+    ogs_diam_logger_self()->stats.nb_sent++;
+    ogs_assert(pthread_mutex_unlock(&ogs_diam_logger_self()->stats_lock) == 0);
+
+}
+
+/* HSS received Cancel Location Answer from MME */
+static void hss_s6a_cla_cb(void *data, struct msg **msg)
+{
+    int ret;
+
+    struct sess_state *sess_data = NULL;
+    struct session *session;
+    int new;
+
+    ogs_debug("HSS Cancel-Location-Answer");
+
+    /* Search the session, retrieve its data */
+    ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
+    ogs_expect_or_return(ret == 0);
+    ogs_expect_or_return(new == 0);
+
+    ret = fd_sess_state_retrieve(hss_s6a_reg, session, &sess_data);
+    ogs_expect_or_return(ret == 0);
+    ogs_expect_or_return(sess_data);
+    ogs_expect_or_return((void *)sess_data == data);
+
+    ret = fd_msg_free(*msg);
+    ogs_assert(ret == 0);
+    *msg = NULL;
+
+    state_cleanup(sess_data, NULL, NULL);
+    return;
+}
+
+/* HSS Sends Insert Subscriber Data Request to MME */
+/* arguments: flags, subscriber data, imsi */
+int hss_s6a_send_idr(char *imsi_bcd, uint32_t idr_flags, uint32_t subdatamask)
+{
+    int ret;
+
+    struct msg *req = NULL;
+    struct avp *avp;
+    union avp_value val;
+    struct sess_state *sess_data = NULL, *svg;
+    struct session *session = NULL;
+
+    ogs_subscription_data_t subscription_data;
+
+    ogs_debug("HSS Insert-Subscriber-Data-Request");
+
+    memset(&subscription_data, 0, sizeof(ogs_subscription_data_t));
+
+    ret = hss_db_subscription_data(imsi_bcd, &subscription_data);
+    if (ret != OGS_OK) {
+        ogs_error("Cannot get Subscription-Data for IMSI:'%s'", imsi_bcd);
+        return OGS_ERROR;
+    }
+
+    if (subscription_data.purge_flag) {
+        ogs_error("    %s UE Purged at MME.  Cannot send IDR.", imsi_bcd);
+        return OGS_ERROR;
+    }
+
+    /* Create the random value to store with the session */
+    sess_data = ogs_calloc(1, sizeof(*sess_data));
+    ogs_assert(sess_data);
+
+    /* Create the request */
+    ret = fd_msg_new(ogs_diam_s6a_cmd_idr, MSGFL_ALLOC_ETEID, &req);
+    ogs_assert(ret == 0);
+
+    /* Create a new session */
+    #define OGS_DIAM_S6A_APP_SID_OPT  "app_s6a"
+    ret = fd_msg_new_session(req, (os0_t)OGS_DIAM_S6A_APP_SID_OPT, 
+            CONSTSTRLEN(OGS_DIAM_S6A_APP_SID_OPT));
+    ogs_assert(ret == 0);
+    ret = fd_msg_sess_get(fd_g_config->cnf_dict, req, &session, NULL);
+    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);
+    val.i32 = OGS_DIAM_AUTH_SESSION_NO_STATE_MAINTAINED;
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+    ogs_assert(ret == 0);
+
+    /* Set Origin-Host & Origin-Realm */
+    ret = fd_msg_add_origin(req, 0);
+    ogs_assert(ret == 0);
+
+    /* Set the Destination-Host AVP */
+    if (subscription_data.mme_host != NULL) {
+        ret = fd_msg_avp_new(ogs_diam_destination_host, 0, &avp);
+        ogs_assert(ret == 0);
+        val.os.data = (uint8_t *)subscription_data.mme_host;
+        val.os.len  = strlen(subscription_data.mme_host);
+        ret = fd_msg_avp_setvalue(avp, &val);
+        ogs_assert(ret == 0);
+        ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+        ogs_assert(ret == 0);
+    }
+
+    /* Set the Destination-Realm AVP */
+    ret = fd_msg_avp_new(ogs_diam_destination_realm, 0, &avp);
+    ogs_assert(ret == 0);
+    if (subscription_data.mme_realm == NULL) {
+        val.os.data = (unsigned char *)(fd_g_config->cnf_diamrlm);
+        val.os.len  = strlen(fd_g_config->cnf_diamrlm);
+    } else {
+        val.os.data = (unsigned char *)subscription_data.mme_realm;
+        val.os.len  = strlen(subscription_data.mme_realm);
+    }
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(req, 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 *)imsi_bcd;
+    val.os.len  = strlen(imsi_bcd);
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+    ogs_assert(ret == 0);
+
+    /* Set the IDR-Flags */
+    if (idr_flags) {
+        ret = fd_msg_avp_new(ogs_diam_s6a_idr_flags, 0, &avp);
+        ogs_assert(ret == 0);
+        val.u32 = idr_flags;
+        ret = fd_msg_avp_setvalue(avp, &val);
+        ogs_assert(ret == 0);
+        ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+        ogs_assert(ret == 0);
+    }
+
+    /* Set the Subscription Data */
+    ret = fd_msg_avp_new(ogs_diam_s6a_subscription_data, 0, &avp);
+    ogs_assert(ret == 0);
+        if (subdatamask) {
+            ret = hss_s6a_avp_add_subscription_data(&subscription_data,
+                avp, subdatamask);
+            if (ret != OGS_OK) {
+                ogs_error("    %s Could not build Subscription-Data.", 
+                    imsi_bcd);
+                return OGS_ERROR;
+            }
+        }
+    ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+    ogs_assert(ret == 0);
+
+    /* Set Vendor-Specific-Application-Id AVP */
+    ret = ogs_diam_message_vendor_specific_appid_set(
+            req, OGS_DIAM_S6A_APPLICATION_ID);
+    ogs_assert(ret == 0);
+
+    /* Keep a pointer to the session data for debug purpose,
+     * in real life we would not need it */
+    svg = sess_data;
+
+    /* Store this value in the session */
+    ret = fd_sess_state_store(hss_s6a_reg, session, &sess_data); 
+    ogs_assert(ret == 0);
+    ogs_assert(sess_data == 0);
+
+    /* Send the request */
+    ret = fd_msg_send(&req, hss_s6a_ida_cb, svg);
+    ogs_assert(ret == 0);
+
+    /* Increment the counter */
+    ogs_assert(pthread_mutex_lock(&ogs_diam_logger_self()->stats_lock) == 0);
+    ogs_diam_logger_self()->stats.nb_sent++;
+    ogs_assert(pthread_mutex_unlock(&ogs_diam_logger_self()->stats_lock) == 0);
+
+    ogs_subscription_data_free(&subscription_data);
+
+    return OGS_OK;
+}
+
+/* HSS received Insert Subscriber Data Answer from MME */
+static void hss_s6a_ida_cb(void *data, struct msg **msg)
+{
+    int ret;
+
+    struct sess_state *sess_data = NULL;
+    struct session *session;
+    int new;
+
+    ogs_debug("HSS Insert-Subscriber-Data-Answer");
+
+    /* Search the session, retrieve its data */
+    ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
+    ogs_expect_or_return(ret == 0);
+    ogs_expect_or_return(new == 0);
+
+    ret = fd_sess_state_retrieve(hss_s6a_reg, session, &sess_data);
+    ogs_expect_or_return(ret == 0);
+    ogs_expect_or_return(sess_data);
+    ogs_expect_or_return((void *)sess_data == data);
+
+    ret = fd_msg_free(*msg);
+    ogs_assert(ret == 0);
+    *msg = NULL;
+
+    state_cleanup(sess_data, NULL, NULL);
+    return;
+}
+
 int hss_s6a_init(void)
 {
     int ret;
@@ -875,6 +1491,10 @@
     memset(&data, 0, sizeof(data));
     data.app = ogs_diam_s6a_application;
 
+    /* Create handler for sessions */
+    ret = fd_sess_handler_create(&hss_s6a_reg, state_cleanup, NULL, NULL);
+    ogs_assert(ret == 0);
+
     /* Fallback CB if command != unexpected message received */
     ret = fd_disp_register(hss_ogs_diam_s6a_fb_cb, DISP_HOW_APPID, &data, NULL,
                 &hdl_s6a_fb);
@@ -892,6 +1512,12 @@
                 &hdl_s6a_ulr);
     ogs_assert(ret == 0);
 
+    /* Specific handler for Purge-UE-Request */
+    data.command = ogs_diam_s6a_cmd_pur;
+    ret = fd_disp_register(hss_ogs_diam_s6a_pur_cb, DISP_HOW_CC, &data, NULL,
+                &hdl_s6a_pur);
+    ogs_assert(ret == 0);
+
     /* Advertise the support for the application in the peer */
     ret = fd_disp_app_support(ogs_diam_s6a_application, ogs_diam_vendor, 1, 0);
     ogs_assert(ret == 0);
@@ -901,10 +1527,17 @@
 
 void hss_s6a_final(void)
 {
+    int ret;
+
+    ret = fd_sess_handler_destroy(&hss_s6a_reg, NULL);
+    ogs_assert(ret == OGS_OK);
+
     if (hdl_s6a_fb)
         (void) fd_disp_unregister(&hdl_s6a_fb, NULL);
     if (hdl_s6a_air)
         (void) fd_disp_unregister(&hdl_s6a_air, NULL);
     if (hdl_s6a_ulr)
         (void) fd_disp_unregister(&hdl_s6a_ulr, NULL);
+    if (hdl_s6a_pur)
+        (void) fd_disp_unregister(&hdl_s6a_pur, NULL);
 }

open5gs_2.4.11.tar.xz/src/hss/hss-s6a-path.h Added

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2019 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/>.
+ */
+
+#ifndef HSS_S6A_PATH_H
+#define HSS_S6A_PATH_H
+
+#include "hss-context.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define OGS_HSS_SUBDATA_NO_UPDATE                       (0)
+#define OGS_HSS_SUBDATA_MSISDN                          (1)
+#define OGS_HSS_SUBDATA_ARD                             (1 << 1)
+#define OGS_HSS_SUBDATA_SUB_STATUS                      (1 << 2)
+#define OGS_HSS_SUBDATA_NAM                             (1 << 3)
+#define OGS_HSS_SUBDATA_UEAMBR                          (1 << 4)
+#define OGS_HSS_SUBDATA_RAU_TAU_TIMER                   (1 << 5)
+#define OGS_HSS_SUBDATA_SLICE                           (1 << 6)
+#define OGS_HSS_SUBDATA_ALL                             0xFFFFFFFF
+
+/* HSS Sends Cancel Location Request to MME */
+void hss_s6a_send_clr(char *imsi_bcd, char *mme_host, char *mme_realm, 
+    uint32_t cancellation_type);
+
+/* HSS Sends Insert Subscriber Data Request to MME */
+int hss_s6a_send_idr(char *imsi_bcd, uint32_t idr_flags, uint32_t subdata_mask);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* HSS_S6A_PATH_H */

open5gs_2.4.11.tar.xz/src/hss/hss-sm.c Added

@@ -0,0 +1,100 @@
+/*
+ * 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 "hss-sm.h"
+#include "hss-context.h"
+#include "hss-event.h"
+
+#define DB_POLLING_TIME ogs_time_from_msec(100)
+
+static ogs_timer_t *t_db_polling = NULL;
+
+void hss_state_initial(ogs_fsm_t *s, ogs_event_t *e)
+{
+    hss_sm_debug(e);
+
+    ogs_assert(s);
+
+    if (ogs_app()->use_mongodb_change_stream) {
+        ogs_dbi_collection_watch_init();
+
+        t_db_polling = ogs_timer_add(ogs_app()->timer_mgr,
+                ogs_timer_dbi_poll_change_stream, 0);
+        ogs_assert(t_db_polling);
+        ogs_timer_start(t_db_polling, DB_POLLING_TIME);
+
+        OGS_FSM_TRAN(s, &hss_state_operational);
+    }
+}
+
+void hss_state_final(ogs_fsm_t *s, ogs_event_t *e)
+{
+    hss_sm_debug(e);
+
+    if (t_db_polling)
+        ogs_timer_delete(t_db_polling);
+
+    ogs_assert(s);
+}
+
+void hss_state_operational(ogs_fsm_t *s, ogs_event_t *e)
+{
+    hss_sm_debug(e);
+
+    ogs_assert(s);
+
+    switch (e->id) {
+    case OGS_FSM_ENTRY_SIG:
+        break;
+
+    case OGS_FSM_EXIT_SIG:
+        if (t_db_polling) {
+            ogs_timer_stop(t_db_polling);
+        }
+        break;
+
+    case OGS_EVENT_DBI_POLL_TIMER:
+        ogs_assert(e);
+
+        switch(e->timer_id) {
+        case OGS_TIMER_DBI_POLL_CHANGE_STREAM:
+            hss_db_poll_change_stream();
+            ogs_timer_start(t_db_polling, DB_POLLING_TIME);
+            break;
+
+        default:
+            ogs_error("Unknown timer%s:%d",
+                    ogs_timer_get_name(e->timer_id), e->timer_id);
+        }
+        break;
+
+    case OGS_EVENT_DBI_MESSAGE:
+        ogs_assert(e);
+
+        ogs_assert(e->dbi.document);
+        hss_handle_change_event(e->dbi.document);
+
+        bson_destroy((bson_t*)e->dbi.document);
+        break;
+
+    default:
+        ogs_error("No handler for event %s", ogs_event_get_name(e));
+        break;
+    }
+}

open5gs_2.4.11.tar.xz/src/hss/hss-sm.h Added

@@ -0,0 +1,42 @@
+/*
+ * 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/>.
+ */
+
+#ifndef HSS_SM_H
+#define HSS_SM_H
+
+#include "hss-event.h"
+#include "ogs-proto.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void hss_state_initial(ogs_fsm_t *s, ogs_event_t *e);
+void hss_state_final(ogs_fsm_t *s, ogs_event_t *e);
+void hss_state_operational(ogs_fsm_t *s, ogs_event_t *e);
+void hss_state_exception(ogs_fsm_t *s, ogs_event_t *e);
+
+#define hss_sm_debug(__pe) \
+    ogs_debug("%s(): %s", __func__, ogs_event_get_name(__pe))
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* HSS_SM_H */

open5gs_2.4.10.tar.xz/src/hss/meson.build -> open5gs_2.4.11.tar.xz/src/hss/meson.build Changed

open5gs_2.4.10.tar.xz/src/mme/mme-context.c -> open5gs_2.4.11.tar.xz/src/mme/mme-context.c Changed

open5gs_2.4.10.tar.xz/src/mme/mme-init.c -> open5gs_2.4.11.tar.xz/src/mme/mme-init.c Changed

open5gs_2.4.10.tar.xz/src/mme/mme-s11-handler.c -> open5gs_2.4.11.tar.xz/src/mme/mme-s11-handler.c Changed

@@ -220,7 +220,7 @@
         ogs_assert(cause);
         cause_value = cause->value;
         if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-            ogs_error("GTP Failed Bearer-CAUSE:%d", cause_value);
+            ogs_error("GTP Bearer Cause VALUE:%d", cause_value);
             if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
                 ogs_error("%s Attach reject", mme_ue->imsi_bcd);
                 ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue,
@@ -240,7 +240,7 @@
             OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_NETWORK_PREFERENCE &&
         cause_value !=
             OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_SINGLE_ADDRESS_BEARER_ONLY) {
-        ogs_error("GTP Failed CAUSE:%d", cause_value);
+        ogs_error("GTP Cause Value:%d", cause_value);
         if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
             ogs_error("%s Attach reject", mme_ue->imsi_bcd);
             ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue,
@@ -467,7 +467,7 @@
     ogs_assert(cause);
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Failed CAUSE:%d", cause_value);
+        ogs_error("GTP Cause Value:%d", cause_value);
         mme_send_delete_session_or_mme_ue_context_release(mme_ue);
         return;
     }
@@ -548,7 +548,7 @@
 
         cause_value = cause->value;
         if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED)
-            ogs_error("GTP Failed CAUSE:%d - Ignored", cause_value);
+            ogs_error("GTP Cause Value:%d - Ignored", cause_value);
     }
 
     /********************
@@ -1143,7 +1143,7 @@
 
         cause_value = cause->value;
         if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED)
-            ogs_error("GTP Failed CAUSE:%d, ACTION:%d", cause_value, action);
+            ogs_error("GTP Cause Value:%d, ACTION:%d", cause_value, action);
     }
 
     /********************
@@ -1455,7 +1455,7 @@
     ogs_assert(cause);
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Failed CAUSE:%d", cause_value);
+        ogs_error("GTP Cause Value:%d", cause_value);
         mme_send_delete_session_or_mme_ue_context_release(mme_ue);
         return;
     }
@@ -1571,7 +1571,7 @@
     ogs_assert(cause);
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Failed CAUSE:%d", cause_value);
+        ogs_error("GTP Cause Value:%d", cause_value);
         mme_send_delete_session_or_mme_ue_context_release(mme_ue);
         return;
     }
@@ -1639,7 +1639,7 @@
         ogs_assert(cause);
 
         cause_value = cause->value;
-        ogs_warn("GTP Failed CAUSE:%d - Ignored", cause_value);
+        ogs_warn("GTP Cause Value:%d - Ignored", cause_value);
     } else {
         ogs_error("No Cause");
     }

open5gs_2.4.10.tar.xz/src/mme/mme-s6a-handler.c -> open5gs_2.4.11.tar.xz/src/mme/mme-s6a-handler.c Changed

@@ -102,13 +102,27 @@
             break;
         }
 
-        mme_ue->sessioni.name = ogs_strdup(slice_data->sessioni.name);
-        ogs_assert(mme_ue->sessioni.name);
+        if (slice_data->sessioni.name) {
+            mme_ue->sessioni.name = ogs_strdup(slice_data->sessioni.name);
+            ogs_assert(mme_ue->sessioni.name);
+        }
 
         mme_ue->sessioni.context_identifier =
             slice_data->sessioni.context_identifier;
 
-        mme_ue->sessioni.session_type = slice_data->sessioni.session_type;
+        if (slice_data->sessioni.session_type == OGS_PDU_SESSION_TYPE_IPV4 ||
+            slice_data->sessioni.session_type == OGS_PDU_SESSION_TYPE_IPV6 ||
+            slice_data->sessioni.session_type ==
+                OGS_PDU_SESSION_TYPE_IPV4V6) {
+            mme_ue->sessioni.session_type =
+                slice_data->sessioni.session_type;
+        } else {
+            ogs_error("Invalid PDN_TYPE%d",
+                slice_data->sessioni.session_type);
+            if (mme_ue->sessioni.name)
+                ogs_free(mme_ue->sessioni.name);
+            break;
+        }
         memcpy(&mme_ue->sessioni.paa, &slice_data->sessioni.paa,
                 sizeof(mme_ue->sessioni.paa));
 
@@ -127,6 +141,11 @@
             slice_data->sessioni.charging_characteristics_presence;
     }
 
+    if (i == 0) {
+        ogs_error("No Session");
+        return OGS_NAS_EMM_CAUSE_SEVERE_NETWORK_FAILURE;
+    }
+
     mme_ue->num_of_session = i;
     mme_ue->context_identifier = slice_data->context_identifier;

open5gs_2.4.10.tar.xz/src/nssf/context.h -> open5gs_2.4.11.tar.xz/src/nssf/context.h Changed

open5gs_2.4.10.tar.xz/src/pcf/context.h -> open5gs_2.4.11.tar.xz/src/pcf/context.h Changed

open5gs_2.4.10.tar.xz/src/pcf/sm-sm.c -> open5gs_2.4.11.tar.xz/src/pcf/sm-sm.c Changed

@@ -214,14 +214,23 @@
                     CASE(OGS_SBI_HTTP_METHOD_DELETE)
                         if (message->res_status !=
                                 OGS_SBI_HTTP_STATUS_NO_CONTENT) {
-                            ogs_error("%s:%d HTTP response error %d",
+                            ogs_warn("%s:%d HTTP response error %d",
                                 pcf_ue->supi, sess->psi, message->res_status);
+
+/*
+ * The PCfBindings resource for that UE may not exist in the BSF
+ * for reasons such as restarting the BSF.
+ *
+ * So, session Release continues even if there is no resource in BSF.
+ */
+#if 0
                             ogs_assert(true ==
                                 ogs_sbi_server_send_error(stream,
                                     message->res_status,
                                     NULL, "HTTP response error", pcf_ue->supi));
                             OGS_FSM_TRAN(s, pcf_sm_state_exception);
                             break;
+#endif
                         }
 
                         pcf_nbsf_management_handle_de_register(

open5gs_2.4.10.tar.xz/src/sgwc/pfcp-path.c -> open5gs_2.4.11.tar.xz/src/sgwc/pfcp-path.c Changed

open5gs_2.4.10.tar.xz/src/sgwc/pfcp-sm.c -> open5gs_2.4.11.tar.xz/src/sgwc/pfcp-sm.c Changed

@@ -169,12 +169,16 @@
 
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
-        ogs_info("PFCP associated");
+        ogs_info("PFCP associated %s:%d",
+            OGS_ADDR(&node->addr, buf),
+            OGS_PORT(&node->addr));
         ogs_timer_start(node->t_no_heartbeat,
                 ogs_app()->time.message.pfcp.no_heartbeat_duration);
         break;
     case OGS_FSM_EXIT_SIG:
-        ogs_info("PFCP de-associated");
+        ogs_info("PFCP de-associated %s:%d",
+            OGS_ADDR(&node->addr, buf),
+            OGS_PORT(&node->addr));
         ogs_timer_stop(node->t_no_heartbeat);
         break;
     case SGWC_EVT_SXA_MESSAGE:
@@ -206,12 +210,16 @@
                     &message->pfcp_heartbeat_response));
             break;
         case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE:
-            ogs_warn("PFCPREQ has already been associated");
+            ogs_warn("PFCPREQ has already been associated %s:%d",
+                OGS_ADDR(&node->addr, buf),
+                OGS_PORT(&node->addr));
             ogs_pfcp_cp_handle_association_setup_request(node, xact,
                     &message->pfcp_association_setup_request);
             break;
         case OGS_PFCP_ASSOCIATION_SETUP_RESPONSE_TYPE:
-            ogs_warn("PFCPRSP has already been associated");
+            ogs_warn("PFCPRSP has already been associated %s:%d",
+                OGS_ADDR(&node->addr, buf),
+                OGS_PORT(&node->addr));
             ogs_pfcp_cp_handle_association_setup_response(node, xact,
                     &message->pfcp_association_setup_response);
             break;

open5gs_2.4.10.tar.xz/src/sgwc/s11-handler.c -> open5gs_2.4.11.tar.xz/src/sgwc/s11-handler.c Changed

@@ -766,7 +766,7 @@
     ogs_assert(cause);
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Failed CAUSE:%d", cause_value);
+        ogs_error("GTP Cause Value:%d", cause_value);
         ogs_assert(OGS_OK ==
             sgwc_pfcp_send_bearer_modification_request(
                 bearer, NULL, NULL,
@@ -919,7 +919,7 @@
     ogs_assert(cause);
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Failed Bearer-CAUSE:%d", cause_value);
+        ogs_error("GTP Bearer Cause VALUE:%d", cause_value);
         ogs_gtp_send_error_message(s5c_xact, sess ? sess->pgw_s5c_teid : 0,
                 OGS_GTP2_UPDATE_BEARER_RESPONSE_TYPE, cause_value);
         return;
@@ -929,7 +929,7 @@
     ogs_assert(cause);
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Failed CAUSE:%d", cause_value);
+        ogs_error("GTP Cause Value:%d", cause_value);
         ogs_gtp_send_error_message(s5c_xact, sess ? sess->pgw_s5c_teid : 0,
                 OGS_GTP2_UPDATE_BEARER_RESPONSE_TYPE, cause_value);
         return;
@@ -1022,7 +1022,7 @@
             cause_value = cause->value;
             if (cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
             } else {
-                ogs_error("GTP Failed CAUSE:%d", cause_value);
+                ogs_error("GTP Cause Value:%d", cause_value);
             }
         } else {
             ogs_error("No Cause");
@@ -1062,13 +1062,13 @@
 
                     if (cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
                     } else {
-                        ogs_error("GTP Failed CAUSE:%d", cause_value);
+                        ogs_error("GTP Cause Value:%d", cause_value);
                     }
                 } else {
                     ogs_error("No Cause");
                 }
             } else {
-                ogs_error("GTP Failed CAUSE:%d", cause_value);
+                ogs_error("GTP Cause Value:%d", cause_value);
             }
         } else {
             ogs_error("No Cause");
@@ -1172,7 +1172,7 @@
 
         cause_value = cause->value;
         if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED)
-            ogs_warn("GTP Failed CAUSE:%d - PFCP_CAUSE%d",
+            ogs_warn("GTP Cause Value:%d - PFCP_CAUSE%d",
                     cause_value, pfcp_cause_from_gtp(cause_value));
     } else {
         ogs_error("No Cause");

open5gs_2.4.10.tar.xz/src/sgwc/s5c-handler.c -> open5gs_2.4.11.tar.xz/src/sgwc/s5c-handler.c Changed

@@ -79,9 +79,6 @@
     ogs_gtp_xact_t *s11_xact = NULL;
     ogs_gtp_node_t *pgw = NULL;
 
-    ogs_assert(sess);
-    sgwc_ue = sess->sgwc_ue;
-    ogs_assert(sgwc_ue);
     ogs_assert(gtpbuf);
     ogs_assert(message);
     rsp = &message->create_session_response;
@@ -99,10 +96,32 @@
     rv = ogs_gtp_xact_commit(s5c_xact);
     ogs_expect(rv == OGS_OK);
 
+    /************************
+     * Check Session Context
+     *
+     * - Session could be deleted before a message is received from SMF.
+     ************************/
+    cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
+
+    if (!sess) {
+        ogs_error("No Context in TEID");
+        cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
+    } else {
+        sgwc_ue = sess->sgwc_ue;
+        ogs_assert(sgwc_ue);
+    }
+
+    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
+        ogs_gtp_send_error_message(
+                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
+        return;
+    }
+
     /*****************************************
      * Check Mandatory/Conditional IE Missing
      *****************************************/
-    cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
+    ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
     if (rsp->pgw_s5_s8__s2a_s2b_f_teid_for_pmip_based_interface_or_for_gtp_based_control_plane_interface.presence == 0) {
         ogs_error("No GTP TEID");
@@ -150,7 +169,7 @@
         ogs_assert(cause);
         cause_value = cause->value;
         if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-            ogs_error("GTP Failed Bearer-CAUSE:%d", cause_value);
+            ogs_error("GTP Bearer Cause VALUE:%d", cause_value);
             ogs_gtp_send_error_message(
                     s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                     OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
@@ -167,7 +186,7 @@
             OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_NETWORK_PREFERENCE &&
         cause_value !=
             OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_SINGLE_ADDRESS_BEARER_ONLY) {
-        ogs_error("GTP Failed CAUSE:%d", cause_value);
+        ogs_error("GTP Cause Value:%d", cause_value);
         ogs_gtp_send_error_message(
                 s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
@@ -280,9 +299,6 @@
     ogs_gtp_xact_t *s11_xact = NULL;
     ogs_gtp2_modify_bearer_response_t *rsp = NULL;
 
-    ogs_assert(sess);
-    sgwc_ue = sess->sgwc_ue;
-    ogs_assert(sgwc_ue);
     ogs_assert(message);
     rsp = &message->modify_bearer_response;
     ogs_assert(rsp);
@@ -300,10 +316,37 @@
     rv = ogs_gtp_xact_commit(s5c_xact);
     ogs_expect(rv == OGS_OK);
 
+    /************************
+     * Check Session Context
+     *
+     * - Session could be deleted before a message is received from SMF.
+     ************************/
+    cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
+
+    if (!sess) {
+        ogs_error("No Context in TEID");
+        cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
+    } else {
+        sgwc_ue = sess->sgwc_ue;
+        ogs_assert(sgwc_ue);
+    }
+
+    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
+        if (modify_action == OGS_GTP_MODIFY_IN_PATH_SWITCH_REQUEST)
+            ogs_gtp_send_error_message(
+                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                    OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
+        else
+            ogs_gtp_send_error_message(
+                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                    OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, cause_value);
+        return;
+    }
+
     /*****************************************
      * Check Mandatory/Conditional IE Missing
      *****************************************/
-    cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
+    ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
     if (rsp->cause.presence == 0) {
         ogs_error("No Cause");
@@ -331,7 +374,7 @@
     ogs_assert(cause);
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Failed CAUSE:%d", cause_value);
+        ogs_error("GTP Cause Value:%d", cause_value);
         if (modify_action == OGS_GTP_MODIFY_IN_PATH_SWITCH_REQUEST)
             ogs_gtp_send_error_message(
                     s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
@@ -385,9 +428,6 @@
     ogs_gtp_xact_t *s11_xact = NULL;
     ogs_gtp2_delete_session_response_t *rsp = NULL;
 
-    ogs_assert(sess);
-    sgwc_ue = sess->sgwc_ue;
-    ogs_assert(sgwc_ue);
     ogs_assert(message);
     rsp = &message->delete_session_response;
     ogs_assert(rsp);
@@ -404,10 +444,32 @@
     rv = ogs_gtp_xact_commit(s5c_xact);
     ogs_expect(rv == OGS_OK);
 
+    /************************
+     * Check Session Context
+     *
+     * - Session could be deleted before a message is received from SMF.
+     ************************/
+    cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
+
+    if (!sess) {
+        ogs_error("No Context in TEID");
+        cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
+    } else {
+        sgwc_ue = sess->sgwc_ue;
+        ogs_assert(sgwc_ue);
+    }
+
+    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
+        ogs_gtp_send_error_message(
+                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                OGS_GTP2_DELETE_SESSION_RESPONSE_TYPE, cause_value);
+        return;
+    }
+
     /*****************************************
      * Check Mandatory/Conditional IE Missing
      *****************************************/
-    cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
+    ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
     if (rsp->cause.presence == 0) {
         ogs_error("No Cause");
@@ -430,7 +492,7 @@
     ogs_assert(cause);
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Failed CAUSE:%d", cause_value);
+        ogs_error("GTP Cause Value:%d", cause_value);
         ogs_gtp_send_error_message(
                 s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_DELETE_SESSION_RESPONSE_TYPE, cause_value);
@@ -835,9 +897,6 @@
 
     sgwc_ue_t *sgwc_ue = NULL;
 
-    ogs_assert(sess);
-    sgwc_ue = sess->sgwc_ue;
-    ogs_assert(sgwc_ue);
     ogs_assert(message);
     ind = &message->bearer_resource_failure_indication;
     ogs_assert(ind);
@@ -851,6 +910,19 @@
     s11_xact = s5c_xact->assoc_xact;
     ogs_assert(s11_xact);
 
+    /************************
+     * Check Session Context
+     *
+     * - Session could be deleted before a message is received from SMF.
+     ************************/
+    if (!sess) {
+        ogs_error("No Context in TEID");
+        cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
+    } else {
+        sgwc_ue = sess->sgwc_ue;
+        ogs_assert(sgwc_ue);
+    }
+
     /********************
      * Check Cause Value
      ********************/

open5gs_2.4.10.tar.xz/src/sgwc/sxa-handler.c -> open5gs_2.4.11.tar.xz/src/sgwc/sxa-handler.c Changed

open5gs_2.4.10.tar.xz/src/sgwu/pfcp-path.c -> open5gs_2.4.11.tar.xz/src/sgwu/pfcp-path.c Changed

open5gs_2.4.10.tar.xz/src/sgwu/pfcp-sm.c -> open5gs_2.4.11.tar.xz/src/sgwu/pfcp-sm.c Changed

@@ -165,12 +165,16 @@
 
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
-        ogs_info("PFCP associated");
+        ogs_info("PFCP associated %s:%d",
+            OGS_ADDR(&node->addr, buf),
+            OGS_PORT(&node->addr));
         ogs_timer_start(node->t_no_heartbeat,
                 ogs_app()->time.message.pfcp.no_heartbeat_duration);
         break;
     case OGS_FSM_EXIT_SIG:
-        ogs_info("PFCP de-associated");
+        ogs_info("PFCP de-associated %s:%d",
+            OGS_ADDR(&node->addr, buf),
+            OGS_PORT(&node->addr));
         ogs_timer_stop(node->t_no_heartbeat);
         break;
     case SGWU_EVT_SXA_MESSAGE:
@@ -194,12 +198,16 @@
                     &message->pfcp_heartbeat_response));
             break;
         case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE:
-            ogs_warn("PFCPREQ has already been associated");
+            ogs_warn("PFCPREQ has already been associated %s:%d",
+                OGS_ADDR(&node->addr, buf),
+                OGS_PORT(&node->addr));
             ogs_pfcp_up_handle_association_setup_request(node, xact,
                     &message->pfcp_association_setup_request);
             break;
         case OGS_PFCP_ASSOCIATION_SETUP_RESPONSE_TYPE:
-            ogs_warn("PFCPRSP has already been associated");
+            ogs_warn("PFCPRSP has already been associated %s:%d",
+                OGS_ADDR(&node->addr, buf),
+                OGS_PORT(&node->addr));
             ogs_pfcp_up_handle_association_setup_response(node, xact,
                     &message->pfcp_association_setup_response);
             break;

open5gs_2.4.10.tar.xz/src/smf/context.c -> open5gs_2.4.11.tar.xz/src/smf/context.c Changed

open5gs_2.4.10.tar.xz/src/smf/context.h -> open5gs_2.4.11.tar.xz/src/smf/context.h Changed

open5gs_2.4.10.tar.xz/src/smf/gsm-sm.c -> open5gs_2.4.11.tar.xz/src/smf/gsm-sm.c Changed

@@ -1521,6 +1521,11 @@
 
                 ogs_assert(true == ogs_sbi_send_http_status_no_content(stream));
 
+                sess->n2_released = true;
+                if ((sess->n1_released) && (sess->n2_released)) {
+                    OGS_FSM_TRAN(s, &smf_gsm_state_session_will_release);
+                }
+
             } else {
                 ogs_fatal("Invalid state %d", ngap_state);
                 ogs_assert_if_reached();
@@ -1545,7 +1550,12 @@
         case OGS_NAS_5GS_PDU_SESSION_RELEASE_COMPLETE:
             ogs_assert(true == ogs_sbi_send_http_status_no_content(stream));
             ogs_assert(true == smf_sbi_send_sm_context_status_notify(sess));
-            OGS_FSM_TRAN(s, &smf_gsm_state_session_will_release);
+
+            sess->n1_released = true;
+            if ((sess->n1_released) && (sess->n2_released)) {
+                OGS_FSM_TRAN(s, &smf_gsm_state_session_will_release);
+            }
+
             break;
         default:
             strerror = ogs_msprintf("Unknown message %d",

open5gs_2.4.10.tar.xz/src/smf/init.c -> open5gs_2.4.11.tar.xz/src/smf/init.c Changed

open5gs_2.4.10.tar.xz/src/smf/n4-handler.c -> open5gs_2.4.11.tar.xz/src/smf/n4-handler.c Changed

open5gs_2.4.10.tar.xz/src/smf/pfcp-path.c -> open5gs_2.4.11.tar.xz/src/smf/pfcp-path.c Changed

open5gs_2.4.10.tar.xz/src/smf/pfcp-sm.c -> open5gs_2.4.11.tar.xz/src/smf/pfcp-sm.c Changed

@@ -171,12 +171,16 @@
 
     switch (e->h.id) {
     case OGS_FSM_ENTRY_SIG:
-        ogs_info("PFCP associated");
+        ogs_info("PFCP associated %s:%d",
+            OGS_ADDR(&node->addr, buf),
+            OGS_PORT(&node->addr));
         ogs_timer_start(node->t_no_heartbeat,
                 ogs_app()->time.message.pfcp.no_heartbeat_duration);
         break;
     case OGS_FSM_EXIT_SIG:
-        ogs_info("PFCP de-associated");
+        ogs_info("PFCP de-associated %s:%d",
+            OGS_ADDR(&node->addr, buf),
+            OGS_PORT(&node->addr));
         ogs_timer_stop(node->t_no_heartbeat);
         break;
     case SMF_EVT_N4_MESSAGE:
@@ -210,12 +214,16 @@
                     &message->pfcp_heartbeat_response));
             break;
         case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE:
-            ogs_warn("PFCPREQ has already been associated");
+            ogs_warn("PFCPREQ has already been associated %s:%d",
+                OGS_ADDR(&node->addr, buf),
+                OGS_PORT(&node->addr));
             ogs_pfcp_cp_handle_association_setup_request(node, xact,
                     &message->pfcp_association_setup_request);
             break;
         case OGS_PFCP_ASSOCIATION_SETUP_RESPONSE_TYPE:
-            ogs_warn("PFCPRSP has already been associated");
+            ogs_warn("PFCPRSP has already been associated %s:%d",
+                OGS_ADDR(&node->addr, buf),
+                OGS_PORT(&node->addr));
             ogs_pfcp_cp_handle_association_setup_response(node, xact,
                     &message->pfcp_association_setup_response);
             break;

open5gs_2.4.10.tar.xz/src/smf/s5c-handler.c -> open5gs_2.4.11.tar.xz/src/smf/s5c-handler.c Changed

@@ -708,7 +708,7 @@
     ogs_assert(cause);
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Failed Bearer-CAUSE:%d", cause_value);
+        ogs_error("GTP Bearer Cause VALUE:%d", cause_value);
         ogs_assert(OGS_OK ==
             smf_epc_pfcp_send_one_bearer_modification_request(
                 bearer, NULL, OGS_PFCP_MODIFY_REMOVE,
@@ -721,7 +721,7 @@
     ogs_assert(cause);
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Failed CAUSE:%d", cause_value);
+        ogs_error("GTP Cause Value:%d", cause_value);
         ogs_assert(OGS_OK ==
             smf_epc_pfcp_send_one_bearer_modification_request(
                 bearer, NULL, OGS_PFCP_MODIFY_REMOVE,
@@ -837,7 +837,7 @@
     ogs_assert(cause);
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Failed Bearer-CAUSE:%d", cause_value);
+        ogs_error("GTP Bearer Cause VALUE:%d", cause_value);
         return;
     }
 
@@ -845,7 +845,7 @@
     ogs_assert(cause);
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Failed CAUSE:%d", cause_value);
+        ogs_error("GTP Cause Value:%d", cause_value);
         return;
     }
 
@@ -925,7 +925,7 @@
             cause_value = cause->value;
             if (cause->value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
             } else {
-                ogs_error("GTP Failed CAUSE:%d", cause_value);
+                ogs_error("GTP Cause Value:%d", cause_value);
             }
         } else {
             ogs_error("No Cause");
@@ -965,13 +965,13 @@
 
                 if (cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
                 } else {
-                    ogs_error("GTP Failed CAUSE:%d", cause_value);
+                    ogs_error("GTP Cause Value:%d", cause_value);
                 }
             } else {
                 ogs_error("No Cause");
             }
         } else {
-            ogs_error("GTP Failed CAUSE:%d", cause_value);
+            ogs_error("GTP Cause Value:%d", cause_value);
         }
     } else {
         ogs_error("No Cause");

open5gs_2.4.10.tar.xz/src/udm/context.h -> open5gs_2.4.11.tar.xz/src/udm/context.h Changed

open5gs_2.4.10.tar.xz/src/udr/context.h -> open5gs_2.4.11.tar.xz/src/udr/context.h Changed

open5gs_2.4.10.tar.xz/src/upf/context.c -> open5gs_2.4.11.tar.xz/src/upf/context.c Changed

@@ -413,11 +413,11 @@
     urr_acc->total_octets += size;
     urr_acc->total_pkts++;
     if (is_uplink) {
-        urr_acc->dl_octets += size;
-        urr_acc->dl_pkts++;
-    } else {
         urr_acc->ul_octets += size;
         urr_acc->ul_pkts++;
+    } else {
+        urr_acc->dl_octets += size;
+        urr_acc->dl_pkts++;
     }
 
     urr_acc->time_of_last_packet = ogs_time_now();
@@ -547,7 +547,8 @@
     if (!urr_acc->t_validity_time)
         urr_acc->t_validity_time = ogs_timer_add(ogs_app()->timer_mgr,
                                         upf_sess_urr_acc_timers_cb, urr);
-    ogs_timer_start(urr_acc->t_validity_time, urr->quota_validity_time * OGS_USEC_PER_SEC);
+    ogs_timer_start(urr_acc->t_validity_time,
+            ogs_time_from_sec(urr->quota_validity_time));
 }
 static void upf_sess_urr_acc_time_quota_setup(upf_sess_t *sess, ogs_pfcp_urr_t *urr)
 {
@@ -558,7 +559,7 @@
     if (!urr_acc->t_time_quota)
         urr_acc->t_time_quota = ogs_timer_add(ogs_app()->timer_mgr,
                                         upf_sess_urr_acc_timers_cb, urr);
-    ogs_timer_start(urr_acc->t_time_quota, urr->time_quota * OGS_USEC_PER_SEC);
+    ogs_timer_start(urr_acc->t_time_quota, ogs_time_from_sec(urr->time_quota));
 }
 static void upf_sess_urr_acc_time_threshold_setup(upf_sess_t *sess, ogs_pfcp_urr_t *urr)
 {
@@ -569,7 +570,8 @@
     if (!urr_acc->t_time_threshold)
         urr_acc->t_time_threshold = ogs_timer_add(ogs_app()->timer_mgr,
                                         upf_sess_urr_acc_timers_cb, urr);
-    ogs_timer_start(urr_acc->t_time_threshold, urr->time_threshold * OGS_USEC_PER_SEC);
+    ogs_timer_start(urr_acc->t_time_threshold,
+            ogs_time_from_sec(urr->time_threshold));
 }
 
 void upf_sess_urr_acc_timers_setup(upf_sess_t *sess, ogs_pfcp_urr_t *urr)

open5gs_2.4.10.tar.xz/src/upf/gtp-path.c -> open5gs_2.4.11.tar.xz/src/upf/gtp-path.c Changed

@@ -466,6 +466,36 @@
              */
             if (far->dst_if != OGS_PFCP_INTERFACE_ACCESS) {
 
+/*
+ * Discussion #1776 was raised,
+ * but we decided not to allow unspecified addresses
+ * because Open5GS has already sent interface identifiers
+ * in the registgration/attach process.
+ *
+ *
+ * RFC4861
+ * 4.  Message Formats
+ * 4.1.  Router Solicitation Message Format
+ * IP Fields:
+ *    Source Address
+ *                  An IP address assigned to the sending interface, or
+ *                  the unspecified address if no address is assigned
+ *                  to the sending interface.
+ *
+ * 6.1.  Message Validation
+ * 6.1.1.  Validation of Router Solicitation Messages
+ *  Hosts MUST silently discard any received Router Solicitation
+ *  Messages.
+ *
+ *  A router MUST silently discard any received Router Solicitation
+ *  messages that do not satisfy all of the following validity checks:
+ *
+ *  ..
+ *  ..
+ *
+ *  - If the IP source address is the unspecified address, there is no
+ *    source link-layer address option in the message.
+ */
                 if (IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)src_addr) &&
                     src_addr2 == sess->ipv6->addr2 &&
                     src_addr3 == sess->ipv6->addr3) {

open5gs_2.4.10.tar.xz/src/upf/pfcp-path.c -> open5gs_2.4.11.tar.xz/src/upf/pfcp-path.c Changed

open5gs_2.4.10.tar.xz/src/upf/pfcp-sm.c -> open5gs_2.4.11.tar.xz/src/upf/pfcp-sm.c Changed

@@ -170,12 +170,16 @@
 
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
-        ogs_info("PFCP associated");
+        ogs_info("PFCP associated %s:%d",
+            OGS_ADDR(&node->addr, buf),
+            OGS_PORT(&node->addr));
         ogs_timer_start(node->t_no_heartbeat,
                 ogs_app()->time.message.pfcp.no_heartbeat_duration);
         break;
     case OGS_FSM_EXIT_SIG:
-        ogs_info("PFCP de-associated");
+        ogs_info("PFCP de-associated %s:%d",
+            OGS_ADDR(&node->addr, buf),
+            OGS_PORT(&node->addr));
         ogs_timer_stop(node->t_no_heartbeat);
         break;
     case UPF_EVT_N4_MESSAGE:
@@ -199,12 +203,16 @@
                     &message->pfcp_heartbeat_response));
             break;
         case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE:
-            ogs_warn("PFCPREQ has already been associated");
+            ogs_warn("PFCPREQ has already been associated %s:%d",
+                OGS_ADDR(&node->addr, buf),
+                OGS_PORT(&node->addr));
             ogs_pfcp_up_handle_association_setup_request(node, xact,
                     &message->pfcp_association_setup_request);
             break;
         case OGS_PFCP_ASSOCIATION_SETUP_RESPONSE_TYPE:
-            ogs_warn("PFCPRSP has already been associated");
+            ogs_warn("PFCPRSP has already been associated %s:%d",
+                OGS_ADDR(&node->addr, buf),
+                OGS_PORT(&node->addr));
             ogs_pfcp_up_handle_association_setup_response(node, xact,
                     &message->pfcp_association_setup_response);
             break;

open5gs_2.4.10.tar.xz/tests/attach/reset-test.c -> open5gs_2.4.11.tar.xz/tests/attach/reset-test.c Changed

@@ -336,9 +336,6 @@
         test_uei = test_ue_add_by_suci(&mobile_identity_suci, 13);
         ogs_assert(test_uei);
 
-        /* Multiple eNB-UE-S1AP-UD */
-        test_uei->enb_ue_s1ap_id = i;
-
         test_uei->e_cgi.cell_id = 0x54f6401;
         test_uei->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
         test_uei->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
@@ -357,6 +354,11 @@
     }
 
     for (i = 0; i < NUM_OF_TEST_UE; i++) {
+        if (i > 0)
+            test_uei->enb_ue_s1ap_id = test_uei-1->enb_ue_s1ap_id;
+        else
+            test_uei->enb_ue_s1ap_id = 0;
+
         sess = test_sess_find_by_apn(
                 test_uei, "internet", OGS_GTP2_RAT_TYPE_EUTRAN);
         ogs_assert(sess);
@@ -584,6 +586,11 @@
     }
 
     for (i = 0; i < NUM_OF_TEST_UE; i++) {
+        if (i > 0)
+            test_uei->enb_ue_s1ap_id = test_uei-1->enb_ue_s1ap_id;
+        else
+            test_uei->enb_ue_s1ap_id = 0;
+
         sess = test_sess_find_by_apn(
                 test_uei, "internet", OGS_GTP2_RAT_TYPE_EUTRAN);
         ogs_assert(sess);

open5gs_2.4.10.tar.xz/tests/attach/simple-test.c -> open5gs_2.4.11.tar.xz/tests/attach/simple-test.c Changed

@@ -209,6 +209,47 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     testgtpu_recv(test_ue, recvbuf);
 
+/*
+ * Discussion #1776 was raised,
+ * but we decided not to allow unspecified addresses
+ * because Open5GS has already sent interface identifiers
+ * in the registgration/attach process.
+ *
+ *
+ * RFC4861
+ * 4.  Message Formats
+ * 4.1.  Router Solicitation Message Format
+ * IP Fields:
+ *    Source Address
+ *                  An IP address assigned to the sending interface, or
+ *                  the unspecified address if no address is assigned
+ *                  to the sending interface.
+ *
+ * 6.1.  Message Validation
+ * 6.1.1.  Validation of Router Solicitation Messages
+ *  Hosts MUST silently discard any received Router Solicitation
+ *  Messages.
+ *
+ *  A router MUST silently discard any received Router Solicitation
+ *  messages that do not satisfy all of the following validity checks:
+ *
+ *  ..
+ *  ..
+ *
+ *  - If the IP source address is the unspecified address, there is no
+ *    source link-layer address option in the message.
+ */
+#if 0
+    /* Send GTP-U Router Solicitation with an unspecified source address */
+    rv = test_gtpu_send_slacc_rs_with_unspecified_source_address(gtpu, bearer);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive GTP-U Router Solicitation */
+    recvbuf = test_gtpu_read(gtpu);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testgtpu_recv(test_ue, recvbuf);
+#endif
+
     /* Send GTP-U ICMP Packet */
     rv = test_gtpu_send_ping(gtpu, bearer, TEST_PING_IPV4);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);

open5gs_2.4.10.tar.xz/tests/common/context.h -> open5gs_2.4.11.tar.xz/tests/common/context.h Changed

open5gs_2.4.10.tar.xz/tests/common/gtpu.c -> open5gs_2.4.11.tar.xz/tests/common/gtpu.c Changed

@@ -409,6 +409,68 @@
     return test_gtpu_send(node, bearer, &gtp_hdesc, &ext_hdesc, pkbuf);
 }
 
+int test_gtpu_send_slacc_rs_with_unspecified_source_address(
+        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_pkbuf_t *pkbuf = NULL;
+    struct ip6_hdr *ip6_h = NULL;
+    uint8_t *src_addr = NULL;
+
+    const char *payload =
+        "60000000"
+        "00103afffe800000 0000000074ee25ff fee4b579ff020000 0000000000000000"
+        "000000028500da95 00000000010176ee 25e4b579";
+    unsigned char tmpOGS_MAX_SDU_LEN;
+    int payload_len = 56;
+
+    ogs_assert(bearer);
+    sess = bearer->sess;
+    ogs_assert(sess);
+
+    pkbuf = ogs_pkbuf_alloc(
+            NULL, 200 /* enough for ICMP; use smaller buffer */);
+    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);
+
+    OGS_HEX(payload, strlen(payload), tmp);
+    memcpy(pkbuf->data, tmp, payload_len);
+
+    ogs_pkbuf_trim(pkbuf, payload_len);
+
+    memset(&gtp_hdesc, 0, sizeof(gtp_hdesc));
+    memset(&ext_hdesc, 0, sizeof(ext_hdesc));
+
+    gtp_hdesc.type = OGS_GTPU_MSGTYPE_GPDU;
+    gtp_hdesc.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;
+
+    } else if (bearer->ebi) {
+        gtp_hdesc.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);
+}
+
+
 int test_gtpu_send_error_indication(
         ogs_socknode_t *node, test_bearer_t *bearer)
 {

open5gs_2.4.10.tar.xz/tests/common/gtpu.h -> open5gs_2.4.11.tar.xz/tests/common/gtpu.h Changed

open5gs_2.4.10.tar.xz/tests/registration/abts-main.c -> open5gs_2.4.11.tar.xz/tests/registration/abts-main.c Changed

open5gs_2.4.10.tar.xz/tests/registration/meson.build -> open5gs_2.4.11.tar.xz/tests/registration/meson.build Changed

open5gs_2.4.11.tar.xz/tests/registration/multi-ue-test.c Added

@@ -0,0 +1,349 @@
+/*
+ * Copyright (C) 2019,2020 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"
+
+#define NUM_OF_TEST_UE 3
+
+static void test1_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;
+
+    ogs_nas_5gs_mobile_identity_suci_t mobile_identity_suci;
+    test_ue_t *test_ueNUM_OF_TEST_UE;
+    test_sess_t *sess = NULL;
+    test_bearer_t *qos_flow = NULL;
+
+    bson_t *doc = NULL;
+
+    /* 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);
+
+    for (i = 0; i < NUM_OF_TEST_UE; i++) {
+        uint64_t imsi_index;
+
+        /* 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_NAS_5GS_NULL_SCHEME;
+        mobile_identity_suci.home_network_pki_value = 0;
+        mobile_identity_suci.scheme_output0 = 0;
+        mobile_identity_suci.scheme_output1 = 0;
+        mobile_identity_suci.scheme_output2 = 0x20;
+        mobile_identity_suci.scheme_output3 = 0x31;
+        mobile_identity_suci.scheme_output4 = 0x90;
+
+        imsi_index = i + 1;
+        ogs_uint64_to_buffer(imsi_index, 5, mobile_identity_suci.scheme_output);
+
+        test_uei = test_ue_add_by_suci(&mobile_identity_suci, 13);
+        ogs_assert(test_uei);
+
+        test_uei->nr_cgi.cell_id = 0x40001;
+
+        test_uei->nas.registration.tsc = 0;
+        test_uei->nas.registration.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
+        test_uei->nas.registration.follow_on_request = 1;
+        test_uei->nas.registration.value = OGS_NAS_5GS_REGISTRATION_TYPE_INITIAL;
+
+        test_uei->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
+        test_uei->opc_string = "e8ed289deba952e4283b54e88e6183ca";
+    }
+
+    for (i = 0; i < NUM_OF_TEST_UE; i++) {
+        if (i > 0)
+            test_uei->ran_ue_ngap_id = test_uei-1->ran_ue_ngap_id;
+        else
+            test_uei->ran_ue_ngap_id = 0;
+
+        /* Send PDU session establishment request */
+        sess = test_sess_add_by_dnn_and_psi(test_uei, "internet", 5);
+        ogs_assert(sess);
+
+        /********** Insert Subscriber in Database */
+        doc = test_db_new_simple(test_uei);
+        ABTS_PTR_NOTNULL(tc, doc);
+        ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_uei, doc));
+
+        /* Send Registration request */
+        test_uei->registration_request_param.guti = 1;
+        gmmbuf = testgmm_build_registration_request(test_uei, NULL, false, false);
+        ABTS_PTR_NOTNULL(tc, gmmbuf);
+
+        test_uei->registration_request_param.gmm_capability = 1;
+        test_uei->registration_request_param.s1_ue_network_capability = 1;
+        test_uei->registration_request_param.requested_nssai = 1;
+        test_uei->registration_request_param.last_visited_registered_tai = 1;
+        test_uei->registration_request_param.ue_usage_setting = 1;
+        nasbuf = testgmm_build_registration_request(test_uei, NULL, false, false);
+        ABTS_PTR_NOTNULL(tc, nasbuf);
+
+        sendbuf = testngap_build_initial_ue_message(test_uei, 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_uei, recvbuf);
+
+        /* Send Identity response */
+        gmmbuf = testgmm_build_identity_response(test_uei);
+        ABTS_PTR_NOTNULL(tc, gmmbuf);
+        sendbuf = testngap_build_uplink_nas_transport(test_uei, 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_uei, recvbuf);
+
+        /* Send Authentication response */
+        gmmbuf = testgmm_build_authentication_response(test_uei);
+        ABTS_PTR_NOTNULL(tc, gmmbuf);
+        sendbuf = testngap_build_uplink_nas_transport(test_uei, 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_uei, recvbuf);
+
+        /* Send Security mode complete */
+        gmmbuf = testgmm_build_security_mode_complete(test_uei, nasbuf);
+        ABTS_PTR_NOTNULL(tc, gmmbuf);
+        sendbuf = testngap_build_uplink_nas_transport(test_uei, 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_uei, recvbuf);
+        ABTS_INT_EQUAL(tc,
+                NGAP_ProcedureCode_id_InitialContextSetup,
+                test_uei->ngap_procedure_code);
+
+        /* Send UERadioCapabilityInfoIndication */
+        sendbuf = testngap_build_ue_radio_capability_info_indication(test_uei);
+        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_uei, 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_uei);
+        ABTS_PTR_NOTNULL(tc, gmmbuf);
+        sendbuf = testngap_build_uplink_nas_transport(test_uei, 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_uei, recvbuf);
+
+        sess->ul_nas_transport_param.request_type =
+            OGS_NAS_5GS_REQUEST_TYPE_INITIAL;
+        sess->ul_nas_transport_param.dnn = 1;
+        sess->ul_nas_transport_param.s_nssai = 0;
+
+        sess->pdu_session_establishment_param.ssc_mode = 1;
+        sess->pdu_session_establishment_param.epco = 1;
+
+        gsmbuf = testgsm_build_pdu_session_establishment_request(sess);
+        ABTS_PTR_NOTNULL(tc, gsmbuf);
+        gmmbuf = testgmm_build_ul_nas_transport(sess,
+                OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, gsmbuf);
+        ABTS_PTR_NOTNULL(tc, gmmbuf);
+        sendbuf = testngap_build_uplink_nas_transport(test_uei, 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_uei, recvbuf);
+        ABTS_INT_EQUAL(tc,
+                NGAP_ProcedureCode_id_PDUSessionResourceSetup,
+                test_uei->ngap_procedure_code);
+
+        /* Send PDUSessionResourceSetupResponse */
+        sendbuf = testngap_sess_build_pdu_session_resource_setup_response(sess);
+        ABTS_PTR_NOTNULL(tc, sendbuf);
+        rv = testgnb_ngap_send(ngap, sendbuf);
+        ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    }
+
+    for (i = 0; i < NUM_OF_TEST_UE; i++) {
+        /* Send PDU session establishment request */
+        sess = test_sess_find_by_psi(test_uei, 5);
+        ogs_assert(sess);
+
+        /* Send PDU Session release request */
+        sess->ul_nas_transport_param.request_type = 0;
+        sess->ul_nas_transport_param.dnn = 0;
+        sess->ul_nas_transport_param.s_nssai = 0;
+
+        sess->pdu_session_establishment_param.ssc_mode = 0;
+        sess->pdu_session_establishment_param.epco = 0;
+
+        gsmbuf = testgsm_build_pdu_session_release_request(sess);
+        ABTS_PTR_NOTNULL(tc, gsmbuf);
+        gmmbuf = testgmm_build_ul_nas_transport(sess,
+                OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, gsmbuf);
+        ABTS_PTR_NOTNULL(tc, gmmbuf);
+        sendbuf = testngap_build_uplink_nas_transport(test_uei, gmmbuf);
+        ABTS_PTR_NOTNULL(tc, sendbuf);
+        rv = testgnb_ngap_send(ngap, sendbuf);
+        ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+        /* Receive PDUSessionResourceReleaseCommand +
+         * DL NAS transport +
+         * PDU session release command */
+        recvbuf = testgnb_ngap_read(ngap);
+        ABTS_PTR_NOTNULL(tc, recvbuf);
+        testngap_recv(test_uei, recvbuf);
+        ABTS_INT_EQUAL(tc,
+                NGAP_ProcedureCode_id_PDUSessionResourceRelease,
+                test_uei->ngap_procedure_code);
+
+        /* Send PDUSessionResourceReleaseResponse */
+        sendbuf = testngap_build_pdu_session_resource_release_response(sess);
+        ABTS_PTR_NOTNULL(tc, sendbuf);
+        rv = testgnb_ngap_send(ngap, sendbuf);
+        ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+        /* Send UplinkNASTransport +
+         * UL NAS trasnport +
+         * PDU session resource release complete */
+        sess->ul_nas_transport_param.request_type = 0;
+        sess->ul_nas_transport_param.dnn = 0;
+        sess->ul_nas_transport_param.s_nssai = 0;
+
+        sess->pdu_session_establishment_param.ssc_mode = 0;
+        sess->pdu_session_establishment_param.epco = 0;
+
+        gsmbuf = testgsm_build_pdu_session_release_complete(sess);
+        ABTS_PTR_NOTNULL(tc, gsmbuf);
+        gmmbuf = testgmm_build_ul_nas_transport(sess,
+                OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, gsmbuf);
+        ABTS_PTR_NOTNULL(tc, gmmbuf);
+        sendbuf = testngap_build_uplink_nas_transport(test_uei, gmmbuf);
+        ABTS_PTR_NOTNULL(tc, sendbuf);
+        rv = testgnb_ngap_send(ngap, sendbuf);
+        ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    }
+
+    for (i = 0; i < NUM_OF_TEST_UE; i++) {
+        /* Send De-registration request */
+        gmmbuf = testgmm_build_de_registration_request(test_uei, 1, true, true);
+        ABTS_PTR_NOTNULL(tc, gmmbuf);
+        sendbuf = testngap_build_uplink_nas_transport(test_uei, gmmbuf);
+        ABTS_PTR_NOTNULL(tc, sendbuf);
+        rv = testgnb_ngap_send(ngap, sendbuf);
+        ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+        /* Receive UEContextReleaseCommand */
+        recvbuf = testgnb_ngap_read(ngap);
+        ABTS_PTR_NOTNULL(tc, recvbuf);
+        testngap_recv(test_uei, recvbuf);
+        ABTS_INT_EQUAL(tc,
+                NGAP_ProcedureCode_id_UEContextRelease,
+                test_uei->ngap_procedure_code);
+
+        /* Send UEContextReleaseComplete */
+        sendbuf = testngap_build_ue_context_release_complete(test_uei);
+        ABTS_PTR_NOTNULL(tc, sendbuf);
+        rv = testgnb_ngap_send(ngap, sendbuf);
+        ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    }
+
+    ogs_msleep(300);
+
+    for (i = 0; i < NUM_OF_TEST_UE; i++) {
+        /********** Remove Subscriber in Database */
+        ABTS_INT_EQUAL(tc, OGS_OK, test_db_remove_ue(test_uei));
+    }
+
+    /* gNB disonncect from UPF */
+    testgnb_gtpu_close(gtpu);
+
+    /* gNB disonncect from AMF */
+    testgnb_ngap_close(ngap);
+
+    /* Clear Test UE Context */
+    test_ue_remove_all();
+}
+
+abts_suite *test_multi_ue(abts_suite *suite)
+{
+    suite = ADD_SUITE(suite)
+
+    abts_run_test(suite, test1_func, NULL);
+
+    return suite;
+}

open5gs_2.4.10.tar.xz/webui/package-lock.json -> open5gs_2.4.11.tar.xz/webui/package-lock.json Changed

open5gs_2.4.10.tar.xz/webui/package.json -> open5gs_2.4.11.tar.xz/webui/package.json Changed

open5gs_2.4.10.tar.xz/webui/server/models/subscriber.js -> open5gs_2.4.11.tar.xz/webui/server/models/subscriber.js Changed

open5gs_2.4.10.tar.xz/webui/src/components/Profile/View.js -> open5gs_2.4.11.tar.xz/webui/src/components/Profile/View.js Changed

@@ -99,6 +99,12 @@
     margin: 12px;
     font-size: 16px;
   }
+  .sectionbody {
+    display: flex;
+  }
+  .sectioncolumn {
+    flex: 1;
+  }
   .body {
     display: flex;
     flex-direction: row;
@@ -194,94 +200,100 @@
               <div className="header">
                 Profile Configuration
               </div>
-              {(msisdn_list.length !== 0 || (imeisv && imeisv.length !== 0)) &&
-                <div className="body">
-                  <div className="left">
-                    <PhoneIcon/>
-                  </div>
-                  <div className="right">
-                    {msisdn_list.map((msisdn, index) =>
-                      <div key={index} className="data">
-                        {msisdn}
-                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>MSISDN</span>
+              <div className="sectionbody">
+                <div className="sectioncolumn">
+                  {(msisdn_list.length !== 0 || (imeisv && imeisv.length !== 0)) &&
+                    <div className="body">
+                      <div className="left">
+                        <PhoneIcon/>
                       </div>
-                    )}
-                    {imeisv && imeisv.length !== 0 &&
-                      <div className="data">
-                        {imeisv}
-                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>IMEISV</span>
+                      <div className="right">
+                        {msisdn_list.map((msisdn, index) =>
+                          <div key={index} className="data">
+                            {msisdn}
+                            <span style={{color:oc.gray5}}><KeyboardControlIcon/>MSISDN</span>
+                          </div>
+                        )}
+                        {imeisv && imeisv.length !== 0 &&
+                          <div className="data">
+                            {imeisv}
+                            <span style={{color:oc.gray5}}><KeyboardControlIcon/>IMEISV</span>
+                          </div>
+                        }
                       </div>
-                    }
-                  </div>
-                </div>
-              }
-              <div className="body">
-                <div className="left">
-                  <SecurityIcon/>
-                </div>
-                <div className="right">
-                  <div className="data">
-                    {security.k}
-                    <span style={{color:oc.gray5}}><KeyboardControlIcon/>K</span>
-                  </div>
-                  {security.opc &&
-                    <div className="data">
-                      {security.opc}
-                      <span style={{color:oc.gray5}}><KeyboardControlIcon/>OPc</span>
                     </div>
                   }
-                  {security.op &&
-                    <div className="data">
-                      {security.op}
-                      <span style={{color:oc.gray5}}><KeyboardControlIcon/>OP</span>
+                  <div className="body">
+                    <div className="left">
+                      <SecurityIcon/>
                     </div>
-                  }
-                  <div className="data">
-                    {security.amf}
-                    <span style={{color:oc.gray5}}><KeyboardControlIcon/>AMF</span>
-                  </div>
-                  {security.sqn &&
-                    <div className="data">
-                      {security.sqn}
-                      <span style={{color:oc.gray5}}><KeyboardControlIcon/>SQN</span>
+                    <div className="right">
+                      <div className="data">
+                        {security.k}
+                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>K</span>
+                      </div>
+                      {security.opc &&
+                        <div className="data">
+                          {security.opc}
+                          <span style={{color:oc.gray5}}><KeyboardControlIcon/>OPc</span>
+                        </div>
+                      }
+                      {security.op &&
+                        <div className="data">
+                          {security.op}
+                          <span style={{color:oc.gray5}}><KeyboardControlIcon/>OP</span>
+                        </div>
+                      }
+                      <div className="data">
+                        {security.amf}
+                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>AMF</span>
+                      </div>
+                      {security.sqn &&
+                        <div className="data">
+                          {security.sqn}
+                          <span style={{color:oc.gray5}}><KeyboardControlIcon/>SQN</span>
+                        </div>
+                      }
                     </div>
-                  }
-                </div>
-              </div>
-              <div className="body">
-                <div className="left">
-                  <PdnIcon/>
-                </div>
-                <div className="right">
-                  <div className="data">
-                    {ambr'downlink' === undefined ? "unlimited" :
-                      ambr.downlink'value' === undefined ? "unlimited" :
-                        ambr.downlink.value
-                    } {ambr'downlink' === undefined ? "unlimited" :
-                         ambr.downlink'value' === undefined ? "" :
-                         ambr.downlink'unit' === undefined ? "bps" :
-                            ambr.downlink.unit === 0 ? "bps" :
-                            ambr.downlink.unit === 1 ? "Kbps" :
-                            ambr.downlink.unit === 2 ? "Mbps" :
-                            ambr.downlink.unit === 3 ? "Gbps" :
-                            ambr.downlink.unit === 4 ? "Tbps" :
-                              "Unknown Unit" }
-                    <span style={{color:oc.gray5}}><KeyboardControlIcon/>UL</span>
                   </div>
-                  <div className="data">
-                    {ambr'uplink' === undefined ? "unlimited" :
-                      ambr.uplink'value' === undefined ? "unlimited" :
-                        ambr.uplink.value
-                    } {ambr'uplink' === undefined ? "unlimited" :
-                         ambr.uplink'value' === undefined ? "" :
-                         ambr.uplink'unit' === undefined ? "bps" :
-                            ambr.uplink.unit === 0 ? "bps" :
-                            ambr.uplink.unit === 1 ? "Kbps" :
-                            ambr.uplink.unit === 2 ? "Mbps" :
-                            ambr.uplink.unit === 3 ? "Gbps" :
-                            ambr.uplink.unit === 4 ? "Tbps" :
-                              "Unknown Unit" }
-                    <span style={{color:oc.gray5}}><KeyboardControlIcon/>DL</span>
+                </div>
+                <div className="sectioncolumn">
+                  <div className="body">
+                    <div className="left">
+                      <PdnIcon/>
+                    </div>
+                    <div className="right">
+                      <div className="data">
+                        {ambr'downlink' === undefined ? "unlimited" :
+                          ambr.downlink'value' === undefined ? "unlimited" :
+                            ambr.downlink.value
+                        } {ambr'downlink' === undefined ? "unlimited" :
+                             ambr.downlink'value' === undefined ? "" :
+                             ambr.downlink'unit' === undefined ? "bps" :
+                                ambr.downlink.unit === 0 ? "bps" :
+                                ambr.downlink.unit === 1 ? "Kbps" :
+                                ambr.downlink.unit === 2 ? "Mbps" :
+                                ambr.downlink.unit === 3 ? "Gbps" :
+                                ambr.downlink.unit === 4 ? "Tbps" :
+                                  "Unknown Unit" }
+                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>UL</span>
+                      </div>
+                      <div className="data">
+                        {ambr'uplink' === undefined ? "unlimited" :
+                          ambr.uplink'value' === undefined ? "unlimited" :
+                            ambr.uplink.value
+                        } {ambr'uplink' === undefined ? "unlimited" :
+                             ambr.uplink'value' === undefined ? "" :
+                             ambr.uplink'unit' === undefined ? "bps" :
+                                ambr.uplink.unit === 0 ? "bps" :
+                                ambr.uplink.unit === 1 ? "Kbps" :
+                                ambr.uplink.unit === 2 ? "Mbps" :
+                                ambr.uplink.unit === 3 ? "Gbps" :
+                                ambr.uplink.unit === 4 ? "Tbps" :
+                                  "Unknown Unit" }
+                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>DL</span>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </div>

open5gs_2.4.10.tar.xz/webui/src/components/Subscriber/View.js -> open5gs_2.4.11.tar.xz/webui/src/components/Subscriber/View.js Changed

@@ -10,6 +10,7 @@
 
 import PhoneIcon from 'react-icons/lib/md/phone';
 import SecurityIcon from 'react-icons/lib/md/security';
+import MmeIcon from 'react-icons/lib/md/router';
 import PdnIcon from 'react-icons/lib/md/cast';
 import KeyboardControlIcon from 'react-icons/lib/md/keyboard-control';
 
@@ -99,6 +100,12 @@
     margin: 12px;
     font-size: 16px;
   }
+  .sectionbody {
+    display: flex;
+  }
+  .sectioncolumn {
+    flex: 1;
+  }
   .body {
     display: flex;
     flex-direction: row;
@@ -163,6 +170,9 @@
   const imsi = (subscriber || {}).imsi;
   const msisdn_list = ((subscriber || {}).msisdn || );
   const imeisv = (subscriber || {}).imeisv;
+  const mme_host = (subscriber || {}).mme_host;
+  const mme_realm = (subscriber || {}).mme_realm;
+  const purge_flag = (subscriber || {}).purge_flag;
   const security = ((subscriber || {}).security || {});
   const ambr = ((subscriber || {}).ambr || {});
   const slice_list = ((subscriber || {}).slice || );
@@ -193,94 +203,123 @@
               <div className="header">
                 Subscriber Configuration
               </div>
-              {(msisdn_list.length !== 0 || (imeisv && imeisv.length !== 0)) &&
-                <div className="body">
-                  <div className="left">
-                    <PhoneIcon/>
-                  </div>
-                  <div className="right">
-                    {msisdn_list.map((msisdn, index) =>
-                      <div key={index} className="data">
-                        {msisdn}
-                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>MSISDN</span>
+              <div className="sectionbody">
+                <div className="sectioncolumn">
+                  {(msisdn_list.length !== 0 || (imeisv && imeisv.length !== 0)) &&
+                    <div className="body">
+                      <div className="left">
+                        <PhoneIcon/>
                       </div>
-                    )}
-                    {imeisv && imeisv.length !== 0 &&
+                      <div className="right">
+                        {msisdn_list.map((msisdn, index) =>
+                          <div key={index} className="data">
+                            {msisdn}
+                            <span style={{color:oc.gray5}}><KeyboardControlIcon/>MSISDN</span>
+                          </div>
+                        )}
+                        {imeisv && imeisv.length !== 0 &&
+                          <div className="data">
+                            {imeisv}
+                            <span style={{color:oc.gray5}}><KeyboardControlIcon/>IMEISV</span>
+                          </div>
+                        }
+                      </div>
+                    </div>
+                  }
+                  <div className="body">
+                    <div className="left">
+                      <SecurityIcon/>
+                    </div>
+                    <div className="right">
+                      <div className="data">
+                        {security.k}
+                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>K</span>
+                      </div>
+                      {security.opc &&
+                        <div className="data">
+                          {security.opc}
+                          <span style={{color:oc.gray5}}><KeyboardControlIcon/>OPc</span>
+                        </div>
+                      }
+                      {security.op &&
+                        <div className="data">
+                          {security.op}
+                          <span style={{color:oc.gray5}}><KeyboardControlIcon/>OP</span>
+                        </div>
+                      }
                       <div className="data">
-                        {imeisv}
-                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>IMEISV</span>
+                        {security.amf}
+                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>AMF</span>
                       </div>
-                    }
+                      {security.sqn &&
+                        <div className="data">
+                          {security.sqn}
+                          <span style={{color:oc.gray5}}><KeyboardControlIcon/>SQN</span>
+                        </div>
+                      }
+                    </div>
                   </div>
                 </div>
-              }
-              <div className="body">
-                <div className="left">
-                  <SecurityIcon/>
-                </div>
-                <div className="right">
-                  <div className="data">
-                    {security.k}
-                    <span style={{color:oc.gray5}}><KeyboardControlIcon/>K</span>
-                  </div>
-                  {security.opc &&
-                    <div className="data">
-                      {security.opc}
-                      <span style={{color:oc.gray5}}><KeyboardControlIcon/>OPc</span>
+                <div className="sectioncolumn">
+                  {mme_host && mme_host.length !== 0 &&
+                    <div className="body">
+                      <div className="left">
+                        <MmeIcon/>
+                      </div>
+                      <div className="right">
+                        <div className="data">
+                          {mme_host}
+                          <span style={{color:oc.gray5}}><KeyboardControlIcon/>MME Hostname</span>
+                        </div>
+                        {mme_realm &&
+                          <div className="data">
+                            {mme_realm}
+                            <span style={{color:oc.gray5}}><KeyboardControlIcon/>MME Realm</span>
+                          </div>
+                        }
+                        <div className="data">
+                          {purge_flag === true ? ( "Purged" ) : ( "Not Purged" )}
+                          <span style={{color:oc.gray5}}><KeyboardControlIcon/>UE is Purged at MME</span>
+                        </div>
+                      </div>
                     </div>
                   }
-                  {security.op &&
-                    <div className="data">
-                      {security.op}
-                      <span style={{color:oc.gray5}}><KeyboardControlIcon/>OP</span>
+                  <div className="body">
+                    <div className="left">
+                      <PdnIcon/>
                     </div>
-                  }
-                  <div className="data">
-                    {security.amf}
-                    <span style={{color:oc.gray5}}><KeyboardControlIcon/>AMF</span>
-                  </div>
-                  {security.sqn &&
-                    <div className="data">
-                      {security.sqn}
-                      <span style={{color:oc.gray5}}><KeyboardControlIcon/>SQN</span>
+                    <div className="right">
+                      <div className="data">
+                        {ambr'downlink' === undefined ? "unlimited" :
+                          ambr.downlink'value' === undefined ? "unlimited" :
+                            ambr.downlink.value
+                        } {ambr'downlink' === undefined ? "unlimited" :
+                            ambr.downlink'value' === undefined ? "" :
+                            ambr.downlink'unit' === undefined ? "bps" :
+                                ambr.downlink.unit === 0 ? "bps" :
+                                ambr.downlink.unit === 1 ? "Kbps" :
+                                ambr.downlink.unit === 2 ? "Mbps" :
+                                ambr.downlink.unit === 3 ? "Gbps" :
+                                ambr.downlink.unit === 4 ? "Tbps" :
+                                  "Unknown Unit" }
+                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>DL</span>
+                      </div>
+                      <div className="data">
+                        {ambr'uplink' === undefined ? "unlimited" :
+                          ambr.uplink'value' === undefined ? "unlimited" :
+                            ambr.uplink.value
+                        } {ambr'uplink' === undefined ? "unlimited" :
+                            ambr.uplink'value' === undefined ? "" :
+                            ambr.uplink'unit' === undefined ? "bps" :
+                                ambr.uplink.unit === 0 ? "bps" :
+                                ambr.uplink.unit === 1 ? "Kbps" :
+                                ambr.uplink.unit === 2 ? "Mbps" :
+                                ambr.uplink.unit === 3 ? "Gbps" :
+                                ambr.uplink.unit === 4 ? "Tbps" :
+                                  "Unknown Unit" }
+                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>UL</span>
+                      </div>
                     </div>
-                  }
-                </div>
-              </div>
-              <div className="body">
-                <div className="left">
-                  <PdnIcon/>
-                </div>
-                <div className="right">
-                  <div className="data">
-                    {ambr'downlink' === undefined ? "unlimited" :
-                      ambr.downlink'value' === undefined ? "unlimited" :
-                        ambr.downlink.value
-                    } {ambr'downlink' === undefined ? "unlimited" :
-                         ambr.downlink'value' === undefined ? "" :
-                         ambr.downlink'unit' === undefined ? "bps" :
-                            ambr.downlink.unit === 0 ? "bps" :
-                            ambr.downlink.unit === 1 ? "Kbps" :
-                            ambr.downlink.unit === 2 ? "Mbps" :
-                            ambr.downlink.unit === 3 ? "Gbps" :
-                            ambr.downlink.unit === 4 ? "Tbps" :
-                              "Unknown Unit" }
-                    <span style={{color:oc.gray5}}><KeyboardControlIcon/>DL</span>
-                  </div>
-                  <div className="data">
-                    {ambr'uplink' === undefined ? "unlimited" :
-                      ambr.uplink'value' === undefined ? "unlimited" :
-                        ambr.uplink.value
-                    } {ambr'uplink' === undefined ? "unlimited" :
-                         ambr.uplink'value' === undefined ? "" :
-                         ambr.uplink'unit' === undefined ? "bps" :
-                            ambr.uplink.unit === 0 ? "bps" :
-                            ambr.uplink.unit === 1 ? "Kbps" :
-                            ambr.uplink.unit === 2 ? "Mbps" :
-                            ambr.uplink.unit === 3 ? "Gbps" :
-                            ambr.uplink.unit === 4 ? "Tbps" :
-                              "Unknown Unit" }
-                    <span style={{color:oc.gray5}}><KeyboardControlIcon/>UL</span>
                   </div>
                 </div>
               </div>

open5gs_2.4.10.tar.xz/webui/static/favicon.ico -> open5gs_2.4.11.tar.xz/webui/static/favicon.ico Changed

Changes of Revision 4