Rollback ogs-app timer

Change S1AP bind address for external eNB.

.clang-tidy

@@ -0,0 +1,69 @@
+---
+Checks: '*,
+  -altera-id-dependent-backward-branch,
+  -altera-struct-pack-align,
+  -altera-unroll-loops,
+  -android-cloexec-*,
+  -bugprone-branch-clone,
+  -bugprone-easily-swappable-parameters,
+  -bugprone-macro-parentheses,
+  -bugprone-reserved-identifier,
+  -bugprone-sizeof-expression,
+  -cert-dcl37-c,
+  -cert-dcl51-cpp,
+  -cert-err33-c,
+  -cert-err34-c,
+  -clang-analyzer-optin.performance.Padding,
+  -clang-analyzer-security.insecureAPI.bcmp,
+  -clang-analyzer-security.insecureAPI.bcopy,
+  -clang-analyzer-security.insecureAPI.bzero,
+  -clang-diagnostic-error,
+  -clang-diagnostic-typedef-redefinition,
+  -clang-diagnostic-unknown-warning-option,
+  -concurrency-mt-unsafe,
+  -cppcoreguidelines-avoid-magic-numbers,
+  -cppcoreguidelines-avoid-non-const-global-variables,
+  -cppcoreguidelines-init-variables,
+  -google-readability-braces-around-statements,
+  -google-readability-casting,
+  -google-readability-function-size,
+  -google-readability-todo,
+  -hicpp-braces-around-statements,
+  -hicpp-function-size,
+  -hicpp-multiway-paths-covered,
+  -llvm-else-after-return,
+  -llvm-header-guard,
+  -llvm-include-order,
+  -llvmlibc-restrict-system-libc-headers,
+  -misc-no-recursion,
+  -misc-unused-parameters,
+  -performance-no-int-to-ptr,
+  -readability-avoid-const-params-in-decls,
+  -readability-braces-around-statements,
+  -readability-duplicate-include,
+  -readability-else-after-return,
+  -readability-function-cognitive-complexity,
+  -readability-function-size,
+  -readability-identifier-length,
+  -readability-isolate-declaration,
+  -readability-magic-numbers,
+  -readability-non-const-parameter,
+  -readability-redundant-control-flow,
+  -readability-redundant-declaration,
+  -readability-suspicious-call-argument,
+
+
+  -bugprone-implicit-widening-of-multiplication-result,
+  -bugprone-narrowing-conversions,
+  -cert-exp42-c,
+  -cert-flp37-c,
+  -clang-analyzer-core.NullDereference,
+  -clang-analyzer-deadcode.DeadStores,
+  -clang-analyzer-security.insecureAPI.strcpy,
+  -cppcoreguidelines-interfaces-global-init,
+  -cppcoreguidelines-narrowing-conversions,
+  -hicpp-signed-bitwise,
+  '
+
+WarningsAsErrors: false
+HeaderFilterRegex: '(.*\.h)'

.dockerignore

@@ -0,0 +1,10 @@
+**/*.md
+**/docker-compose*.yml
+**/docker-compose*.yaml
+**/Dockerfile*
+.git
+.dockerignore
+.cache
+.gitignore
+.github
+build

.github/workflows/meson-ci.yml

@@ -0,0 +1,78 @@
+name: Meson Continuous Integration
+on: [push, pull_request]
+
+jobs:
+  macos-latest:
+    name: Build and Test on MacOS Latest
+    runs-on: macos-latest
+    steps:
+#    - name: Install MongoDB with Package Manager
+#      run: |
+#          brew tap mongodb/brew
+#          brew install mongodb-community
+#          brew services start mongodb-community
+    - name: Create the TUN device with the interface name `ogstun`.
+      run: |
+          sudo ifconfig lo0 alias 127.0.0.2 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.3 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.4 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.5 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.5 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.6 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.7 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.8 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.9 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.10 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.11 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.12 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.13 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.14 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.15 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.16 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.17 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.18 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.19 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.0.20 netmask 255.255.255.255
+          sudo ifconfig lo0 alias 127.0.1.10 netmask 255.255.255.255
+    - name: Install the dependencies for building the source code.
+      run: brew install mongo-c-driver libidn libmicrohttpd nghttp2 bison libusrsctp libtins talloc meson
+    - name: Check out repository code
+      uses: actions/checkout@main
+    - name: Setup Meson Build
+      run: PATH="/usr/local/opt/bison/bin:$PATH" meson setup build
+      env:
+        CC: gcc
+    - name : Build Open5GS
+      run: ninja -C build
+    - name: Test Open5GS
+      run: sudo meson test -C build -v crypt unit
+
+  ubuntu-latest:
+    name: Build and Test on Ubuntu Latest
+    runs-on: ubuntu-latest
+    services:
+      mongodb:
+        image: mongo
+        ports:
+          - 27017:27017
+    steps:
+    - name: Create the TUN device with the interface name `ogstun`.
+      run: |
+          sudo ip tuntap add name ogstun mode tun
+          sudo ip addr add 10.45.0.1/16 dev ogstun
+          sudo ip addr add 2001:db8:cafe::1/48 dev ogstun
+          sudo ip link set ogstun up
+    - name: Install the dependencies for building the source code.
+      run: |
+          sudo apt update
+          sudo apt install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev libidn11-dev libmongoc-dev libbson-dev libyaml-dev libnghttp2-dev libmicrohttpd-dev libcurl4-gnutls-dev libnghttp2-dev libtins-dev libtalloc-dev meson
+    - name: Check out repository code
+      uses: actions/checkout@main
+    - name: Setup Meson Build
+      run: meson setup build
+      env:
+        CC: gcc
+    - name : Build Open5GS
+      run: ninja -C build
+    - name: Test Open5GS
+      run: meson test -C build -v

.gitignore

@@ -1,5 +1,7 @@
 # This directory is fetched during first build and is present in this directory
 subprojects/freeDiameter
+subprojects/libtins
+subprojects/prometheus-client-c
 subprojects/usrsctp
 
-webui/.next
+webui/.next

README.md

@@ -1,59 +1,18 @@
-<h2 align="center">Supporting Open5GS</h2>
+<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>
+
+## Getting Started
+
+Please follow the [documentation](https://open5gs.org/open5gs/docs/) at [open5gs.org](https://open5gs.org/)!
+
+## Sponsors
 
 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).
 
-<h3 align="center">Special Sponsor</h3>
-<table>
-  <tbody>
-    <tr>
-      <td align="center" valign="middle">
-  <a href="https://nextepc.com/" target="_blank">
-    <img width="260px" src="https://open5gs.org/assets/img/nextepc_logo.jpg">
+<p align="center">
+  <a target="_blank" href="https://open5gs.org/#sponsors">
+      <img alt="sponsors" src="https://open5gs.org/assets/img/sponsors.svg">
   </a>
-      </td>
-      <td width="20px"></td>
-      <td align="center" valign="middle">
-  <a href="https://sdr.eee.strath.ac.uk/" target="_blank">
-    <img width="260px" src="https://open5gs.org/assets/img/strath.png">
-  </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-<h3 align="center">Sponsors</h3>
-<table>
-  <tbody>
-    <tr>
-      <td align="center" valign="middle">
-        <a href="https://www.auctionsoftware.com/" target="_blank">
-          <img width="222px" src="https://open5gs.org/assets/img/asLogonew.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://www.wearetriple.com/" target="_blank">
-          <img width="222px" src="https://open5gs.org/assets/img/triple_logo.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://www.accessparks.com/" target="_blank">
-          <img width="222px" src="https://open5gs.org/assets/img/AccessParks.png">
-        </a>
-      </td>
-    </tr>
-    <tr>
-      <td align="center" valign="middle">
-        <a href="https://skylarkwireless.com/" target="_blank">
-          <img width="222px" src="https://open5gs.org/assets/img/SkylarkWireless-420x78-Web2-R.png">
-        </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-## Documentation
-
-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.
+</p>
 
 ## Community
 
@@ -68,4 +27,4 @@ If you're contributing through a pull request to Open5GS project on GitHub, plea
 ## 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/)

configs/310014.yaml.in

@@ -4,6 +4,7 @@ logger:
 
 parameter:
 #    no_nrf: true
+#    no_scp: true
 #    no_amf: true
 #    no_smf: true
 #    no_upf: true
@@ -11,18 +12,21 @@ parameter:
 #    no_udm: true
 #    no_pcf: true
 #    no_nssf: true
+#    no_bsf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true
 #    no_sgwu: true
 #    no_pcrf: true
 #    no_hss: true
+#    use_mongodb_change_stream: true
 
 mme:
     freeDiameter:
       identity: mme.localdomain
       realm: localdomain
       listen_on: 127.0.0.2
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -31,7 +35,7 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -78,7 +82,7 @@ smf:
       - addr: ::1
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
     dns:
       - 8.8.8.8
       - 8.8.4.4
@@ -89,6 +93,7 @@ smf:
       identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -97,7 +102,7 @@ smf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -145,13 +150,14 @@ upf:
       - addr: 127.0.0.7
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
 
 hss:
     freeDiameter:
       identity: hss.localdomain
       realm: localdomain
       listen_on: 127.0.0.8
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -160,7 +166,7 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -169,6 +175,7 @@ pcrf:
       identity: pcrf.localdomain
       realm: localdomain
       listen_on: 127.0.0.9
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -177,7 +184,7 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -189,6 +196,11 @@ nrf:
         - ::1
         port: 7777
 
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
 ausf:
     sbi:
       - addr: 127.0.0.11
@@ -209,11 +221,16 @@ nssf:
       - addr: 127.0.0.14
         port: 7777
     nsi:
-      - addr: ::1
+      - addr: 127.0.0.10
         port: 7777
         s_nssai:
           sst: 1
 
+bsf:
+    sbi:
+      - addr: 127.0.0.15
+        port: 7777
+
 udr:
     sbi:
       - addr: 127.0.0.20

configs/csfb.yaml.in

@@ -4,6 +4,7 @@ logger:
 
 parameter:
 #    no_nrf: true
+#    no_scp: true
 #    no_amf: true
 #    no_smf: true
 #    no_upf: true
@@ -11,18 +12,21 @@ parameter:
 #    no_udm: true
 #    no_pcf: true
 #    no_nssf: true
+#    no_bsf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true
 #    no_sgwu: true
 #    no_pcrf: true
 #    no_hss: true
+#    use_mongodb_change_stream: true
 
 mme:
     freeDiameter:
       identity: mme.localdomain
       realm: localdomain
       listen_on: 127.0.0.2
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -31,7 +35,7 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -45,12 +49,12 @@ mme:
         map:
           tai:
             plmn_id:
-              mcc: 901
+              mcc: 999
               mnc: 70
             tac: 7
           lai:
             plmn_id:
-              mcc: 901
+              mcc: 999
               mnc: 70
             lac: 2342
         map:
@@ -66,7 +70,7 @@ mme:
             lac: 51544
     gummei:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         mme_gid: 2
         mme_code: 1
@@ -77,7 +81,7 @@ mme:
         mme_code: 1
     tai:
       plmn_id:
-        mcc: 901
+        mcc: 999
         mnc: 70
       tac: 7
     tai:
@@ -112,7 +116,7 @@ smf:
       - addr: ::1
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
     dns:
       - 8.8.8.8
       - 8.8.4.4
@@ -123,6 +127,7 @@ smf:
       identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -131,7 +136,7 @@ smf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -143,19 +148,19 @@ amf:
       - addr: 127.0.0.5
     guami:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         amf_id:
           region: 2
           set: 1
     tai:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         tac: 1
     plmn_support:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         s_nssai:
           - sst: 1
@@ -179,13 +184,14 @@ upf:
       - addr: 127.0.0.7
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
 
 hss:
     freeDiameter:
       identity: hss.localdomain
       realm: localdomain
       listen_on: 127.0.0.8
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -194,7 +200,7 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -203,6 +209,7 @@ pcrf:
       identity: pcrf.localdomain
       realm: localdomain
       listen_on: 127.0.0.9
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -211,7 +218,7 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -243,11 +250,16 @@ nssf:
       - addr: 127.0.0.14
         port: 7777
     nsi:
-      - addr: ::1
+      - addr: 127.0.0.10
         port: 7777
         s_nssai:
           sst: 1
 
+bsf:
+    sbi:
+      - addr: 127.0.0.15
+        port: 7777
+
 udr:
     sbi:
       - addr: 127.0.0.20

configs/freeDiameter/hss.conf.in

@@ -175,6 +175,7 @@ TLS_CA = "@sysconfdir@/freeDiameter/cacert.pem";
 # exchanges.
 # Default: Relaying is enabled.
 #NoRelay;
+NoRelay;
 
 # Number of server threads that can handle incoming messages at the same time.
 # Default: 4

configs/freeDiameter/mme.conf.in

@@ -175,6 +175,7 @@ TLS_CA = "@sysconfdir@/freeDiameter/cacert.pem";
 # exchanges.
 # Default: Relaying is enabled.
 #NoRelay;
+NoRelay;
 
 # Number of server threads that can handle incoming messages at the same time.
 # Default: 4

configs/freeDiameter/pcrf.conf.in

@@ -175,6 +175,7 @@ TLS_CA = "@sysconfdir@/freeDiameter/cacert.pem";
 # exchanges.
 # Default: Relaying is enabled.
 #NoRelay;
+NoRelay;
 
 # Number of server threads that can handle incoming messages at the same time.
 # Default: 4

configs/freeDiameter/smf.conf.in

@@ -175,6 +175,7 @@ TLS_CA = "@sysconfdir@/freeDiameter/cacert.pem";
 # exchanges.
 # Default: Relaying is enabled.
 #NoRelay;
+NoRelay;
 
 # Number of server threads that can handle incoming messages at the same time.
 # Default: 4

configs/logrotate/open5gs.in

@@ -7,7 +7,7 @@
     create 640 open5gs open5gs
 
     postrotate
-        for i in nrfd pcrfd hssd ausfd udmd udrd upfd sgwcd sgwud smfd mmed amfd; do
+        for i in nrfd scpd pcrfd hssd ausfd udmd udrd upfd sgwcd sgwud smfd mmed amfd; do
             systemctl reload open5gs-$i
         done
     endscript

configs/meson.build

@@ -27,12 +27,6 @@ freediameter_extensions_builddir = join_paths(
 conf_data.set('freediameter_extensions_builddir',
         freediameter_extensions_builddir)
 
-if host_system == 'linux'
-    conf_data.set('loopback_devname', 'lo')
-else
-    conf_data.set('loopback_devname', 'lo0')
-endif
-
 example_conf = '''
     sample.yaml
     310014.yaml
@@ -41,7 +35,7 @@ example_conf = '''
     vonr.yaml
     slice.yaml
     srslte.yaml
-    sample.yaml
+    non3gpp.yaml
 '''.split()
 
 foreach file : example_conf

configs/newsyslog/open5gs.conf.in

@@ -2,6 +2,7 @@
 #
 # logfilename                         [owner:group] mode count size  when  flags [/pid_file]        [sig_num]
 @localstatedir@/log/open5gs/nrf.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-nrfd/pid`
+@localstatedir@/log/open5gs/scp.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-scpd/pid`
 @localstatedir@/log/open5gs/pcrf.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-pcrfd/pid`
 @localstatedir@/log/open5gs/hss.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-hssd/pid`
 @localstatedir@/log/open5gs/ausf.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-ausfd/pid`

configs/non3gpp.yaml.in

@@ -0,0 +1,235 @@
+db_uri: mongodb://localhost/open5gs
+
+logger:
+
+parameter:
+#    no_nrf: true
+#    no_scp: true
+#    no_amf: true
+#    no_smf: true
+#    no_upf: true
+#    no_ausf: true
+#    no_udm: true
+#    no_pcf: true
+#    no_nssf: true
+#    no_bsf: true
+#    no_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
+#    use_mongodb_change_stream: true
+
+mme:
+    freeDiameter:
+      identity: mme.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.2
+      no_fwd: true
+      load_extension:
+        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
+        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
+        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
+        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+      connect:
+        - identity: hss.localdomain
+          addr: 127.0.0.8
+
+    s1ap:
+      - addr: 127.0.0.2
+    gtpc:
+      - addr: 127.0.0.2
+    gummei:
+      plmn_id:
+        mcc: 999
+        mnc: 70
+      mme_gid: 2
+      mme_code: 1
+    tai:
+      plmn_id:
+        mcc: 999
+        mnc: 70
+      tac: 1
+    security:
+        integrity_order : [ EIA2, EIA1, EIA0 ]
+        ciphering_order : [ EEA0, EEA1, EEA2 ]
+
+    network_name:
+        full: Open5GS
+
+sgwc:
+    gtpc:
+      - addr: 127.0.0.3
+    pfcp:
+      - addr: 127.0.0.3
+
+smf:
+    sbi:
+      - addr: 127.0.0.4
+        port: 7777
+    pfcp:
+      - addr: 127.0.0.4
+    gtpc:
+      - addr: 127.0.0.4
+      - addr: ::1
+    gtpu:
+      - addr: 127.0.0.4
+      - addr: ::1
+    subnet:
+      - addr: 10.45.0.1/16
+      - addr: 2001:db8:cafe::1/48
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+      - 2001:4860:4860::8888
+      - 2001:4860:4860::8844
+    mtu: 1400
+    freeDiameter:
+      identity: smf.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.4
+      no_fwd: true
+      load_extension:
+        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
+        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
+        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
+        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+      connect:
+        - identity: pcrf.localdomain
+          addr: 127.0.0.9
+        - identity: aaa.localdomain
+          addr: 127.0.0.1
+amf:
+    sbi:
+      - addr: 127.0.0.5
+        port: 7777
+    ngap:
+      - addr: 127.0.0.5
+    guami:
+      - plmn_id:
+          mcc: 999
+          mnc: 70
+        amf_id:
+          region: 2
+          set: 1
+    tai:
+      - plmn_id:
+          mcc: 999
+          mnc: 70
+        tac: 1
+    plmn_support:
+      - plmn_id:
+          mcc: 999
+          mnc: 70
+        s_nssai:
+          - sst: 1
+    security:
+        integrity_order : [ NIA2, NIA1, NIA0 ]
+        ciphering_order : [ NEA0, NEA1, NEA2 ]
+    network_name:
+        full: Open5GS
+    amf_name: open5gs-amf0
+
+sgwu:
+    pfcp:
+      - addr: 127.0.0.6
+    gtpu:
+      - addr: 127.0.0.6
+
+upf:
+    pfcp:
+      - addr: 127.0.0.7
+    gtpu:
+      - addr: 127.0.0.7
+    subnet:
+      - addr: 10.45.0.1/16
+      - addr: 2001:db8:cafe::1/48
+
+hss:
+    freeDiameter:
+      identity: hss.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.8
+      no_fwd: true
+      load_extension:
+        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
+        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
+        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
+        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+      connect:
+        - identity: mme.localdomain
+          addr: 127.0.0.2
+        - identity: aaa.localdomain
+          addr: 127.0.0.1
+pcrf:
+    freeDiameter:
+      identity: pcrf.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.9
+      no_fwd: true
+      load_extension:
+        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
+        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
+        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
+        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+      connect:
+        - identity: smf.localdomain
+          addr: 127.0.0.4
+
+nrf:
+    sbi:
+      - addr:
+        - 127.0.0.10
+        - ::1
+        port: 7777
+
+ausf:
+    sbi:
+      - addr: 127.0.0.11
+        port: 7777
+
+udm:
+    sbi:
+      - addr: 127.0.0.12
+        port: 7777
+
+pcf:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777
+
+nssf:
+    sbi:
+      - addr: 127.0.0.14
+        port: 7777
+    nsi:
+      - addr: 127.0.0.10
+        port: 7777
+        s_nssai:
+          sst: 1
+bsf:
+    sbi:
+      - addr: 127.0.0.15
+        port: 7777
+
+udr:
+    sbi:
+      - addr: 127.0.0.20
+        port: 7777

configs/open5gs/amf.yaml.in

@@ -20,6 +20,7 @@
 #
 logger:
     file: @localstatedir@/log/open5gs/amf.log
+
 #
 # amf:
 #
@@ -35,7 +36,7 @@ logger:
 #          - ::0
 #        port: 7777
 #
-#  o SBI Server(https://<all address avaiable>:443)
+#  o SBI Server(https://<all address available>:443)
 #    sbi:
 #      - tls:
 #          key: amf.key
@@ -73,9 +74,77 @@ logger:
 #          - 127.0.0.99
 #          - ::1
 #
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.5
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  <NF Service>
+#
+#  o NF Service Name(Default : all NF services available)
+#    service_name:
+#
+#  o NF Service Name(Only some NF services are available)
+#    service_name:
+#      - namf-comm
+#
+#  <NF Discovery Query Parameter>
+#
+#  o (Default) If you do not set Query Parameter as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.5
+#        port: 7777
+#
+#    - 'service-names' is included.
+#
+#    sbi:
+#      - addr: 127.0.0.5
+#        port: 7777
+#    discovery:
+#      option:
+#        no_service_names: false
+#
+#  o To remove 'service-names' from URI query parameters in NS Discovery
+#         no_service_names: true
+#
+#    * For Indirect Communication with Delegated Discovery,
+#      'service-names' is always included in the URI query parameter.
+#    * That is, 'no_service_names' has no effect.
+#
+#  <For Indirect Communication with Delegated Discovery>
+#
+#  o (Default) If you do not set Delegated Discovery as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.5
+#        port: 7777
+#
+#    - Use SCP if SCP avaiable. Otherwise NRF is used.
+#      => App fails if both NRF and SCP are unavailable.
+#
+#    sbi:
+#      - addr: 127.0.0.5
+#        port: 7777
+#    discovery:
+#      delegated: auto
+#
+#  o To use SCP always => App fails if no SCP available.
+#      delegated: yes
+#
+#  o Don't use SCP server => App fails if no NRF available.
+#      delegated: no
+#
 #  <NGAP Server>>
 #
-#  o NGAP Server(all address avaiable)
+#  o NGAP Server(all address available)
 #    ngap:
 #
 #  o NGAP Server(0.0.0.0:38412)
@@ -92,16 +161,60 @@ logger:
 #      - addr: 127.0.0.5
 #        port: 38413
 #
-#  o NGAP Server(address avaiable in `eth0` interface)
+#  o NGAP Server(address available in `eth0` interface)
 #    ngap:
 #      dev: eth0
 #
+#  o NGAP Option (Default)
+#    - sctp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    ngap:
+#      addr: 127.0.0.5
+#      option:
+#        stcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  o NGAP SCTP Option (Default)
+#    - spp_hbinterval : 5000 (5secs)
+#    - spp_sackdelay : 200 (200ms)
+#    - srto_initial : 3000 (3secs)
+#    - srto_min : 1000 (1sec)
+#    - srto_max : 5000 (5secs)
+#    - sinit_num_ostreams : 30
+#    - sinit_max_instreams : 65535
+#    - sinit_max_attempts : 4
+#    - sinit_max_init_timeo : 8000(8secs)
+#
+#    ngap:
+#      addr: 127.0.0.5
+#      option:
+#        sctp:
+#          spp_hbinterval : 5000
+#          spp_sackdelay : 200
+#          srto_initial : 3000
+#          srto_min : 1000
+#          srto_max : 5000
+#          sinit_num_ostreams : 30
+#          sinit_max_instreams : 65535
+#          sinit_max_attempts : 4
+#          sinit_max_init_timeo : 8000
+#
+#  <Metrics Server>
+#
+#  o Metrics Server(http://<any address>:9090)
+#    metrics:
+#      addr: 0.0.0.0
+#      port: 9090
+#
 #  <GUAMI>
 #
 #  o Multiple GUAMI
 #    guami:
 #      - plmn_id:
-#          mcc: 901
+#          mcc: 999
 #          mnc: 70
 #        amf_id:
 #          region: 2
@@ -150,13 +263,13 @@ logger:
 #  o Multiple PLMN Support
 #    plmn_support:
 #      - plmn_id:
-#          mcc: 901
+#          mcc: 999
 #          mnc: 70
 #        s_nssai:
 #          - sst: 1
 #            sd: 010000
 #      - plmn_id:
-#          mcc: 901
+#          mcc: 999
 #          mnc: 70
 #        s_nssai:
 #          - sst: 1
@@ -169,7 +282,7 @@ logger:
 #
 #  <AMF Name>
 #
-#    amf_name: amf1.open5gs.amf.5gc.mnc70.mcc901.3gppnetwork.org
+#    amf_name: amf1.open5gs.amf.5gc.mnc70.mcc999.3gppnetwork.org
 #
 #  <Relative Capacity> - Default(255)
 #
@@ -181,21 +294,24 @@ amf:
         port: 7777
     ngap:
       - addr: 127.0.0.5
+    metrics:
+        addr: 127.0.0.5
+        port: 9090
     guami:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         amf_id:
           region: 2
           set: 1
     tai:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         tac: 1
     plmn_support:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         s_nssai:
           - sst: 1
@@ -206,6 +322,50 @@ amf:
         full: Open5GS
     amf_name: open5gs-amf0
 
+#
+# scp:
+#
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.1.10:7777)
+#    sbi:
+#      addr: 127.0.1.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.1.10
+#        tls:
+#          key: scp.key
+#          pem: scp.pem
+#      - name: scp.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fb::1]:80)
+#    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.1.10
+#        - fd69:f21d:873c:fb::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.1.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
 #
 # nrf:
 #
@@ -224,20 +384,32 @@ amf:
 #          pem: nrf.pem
 #      - name: nrf.open5gs.org
 #
-#  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
+#  o SBI Client(http://[fd69:f21d:873c:fa::1]:80)
 #    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #
 #    sbi:
 #      addr:
 #        - 127.0.0.10
-#        - fe80::1%@loopback_devname@
+#        - fd69:f21d:873c:fa::1
 #
-nrf:
-    sbi:
-      - addr:
-          - 127.0.0.10
-          - ::1
-        port: 7777
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#nrf:
+#    sbi:
+#      - addr:
+#          - 127.0.0.10
+#          - ::1
+#        port: 7777
 
 #
 # parameter:
@@ -256,57 +428,18 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
 #
 max:
 
 #
-# pool:
+# usrsctp:
+#    udp_port : 9899
 #
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:
-
-#
-# sockopt:
-#    no_delay : true
-#
-sockopt:
-
-#
-# sctp:
-#    heartbit_interval : 5000 (5secs)
-#    sack_delay : 200 (200ms)
-#    rto_initial : 3000 (3secs)
-#    rto_min : 1000 (1sec)
-#    rto_max : 5000 (5secs)
-#    max_num_of_ostreams : 30
-#    max_num_of_istreams : 65535
-#    max_attempts : 4
-#    max_initial_timeout : 8000(8secs)
-#    usrsctp_udp_port : 9899
-#
-sctp:
+usrsctp:
 
 #
 # time:

configs/open5gs/ausf.yaml.in

@@ -20,6 +20,7 @@
 #
 logger:
     file: @localstatedir@/log/open5gs/ausf.log
+
 #
 # ausf:
 #
@@ -35,7 +36,7 @@ logger:
 #          - ::0
 #        port: 7777
 #
-#  o SBI Server(https://<all address avaiable>:443)
+#  o SBI Server(https://<all address available>:443)
 #    sbi:
 #      - tls:
 #          key: ausf.key
@@ -73,11 +74,123 @@ logger:
 #          - 127.0.0.99
 #          - ::1
 #
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.11
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  <NF Service>
+#
+#  o NF Service Name(Default : all NF services available)
+#    service_name:
+#
+#  o NF Service Name(Only some NF services are available)
+#    service_name:
+#      - nausf-auth
+#
+#  <NF Discovery Query Parameter>
+#
+#  o (Default) If you do not set Query Parameter as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.11
+#        port: 7777
+#
+#    - 'service-names' is included.
+#
+#    sbi:
+#      - addr: 127.0.0.11
+#        port: 7777
+#    discovery:
+#      option:
+#        no_service_names: false
+#
+#  o To remove 'service-names' from URI query parameters in NS Discovery
+#         no_service_names: true
+#
+#    * For Indirect Communication with Delegated Discovery,
+#      'service-names' is always included in the URI query parameter.
+#    * That is, 'no_service_names' has no effect.
+#
+#  <For Indirect Communication with Delegated Discovery>
+#
+#  o (Default) If you do not set Delegated Discovery as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.11
+#        port: 7777
+#
+#    - Use SCP if SCP avaiable. Otherwise NRF is used.
+#      => App fails if both NRF and SCP are unavailable.
+#
+#    sbi:
+#      - addr: 127.0.0.11
+#        port: 7777
+#    discovery:
+#      delegated: auto
+#
+#  o To use SCP always => App fails if no SCP available.
+#      delegated: yes
+#
+#  o Don't use SCP server => App fails if no NRF available.
+#      delegated: no
+#
 ausf:
     sbi:
       - addr: 127.0.0.11
         port: 7777
 
+#
+# scp:
+#
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.1.10:7777)
+#    sbi:
+#      addr: 127.0.1.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.1.10
+#        tls:
+#          key: scp.key
+#          pem: scp.pem
+#      - name: scp.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fb::1]:80)
+#    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.1.10
+#        - fd69:f21d:873c:fb::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.1.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
 #
 # nrf:
 #
@@ -96,27 +209,36 @@ ausf:
 #          pem: nrf.pem
 #      - name: nrf.open5gs.org
 #
-#  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
+#  o SBI Client(http://[fd69:f21d:873c:fa::1]:80)
 #    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #
 #    sbi:
 #      addr:
 #        - 127.0.0.10
-#        - fe80::1%@loopback_devname@
+#        - fd69:f21d:873c:fa::1
 #
-nrf:
-    sbi:
-      - addr:
-          - 127.0.0.10
-          - ::1
-        port: 7777
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#nrf:
+#    sbi:
+#      - addr:
+#          - 127.0.0.10
+#          - ::1
+#        port: 7777
 
 #
 # parameter:
 #
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
-#
 #  o Disable use of IPv4 addresses (only IPv6)
 #      no_ipv4: true
 #
@@ -131,37 +253,13 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
 #
 max:
 
-#
-# pool:
-#
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:
-
 #
 # time:
 #

configs/open5gs/bsf.yaml.in

@@ -0,0 +1,284 @@
+db_uri: mongodb://localhost/open5gs
+
+#
+# logger:
+#
+#  o Set OGS_LOG_INFO to all domain level
+#   - If `level` is omitted, the default level is OGS_LOG_INFO)
+#   - If `domain` is omitted, the all domain level is set from 'level'
+#    (Nothing is needed)
+#
+#  o Set OGS_LOG_ERROR to all domain level
+#   - `level` can be set with none, fatal, error, warn, info, debug, trace
+#    level: error
+#
+#  o Set OGS_LOG_DEBUG to mme/emm domain level
+#    level: debug
+#    domain: mme,emm
+#
+#  o Set OGS_LOG_TRACE to all domain level
+#    level: trace
+#    domain: core,sbi,bsf,event,tlv,mem,sock
+#
+logger:
+    file: @localstatedir@/log/open5gs/bsf.log
+
+#
+# bsf:
+#
+#  <SBI Server>
+#
+#  o SBI Server(http://<all address available>:80)
+#    sbi:
+#
+#  o SBI Server(http://<any address>:80)
+#    sbi:
+#      - addr:
+#          - 0.0.0.0
+#          - ::0
+#        port: 7777
+#
+#  o SBI Server(https://<all address available>:443)
+#    sbi:
+#      - tls:
+#          key: bsf.key
+#          pem: bsf.pem
+#
+#  o SBI Server(https://127.0.0.15:443, http://[::1]:80)
+#    sbi:
+#      - addr: 127.0.0.15
+#        tls:
+#          key: bsf.key
+#          pem: bsf.pem
+#      - addr: ::1
+#
+#  o SBI Server(http://bsf.open5gs.org:80)
+#    sbi:
+#      - name: bsf.open5gs.org
+#
+#  o SBI Server(http://127.0.0.15:7777)
+#    sbi:
+#      - addr: 127.0.0.15
+#        port: 7777
+#
+#  o SBI Server(http://<eth0 IP address>:80)
+#    sbi:
+#      - dev: eth0
+#
+#  o Provide custom SBI address to be advertised to NRF
+#    sbi:
+#      - dev: eth0
+#        advertise: open5gs-bsf.svc.local
+#
+#    sbi:
+#      - addr: localhost
+#        advertise:
+#          - 127.0.0.99
+#          - ::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.15
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  <NF Service>
+#
+#  o NF Service Name(Default : all NF services available)
+#    service_name:
+#
+#  o NF Service Name(Only some NF services are available)
+#    service_name:
+#      - nbsf-management
+#
+#  <NF Discovery Query Parameter>
+#
+#  o (Default) If you do not set Query Parameter as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.15
+#        port: 7777
+#
+#    - 'service-names' is included.
+#
+#    sbi:
+#      - addr: 127.0.0.15
+#        port: 7777
+#    discovery:
+#      option:
+#        no_service_names: false
+#
+#  o To remove 'service-names' from URI query parameters in NS Discovery
+#         no_service_names: true
+#
+#    * For Indirect Communication with Delegated Discovery,
+#      'service-names' is always included in the URI query parameter.
+#    * That is, 'no_service_names' has no effect.
+#
+#  <For Indirect Communication with Delegated Discovery>
+#
+#  o (Default) If you do not set Delegated Discovery as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.15
+#        port: 7777
+#
+#    - Use SCP if SCP avaiable. Otherwise NRF is used.
+#      => App fails if both NRF and SCP are unavailable.
+#
+#    sbi:
+#      - addr: 127.0.0.15
+#        port: 7777
+#    discovery:
+#      delegated: auto
+#
+#  o To use SCP always => App fails if no SCP available.
+#      delegated: yes
+#
+#  o Don't use SCP server => App fails if no NRF available.
+#      delegated: no
+#
+bsf:
+    sbi:
+      - addr: 127.0.0.15
+        port: 7777
+
+#
+# scp:
+#
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.1.10:7777)
+#    sbi:
+#      addr: 127.0.1.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.1.10
+#        tls:
+#          key: scp.key
+#          pem: scp.pem
+#      - name: scp.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fb::1]:80)
+#    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.1.10
+#        - fd69:f21d:873c:fb::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.1.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
+#
+# nrf:
+#
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.0.10:7777)
+#    sbi:
+#      addr: 127.0.0.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.0.10
+#        tls:
+#          key: nrf.key
+#          pem: nrf.pem
+#      - name: nrf.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fa::1]:80)
+#    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.0.10
+#        - fd69:f21d:873c:fa::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#nrf:
+#    sbi:
+#      - addr:
+#          - 127.0.0.10
+#          - ::1
+#        port: 7777
+
+#
+# parameter:
+#
+#  o Disable use of IPv4 addresses (only IPv6)
+#      no_ipv4: true
+#
+#  o Disable use of IPv6 addresses (only IPv4)
+#      no_ipv6: true
+#
+#  o Prefer IPv4 instead of IPv6 for estabishing new GTP connections.
+#      prefer_ipv4: true
+#
+parameter:
+
+#
+# max:
+#
+# o Maximum Number of UE
+#    ue: 1024
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
+#
+max:
+
+#
+# time:
+#
+#  o NF Instance Heartbeat (Default : 0)
+#    NFs will not send heart-beat timer in NFProfile
+#    NRF will send heart-beat timer in NFProfile
+#
+#  o NF Instance Heartbeat (20 seconds)
+#    NFs will send heart-beat timer (20 seconds) in NFProfile
+#    NRF can change heart-beat timer in NFProfile
+#
+#    nf_instance:
+#      heartbeat: 20
+#
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
+time:

configs/open5gs/hss.yaml.in

@@ -26,12 +26,11 @@ logger:
 hss:
     freeDiameter: @sysconfdir@/freeDiameter/hss.conf
 
+#    sms_over_ims: "sip:smsc.mnc001.mcc001.3gppnetwork.org:7060;transport=tcp"
+
 #
 # parameter:
 #
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
-#
 #  o Disable use of IPv4 addresses (only IPv6)
 #      no_ipv4: true
 #
@@ -42,37 +41,14 @@ hss:
 #      prefer_ipv4: true
 #
 parameter:
+#    use_mongodb_change_stream: true
 
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
 #
 max:
-
-#
-# pool:
-#
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:

configs/open5gs/meson.build

@@ -29,11 +29,13 @@ open5gs_conf = '''
     hss.yaml
     pcrf.yaml
     nrf.yaml
+    scp.yaml
     ausf.yaml
     udm.yaml
     udr.yaml
     pcf.yaml
     nssf.yaml
+    bsf.yaml
 '''.split()
 
 foreach file : open5gs_conf

configs/open5gs/mme.yaml.in

@@ -26,7 +26,7 @@ logger:
 #
 #  <S1AP Server>>
 #
-#  o S1AP Server(all address avaiable)
+#  o S1AP Server(all address available)
 #    s1ap:
 #
 #  o S1AP Server(0.0.0.0:36412)
@@ -43,13 +43,50 @@ logger:
 #      - addr: 127.0.0.2
 #        port: 36413
 #
-#  o S1AP Server(address avaiable in `eth0` interface)
+#  o S1AP Server(address available in `eth0` interface)
 #    s1ap:
 #      dev: eth0
 #
+#  o S1AP Option (Default)
+#    - sctp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    s1ap:
+#      addr: 127.0.0.2
+#      option:
+#        stcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  o S1AP SCTP Option (Default)
+#    - spp_hbinterval : 5000 (5secs)
+#    - spp_sackdelay : 200 (200ms)
+#    - srto_initial : 3000 (3secs)
+#    - srto_min : 1000 (1sec)
+#    - srto_max : 5000 (5secs)
+#    - sinit_num_ostreams : 30
+#    - sinit_max_instreams : 65535
+#    - sinit_max_attempts : 4
+#    - sinit_max_init_timeo : 8000(8secs)
+#
+#    s1ap:
+#      addr: 127.0.0.2
+#      option:
+#        sctp:
+#          spp_hbinterval : 5000
+#          spp_sackdelay : 200
+#          srto_initial : 3000
+#          srto_min : 1000
+#          srto_max : 5000
+#          sinit_num_ostreams : 30
+#          sinit_max_instreams : 65535
+#          sinit_max_attempts : 4
+#          sinit_max_init_timeo : 8000
+#
 #  <GTP-C Server>>
 #
-#  o GTP-C Server(all address avaiable)
+#  o GTP-C Server(all address available)
 #    gtpc:
 #
 #  o GTP-C Server(127.0.0.2:2123, [::1]:2123)
@@ -113,7 +150,7 @@ logger:
 #            lac: 43692
 #      - addr
 #         - 127.0.0.4
-#         - fe80::2%@loopback_devname@
+#         - fd69:f21d:873c:fa::2
 #        map:
 #          tai:
 #            plmn_id:
@@ -138,6 +175,12 @@ logger:
 #              mnc: 02
 #            lac: 43693
 #
+#  <Metrics Server>
+#
+#  o Metrics Server(http://<any address>:9090)
+#    metrics:
+#      addr: 0.0.0.0
+#      port: 9090
 #
 #  <GUMMEI>
 #
@@ -211,15 +254,18 @@ mme:
       - addr: 127.0.0.2
     gtpc:
       - addr: 127.0.0.2
-    gummei: 
+    metrics:
+      addr: 127.0.0.2
+      port: 9090
+    gummei:
       plmn_id:
-        mcc: 901
+        mcc: 999
         mnc: 70
       mme_gid: 2
       mme_code: 1
     tai:
       plmn_id:
-        mcc: 901
+        mcc: 999
         mnc: 70
       tac: 1
     security:
@@ -237,25 +283,25 @@ mme:
 #  o Specify SGW addresses the GTP-C must connect to
 #
 #  o One SGW is defined.
-#    If prefer_ipv4 is not true, [fe80::2%@loopback_devname@] is selected.
+#    If prefer_ipv4 is not true, [fd69:f21d:873c:fa::2] is selected.
 #    gtpc:
 #      addr:
 #        - 127.0.0.3
-#        - fe80::2%@loopback_devname@
+#        - fd69:f21d:873c:fa::2
 #
 #  o Two SGW are defined. MME selects SGW with round-robin manner per UE
 #    gtpc:
 #      - addr: 127.0.0.3
-#      - addr: fe80::2%@loopback_devname@
+#      - addr: fd69:f21d:873c:fa::2
 #
 #  o Three SGW are defined. MME selects SGW with round-robin manner per UE
 #    gtpc:
 #      - addr
 #        - 127.0.0.3
-#        - fe80::2%@loopback_devname@
+#        - fd69:f21d:873c:fa::2
 #      - addr
 #        - 127.0.0.22
-#        - fe80::12%@loopback_devname@
+#        - fd69:f21d:873c:fa::12
 #      - name: sgw3.open5gs.org
 #
 # <SGW Selection Mode>
@@ -300,17 +346,17 @@ sgwc:
 #      you can use a specific SMF node for each UE.
 #
 #  o Two SMF are defined. 127.0.0.4:2123 is used.
-#    [fe80::3%@loopback_devname@]:2123 is ignored.
+#    [fd69:f21d:873c:fa::3]:2123 is ignored.
 #    gtpc:
 #      - addr: 127.0.0.4
-#      - addr: fe80::3%@loopback_devname@
+#      - addr: fd69:f21d:873c:fa::3
 #
 #  o One SMF is defined. if prefer_ipv4 is not true,
-#    [fe80::3%@loopback_devname@] is selected.
+#    [fd69:f21d:873c:fa::3] is selected.
 #    gtpc:
 #      - addr:
 #        - 127.0.0.4
-#        - fe80::3%@loopback_devname@
+#        - fd69:f21d:873c:fa::3
 #
 #  o Two SMF are defined with a different APN.
 #    - Note that if SMF IP for UE is configured in HSS,
@@ -354,57 +400,18 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
 #
 max:
 
 #
-# pool:
+# usrsctp:
+#    udp_port : 9899
 #
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:
-
-#
-# sockopt:
-#    no_delay : true
-#
-sockopt:
-
-#
-# sctp:
-#    heartbit_interval : 5000 (5secs)
-#    sack_delay : 200 (200ms)
-#    rto_initial : 3000 (3secs)
-#    rto_min : 1000 (1sec)
-#    rto_max : 5000 (5secs)
-#    max_num_of_ostreams : 30
-#    max_num_of_istreams : 65535
-#    max_attempts : 4
-#    max_initial_timeout : 8000(8secs)
-#    usrsctp_udp_port : 9899
-#
-sctp:
+usrsctp:
 
 #
 # time:

configs/open5gs/nrf.yaml.in

@@ -1,5 +1,3 @@
-db_uri: mongodb://localhost/open5gs
-
 #
 # logger:
 #
@@ -38,7 +36,7 @@ logger:
 #          - ::0
 #        port: 7777
 #
-#  o SBI Server(https://<all address avaiable>:443)
+#  o SBI Server(https://<all address available>:443)
 #    sbi:
 #        tls:
 #          key: nrf.key
@@ -65,6 +63,28 @@ logger:
 #    sbi:
 #      dev: eth0
 #
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  <NF Service>
+#
+#  o NF Service Name(Default : all NF services available)
+#    service_name:
+#
+#  o NF Service Name(Only some NF services are available)
+#    service_name:
+#      - nnrf-nfm
+#      - nnrf-disc
+#
 nrf:
     sbi:
       addr:
@@ -73,10 +93,51 @@ nrf:
       port: 7777
 
 #
-# parameter:
+# scp:
 #
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.1.10:7777)
+#    sbi:
+#      addr: 127.0.1.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.1.10
+#        tls:
+#          key: scp.key
+#          pem: scp.pem
+#      - name: scp.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fb::1]:80)
+#    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.1.10
+#        - fd69:f21d:873c:fb::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.1.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
+#
+# parameter:
 #
 #  o Disable use of IPv4 addresses (only IPv6)
 #      no_ipv4: true
@@ -92,37 +153,13 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
 #
 max:
 
-#
-# pool:
-#
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:
-
 #
 # time:
 #

configs/open5gs/nssf.yaml.in

@@ -20,6 +20,7 @@
 #
 logger:
     file: @localstatedir@/log/open5gs/nssf.log
+
 #
 # nssf:
 #
@@ -35,7 +36,7 @@ logger:
 #          - ::0
 #        port: 7777
 #
-#  o SBI Server(https://<all address avaiable>:443)
+#  o SBI Server(https://<all address available>:443)
 #    sbi:
 #      - tls:
 #          key: nssf.key
@@ -73,7 +74,19 @@ logger:
 #          - 127.0.0.99
 #          - ::1
 #
-#  <List of avaiable Network Slice Instance(NSI)>
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.14
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  <List of available Network Slice Instance(NSI)>
 #
 #  o One NSI
 #   - NRF[http://::1:7777/nnrf-nfm/v1/nf-instances]
@@ -110,16 +123,129 @@ logger:
 #        s_nssai:
 #          sst: 1
 #          sd: 009000
+#
+#  o NSI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    nsi:
+#      addr: ::1
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  <NF Service>
+#
+#  o NF Service Name(Default : all NF services available)
+#    service_name:
+#
+#  o NF Service Name(Only some NF services are available)
+#    service_name:
+#      - nnssf-nsselection
+#
+#  <NF Discovery Query Parameter>
+#
+#  o (Default) If you do not set Query Parameter as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.14
+#        port: 7777
+#
+#    - 'service-names' is included.
+#
+#    sbi:
+#      - addr: 127.0.0.14
+#        port: 7777
+#    discovery:
+#      option:
+#        no_service_names: false
+#
+#  o To remove 'service-names' from URI query parameters in NS Discovery
+#         no_service_names: true
+#
+#    * For Indirect Communication with Delegated Discovery,
+#      'service-names' is always included in the URI query parameter.
+#    * That is, 'no_service_names' has no effect.
+#
+#  <For Indirect Communication with Delegated Discovery>
+#
+#  o (Default) If you do not set Delegated Discovery as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.14
+#        port: 7777
+#
+#    - Use SCP if SCP avaiable. Otherwise NRF is used.
+#      => App fails if both NRF and SCP are unavailable.
+#
+#    sbi:
+#      - addr: 127.0.0.14
+#        port: 7777
+#    discovery:
+#      delegated: auto
+#
+#  o To use SCP always => App fails if no SCP available.
+#      delegated: yes
+#
+#  o Don't use SCP server => App fails if no NRF available.
+#      delegated: no
+#
 nssf:
     sbi:
       - addr: 127.0.0.14
         port: 7777
     nsi:
-      - addr: ::1
+      - addr: 127.0.0.10
         port: 7777
         s_nssai:
           sst: 1
 
+#
+# scp:
+#
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.1.10:7777)
+#    sbi:
+#      addr: 127.0.1.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.1.10
+#        tls:
+#          key: scp.key
+#          pem: scp.pem
+#      - name: scp.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fb::1]:80)
+#    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.1.10
+#        - fd69:f21d:873c:fb::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.1.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
 #
 # nrf:
 #
@@ -138,27 +264,24 @@ nssf:
 #          pem: nrf.pem
 #      - name: nrf.open5gs.org
 #
-#  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
+#  o SBI Client(http://[fd69:f21d:873c:fa::1]:80)
 #    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #
 #    sbi:
 #      addr:
 #        - 127.0.0.10
-#        - fe80::1%@loopback_devname@
+#        - fd69:f21d:873c:fa::1
 #
-nrf:
-    sbi:
-      - addr:
-          - 127.0.0.10
-          - ::1
-        port: 7777
+#nrf:
+#    sbi:
+#      - addr:
+#          - 127.0.0.10
+#          - ::1
+#        port: 7777
 
 #
 # parameter:
 #
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
-#
 #  o Disable use of IPv4 addresses (only IPv6)
 #      no_ipv4: true
 #
@@ -173,37 +296,13 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
 #
 max:
 
-#
-# pool:
-#
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:
-
 #
 # time:
 #

configs/open5gs/pcf.yaml.in

@@ -22,6 +22,7 @@ db_uri: mongodb://localhost/open5gs
 #
 logger:
     file: @localstatedir@/log/open5gs/pcf.log
+
 #
 # pcf:
 #
@@ -37,7 +38,7 @@ logger:
 #          - ::0
 #        port: 7777
 #
-#  o SBI Server(https://<all address avaiable>:443)
+#  o SBI Server(https://<all address available>:443)
 #    sbi:
 #      - tls:
 #          key: pcf.key
@@ -75,11 +76,130 @@ logger:
 #          - 127.0.0.99
 #          - ::1
 #
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.13
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  <NF Service>
+#
+#  o NF Service Name(Default : all NF services available)
+#    service_name:
+#
+#  o NF Service Name(Only some NF services are available)
+#    service_name:
+#      - npcf-am-policy-control
+#      - npcf-smpolicycontrol
+#      - npcf-policyauthorization
+#
+#  == NOTE ==
+#  Placing npcf-smpolicycontrol and pcf-policyauthorization
+#  in different NFs is not supported. Both npcf-smpolicycontrol
+#  and pcf-policyauthorization should be placed in the same NF.
+#
+#  <NF Discovery Query Parameter>
+#
+#  o (Default) If you do not set Query Parameter as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.13
+#        port: 7777
+#
+#    - 'service-names' is included.
+#
+#    sbi:
+#      - addr: 127.0.0.13
+#        port: 7777
+#    discovery:
+#      option:
+#        no_service_names: false
+#
+#  o To remove 'service-names' from URI query parameters in NS Discovery
+#         no_service_names: true
+#
+#    * For Indirect Communication with Delegated Discovery,
+#      'service-names' is always included in the URI query parameter.
+#    * That is, 'no_service_names' has no effect.
+#
+#  <For Indirect Communication with Delegated Discovery>
+#
+#  o (Default) If you do not set Delegated Discovery as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.13
+#        port: 7777
+#
+#    - Use SCP if SCP avaiable. Otherwise NRF is used.
+#      => App fails if both NRF and SCP are unavailable.
+#
+#    sbi:
+#      - addr: 127.0.0.13
+#        port: 7777
+#    discovery:
+#      delegated: auto
+#
+#  o To use SCP always => App fails if no SCP available.
+#      delegated: yes
+#
+#  o Don't use SCP server => App fails if no NRF available.
+#      delegated: no
+#
 pcf:
     sbi:
       - addr: 127.0.0.13
         port: 7777
 
+#
+# scp:
+#
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.1.10:7777)
+#    sbi:
+#      addr: 127.0.1.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.1.10
+#        tls:
+#          key: scp.key
+#          pem: scp.pem
+#      - name: scp.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fb::1]:80)
+#    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.1.10
+#        - fd69:f21d:873c:fb::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.1.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
 #
 # nrf:
 #
@@ -98,27 +218,36 @@ pcf:
 #          pem: nrf.pem
 #      - name: nrf.open5gs.org
 #
-#  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
+#  o SBI Client(http://[fd69:f21d:873c:fa::1]:80)
 #    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #
 #    sbi:
 #      addr:
 #        - 127.0.0.10
-#        - fe80::1%@loopback_devname@
+#        - fd69:f21d:873c:fa::1
 #
-nrf:
-    sbi:
-      - addr:
-          - 127.0.0.10
-          - ::1
-        port: 7777
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#nrf:
+#    sbi:
+#      - addr:
+#          - 127.0.0.10
+#          - ::1
+#        port: 7777
 
 #
 # parameter:
 #
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
-#
 #  o Disable use of IPv4 addresses (only IPv6)
 #      no_ipv4: true
 #
@@ -133,37 +262,13 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
 #
 max:
 
-#
-# pool:
-#
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:
-
 #
 # time:
 #

configs/open5gs/pcrf.yaml.in

@@ -28,9 +28,6 @@ pcrf:
 #
 # parameter:
 #
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
-#
 #  o Disable use of IPv4 addresses (only IPv6)
 #      no_ipv4: true
 #
@@ -40,42 +37,14 @@ pcrf:
 #  o Prefer IPv4 instead of IPv6 for estabishing new GTP connections.
 #      prefer_ipv4: true
 #
-#  o Legacy support for pre-release LTE 11 devices to do calling
-#    - Replace IPv4/v6 local addr field in AAR Media-Subcomponent AVP by any
-#      no_ipv4v6_local_addr_in_packet_filter: true
-#
 parameter:
 
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
 #
 max:
-
-#
-# pool:
-#
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:

configs/open5gs/scp.yaml.in

@@ -0,0 +1,246 @@
+db_uri: mongodb://localhost/open5gs
+
+#
+# logger:
+#
+#  o Set OGS_LOG_INFO to all domain level
+#   - If `level` is omitted, the default level is OGS_LOG_INFO)
+#   - If `domain` is omitted, the all domain level is set from 'level'
+#    (Nothing is needed)
+#
+#  o Set OGS_LOG_ERROR to all domain level
+#   - `level` can be set with none, fatal, error, warn, info, debug, trace
+#    level: error
+#
+#  o Set OGS_LOG_DEBUG to mme/emm domain level
+#    level: debug
+#    domain: mme,emm
+#
+#  o Set OGS_LOG_TRACE to all domain level
+#    level: trace
+#    domain: core,sbi,scp,event,tlv,mem,sock
+#
+logger:
+    file: @localstatedir@/log/open5gs/scp.log
+
+#
+# scp:
+#
+#  <SBI Server>
+#
+#  o SBI Server(http://<all address available>:80)
+#    sbi:
+#
+#  o SBI Server(http://<any address>:80)
+#    sbi:
+#      - addr:
+#          - 0.0.0.0
+#          - ::0
+#        port: 7777
+#
+#  o SBI Server(https://<all address available>:443)
+#    sbi:
+#      - tls:
+#          key: scp.key
+#          pem: scp.pem
+#
+#  o SBI Server(https://127.0.1.10:443, http://[::1]:80)
+#    sbi:
+#      - addr: 127.0.1.10
+#        tls:
+#          key: scp.key
+#          pem: scp.pem
+#      - addr: ::1
+#
+#  o SBI Server(http://scp.open5gs.org:80)
+#    sbi:
+#      - name: scp.open5gs.org
+#
+#  o SBI Server(http://127.0.1.10:7777)
+#    sbi:
+#      - addr: 127.0.1.10
+#        port: 7777
+#
+#  o SBI Server(http://<eth0 IP address>:80)
+#    sbi:
+#      - dev: eth0
+#
+#  o Provide custom SBI address to be advertised to NRF
+#    sbi:
+#      - dev: eth0
+#        advertise: open5gs-scp.svc.local
+#
+#    sbi:
+#      - addr: localhost
+#        advertise:
+#          - 127.0.0.99
+#          - ::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.1.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  <For Indirect Communication with Delegated Discovery>
+#
+#  o (Default) If you do not set Delegated Discovery as shown below,
+#
+#    sbi:
+#      - addr: 127.0.1.10
+#        port: 7777
+#
+#    - Use SCP if SCP avaiable. Otherwise NRF is used.
+#      => App fails if both NRF and SCP are unavailable.
+#
+#    sbi:
+#      - addr: 127.0.1.10
+#        port: 7777
+#    discovery:
+#      delegated: auto
+#
+#  o To use SCP always => App fails if no SCP available.
+#      delegated: yes
+#
+#  o Don't use SCP server => App fails if no NRF available.
+#      delegated: no
+#
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
+#
+# next_scp:
+#
+#  <Next hop SCP>
+#
+#  o SBI Client(http://127.0.1.11:7777)
+#    sbi:
+#      addr: 127.0.1.11
+#      port: 7777
+#
+#  o SBI Client(https://127.0.1.11:443, http://next-scp.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.1.11
+#        tls:
+#          key: next-scp.key
+#          pem: next-scp.pem
+#      - name: next-scp.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fb::1]:80)
+#    If prefer_ipv4 is true, http://127.0.1.11:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.1.11
+#        - fd69:f21d:873c:fb::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.1.11
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+
+#
+# nrf:
+#
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.0.10:7777)
+#    sbi:
+#      addr: 127.0.0.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.0.10
+#        tls:
+#          key: nrf.key
+#          pem: nrf.pem
+#      - name: nrf.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fa::1]:80)
+#    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.0.10
+#        - fd69:f21d:873c:fa::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+nrf:
+    sbi:
+      - addr:
+          - 127.0.0.10
+          - ::1
+        port: 7777
+
+#
+# parameter:
+#
+#  o Disable use of IPv4 addresses (only IPv6)
+#      no_ipv4: true
+#
+#  o Disable use of IPv6 addresses (only IPv4)
+#      no_ipv6: true
+#
+#  o Prefer IPv4 instead of IPv6 for estabishing new GTP connections.
+#      prefer_ipv4: true
+#
+parameter:
+
+#
+# max:
+#
+# o Maximum Number of UE
+#    ue: 1024
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
+#
+max:
+
+#
+# time:
+#
+#  o NF Instance Heartbeat (Default : 0)
+#    NFs will not send heart-beat timer in NFProfile
+#    NRF will send heart-beat timer in NFProfile
+#
+#  o NF Instance Heartbeat (20 seconds)
+#    NFs will send heart-beat timer (20 seconds) in NFProfile
+#    NRF can change heart-beat timer in NFProfile
+#
+#    nf_instance:
+#      heartbeat: 20
+#
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
+time:

configs/open5gs/sgwc.yaml.in

@@ -26,17 +26,25 @@ logger:
 #
 #  <GTP-C Server>
 #
-#  o GTP-C Server(127.0.0.3:2123, [fe80::2%@loopback_devname@]:2123)
+#  o GTP-C Server(127.0.0.3:2123, [fd69:f21d:873c:fa::2]:2123)
 #    gtpc:
 #      addr:
 #        - 127.0.0.3
-#        - fe80::2%@loopback_devname@
+#        - fd69:f21d:873c:fa::2
 #
 #  o On SGW, Same Configuration(127.0.0.3:2123,
-#  [fe80::2%@loopback_devname@]:2123) as below.
+#  [fd69:f21d:873c:fa::2]:2123) as below.
 #    gtpc:
 #      - addr: 127.0.0.3
-#      - addr: fe80::2%@loopback_devname@
+#      - addr: fd69:f21d:873c:fa::2
+#
+#  o GTP-C Option (Default)
+#    - so_bindtodevice : NULL
+#
+#    gtpc:
+#      addr: 127.0.0.3
+#      option:
+#        so_bindtodevice: vrf-blue
 #
 #  <PFCP Server>
 #
@@ -49,6 +57,14 @@ logger:
 #    pfcp:
 #      name: localhost
 #
+#  o PFCP Option (Default)
+#    - so_bindtodevice : NULL
+#
+#    pfcp:
+#      addr: 127.0.0.3
+#      option:
+#        so_bindtodevice: vrf-blue
+#
 sgwc:
     gtpc:
       - addr: 127.0.0.3
@@ -67,15 +83,10 @@ sgwc:
 #
 #  <SGWU_SELECTION_MODE - EPC only>
 #
-# o Round-Robin
-#   (note that round robin can be disabled for a particular node
-#     by setting flag 'rr' to 0)
-#
 #  sgwu:
 #    pfcp:
 #      - addr: 127.0.0.6
 #      - addr: 127.0.0.12
-#        rr: 0
 #      - addr: 127.0.0.18
 #
 # o SGWU selection by eNodeB TAC
@@ -114,9 +125,6 @@ sgwu:
 #
 # parameter:
 #
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
-#
 #  o Disable use of IPv4 addresses (only IPv6)
 #      no_ipv4: true
 #
@@ -126,42 +134,23 @@ sgwu:
 #  o Prefer IPv4 instead of IPv6 for estabishing new GTP connections.
 #      prefer_ipv4: true
 #
+#  o Disable selection of SGW-U PFCP in Round-Robin manner
+#      no_pfcp_rr_select: true
+#
 parameter:
 
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
+# o Maximum Number of GTP peer nodes per SGWC/SMF
+#    gtp_peer: 64
 #
 max:
 
-#
-# pool:
-#
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:
-
 #
 # time:
 #

configs/open5gs/sgwu.yaml.in

@@ -35,6 +35,14 @@ logger:
 #    pfcp:
 #      - name: localhost
 #
+#  o PFCP Option (Default)
+#    - so_bindtodevice : NULL
+#
+#    pfcp:
+#      addr: 127.0.0.6
+#      option:
+#        so_bindtodevice: vrf-blue
+#
 #  <GTP-U Server>
 #
 #  o GTP-U Server(127.0.0.6:2152, [::1]:2152)
@@ -80,6 +88,14 @@ logger:
 #      - dev: ens3
 #        advertise: sgw1.epc.mnc001.mcc001.3gppnetwork.org
 #
+#  o GTP-U Option (Default)
+#    - so_bindtodevice : NULL
+#
+#    gtpu:
+#      addr: 127.0.0.6
+#      option:
+#        so_bindtodevice: vrf-blue
+#
 sgwu:
     pfcp:
       - addr: 127.0.0.6
@@ -91,19 +107,16 @@ sgwu:
 #
 #  <PFCP Client>>
 #
-#  o PFCP Client(127.0.0.6:8805)
+#  o PFCP Client(127.0.0.3:8805)
 #
 #    pfcp:
-#      addr: 127.0.0.6
+#      addr: 127.0.0.3
 #
 sgwc:
 
 #
 # parameter:
 #
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
-#
 #  o Disable use of IPv4 addresses (only IPv6)
 #      no_ipv4: true
 #
@@ -118,37 +131,13 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
 #
 max:
 
-#
-# pool:
-#
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:
-
 #
 # time:
 #

configs/open5gs/smf.yaml.in

@@ -16,10 +16,11 @@
 #
 #  o Set OGS_LOG_TRACE to all domain level
 #    level: trace
-#    domain: core,pfcp,fd,pfcp,gtp,smf,event,tlv,mem,sock
+#    domain: core,fd,pfcp,gtp,smf,event,tlv,mem,sock
 #
 logger:
     file: @localstatedir@/log/open5gs/smf.log
+
 #
 # smf:
 #
@@ -35,7 +36,7 @@ logger:
 #          - ::0
 #        port: 7777
 #
-#  o SBI Server(https://<all address avaiable>:443)
+#  o SBI Server(https://<all address available>:443)
 #    sbi:
 #      - tls:
 #          key: smf.key
@@ -73,6 +74,75 @@ logger:
 #          - 127.0.0.99
 #          - ::1
 #
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.4
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  <NF Service>
+#
+#  o NF Service Name(Default : all NF services available)
+#    service_name:
+#
+#  o NF Service Name(Only some NF services are available)
+#    service_name:
+#      - nsmf-pdusession
+#
+#  <NF Discovery Query Parameter>
+#
+#  o (Default) If you do not set Query Parameter as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.4
+#        port: 7777
+#
+#    - 'service-names' is included.
+#
+#    sbi:
+#      - addr: 127.0.0.4
+#        port: 7777
+#    discovery:
+#      option:
+#        no_service_names: false
+#
+#  o To remove 'service-names' from URI query parameters in NS Discovery
+#         no_service_names: true
+#
+#    * For Indirect Communication with Delegated Discovery,
+#      'service-names' is always included in the URI query parameter.
+#    * That is, 'no_service_names' has no effect.
+#
+#  <For Indirect Communication with Delegated Discovery>
+#
+#  o (Default) If you do not set Delegated Discovery as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.4
+#        port: 7777
+#
+#    - Use SCP if SCP avaiable. Otherwise NRF is used.
+#      => App fails if both NRF and SCP are unavailable.
+#
+#    sbi:
+#      - addr: 127.0.0.4
+#        port: 7777
+#    discovery:
+#      delegated: auto
+#
+#  o To use SCP always => App fails if no SCP available.
+#      delegated: yes
+#
+#  o Don't use SCP server => App fails if no NRF available.
+#      delegated: no
+#
+#
 #  <PFCP Server>
 #
 #  o PFCP Server(127.0.0.4:8805, ::1:8805)
@@ -84,19 +154,35 @@ logger:
 #    pfcp:
 #      name: localhost
 #
+#  o PFCP Option (Default)
+#    - so_bindtodevice : NULL
+#
+#    pfcp:
+#      addr: 127.0.0.4
+#      option:
+#        so_bindtodevice: vrf-blue
+#
 #  <GTP-C Server>
 #
-#  o GTP-C Server(127.0.0.4:2123, [fe80::3%@loopback_devname@]:2123)
+#  o GTP-C Server(127.0.0.4:2123, [fd69:f21d:873c:fa::3]:2123)
 #    gtpc:
 #      addr:
 #        - 127.0.0.4
-#        - fe80::3%@loopback_devname@
+#        - fd69:f21d:873c:fa::3
 #
 #  o On SMF, Same configuration
-#    (127.0.0.4:2123, [fe80::3%@loopback_devname@]:2123).
+#    (127.0.0.4:2123, [fd69:f21d:873c:fa::3]:2123).
 #    gtpc:
 #      - addr: 127.0.0.4
-#      - addr: fe80::3%@loopback_devname@
+#      - addr: fd69:f21d:873c:fa::3
+#
+#  o GTP-C Option (Default)
+#    - so_bindtodevice : NULL
+#
+#    gtpc:
+#      addr: 127.0.0.4
+#      option:
+#        so_bindtodevice: vrf-blue
 #
 #  <GTP-U Server>>
 #
@@ -109,6 +195,21 @@ logger:
 #    gtpu:
 #      name: localhost
 #
+#  o GTP-U Option (Default)
+#    - so_bindtodevice : NULL
+#
+#    gtpu:
+#      addr: 127.0.0.4
+#      option:
+#        so_bindtodevice: vrf-blue
+#
+#  <Metrics Server>
+#
+#  o Metrics Server(http://<any address>:9090)
+#    metrics:
+#      addr: 0.0.0.0
+#      port: 9090
+#
 #  <Subnet for UE Pool>
 #
 #  o IPv4 Pool
@@ -118,21 +219,32 @@ logger:
 #  o IPv4/IPv6 Pool
 #    subnet:
 #      - addr: 10.45.0.1/16
-#      - addr: 2001:230:cafe::1/48
+#      - addr: 2001:db8:cafe::1/48
 #
 #
-#  o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:230:babe::1/48
+#  o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48
+#    ; If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash.
 #
 #    subnet:
 #      - addr: 10.45.0.1/16
 #        dnn: internet
-#      - addr: 2001:230:cafe::1/48
+#      - addr: 2001:db8:cafe::1/48
 #        dnn: internet
 #      - addr: 10.46.0.1/16
 #        dnn: ims
-#      - addr: 2001:230:babe::1/48
+#      - addr: 2001:db8:babe::1/48
 #        dnn: ims
 #
+#  o Specific DNN/APN with the FALLBACK SUBNET(10.47.0.1/16)
+#    ; Note that put the FALLBACK SUBNET last to avoid SMF/UPF crash.
+#
+#    subnet:
+#      - addr: 10.45.0.1/16
+#        dnn: internet
+#      - addr: 10.46.0.1/16
+#        dnn: ims
+#      - addr: 10.50.0.1/16 ## FALLBACK SUBNET
+#
 #  o Pool Range Sample
 #    subnet:
 #      - addr: 10.45.0.1/24
@@ -155,10 +267,10 @@ logger:
 #        range:
 #          - 10.45.0.100-10.45.0.200
 #          - 10.45.1.100-10.45.1.200
-#      - addr: 2001:230:cafe::1/48
+#      - addr: 2001:db8:cafe::1/48
 #        range:
-#          - 2001:230:cafe:a0::0-2001:230:cafe:b0::0
-#          - 2001:230:cafe:c0::0-2001:230:cafe:d0::0
+#          - 2001:db8:cafe:a0::0-2001:db8:cafe:b0::0
+#          - 2001:db8:cafe:c0::0-2001:db8:cafe:d0::0
 #
 #  <Domain Name Server>
 #
@@ -186,6 +298,19 @@ logger:
 #      - 127.0.0.1
 #      - ::1
 #
+#  <CTF>
+#
+#  o Gy interface parameters towards OCS.
+#  o enabled:
+#    o auto: Default. Use Gy only if OCS available among Diameter peers
+#    o yes:  Use Gy always;
+#            reject subscribers if no OCS available among Diameter peers
+#    o no:   Don't use Gy interface if there is an OCS available
+#
+#    ctf:
+#      enabled: auto|yes|no
+#
+#
 #  <SMF Selection - 5G Core only>
 #  1. SMF sends SmfInfo(S-NSSAI, DNN, TAI) to the NRF
 #  2. NRF responds to AMF with SmfInfo during NF-Discovery.
@@ -209,7 +334,7 @@ logger:
 #              - internet
 #              - ims
 #
-#  o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:90170 TAC:1]
+#  o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:99970 TAC:1]
 #    info:
 #      - s_nssai:
 #          - sst: 1
@@ -217,14 +342,14 @@ logger:
 #              - internet
 #        tai:
 #          - plmn_id:
-#              mcc: 901
+#              mcc: 999
 #              mnc: 70
 #            tac: 1
 #
 #  o If any of conditions below are met:
-#   - S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:90170 TAC:1-9]
+#   - S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:99970 TAC:1-9]
 #   - S-NSSAI[SST:2 SD:000080] and DNN[internet or ims]
-#   - S-NSSAI[SST:4] and DNN[internet] and TAI[PLMN-ID:90170 TAC:10-20,30-40]
+#   - S-NSSAI[SST:4] and DNN[internet] and TAI[PLMN-ID:99970 TAC:10-20,30-40]
 #
 #    info:
 #      - s_nssai:
@@ -233,7 +358,7 @@ logger:
 #              - internet
 #        tai:
 #          - plmn_id:
-#              mcc: 901
+#              mcc: 999
 #              mnc: 70
 #            range:
 #              - 1-9
@@ -249,7 +374,7 @@ logger:
 #              - internet
 #        tai:
 #          - plmn_id:
-#              mcc: 901
+#              mcc: 999
 #              mnc: 70
 #            range:
 #              - 10-20
@@ -279,27 +404,27 @@ logger:
 #              - internet
 #        tai:
 #          - plmn_id:
-#              mcc: 901
+#              mcc: 999
 #              mnc: 70
 #            tac: [1, 2, 3]
 #          - plmn_id:
-#              mcc: 901
+#              mcc: 999
 #              mnc: 70
 #            tac: 4
 #          - plmn_id:
-#              mcc: 901
+#              mcc: 999
 #              mnc: 70
 #            tac:
 #              - 5
 #              - 6
 #          - plmn_id:
-#              mcc: 901
+#              mcc: 999
 #              mnc: 70
 #            range:
 #              - 100-200
 #              - 300-400
 #          - plmn_id:
-#              mcc: 901
+#              mcc: 999
 #              mnc: 70
 #            range:
 #              - 500-600
@@ -311,11 +436,24 @@ logger:
 #              - internet
 #        tai:
 #          - plmn_id:
-#              mcc: 901
+#              mcc: 999
 #              mnc: 70
 #            tac: 99
-# 
-
+#
+#  <Security Indication - 5G Core only>
+#
+#   According to 3GPP TS38.413 Section 9.3.1.27,
+#   Security Indication IE may be instructed to 5G gNB.
+#
+#   If you set the security_indication in smf.yaml,
+#   this information is delivered using PDU Session Resource Request Transfer IE
+#
+#    security_indication:
+#      integrity_protection_indication: required|preferred|not-needed
+#      confidentiality_protection_indication: required|preferred|not-needed
+#      maximum_integrity_protected_data_rate_uplink: bitrate64kbs|maximum-UE-rate
+#      maximum_integrity_protected_data_rate_downlink: bitrate64kbs|maximum-UE-rate
+#
 smf:
     sbi:
       - addr: 127.0.0.4
@@ -329,17 +467,66 @@ smf:
     gtpu:
       - addr: 127.0.0.4
       - addr: ::1
+    metrics:
+        addr: 127.0.0.4
+        port: 9090
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
     dns:
       - 8.8.8.8
       - 8.8.4.4
       - 2001:4860:4860::8888
       - 2001:4860:4860::8844
     mtu: 1400
+    ctf:
+      enabled: auto
     freeDiameter: @sysconfdir@/freeDiameter/smf.conf
 
+#
+# scp:
+#
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.1.10:7777)
+#    sbi:
+#      addr: 127.0.1.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.1.10
+#        tls:
+#          key: scp.key
+#          pem: scp.pem
+#      - name: scp.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fb::1]:80)
+#    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.1.10
+#        - fd69:f21d:873c:fb::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.1.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
 #
 # nrf:
 #
@@ -358,20 +545,32 @@ smf:
 #          pem: nrf.pem
 #      - name: nrf.open5gs.org
 #
-#  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
+#  o SBI Client(http://[fd69:f21d:873c:fa::1]:80)
 #    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #
 #    sbi:
 #      addr:
 #        - 127.0.0.10
-#        - fe80::1%@loopback_devname@
+#        - fd69:f21d:873c:fa::1
 #
-nrf:
-    sbi:
-      - addr:
-          - 127.0.0.10
-          - ::1
-        port: 7777
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#nrf:
+#    sbi:
+#      - addr:
+#          - 127.0.0.10
+#          - ::1
+#        port: 7777
 
 #
 # upf:
@@ -379,7 +578,7 @@ nrf:
 #  <PFCP Client>>
 #
 #  o PFCP Client(127.0.0.7:8805)
-# 
+#
 #    pfcp:
 #      addr: 127.0.0.7
 #
@@ -432,9 +631,6 @@ upf:
 #
 # parameter:
 #
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
-#
 #  o Disable use of IPv4 addresses (only IPv6)
 #      no_ipv4: true
 #
@@ -444,42 +640,27 @@ upf:
 #  o Prefer IPv4 instead of IPv6 for estabishing new GTP connections.
 #      prefer_ipv4: true
 #
+#  o Disable selection of UPF PFCP in Round-Robin manner
+#      no_pfcp_rr_select: true
+#
+#  o Legacy support for pre-release LTE 11 devices
+#    - Omits adding local address in packet filters for compatibility
+#      no_ipv4v6_local_addr_in_packet_filter: true
+#
 parameter:
 
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
+# o Maximum Number of GTP peer nodes per SGWC/SMF
+#    gtp_peer: 64
 #
 max:
 
-#
-# pool:
-#
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:
-
 #
 # time:
 #

configs/open5gs/udm.yaml.in

@@ -20,6 +20,7 @@
 #
 logger:
     file: @localstatedir@/log/open5gs/udm.log
+
 #
 # udm:
 #
@@ -35,7 +36,7 @@ logger:
 #          - ::0
 #        port: 7777
 #
-#  o SBI Server(https://<all address avaiable>:443)
+#  o SBI Server(https://<all address available>:443)
 #    sbi:
 #      - tls:
 #          key: udm.key
@@ -73,11 +74,125 @@ logger:
 #          - 127.0.0.99
 #          - ::1
 #
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.12
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  <NF Service>
+#
+#  o NF Service Name(Default : all NF services available)
+#    service_name:
+#
+#  o NF Service Name(Only some NF services are available)
+#    service_name:
+#      - nudm-sdm
+#      - nudm-uecm
+#      - nudm-ueau
+#
+#  <NF Discovery Query Parameter>
+#
+#  o (Default) If you do not set Query Parameter as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.12
+#        port: 7777
+#
+#    - 'service-names' is included.
+#
+#    sbi:
+#      - addr: 127.0.0.12
+#        port: 7777
+#    discovery:
+#      option:
+#        no_service_names: false
+#
+#  o To remove 'service-names' from URI query parameters in NS Discovery
+#         no_service_names: true
+#
+#    * For Indirect Communication with Delegated Discovery,
+#      'service-names' is always included in the URI query parameter.
+#    * That is, 'no_service_names' has no effect.
+#
+#  <For Indirect Communication with Delegated Discovery>
+#
+#  o (Default) If you do not set Delegated Discovery as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.12
+#        port: 7777
+#
+#    - Use SCP if SCP avaiable. Otherwise NRF is used.
+#      => App fails if both NRF and SCP are unavailable.
+#
+#    sbi:
+#      - addr: 127.0.0.12
+#        port: 7777
+#    discovery:
+#      delegated: auto
+#
+#  o To use SCP always => App fails if no SCP available.
+#      delegated: yes
+#
+#  o Don't use SCP server => App fails if no NRF available.
+#      delegated: no
+#
 udm:
     sbi:
       - addr: 127.0.0.12
         port: 7777
 
+#
+# scp:
+#
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.1.10:7777)
+#    sbi:
+#      addr: 127.0.1.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.1.10
+#        tls:
+#          key: scp.key
+#          pem: scp.pem
+#      - name: scp.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fb::1]:80)
+#    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.1.10
+#        - fd69:f21d:873c:fb::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.1.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
 #
 # nrf:
 #
@@ -96,27 +211,36 @@ udm:
 #          pem: nrf.pem
 #      - name: nrf.open5gs.org
 #
-#  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
+#  o SBI Client(http://[fd69:f21d:873c:fa::1]:80)
 #    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #
 #    sbi:
 #      addr:
 #        - 127.0.0.10
-#        - fe80::1%@loopback_devname@
+#        - fd69:f21d:873c:fa::1
 #
-nrf:
-    sbi:
-      - addr:
-          - 127.0.0.10
-          - ::1
-        port: 7777
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#nrf:
+#    sbi:
+#      - addr:
+#          - 127.0.0.10
+#          - ::1
+#        port: 7777
 
 #
 # parameter:
 #
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
-#
 #  o Disable use of IPv4 addresses (only IPv6)
 #      no_ipv4: true
 #
@@ -131,37 +255,13 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
 #
 max:
 
-#
-# pool:
-#
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:
-
 #
 # time:
 #

configs/open5gs/udr.yaml.in

@@ -22,6 +22,7 @@ db_uri: mongodb://localhost/open5gs
 #
 logger:
     file: @localstatedir@/log/open5gs/udr.log
+
 #
 # udr:
 #
@@ -37,7 +38,7 @@ logger:
 #          - ::0
 #        port: 7777
 #
-#  o SBI Server(https://<all address avaiable>:443)
+#  o SBI Server(https://<all address available>:443)
 #    sbi:
 #      - tls:
 #          key: udr.key
@@ -75,11 +76,123 @@ logger:
 #          - 127.0.0.99
 #          - ::1
 #
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.20
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#  <NF Service>
+#
+#  o NF Service Name(Default : all NF services available)
+#    service_name:
+#
+#  o NF Service Name(Only some NF services are available)
+#    service_name:
+#      - nudr-dr
+#
+#  <NF Discovery Query Parameter>
+#
+#  o (Default) If you do not set Query Parameter as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.20
+#        port: 7777
+#
+#    - 'service-names' is included.
+#
+#    sbi:
+#      - addr: 127.0.0.20
+#        port: 7777
+#    discovery:
+#      option:
+#        no_service_names: false
+#
+#  o To remove 'service-names' from URI query parameters in NS Discovery
+#         no_service_names: true
+#
+#    * For Indirect Communication with Delegated Discovery,
+#      'service-names' is always included in the URI query parameter.
+#    * That is, 'no_service_names' has no effect.
+#
+#  <For Indirect Communication with Delegated Discovery>
+#
+#  o (Default) If you do not set Delegated Discovery as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.20
+#        port: 7777
+#
+#    - Use SCP if SCP avaiable. Otherwise NRF is used.
+#      => App fails if both NRF and SCP are unavailable.
+#
+#    sbi:
+#      - addr: 127.0.0.20
+#        port: 7777
+#    discovery:
+#      delegated: auto
+#
+#  o To use SCP always => App fails if no SCP available.
+#      delegated: yes
+#
+#  o Don't use SCP server => App fails if no NRF available.
+#      delegated: no
+#
 udr:
     sbi:
       - addr: 127.0.0.20
         port: 7777
 
+#
+# scp:
+#
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.1.10:7777)
+#    sbi:
+#      addr: 127.0.1.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.1.10
+#        tls:
+#          key: scp.key
+#          pem: scp.pem
+#      - name: scp.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fb::1]:80)
+#    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.1.10
+#        - fd69:f21d:873c:fb::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.1.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
 #
 # nrf:
 #
@@ -98,27 +211,36 @@ udr:
 #          pem: nrf.pem
 #      - name: nrf.open5gs.org
 #
-#  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
+#  o SBI Client(http://[fd69:f21d:873c:fa::1]:80)
 #    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #
 #    sbi:
 #      addr:
 #        - 127.0.0.10
-#        - fe80::1%@loopback_devname@
+#        - fd69:f21d:873c:fa::1
 #
-nrf:
-    sbi:
-      - addr:
-          - 127.0.0.10
-          - ::1
-        port: 7777
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.0.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#nrf:
+#    sbi:
+#      - addr:
+#          - 127.0.0.10
+#          - ::1
+#        port: 7777
 
 #
 # parameter:
 #
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
-#
 #  o Disable use of IPv4 addresses (only IPv6)
 #      no_ipv4: true
 #
@@ -133,37 +255,13 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
 #
 max:
 
-#
-# pool:
-#
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:
-
 #
 # time:
 #

configs/open5gs/upf.yaml.in

@@ -35,6 +35,14 @@ logger:
 #    pfcp:
 #      name: localhost
 #
+#  o PFCP Option (Default)
+#    - so_bindtodevice : NULL
+#
+#    pfcp:
+#      addr: 127.0.0.7
+#      option:
+#        so_bindtodevice: vrf-blue
+#
 #  <GTP-U Server>>
 #
 #  o GTP-U Server(127.0.0.7:2152, [::1]:2152)
@@ -80,6 +88,14 @@ logger:
 #      - dev: ens3
 #        advertise: upf1.5gc.mnc001.mcc001.3gppnetwork.org
 #
+#  o GTP-U Option (Default)
+#    - so_bindtodevice : NULL
+#
+#    gtpu:
+#      addr: 127.0.0.7
+#      option:
+#        so_bindtodevice: vrf-blue
+#
 #  <Subnet for UE network>
 #
 #  Note that you need to setup your UE network using TUN device.
@@ -93,46 +109,58 @@ logger:
 #
 #  o IPv4/IPv6 Pool
 #    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#    $ sudo ip addr add 2001:230:cafe::1/48 dev ogstun
+#    $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun
 #
 #    subnet:
 #      - addr: 10.45.0.1/16
-#      - addr: 2001:230:cafe::1/48
+#      - addr: 2001:db8:cafe::1/48
 #
 #
-#  o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:230:babe::1/48
-#    All other APNs use 10.45.0.1/16, 2001:230:cafe::1/48
+#  o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48
+#    All other APNs use 10.45.0.1/16, 2001:db8:cafe::1/48
 #    $ sudo ip addr add 10.45.0.1/16 dev ogstun
 #    $ sudo ip addr add 10.46.0.1/16 dev ogstun
-#    $ sudo ip addr add 2001:230:cafe::1/48 dev ogstun
-#    $ sudo ip addr add 2001:230:babe::1/48 dev ogstun
+#    $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun
+#    $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun
+#
+#    ; If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash.
 #
 #    subnet:
 #      - addr: 10.45.0.1/16
 #        dnn: internet
-#      - addr: 2001:230:cafe::1/48
+#      - addr: 2001:db8:cafe::1/48
 #        dnn: internet
 #      - addr: 10.46.0.1/16
 #        dnn: ims
-#      - addr: 2001:230:babe::1/48
+#      - addr: 2001:db8:babe::1/48
 #        dnn: ims
 #
-#  o Multiple Devices (default: ogstun)
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#    $ sudo ip addr add 2001:230:cafe::1/48 dev ogstun2
-#    $ sudo ip addr add 10.46.0.1/16 dev ogstun3
-#    $ sudo ip addr add 2001:230:babe::1/48 dev ogstun3
+#  o Specific DNN/APN with the FALLBACK SUBNET(10.47.0.1/16)
+#    ; Note that put the FALLBACK SUBNET last to avoid SMF/UPF crash.
 #
 #    subnet:
 #      - addr: 10.45.0.1/16
 #        dnn: internet
-#      - addr: 2001:230:cafe::1/48
+#      - addr: 10.46.0.1/16
+#        dnn: ims
+#      - addr: 10.50.0.1/16 ## FALLBACK SUBNET
+#
+#  o Multiple Devices (default: ogstun)
+#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
+#    $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun2
+#    $ sudo ip addr add 10.46.0.1/16 dev ogstun3
+#    $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun3
+#
+#    subnet:
+#      - addr: 10.45.0.1/16
+#        dnn: internet
+#      - addr: 2001:db8:cafe::1/48
 #        dnn: internet
 #        dev: ogstun2
 #      - addr: 10.46.0.1/16
 #        dnn: ims
 #        dev: ogstun3
-#      - addr: 2001:230:babe::1/48
+#      - addr: 2001:db8:babe::1/48
 #        dnn: ims
 #        dev: ogstun3
 #
@@ -143,17 +171,17 @@ upf:
       - addr: 127.0.0.7
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
 
 #
 # smf:
 #
 #  <PFCP Client>>
 #
-#  o PFCP Client(127.0.0.3:8805)
+#  o PFCP Client(127.0.0.4:8805)
 #
 #    pfcp:
-#      addr: 127.0.0.3
+#      addr: 127.0.0.4
 #
 smf:
 
@@ -177,37 +205,13 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of UE per AMF/MME
+# o Maximum Number of UE
 #    ue: 1024
-# o Maximum Number of gNB/eNB per AMF/MME
-#    gnb: 32
+# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
+#    peer: 64
 #
 max:
 
-#
-# pool:
-#
-# o The default memory pool size was set assuming 1024 UEs.
-#   To connect more UEs, you need to increase the size further.
-#
-#   - Pool-size 128         => 65536 Number
-#   - Pool-size 256         => 16384 Number
-#   - Pool-size 512         => 4096 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  65536
-#    256:  16384
-#    512:  4096
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-pool:
-
 #
 # time:
 #

configs/sample.yaml.in

@@ -4,6 +4,7 @@ logger:
 
 parameter:
 #    no_nrf: true
+#    no_scp: true
 #    no_amf: true
 #    no_smf: true
 #    no_upf: true
@@ -11,18 +12,21 @@ parameter:
 #    no_udm: true
 #    no_pcf: true
 #    no_nssf: true
+#    no_bsf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true
 #    no_sgwu: true
 #    no_pcrf: true
 #    no_hss: true
+#    use_mongodb_change_stream: true
 
 mme:
     freeDiameter:
       identity: mme.localdomain
       realm: localdomain
       listen_on: 127.0.0.2
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -31,7 +35,7 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -42,13 +46,13 @@ mme:
       - addr: 127.0.0.2
     gummei:
       plmn_id:
-        mcc: 901
+        mcc: 999
         mnc: 70
       mme_gid: 2
       mme_code: 1
     tai:
       plmn_id:
-        mcc: 901
+        mcc: 999
         mnc: 70
       tac: 1
     security:
@@ -78,7 +82,7 @@ smf:
       - addr: ::1
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
     dns:
       - 8.8.8.8
       - 8.8.4.4
@@ -89,6 +93,7 @@ smf:
       identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -97,10 +102,35 @@ smf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
+
+#
+#  <For Indirect Communication with Delegated Discovery>
+#
+#  o (Default) If you do not set Delegated Discovery as shown below,
+#
+#    sbi:
+#      - addr: 127.0.0.5
+#        port: 7777
+#
+#    - Use SCP if SCP avaiable. Otherwise NRF is used.
+#      => App fails if both NRF and SCP are unavailable.
+#
+#    sbi:
+#      - addr: 127.0.0.5
+#        port: 7777
+#    discovery:
+#      delegated: auto
+#
+#  o To use SCP always => App fails if no SCP available.
+#      delegated: yes
+#
+#  o Don't use SCP server => App fails if no NRF available.
+#      delegated: no
+#
 amf:
     sbi:
       - addr: 127.0.0.5
@@ -109,19 +139,19 @@ amf:
       - addr: 127.0.0.5
     guami:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         amf_id:
           region: 2
           set: 1
     tai:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         tac: 1
     plmn_support:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         s_nssai:
           - sst: 1
@@ -145,13 +175,14 @@ upf:
       - addr: 127.0.0.7
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
 
 hss:
     freeDiameter:
       identity: hss.localdomain
       realm: localdomain
       listen_on: 127.0.0.8
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -160,7 +191,7 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -169,6 +200,7 @@ pcrf:
       identity: pcrf.localdomain
       realm: localdomain
       listen_on: 127.0.0.9
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -177,7 +209,7 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -189,6 +221,50 @@ nrf:
         - ::1
         port: 7777
 
+#
+# scp:
+#
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.1.10:7777)
+#    sbi:
+#      addr: 127.0.1.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.1.10
+#        tls:
+#          key: scp.key
+#          pem: scp.pem
+#      - name: scp.open5gs.org
+#
+#  o SBI Client(http://[fd69:f21d:873c:fb::1]:80)
+#    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.1.10
+#        - fd69:f21d:873c:fb::1
+#
+#  o SBI Option (Default)
+#    - tcp_nodelay : true
+#    - so_linger.l_onoff : false
+#
+#    sbi:
+#      addr: 127.0.1.10
+#      option:
+#        tcp_nodelay: false
+#        so_linger:
+#          l_onoff: true
+#          l_linger: 10
+#
+#
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
 ausf:
     sbi:
       - addr: 127.0.0.11
@@ -209,10 +285,15 @@ nssf:
       - addr: 127.0.0.14
         port: 7777
     nsi:
-      - addr: ::1
+      - addr: 127.0.0.10
         port: 7777
         s_nssai:
           sst: 1
+bsf:
+    sbi:
+      - addr: 127.0.0.15
+        port: 7777
+
 udr:
     sbi:
       - addr: 127.0.0.20

configs/slice.yaml.in

@@ -4,6 +4,7 @@ logger:
 
 parameter:
 #    no_nrf: true
+    no_scp: true
 #    no_amf: true
 #    no_smf: true
 #    no_upf: true
@@ -11,18 +12,21 @@ parameter:
 #    no_udm: true
 #    no_pcf: true
 #    no_nssf: true
+#    no_bsf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true
 #    no_sgwu: true
 #    no_pcrf: true
 #    no_hss: true
+#    use_mongodb_change_stream: true
 
 mme:
     freeDiameter:
       identity: mme.localdomain
       realm: localdomain
       listen_on: 127.0.0.2
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -31,7 +35,7 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -42,13 +46,13 @@ mme:
       - addr: 127.0.0.2
     gummei:
       plmn_id:
-        mcc: 901
+        mcc: 999
         mnc: 70
       mme_gid: 2
       mme_code: 1
     tai:
       plmn_id:
-        mcc: 901
+        mcc: 999
         mnc: 70
       tac: 1
     security:
@@ -78,7 +82,7 @@ smf:
       - addr: ::1
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
     dns:
       - 8.8.8.8
       - 8.8.4.4
@@ -89,6 +93,7 @@ smf:
       identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -97,7 +102,7 @@ smf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -109,19 +114,19 @@ amf:
       - addr: 127.0.0.5
     guami:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         amf_id:
           region: 202
           set: 1016
     tai:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         tac: 1
     plmn_support:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         s_nssai:
           - sst: 1
@@ -149,13 +154,14 @@ upf:
       - addr: 127.0.0.7
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
 
 hss:
     freeDiameter:
       identity: hss.localdomain
       realm: localdomain
       listen_on: 127.0.0.8
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -164,7 +170,7 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -173,6 +179,7 @@ pcrf:
       identity: pcrf.localdomain
       realm: localdomain
       listen_on: 127.0.0.9
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -181,7 +188,7 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -228,6 +235,11 @@ nssf:
           sst: 1
           sd: 009000
 
+bsf:
+    sbi:
+      - addr: 127.0.0.15
+        port: 7777
+
 udr:
     sbi:
       - addr: 127.0.0.20

configs/srslte.yaml.in

@@ -4,6 +4,7 @@ logger:
 
 parameter:
 #    no_nrf: true
+#    no_scp: true
 #    no_amf: true
 #    no_smf: true
 #    no_upf: true
@@ -11,18 +12,21 @@ parameter:
 #    no_udm: true
 #    no_pcf: true
 #    no_nssf: true
+#    no_bsf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true
 #    no_sgwu: true
 #    no_pcrf: true
 #    no_hss: true
+#    use_mongodb_change_stream: true
 
 mme:
     freeDiameter:
       identity: mme.localdomain
       realm: localdomain
       listen_on: 127.0.0.2
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -31,7 +35,7 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -42,13 +46,13 @@ mme:
       - addr: 127.0.0.2
     gummei:
       plmn_id:
-        mcc: 901
+        mcc: 999
         mnc: 70
       mme_gid: 2
       mme_code: 1
     tai:
       plmn_id:
-        mcc: 901
+        mcc: 999
         mnc: 70
       tac: 7
     security:
@@ -78,7 +82,7 @@ smf:
       - addr: ::1
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
     dns:
       - 8.8.8.8
       - 8.8.4.4
@@ -89,6 +93,7 @@ smf:
       identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -97,7 +102,7 @@ smf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -109,19 +114,19 @@ amf:
       - addr: 127.0.0.5
     guami:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         amf_id:
           region: 2
           set: 1
     tai:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         tac: 1
     plmn_support:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         s_nssai:
           - sst: 1
@@ -145,13 +150,14 @@ upf:
       - addr: 127.0.0.7
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
 
 hss:
     freeDiameter:
       identity: hss.localdomain
       realm: localdomain
       listen_on: 127.0.0.8
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -160,7 +166,7 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -169,6 +175,7 @@ pcrf:
       identity: pcrf.localdomain
       realm: localdomain
       listen_on: 127.0.0.9
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -177,7 +184,7 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -209,11 +216,16 @@ nssf:
       - addr: 127.0.0.14
         port: 7777
     nsi:
-      - addr: ::1
+      - addr: 127.0.0.10
         port: 7777
         s_nssai:
           sst: 1
 
+bsf:
+    sbi:
+      - addr: 127.0.0.15
+        port: 7777
+
 udr:
     sbi:
       - addr: 127.0.0.20

configs/systemd/99-open5gs.network

@@ -3,4 +3,8 @@ Name=ogstun
 
 [Network]
 Address=10.45.0.1/16
-Address=2001:230:cafe::1/48
+Address=2001:db8:cafe::1/48
+
+[Link]
+MTUBytes=1400
+RequiredForOnline=false

configs/systemd/meson.build

@@ -25,10 +25,12 @@ systemd_conf_in = '''
     open5gs-hssd.service
     open5gs-pcrfd.service
     open5gs-nrfd.service
+    open5gs-scpd.service
     open5gs-ausfd.service
     open5gs-udmd.service
     open5gs-pcfd.service
     open5gs-nssfd.service
+    open5gs-bsfd.service
     open5gs-udrd.service
 '''.split()
 

configs/systemd/open5gs-amfd.service.in

@@ -1,6 +1,6 @@
 [Unit]
 Description=Open5GS AMF Daemon
-After=networking.service
+After=network-online.target
 
 [Service]
 Type=simple

configs/systemd/open5gs-ausfd.service.in

@@ -1,6 +1,6 @@
 [Unit]
 Description=Open5GS AUSF Daemon
-After=networking.service
+After=network-online.target
 
 [Service]
 Type=simple

configs/systemd/open5gs-bsfd.service.in

@@ -0,0 +1,18 @@
+[Unit]
+Description=Open5GS BSF Daemon
+Wants=mongodb.service mongod.service
+
+[Service]
+Type=simple
+
+User=open5gs
+Group=open5gs
+
+Restart=always
+ExecStart=@bindir@/open5gs-bsfd -c @sysconfdir@/open5gs/bsf.yaml
+RestartSec=2
+RestartPreventExitStatus=1
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

configs/systemd/open5gs-mmed.service.in

@@ -1,6 +1,6 @@
 [Unit]
 Description=Open5GS MME Daemon
-After=networking.service
+After=network-online.target
 
 [Service]
 Type=simple

configs/systemd/open5gs-nssfd.service.in

@@ -1,6 +1,6 @@
 [Unit]
 Description=Open5GS NSSF Daemon
-After=networking.service
+After=network-online.target
 
 [Service]
 Type=simple

configs/systemd/open5gs-scpd.service.in

@@ -0,0 +1,18 @@
+[Unit]
+Description=Open5GS NRF Daemon
+Wants=mongodb.service mongod.service
+
+[Service]
+Type=simple
+
+User=open5gs
+Group=open5gs
+
+Restart=always
+ExecStart=@bindir@/open5gs-scpd -c @sysconfdir@/open5gs/scp.yaml
+RestartSec=2
+RestartPreventExitStatus=1
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

configs/systemd/open5gs-sgwcd.service.in

@@ -1,6 +1,6 @@
 [Unit]
 Description=Open5GS SGW-C Daemon
-After=networking.service
+After=network-online.target
 
 [Service]
 Type=simple

configs/systemd/open5gs-sgwud.service.in

@@ -1,6 +1,6 @@
 [Unit]
 Description=Open5GS SGW-U Daemon
-After=networking.service
+After=network-online.target
 
 [Service]
 Type=simple

configs/systemd/open5gs-smfd.service.in

@@ -1,7 +1,6 @@
 [Unit]
 Description=Open5GS SMF Daemon
-After=networking.service
-Requires=systemd-networkd.service
+After=network-online.target
 
 [Service]
 Type=simple

configs/systemd/open5gs-udmd.service.in

@@ -1,6 +1,6 @@
 [Unit]
 Description=Open5GS UDM Daemon
-After=networking.service
+After=network-online.target
 
 [Service]
 Type=simple

configs/systemd/open5gs-upfd.service.in

@@ -1,7 +1,7 @@
 [Unit]
 Description=Open5GS UPF Daemon
-After=networking.service
-Requires=systemd-networkd.service
+After=network-online.target systemd-networkd.service
+Wants=systemd-networkd.service
 
 [Service]
 Type=simple

configs/volte.yaml.in

@@ -4,6 +4,7 @@ logger:
 
 parameter:
 #    no_nrf: true
+#    no_scp: true
 #    no_amf: true
 #    no_smf: true
 #    no_upf: true
@@ -11,18 +12,21 @@ parameter:
 #    no_udm: true
 #    no_pcf: true
 #    no_nssf: true
+#    no_bsf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true
 #    no_sgwu: true
 #    no_pcrf: true
 #    no_hss: true
+#    use_mongodb_change_stream: true
 
 mme:
     freeDiameter:
       identity: mme.localdomain
       realm: localdomain
       listen_on: 127.0.0.2
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -31,7 +35,7 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -42,15 +46,15 @@ mme:
       - addr: 127.0.0.2
     gummei:
       plmn_id:
-        mcc: 001
-        mnc: 01
+        mcc: 999
+        mnc: 70
       mme_gid: 2
       mme_code: 1
     tai:
       plmn_id:
-        mcc: 001
-        mnc: 01
-      tac: 12345
+        mcc: 999
+        mnc: 70
+      tac: 1
     security:
         integrity_order : [ EIA2, EIA1, EIA0 ]
         ciphering_order : [ EEA0, EEA1, EEA2 ]
@@ -78,7 +82,7 @@ smf:
       - addr: ::1
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
     dns:
       - 8.8.8.8
       - 8.8.4.4
@@ -92,6 +96,7 @@ smf:
       identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -100,7 +105,7 @@ smf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -112,20 +117,20 @@ amf:
       - addr: 127.0.0.5
     guami:
       - plmn_id:
-          mcc: 001
-          mnc: 01
+          mcc: 999
+          mnc: 70
         amf_id:
           region: 2
           set: 1
     tai:
       - plmn_id:
-          mcc: 001
-          mnc: 01
+          mcc: 999
+          mnc: 70
         tac: 1
     plmn_support:
       - plmn_id:
-          mcc: 001
-          mnc: 01
+          mcc: 999
+          mnc: 70
         s_nssai:
           - sst: 1
     security:
@@ -148,13 +153,14 @@ upf:
       - addr: 127.0.0.7
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
 
 hss:
     freeDiameter:
       identity: hss.localdomain
       realm: localdomain
       listen_on: 127.0.0.8
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -163,7 +169,7 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -174,6 +180,7 @@ pcrf:
       identity: pcrf.localdomain
       realm: localdomain
       listen_on: 127.0.0.9
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -182,7 +189,7 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -216,11 +223,16 @@ nssf:
       - addr: 127.0.0.14
         port: 7777
     nsi:
-      - addr: ::1
+      - addr: 127.0.0.10
         port: 7777
         s_nssai:
           sst: 1
 
+bsf:
+    sbi:
+      - addr: 127.0.0.15
+        port: 7777
+
 udr:
     sbi:
       - addr: 127.0.0.20

configs/vonr.yaml.in

@@ -4,6 +4,7 @@ logger:
 
 parameter:
 #    no_nrf: true
+#    no_scp: true
 #    no_amf: true
 #    no_smf: true
 #    no_upf: true
@@ -11,18 +12,21 @@ parameter:
 #    no_udm: true
 #    no_pcf: true
 #    no_nssf: true
+#    no_bsf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true
 #    no_sgwu: true
 #    no_pcrf: true
 #    no_hss: true
+#    use_mongodb_change_stream: true
 
 mme:
     freeDiameter:
       identity: mme.localdomain
       realm: localdomain
       listen_on: 127.0.0.2
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -31,7 +35,7 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -42,13 +46,13 @@ mme:
       - addr: 127.0.0.2
     gummei:
       plmn_id:
-        mcc: 901
+        mcc: 999
         mnc: 70
       mme_gid: 2
       mme_code: 1
     tai:
       plmn_id:
-        mcc: 901
+        mcc: 999
         mnc: 70
       tac: 1
     security:
@@ -78,7 +82,7 @@ smf:
       - addr: ::1
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
     dns:
       - 8.8.8.8
       - 8.8.4.4
@@ -92,6 +96,7 @@ smf:
       identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -100,7 +105,7 @@ smf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -112,19 +117,19 @@ amf:
       - addr: 127.0.0.5
     guami:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         amf_id:
           region: 2
           set: 1
     tai:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         tac: 1
     plmn_support:
       - plmn_id:
-          mcc: 901
+          mcc: 999
           mnc: 70
         s_nssai:
           - sst: 1
@@ -148,13 +153,14 @@ upf:
       - addr: 127.0.0.7
     subnet:
       - addr: 10.45.0.1/16
-      - addr: 2001:230:cafe::1/48
+      - addr: 2001:db8:cafe::1/48
 
 hss:
     freeDiameter:
       identity: hss.localdomain
       realm: localdomain
       listen_on: 127.0.0.8
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -163,7 +169,7 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -172,6 +178,7 @@ pcrf:
       identity: pcrf.localdomain
       realm: localdomain
       listen_on: 127.0.0.9
+      no_fwd: true
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -180,7 +187,7 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
         - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -194,6 +201,11 @@ nrf:
         - ::1
         port: 7777
 
+scp:
+    sbi:
+      - addr: 127.0.1.10
+        port: 7777
+
 ausf:
     sbi:
       - addr: 127.0.0.11
@@ -214,11 +226,21 @@ nssf:
       - addr: 127.0.0.14
         port: 7777
     nsi:
-      - addr: ::1
+      - addr: 127.0.0.10
         port: 7777
         s_nssai:
           sst: 1
 
+bsf:
+    sbi:
+      - addr: 127.0.0.15
+        port: 7777
+
+af:
+    sbi:
+      - addr: 127.0.0.16
+        port: 7777
+
 udr:
     sbi:
       - addr: 127.0.0.20

debian/changelog

@@ -1,3 +1,573 @@
+open5gs (2.5.6) unstable; urgency=medium
+
+  * New NF - SCP(Service Communication Proxy)
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 18 Nov 2022 23:24:32 +0900
+
+open5gs (2.5.6~jammy5) jammy; urgency=medium
+
+  * New NF - SCP(Service Communication Proxy)
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 18 Nov 2022 23:23:07 +0900
+
+open5gs (2.5.6~kinetic3) kinetic; urgency=medium
+
+  * New NF - SCP(Service Communication Proxy)
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 18 Nov 2022 23:21:16 +0900
+
+open5gs (2.5.6~bionic3) bionic; urgency=medium
+
+  * New NF - SCP(Service Communication Proxy)
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 18 Nov 2022 23:18:33 +0900
+
+open5gs (2.5.6~focal3) focal; urgency=medium
+
+  * New NF - SCP(Service Communication Proxy)
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 18 Nov 2022 23:17:05 +0900
+
+open5gs (2.4.11) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 01 Oct 2022 13:51:50 +0900
+
+open5gs (2.4.11~jammy) jammy; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 01 Oct 2022 13:50:11 +0900
+
+open5gs (2.4.11~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 01 Oct 2022 13:48:49 +0900
+
+open5gs (2.4.11~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 01 Oct 2022 13:47:02 +0900
+
+open5gs (2.4.10) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 09 Sep 2022 09:36:48 +0900
+
+open5gs (2.4.10~jammy) jammy; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 09 Sep 2022 09:35:23 +0900
+
+open5gs (2.4.10~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 09 Sep 2022 09:34:00 +0900
+
+open5gs (2.4.10~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 09 Sep 2022 09:30:16 +0900
+
+open5gs (2.4.9) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Mon, 25 Jul 2022 20:49:38 +0900
+
+open5gs (2.4.9~jammy) jammy; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Mon, 25 Jul 2022 20:48:36 +0900
+
+open5gs (2.4.9~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Mon, 25 Jul 2022 20:47:16 +0900
+
+open5gs (2.4.9~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Mon, 25 Jul 2022 20:45:33 +0900
+
+open5gs (2.4.8) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 12 Jun 2022 16:28:51 +0900
+
+open5gs (2.4.8~jammy) jammy; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 12 Jun 2022 16:27:13 +0900
+
+open5gs (2.4.8~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 12 Jun 2022 16:23:05 +0900
+
+open5gs (2.4.8~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 12 Jun 2022 16:22:04 +0900
+
+open5gs (2.4.8~impish) impish; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 12 Jun 2022 16:19:27 +0900
+
+open5gs (2.4.7) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 21 May 2022 19:20:07 +0900
+
+open5gs (2.4.7~jammy) jammy; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 21 May 2022 19:19:10 +0900
+
+open5gs (2.4.7~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 21 May 2022 19:18:11 +0900
+
+open5gs (2.4.7~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 21 May 2022 19:17:08 +0900
+
+open5gs (2.4.7~impish) impish; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 21 May 2022 19:14:58 +0900
+
+open5gs (2.4.6) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 17 May 2022 22:41:32 +0900
+
+open5gs (2.4.6~jammy) jammy; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 17 May 2022 22:40:16 +0900
+
+open5gs (2.4.6~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 17 May 2022 22:38:38 +0900
+
+open5gs (2.4.6~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 17 May 2022 22:37:22 +0900
+
+open5gs (2.4.6~impish) impish; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 17 May 2022 22:34:40 +0900
+
+open5gs (2.4.5) unstable; urgency=medium
+
+  * GTP-1C(GGSN) provided by sysmocom
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 27 Mar 2022 18:41:04 +0900
+
+open5gs (2.4.5~focal) focal; urgency=medium
+
+  * GTP-1C(GGSN) provided by sysmocom
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 27 Mar 2022 18:40:06 +0900
+
+open5gs (2.4.5~bionic) bionic; urgency=medium
+
+  * GTP-1C(GGSN) provided by sysmocom
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 27 Mar 2022 18:38:55 +0900
+
+open5gs (2.4.5~impish) impish; urgency=medium
+
+  * GTP-1C(GGSN) provided by sysmocom
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 27 Mar 2022 18:37:40 +0900
+
+open5gs (2.4.4) unstable; urgency=medium
+
+  * Fixed Memory leak
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 01 Feb 2022 15:03:37 +0900
+
+open5gs (2.4.4~focal) focal; urgency=medium
+
+  * Fixed Memory leak
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 01 Feb 2022 15:02:35 +0900
+
+open5gs (2.4.4~bionic) bionic; urgency=medium
+
+  * Fixed Memory leak
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 01 Feb 2022 15:01:31 +0900
+
+open5gs (2.4.4~impish) impish; urgency=medium
+
+  * Fixed Memory leak
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 01 Feb 2022 14:58:13 +0900
+
+open5gs (2.4.3) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 20 Jan 2022 17:09:51 +0900
+
+open5gs (2.4.3~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 20 Jan 2022 17:08:55 +0900
+
+open5gs (2.4.3~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 20 Jan 2022 17:08:01 +0900
+
+open5gs (2.4.3~hirsute) hirsute; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 20 Jan 2022 17:06:53 +0900
+
+open5gs (2.4.3~impish) impish; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 20 Jan 2022 17:05:35 +0900
+
+open5gs (2.4.2) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 14 Jan 2022 20:39:46 +0900
+
+open5gs (2.4.2~impish) impish; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 14 Jan 2022 20:38:43 +0900
+
+open5gs (2.4.2~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 14 Jan 2022 20:37:33 +0900
+
+open5gs (2.4.2~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 14 Jan 2022 20:36:17 +0900
+
+open5gs (2.4.2~hirsute) hirsute; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 14 Jan 2022 20:34:57 +0900
+
+open5gs (2.4.1) unstable; urgency=medium
+
+  * Use talloc & S1AP/NGAP r16.7.0
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 04 Jan 2022 17:34:08 +0900
+
+open5gs (2.4.1~bionic) bionic; urgency=medium
+
+  * Use talloc & S1AP/NGAP r16.7.0
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 04 Jan 2022 17:33:09 +0900
+
+open5gs (2.4.1~focal) focal; urgency=medium
+
+  * Use talloc & S1AP/NGAP r16.7.0
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 04 Jan 2022 17:31:56 +0900
+
+open5gs (2.4.1~hirsute) hirsute; urgency=medium
+
+  * Use talloc & S1AP/NGAP r16.7.0
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 04 Jan 2022 17:27:54 +0900
+
+open5gs (2.4.0) unstable; urgency=medium
+
+  * VoNR Added
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 11 Dec 2021 22:21:31 +0900
+
+open5gs (2.4.0~bionic) bionic; urgency=medium
+
+  * VoNR added
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 11 Dec 2021 22:19:42 +0900
+
+open5gs (2.4.0~focal) focal; urgency=medium
+
+  * VoNR added
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 11 Dec 2021 22:18:26 +0900
+
+open5gs (2.4.0~hirsute) hirsute; urgency=medium
+
+  * VoNR added
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 11 Dec 2021 21:22:12 +0900
+
+open5gs (2.3.6) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 16 Oct 2021 22:45:37 +0900
+
+open5gs (2.3.6~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 16 Oct 2021 22:44:14 +0900
+
+open5gs (2.3.6~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 16 Oct 2021 22:43:17 +0900
+
+open5gs (2.3.6~hirsute) hirsute; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 16 Oct 2021 22:42:02 +0900
+
+open5gs (2.3.4) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 06 Oct 2021 21:46:16 +0900
+
+open5gs (2.3.4~hirsute) hirsute; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 06 Oct 2021 21:44:21 +0900
+
+open5gs (2.3.4~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 06 Oct 2021 21:43:06 +0900
+
+open5gs (2.3.4~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 06 Oct 2021 21:41:20 +0900
+
+open5gs (2.3.3) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 21 Aug 2021 18:20:49 +0900
+
+open5gs (2.3.3~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 21 Aug 2021 18:19:35 +0900
+
+open5gs (2.3.3~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 21 Aug 2021 18:17:53 +0900
+
+open5gs (2.3.3~hirsute) hirsute; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 21 Aug 2021 18:16:18 +0900
+
+open5gs (2.3.2) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 18 Jul 2021 20:24:08 +0900
+
+open5gs (2.3.2~hirsute) hirsute; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 18 Jul 2021 20:23:04 +0900
+
+open5gs (2.3.2~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 18 Jul 2021 20:21:54 +0900
+
+open5gs (2.3.2~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 18 Jul 2021 20:20:38 +0900
+
+open5gs (2.3.1) unstable; urgency=medium
+
+  * Support ePDG Interface
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 29 Jun 2021 22:12:11 +0900
+
+open5gs (2.3.1~hirsute) hirsute; urgency=medium
+
+  * Support ePDG Interface
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 29 Jun 2021 22:11:04 +0900
+
+open5gs (2.3.1~bionic) bionic; urgency=medium
+
+  * Support ePDG Interface
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 29 Jun 2021 22:10:02 +0900
+
+open5gs (2.3.1~focal) focal; urgency=medium
+
+  * Support ePDG Interface
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 29 Jun 2021 22:08:55 +0900
+
+open5gs (2.3.0) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 08 Jun 2021 21:19:10 +0900
+
+open5gs (2.3.0~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 08 Jun 2021 21:18:10 +0900
+
+open5gs (2.3.0~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 08 Jun 2021 21:16:53 +0900
+
+open5gs (2.3.0~hirsute) hirsute; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 08 Jun 2021 21:15:17 +0900
+
+open5gs (2.2.9) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 19 May 2021 14:12:49 +0900
+
+open5gs (2.2.9~hirsute1) hirsute; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 19 May 2021 14:11:46 +0900
+
+open5gs (2.2.9~bionic1) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 19 May 2021 14:10:51 +0900
+
+open5gs (2.2.9~focal1) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 19 May 2021 14:09:29 +0900
+
+open5gs (2.2.9~hirsute) hirsute; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 19 May 2021 14:06:05 +0900
+
+open5gs (2.2.9~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 19 May 2021 13:32:46 +0900
+
+open5gs (2.2.9~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 19 May 2021 13:31:08 +0900
+
+open5gs (2.2.8) unstable; urgency=medium
+
+  * Security Protection
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 09 May 2021 11:23:01 +0900
+
+open5gs (2.2.8~bionic) bionic; urgency=medium
+
+  * Security Protection
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 09 May 2021 11:22:02 +0900
+
+open5gs (2.2.8~focal) focal; urgency=medium
+
+  * Security Protection
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 09 May 2021 11:20:13 +0900
+
+open5gs (2.2.7) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 30 Apr 2021 14:20:47 +0900
+
+open5gs (2.2.7~focal3) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 30 Apr 2021 14:19:39 +0900
+
+open5gs (2.2.7~bionic3) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 30 Apr 2021 14:17:11 +0900
+
 open5gs (2.2.6) unstable; urgency=medium
 
   * HSS Cx Added

debian/control

@@ -20,6 +20,8 @@ Build-Depends: debhelper (>= 11),
                libmicrohttpd-dev,
                libcurl4-gnutls-dev,
                libnghttp2-dev,
+               libtins-dev,
+               libtalloc-dev,
 Standards-Version: 4.3.0
 Rules-Requires-Root: no
 Homepage: https://open5gs.org
@@ -163,6 +165,18 @@ Description: NRF (Network Repository Function)
  .
  This package provides the NRF (Network Repository Function)
 
+Package: open5gs-scp
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         open5gs-common (= ${binary:Version})
+Description: SCP (Network Repository Function)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
+ .
+ This package provides the SCP (Service Communication Proxy)
+
 Package: open5gs-ausf
 Architecture: any
 Multi-Arch: same
@@ -211,6 +225,18 @@ Description: NSSF (Network Slice Selection Function)
  .
  This package provides the NSSF (Network Slice Selection Function)
 
+Package: open5gs-bsf
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         open5gs-common (= ${binary:Version})
+Description: BSF (Binding Support Function)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
+ .
+ This package provides the BSF (Binding Support Function)
+
 Package: open5gs-udr
 Architecture: any
 Multi-Arch: same
@@ -237,10 +263,12 @@ Depends: ${misc:Depends},
          open5gs-hss (= ${binary:Version}),
          open5gs-pcrf (= ${binary:Version}),
          open5gs-nrf (= ${binary:Version}),
+         open5gs-scp (= ${binary:Version}),
          open5gs-ausf (= ${binary:Version}),
          open5gs-udm (= ${binary:Version}),
          open5gs-pcf (= ${binary:Version}),
          open5gs-nssf (= ${binary:Version}),
+         open5gs-bsf (= ${binary:Version}),
          open5gs-udr (= ${binary:Version})
 Description: 5G Core and EPC (metapackage)
  Open5GS is a C-language implementation of 5G Core and EPC

debian/open5gs-bsf.install

@@ -0,0 +1,3 @@
+usr/bin/open5gs-bsfd
+configs/open5gs/bsf.yaml etc/open5gs
+configs/systemd/open5gs-bsfd.service lib/systemd/system

debian/open5gs-common.install

@@ -3,4 +3,3 @@ usr/lib/*/libfd*.so*
 usr/lib/*/freeDiameter/*.fdx
 configs/freeDiameter/cacert.pem /etc/freeDiameter
 configs/logrotate/open5gs /etc/logrotate.d
-#misc/db/open5gs-dbctl /usr/bin

debian/open5gs-common.postinst

@@ -20,17 +20,17 @@ set -e
 
 case "$1" in
     configure)
-	# create a open5gs group and user
-	if ! getent passwd open5gs >/dev/null; then
-		adduser --system --disabled-password --disabled-login \
-			--home /var/run/open5gs --no-create-home \
-			--quiet --group open5gs
-	fi
-	for dir in /var/log/open5gs; do
-		if ! dpkg-statoverride --list "$dir" >/dev/null 2>&1; then
-			dpkg-statoverride --update --add open5gs open5gs 0755 "$dir"
-		fi
-	done
+    # create a open5gs group and user
+    if ! getent passwd open5gs >/dev/null; then
+        adduser --system --disabled-password --disabled-login \
+            --home /var/run/open5gs --no-create-home \
+            --quiet --group open5gs
+    fi
+    for dir in /var/log/open5gs; do
+        if ! dpkg-statoverride --list "$dir" >/dev/null 2>&1; then
+            dpkg-statoverride --update --add open5gs open5gs 0755 "$dir"
+        fi
+    done
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

debian/open5gs-scp.install

@@ -0,0 +1,3 @@
+usr/bin/open5gs-scpd
+configs/open5gs/scp.yaml etc/open5gs
+configs/systemd/open5gs-scpd.service lib/systemd/system

debian/open5gs-upf.postinst

@@ -20,18 +20,20 @@ set -e
 
 case "$1" in
     configure)
-	if test "x`sysctl -n net.ipv6.conf.all.disable_ipv6`" = x1; then
-		echo "net.ipv6.conf.all.disable_ipv6=0" > /etc/sysctl.d/30-open5gs.conf
-		sysctl -p /etc/sysctl.d/30-open5gs.conf
-	fi
-	if test "x`systemctl is-enabled systemd-networkd`" = xdisabled; then
-		systemctl enable systemd-networkd
-	fi
-	deb-systemd-invoke restart systemd-networkd
-	if test -f /etc/sysctl.d/30-open5gs.conf && grep "ogstun" /proc/net/dev > /dev/null; then
-		echo "net.ipv6.conf.ogstun.disable_ipv6=0" > /etc/sysctl.d/30-open5gs.conf
-		sysctl -p /etc/sysctl.d/30-open5gs.conf
-	fi
+    if test "x`sysctl -n net.ipv6.conf.all.disable_ipv6`" = x1; then
+        echo "net.ipv6.conf.all.disable_ipv6=0" > /etc/sysctl.d/30-open5gs.conf
+        sysctl -p /etc/sysctl.d/30-open5gs.conf
+    fi
+    if test "x`systemctl is-enabled systemd-networkd`" = xdisabled; then
+        systemctl enable systemd-networkd
+    fi
+    if test -d "/run/systemd"; then
+        deb-systemd-invoke restart systemd-networkd
+    fi
+    if test -f /etc/sysctl.d/30-open5gs.conf && grep "ogstun" /proc/net/dev > /dev/null; then
+        echo "net.ipv6.conf.ogstun.disable_ipv6=0" > /etc/sysctl.d/30-open5gs.conf
+        sysctl -p /etc/sysctl.d/30-open5gs.conf
+    fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

debian/open5gs-upf.postrm

@@ -24,7 +24,7 @@ case "$1" in
     if grep "ogstun" /proc/net/dev > /dev/null; then
         ip tuntap del name ogstun mode tun
     fi
-	rm -f /etc/sysctl.d/30-open5gs.conf
+    rm -f /etc/sysctl.d/30-open5gs.conf
     ;;
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

docker/README.md

@@ -1,76 +1,102 @@
 Docker running example
 ===========================================
-* Build Image
-  $ docker-compose build
+* Development
+  
+  `$ docker compose run dev`
 
-* Development 
-  $ docker-compose run dev
-
-* Runtime
-  $ docker-compose \
-    -f docker-compose.yml -f docker-compose.run.yml run run
+* Run WebUI
+  
+  `$ docker-compose up webui`
 
 * Test
-  $ docker-compose \
-    -f docker-compose.yml -f docker-compose.test.yml run test
 
-* Test(ubuntu:artful)
-  $ TAG=eoan docker-compose build
-  $ TAG=eoan docker-compose \
-    -f docker-compose.yml -f docker-compose.test.yml run test
+  `$ docker compose run test`
+
+* Test(ubuntu:focal)
+
+  `$ TAG=focal docker compose run test`
 
 * Development(fedora:latest)
-  $ DIST=fedora docker-compose build
-  $ DIST=fedora docker-compose run dev
 
-* Runtime(debian:jessie)
-  $ DIST=debian TAG=stretch docker-compose build
-  $ DIST=debian TAG=stretch docker-compose 
-    -f docker-compose.yml -f docker-compose.run.yml run run
+  `$ DIST=fedora docker compose run dev`
 
 * All Test with All Environment
-  $ ./check.sh
+  
+  `$ ./check.sh`
 
-* Run WebUI 
-  $ docker-compose up -d
+* Runtime
+
+  `$ docker compose run run`
 
 For OpenSUSE Build Service Release
 ===========================================
 
 * Build Package
+  
+  ```
   $ ./build-aux/git-version-gen . > .tarball-version
   $ dpkg-source -b .
   $ rm -f .tarball-version
+  ```
 
 * Get Release Key
+  
+  ```
   $ wget http://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_18.04/Release.key
   $ sudo apt-key add Release.key
+  ```
 
 * Setup Repository
+  ```
   $ sudo sh -c "echo 'deb https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_18.04/ ./' > /etc/apt/sources.list.d/open5gs-latest.list"
   $ sudo apt-get update
+  ```
   
 For Launchpad Release
 ===========================================
 
 * Run Docker
+  
+  ```
   $ docker-compose run dev
+  ```
 
 * Setup Debian Environment
+
+```
 export DEBFULLNAME='Sukchan Lee'
 export DEBEMAIL='acetcom@gmail.com'
+```
 
 * Transfer GPG key
+
+```
   $ gpg --export-secret-keys --armor --output private.asc
   $ gpg --import private.asc
   $ gpg --export > public.asc
   $ gpg --import public.asc
+  ```
 
 * Version Change
-  $ vi meson.build
-  $ ./misc/git-version-gen . > .tarball-version 2>/dev/null
+  
+  ```
+  $ cat ./meson.build
+  $ cat ./webui/package.json
+  $ cat ./webui/package-lock.json
+  $ cat ./docs/assets/webui/install
+  ```
+
+* New NF
+  ```
+  $ cat debian/control
+  $ cat configs/systemd/open5gs-scpd.service.in
+  $ cat configs/logrotate/open5gs.in
+  $ cat configs/newsyslog/open5gs.conf.in
+  ```
 
 * Upload OpenBuildService
+  
+  ```
   $ dch -i
   $ meson subprojects download freeDiameter
   $ debuild -S -uc -us -d
@@ -78,16 +104,25 @@ export DEBEMAIL='acetcom@gmail.com'
   $ cd home\:acetcom\:open5gs/latest/
   $ cp ~/git/open5gs_1.0.0.* .
   $ osc ci -m "Update it"
+  ```
 
 * Upload LaunchPad
+  
+  ```
   $ dch -i
   $ meson subprojects download freeDiameter
   $ debuild -S -d
   $ dput ppa:open5gs/latest *.source.changes
+  ```
 
 * Tagging
+  
+  ```
   $ git tag v1.x.x -a
+  ```
 
 * Build package
+  
+  ```
   $ dpkg-buildpackage -d
-
+  ```

docker/alpine/latest/base/Dockerfile

@@ -0,0 +1,27 @@
+ARG dist=alpine
+ARG tag=latest
+FROM ${dist}:${tag}
+
+MAINTAINER Sukchan Lee <acetcom@gmail.com>
+
+RUN apk update && \
+    apk add --no-cache \
+        alpine-sdk \
+        bison \
+        flex \
+        git \
+        meson \
+        bash \
+        linux-headers \
+        bsd-compat-headers \
+        yaml-dev \
+        lksctp-tools-dev \
+        gnutls-dev \
+        libgcrypt-dev \
+        libidn-dev \
+        mongo-c-driver-dev \
+        libmicrohttpd-dev \
+        curl-dev \
+        nghttp2-dev \
+        talloc-dev \
+        iproute2

docker/alpine/latest/dev/Dockerfile

@@ -1,21 +1,19 @@
-ARG dist=centos
+ARG dist=alpine
 ARG tag=latest
 ARG username=acetcom
 FROM ${username}/${dist}-${tag}-open5gs-base
 
 MAINTAINER Sukchan Lee <acetcom@gmail.com>
 
-RUN yum -y install \
-        cscope \
-        vim \
-        sudo \
-        iputils \
-        net-tools
-
 COPY setup.sh /root
 
+RUN apk update && \
+    apk add --no-cache \
+        vim \
+        sudo
+
 ARG username=acetcom
-RUN useradd -m --uid=1000 ${username} && \
+RUN adduser -u 1000 acetcom -D && \
     echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \
     chmod 0440 /etc/sudoers.d/${username}
 

docker/alpine/latest/dev/setup.sh

@@ -5,6 +5,6 @@ if ! grep "ogstun" /proc/net/dev > /dev/null; then
 fi
 ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null
 ip addr add 10.45.0.1/16 dev ogstun
-ip addr del 2001:230:cafe::1/48 dev ogstun 2> /dev/null
-ip addr add 2001:230:cafe::1/48 dev ogstun
+ip addr del 2001:db8:cafe::1/48 dev ogstun 2> /dev/null
+ip addr add 2001:db8:cafe::1/48 dev ogstun
 ip link set ogstun up

docker/build/Dockerfile

@@ -5,15 +5,11 @@ FROM ${username}/${dist}-${tag}-open5gs-base
 
 MAINTAINER Sukchan Lee <acetcom@gmail.com>
 
-WORKDIR /root
-COPY setup.sh /root
+WORKDIR /open5gs
+COPY docker/build/setup.sh /root
+COPY ./ /open5gs
 
-ARG USER=open5gs
-ARG REPO=open5gs
-ARG BRANCH=main
-RUN	git clone https://github.com/$USER/$REPO
-ADD https://api.github.com/repos/$USER/$REPO/git/refs/heads/$BRANCH /root/open5gs-ver.json
+ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.9.0/wait /wait
+RUN chmod +x /wait
 
-RUN	cd $REPO && \
-	git fetch && git checkout -f -B $BRANCH origin/$BRANCH && \
-    meson build && ninja -C build install
+RUN meson build && ninja -C build install

docker/build/setup.sh

@@ -5,6 +5,6 @@ if ! grep "ogstun" /proc/net/dev > /dev/null; then
 fi
 ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null
 ip addr add 10.45.0.1/16 dev ogstun
-ip addr del 2001:230:cafe::1/48 dev ogstun 2> /dev/null
-ip addr add 2001:230:cafe::1/48 dev ogstun
+ip addr del 2001:db8:cafe::1/48 dev ogstun 2> /dev/null
+ip addr add 2001:db8:cafe::1/48 dev ogstun
 ip link set ogstun up

docker/centos/7/base/Dockerfile

@@ -1,30 +0,0 @@
-ARG dist=centos
-ARG tag=latest
-FROM ${dist}:${tag}
-
-MAINTAINER Sukchan Lee <acetcom@gmail.com>
-
-RUN yum -y install epel-release
-#RUN yum -y install https://centos7.iuscommunity.org/ius-release.rpm
-RUN yum -y update
-
-RUN yum -y install \
-        python3 \
-        ninja-build \
-        gcc \
-        flex \
-        bison \
-        git \
-        meson \
-        lksctp-tools-devel \
-        libidn-devel \
-        gnutls-devel \
-        libgcrypt-devel \
-        openssl-devel \
-        cyrus-sasl-devel \
-        libyaml-devel \
-        mongo-c-driver-devel \
-        libmicrohttpd-devel \
-        libcurl-devel \
-        libnghttp2-devel \
-        iproute

docker/centos/7/dev

@@ -1 +0,0 @@
-../8/dev

docker/centos/latest/base/Dockerfile

@@ -1,37 +0,0 @@
-ARG dist=centos
-ARG tag=latest
-FROM ${dist}:${tag}
-
-MAINTAINER Sukchan Lee <acetcom@gmail.com>
-
-RUN dnf -y install epel-release && \
-        dnf -y install 'dnf-command(config-manager)' && \
-        dnf config-manager --set-enabled PowerTools && \
-        dnf -y update
-
-RUN dnf -y install \
-        https://www.elrepo.org/elrepo-release-8.el8.elrepo.noarch.rpm && \
-        dnf config-manager --set-enabled elrepo-testing && \
-        dnf -y update
-
-RUN dnf -y install \
-        python3 \
-        ninja-build \
-        gcc \
-        flex \
-        bison \
-        git \
-        lksctp-tools-devel \
-        libidn-devel \
-        gnutls-devel \
-        libgcrypt-devel \
-        openssl-devel \
-        cyrus-sasl-devel \
-        libyaml-devel \
-        mongo-c-driver-devel \
-        libmicrohttpd-devel \
-        libcurl-devel \
-        libnghttp2-devel \
-        iproute
-
-RUN dnf -y install meson

docker/check.sh

@@ -1,18 +1,9 @@
 #!/bin/sh
 
-docker-compose build
-docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
-
-TAG=bionic docker-compose build
-TAG=bionic docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
-
-DIST=fedora TAG=32 docker-compose build
-DIST=fedora TAG=32 docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
-
-DIST=centos docker-compose build
-DIST=centos docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
-
-DIST=debian docker-compose build
-DIST=debian docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
+docker compose run --rm test
+TAG=focal docker compose run --rm test
+DIST=fedora docker compose run --rm test
+DIST=debian docker compose run --rm test
+#DIST=alpine docker compose run --rm test
 
 docker rm $(docker ps -qa --no-trunc --filter "status=exited")

docker/debian/latest/base/Dockerfile

@@ -28,6 +28,8 @@ RUN apt-get update && \
         libmicrohttpd-dev \
         libcurl4-gnutls-dev \
         libnghttp2-dev \
+        libtins-dev \
+        libtalloc-dev \
         iproute2 \
         ca-certificates \
         netbase \

docker/debian/latest/dev/setup.sh

@@ -5,6 +5,6 @@ if ! grep "ogstun" /proc/net/dev > /dev/null; then
 fi
 ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null
 ip addr add 10.45.0.1/16 dev ogstun
-ip addr del 2001:230:cafe::1/48 dev ogstun 2> /dev/null
-ip addr add 2001:230:cafe::1/48 dev ogstun
+ip addr del 2001:db8:cafe::1/48 dev ogstun 2> /dev/null
+ip addr add 2001:db8:cafe::1/48 dev ogstun
 ip link set ogstun up

docker/debian/sid

@@ -0,0 +1 @@
+latest

docker/debian/testing

@@ -0,0 +1 @@
+latest

docker/docker-compose.run.yml

@@ -1,22 +0,0 @@
-version: '3'
-
-services:
-  run:
-    network_mode: "host"
-    image: ${USER}/${DIST-ubuntu}-${TAG-latest}-open5gs-build
-    depends_on:
-      - mongodb
-      - build
-    cap_add:
-      - NET_ADMIN
-    devices:
-      - "/dev/net/tun:/dev/net/tun"
-    sysctls:
-      - net.ipv6.conf.all.disable_ipv6=0
-    volumes:
-      - config:/etc/open5gs
-    hostname: open5gs-run
-    command: /bin/bash -c "/root/setup.sh; /usr/bin/open5gs-pcrfd -D; /usr/bin/open5gs-pgwd -D; /usr/bin/open5gs-sgwd -D; /usr/bin/open5gs-hssd -D; /usr/bin/open5gs-mmed"
-
-volumes:
-  config: {}

docker/docker-compose.test.yml

@@ -1,18 +0,0 @@
-version: '3'
-
-services:
-  test:
-    image: ${USER}/${DIST-ubuntu}-${TAG-latest}-open5gs-build
-    depends_on:
-      - mongodb
-      - build
-    environment:
-      DB_URI: mongodb://mongodb/open5gs
-    cap_add:
-      - NET_ADMIN
-    devices:
-      - "/dev/net/tun:/dev/net/tun"
-    sysctls:
-      - net.ipv6.conf.all.disable_ipv6=0
-    hostname: open5gs-test
-    command: /bin/bash -c "/root/setup.sh; cd open5gs && ninja -C build test"

docker/docker-compose.yml

@@ -6,21 +6,24 @@ services:
     container_name: open5gs-mongodb
     ports:
       - "27017:27017"
+    restart: unless-stopped
     volumes:
       - mongodb:/data/db
+      - ../docs/assets/webui/mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
 
   webui:
-    build: webui
+    build:
+      context: ../
+      dockerfile: docker/webui/Dockerfile
     image: ${USER}/open5gs-webui
     container_name: open5gs-webui
     depends_on:
       - mongodb
     ports:
       - "3000:3000"
-    depends_on:
-      - mongodb
     environment:
-      DB_URI: mongodb://mongodb/open5gs
+      - DB_URI=mongodb://mongodb/open5gs
+      - WAIT_HOSTS=mongodb:27017
 
   base:
     build:
@@ -33,7 +36,8 @@ services:
 
   build:
     build:
-      context: ./build
+      context: ../
+      dockerfile: docker/build/Dockerfile
       args:
         dist: ${DIST-ubuntu}
         tag: ${TAG-latest}
@@ -43,6 +47,40 @@ services:
       - base
     command: /bin/bash -c "echo 'build' services"
 
+  run:
+#    network_mode: "host"
+    image: ${USER}/${DIST-ubuntu}-${TAG-latest}-open5gs-build
+    depends_on:
+      - mongodb
+      - build
+    cap_add:
+      - NET_ADMIN
+    devices:
+      - "/dev/net/tun:/dev/net/tun"
+    sysctls:
+      - net.ipv6.conf.all.disable_ipv6=0
+    volumes:
+      - config:/etc/open5gs
+    hostname: open5gs-run
+#    command: /bin/bash -c "/root/setup.sh; /usr/bin/open5gs-pcrfd -D; /usr/bin/open5gs-pgwd -D; /usr/bin/open5gs-sgwd -D; /usr/bin/open5gs-hssd -D; /usr/bin/open5gs-mmed"
+
+  test:
+    image: ${USER}/${DIST-ubuntu}-${TAG-latest}-open5gs-build
+    depends_on:
+      - mongodb
+      - build
+    environment:
+      - DB_URI=mongodb://mongodb/open5gs
+      - WAIT_HOSTS=mongodb:27017
+    cap_add:
+      - NET_ADMIN
+    devices:
+      - "/dev/net/tun:/dev/net/tun"
+    sysctls:
+      - net.ipv6.conf.all.disable_ipv6=0
+    hostname: open5gs-test
+    command: /bin/bash -c "/root/setup.sh; cd /open5gs/build && /wait && meson test -v"
+
   dev:
     build:
       context: ./${DIST-ubuntu}/${TAG-latest}/dev
@@ -67,7 +105,7 @@ services:
     volumes:
       - home:/home/${USER}
       - ${HOME}:/mnt
-      - /tmp/.X11-unix:/tmp/.X11-unix
+    # - /tmp/.X11-unix:/tmp/.X11-unix
     # - /etc/localtime:/etc/localtime:ro
     # - /usr/share/zoneinfo/Europe/Helsinki:/etc/localtime:ro
     hostname: open5gs-dev
@@ -82,3 +120,4 @@ services:
 volumes:
   mongodb: {}
   home: {}
+  config: {}

docker/fedora/latest/base/Dockerfile

@@ -8,6 +8,7 @@ RUN dnf -y install \
         python3 \
         ninja-build \
         gcc \
+        gcc-c++ \
         flex \
         bison \
         git \
@@ -22,6 +23,7 @@ RUN dnf -y install \
         libmicrohttpd-devel \
         libcurl-devel \
         libnghttp2-devel \
+        libtalloc-devel \
         iproute
 
 RUN dnf -y install meson

docker/fedora/latest/dev/setup.sh

@@ -5,6 +5,6 @@ if ! grep "ogstun" /proc/net/dev > /dev/null; then
 fi
 ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null
 ip addr add 10.45.0.1/16 dev ogstun
-ip addr del 2001:230:cafe::1/48 dev ogstun 2> /dev/null
-ip addr add 2001:230:cafe::1/48 dev ogstun
+ip addr del 2001:db8:cafe::1/48 dev ogstun 2> /dev/null
+ip addr add 2001:db8:cafe::1/48 dev ogstun
 ip link set ogstun up

docker/ubuntu/hirsute

@@ -0,0 +1 @@
+latest

docker/ubuntu/latest/base/Dockerfile

@@ -28,6 +28,8 @@ RUN apt-get update && \
         libmicrohttpd-dev \
         libcurl4-gnutls-dev \
         libnghttp2-dev \
+        libtins-dev \
+        libtalloc-dev \
         iproute2 \
         ca-certificates \
         netbase \

docker/ubuntu/latest/dev/Dockerfile

@@ -23,12 +23,12 @@ RUN apt-get update && \
         net-tools && \
     apt-get clean
 
-RUN apt-get update && \
-    apt-get install -y software-properties-common && \
-    sudo add-apt-repository ppa:wireshark-dev/stable -y && \
-    apt-get update && \
-    DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y wireshark
+#RUN apt-get update && \
+#    apt-get install -y software-properties-common && \
+#    sudo add-apt-repository ppa:wireshark-dev/stable -y && \
+#    apt-get update && \
+#    DEBIAN_FRONTEND=noninteractive \
+#    apt-get install -y wireshark
 
 COPY setup.sh /root
 

docker/ubuntu/latest/dev/setup.sh

@@ -5,6 +5,6 @@ if ! grep "ogstun" /proc/net/dev > /dev/null; then
 fi
 ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null
 ip addr add 10.45.0.1/16 dev ogstun
-ip addr del 2001:230:cafe::1/48 dev ogstun 2> /dev/null
-ip addr add 2001:230:cafe::1/48 dev ogstun
+ip addr del 2001:db8:cafe::1/48 dev ogstun 2> /dev/null
+ip addr add 2001:db8:cafe::1/48 dev ogstun
 ip link set ogstun up

docker/webui/Dockerfile

@@ -1,21 +1,16 @@
-FROM node:carbon
+FROM node:19
 
 MAINTAINER Sukchan Lee <acetcom@gmail.com>
 
-ARG PACKAGE=open5gs
-ARG VERSION=1.0.0
-
-RUN set -e; \
-    cd /usr/src; \
-    rm -rf ./$PACKAGE; \
-    curl -SLO "https://github.com/open5gs/$PACKAGE/archive/v$VERSION.tar.gz"; \
-    tar -xvf v$VERSION.tar.gz; \
-    mv ./$PACKAGE-$VERSION/ ./$PACKAGE;
+COPY webui /usr/src/open5gs/webui
 
 WORKDIR /usr/src/open5gs/webui
-RUN npm install && \
+RUN npm clean-install && \
     npm run build
 
-CMD npm run start
+ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.9.0/wait /wait
+RUN chmod +x /wait
+
+CMD /wait && npm run start
 
 EXPOSE 3000

docs/_config.yml

@@ -22,7 +22,7 @@ baseurl: "/open5gs" # the subpath of your site, e.g. /blog
 url: "https://open5gs.org" # the base hostname & protocol for your site, e.g. http://example.com
 author: "Sukchan Lee"
 github_username: open5gs
-google_analytics: UA-139225646-2
+google_analytics: G-12MQZTB3JH
 
 # Build settings
 markdown: kramdown

docs/_docs/guide/01-quickstart.md

@@ -34,7 +34,7 @@ The Open5GS 4G/ 5G NSA Core contains the following components:
 
 The core has two main planes: the control plane and the user plane. These are physically separated in Open5GS as CUPS (control/ user plane separation) is implemented.
 
-The MME is the main **control plane** hub of the core. It primarily manages sessions, mobilty, paging and bearers. It links to the HSS, which generates SIM authentication vectors and holds the subscriber profile; and also to the SGWC and PGWC/SMF, which are the control planes of the gateway servers. All the eNBs in the mobile network (4G basestations) connect to the MME. The final element of the control plane is the PCRF, which sits in-between the PGWC/SMF and the HSS, and handles charging and enforces subscriber policies.
+The MME is the main **control plane** hub of the core. It primarily manages sessions, mobility, paging and bearers. It links to the HSS, which generates SIM authentication vectors and holds the subscriber profile; and also to the SGWC and PGWC/SMF, which are the control planes of the gateway servers. All the eNBs in the mobile network (4G basestations) connect to the MME. The final element of the control plane is the PCRF, which sits in-between the PGWC/SMF and the HSS, and handles charging and enforces subscriber policies.
 
 The **user plane** carries user data packets between the eNB/ NSA gNB (5G NSA basestations) and the external WAN. The two user plane core components are the SGWU and PGWU/UPF. Each of these connect back to their control plane counterparts. eNBs/ NSA gNBs connect to the SGWU, which connects to the PGWU/UPF, and on to the WAN.  *By having the control and user planes physically separated like this, it means you can deploy multiple user plane servers in the field (eg somewhere with a high speed Internet connection), whilst keeping control functionality centralised. This enables support of MEC use cases, for example.*
 
@@ -44,17 +44,19 @@ All of these Open5GS components have config files. Each config file contains the
 #### 5G SA Core
 
 The Open5GS 5G SA Core contains the following functions:
+* NRF - NF Repository Function
+* SCP - Service Communication Proxy
 * AMF - Access and Mobility Management Function
 * SMF - Session Management Function
 * UPF - User Plane Function
 * AUSF - Authentication Server Function
-* NRF - NF Repository Function
 * UDM - Unified Data Management
 * UDR - Unified Data Repository
 * PCF - Policy and Charging Function
 * NSSF - Network Slice Selection Function
+* BSF - Binding Support Function
 
-The 5G SA core works in a different way to the 4G core - it uses a **Service Based Architecture** (SBI). **Control plane** functions are configured to register with the NRF, and the NRF then helps them discover the other core functions. Running through the other functions: The AMF handles connection and mobility management; a subset of what the 4G MME is tasked with. gNBs (5G basestations) connect to the AMF. The UDM, AUSF and UDR carry out similar operations as the 4G HSS, generating SIM authentication vectors and holding the subscriber profile. Session management is all handled by the SMF (previously the responsibility of the 4G MME/ SGWC/ PGWC). The NSSF provides a way to select the network slice. Finally there is the PCF, used for charging and enforcing subscriber policies.
+The 5G SA core works in a different way to the 4G core - it uses a **Service Based Architecture** (SBI). **Control plane** functions are configured to register with the NRF, and the NRF then helps them discover the other core functions. Running through the other functions: The AMF handles connection and mobility management; a subset of what the 4G MME is tasked with. gNBs (5G basestations) connect to the AMF. The UDM, AUSF and UDR carry out similar operations as the 4G HSS, generating SIM authentication vectors and holding the subscriber profile. Session management is all handled by the SMF (previously the responsibility of the 4G MME/ SGWC/ PGWC). The NSSF provides a way to select the network slice, and PCF is used for charging and enforcing subscriber policies. Finally there is the SCP that enable indirect communication.
 
 The 5G SA core **user plane** is much simpler, as it only contains a single function. The UPF carries user data packets between the gNB and the external WAN. It connects back to the SMF too. 
 
@@ -69,14 +71,36 @@ With the exception of the SMF and UPF, all config files for the 5G SA core funct
 **Note:** Nighly builds are offered by [Osmocom](https://osmocom.org) on [OBS](https://build.opensuse.org/package/show/network:osmocom:nightly/open5gs). Scroll down to use a nightly build package.
 {: .notice--warning}
 
+#### Getting MongoDB
+---
 
-#### Ubuntu
-
-*Ubuntu* makes it easy to install Open5GS as shown below,
+Import the public key used by the package management system.
 
 ```bash
 $ sudo apt update
-$ sudo apt install software-properties-common
+$ sudo apt install wget gnupg
+$ wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | sudo apt-key add -
+```
+
+Create the list file /etc/apt/sources.list.d/mongodb-org-6.0.list for your version of Ubuntu.
+
+```bash
+$ echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
+```
+
+Install the MongoDB packages.
+```bash
+$ sudo apt update
+$ sudo apt-get install -y mongodb-org
+$ sudo systemctl start mongod (if '/usr/bin/mongod' is not running)
+$ sudo systemctl enable mongod (ensure to automatically start it on system boot)
+```
+
+#### Ubuntu
+
+*Ubuntu* makes it easy to install Open5GS as shown below.
+
+```bash
 $ sudo add-apt-repository ppa:open5gs/latest
 $ sudo apt update
 $ sudo apt install open5gs
@@ -89,13 +113,9 @@ The Open5GS packages for Debian are available on [OBS](https://build.opensuse.or
 
 ```bash
 $ sudo apt update
-$ sudo apt install wget gnupg
-$ wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | sudo apt-key add -
-$ echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" | sudo tee /etc/apt/sources.list.d/mongodb-org.list
 $ wget -qO - https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Debian_10/Release.key | sudo apt-key add -
 $ sudo sh -c "echo 'deb http://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Debian_10/ ./' > /etc/apt/sources.list.d/open5gs.list"
 $ sudo apt update
-$ sudo apt install mongodb-org
 $ sudo apt install open5gs
 ```
 
@@ -107,20 +127,11 @@ https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Debian
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Debian_Unstable/
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Raspbian_10/
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_18.04/
-https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_19.04/
-https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_19.10/
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_20.04/
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_20.10/
-```
-
-#### openSUSE
-
-[Martin Hauke](https://build.opensuse.org/user/show/mnhauke) packaged Open5GS for *openSUSE* on [OBS](https://build.opensuse.org/package/show/home:mnhauke:open5gs/open5gs).
-
-```bash
-$ sudo zypper addrepo -f obs://home:mnhauke:open5gs home:mnhauke:open5gs
-$ sudo zypper install mongodb-server mongodb-shell
-$ sudo zypper install open5gs
+https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_21.04/
+https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_21.10/
+https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_22.04/
 ```
 
 #### Nightly Builds
@@ -144,12 +155,22 @@ https://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_Test
 https://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_Unstable/
 https://download.opensuse.org/repositories/network:/osmocom:/nightly/Raspbian_10/
 https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_18.04/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_19.04/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_19.10/
 https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_20.04/
 https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_20.10/
+https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_21.04/
+https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_21.10/
+https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_22.04/
 ```
 
+#### openSUSE
+
+[Martin Hauke](https://build.opensuse.org/user/show/mnhauke) packaged Open5GS for *openSUSE* on [OBS](https://build.opensuse.org/package/show/home:mnhauke:open5gs/open5gs).
+
+```bash
+$ sudo zypper addrepo -f obs://home:mnhauke:open5gs home:mnhauke:open5gs
+$ sudo zypper install mongodb-server mongodb-shell
+$ sudo zypper install open5gs
+```
 
 ## 3. Install the  WebUI of Open5GS
 ---
@@ -164,7 +185,7 @@ The WebUI allows you to interactively edit subscriber data. While it is not esse
     ```bash
     $ sudo apt update
     $ sudo apt install curl
-    $ curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
+    $ curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
     $ sudo apt install nodejs
     ```
 
@@ -177,7 +198,7 @@ The WebUI allows you to interactively edit subscriber data. While it is not esse
 You can now install WebUI of Open5GS.
 
 ```bash
-$ curl -sL {{ site.url }}{{ site.baseurl }}/assets/webui/install | sudo -E bash -
+$ curl -fsSL {{ site.url }}{{ site.baseurl }}/assets/webui/install | sudo -E bash -
 ```
 
 ## 4. Configure Open5GS
@@ -192,13 +213,14 @@ MongoDB   = 127.0.0.1 (subscriber data) - http://localhost:3000
 
 MME-s1ap  = 127.0.0.2 :36412 for S1-MME
 MME-gtpc  = 127.0.0.2 :2123 for S11
-MME-frDi  = 127.0.0.2 :3868 for S6a auth
+MME-frDi  = 127.0.0.2 :3868 for S6a
 
 SGWC-gtpc = 127.0.0.3 :2123 for S11
 SGWC-pfcp = 127.0.0.3 :8805 for Sxa
 
-SMF-gtpc  = 127.0.0.4 :2123 for S5/8c, N11
-SMF-pfcp  = 127.0.0.4 :8805 for N4
+SMF-gtpc  = 127.0.0.4 :2123 for S5c, N11
+SMF-gtpu  = 127.0.0.4 :2152 for N4u (Sxu)
+SMF-pfcp  = 127.0.0.4 :8805 for N4 (Sxb)
 SMF-frDi  = 127.0.0.4 :3868 for Gx auth
 SMF-sbi   = 127.0.0.4 :7777 for 5G SBI (N7,N10,N11)
 
@@ -206,20 +228,22 @@ AMF-ngap  = 127.0.0.5 :38412 for N2
 AMF-sbi   = 127.0.0.5 :7777 for 5G SBI (N8,N12,N11)
 
 SGWU-pfcp = 127.0.0.6 :8805 for Sxa
-SGWU-gtpu = 127.0.0.6 :2152 for S1-U, S5/8u
+SGWU-gtpu = 127.0.0.6 :2152 for S1-U, S5u
 
-UPF-pfcp  = 127.0.0.7 :8805 for N4
-UPF-gtpu  = 127.0.0.7 :2152 for S5/8u, N3
+UPF-pfcp  = 127.0.0.7 :8805 for N4 (Sxb)
+UPF-gtpu  = 127.0.0.7 :2152 for S5u, N3, N4u (Sxu)
 
-HSS-frDi  = 127.0.0.8 :3868 for S6a auth
+HSS-frDi  = 127.0.0.8 :3868 for S6a, Cx
 
-PCRF-frDi = 127.0.0.9 :3868 for Gx auth
+PCRF-frDi = 127.0.0.9 :3868 for Gx
 
 NRF-sbi   = 127.0.0.10:7777 for 5G SBI
+SCP-sbi   = 127.0.1.10:7777 for 5G SBI
 AUSF-sbi  = 127.0.0.11:7777 for 5G SBI
 UDM-sbi   = 127.0.0.12:7777 for 5G SBI
 PCF-sbi   = 127.0.0.13:7777 for 5G SBI
 NSSF-sbi  = 127.0.0.14:7777 for 5G SBI
+BSF-sbi   = 127.0.0.15:7777 for 5G SBI
 UDR-sbi   = 127.0.0.20:7777 for 5G SBI
 ```
 
@@ -234,45 +258,49 @@ Modify [/etc/open5gs/mme.yaml](https://github.com/{{ site.github_username }}/ope
 
 ```diff
 $ diff -u /etc/open5gs/mme.yaml.old /etc/open5gs/mme.yaml
-
- mme:
-     freeDiameter: /etc/freeDiameter/mme.conf
+--- mme.yaml    2020-09-05 20:52:28.648235143 -0400
++++ mme.yaml.new    2020-09-05 20:56:05.434484208 -0400
+@@ -253,20 +253,20 @@ mme:
      s1ap:
--      addr: 127.0.0.2
-+      addr: 10.10.0.2 # for external eNB - a local address that can be reached by the eNB
+-      - addr: 127.0.0.2
++      - addr: 10.10.0.2
      gtpc:
+       - addr: 127.0.0.2
+     metrics:
        addr: 127.0.0.2
+       port: 9090
      gummei:
        plmn_id:
--        mcc: 901
+-        mcc: 999
 -        mnc: 70
-+        mcc: 001 # set your PLMN-MCC
-+        mnc: 01  # set your PLMN-MNC
++        mcc: 001
++        mnc: 01
        mme_gid: 2
        mme_code: 1
      tai:
        plmn_id:
--        mcc: 901
+-        mcc: 999
 -        mnc: 70
--      tac: 1
-+        mcc: 001 # set your PLMN-MCC
-+        mnc: 01  # set your PLMN-MNC
-+      tac: 2 # should match the TAC used by your eNB
++        mcc: 001
++        mnc: 01
+       tac: 1
      security:
-
+         integrity_order : [ EIA2, EIA1, EIA0 ]
 ```
 
 Modify [/etc/open5gs/sgwu.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/sgwu.yaml.in) to set the GTP-U IP address.
 ```diff
 $ diff -u /etc/open5gs/sgwu.yaml.old /etc/open5gs/sgwu.yaml
-
+--- sgwu.yaml    2020-09-05 20:50:39.393022566 -0400
++++ sgwu.yaml.new    2020-09-05 20:51:06.667838823 -0400
+@@ -98,7 +98,7 @@ logger:
+ #
  sgwu:
-     gtpu:
--      addr: 127.0.0.6
-+      addr: 10.11.0.6  # for external eNB - a local address that can be reached by the eNB
      pfcp:
-       addr: 127.0.0.6
-
+-      - addr: 127.0.0.6
++      - addr: 10.11.0.6
+     gtpu:
+       - addr: 127.0.0.6
 ```
 
 After changing config files, please restart Open5GS daemons.
@@ -293,57 +321,58 @@ Modify [/etc/open5gs/amf.yaml](https://github.com/{{ site.github_username }}/ope
 
 ```diff
 $ diff -u /etc/open5gs/amf.yaml.old /etc/open5gs/amf.yaml
-
-amf:
-    sbi:
-      - addr: 127.0.0.5
-        port: 7777
+--- amf.yaml    2020-09-05 20:52:28.652234967 -0400
++++ amf.yaml.new    2020-09-05 20:55:07.453114885 -0400
+@@ -293,26 +293,26 @@ amf:
+       - addr: 127.0.0.5
+         port: 7777
      ngap:
 -      - addr: 127.0.0.5
-+      - addr: 10.10.0.5 # for external gNB - a local address that can be reached by the gNB
++      - addr: 10.10.0.5
+     metrics:
+         addr: 127.0.0.5
+         port: 9090
      guami:
        - plmn_id:
--          mcc: 901
+-          mcc: 999
 -          mnc: 70
-+          mcc: 001 # set your PLMN-MCC
-+          mnc: 01  # set your PLMN-MNC
++          mcc: 001
++          mnc: 01
          amf_id:
            region: 2
            set: 1
      tai:
        - plmn_id:
--          mcc: 901
+-          mcc: 999
 -          mnc: 70
--        tac: 1
-+          mcc: 001 # set your PLMN-MCC
-+          mnc: 01  # set your PLMN-MNC
-+        tac: 2 # should match the TAC used by your gNB
++          mcc: 001
++          mnc: 01
+         tac: 1
      plmn_support:
        - plmn_id:
--          mcc: 901
+-          mcc: 999
 -          mnc: 70
-+          mcc: 001 # set your PLMN-MCC
-+          mnc: 01  # set your PLMN-MNC
++          mcc: 001
++          mnc: 01
          s_nssai:
            - sst: 1
      security:
-
 ```
 
 Modify [/etc/open5gs/upf.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/upf.yaml.in) to set the GTP-U address.
 ```diff
 $ diff -u /etc/open5gs/upf.yaml.old /etc/open5gs/upf.yaml
-
-upf:
+--- upf.yaml    2020-09-05 20:52:28.652234967 -0400
++++ upf.yaml.new    2020-09-05 20:52:55.279052142 -0400
+@@ -168,7 +168,7 @@ upf:
      pfcp:
        - addr: 127.0.0.7
      gtpu:
 -      - addr: 127.0.0.7
-+      - addr: 10.11.0.7 # for external gNB - a local address that can be reached by the gNB
++      - addr: 10.11.0.7
      subnet:
        - addr: 10.45.0.1/16
-       - addr: 2001:230:cafe::1/48
-
+       - addr: 2001:db8:cafe::1/48
 ```
 
 After changing config files, please restart Open5GS daemons.
@@ -374,8 +403,8 @@ To add subscriber information, you can do WebUI operations in the following orde
 
 Enter the subscriber details of your SIM cards using this tool, to save the subscriber profile in the HSS and UDR MongoDB database backend. If you are using test SIMs, the details are normally printed on the card.
 
-**Tip:** Subscribers added with this tool immediately register in the Open5GS HSS/ UDR without the need to restart any daemon.
-{: .notice--info}
+**Note:** Subscribers added with this tool immediately register in the Open5GS HSS/UDR without the need to restart any daemon. However, if you use the WebUI to change subscriber profile, you must restart the Open5GS AMF/MME daemon for the changes to take effect.
+{: .notice--warning}
 
 
 #### Adding a route for the UE to have WAN connectivity {#UEInternet}
@@ -422,9 +451,24 @@ $ sudo sysctl -w net.ipv6.conf.all.forwarding=1
 
 ### Add NAT Rule
 $ sudo iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE
-$ sudo ip6tables -t nat -A POSTROUTING -s 2001:230:cafe::/48 ! -o ogstun -j MASQUERADE
+$ sudo ip6tables -t nat -A POSTROUTING -s 2001:db8:cafe::/48 ! -o ogstun -j MASQUERADE
 ```
 
+Optionally, you may consider the settings below for security purposes.
+
+```bash
+### Prevent UE's from connecting to the host on which UPF is running
+$ sudo iptables -I INPUT -s 10.45.0.0/16 -j DROP
+$ sudo ip6tables -I INPUT -s 2001:db8:cafe::/48 -j DROP
+
+### If your core network runs over multiple hosts, you probably want to block
+### UE originating traffic from accessing other network functions.
+### Replace x.x.x.x/y with the VNFs IP/subnet
+$ sudo iptables -I FORWARD -s 10.45.0.0/16 -d x.x.x.x/y -j DROP
+```
+
+**Note:** The above assumes you do not have any existing rules in the filter and nat tables. If a program such as docker has already set up rules, you may need to add the Open5GS related rules differently.
+{: .notice--danger}
 
 ## 5. Turn on your eNB/gNB and UE
 ---
@@ -462,10 +506,12 @@ $ sudo systemctl stop open5gs-upfd
 $ sudo systemctl stop open5gs-hssd
 $ sudo systemctl stop open5gs-pcrfd
 $ sudo systemctl stop open5gs-nrfd
+$ sudo systemctl stop open5gs-scpd
 $ sudo systemctl stop open5gs-ausfd
 $ sudo systemctl stop open5gs-udmd
 $ sudo systemctl stop open5gs-pcfd
 $ sudo systemctl stop open5gs-nssfd
+$ sudo systemctl stop open5gs-bsfd
 $ sudo systemctl stop open5gs-udrd
 $ sudo systemctl stop open5gs-webui
 ```
@@ -480,10 +526,12 @@ $ sudo systemctl restart open5gs-upfd
 $ sudo systemctl restart open5gs-hssd
 $ sudo systemctl restart open5gs-pcrfd
 $ sudo systemctl restart open5gs-nrfd
+$ sudo systemctl restart open5gs-scpd
 $ sudo systemctl restart open5gs-ausfd
 $ sudo systemctl restart open5gs-udmd
 $ sudo systemctl restart open5gs-pcfd
 $ sudo systemctl restart open5gs-nssfd
+$ sudo systemctl restart open5gs-bsfd
 $ sudo systemctl restart open5gs-udrd
 $ sudo systemctl restart open5gs-webui
 ```
@@ -515,6 +563,5 @@ $ sudo rm -Rf /var/log/open5gs
 The WebUI of Open5GS can be removed as follows:
 
 ```bash
-curl -sL {{ site.url }}{{ site.baseurl }}/assets/webui/uninstall | sudo -E bash -
+curl -fsSL {{ site.url }}{{ site.baseurl }}/assets/webui/uninstall | sudo -E bash -
 ```
-

docs/_docs/guide/02-building-open5gs-from-sources.md

@@ -13,15 +13,29 @@ This post explains how to compile and install the source code on **Debian/Ubuntu
 ### Getting MongoDB
 ---
 
-Install MongoDB with package manager. It is used as database for NRF/PCF/UDR and PCRF/HSS.
+Import the public key used by the package management system.
 
 ```bash
-$ sudo apt update
-$ sudo apt install mongodb
-$ sudo systemctl start mongodb (if '/usr/bin/mongod' is not running)
-$ sudo systemctl enable mongodb (ensure to automatically start it on system boot)
+$ wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | sudo apt-key add -
 ```
 
+Create the list file /etc/apt/sources.list.d/mongodb-org-6.0.list for your version of Ubuntu.
+
+```bash
+$ echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
+```
+
+Install the MongoDB packages.
+```bash
+$ sudo apt update
+$ sudo apt-get install -y mongodb-org
+$ sudo systemctl start mongod (if '/usr/bin/mongod' is not running)
+$ sudo systemctl enable mongod (ensure to automatically start it on system boot)
+```
+
+**Tip:** MongoDB is used as database for NRF/PCF/UDR and PCRF/HSS.
+{: .notice--info}
+
 ### Setting up TUN device (not persistent after rebooting)
 ---
 
@@ -30,7 +44,7 @@ Create the TUN device with the interface name `ogstun`.
 ```bash
 $ sudo ip tuntap add name ogstun mode tun
 $ sudo ip addr add 10.45.0.1/16 dev ogstun
-$ sudo ip addr add 2001:230:cafe::1/48 dev ogstun
+$ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun
 $ sudo ip link set ogstun up
 ```
 
@@ -44,7 +58,7 @@ $ sudo ip link set ogstun up
 Install the dependencies for building the source code.
 
 ```bash
-$ sudo apt install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev libidn11-dev libmongoc-dev libbson-dev libyaml-dev libnghttp2-dev libmicrohttpd-dev libcurl4-gnutls-dev libnghttp2-dev meson
+$ sudo apt install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev libidn11-dev libmongoc-dev libbson-dev libyaml-dev libnghttp2-dev libmicrohttpd-dev libcurl4-gnutls-dev libnghttp2-dev libtins-dev libtalloc-dev meson
 ```
 
 Git clone.
@@ -97,17 +111,20 @@ Modify [install/etc/open5gs/amf.yaml](https://github.com/{{ site.github_username
 
 ```diff
 $ diff -u /etc/open5gs/amf.yaml.old /etc/open5gs/amf.yaml
---- amf.yaml	2020-09-05 20:52:28.652234967 -0400
-+++ amf.yaml.new	2020-09-05 20:55:07.453114885 -0400
-@@ -165,23 +165,23 @@
+--- amf.yaml    2020-09-05 20:52:28.652234967 -0400
++++ amf.yaml.new    2020-09-05 20:55:07.453114885 -0400
+@@ -293,26 +293,26 @@ amf:
        - addr: 127.0.0.5
          port: 7777
      ngap:
 -      - addr: 127.0.0.5
 +      - addr: 10.10.0.5
+     metrics:
+         addr: 127.0.0.5
+         port: 9090
      guami:
        - plmn_id:
--          mcc: 901
+-          mcc: 999
 -          mnc: 70
 +          mcc: 001
 +          mnc: 01
@@ -116,15 +133,14 @@ $ diff -u /etc/open5gs/amf.yaml.old /etc/open5gs/amf.yaml
            set: 1
      tai:
        - plmn_id:
--          mcc: 901
+-          mcc: 999
 -          mnc: 70
--        tac: 1
 +          mcc: 001
 +          mnc: 01
-+        tac: 2
+         tac: 1
      plmn_support:
        - plmn_id:
--          mcc: 901
+-          mcc: 999
 -          mnc: 70
 +          mcc: 001
 +          mnc: 01
@@ -136,19 +152,17 @@ $ diff -u /etc/open5gs/amf.yaml.old /etc/open5gs/amf.yaml
 Modify [install/etc/open5gs/upf.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/upf.yaml.in) to set the GTP-U and PFCP IP address.
 ```diff
 $ diff -u /etc/open5gs/upf.yaml.old /etc/open5gs/upf.yaml
---- upf.yaml	2020-09-05 20:52:28.652234967 -0400
-+++ upf.yaml.new	2020-09-05 20:52:55.279052142 -0400
-@@ -137,9 +137,7 @@
+--- upf.yaml    2020-09-05 20:52:28.652234967 -0400
++++ upf.yaml.new    2020-09-05 20:52:55.279052142 -0400
+@@ -168,7 +168,7 @@ upf:
      pfcp:
        - addr: 127.0.0.7
      gtpu:
--      - addr:
--        - 127.0.0.7
--        - ::1
+-      - addr: 127.0.0.7
 +      - addr: 10.11.0.7
      subnet:
        - addr: 10.45.0.1/16
-       - addr: 2001:230:cafe::1/48
+       - addr: 2001:db8:cafe::1/48
 ```
 ##### 4G EPC
 
@@ -156,19 +170,20 @@ Modify [install/etc/open5gs/mme.yaml](https://github.com/{{ site.github_username
 
 ```diff
 $ diff -u /etc/open5gs/mme.yaml.old /etc/open5gs/mme.yaml
---- mme.yaml	2020-09-05 20:52:28.648235143 -0400
-+++ mme.yaml.new	2020-09-05 20:56:05.434484208 -0400
-@@ -204,20 +204,20 @@
- mme:
-     freeDiameter: /home/acetcom/Documents/git/open5gs/install/etc/freeDiameter/mme.conf
+--- mme.yaml    2020-09-05 20:52:28.648235143 -0400
++++ mme.yaml.new    2020-09-05 20:56:05.434484208 -0400
+@@ -253,20 +253,20 @@ mme:
      s1ap:
--      addr: 127.0.0.2
-+      addr: 10.10.0.2
+-      - addr: 127.0.0.2
++      - addr: 10.10.0.2
      gtpc:
+       - addr: 127.0.0.2
+     metrics:
        addr: 127.0.0.2
+       port: 9090
      gummei:
        plmn_id:
--        mcc: 901
+-        mcc: 999
 -        mnc: 70
 +        mcc: 001
 +        mnc: 01
@@ -176,31 +191,28 @@ $ diff -u /etc/open5gs/mme.yaml.old /etc/open5gs/mme.yaml
        mme_code: 1
      tai:
        plmn_id:
--        mcc: 901
+-        mcc: 999
 -        mnc: 70
--      tac: 1
 +        mcc: 001
 +        mnc: 01
-+      tac: 2
+       tac: 1
      security:
-         integrity_order : [ EIA1, EIA2, EIA0 ]
-         ciphering_order : [ EEA0, EEA1, EEA2 ]
+         integrity_order : [ EIA2, EIA1, EIA0 ]
 ```
 
 Modify [install/etc/open5gs/sgwu.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/sgwu.yaml.in) to set the GTP-U IP address.
 ```diff
 $ diff -u /etc/open5gs/sgwu.yaml.old /etc/open5gs/sgwu.yaml
---- sgwu.yaml	2020-09-05 20:50:39.393022566 -0400
-+++ sgwu.yaml.new	2020-09-05 20:51:06.667838823 -0400
-@@ -51,7 +51,7 @@
+--- sgwu.yaml    2020-09-05 20:50:39.393022566 -0400
++++ sgwu.yaml.new    2020-09-05 20:51:06.667838823 -0400
+@@ -98,7 +98,7 @@ logger:
  #
  sgwu:
-     gtpu:
--      addr: 127.0.0.6
-+      addr: 10.11.0.6
      pfcp:
-       addr: 127.0.0.6
-
+-      - addr: 127.0.0.6
++      - addr: 10.11.0.6
+     gtpu:
+       - addr: 127.0.0.6
 ```
 
 If you modify the config files while Open5GS daemons are running, please restart them
@@ -210,133 +222,164 @@ If you modify the config files while Open5GS daemons are running, please restart
 ---
 
 ```bash
-$ cd install/bin/
-$ ./install/bin/open5gs-mmed
-Open5GS daemon v2.1.0
+$ ./install/bin/open5gs-nrfd
+Open5GS daemon v2.4.11-100-gbea24d7
 
-08/21 22:53:47.328: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/mme.yaml' (../src/main.c:54)
-08/21 22:53:47.328: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/mme.log' (../src/main.c:57)
-08/21 22:53:47.365: [app] INFO: MME initialize...done (../src/mme/app-init.c:33)
-08/21 22:53:47.365: [gtp] INFO: gtp_server() [127.0.0.2]:2123 (../lib/gtp/path.c:32)
-08/21 22:53:47.365: [gtp] INFO: gtp_connect() [127.0.0.3]:2123 (../lib/gtp/path.c:59)
-08/21 22:53:47.366: [mme] INFO: s1ap_server() [127.0.0.2]:36412 (../src/mme/s1ap-sctp.c:57)
+10/22 10:43:43.669: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/nrf.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:43:43.669: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/nrf.log' (../lib/app/ogs-init.c:129)
+10/22 10:43:43.670: [sbi] INFO: nghttp2_server() [127.0.0.10]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:43:43.670: [sbi] INFO: nghttp2_server() [::1]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:43:43.671: [app] INFO: NRF initialize...done (../src/nrf/app.c:31)
 
-$ ./install/bin/open5gs-sgwcd
-Open5GS daemon v2.1.0
+$ ./install/bin/open5gs-scpd
+Open5GS daemon v2.4.11-100-gbea24d7
 
-08/21 22:54:43.059: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/sgwc.yaml' (../src/main.c:54)
-08/21 22:54:43.059: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/sgwc.log' (../src/main.c:57)
-08/21 22:54:43.065: [app] INFO: SGW-C initialize...done (../src/sgwc/app.c:31)
-08/21 22:54:43.066: [gtp] INFO: gtp_server() [127.0.0.3]:2123 (../lib/gtp/path.c:32)
-08/21 22:54:43.066: [pfcp] INFO: pfcp_server() [127.0.0.3]:8805 (../lib/pfcp/path.c:32)
-08/21 22:54:43.066: [pfcp] INFO: ogs_pfcp_connect() [127.0.0.6]:8805 (../lib/pfcp/path.c:60)
-
-$ ./install/bin/open5gs-smfd
-Open5GS daemon v2.1.0
-
-08/21 22:54:56.000: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/smf.yaml' (../src/main.c:54)
-08/21 22:54:56.000: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/smf.log' (../src/main.c:57)
-08/21 22:54:56.050: [gtp] INFO: gtp_server() [127.0.0.4]:2123 (../lib/gtp/path.c:32)
-08/21 22:54:56.050: [app] INFO: SMF initialize...done (../src/smf/app.c:31)
-08/21 22:54:56.050: [gtp] INFO: gtp_server() [::1]:2123 (../lib/gtp/path.c:32)
-08/21 22:54:56.050: [pfcp] INFO: pfcp_server() [127.0.0.4]:8805 (../lib/pfcp/path.c:32)
-08/21 22:54:56.050: [pfcp] INFO: pfcp_server() [::1]:8805 (../lib/pfcp/path.c:32)
-08/21 22:54:56.050: [pfcp] INFO: ogs_pfcp_connect() [127.0.0.7]:8805 (../lib/pfcp/path.c:60)
-08/21 22:54:56.051: [sbi] INFO: sbi_server() [127.0.0.4]:7777 (../lib/sbi/server.c:298)
+10/22 10:43:45.709: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/scp.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:43:45.709: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/scp.log' (../lib/app/ogs-init.c:129)
+10/22 10:43:45.711: [sbi] INFO: nghttp2_server() [127.0.1.10]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:43:45.712: [app] INFO: SCP initialize...done (../src/scp/app.c:31)
 
 $ ./install/bin/open5gs-amfd
-Open5GS daemon v2.1.0
+Open5GS daemon v2.4.11-100-gbea24d7
 
-08/21 22:55:14.015: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/amf.yaml' (../src/main.c:54)
-08/21 22:55:14.015: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/amf.log' (../src/main.c:57)
-08/21 22:55:14.039: [app] INFO: AMF initialize...done (../src/amf/app.c:33)
-08/21 22:55:14.040: [sbi] INFO: sbi_server() [127.0.0.5]:7777 (../lib/sbi/server.c:298)
-08/21 22:55:14.040: [amf] INFO: ngap_server() [127.0.0.5]:38412 (../src/amf/ngap-sctp.c:56)
+10/22 10:44:01.416: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/amf.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:44:01.416: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/amf.log' (../lib/app/ogs-init.c:129)
+10/22 10:44:01.419: [sbi] INFO: NF Service [namf-comm] (../lib/sbi/context.c:1401)
+10/22 10:44:01.420: [sbi] INFO: nghttp2_server() [127.0.0.5]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:44:01.420: [amf] INFO: ngap_server() [127.0.0.5]:38412 (../src/amf/ngap-sctp.c:61)
+10/22 10:44:01.420: [sctp] INFO: AMF initialize...done (../src/amf/app.c:33)
 
-$ ./install/bin/open5gs-sgwud
-Open5GS daemon v2.1.0
+$ ./install/bin/open5gs-smfd
+Open5GS daemon v2.4.11-100-gbea24d7
 
-08/21 22:54:10.357: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/sgwu.yaml' (../src/main.c:54)
-08/21 22:54:10.357: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/sgwu.log' (../src/main.c:57)
-08/21 22:54:10.360: [pfcp] INFO: pfcp_server() [127.0.0.6]:8805 (../lib/pfcp/path.c:32)
-08/21 22:54:10.360: [app] INFO: SGW-U initialize...done (../src/sgwu/app.c:31)
-08/21 22:54:10.361: [gtp] INFO: gtp_server() [127.0.0.6]:2152 (../lib/gtp/path.c:32)
+10/22 10:44:03.217: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/smf.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:44:03.217: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/smf.log' (../lib/app/ogs-init.c:129)
+10/22 10:44:03.269: [gtp] INFO: gtp_server() [127.0.0.4]:2123 (../lib/gtp/path.c:30)
+10/22 10:44:03.269: [gtp] INFO: gtp_server() [::1]:2123 (../lib/gtp/path.c:30)
+10/22 10:44:03.269: [gtp] INFO: gtp_server() [127.0.0.4]:2152 (../lib/gtp/path.c:30)
+10/22 10:44:03.269: [gtp] INFO: gtp_server() [::1]:2152 (../lib/gtp/path.c:30)
+10/22 10:44:03.269: [pfcp] INFO: pfcp_server() [127.0.0.4]:8805 (../lib/pfcp/path.c:30)
+10/22 10:44:03.269: [pfcp] INFO: pfcp_server() [::1]:8805 (../lib/pfcp/path.c:30)
+10/22 10:44:03.269: [pfcp] INFO: ogs_pfcp_connect() [127.0.0.7]:8805 (../lib/pfcp/path.c:61)
+10/22 10:44:03.269: [sbi] INFO: NF Service [nsmf-pdusession] (../lib/sbi/context.c:1401)
+10/22 10:44:03.270: [sbi] INFO: nghttp2_server() [127.0.0.4]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:44:03.270: [app] INFO: SMF initialize...done (../src/smf/app.c:31)
 
 $ ./install/bin/open5gs-upfd
-Open5GS daemon v2.1.0
+Open5GS daemon v2.4.11-100-gbea24d7
 
-08/21 22:54:21.596: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/upf.yaml' (../src/main.c:54)
-08/21 22:54:21.596: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/upf.log' (../src/main.c:57)
-08/21 22:54:21.601: [pfcp] INFO: pfcp_server() [127.0.0.7]:8805 (../lib/pfcp/path.c:32)
-08/21 22:54:21.601: [app] INFO: UPF initialize...done (../src/upf/app.c:31)
-08/21 22:54:21.601: [gtp] INFO: gtp_server() [127.0.0.7]:2152 (../lib/gtp/path.c:32)
-08/21 22:54:21.601: [gtp] INFO: gtp_server() [::1]:2152 (../lib/gtp/path.c:32)
+10/22 10:44:06.884: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/upf.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:44:06.884: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/upf.log' (../lib/app/ogs-init.c:129)
+10/22 10:44:06.892: [pfcp] INFO: pfcp_server() [127.0.0.7]:8805 (../lib/pfcp/path.c:30)
+10/22 10:44:06.892: [gtp] INFO: gtp_server() [127.0.0.7]:2152 (../lib/gtp/path.c:30)
+10/22 10:44:06.892: [app] INFO: UPF initialize...done (../src/upf/app.c:31)
 
-$ ./install/bin/open5gs-hssd
-Open5GS daemon v2.1.0
+$./install/bin/open5gs-ausfd
+Open5GS daemon v2.4.11-100-gbea24d7
 
-08/21 22:57:17.450: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/hss.yaml' (../src/main.c:54)
-08/21 22:57:17.450: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/hss.log' (../src/main.c:57)
-08/21 22:57:17.451: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:99)
-08/21 22:57:17.519: [app] INFO: HSS initialize...done (../src/hss/app-init.c:31)
-
-$ ./install/bin/open5gs-pcrfd
-Open5GS daemon v2.1.0
-
-08/21 22:57:45.894: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/pcrf.yaml' (../src/main.c:54)
-08/21 22:57:45.894: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/pcrf.log' (../src/main.c:57)
-08/21 22:57:45.896: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:99)
-08/21 22:57:45.997: [app] INFO: PCRF initialize...done (../src/pcrf/app-init.c:31)
-
-$ ./install/bin/open5gs-nrfd
-Open5GS daemon v2.1.0
-
-08/21 22:56:35.472: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/nrf.yaml' (../src/main.c:54)
-08/21 22:56:35.472: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/nrf.log' (../src/main.c:57)
-08/21 22:56:35.472: [app] INFO: NRF initialize...done (../src/nrf/app.c:31)
-08/21 22:56:35.473: [sbi] INFO: sbi_server() [127.0.0.10]:7777 (../lib/sbi/server.c:298)
-08/21 22:56:35.473: [sbi] INFO: sbi_server() [::1]:7777 (../lib/sbi/server.c:298
-
-$ ./install/bin/open5gs-ausfd
-Open5GS daemon v2.1.0
-
-08/21 22:55:41.899: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/ausf.yaml' (../src/main.c:54)
-08/21 22:55:41.899: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/ausf.log' (../src/main.c:57)
-08/21 22:55:41.900: [app] INFO: AUSF initialize...done (../src/ausf/app.c:31)
-08/21 22:55:41.900: [sbi] INFO: sbi_server() [127.0.0.11]:7777 (../lib/sbi/server.c:298)
+10/22 10:44:08.747: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/ausf.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:44:08.747: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/ausf.log' (../lib/app/ogs-init.c:129)
+10/22 10:44:08.748: [sbi] INFO: NF Service [nausf-auth] (../lib/sbi/context.c:1401)
+10/22 10:44:08.749: [sbi] INFO: nghttp2_server() [127.0.0.11]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:44:08.749: [app] INFO: AUSF initialize...done (../src/ausf/app.c:31)
 
 $ ./install/bin/open5gs-udmd
-Open5GS daemon v2.1.0
+Open5GS daemon v2.4.11-100-gbea24d7
 
-08/21 22:56:02.154: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/udm.yaml' (../src/main.c:54)
-08/21 22:56:02.154: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/udm.log' (../src/main.c:57)
-08/21 22:56:02.155: [app] INFO: UDM initialize...done (../src/udm/app.c:31)
-08/21 22:56:02.155: [sbi] INFO: sbi_server() [127.0.0.12]:7777 (../lib/sbi/server.c:298)
+10/22 10:44:10.724: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/udm.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:44:10.724: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/udm.log' (../lib/app/ogs-init.c:129)
+10/22 10:44:10.726: [sbi] INFO: NF Service [nudm-ueau] (../lib/sbi/context.c:1401)
+10/22 10:44:10.726: [sbi] INFO: NF Service [nudm-uecm] (../lib/sbi/context.c:1401)
+10/22 10:44:10.726: [sbi] INFO: NF Service [nudm-sdm] (../lib/sbi/context.c:1401)
+10/22 10:44:10.727: [sbi] INFO: nghttp2_server() [127.0.0.12]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:44:10.727: [app] INFO: UDM initialize...done (../src/udm/app.c:31)
 
-$ ./install/bin/open5gs-pcfd
-Open5GS daemon v2.1.0
+$./install/bin/open5gs-pcfd
+Open5GS daemon v2.4.11-100-gbea24d7
 
-08/21 22:56:02.154: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/pcf.yaml' (../src/main.c:54)
-08/21 22:56:02.154: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/pcf.log' (../src/main.c:57)
-08/21 22:56:02.155: [app] INFO: PCF initialize...done (../src/pcf/app.c:31)
-08/21 22:56:02.155: [sbi] INFO: sbi_server() [127.0.0.12]:7777 (../lib/sbi/server.c:298)
+10/22 10:44:14.265: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/pcf.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:44:14.265: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/pcf.log' (../lib/app/ogs-init.c:129)
+10/22 10:44:14.269: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:130)
+10/22 10:44:14.269: [sbi] INFO: NF Service [npcf-am-policy-control] (../lib/sbi/context.c:1401)
+10/22 10:44:14.269: [sbi] INFO: NF Service [npcf-smpolicycontrol] (../lib/sbi/context.c:1401)
+10/22 10:44:14.269: [sbi] INFO: NF Service [npcf-policyauthorization] (../lib/sbi/context.c:1401)
+10/22 10:44:14.269: [sbi] INFO: nghttp2_server() [127.0.0.13]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:44:14.269: [app] INFO: PCF initialize...done (../src/pcf/app.c:31)
 
 $ ./install/bin/open5gs-nssfd
-Open5GS daemon v2.1.0
+Open5GS daemon v2.4.11-100-gbea24d7
 
-08/21 22:56:02.154: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/nssfd.yaml' (../src/main.c:54)
-08/21 22:56:02.154: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/nssfd.log' (../src/main.c:57)
-08/21 22:56:02.155: [app] INFO: NSSF initialize...done (../src/nssfd/app.c:31)
-08/21 22:56:02.155: [sbi] INFO: sbi_server() [127.0.0.12]:7777 (../lib/sbi/server.c:298)
+10/22 10:44:16.250: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/nssf.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:44:16.250: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/nssf.log' (../lib/app/ogs-init.c:129)
+10/22 10:44:16.252: [sbi] INFO: NF Service [nnssf-nsselection] (../lib/sbi/context.c:1401)
+10/22 10:44:16.252: [sbi] INFO: nghttp2_server() [127.0.0.14]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:44:16.252: [app] INFO: NSSF initialize...done (../src/nssf/app.c:31)
+
+$ ./install/bin/open5gs-bsfd
+Open5GS daemon v2.4.11-100-gbea24d7
+
+10/22 10:44:18.836: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/bsf.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:44:18.836: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/bsf.log' (../lib/app/ogs-init.c:129)
+10/22 10:44:18.837: [sbi] INFO: NF Service [nbsf-management] (../lib/sbi/context.c:1401)
+10/22 10:44:18.837: [sbi] INFO: nghttp2_server() [127.0.0.15]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:44:18.837: [app] INFO: BSF initialize...done (../src/bsf/app.c:31)
 
 $ ./install/bin/open5gs-udrd
-Open5GS daemon v2.1.0
+Open5GS daemon v2.4.11-100-gbea24d7
 
-08/21 22:56:15.810: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/udr.yaml' (../src/main.c:54)
-08/21 22:56:15.810: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/udr.log' (../src/main.c:57)
-08/21 22:56:15.813: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:99)
-08/21 22:56:15.813: [app] INFO: UDR initialize...done (../src/udr/app.c:31)
-08/21 22:56:15.813: [sbi] INFO: sbi_server() [127.0.0.13]:7777 (../lib/sbi/server.c:298)
+10/22 10:44:24.018: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/udr.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:44:24.018: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/udr.log' (../lib/app/ogs-init.c:129)
+10/22 10:44:24.021: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:130)
+10/22 10:44:24.021: [sbi] INFO: NF Service [nudr-dr] (../lib/sbi/context.c:1401)
+10/22 10:44:24.021: [sbi] INFO: nghttp2_server() [127.0.0.20]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:44:24.021: [app] INFO: UDR initialize...done (../src/udr/app.c:31)
+
+$ ./install/bin/open5gs-mmed
+Open5GS daemon v2.4.11-100-gbea24d7
+
+10/22 10:44:26.011: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/mme.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:44:26.011: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/mme.log' (../lib/app/ogs-init.c:129)
+10/22 10:44:26.062: [gtp] INFO: gtp_server() [127.0.0.2]:2123 (../lib/gtp/path.c:30)
+10/22 10:44:26.063: [gtp] INFO: gtp_connect() [127.0.0.3]:2123 (../lib/gtp/path.c:60)
+10/22 10:44:26.063: [mme] INFO: s1ap_server() [127.0.0.2]:36412 (../src/mme/s1ap-sctp.c:62)
+10/22 10:44:26.063: [sctp] INFO: MME initialize...done (../src/mme/app-init.c:33)
+
+$ ./install/bin/open5gs-sgwcd
+Open5GS daemon v2.4.11-100-gbea24d7
+
+10/22 10:44:29.050: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/sgwc.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:44:29.050: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/sgwc.log' (../lib/app/ogs-init.c:129)
+10/22 10:44:29.058: [gtp] INFO: gtp_server() [127.0.0.3]:2123 (../lib/gtp/path.c:30)
+10/22 10:44:29.058: [pfcp] INFO: pfcp_server() [127.0.0.3]:8805 (../lib/pfcp/path.c:30)
+10/22 10:44:29.058: [pfcp] INFO: ogs_pfcp_connect() [127.0.0.6]:8805 (../lib/pfcp/path.c:61)
+10/22 10:44:29.058: [app] INFO: SGW-C initialize...done (../src/sgwc/app.c:31)
+
+$ ./install/bin/open5gs-sgwud
+Open5GS daemon v2.4.11-100-gbea24d7
+
+10/22 10:44:36.178: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/sgwu.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:44:36.178: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/sgwu.log' (../lib/app/ogs-init.c:129)
+10/22 10:44:36.185: [pfcp] INFO: pfcp_server() [127.0.0.6]:8805 (../lib/pfcp/path.c:30)
+10/22 10:44:36.185: [gtp] INFO: gtp_server() [127.0.0.6]:2152 (../lib/gtp/path.c:30)
+10/22 10:44:36.185: [app] INFO: SGW-U initialize...done (../src/sgwu/app.c:31)
+
+$ ./install/bin/open5gs-hssd
+Open5GS daemon v2.4.11-100-gbea24d7
+
+10/22 10:49:22.963: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/hss.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:49:22.963: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/hss.log' (../lib/app/ogs-init.c:129)
+10/22 10:49:22.965: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:130)
+10/22 10:49:22.996: [app] INFO: HSS initialize...done (../src/hss/app-init.c:31)
+10/22 10:49:22.997: [diam] INFO: CONNECTED TO 'mme.localdomain' (SCTP,soc#15): (../lib/diameter/common/logger.c:108)
+
+$ ./install/bin/open5gs-pcrfd
+Open5GS daemon v2.4.11-100-gbea24d7
+
+10/22 10:49:26.089: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/pcrf.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:49:26.089: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/pcrf.log' (../lib/app/ogs-init.c:129)
+10/22 10:49:26.091: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:130)
+10/22 10:49:26.124: [app] INFO: PCRF initialize...done (../src/pcrf/app-init.c:31)
+10/22 10:49:26.125: [diam] INFO: CONNECTED TO 'smf.localdomain' (SCTP,soc#15): (../lib/diameter/common/logger.c:108)
 ```
 
 Several command line options are provided.
@@ -375,7 +418,7 @@ $ ./build/tests/app/app ## Both 5G Core and EPC with ./build/configs/sample.yaml
 
 ```bash
 $ sudo apt install curl
-$ curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
+$ curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
 $ sudo apt install nodejs
 ```
 
@@ -383,7 +426,7 @@ Install the dependencies to run WebUI
 
 ```bash
 $ cd webui
-$ npm ci --no-optional
+$ npm ci
 ```
 
 The WebUI runs as an [npm](https://www.npmjs.com/) script.
@@ -418,7 +461,7 @@ To add subscriber information, you can do WebUI operations in the following orde
   3. Fill the IMSI, security context(K, OPc, AMF), and APN of the subscriber.
   4. Click `SAVE` Button
 
-**Tip:** This addition immediately affects Open5GS without restarting any daemon.
+**Note:** Subscribers added with this tool immediately register in the Open5GS HSS/UDR without the need to restart any daemon. However, if you use the WebUI to change subscriber profile, you must restart the Open5GS AMF/MME daemon for the changes to take effect.
 {: .notice--warning}
 
 ### IP routing + NAT for UE internet connectivity
@@ -458,7 +501,20 @@ $ sudo sysctl -w net.ipv6.conf.all.forwarding=1
 
 ### Add NAT Rule
 $ sudo iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE
-$ sudo ip6tables -t nat -A POSTROUTING -s 2001:230:cafe::/48 ! -o ogstun -j MASQUERADE
+$ sudo ip6tables -t nat -A POSTROUTING -s 2001:db8:cafe::/48 ! -o ogstun -j MASQUERADE
+```
+
+Optionally, you may consider the settings below for security purposes.
+
+```bash
+### Prevent UE's from connecting to the host on which UPF is running
+$ sudo iptables -I INPUT -s 10.45.0.0/16 -j DROP
+$ sudo ip6tables -I INPUT -s 2001:db8:cafe::/48 -j DROP
+
+### If your core network runs over multiple hosts, you probably want to block
+### UE originating traffic from accessing other network functions.
+### Replace x.x.x.x/y with the VNFs IP/subnet
+$ sudo iptables -I FORWARD -s 10.45.0.0/16 -d x.x.x.x/y -j DROP
 ```
 
 **Note:** The above assumes you do not have any existing rules in the filter and nat tables. If a program such as docker has already set up rules, you may need to add the Open5GS related rules differently.
@@ -527,32 +583,37 @@ You can use the command line option[`-d`] to record more logs.
 
 ```bash
 $ ./tests/app/app -d
-Open5GS daemon v1.3.0-213-gd190548+
+Open5GS daemon v2.4.11-100-gbea24d7
 
-08/21 23:01:54.246: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/build/configs/sample.yaml' (../src/main.c:54)
-08/21 23:01:54.246: [thread] DEBUG: [0x7f8de4d25018] worker signal (../lib/core/ogs-thread.c:66)
-08/21 23:01:54.246: [thread] DEBUG: [0x7f8de4d25018] thread started (../lib/core/ogs-thread.c:101)
-Open5GS daemon v1.3.0-213-gd190548+
-
-08/21 23:01:54.254: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/build/configs/sample.yaml' (../src/main.c:54)
-08/21 23:01:54.254: [thread] DEBUG: [0x7ff8d13be818] worker signal (../lib/core/ogs-thread.c:66)
-08/21 23:01:54.254: [nrf] DEBUG: nrf_state_initial(): INIT (../src/nrf/nrf-sm.c:25)
-08/21 23:01:54.254: [nrf] DEBUG: nrf_state_operational(): ENTRY (../src/nrf/nrf-sm.c:50)
-08/21 23:01:54.254: [thread] DEBUG: [0x7ff8d13be818] thread started (../lib/core/ogs-thread.c:101)
-08/21 23:01:54.254: [app] INFO: NRF initialize...done (../src/nrf/app.c:31)
-08/21 23:01:54.255: [sbi] INFO: sbi_server() [127.0.0.10]:7777 (../lib/sbi/server.c:298)
-08/21 23:01:54.255: [sbi] INFO: sbi_server() [::1]:7777 (../lib/sbi/server.c:298)
-08/21 23:01:54.296: [thread] DEBUG: [0x7f8de4d25098] worker signal (../lib/core/ogs-thread.c:66)
-08/21 23:01:54.296: [thread] DEBUG: [0x7f8de4d25098] thread started (../lib/core/ogs-thread.c:101)
-Open5GS daemon v1.3.0-213-gd190548+
-
-08/21 23:01:54.315: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/build/configs/sample.yaml' (../src/main.c:54)
-08/21 23:01:54.319: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:99)
-08/21 23:01:54.332: [app] INFO: PCRF initialize...done (../src/pcrf/app-init.c:31)
-08/21 23:01:54.347: [thread] DEBUG: [0x7f8de4d25118] worker signal (../lib/core/ogs-thread.c:66)
-08/21 23:01:54.347: [thread] DEBUG: [0x7f8de4d25118] thread started (../lib/core/ogs-thread.c:101)
-Open5GS daemon v1.3.0-213-gd190548+
+10/22 10:59:03.813: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/build/configs/sample.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:59:03.813: [thread] DEBUG: [0x55fab86aff40] worker signal (../lib/core/ogs-thread.c:66)
+10/22 10:59:03.813: [thread] DEBUG: [0x55fab86aff40] thread started (../lib/core/ogs-thread.c:101)
+Open5GS daemon v2.4.11-100-gbea24d7
 
+10/22 10:59:03.818: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/build/configs/sample.yaml' (../lib/app/ogs-init.c:126)
+10/22 10:59:03.819: [sock] DEBUG: addr:127.0.0.10, port:7777 (../lib/core/ogs-sockaddr.c:140)
+10/22 10:59:03.819: [sock] DEBUG: addr:::1, port:7777 (../lib/core/ogs-sockaddr.c:140)
+10/22 10:59:03.819: [sock] DEBUG: addr:127.0.1.10, port:7777 (../lib/core/ogs-sockaddr.c:140)
+10/22 10:59:03.819: [sock] DEBUG: socket create(2:1:6) (../lib/core/ogs-socket.c:92)
+10/22 10:59:03.819: [sock] DEBUG: Turn on TCP_NODELAY (../lib/core/ogs-sockopt.c:139)
+10/22 10:59:03.819: [sock] DEBUG: Turn on SO_REUSEADDR (../lib/core/ogs-sockopt.c:120)
+10/22 10:59:03.819: [sock] DEBUG: socket bind 127.0.0.10:7777 (../lib/core/ogs-socket.c:117)
+10/22 10:59:03.819: [sock] DEBUG: tcp_server() [127.0.0.10]:7777 (../lib/core/ogs-tcp.c:60)
+10/22 10:59:03.819: [sbi] INFO: nghttp2_server() [127.0.0.10]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:59:03.819: [sock] DEBUG: socket create(10:1:6) (../lib/core/ogs-socket.c:92)
+10/22 10:59:03.819: [sock] DEBUG: Turn on TCP_NODELAY (../lib/core/ogs-sockopt.c:139)
+10/22 10:59:03.819: [sock] DEBUG: Turn on SO_REUSEADDR (../lib/core/ogs-sockopt.c:120)
+10/22 10:59:03.819: [sock] DEBUG: socket bind ::1:7777 (../lib/core/ogs-socket.c:117)
+10/22 10:59:03.819: [sock] DEBUG: tcp_server() [::1]:7777 (../lib/core/ogs-tcp.c:60)
+10/22 10:59:03.819: [sbi] INFO: nghttp2_server() [::1]:7777 (../lib/sbi/nghttp2-server.c:150)
+10/22 10:59:03.819: [thread] DEBUG: [0x5601b141e520] worker signal (../lib/core/ogs-thread.c:66)
+10/22 10:59:03.819: [nrf] DEBUG: nrf_state_initial(): INIT (../src/nrf/nrf-sm.c:25)
+10/22 10:59:03.819: [nrf] DEBUG: nrf_state_operational(): ENTRY (../src/nrf/nrf-sm.c:50)
+10/22 10:59:03.819: [thread] DEBUG: [0x5601b141e520] thread started (../lib/core/ogs-thread.c:101)
+10/22 10:59:03.819: [app] INFO: NRF initialize...done (../src/nrf/app.c:31)
+10/22 10:59:03.864: [thread] DEBUG: [0x55fab86d2100] worker signal (../lib/core/ogs-thread.c:66)
+10/22 10:59:03.864: [thread] DEBUG: [0x55fab86d2100] thread started (../lib/core/ogs-thread.c:101)
+Open5GS daemon v2.4.11-100-gbea24d7
 ...
 
 ```

docs/_docs/guide/03-splitting-network-functions.md

@@ -1,371 +0,0 @@
----
-title: Open5GS Splitting Network Functions
-head_inline: "<style> .blue { color: blue; } </style>"
----
-
-In a production network, NFs are usually not on the same machine as the default example that comes with Open5GS.
-
-Open5GS is designed to comply with standards, so in theory you can connect core network functions from Open5GS or other vendors to form a functioning network. However, this is only possible if it complies with 3GPP.
-
-To demonstrate this, we will cover how to isolate each network function and connect each network function to another. For some interfaces, you can specify multiple interfaces to connect to multiple interfaces.
-
-In this example, we are connecting the Open5GS NF together, but instead of the Open5GS network function, you can easily connect them like other vendors' NFs.
-
-## 1. Configuring Open5GS (Without other vendors' NFs)
-
-_Cloud Authentication and Session Management Server_
-
-```
-MongoDB   = 127.0.0.1 (subscriber data) - http://localhost:3000
-MME-s1ap  = 10.10.0.2 :36412 (authVPN) for S1-MME
-MME-gtpc  = 127.0.0.2 :2123 for S11
-MME-frDi  = 127.0.0.2 :3868 for S6a auth
-SGWC-gtpc = 127.0.0.3 :2123 for S11
-SGWC-pfcp = 10.10.0.3 :8805 (authVPN) for Sxa
-SMF-gtpc  = 127.0.0.4 :2123 for S5/8c, N11
-SMF-pfcp  = 10.10.0.4 :8805 (authVPN) for N4
-SMF-frDi  = 127.0.0.4 :3868 for Gx auth
-SMF-sbi   = 127.0.0.4 :7777 for 5G SBI (N7,N10,N11)
-AMF-ngap  = 10.10.0.5 :38412 (authVPN) for N2
-AMF-sbi   = 127.0.0.5 :7777 for 5G SBI (N8,N12,N11)
-HSS-frDi  = 127.0.0.8 :3868 for S6a auth
-PCRF-frDi = 127.0.0.9 :3868 for Gx auth
-NRF-sbi   = 127.0.0.10:7777 for 5G SBI
-AUSF-sbi  = 127.0.0.11:7777 for 5G SBI
-UDM-sbi   = 127.0.0.12:7777 for 5G SBI
-PCF-sbi   = 127.0.0.13:7777 for 5G SBI
-NSSF-sbi   = 127.0.0.14:7777 for 5G SBI
-UDR-sbi   = 127.0.0.20:7777 for 5G SBI
-```
-
-_Cloud Userplane Server (to host IMS etc)_
-
-```
-SGWU-pfcp = 10.10.0.6 :8805 (authVPN) for Sxa
-SGWU-gtpu = 10.11.0.6 :2152 (userplaneVPN) for S1-U, S5/8u
-UPF-pfcp  = 10.10.0.7 :8805 (authVPN) for N4
-UPF-gtpu  = 10.11.0.7 :2152 (userplaneVPN) for S5/8u, N3
-```
-
-You can refer to the network settings at
-[{{ site.url }}{{ site.baseurl }}/assets/Open5GS-Diagram.pdf]({{ site.url }}{{ site.baseurl }}/assets/Open5GS-Diagram.pdf) provided by [@kbarlee](https://github.com/kbarlee) in issue [#528](https://github.com/{{ site.github_username }}/open5gs/issues/528)
-{: .notice--danger}
-
-Modify [install/etc/open5gs/mme.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/mme.yaml.in) to set the S1AP IP address, PLMN ID, and TAC.
-
-```diff
-$ diff -u /etc/open5gs/mme.yaml.old /etc/open5gs/mme.yaml
---- mme.yaml.old	2020-08-22 11:36:40.512418765 -0400
-+++ mme.yaml	2020-08-22 11:36:27.081466682 -0400
-@@ -204,20 +204,20 @@
- mme:
-     freeDiameter: /home/acetcom/Documents/git/open5gs/install/etc/freeDiameter/mme.conf
-     s1ap:
--      addr: 127.0.0.2
-+      addr: 10.10.0.2
-     gtpc:
-       addr: 127.0.0.2
-     gummei: 
-       plmn_id:
--        mcc: 001
--        mnc: 01
-+        mcc: 901
-+        mnc: 70
-       mme_gid: 2
-       mme_code: 1
-     tai:
-       plmn_id:
--        mcc: 001
--        mnc: 01
--      tac: 7
-+        mcc: 901
-+        mnc: 70
-+      tac: 1
-     security:
-         integrity_order : [ EIA1, EIA2, EIA0 ]
-         ciphering_order : [ EEA0, EEA1, EEA2 ]
-```
-
-Modify [install/etc/open5gs/sgwc.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/sgwc.yaml.in) to set the PFCP IP address.
-```diff
-$ diff -u /etc/open5gs/sgwc.yaml.old /etc/open5gs/sgwc.yaml
-@@ -49,7 +49,7 @@
-     gtpc:
-       addr: 127.0.0.3
-     pfcp:
--      addr: 127.0.0.3
-+      addr: 10.10.0.3
-
- #
- # sgwu:
-@@ -100,7 +100,7 @@
- #
- sgwu:
-     pfcp:
--      addr: 127.0.0.6
-+      addr: 10.10.0.6
-
- #
- # parameter:
-```
-
-Modify [install/etc/open5gs/smf.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/smf.yaml.in) to set the PFCP IP address.
-```diff
-$ diff -u /etc/open5gs/smf.yaml.old /etc/open5gs/smf.yaml
---- smf.yaml.old	2020-08-22 11:37:39.990816411 -0400
-+++ smf.yaml	2020-08-22 11:38:18.647999952 -0400
-@@ -187,8 +187,7 @@
-       - addr: 127.0.0.4
-       - addr: ::1
-     pfcp:
--      - addr: 127.0.0.4
--      - addr: ::1
-+      - addr: 10.10.0.4
-     subnet:
-       - addr: 10.45.0.1/16
-       - addr: 2001:230:cafe::1/48
-@@ -282,7 +281,7 @@
- #
- upf:
-     pfcp:
--      - addr: 127.0.0.7
-+      - addr: 10.10.0.7
-
- #
- # parameter:
-
-```
-
-Modify [install/etc/open5gs/amf.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/amf.yaml.in) to set the NGAP IP address, PLMN ID, TAC and NSSAI.
-
-```diff
-diff -u /etc/open5gs/amf.yaml.old /etc/open5gs/amf.yaml
---- amf.yaml.old	2020-06-21 23:34:14.643114779 -0400
-+++ amf.yaml	2020-06-21 23:34:28.718482095 -0400
-@@ -67,25 +67,25 @@
-       - addr: 127.0.0.5
-         port: 7777
-     ngap:
--      - addr: 127.0.0.5
-+      - addr: 10.10.0.5
-     guami:
-       - plmn_id:
--          mcc: 001
--          mnc: 01
-+          mcc: 901
-+          mnc: 70
-         amf_id:
-           region: 2
-           set: 1
-     tai:
-       - plmn_id:
--          mcc: 001
--          mnc: 01
--        tac: 7
-+          mcc: 901
-+          mnc: 70
-+        tac: 1
-     plmn_support:
-       - plmn_id:
--          mcc: 001
--          mnc: 01
-+          mcc: 901
-+          mnc: 70
-         s_nssai:
-           - sst: 1
--          - sd: 2
-     security:
-         integrity_order : [ NIA1, NIA2, NIA0 ]
-         ciphering_order : [ NEA0, NEA1, NEA2 ]
-```
-
-Modify [install/etc/open5gs/sgwu.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/sgwu.yaml.in) to set the GTP-U and PFCP IP address.
-```diff
-$ diff -u /etc/open5gs/sgwu.yaml.old /etc/open5gs/sgwu.yaml
---- sgwu.yaml.old	2020-08-22 11:41:09.214670723 -0400
-+++ sgwu.yaml	2020-08-22 11:41:27.433937124 -0400
-@@ -51,9 +51,9 @@
- #
- sgwu:
-     gtpu:
--      addr: 127.0.0.6
-+      addr: 10.11.0.6
-     pfcp:
--      addr: 127.0.0.6
-+      addr: 10.10.0.6
-
- #
- # sgwc:
-```
-
-Modify [install/etc/open5gs/upf.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/upf.yaml.in) to set the GTP-U and PFCP IP address.
-```diff
-$ diff -u /etc/open5gs/upf.yaml.old /etc/open5gs/upf.yaml
---- upf.yaml.old	2020-08-22 11:42:57.781750067 -0400
-+++ upf.yaml	2020-08-22 11:43:13.268901616 -0400
-@@ -59,11 +59,9 @@
- #
- upf:
-     pfcp:
--      - addr: 127.0.0.7
-+      - addr: 10.10.0.7
-     gtpu:
--      - addr:
--        - 127.0.0.7
--        - ::1
-+      - addr: 10.11.0.7
-     subnet:
-       - addr: 10.45.0.1/16
-       - addr: 2001:230:cafe::1/48
-```
-
-After changing conf files, please restart Open5GS daemons.
-
-```bash
-$ sudo systemctl restart open5gs-mmed.service
-$ sudo systemctl restart open5gs-sgwcd.service
-$ sudo systemctl restart open5gs-smfd.service
-$ sudo systemctl restart open5gs-amfd.service
-$ sudo systemctl restart open5gs-upfd.service
-$ sudo systemctl restart open5gs-sgwud.service
-```
-
-## 2. External SMF
-In it's simplest form the SMF has 4 interfaces:
- * S5 - Connection to home network SGW-C (GTP-C)
- * Gx - Connection to PCRF (Diameter)
- * SBI - Service-based interface(HTTP2)
- * Sgi - Connection to external network (Generally the Internet via standard TCP/IP)
-
-#### S5 Interface Configuration
-Edit ```/etc/open5gs/smf.yaml``` and change the address to IP of the server running the SMF for the listener on GTP-C interfaces.
-
-```
-smf:
-    freeDiameter: /etc/freeDiameter/smf.conf
-    gtpc: 
-      addr:
-        - 10.0.1.121
-```
-
-#### Gx Interface Configuration
-Edit ```/etc/freeDiameter/smf.conf```
-
-Update ```ListenOn``` address to IP of the server running the SMF:
-
-``` ListenOn = "10.0.1.121"; ``` 
-
-Update ConnectPeer to connect to the PCRF on it's IP.
-
-```ConnectPeer = "pcrf.localdomain" { ConnectTo = "10.0.1.123"; No_TLS; };```
-
-#### Restart Services
-Restart Open5GS SMF Daemon:
-
-``` $ sudo systemctl restart open5gs-smfd.service ```
-
-
-## 3. External SGW-C
-In it's simplest form the SGW-C has 2 interfaces:
- * S11 - Connection to MME (GTP-C)
- * S5 - Connection to the home network SMF (GTP-C)
-
-#### S5 Interface Configuration
-Edit ```/etc/open5gs/sgwc.yaml``` and change the address to IP of the server running the SGW-C for the listener on GTP-C interface.
-
-```
-sgwc:
-    gtpc: 
-      addr:
-        - 10.0.1.122
-```
- 
- Restart Open5GS SGW-C Daemon:
-
-``` $ sudo systemctl restart open5gs-sgwcd.service ```
-
-
-## 4. External PCRF
-In it's simplest from the PCRF has 1 network interface:
- * Gx - Connection to SMF (Diameter)
-
-#### Gx Interface Configuration
-Edit ```/etc/freeDiameter/pcrf.conf```
-
-Update ```ListenOn``` address to IP of the server running the HSS on it's IP:
-
-``` ListenOn = "10.0.1.123"; ``` 
-
-Update ConnectPeer to connect to the MME.
-
-```ConnectPeer = "smf.localdomain" { ConnectTo = "10.0.1.121"; No_TLS; };```
-
-#### MongoDB Interface Configuration
-Edit the ```db_uri:``` to point at the Open5GS: ```db_uri: mongodb://10.0.1.118/open5gs``` 
-
-Restart Open5GS PCRF Daemon:
-
-``` $ sudo systemctl restart open5gs-pcrfd.service ```
-
-## 5. External HSS
-In it's simplest form the HSS has 1 network interface:
- * S6a - Connection to MME (Diameter)
-
-#### S6a Interface Configuration
-Edit ```/etc/freeDiameter/hss.conf```
-
-Update ```ListenOn``` address to IP of the server running the HSS on it's IP:
-
-``` ListenOn = "10.0.1.118"; ``` 
-
-Update ConnectPeer to connect to the MME.
-
-```ConnectPeer = "mme.localdomain" { ConnectTo = "10.0.1.124"; No_TLS; };```
-
-Restart Open5GS HSS Daemon:
-
-``` $ sudo systemctl restart open5gs-hssd.service ```
-
-#### MongoDB Interface Configuration (Open5GS specific)
-If you are using Open5GS's HSS you may need to enable MongoDB access from the PCRF. This is done by editing ''/etc/mongodb.conf'' and changing the bind IP to:
-``` bind_ip = 0.0.0.0 ```
-
-Restart MongoDB for changes to take effect.
-
-``` $ /etc/init.d/mongodb restart ```
-
-## 6. External MME
-In it's simplest form the MME has 3 interfaces:
- * S1AP - Connections from eNodeBs
- * S6a - Connection to HSS (Diameter)
- * S11 - Connection to SGW-C (GTP-C)
- 
-#### S11 Interface Configuration
-Edit ```/etc/open5gs/mme.yaml``` and filling the IP address of the SGW-C and SMF servers.
-```
-sgwc:
-    gtpc:
-      addr: 10.0.1.122
-
-smf:
-    gtpc:
-      addr:
-        - 10.0.1.121
-```
-
-#### S6a Interface Configuration
-Edit ```/etc/freeDiameter/mme.conf```
-
-Update ```ListenOn``` address to IP of the server running the MME:
-
-``` ListenOn = "10.0.1.124"; ``` 
-
-Update ConnectPeer to connect to the PCRF on it's IP.
-
-```ConnectPeer = "hss.localdomain" { ConnectTo = "10.0.1.118"; No_TLS; };```
-
-
-#### Restart Services
-Restart Open5GS MME Daemon:
-
-``` $ sudo systemctl restart open5gs-mmed.service ```

docs/_docs/hardware/01-genodebs.md

@@ -5,47 +5,62 @@ head_inline: "<style> .blue { color: blue; } .bold { font-weight: bold; } </styl
 
 This page lists Radio hardware that has been tested by members of the Open5GS community,
 
-Listed eNodeBs have at a minimum connected to Open5GS. This does not mean all functionality (dedicated bearers, GBRs, etc) has been tested.
-
 If you have tested radio hardware from a vendor not listed with Open5GS, please add it to this page [by creating a PR on GitHub.](https://github.com/open5gs/open5gs)
 
-### Commercial Macro BTS
+### Commercial 5G
+---
+ * 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)
+
+### Commercial 4G
 ---
 
- * Huawei BTS 3900 (S/W version V100R011C10SPC230)
-
-### Small Cells
----
-
- * Baicells Neutrino
- * Baicells Nova 243
- * Baicells Nova 246
- * Baicells Nova 436Q
- * Baicells Nova 227 (EBS & CBRS)
- * Baicells Nova 233
- * Airspan AirSpeed 1030
- * Airspan AirHarmony 1000
+ * Accelleran E1010 (LTE TDD B42)
  * AirHarmony 4000
  * AirHarmony 4200
  * AirHarmony 4400
+ * Airspan AirSpeed 1030
+ * Airspan AirHarmony 1000
+ * Baicells Neutrino
+ * Baicells Nova 243
+ * Baicells Nova 246
+ * Baicells Nova 249
+ * Baicells Nova 436Q
+ * Baicells Nova 227 (EBS & CBRS)
+ * Baicells Nova 233
+ * 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)
- * NOKIA FW2PC BC28 Flexi Zone G2 Outdoor Micro FDD LTE 700 MHz High Power
- * NOKIA FWH1 B38 Flexi Zone Outdoor Micro TD LTE 2600 MHz
- * Accelleran E1010 (LTE TDD B42)
-
-### OpenRAN Hardware
----
-
+ * Huawei BTS3900 (S/W version V100R011C10SPC230)
+ * Huawei BBU5900 with RRU5304W Band 7 FDD 2600Mhz 40W Version V100R016C10
+ * Nokia FW2PC BC28 Flexi Zone G2 Outdoor Micro FDD LTE 700 MHz High Power
+ * Nokia FWH1 B38 Flexi Zone Outdoor Micro TD LTE 2600 MHz
+ * Nokia FRGY Flexi BTS BBU with Nokia FRCG RRU Band 5 850Mhz FDD 40W. Version 16.1A to 19.0
+ * Nokia FW2FA Flexi Zone Mini-Macro Outdoor BTS, 2x20w Band 39
+ * Nokia FWGR Flexi Zone Mini-Macro Outdoor BTS, 2x20w Band 1
+ * Ruckus Q710 and Q910
 
 ### 4G/5G Software Stacks + SDRs
 ---
 
- * [srsLTE / srsENB](https://github.com/srsLTE/srsLTE) + LimeSDR, USRP, BladeRF x40 (BladeRF Not stable)
  * [Amarisoft](https://www.amarisoft.com/) + LimeSDR, USRP, Amarisoft PCI Express Card
+ * 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
 ---
+ * [OpenAirInterface v1.0.3](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tree/v1.0.3) 4G RAN Simulator
  * [OsmoBTS](https://osmocom.org/projects/osmobts/wiki) controlled ip.access NanoBTS (Used for CSFB with Osmocom)
  * [UERANSIM](https://github.com/aligungr/UERANSIM) 5G RAN Simulator
- * [OpenAirInterface v1.0.3](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tree/v1.0.3) 4G RAN Simulator
- 

docs/_docs/platform/01-debian-ubuntu.md

@@ -67,7 +67,7 @@ $ sudo sh -c "cat << EOF > /etc/systemd/network/99-open5gs.network
 Name=ogstun
 [Network]
 Address=10.45.0.1/16
-Address=2001:230:cafe::1/48
+Address=2001:db8:cafe::1/48
 EOF"
 ```
 
@@ -84,7 +84,7 @@ Make sure it is set up properly.
 $ ifconfig ogstun
 ogstun: flags=4305<UP,POINTOPOINT,RUNNING,NOARP,MULTICAST>  mtu 1500
         inet 10.45.0.1  netmask 255.255.0.0  destination 10.45.0.1
-        inet6 2001:230:cafe::1  prefixlen 64  scopeid 0x0<global>
+        inet6 2001:db8:cafe::1  prefixlen 64  scopeid 0x0<global>
         inet6 fe80::e86e:86d8:ea24:f8ee  prefixlen 64  scopeid 0x20<link>
         unspec 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00  txqueuelen 500  (UNSPEC)
         RX packets 0  bytes 0 (0.0 B)

docs/_docs/platform/02-centos.md

@@ -3,10 +3,10 @@ title: CentOS
 head_inline: "<style> .blue { color: blue; } </style>"
 ---
 
-This guide is based on **CentOS 8** Distribution.
+This guide is based on **CentOS Stream 8** Distribution.
 {: .blue}
 
-## Install **CentOS 8** from Vagrant box (optional)
+## Install **CentOS Stream 8** from Vagrant box (optional)
 ---
 Vagrant provides a simple way to create and deploy Virtual Machines from
 pre-built images using VirtualBox, libvirt, or VMWare as a hypervisor engine.
@@ -20,13 +20,13 @@ The instructions to install Vagrant are provided at
 [vagrantup.com](https://www.vagrantup.com/).
 
 
-### Create a CentOS 8 Virtual Machine using Vagrant
+### Create a CentOS Stream 8 Virtual Machine using Vagrant
 ---
 
 Use the supplied `Vagrantfile` in the `vagrant` directory to create the
 virtual machine.
 
-Note that this Vagrantfile is identical to the base CentOS 8 box, with
+Note that this Vagrantfile is identical to the base CentOS Stream 8 box, with
 the exception that the amount of virtual memory has been increased to 1GB:
 
 ```bash
@@ -37,7 +37,7 @@ vagrant up --provider virtualbox
 ### Log into the newly created CentOS VM
 ---
 
-Use SSH to log into the CentOS 8 VM:
+Use SSH to log into the CentOS Stream 8 VM:
 
 ```bash
 vagrant ssh
@@ -45,20 +45,20 @@ vagrant ssh
 
 Note that the Open5GS source is *not* copied into the VM.  The instructions
 below provide the step by step instructions for setting up Open5GS for
-either a bare metal or virtual CentOS 8 system.
+either a bare metal or virtual CentOS Stream 8 system.
 
 The rest of the commands below are performed inside the CentOS VM as the
-user 'vagrant', or on your bare metal CentOS 8 system as any normal user.
+user 'vagrant', or on your bare metal CentOS Stream 8 system as any normal user.
 
 ## Install prerequisite packages to build and run Open5GS
 ---
 
-### Enable CentOS 8 PowerTools repository
+### Enable CentOS Stream 8 PowerTools repository
 ---
 
 ```bash
 $ sudo dnf install 'dnf-command(config-manager)'
-$ sudo dnf config-manager --set-enabled PowerTools
+$ sudo dnf config-manager --set-enabled powertools
 ```
 
 ### Enable the Extra Packages for Enterprise Linux
@@ -86,13 +86,13 @@ $ sudo dnf config-manager --set-enabled elrepo-testing
 Create a repository file to install the MongoDB packages:
 
 ```bash
-$ sudo sh -c 'cat << EOF > /etc/yum.repos.d/mongodb-org-3.4.repo
-[mongodb-org-3.4]
+$ sudo sh -c 'cat << EOF > /etc/yum.repos.d/mongodb-org-3.6.repo
+[mongodb-org-3.6]
 name=MongoDB Repository
-baseurl=https://repo.mongodb.org/yum/redhat/\$releasever/mongodb-org/3.4/x86_64/
+baseurl=https://repo.mongodb.org/yum/redhat/\$releasever/mongodb-org/3.6/x86_64/
 gpgcheck=1
 enabled=1
-gpgkey=https://www.mongodb.org/static/pgp/server-3.4.asc
+gpgkey=https://www.mongodb.org/static/pgp/server-3.6.asc
 EOF'
 ```
 
@@ -105,18 +105,11 @@ $ sudo dnf -y install mongodb-org
 ### Install the dependencies for building the source code.
 ---
 Open5GS requires several packages which are not installed by default in
-a base CentOS 8 installation.
+a base CentOS Stream 8 installation.
 
 
 ```bash
-$ sudo dnf install python3 meson ninja-build gcc flex bison git lksctp-tools-devel libidn-devel gnutls-devel libgcrypt-devel openssl-devel cyrus-sasl-devel libyaml-devel mongo-c-driver-devel libmicrohttpd-devel libcurl-devel libnghttp2-devel
-```
-
-### Install the SCTP kernel module in kernel-modules-extra.
----
-
-```bash
-$ sudo dnf install kernel-modules-extra
+$ sudo dnf install python3 meson ninja-build gcc gcc-c++ flex bison git lksctp-tools-devel libidn-devel gnutls-devel libgcrypt-devel openssl-devel cyrus-sasl-devel libyaml-devel mongo-c-driver-devel libmicrohttpd-devel libcurl-devel libnghttp2-devel libtalloc-devel
 ```
 
 ### Install iproute IP interface tools.
@@ -126,6 +119,15 @@ $ sudo dnf install kernel-modules-extra
 $ sudo dnf install iproute
 ```
 
+### Install the SCTP kernel module in kernel-modules-extra.
+---
+
+```bash
+$ sudo dnf install kernel-modules-extra
+$ sudo rm /etc/modprobe.d/sctp-blacklist.conf
+$ sudo rm /etc/modprobe.d/sctp_diag-blacklist.conf
+```
+
 ### Update all installed packages to the latest versions.
 ---
 
@@ -141,11 +143,27 @@ after this step to ensure that you are running this new kernel version.
 This is important when you try to load the SCTP kernel module later.
 
 ```bash
-[vm] $ sudo reboot
+[host] $ vagrant halt
+[host] $ vagrant up --provider virtualbox
 [host] $ # ssh back into the VM after it reboots...
 [host] $ vagrant ssh
 ```
 
+### Check the SCTP kernel module
+---
+Open5GS requires the Linux SCTP kernel module to be loaded in the kernel.
+In the CentOS Stream 8 Vagrant box SCTP is not loaded into the kernel automatically
+so must be installed as follows:
+
+```bash
+$ checksctp
+SCTP supported
+$ sudo modprobe sctp
+$ # Check that SCTP was loaded successfully:
+$ sudo dmesg | grep sctp
+[  639.971360] sctp: Hash tables configured (bind 256/256)
+```
+
 ## Build Open5GS from Source
 ---
 
@@ -223,7 +241,7 @@ to support IPv6.  This is done by setting the `diable_ipv6` option for
 $ sysctl -n net.ipv6.conf.ogstun.disable_ipv6
 1
 
-$ sudo -w net.ipv6.conf.ogstun.disable_ipv6=0
+$ sudo sysctl -w net.ipv6.conf.ogstun.disable_ipv6=0
 
 $ sysctl -n net.ipv6.conf.ogstun.disable_ipv6
 0
@@ -236,7 +254,7 @@ Set the IP address on the `ogstun` TUN interface.
 
 ```bash
 $ sudo ip addr add 10.45.0.1/16 dev ogstun
-$ sudo ip addr add 2001:230:cafe::1/48 dev ogstun
+$ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun
 ```
 
 Make sure it is set up properly.
@@ -252,19 +270,6 @@ to configure the TUN device as follows:
 `$ sudo ./misc/netconf.sh`
 {: .notice--info}
 
-### Install the SCTP kernel module
----
-Open5GS requires the Linux SCTP kernel module to be loaded in the kernel.
-In the CentOS 8 Vagrant box SCTP is not loaded into the kernel automatically
-so must be installed as follows:
-
-```bash
-$ sudo modprobe sctp
-$ # Check that SCTP was loaded successfully:
-$ sudo dmesg | grep sctp
-[  639.971360] sctp: Hash tables configured (bind 256/256)
-```
-
 ## Testing Open5GS
 ---
 
@@ -323,9 +328,10 @@ $ cd build
 $ ninja install
 $ cd ../
 $ ls install/bin
-open5gs-amfd   open5gs-hssd  open5gs-nrfd   open5gs-sgwcd  open5gs-smfd  open5gs-udrd
-open5gs-ausfd  open5gs-mmed  open5gs-pcrfd  open5gs-sgwud  open5gs-udmd  open5gs-pcfd
-open5gs-upfd   open5gs-nssfd
+open5gs-amfd   open5gs-mmed   open5gs-pcrfd  open5gs-smfd
+open5gs-ausfd  open5gs-nrfd   open5gs-scpd   open5gs-udmd
+open5gs-bsfd   open5gs-nssfd  open5gs-sgwcd  open5gs-udrd
+open5gs-hssd   open5gs-pcfd   open5gs-sgwud  open5gs-upfd
 ```
 
 ## Building WebUI of Open5GS
@@ -342,7 +348,7 @@ Install the dependencies to run WebUI
 ```bash
 $ cd ~/open5gs
 $ cd webui
-$ npm ci --no-optional
+$ npm ci
 ```
 
 The WebUI runs as an [npm](https://www.npmjs.com/) script.

docs/_docs/platform/03-fedora.md

@@ -39,7 +39,7 @@ Then, to support IPv6-enabled UEs, you must configure your TUN device to support
 $ sysctl -n net.ipv6.conf.ogstun.disable_ipv6
 1
 
-$ sudo -w net.ipv6.conf.ogstun.disable_ipv6=0
+$ sudo -w sysctl net.ipv6.conf.ogstun.disable_ipv6=0
 
 $ sysctl -n net.ipv6.conf.ogstun.disable_ipv6
 0
@@ -52,7 +52,7 @@ You are now ready to set the IP address on TUN device.
 
 ```bash
 $ sudo ip addr add 10.45.0.1/16 dev ogstun
-$ sudo ip addr add 2001:230:cafe::1/48 dev ogstun
+$ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun
 ```
 
 Make sure it is set up properly.
@@ -70,7 +70,7 @@ $ ip link show
 
 Install the depedencies for building the source code.
 ```bash
-$ sudo dnf install python3 ninja-build gcc flex bison git lksctp-tools-devel libidn-devel gnutls-devel libgcrypt-devel openssl-devel cyrus-sasl-devel libyaml-devel mongo-c-driver-devel libmicrohttpd-devel libcurl-devel libnghttp2-devel iproute
+$ sudo dnf install python3 ninja-build gcc gcc-c++ flex bison git lksctp-tools-devel libidn-devel gnutls-devel libgcrypt-devel openssl-devel cyrus-sasl-devel libyaml-devel mongo-c-driver-devel libmicrohttpd-devel libcurl-devel libnghttp2-devel libtalloc-devel iproute
 ```
 
 Install Meson
@@ -127,7 +127,7 @@ Install the dependencies to run WebUI
 
 ```bash
 $ cd webui
-$ npm ci --no-optional
+$ npm ci
 ```
 
 The WebUI runs as an [npm](https://www.npmjs.com/) script.

docs/_docs/platform/05-macosx-apple-silicon.md

@@ -69,6 +69,7 @@ $ sudo ifconfig lo0 alias 127.0.0.17 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.18 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.19 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.20 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.1.10 netmask 255.255.255.255
 ```
 
 Enable IP forwarding & Masquerading
@@ -76,7 +77,7 @@ Enable IP forwarding & Masquerading
 $ sudo sysctl -w net.inet.ip.forwarding=1
 $ sudo sysctl -w net.inet6.ip6.forwarding=1
 $ sudo sh -c "echo 'nat on {en0} from 10.45.0.0/16 to any -> {en0}' > /etc/pf.anchors/org.open5gs"
-$ sudo sh -c "echo 'nat on {en0} from 2001:230:cafe::1/48 to any -> {en0}' > /etc/pf.anchors/org.open5gs"
+$ sudo sh -c "echo 'nat on {en0} from 2001:db8:cafe::1/48 to any -> {en0}' > /etc/pf.anchors/org.open5gs"
 $ sudo pfctl -e -f /etc/pf.anchors/org.open5gs
 ```
 
@@ -89,7 +90,7 @@ $ sudo pfctl -e -f /etc/pf.anchors/org.open5gs
 
 Install the depedencies for building the source code.
 ```bash
-$ brew install mongo-c-driver gnutls libgcrypt libidn libyaml libmicrohttpd nghttp2 pkg-config bison libusrsctp
+$ brew install mongo-c-driver gnutls libgcrypt libidn libyaml libmicrohttpd nghttp2 pkg-config bison libusrsctp libtins talloc
 ```
 
 Configure Homebrew PATH
@@ -97,6 +98,7 @@ Configure Homebrew PATH
 $ export PATH="/opt/homebrew/opt/bison/bin:/opt/homebrew/bin:$PATH"
 $ export LIBRARY_PATH=/opt/homebrew/lib
 $ export C_INCLUDE_PATH=/opt/homebrew/include
+$ export CPLUS_INCLUDE_PATH=/opt/homebrew/include
 ```
 
 Install Meson using Homebrew.
@@ -162,7 +164,7 @@ Install the dependencies to run WebUI
 
 ```bash
 $ cd webui
-$ npm ci --no-optional
+$ npm ci
 ```
 
 The WebUI runs as an [npm](https://www.npmjs.com/) script.

docs/_docs/platform/06-macosx-intel.md

@@ -69,6 +69,7 @@ $ sudo ifconfig lo0 alias 127.0.0.17 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.18 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.19 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.20 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.1.10 netmask 255.255.255.255
 ```
 
 Enable IP forwarding & Masquerading
@@ -76,7 +77,7 @@ Enable IP forwarding & Masquerading
 $ sudo sysctl -w net.inet.ip.forwarding=1
 $ sudo sysctl -w net.inet6.ip6.forwarding=1
 $ sudo sh -c "echo 'nat on {en0} from 10.45.0.0/16 to any -> {en0}' > /etc/pf.anchors/org.open5gs"
-$ sudo sh -c "echo 'nat on {en0} from 2001:230:cafe::1/48 to any -> {en0}' > /etc/pf.anchors/org.open5gs"
+$ sudo sh -c "echo 'nat on {en0} from 2001:db8:cafe::1/48 to any -> {en0}' > /etc/pf.anchors/org.open5gs"
 $ sudo pfctl -e -f /etc/pf.anchors/org.open5gs
 ```
 
@@ -89,7 +90,7 @@ $ sudo pfctl -e -f /etc/pf.anchors/org.open5gs
 
 Install the depedencies for building the source code.
 ```bash
-$ brew install mongo-c-driver gnutls libgcrypt libidn libyaml libmicrohttpd nghttp2 pkg-config libusrsctp
+$ brew install mongo-c-driver gnutls libgcrypt libidn libyaml libmicrohttpd nghttp2 pkg-config libusrsctp libtins talloc
 ```
 
 Install Bison and Create soft link.
@@ -161,7 +162,7 @@ Install the dependencies to run WebUI
 
 ```bash
 $ cd webui
-$ npm ci --no-optional
+$ npm ci
 ```
 
 The WebUI runs as an [npm](https://www.npmjs.com/) script.

docs/_docs/platform/07-freebsd.md

@@ -89,6 +89,7 @@ $ sudo ifconfig lo0 alias 127.0.0.17 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.18 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.19 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.20 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.1.10 netmask 255.255.255.255
 ```
 
 Enable IP forwarding
@@ -106,7 +107,7 @@ $ sudo sysctl -w net.inet6.ip6.forwarding=1
 
 Install the depedencies for building the source code.
 ```bash
-$ sudo pkg install meson ninja gcc bison gsed pkgconf git mongo-c-driver gnutls libgcrypt libidn libyaml libmicrohttpd nghttp2
+$ sudo pkg install meson ninja gcc bison gsed pkgconf git mongo-c-driver gnutls libgcrypt libidn libyaml libmicrohttpd nghttp2 talloc
 ```
 
 Configure gcc PATH
@@ -206,7 +207,7 @@ Install the dependencies to run WebUI
 
 ```bash
 $ cd webui
-$ npm ci --no-optional
+$ npm ci
 ```
 
 The WebUI runs as an [npm](https://www.npmjs.com/) script.

docs/_docs/platform/08-alpine.md

@@ -0,0 +1,115 @@
+---
+title: Alpine
+head_inline: "<style> .blue { color: blue; } </style>"
+---
+
+This guide is based on **Alpine 3.13** Distribution.
+{: .blue}
+
+### Getting MongoDB
+---
+
+Install MongoDB with package manager.
+```bash
+$ sudo apk update
+$ sudo apk add mongodb
+```
+
+Run MongoDB server.
+```bash
+$ mkdir -p ./data/db
+$ mongod --dbpath ./data/db
+```
+
+### Setting up TUN device (No persistent after rebooting)
+---
+
+Create the TUN device. Interface name will be `ogstun`.
+```bash
+$ sudo apk add iproute2
+$ sudo ip tuntap add name ogstun mode tun
+$ ip link show
+```
+
+You are now ready to set the IP address on TUN device. 
+
+```bash
+$ sudo ip addr add 10.45.0.1/16 dev ogstun
+$ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun
+```
+
+Make sure it is set up properly.
+```bash
+$ sudo ip link set ogstun up
+$ ip link show
+```
+
+**Tip:** The script provided in [$GIT_REPO/misc/netconf.sh](https://github.com/{{ site.github_username }}/open5gs/blob/main/misc/netconf.sh) makes it easy to configure the TUN device as follows:
+`$ sudo ./misc/netconf.sh`
+{: .notice--info}
+
+### Building Open5GS
+---
+
+Install the depedencies for building the source code.
+```bash
+$ sudo apk add alpine-sdk bison flex git meson bash sudo linux-headers bsd-compat-headers yaml-dev lksctp-tools-dev gnutls-dev libgcrypt-dev libidn-dev mongo-c-driver-dev libmicrohttpd-dev curl-dev nghttp2-dev talloc-dev
+```
+
+Git clone.
+
+```bash
+$ git clone https://github.com/{{ site.github_username }}/open5gs
+```
+
+To compile with meson:
+
+```bash
+$ cd open5gs
+$ meson build --prefix=`pwd`/install
+$ ninja -C build
+```
+
+Check whether the compilation is correct.
+```bash
+$ ./build/tests/attach/attach ## EPC Only
+$ ./build/tests/registration/registration ## 5G Core Only
+```
+
+Run all test programs as below.
+```bash
+$ cd build
+$ meson test -v
+```
+
+**Tip:** You can also check the result of `ninja -C build test` with a tool that captures packets. If you are running `wireshark`, select the `loopback` interface and set FILTER to `s1ap || gtpv2 || pfcp || diameter || gtp || ngap || http2.data.data || http2.headers`.  You can see the virtually created packets. [testattach.pcapng]({{ site.url }}{{ site.baseurl }}/assets/pcapng/testattach.pcapng)/[testregistration.pcapng]({{ site.url }}{{ site.baseurl }}/assets/pcapng/testregistration.pcapng)
+{: .notice--info}
+
+You need to perform the **installation process**.
+```bash
+$ cd build
+$ ninja install
+$ cd ../
+```
+
+### Building WebUI of Open5GS
+---
+
+[Node.js](https://nodejs.org/) is required to build WebUI of Open5GS
+
+```bash
+$ sudo apk add nodejs
+```
+
+Install the dependencies to run WebUI
+
+```bash
+$ cd webui
+$ npm ci
+```
+
+The WebUI runs as an [npm](https://www.npmjs.com/) script.
+
+```bash
+$ npm run dev
+```

docs/_docs/troubleshoot/01-simple-issues.md

@@ -21,14 +21,16 @@ open5gs  26934  0.0  0.0 707472 12732 ?        Ssl  12:13   0:00 /usr/bin/open5g
 open5gs  27244  0.2  0.0 2861424 13584 ?       Ssl  12:13   0:00 /usr/bin/open5gs-hssd -c /etc/open5gs/hss.yaml
 open5gs  27366  0.0  0.0 2890772 14380 ?       Ssl  12:13   0:00 /usr/bin/open5gs-pcrfd -c /etc/open5gs/pcrf.yaml
 open5gs  27485  0.0  0.0 243816 15064 ?        Ssl  12:13   0:00 /usr/bin/open5gs-nrfd -c /etc/open5gs/nrf.yaml
+open5gs  27485  0.0  0.0 243916 13064 ?        Ssl  12:13   0:00 /usr/bin/open5gs-scpd -c /etc/open5gs/scp.yaml
 open5gs  27543  0.0  0.0 222416  9672 ?        Ssl  12:13   0:00 /usr/bin/open5gs-ausfd -c /etc/open5gs/ausf.yaml
 open5gs  27600  0.0  0.0 222328  9668 ?        Ssl  12:13   0:00 /usr/bin/open5gs-udmd -c /etc/open5gs/udm.yaml
 open5gs  27600  0.0  0.0 222329  9669 ?        Ssl  12:13   0:00 /usr/bin/open5gs-pcfd -c /etc/open5gs/pcf.yaml
 open5gs  27600  0.0  0.0 222329  9669 ?        Ssl  12:13   0:00 /usr/bin/open5gs-nssfd -c /etc/open5gs/nssf.yaml
+open5gs  27600  0.0  0.0 222329  9669 ?        Ssl  12:13   0:00 /usr/bin/open5gs-bsfd -c /etc/open5gs/bsf.yaml
 open5gs  27697  0.0  0.0 243976 13716 ?        Ssl  12:13   0:00 /usr/bin/open5gs-udrd -c /etc/open5gs/udr.yaml
 ```
 
-You should see each of the above services, MME, SGW-C, SMF, AMF, SGW-U, UPF, HSS, PCRF, NRF, AUSF, UDM, PCF, NSSF & UDR are all running.
+You should see each of the above services, MME, SGW-C, SMF, AMF, SGW-U, UPF, HSS, PCRF, NRF, SCP, AUSF, UDM, PCF, NSSF, BSF & UDR are all running.
 
 If your instance doesn't show this make sure you're started each service:
 ```bash
@@ -41,10 +43,12 @@ $ systemctl start open5gs-upfd.service
 $ systemctl start open5gs-hssd.service
 $ systemctl start open5gs-pcrfd.service
 $ systemctl start open5gs-nrfd.service
+$ systemctl start open5gs-scpd.service
 $ systemctl start open5gs-ausfd.service
 $ systemctl start open5gs-udmd.service
 $ systemctl start open5gs-pcfd.service
 $ systemctl start open5gs-nssfd.service
+$ systemctl start open5gs-bsfd.service
 $ systemctl start open5gs-udrd.service
 ```
 
@@ -53,14 +57,15 @@ $ systemctl start open5gs-udrd.service
 If a service isn't running check the log for that service - logs for each service live in */var/log/open5gs/* where each service logs to it's own file - MME logs in mme.log, AMF logs in amf.log, and so on. 
 
 ```bash
-$ cat /var/log/open5gs/mme.log
-Open5GS daemon v1.0.0
+$ cat a.log
+Open5GS daemon v2.4.11-100-gbea24d7
 
-[app] INFO: Configuration: '/etc/open5gs/mme.yaml' (../src/main.c:54)
-[app] INFO: File Logging: '/var/log/open5gs/mme.log' (../src/main.c:57)
-[mme] ERROR: No sgwc.gtpc in '/etc/open5gs/mme.yaml' (../src/mme/mme-context.c:192)
-[app] ERROR: Failed to intialize MME (../src/mme/app-init.c:30)
-[app] FATAL: Open5GS initialization failed. Aborted (../src/main.c:222)
+10/22 11:05:40.032: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/mme.yaml' (../lib/app/ogs-init.c:126)
+10/22 11:05:40.032: [app] INFO: File Logging: 'a.log' (../lib/app/ogs-init.c:129)
+10/22 11:05:40.094: [gtp] INFO: gtp_server() [127.0.0.2]:2123 (../lib/gtp/path.c:30)
+10/22 11:05:40.094: [gtp] INFO: gtp_connect() [127.0.0.3]:2123 (../lib/gtp/path.c:60)
+10/22 11:05:40.094: [mme] INFO: s1ap_server() [127.0.0.2]:36412 (../src/mme/s1ap-sctp.c:62)
+10/22 11:05:40.094: [sctp] INFO: MME initialize...done (../src/mme/app-init.c:33)
 ```
 
 Or, you can use `journalctl` like below to view live log.
@@ -174,16 +179,16 @@ You can modify the configuration file to record more logs.
 
 ```diff
 $ diff -u /etc/open5gs/amf.yaml.old /etc/open5gs/amf.yaml
---- amf.yaml.old	2020-08-22 12:26:56.132213488 -0400
-+++ amf.yaml	2020-08-22 12:27:04.135901201 -0400
+--- amf.yaml.old    2020-08-22 12:26:56.132213488 -0400
++++ amf.yaml    2020-08-22 12:27:04.135901201 -0400
 @@ -20,6 +20,7 @@
  #
  logger:
-     file: /home/acetcom/Documents/git/open5gs/install/var/log/open5gs/amf.log
+     file: @localstatedir@/log/open5gs/amf.log
 +    level: debug
+
  #
  # amf:
- #
 ```
 
 After changing conf files, please restart Open5GS daemons.

docs/_docs/troubleshoot/02-now-in-github-issues.md

@@ -10,6 +10,298 @@ head_inline: "<style> .blue { color: blue; } </style>"
   }
 </style>
 
+#### MME sends Attach reject(EMM-Cause:15) with Diameter error(Result-Code:3002)
+
+If you see the Attach reject(EMM-Cause:15] with Diameter error(Result-Code:3002), it means that HSS is not running.
+
+```
+...
+5/08 18:22:23.584: [diam] ERROR: pid:Routing-OUT (0x563969fc2060) in md_hook_cb_tree@dbg_msg_dumps.c:113:         AVP: 'Vendor-Specific-Application-Id'(260) l=8 f=-M val=(grouped)
+ ((null):0)
+05/08 18:22:23.584: [diam] ERROR: pid:Routing-OUT (0x563969fc2060) in md_hook_cb_tree@dbg_msg_dumps.c:113:            AVP: 'Vendor-Id'(266) l=12 f=-M val=10415 (0x28af)
+ ((null):0)
+05/08 18:22:23.584: [diam] ERROR: pid:Routing-OUT (0x563969fc2060) in md_hook_cb_tree@dbg_msg_dumps.c:113:            AVP: 'Auth-Application-Id'(258) l=12 f=-M val=16777251 (0x1000023)
+ ((null):0)
+05/08 18:22:23.584: [mme] INFO:     Result Code: 3002 (../src/mme/mme-fd-path.c:301)
+05/08 18:22:23.585: [mme] INFO: [001010123456792] Attach reject [EMM_CAUSE:15] (../src/mme/mme-sm.c:448)
+05/08 18:22:23.612: [mme] INFO: UE Context Release [Action:3] (../src/mme/s1ap-handler.c:1328)
+05/08 18:22:23.612: [mme] INFO:     ENB_UE_S1AP_ID[1] MME_UE_S1AP_ID[1] (../src/mme/s1ap-handler.c:1330)
+05/08 18:22:23.612: [mme] INFO:     IMSI[001010123456792] (../src/mme/s1ap-handler.c:1332)
+05/08 18:22:23.612: [mme] INFO: [Removed] Number of eNB-UEs is now 0 (../src/mme/mme-context.c:3228)
+...
+```
+
+Please check the status of HSS and restart it.
+```
+$ sudo systemctl status open5gs-hssd.service
+● open5gs-hssd.service - Open5GS HSS Daemon
+     Loaded: loaded (/lib/systemd/system/open5gs-hssd.service; disabled; vendor preset: enabled)
+     Active: inactive (dead)
+sudo systemctl status open5gs-hssd.service
+● open5gs-hssd.service - Open5GS HSS Daemon
+     Loaded: loaded (/lib/systemd/system/open5gs-hssd.service; disabled; vendor preset: enabled)
+     Active: active (running) since Sun 2021-05-09 18:36:49 KST; 1s ago
+   Main PID: 6011 (open5gs-hssd)
+      Tasks: 37 (limit: 19047)
+     Memory: 14.6M
+     CGroup: /system.slice/open5gs-hssd.service
+             └─6011 /usr/bin/open5gs-hssd -c /etc/open5gs/hss.yaml
+
+May 09 18:36:49 open5gs systemd[1]: Started Open5GS HSS Daemon.
+May 09 18:36:49 open5gs open5gs-hssd[6011]: Open5GS daemon v2.2.7
+May 09 18:36:49 open5gs open5gs-hssd[6011]: 05/09 18:36:49.987: [app] INFO: Configuration: '/etc/ope>
+May 09 18:36:49 open5gs open5gs-hssd[6011]: 05/09 18:36:49.987: [app] INFO: File Logging: '/var/log/>
+May 09 18:36:49 open5gs open5gs-hssd[6011]: 05/09 18:36:49.994: [dbi] INFO: MongoDB URI: 'mongodb://>
+May 09 18:36:50 open5gs open5gs-hssd[6011]: 05/09 18:36:50.116: [app] INFO: HSS initialize...done
+```
+
+#### MME Diameter-Error with HSS-crash using v2.2.x package
+
+If the following MME log occurs while connecting to the UE, it means that you may use the old format DB schema.
+
+```
+04/14 20:14:21.981: [diam] ERROR: pid:PSM/hss.localdomain in fd_psm_change_state@p_psm.c:287: 'STATE_OPEN' -> 'STATE_CLOSED' 'hss.localdomain'
+((null):0)
+04/14 20:14:21.982: [diam] ERROR: pid:PSM/hss.localdomain in md_hook_cb_tree@dbg_msg_dumps.c:89: FAILOVER from 'hss.localdomain':
+((null):0)
+04/14 20:14:21.982: [diam] ERROR: pid:PSM/hss.localdomain in md_hook_cb_tree@dbg_msg_dumps.c:90: 'Update-Location-Request'
+((null):0)
+```
+
+In this case, the HSS may crash as shown below.
+
+```
+04/12 10:13:45.025: [app] INFO: Configuration: '/home/open5gs/install/etc/open5gs/hss.yaml' (../lib/app/ogs-init.c:129)
+04/12 10:13:45.025: [app] INFO: File Logging: '/home/open5gs/install/var/log/open5gs/hss.log' (../lib/app/ogs-init.c:132)
+04/12 10:13:45.028: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:129)
+04/12 10:13:45.068: [diam] INFO: CONNECTED TO 'mme.epc.mnc001.mcc001.3gppnetwork.org' (SCTP,soc#17): (../lib/diameter/common/logger.c:108)
+04/12 10:13:45.069: [app] INFO: HSS initialize...done (../src/hss/app-init.c:31)
+04/12 10:14:27.167: [core] FATAL: ogs_slice_find_by_s_nssai: Assertion `num_of_slice_data' failed. (../lib/core/ogs-3gpp-types.c:529)
+04/12 10:14:27.168: [core] FATAL: backtrace() returned 10 addresses (../lib/core/ogs-abort.c:37)
+/home/open5gs/install/lib/x86_64-linux-gnu/libogscore.so.2(ogs_slice_find_by_s_nssai+0xd2) [0x7f3b720a126e]
+./install/bin/open5gs-hssd(+0xd12e) [0x55a57bb6f12e]
+/home/open5gs/install/lib/x86_64-linux-gnu/libfdproto.so.7(fd_disp_call_cb_int+0x270) [0x7f3b7135acb3]
+/home/open5gs/install/lib/x86_64-linux-gnu/libfdproto.so.7(fd_msg_dispatch+0xdca) [0x7f3b7137442f]
+home/open5gs/install/lib/x86_64-linux-gnu/libfdcore.so.7(+0x67c3c) [0x7f3b715f9c3c]
+/home/open5gs/install/lib/x86_64-linux-gnu/libfdcore.so.7(+0x6ca99) [0x7f3b715fea99]
+/open5gs/install/lib/x86_64-linux-gnu/libfdcore.so.7(+0x6cd06) [0x7f3b715fed06]
+/lib/x86_64-linux-gnu/libpthread.so.0(+0x76db) [0x7f3b70d016db]
+/lib/x86_64-linux-gnu/libc.so.6(clone+0x3f) [0x7f3b70a2a71f]
+```
+
+At this time, you need to check the DB schema is in the form below by using the command the below.
+
+```
+$ mongosh
+> use open5gs
+> db.subscribers.find().pretty()
+{
+    "_id" : ObjectId("60969fe79459f8b40d8d3f68"),
+    "imsi" : "999700000000001",
+    "__v" : 0,
+    "access_restriction_data" : 32,
+    "ambr" : {
+        "uplink" : {
+            "value" : 1,
+            "unit" : 3
+        },
+        "downlink" : {
+            "value" : 1,
+            "unit" : 3
+        }
+    },
+    "network_access_mode" : 2,
+    "security" : {
+        "k" : "465b5ce8b199b49faa5f0a2ee238a6bc",
+        "amf" : "8000",
+        "op" : null,
+        "opc" : "e8ed289deba952e4283b54e88e6183ca",
+        "sqn" : NumberLong(97)
+    },
+    "slice" : [
+        {
+            "sst" : 1,
+            "default_indicator" : true,
+            "_id" : ObjectId("60969fe7de8743b3c7b1a973"),
+            "session" : [
+                {
+                    "name" : "internet",
+                    "type" : 3,
+                    "_id" : ObjectId("60969fe7de8743b3c7b1a974"),
+                    "pcc_rule" : [ ],
+                    "ambr" : {
+                        "uplink" : {
+                            "value" : 1,
+                            "unit" : 3
+                        },
+                        "downlink" : {
+                            "value" : 1,
+                            "unit" : 3
+                        }
+                    },
+                    "qos" : {
+                        "index" : 9,
+                        "arp" : {
+                            "priority_level" : 8,
+                            "pre_emption_capability" : 1,
+                            "pre_emption_vulnerability" : 1
+                        }
+                    }
+                }
+            ]
+        }
+    ],
+    "subscribed_rau_tau_timer" : 12,
+    "subscriber_status" : 0
+}
+```
+
+If you see below, you are using the old format DB schema.
+
+```
+$ mongosh
+> use open5gs
+> db.subscribers.find().pretty()
+{
+    "_id" : ObjectId("609715fda08851a0744e6ae7"),
+    "imsi" : "999700000021309",
+    "__v" : 0,
+    "access_restriction_data" : 32,
+    "ambr" : {
+        "downlink" : NumberLong(1024000),
+        "uplink" : NumberLong(1024000)
+    },
+    "network_access_mode" : 2,
+    "pdn" : [
+        {
+            "apn" : "internet",
+            "_id" : ObjectId("609715fd455bcd38c884ce85"),
+            "pcc_rule" : [ ],
+            "ambr" : {
+                "downlink" : NumberLong(1024000),
+                "uplink" : NumberLong(1024000)
+            },
+            "qos" : {
+                "qci" : 9,
+                "arp" : {
+                    "priority_level" : 8,
+                    "pre_emption_vulnerability" : 1,
+                    "pre_emption_capability" : 0
+                }
+            },
+            "type" : 0
+        }
+    ],
+    "security" : {
+        "k" : "70D49A71DD1A2B806A25ABE0EF749F1E",
+        "amf" : "8000",
+        "op" : null,
+        "opc" : "6F1BF53D624B3A43AF6592854E2444C7"
+    },
+    "subscribed_rau_tau_timer" : 12,
+    "subscriber_status" : 0
+}
+```
+
+If you are using old format DB schema, please perform the following step.
+
+1. First of all, it is recommended to use the following command to remove all existing subscription DB.
+```
+$ mongosh
+> use open5gs
+switched to db open5gs
+> db.subscribers.drop()
+true
+```
+2. Then, if you are using a version of WebUI prior to v2.1.7, you need to do a WebUI logout from your web browser.
+3. Finally, install the latest version of WebUI with the following command.
+```
+$ curl -fsSL https://open5gs.org/open5gs/assets/webui/install | sudo -E bash -
+```
+4. Log in to the new WebUI and add new subscriber information using your web browser.
+5. Make sure it is a new DB schema as below:
+```
+$ mongosh
+> use open5gs
+> db.subscribers.find().pretty()
+{
+...
+    "slice" : [
+        {
+            "sst" : 1,
+            "default_indicator" : true,
+            "_id" : ObjectId("60969fe7de8743b3c7b1a973"),
+            "session" : [
+...
+}
+```
+
+If the above problem still occurs, we recommend that you delete all Open5GS and start from scratch.
+
+#### 5G Core test failed (e.g. `./build/tests/registration/registration`)
+
+The AUSF(or SMF) has already been started, but NRF-discovery fails and the test program does not work as shown below.
+
+```
+$ ./build/tests/registration/registration
+
+...
+04/12 14:26:25.885: [app] ERROR: Cannot discover [AUSF] (../lib/sbi/path.c:119)
+...
+04/12 14:27:25.666: [app] ERROR: Cannot discover [SMF] (../lib/sbi/path.c:119)
+```
+
+This is a test program bug and has not yet been resolved.
+{: .blue}
+
+To restart the test program, first remove all subscriber information using MongoDB Client
+```
+$ mongosh
+> use open5gs
+switched to db open5gs
+> db.subscribers.find()  ### Check the test subscriber
+> db.subscribers.drop()  ### Remove all subscriber
+> db.subscribers.find()  ### Check that all subscribers are empty
+```
+
+Kill all processes.
+```bash
+$ ps -ef | grep open5gs
+$ sudo pkill -9 open5gs-mmed
+$ sudo pkill -9 open5gs-sgwcd
+$ sudo pkill -9 open5gs-smfd
+$ sudo pkill -9 open5gs-amfd
+$ sudo pkill -9 open5gs-sgwud
+$ sudo pkill -9 open5gs-upfd
+$ sudo pkill -9 open5gs-hssd
+$ sudo pkill -9 open5gs-pcrfd
+$ sudo pkill -9 open5gs-nrfd
+$ sudo pkill -9 open5gs-scpd
+$ sudo pkill -9 open5gs-ausfd
+$ sudo pkill -9 open5gs-udmd
+$ sudo pkill -9 open5gs-pcfd
+$ sudo pkill -9 open5gs-nssfd
+$ sudo pkill -9 open5gs-bsfd
+$ sudo pkill -9 open5gs-udrd
+```
+
+Run `./build/tests/registration/registration` again
+```
+$ ./build/tests/registration/registration
+guti-test           : SUCCESS
+auth-test           : SUCCESS
+idle-test           : SUCCESS
+dereg-test          : SUCCESS
+paging-test         : SUCCESS
+identity-test       : SUCCESS
+gmm-status-test     : SUCCESS
+ue-context-test     : SUCCESS
+reset-test          : SUCCESS
+All tests passed.
+```
+
+In general, if this test program succeeds at least once, you can assume that you have successfully built the development environment.
+
 #### How to use a different Slice for each SMF
 
 To add a slice with SST of 1 and SD of 000080, you need to update the configuration file as shown below.
@@ -21,12 +313,12 @@ $ diff --git a/configs/open5gs/amf.yaml.in b/configs/open5gs/amf.yaml.in
 index 7e939e81..dfe4456d 100644
 --- a/configs/open5gs/amf.yaml.in
 +++ b/configs/open5gs/amf.yaml.in
-@@ -199,6 +199,12 @@ amf:
+@@ -315,6 +315,12 @@ amf:
            mnc: 70
          s_nssai:
            - sst: 1
 +      - plmn_id:
-+          mcc: 901
++          mcc: 999
 +          mnc: 70
 +        s_nssai:
 +          - sst: 1
@@ -41,9 +333,9 @@ $ diff --git a/configs/open5gs/smf.yaml.in b/configs/open5gs/smf.yaml.in
 index d45aa60f..701ee533 100644
 --- a/configs/open5gs/smf.yaml.in
 +++ b/configs/open5gs/smf.yaml.in
-@@ -317,6 +317,11 @@ logger:
- # 
- 
+@@ -442,6 +442,11 @@ logger:
+ #
+
  smf:
 +    info:
 +      - s_nssai:
@@ -60,7 +352,7 @@ $ diff --git a/configs/open5gs/smf.yaml.in b/configs/open5gs/smf.yaml.in
 index d45aa60f..949da220 100644
 --- a/configs/open5gs/smf.yaml.in
 +++ b/configs/open5gs/smf.yaml.in
-@@ -317,6 +317,12 @@ logger:
+@@ -442,6 +442,12 @@ logger:
  #
 
  smf:
@@ -79,7 +371,7 @@ $ diff --git a/configs/open5gs/nssf.yaml.in b/configs/open5gs/nssf.yaml.in
 index ecd4f7e2..04d9c4ba 100644
 --- a/configs/open5gs/nssf.yaml.in
 +++ b/configs/open5gs/nssf.yaml.in
-@@ -119,6 +119,11 @@ nssf:
+@@ -201,6 +201,12 @@ nssf:
          port: 7777
          s_nssai:
            sst: 1
@@ -88,9 +380,10 @@ index ecd4f7e2..04d9c4ba 100644
 +        s_nssai:
 +          sst: 1
 +          sd: 000080
- 
++
+
  #
- # nrf:
+ # scp:
 ```
 
 Then add a slice to MongoDB's subscriber info.
@@ -118,11 +411,13 @@ And the process below is only used in 5G, so there is no need to run it.
 
 ```bash
 $ open5gs-nrfd
+$ open5gs-scpd
 $ open5gs-amfd
 $ open5gs-ausfd
 $ open5gs-udmd
 $ open5gs-pcfd
 $ open5gs-nssfd
+$ open5gs-bsfd
 $ open5gs-udrd
 ```
 
@@ -184,15 +479,15 @@ The Open5GS package contains a systemd-networkd configuration file for `ogstun`.
 
 ```diff
 $ diff -u /etc/systemd/network/99-open5gs.network /etc/systemd/network/99-open5gs.network.new
---- /etc/systemd/network/99-open5gs.network	2020-09-17 09:29:09.137392040 -0400
-+++ /etc/systemd/network/99-open5gs.network.new	2020-09-17 09:29:03.375719620 -0400
+--- /etc/systemd/network/99-open5gs.network    2020-09-17 09:29:09.137392040 -0400
++++ /etc/systemd/network/99-open5gs.network.new    2020-09-17 09:29:03.375719620 -0400
 @@ -2,5 +2,5 @@
  Name=ogstun
 
  [Network]
 -Address=10.45.0.1/16
 +Address=10.46.0.1/16
- Address=2001:230:cafe::1/48
+ Address=2001:db8:cafe::1/48
 ```
 
 Restart systemd-networkd
@@ -209,30 +504,30 @@ Now, you need to modify the configuration file of Open5GS to adjust the UE IP Po
 
 ```diff
 $ diff -u smf.yaml smf.yaml.new
---- smf.yaml	2020-09-17 09:31:16.547882093 -0400
-+++ smf.yaml.new	2020-09-17 09:32:18.267726844 -0400
-@@ -190,7 +190,7 @@
-       - addr: 127.0.0.4
-       - addr: ::1
+--- smf.yaml    2020-09-17 09:31:16.547882093 -0400
++++ smf.yaml.new    2020-09-17 09:32:18.267726844 -0400
+@@ -458,7 +458,7 @@ smf:
+         addr: 127.0.0.4
+         port: 9090
      subnet:
 -      - addr: 10.45.0.1/16
 +      - addr: 10.46.0.1/16
-       - addr: 2001:230:cafe::1/48
+       - addr: 2001:db8:cafe::1/48
      dns:
        - 8.8.8.8
 ```
 
 ```diff
 $ diff -u upf.yaml upf.yaml.new
---- upf.yaml	2020-09-17 09:31:16.547882093 -0400
-+++ upf.yaml.new	2020-09-17 09:32:25.199619989 -0400
-@@ -139,7 +139,7 @@
+--- upf.yaml    2020-09-17 09:31:16.547882093 -0400
++++ upf.yaml.new    2020-09-17 09:32:25.199619989 -0400
+@@ -170,7 +170,7 @@ upf:
      gtpu:
        - addr: 127.0.0.7
      subnet:
 -      - addr: 10.45.0.1/16
 +      - addr: 10.46.0.1/16
-       - addr: 2001:230:cafe::1/48
+       - addr: 2001:db8:cafe::1/48
 
  #
 ```
@@ -304,7 +599,7 @@ Please make sure that MongoDB server daemon is running.
 
 Then, remove all subscriber information using MongoDB Client
 ```
-$ mongo
+$ mongosh
 > use open5gs
 switched to db open5gs
 > db.subscribers.find()  ### Check the test subscriber
@@ -324,10 +619,12 @@ $ sudo pkill -9 open5gs-upfd
 $ sudo pkill -9 open5gs-hssd
 $ sudo pkill -9 open5gs-pcrfd
 $ sudo pkill -9 open5gs-nrfd
+$ sudo pkill -9 open5gs-scpd
 $ sudo pkill -9 open5gs-ausfd
 $ sudo pkill -9 open5gs-udmd
 $ sudo pkill -9 open5gs-pcfd
 $ sudo pkill -9 open5gs-nssfd
+$ sudo pkill -9 open5gs-bsfd
 $ sudo pkill -9 open5gs-udrd
 ```
 
@@ -473,8 +770,8 @@ Create **newtables** file as below.
 
 ```diff
 $ diff -u oldtables newtables
---- oldtables	2019-06-01 23:43:50.354974226 +0900
-+++ newtables	2019-06-01 23:44:16.110931684 +0900
+--- oldtables    2019-06-01 23:43:50.354974226 +0900
++++ newtables    2019-06-01 23:44:16.110931684 +0900
 @@ -8,6 +8,7 @@
  -A PREROUTING -m addrtype --dst-type LOCAL -j DOCKER
  -A OUTPUT ! -d 127.0.0.0/8 -m addrtype --dst-type LOCAL -j DOCKER
@@ -503,7 +800,7 @@ $ sudo iptables-restore < newtables
 
 Docker doesn't have IPv6 NAT rules. In this case, you just add the NAT rule as below.
 ```
-$ sudo ip6tables -t nat -A POSTROUTING -s 2001:230:cafe::/48 ! -o ogstun -j MASQUERADE
+$ sudo ip6tables -t nat -A POSTROUTING -s 2001:db8:cafe::/48 ! -o ogstun -j MASQUERADE
 ```
 
 The above operation is the same as described in the following manuals.
@@ -539,7 +836,7 @@ $ sudo sysctl -w net.ipv6.conf.all.forwarding=1
 
 ### Add NAT Rule
 $ sudo iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE
-$ sudo ip6tables -t nat -A POSTROUTING -s 2001:230:cafe::/48 ! -o ogstun -j MASQUERADE
+$ sudo ip6tables -t nat -A POSTROUTING -s 2001:db8:cafe::/48 ! -o ogstun -j MASQUERADE
 ```
 
 #### How to use a different DNN/APN for each SMF
@@ -604,26 +901,26 @@ The IP address of the UE can also use a different UE pool depending on the DNN/A
 #
 #  o IPv4/IPv6 Pool
 #    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#    $ sudo ip addr add 2001:230:cafe::1/48 dev ogstun
+#    $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun
 #
 #    subnet:
 #      - addr: 10.45.0.1/16
-#      - addr: 2001:230:cafe::1/48
+#      - addr: 2001:db8:cafe::1/48
 #
 #
-#  o Specific DNN/APN(e.g 'volte') uses 10.46.0.1/16, 2001:230:babe::1/48
-#    All other DNNs/APNs use 10.45.0.1/16, 2001:230:cafe::1/48
+#  o Specific DNN/APN(e.g 'volte') uses 10.46.0.1/16, 2001:db8:babe::1/48
+#    All other DNNs/APNs use 10.45.0.1/16, 2001:db8:cafe::1/48
 #    $ sudo ip addr add 10.45.0.1/16 dev ogstun
 #    $ sudo ip addr add 10.46.0.1/16 dev ogstun
-#    $ sudo ip addr add 2001:230:cafe::1/48 dev ogstun
-#    $ sudo ip addr add 2001:230:babe::1/48 dev ogstun
+#    $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun
+#    $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun
 #
 #    subnet:
 #      - addr: 10.45.0.1/16
-#      - addr: 2001:230:cafe::1/48
+#      - addr: 2001:db8:cafe::1/48
 #      - addr: 10.46.0.1/16
 #        dnn: volte
-#      - addr: 2001:230:babe::1/48
+#      - addr: 2001:db8:babe::1/48
 #        dnn: volte
 #
 #  o Pool Range Sample
@@ -648,10 +945,10 @@ The IP address of the UE can also use a different UE pool depending on the DNN/A
 #        range:
 #          - 10.45.0.100-10.45.0.200
 #          - 10.45.1.100-10.45.1.200
-#      - addr: 2001:230:cafe::1/48
+#      - addr: 2001:db8:cafe::1/48
 #        range:
-#          - 2001:230:cafe:a0::0-2001:230:cafe:b0::0
-#          - 2001:230:cafe:c0::0-2001:230:cafe:d0::0
+#          - 2001:db8:cafe:a0::0-2001:db8:cafe:b0::0
+#          - 2001:db8:cafe:c0::0-2001:db8:cafe:d0::0
 #
 ```
 
@@ -705,7 +1002,7 @@ attach_test         : -Line 134: Condition is false, but expected true
 
 Remove all subscriber information using MongoDB Client
 ```
-$ mongo
+$ mongosh
 > db.subscribers.find()  ### Check the test subscriber
 > db.subscribers.drop()  ### Remove all subscriber
 > db.subscribers.find()  ### Check that all subscribers are empty
@@ -784,10 +1081,12 @@ Currently, the number of UE is limited to `128*128`.
 * HSS : 127.0.0.8
 * PCRF : 127.0.0.9
 * NRF : 127.0.0.10
+* SCP : 127.0.1.10
 * AUSF : 127.0.0.11
 * UDM : 127.0.0.12
 * PCF : 127.0.0.13
 * NSSF : 127.0.0.14
+* BSF : 127.0.0.15
 * UDR : 127.0.0.20
 ```
 
@@ -795,12 +1094,12 @@ Currently, the number of UE is limited to `128*128`.
 
 ```
 * AMF_ID
-  PLMN ID - MNC: 901, MCC: 70
+  PLMN ID - MNC: 999, MCC: 70
   Region : 2
   Set : 1
 
 * TAI
-  PLMN ID - MNC: 901, MCC: 70
+  PLMN ID - MNC: 999, MCC: 70
   TAC : 1
 
 * S_NSSASI
@@ -811,12 +1110,12 @@ Currently, the number of UE is limited to `128*128`.
 
 ```
 * GUMMEI
-  PLMN ID - MNC: 901, MCC: 70
+  PLMN ID - MNC: 999, MCC: 70
   MME Group : 2
   MME Code : 1
 
 * TAI
-  PLMN ID - MNC: 901, MCC: 70
+  PLMN ID - MNC: 999, MCC: 70
   TAC : 1
 ```
 
@@ -831,7 +1130,7 @@ Currently, the number of UE is limited to `128*128`.
 
 ```
 * IPv4 : 10.45.0.1/16
-* IPv6 : 2001:230:cafe::1/48
+* IPv6 : 2001:db8:cafe::1/48
 ```
 
 - DNS
@@ -979,10 +1278,10 @@ $ echo $(cd $(dirname ./install/lib/x86_64-linux-gnu/) && pwd -P)/$(basename ./i
 $ export LD_LIBRARY_PATH=/home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu
 $ ldd ./install/bin/open5gs-amfd
 ...
-	libogsapp.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogsapp.so.1 (0x00007f161ab51000)
-	libogscore.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogscore.so.1 (0x00007f161a922000)
-	libogssctp.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogssctp.so.1 (0x00007f161a71d000)
-	libogss1ap.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogss1ap.so.1 (0x00007f161a519000)
+    libogsapp.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogsapp.so.1 (0x00007f161ab51000)
+    libogscore.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogscore.so.1 (0x00007f161a922000)
+    libogssctp.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogssctp.so.1 (0x00007f161a71d000)
+    libogss1ap.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogss1ap.so.1 (0x00007f161a519000)
 ...
 ```
 

docs/_docs/tutorial/01-your-first-lte.md

@@ -8,12 +8,12 @@ This post is the perfect starting point for learning to build your own LTE netwo
 ### Prerequisites
 ---
 
-First, you have to prepare USRP B200/B210 to run srsENB. However, please keep in mind that you would still need a fairly high-end PC (at least dual-core i5, better quad-core i7) with USB 3.0 to attach the USRP B200/B210. 
+First, you have to prepare USRP B200/B210 to run srsRAN. However, please keep in mind that you would still need a fairly high-end PC (at least dual-core i5, better quad-core i7) with USB 3.0 to attach the USRP B200/B210. 
 
 For USRP B200/B210, you can use a GPS antenna for clock synchronization. Of course, it can work without a GPS antenna, but if you have that antenna, it's a good to have a window near your desk where you can put the small GPS patch antenna. In my case, a 1 to 2 meters antenna cable is used between desk/computer and the window.
 
 This document will be described with the following equipment.
- - i5-8500 PC with Ubuntu 18.04(bionic)
+ - i5-8500 PC with Ubuntu 20.04(focal)
  - USRP B200/B210 with USB 3.0
  - iPhone XS
  - sysmoUSIM-SJS1
@@ -112,7 +112,7 @@ Done !
 ### Installation
 ---
 
-We will use *Ubuntu 18.04(Bionic)* installed PC.
+We will use *Ubuntu 20.04(focal)* installed PC.
 {: .blue .bold}
 
 #### 1. USRP Hardware Driver
@@ -131,9 +131,9 @@ After installing, you need to download the FPGA images packages by running _uhd
 $ sudo /usr/lib/uhd/utils/uhd_images_downloader.py
 ```
 
-#### 2. srsENB
+#### 2. srsRAN
 
-On *Ubuntu 18.04(Bionic)*, one can install the required libraries with:
+On *Ubuntu 20.04(focal)*, one can install the required libraries with:
 
 ```bash
 $ sudo apt install cmake libfftw3-dev libmbedtls-dev libboost-program-options-dev libconfig++-dev libsctp-dev
@@ -142,11 +142,11 @@ $ sudo apt install cmake libfftw3-dev libmbedtls-dev libboost-program-options-de
 Download and build srsLTE:
 
 ```bash
-$ git clone https://github.com/srsLTE/srsLTE.git
-$ cd srsLTE
-$ git checkout release_19_12
+$ git clone https://github.com/srsRAN/srsRAN.git
+$ cd srsRAN
+$ git checkout release_21_10
 $ git rev-parse HEAD
-d045213fb9cbf98c83c06d7c17197a9dcbfddacf
+5275f33360f1b3f1ee8d1c4d9ae951ac7c4ecd4e
 $ mkdir build
 $ cd build
 $ cmake ../
@@ -156,16 +156,27 @@ $ make test
 
 #### 3. Open5GS
 
+Install the MongoDB packages.
+
+```bash
+```
+
 The Open5GS package is available on the recent versions of *Ubuntu*.
 
 ```bash
+# Install the MongoDB Packages
+$ wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | sudo apt-key add -
+$ echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
+$ sudo apt update
+$ sudo apt install mongodb-org
+
 # Getting the authentication key
 $ sudo apt install wget
-$ wget https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_18.04/Release.key
+$ wget https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_20.04/Release.key
 $ sudo apt-key add Release.key
 
 # Installing Open5GS
-$ sudo sh -c "echo 'deb https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_18.04/ ./' > /etc/apt/sources.list.d/open5gs.list"
+$ sudo sh -c "echo 'deb https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_20.04/ ./' > /etc/apt/sources.list.d/open5gs.list"
 $ sudo apt update
 $ sudo apt install open5gs
 ```
@@ -173,9 +184,9 @@ $ sudo apt install open5gs
 The following shows how to install the Web UI of Open5GS.
 
 ```bash
-$ curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
+$ curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
 $ sudo apt install nodejs
-$ curl -sL https://open5gs.org/open5gs/assets/webui/install | sudo -E bash -
+$ curl -fsSL https://open5gs.org/open5gs/assets/webui/install | sudo -E bash -
 ```
 
 ### Configuration & Running
@@ -190,14 +201,14 @@ Title : sysmocom SIM Card Details / AM93\PICK\00859
 
 IMSI    ICCID   ACC PIN1    PUK1    PIN2    PUK2    Ki  OPC ADM1    KIC1    KID1    KIK1
 ...
-901700000017408	8988211000000174089	0100	3623	84724035	8774	57473966	B1233463AB9BC2AD2DB1830EB6417E7B	625150E2A943E3353DD23554101CAFD4	47190711	C865CAA0A54542333929B29B116F4375	7D7F65DCD99003C0A0D5D31CA3E5253E	5B27983AF628FC3FCB36B89300012944
+999700000017408    8988211000000174089    0100    3623    84724035    8774    57473966    B1233463AB9BC2AD2DB1830EB6417E7B    625150E2A943E3353DD23554101CAFD4    47190711    C865CAA0A54542333929B29B116F4375    7D7F65DCD99003C0A0D5D31CA3E5253E    5B27983AF628FC3FCB36B89300012944
 ```
 
 Here's my subscriber information from above.
 
 ```
-MCC/MNC : 901/70
-IMSI : 901700000017408
+MCC/MNC : 999/70
+IMSI : 999700000017408
 K : B1233463AB9BC2AD2DB1830EB6417E7B
 OPc : 625150E2A943E3353DD23554101CAFD4  
 ```
@@ -222,23 +233,27 @@ Then proceed as follows:
   3. Fill the IMSI, security context(K, OPc, AMF), and APN of the subscriber.
   4. Click `SAVE` Button
 
+**Note:** Subscribers added with this tool immediately register in the Open5GS HSS/UDR without the need to restart any daemon. However, if you use the WebUI to change subscriber profile, you must restart the Open5GS AMF/MME daemon for the changes to take effect.
+{: .notice--warning}
+
 Modify [install/etc/open5gs/mme.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/mme.yaml.in) to set the S1AP IP address, PLMN ID, and TAC.
 
 ```diff
 $ diff -u /etc/open5gs/mme.yaml.old /etc/open5gs/mme.yaml
---- mme.yaml.old	2020-08-22 12:07:32.755250028 -0400
-+++ mme.yaml	2020-08-22 12:08:17.309320211 -0400
-@@ -204,20 +204,20 @@
- mme:
-     freeDiameter: /home/acetcom/Documents/git/open5gs/install/etc/freeDiameter/mme.conf
+--- mme.yaml    2020-09-05 20:52:28.648235143 -0400
++++ mme.yaml.new    2020-09-05 20:56:05.434484208 -0400
+@@ -253,20 +253,20 @@ mme:
      s1ap:
--      addr: 127.0.0.2
-+      addr: 127.0.1.100
+-      - addr: 127.0.0.2
++      - addr: 10.10.0.2
      gtpc:
+       - addr: 127.0.0.2
+     metrics:
        addr: 127.0.0.2
+       port: 9090
      gummei:
        plmn_id:
--        mcc: 901
+-        mcc: 999
 -        mnc: 70
 +        mcc: 310
 +        mnc: 789
@@ -246,30 +261,28 @@ $ diff -u /etc/open5gs/mme.yaml.old /etc/open5gs/mme.yaml
        mme_code: 1
      tai:
        plmn_id:
--        mcc: 901
+-        mcc: 999
 -        mnc: 70
--      tac: 1
 +        mcc: 310
 +        mnc: 789
-+      tac: 7
+       tac: 1
      security:
-         integrity_order : [ EIA1, EIA2, EIA0 ]
-         ciphering_order : [ EEA0, EEA1, EEA2 ]
+         integrity_order : [ EIA2, EIA1, EIA0 ]
 ```
 
 Modify [install/etc/open5gs/sgwu.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/sgwu.yaml.in) to set the GTP-U IP address.
 ```diff
 $ diff -u /etc/open5gs/sgwu.yaml.old /etc/open5gs/sgwu.yaml
---- sgwu.yaml.old	2020-08-22 12:08:44.782880778 -0400
-+++ sgwu.yaml	2020-08-22 12:06:49.809299514 -0400
-@@ -51,7 +51,7 @@
+--- sgwu.yaml    2020-09-05 20:50:39.393022566 -0400
++++ sgwu.yaml.new    2020-09-05 20:51:06.667838823 -0400
+@@ -98,7 +98,7 @@ logger:
  #
  sgwu:
-     gtpu:
--      addr: 10.11.0.6
-+      addr: 127.0.0.6
      pfcp:
-       addr: 127.0.0.6
+-      - addr: 10.11.0.6
++      - addr: 127.0.0.6
+     gtpu:
+       - addr: 127.0.0.6
 ```
 
 
@@ -314,86 +327,132 @@ $ sudo sysctl -w net.ipv6.conf.all.forwarding=1
 
 ### Add NAT Rule
 $ sudo iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE
-$ sudo ip6tables -t nat -A POSTROUTING -s 2001:230:cafe::/48 ! -o ogstun -j MASQUERADE
+$ sudo ip6tables -t nat -A POSTROUTING -s 2001:db8:cafe::/48 ! -o ogstun -j MASQUERADE
 ```
 
 **Note:** For the first time, it is a good condition if you do not have any rules in the IP/NAT tables. If a program such as docker has already set up a rule, you will need to add a rule differently.
 {: .notice--danger}
 
-#### 2. srsENB
-Change back to the srsENB source directory and copy the main config example as well as all additional config files for RR, SIB and DRB.
+#### 2. srsRAN
+Change back to the srsRAN source directory and copy the main config example as well as all additional config files for RR, SIB and DRB.
 
 ```bash
 $ cp srsenb/enb.conf.example srsenb/enb.conf
 $ cp srsenb/rr.conf.example srsenb/rr.conf
-$ cp srsenb/sib.conf.example srsenb/sib.conf
 $ cp srsenb/drb.conf.example srsenb/drb.conf
+$ cp srsenb/sib.conf.example srsenb/sib.conf
+$ cp srsenb/sib.conf.mbsfn.example srsenb/sib.conf.mbsfn
 ```
 
 You should check your phone frequency. If your phone does not support Band-3, you should use a different DL EARFCN value.
 
 ```diff
---- enb.conf.example	2018-11-19 18:16:06.953631893 +0900
-+++ enb.conf	2019-04-08 11:15:18.051261318 +0900
-@@ -23,8 +23,8 @@
- cell_id = 0x01
- phy_cell_id = 1
- tac = 0x0007
+$ diff -u enb.conf.example enb.conf
+-- enb.conf.example    2022-01-19 20:30:13.612993155 +0900
++++ enb.conf    2022-01-19 21:04:15.674419300 +0900
+@@ -20,9 +20,9 @@
+ #####################################################################
+ [enb]
+ enb_id = 0x19B
 -mcc = 001
 -mnc = 01
+-mme_addr = 127.0.1.100
 +mcc = 310
 +mnc = 789
- mme_addr = 127.0.1.100
++mme_addr = 127.0.1.2
  gtp_bind_addr = 127.0.1.1
  s1c_bind_addr = 127.0.1.1
-@@ -66,12 +66,13 @@
- #                     Default "auto". B210 USRP: 400 us, bladeRF: 0 us.
- #####################################################################
- [rf]
--dl_earfcn = 3400
-+dl_earfcn = 1600
+ s1c_bind_port = 0
+@@ -67,7 +67,7 @@
  tx_gain = 80
  rx_gain = 40
 
- #device_name = auto
- #device_args = auto
-+device_args="clock=external"
- #time_adv_nsamples = auto
- #burst_preamble_us = auto
+-#device_name = auto
++device_name = auto
+
+ # For best performance in 2x2 MIMO and >= 15 MHz use the following device_args settings:
+ #     USRP B210: num_recv_frames=64,num_send_frames=64
+@@ -81,7 +81,7 @@
+
+ # Example for ZMQ-based operation with TCP transport for I/Q samples
+ #device_name = zmq
+-#device_args = fail_on_disconnect=true,tx_port=tcp://*:2000,rx_port=tcp://localhost:2001,id=enb,base_srate=23.04e6
++device_args = clock=external
+
+ #####################################################################
+ # Packet capture configuration
 ```
 
-PLMN ID, DL EARFCN, and Device Argument are updated as belows.
+```diff
+$ diff -u rr.conf.example rr.conf
+-- rr.conf.example    2022-01-19 20:30:13.620992794 +0900
++++ rr.conf    2022-01-19 21:05:21.959044145 +0900
+@@ -55,10 +55,10 @@
+   {
+     // rf_port = 0;
+     cell_id = 0x01;
+-    tac = 0x0007;
++    tac = 0x0002;
+     pci = 1;
+     // root_seq_idx = 204;
+-    dl_earfcn = 3350;
++    dl_earfcn = 1600;
+     //ul_earfcn = 21400;
+     ho_active = false;
+     //meas_gap_period = 0; // 0 (inactive), 40 or 80
+@@ -114,4 +114,4 @@
+ nr_cell_list =
+ (
+   // no NR cells
+```
+
+MME Address, TAC, PLMN ID, DL EARFCN, and Device Argument are updated as belows.
 
 ```
+MME Address : 127.0.1.2
+TAC : 2
 PLMN ID : MNC(310), MCC(789) programmed USIM with a card reader
 DL EARFCN : Band-3 - from your Phone
 Device Argument : Clock source from external GPS-DO
 ```
 
-If you do not use the GPS-DO, you should use:
+If you are not using GPS-DO, you can just comment out `device_args` as shown below.
 ```diff
- #device_name = auto
--#device_args = auto
-+device_args = auto
- #time_adv_nsamples = auto
- #burst_preamble_us = auto
+$ diff -u enb.conf enb.conf.no_gps_do
+--- enb.conf    2022-01-19 21:08:32.941527373 +0900
++++ enb.conf.no_gps_do    2022-01-19 21:10:18.612581261 +0900
+@@ -81,7 +81,7 @@
+
+ # Example for ZMQ-based operation with TCP transport for I/Q samples
+ #device_name = zmq
+-device_args = clock=external
++#device_args = fail_on_disconnect=true,tx_port=tcp://*:2000,rx_port=tcp://localhost:2001,id=enb,base_srate=23.04e6
+
+ #####################################################################
+ # Packet capture configuration
 ```
 
-Now, run the srsENB as follows:
+Now, run the srsRAN as follows:
 
 ```bash
 $ cd srsenb/
-$ sudo ../build/srsenb/src/srsenb ./enb.conf
-
-Built in Release mode using commit d045213fb on branch HEAD.
-
+$ sudo UHD_IMAGES_DIR=/usr/share/uhd/images ../build/srsenb/src/srsenb ./enb.conf
 ---  Software Radio Systems LTE eNodeB  ---
 
 Reading configuration file ./enb.conf...
-Opening 1 RF devices with 1 RF channels...
-[INFO] [UHD] linux; GNU C++ version 7.4.0; Boost_106501; UHD_3.14.1.1-release
+WARNING: cpu0 scaling governor is not set to performance mode. Realtime processing could be compromised. Consider setting it to performance mode before running the application.
+
+Built in Release mode using commit 5275f3336 on branch HEAD.
+
+connect(): Connection refused
+Failed to initiate S1 connection. Attempting reconnection in 10 seconds
+Opening 1 channels in RF device=default with args=default
+Available RF device list: UHD
+Trying to open RF device 'UHD'
+[INFO] [UHD] linux; GNU C++ version 9.3.0; Boost_107100; UHD_4.1.0.4-release
 [INFO] [LOGGING] Fastpath logging disabled at runtime.
-Opening USRP with args: type=b200,master_clock_rate=23.04e6
+Opening USRP channels=1, args: type=b200,master_clock_rate=23.04e6
+[INFO] [UHD RF] RF UHD Generic instance constructed
 [INFO] [B200] Detected Device: B200
 [INFO] [B200] Operating over USB 3.
 [INFO] [B200] Initialize CODEC control...
@@ -402,8 +461,7 @@ Opening USRP with args: type=b200,master_clock_rate=23.04e6
 [INFO] [B200] Register loopback test passed
 [INFO] [B200] Asking for clock rate 23.040000 MHz...
 [INFO] [B200] Actually got clock rate 23.040000 MHz.
-Setting frequency: DL=1845.0 Mhz, UL=1750.0 MHz
-Setting Sampling frequency 11.52 MHz
+RF device 'UHD' successfully opened
 
 ==== eNodeB started ===
 Type <t> to view trace

docs/_docs/tutorial/02-VoLTE-setup.md

@@ -307,9 +307,9 @@ Username: test
 Password: testpasswd
 Server: ims.mnc001.mcc001.3gppnetwork.org (Created DNS Domain Name or IP to which IMS components are bound to, visible interface IP address)
 Optional Settings:
-	Authentication username: test
-	Outbound proxy address: 172.24.15.30 (Floating IP of VM in case of OpenStack or else no need to fill in case of physical machine)
-	Transport type: UDP
+    Authentication username: test
+    Outbound proxy address: 172.24.15.30 (Floating IP of VM in case of OpenStack or else no need to fill in case of physical machine)
+    Transport type: UDP
 ```
 
 In Phone 2:
@@ -319,9 +319,9 @@ Username: test2
 Password: testpasswd
 Server: ims.mnc001.mcc001.3gppnetwork.org (Created DNS Domain Name or IP to which IMS components are bound to, visible interface IP address)
 Optional Settings:
-	Authentication username: test2
-	Outbound proxy address: 172.24.15.30 (Floating IP of VM in case of OpenStack or else no need to fill in case of physical machine)
-	Transport type: UDP
+    Authentication username: test2
+    Outbound proxy address: 172.24.15.30 (Floating IP of VM in case of OpenStack or else no need to fill in case of physical machine)
+    Transport type: UDP
 ```
 
 - Set "Receive incoming calls" option to enabled state in both phones
@@ -566,8 +566,8 @@ options {
         // the all-0's placeholder.
 
         //forwarders {
-		// Put here the IP address of other DNS server which could be used if name cannot be resolved with DNS server running in this machine (Optional)
-		//10.4.128.2;
+        // Put here the IP address of other DNS server which could be used if name cannot be resolved with DNS server running in this machine (Optional)
+        //10.4.128.2;
         //};
 
         //========================================================================
@@ -787,6 +787,7 @@ APN Configuration:
 ---------------------------------------------------------------------------------------------------------------------
 | ims      | IPv4 | 5   | 1   | Disabled   | Disabled       | 3850/1530           |                 |               |
 |          |      | 1   | 2   | Enabled    | Enabled        | 128/128             | 128/128         |               |
+|          |      | 2   | 4   | Enabled    | Enabled        | 128/128             | 128/128         |               |
 ---------------------------------------------------------------------------------------------------------------------
 </pre>
 
@@ -1067,8 +1068,8 @@ In the below example. epc-ims is the hostname of the machine
 
 ```
 root@epc-ims:~# cat /etc/hosts
-127.0.0.1	localhost
-127.0.0.1	epc-ims
+127.0.0.1    localhost
+127.0.0.1    epc-ims
 ```
 
 #### 20. Add IMS subscription use in FoHSS as follows from the Web GUI
@@ -1077,7 +1078,7 @@ Assuming IMSI of the user as 001010123456791 and MSISDN is 0198765432100
 
 ```
 Login to the HSS web console.
-Navigate to the User Identities page	
+Navigate to the User Identities page
 Create the IMSU 
 Click IMS Subscription / Create
 Enter:
@@ -1131,13 +1132,13 @@ Visited Network = ims.mnc001.mcc001.3gppnetwork.org
 Click Add
 
 Associate IMPI(s) to IMPU
-IMPI Identity = 001011234567891@ims.mnc001.mcc001.3gppnetwork.org
+IMPI Identity = 001010123456791@ims.mnc001.mcc001.3gppnetwork.org
 Click Add
 
-2. sip:0198765432100
+2. sip:0198765432100@ims.mnc001.mcc001.3gppnetwork.org
 
 Public User Identity -IMPU-
-Identity = sip:0198765432100
+Identity = sip:0198765432100@ims.mnc001.mcc001.3gppnetwork.org
 Service Profile = default_sp
 Charging-Info Set = default_charging_set
 Can Register = Yes
@@ -1150,12 +1151,12 @@ Visited Network = ims.mnc001.mcc001.3gppnetwork.org
 Click Add
 
 Associate IMPI(s) to IMPU
-IMPI Identity = 001011234567891@ims.mnc001.mcc001.3gppnetwork.org
+IMPI Identity = 001010123456791@ims.mnc001.mcc001.3gppnetwork.org
 Click Add
 
-And, finally add these IMPUs as implicit set of IMSI derived IMPU in HSS i.e sip:001011234567891@ims.mnc001.mcc001.3gppnetwork.org as follows:
+And, finally add these IMPUs as implicit set of IMSI derived IMPU in HSS i.e sip:001010123456791@ims.mnc001.mcc001.3gppnetwork.org as follows:
 
-1. Goto to IMPU sip:001011234567891@ims.mnc001.mcc001.3gppnetwork.org
+1. Goto to IMPU sip:001010123456791@ims.mnc001.mcc001.3gppnetwork.org
 2. In "Add IMPU(s) to Implicit-Set" section give IMPU Identity created above to be added to this IMPU
 ```
 

docs/_docs/tutorial/03-VoLTE-dockerized.md

@@ -14,42 +14,31 @@ Setup description:
 #### 0. Introduction
 
 This tutorial introduces an install-and-run lab for Open5GS + Kamailio IMS
-VoLTE study, a follow-up project of [Open5GS Tutorial: VoLTE Setup with Kamailio IMS and Open5GS](https://open5gs.org/open5gs/docs/tutorial/02-VoLTE-setup/). 
-The tutorial is based on Herle Supreeth's [docker_open5gs](https://github.com/herlesupreeth/docker_open5gs) and his fork of Open5GS and Kamailio.
+VoLTE study, a follow-up project of [Open5GS Tutorial: VoLTE Setup with Kamailio IMS and Open5GS](https://open5gs.org/open5gs/docs/tutorial/02-VoLTE-setup/).
 
 The main purpose is to save researchers' and students' time to debug for a
 minimum-viable environment before actual study can be proceeded.
 
 **Important notice before you start**
 
-1. Herle Supreeth's fork of Kamailio is used to support IPsec.
 1. Java 7 is downloaded from an alternative location.  You have to agree with
    Oracle's term of service and have an Oracle account, to legally use Java SDK
    7u80.  By using this repo, I assume you have the legal right to use it and
    hold no liability.
 
-You have to prepare IMSI, Ki, OP (yes, not **OPc**), SQN of your SIM cards.
-Even though Open5GS supports OPc, FHoSS merely takes OP.  You may also want to
-disable SQN checking in the SIM card (even though we are not sure whether it is
-effective.)  Check out https://github.com/herlesupreeth/sysmo-usim-tool for a
-slightly modified sysmo-usim-tool.
-
+You have to prepare IMSI, Ki, OP/OPc, SQN of your SIM cards.
 
 #### 1. Prepare SIM cards for VoLTE
 
-**N.B.**
 1. Wrong KIC / KID / KIK bricks your SIM card.
-1. Use MCC = 001, MNC = 01 for a testing network, unless you know your MCC/MNC is supported by Android Carrier Privileges.
+2. Use MCC = 001, MNC = 01 for a test network, unless you know your MCC/MNC is supported by Android Carrier Privileges.
 
-Refer to: https://osmocom.org/projects/cellular-infrastructure/wiki/VoLTE_IMS_Android_Carrier_Privileges
-* gp --key-enc KIC1 --key-mac KID1 --key-dek KIK1 -lvi
-* gp --key-enc KIC1 --key-mac KID1 --key-dek KIK1 --unlock
+Refer to: https://github.com/herlesupreeth/CoIMS_Wiki/blob/master/README.md
+* gp --key-enc <KIC1> --key-mac <KID1> --key-dek <KIK1> -lvi
+* gp --key-enc <KIC1> --key-mac <KID1> --key-dek <KIK1> --unlock
 * gp --install applet.cap
 * gp -a 00A4040009A00000015141434C0000 -a 80E2900033F031E22FE11E4F06FFFFFFFFFFFFC114E46872F28B350B7E1F140DE535C2A8D5804F0BE3E30DD00101DB080000000000000001
-* gp --acr-list
-
-If you use gp.jar from Herle Supreeth's [CoSIM Wiki](https://github.com/herlesupreeth/CoIMS_Wiki), replace `gp --acr-list` with `gp --acr-list-aram`.
-
+* gp --acr-list-aram
 
 #### 2. Build Open5GS, Kamailio with docker-compose
 
@@ -62,54 +51,76 @@ Install docker-compose and make sure it works before going forward.
 Clone the repository and build base docker images of open5gs and Kamailio:
 
 ```
-git clone https://github.com/miaoski/docker_open5gs
+git clone https://github.com/herlesupreeth/docker_open5gs
 cd docker_open5gs/base
 docker build --no-cache --force-rm -t docker_open5gs .
 
 cd ../kamailio_base
 docker build --no-cache --force-rm -t open5gs_kamailio .
-
-cd ..
-docker-compose build --no-cache
-
-# Copy DNS setting to containers.  Do this whenever you change IP in .env
-./copy-env.sh
-
-# Start MySQL and MongoDB first, in order to initialize the databases
-docker-compose up mongo mysql dns
-
-# To start Open5GS core network without IMS
-docker-compose up hss mme pcrf pgw sgw
-
-# To start IMS
-docker-compose up rtpengine fhoss pcscf icscf scscf
-
-# To test whether DNS is properly running
-./test-dns.sh
 ```
 
-You may want to review `.env` for IP allocation.
+#### 3. Configuring your setup
 
+`.env` is the only file most of them need to edit as per their deployment needs
+{: .notice--warning}
 
-#### 3. (Optional) Run srsENB in a separate container
+Edit only the following parameters in `.env` as per your setup
+
+```
+MCC
+MNC
+TEST_NETWORK --> Change this only if it clashes with the internal network at your home/office
+DOCKER_HOST_IP --> This is the IP address of the host running your docker setup
+SGWU_ADVERTISE_IP --> Change this to value of DOCKER_HOST_IP set above only if eNB is not running the same docker network/host
+```
+
+If eNB is NOT running in the same docker network/host as the host running the dockerized Core + IMS then follow the below additional steps
+
+Under `mme` section in docker compose file (`docker-compose.yaml`, `nsa-deploy.yaml`), uncomment the following part
+
+```
+...
+    # ports:
+    #   - "36412:36412/sctp"
+...
+```
+
+Under `sgwu` section in docker compose file (`docker-compose.yaml`, `nsa-deploy.yaml`), uncomment the following part
+
+```
+...
+    # ports:
+    #   - "2152:2152/udp"
+...
+```
+
+#### 4. Building 4G/5G Core + IMS related components images
+
+```
+cd docker_open5gs
+source .env
+docker-compose build --no-cache
+```
+
+#### 5. (Optional) Run srsENB in a separate container
 
 I use srsENB and USRP B210 in the lab.  Sometimes you may want to restart
 srsENB while keeping the core network running.  It is thus recommended to run
 srsENB separately.
 
-Edit `.env` first to set EARFCN, TX_GAIN, RX_GAIN.  Thereafter,
-
 ```
+cd docker_open5gs
+source .env
 docker-compose -f srsenb.yaml build --no-cache
 docker-compose -f srsenb.yaml up
 ```
 
+#### 6. Configuration and register two UE
 
-#### 4. Configuration and register two UE
-
-The configuration files for each of the Core Network component can be found
-under their respective folder. Edit the .yaml files of the components and run
+If there is a need to change the Core Network component configuration files
+found under their respective folder, make sure to re-compile images using
 `docker-compose build` again.
+{: .notice--warning}
 
 Open (http://<DOCKER_HOST_IP>:3000) in a web browser, where <DOCKER_HOST_IP> is
 the IP of the machine/VM running the open5gs containers. Login with following
@@ -129,14 +140,12 @@ Follow the instructions in [VoLTE Setup](https://open5gs.org/open5gs/docs/tutori
 ![Set both type to IPv4 only](https://raw.githubusercontent.com/miaoski/docker_open5gs/gh-pages/screenshots/subscriber-type-ipv4.png)
 
 For already running systems, copy SQN from Open5GS and type it in FHoSS.  You
-can type SQN in decimal.  FHoSS will automagically convert it to hex.
+can type SQN in decimal. FHoSS will automagically convert it to hex.
 
-Pay special attention to copy/paste.  You might have leading or trailing spaces
+Pay special attention to copy/paste. You might have leading or trailing spaces
 in FHoSS, resulting in failed connections!
 
-
-
-#### 5. Debugging with Wireshark
+#### 7. Debugging with Wireshark
 
 Thanks to Open5GS, the topology is super similar to [SAE on Wikipedia](https://en.wikipedia.org/wiki/System_Architecture_Evolution#/media/File:Evolved_Packet_Core.svg).
 
@@ -174,8 +183,7 @@ order to add xfrm state and policy.
 
 ![401 Unauthorized](https://raw.githubusercontent.com/miaoski/docker_open5gs/gh-pages/screenshots/401-unauthorized.png)
 
-
-#### 6. Successful calls
+#### 8. Successful calls
 
 Herle Supreeth has shared PCAP files of successful calls, including
 - [IPSec UE registration for VoLTE]({{ site.url }}{{ site.baseurl }}/assets/pcapng/ipsec_reg.pcapng)
@@ -230,14 +238,11 @@ Trying, a UE that does not support IPSec is sent a SIP INVITE in clear text:
 
 ![non-ipsec callee](https://raw.githubusercontent.com/miaoski/docker_open5gs/gh-pages/screenshots/ipsec-to-noipsec.png)
 
-
-
-#### 7. Known issues
+#### 9. Known issues
 
 - IPv6 is not supported.
 
-
-#### 8. References
+#### 10. References
 
 - [https://github.com/onmyway133/blog/issues/284](https://github.com/onmyway133/blog/issues/284)
 - [https://realtimecommunication.wordpress.com/2015/05/26/at-your-service/](https://realtimecommunication.wordpress.com/2015/05/26/at-your-service/)