update it

- Added explicit size checks for critical IE fields (PLMNIdentity, TAC,
  GTP-TEID, Cell-ID, UE security capability algorithms, etc.) before
  memcpy() operations.
- When size mismatch is detected, log an error and return an Error
  Indication (or Setup Failure) with appropriate protocol cause
  (semantic_error or message_not_compatible_with_receiver_state).
- Introduced s1ap_send_error_indication1(enb_ue_t *enb_ue, ...)
  as a helper for cases where ENB UE context is available directly.
  s1ap_send_error_indication2(mme_ue_t *mme_ue, ...) now delegates
  to the new function, reducing code duplication.
- Replaced ogs_assert() checks with graceful error handling paths
  to avoid abnormal process termination.

This improves robustness against malformed or non-compliant NGAP/S1AP
messages and prevents potential AMF/MME crashes.

.github/workflows/cifuzz.yml

@@ -19,14 +19,14 @@ jobs:
        fuzz-seconds: 300
        output-sarif: true
    - name: Upload Crash
-     uses: actions/upload-artifact@v3
+     uses: actions/upload-artifact@v4
      if: failure() && steps.build.outcome == 'success'
      with:
        name: artifacts
        path: ./out/artifacts
    - name: Upload Sarif
      if: always() && steps.build.outcome == 'success'
-     uses: github/codeql-action/upload-sarif@v2
+     uses: github/codeql-action/upload-sarif@v3
      with:
       # Path to SARIF file relative to the root of the repository
       sarif_file: cifuzz-sarif/results.sarif

README.md

@@ -37,4 +37,8 @@ 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 [NeoPlane](https://neoplane.io/)
+- [Commercial licenses](https://open5gs.org/open5gs/support/) are also available from [NewPlane](https://newplane.io/) at [sales@newplane.io](mailto:sales@newplane.io).
+
+## Support
+
+Technical support and customized services for Open5GS are provided by [NewPlane](https://newplane.io/) at [support@newplane.io](mailto:support@newplane.io).

configs/attach.yaml.in

@@ -0,0 +1,335 @@
+db_uri: mongodb://localhost/open5gs
+
+logger:
+
+test:
+  serving:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+
+global:
+  parameter:
+#    no_nrf: true
+#    no_scp: true
+    no_sepp: 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
+
+mme:
+  freeDiameter:
+    identity: mme.localdomain
+    realm: localdomain
+    listen_on: 127.0.0.2
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: hss.localdomain
+        address: 127.0.0.8
+
+  s1ap:
+    server:
+      - address: 127.0.0.2
+  gtpc:
+    server:
+      - address: 127.0.0.2
+    client:
+      sgwc:
+        - address: 127.0.0.3
+      smf:
+        - address: 127.0.0.4
+  metrics:
+    server:
+      - address: 127.0.0.2
+        port: 9090
+  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
+  time:
+    t3412:
+      value: 540
+
+sgwc:
+  gtpc:
+    server:
+      - address: 127.0.0.3
+  pfcp:
+    server:
+      - address: 127.0.0.3
+    client:
+      sgwu:
+        - address: 127.0.0.6
+
+smf:
+#  sbi:
+#    server:
+#      - address: 127.0.0.4
+#        port: 7777
+#    client:
+#      scp:
+#        - uri: http://127.0.0.200:7777
+  pfcp:
+    server:
+      - address: 127.0.0.4
+    client:
+      upf:
+        - address: 127.0.0.7
+  gtpc:
+    server:
+      - address: 127.0.0.4
+  gtpu:
+    server:
+      - address: 127.0.0.4
+  metrics:
+    server:
+      - address: 127.0.0.4
+        port: 9090
+  session:
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
+  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: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: pcrf.localdomain
+        address: 127.0.0.9
+
+amf:
+  sbi:
+    server:
+      - address: 127.0.0.5
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+  ngap:
+    server:
+      - address: 127.0.0.5
+  metrics:
+    server:
+      - address: 127.0.0.5
+        port: 9090
+  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
+  time:
+    t3512:
+      value: 540     # 9 mintues * 60 = 540 seconds
+
+sgwu:
+  pfcp:
+    server:
+      - address: 127.0.0.6
+  gtpu:
+    server:
+      - address: 127.0.0.6
+
+upf:
+  pfcp:
+    server:
+      - address: 127.0.0.7
+  gtpu:
+    server:
+      - address: 127.0.0.7
+  session:
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
+  metrics:
+    server:
+      - address: 127.0.0.7
+        port: 9090
+
+hss:
+  freeDiameter:
+    identity: hss.localdomain
+    realm: localdomain
+    listen_on: 127.0.0.8
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: mme.localdomain
+        address: 127.0.0.2
+pcrf:
+  freeDiameter:
+    identity: pcrf.localdomain
+    realm: localdomain
+    listen_on: 127.0.0.9
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: smf.localdomain
+        address: 127.0.0.4
+
+nrf:
+  sbi:
+    server:
+      - address: 127.0.0.10
+        port: 7777
+
+scp:
+  sbi:
+    server:
+      - address: 127.0.0.200
+        port: 7777
+    client:
+      nrf:
+        - uri: http://127.0.0.10:7777
+
+ausf:
+  sbi:
+    server:
+      - address: 127.0.0.11
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+
+udm:
+  hnet:
+    - id: 1
+      scheme: 1
+      key: @build_configs_dir@/open5gs/hnet/curve25519-1.key
+    - id: 2
+      scheme: 2
+      key: @build_configs_dir@/open5gs/hnet/secp256r1-2.key
+  sbi:
+    server:
+      - address: 127.0.0.12
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+
+pcf:
+  sbi:
+    server:
+      - address: 127.0.0.13
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+  metrics:
+    server:
+      - address: 127.0.0.13
+        port: 9090
+
+nssf:
+  sbi:
+    server:
+      - address: 127.0.0.14
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+      nsi:
+        - uri: http://127.0.0.10:7777
+          s_nssai:
+            sst: 1
+bsf:
+  sbi:
+    server:
+      - address: 127.0.0.15
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+
+udr:
+  sbi:
+    server:
+      - address: 127.0.0.20
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777

configs/csfb.yaml.in

@@ -59,7 +59,7 @@ mme:
       smf:
         - address: 127.0.0.4
   sgsap:
-    server:
+    client:
       - address: 127.0.0.2
         map:
           tai:

configs/examples/5gc-no-scp-sepp1-999-70.yaml.in

@@ -0,0 +1,530 @@
+db_uri: mongodb://localhost/open5gs
+
+logger:
+
+global:
+  parameter:
+#    no_nrf: true
+    no_scp: true
+#    no_sepp: 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
+
+mme:
+  freeDiameter:
+    identity: mme.localdomain
+    realm: localdomain
+    listen_on: 127.0.1.2
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: hss.localdomain
+        address: 127.0.1.8
+
+  s1ap:
+    server:
+      - address: 127.0.1.2
+  gtpc:
+    server:
+      - address: 127.0.1.2
+    client:
+      sgwc:
+        - address: 127.0.1.3
+      smf:
+        - address: 127.0.1.4
+  metrics:
+    server:
+      - address: 127.0.1.2
+        port: 9090
+  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
+  time:
+    t3412:
+      value: 3240
+
+sgwc:
+  gtpc:
+    server:
+      - address: 127.0.1.3
+  pfcp:
+    server:
+      - address: 127.0.1.3
+    client:
+      sgwu:
+        - address: 127.0.1.6
+
+smf:
+  sbi:
+    server:
+#      - address: 127.0.1.4
+#        port: 7777
+      - address: smf.5gc.mnc070.mcc999.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+  pfcp:
+    server:
+      - address: 127.0.1.4
+    client:
+      upf:
+        - address: 127.0.1.7
+  gtpc:
+    server:
+      - address: 127.0.1.4
+  gtpu:
+    server:
+      - address: 127.0.1.4
+  metrics:
+    server:
+      - address: 127.0.1.4
+        port: 9090
+  session:
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
+  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.1.4
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: pcrf.localdomain
+        address: 127.0.1.9
+
+amf:
+  sbi:
+    server:
+      - address: 127.0.1.5
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+  ngap:
+    server:
+      - address: 127.0.1.5
+  metrics:
+    server:
+      - address: 127.0.1.5
+        port: 9090
+  access_control:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+  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
+  time:
+    t3512:
+      value: 540     # 9 mintues * 60 = 540 seconds
+
+sgwu:
+  pfcp:
+    server:
+      - address: 127.0.1.6
+  gtpu:
+    server:
+      - address: 127.0.1.6
+
+upf:
+  pfcp:
+    server:
+      - address: 127.0.1.7
+  gtpu:
+    server:
+      - address: 127.0.1.7
+  session:
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
+  metrics:
+    server:
+      - address: 127.0.1.7
+        port: 9090
+
+hss:
+  freeDiameter:
+    identity: hss.localdomain
+    realm: localdomain
+    listen_on: 127.0.1.8
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: mme.localdomain
+        address: 127.0.1.2
+pcrf:
+  freeDiameter:
+    identity: pcrf.localdomain
+    realm: localdomain
+    listen_on: 127.0.1.9
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: smf.localdomain
+        address: 127.0.1.4
+
+nrf:
+  serving:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+  sbi:
+    server:
+#      - address: 127.0.1.10
+#        port: 7777
+      - address: nrf.5gc.mnc070.mcc999.3gppnetwork.org
+
+sepp:
+  default:
+    tls:
+      server:
+        private_key: @build_configs_dir@/open5gs/tls/sepp1.key
+        cert: @build_configs_dir@/open5gs/tls/sepp1.crt
+      client:
+        cacert: @build_configs_dir@/open5gs/tls/ca.crt
+  sbi:
+    server:
+      - address: 127.0.1.250
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+  n32:
+    server:
+      - sender: sepp1.localdomain
+        address: 127.0.1.251
+        port: 7777
+        n32f:
+          address: 127.0.1.252
+          port: 7777
+    client:
+      sepp:
+        - receiver: sepp2.localdomain
+          uri: http://127.0.2.251:7777
+          n32f:
+            uri: http://127.0.2.252:7777
+        - receiver: sepp3.localdomain
+          uri: http://127.0.3.251:7777
+          n32f:
+            uri: http://127.0.3.252:7777
+
+ausf:
+  sbi:
+    server:
+#      - address: 127.0.1.11
+#        port: 7777
+      - address: ausf.5gc.mnc070.mcc999.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+
+udm:
+  hnet:
+    - id: 1
+      scheme: 1
+      key: @build_configs_dir@/open5gs/hnet/curve25519-1.key
+    - id: 2
+      scheme: 2
+      key: @build_configs_dir@/open5gs/hnet/secp256r1-2.key
+  sbi:
+    server:
+#        - address: 127.0.1.12
+#          port: 7777
+      - address: udm.5gc.mnc070.mcc999.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+
+pcf:
+  sbi:
+    server:
+      - address: 127.0.1.13
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+  metrics:
+    server:
+      - address: 127.0.1.13
+        port: 9090
+  policy:
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+      slice:
+        - sst: 1  # 1,2,3,4
+          default_indicator: true
+          session:
+            - name: internet
+              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+              ambr:
+                downlink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                uplink:
+                  value: 1
+                  unit: 3
+              qos:
+                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                arp:
+                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
+                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+            - name: ims
+              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+              ambr:
+                downlink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                uplink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+              qos:
+                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                arp:
+                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
+                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+              pcc_rule:
+                - qos:
+                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                    arp:
+                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
+                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
+                    mbr:
+                      downlink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                    gbr:
+                      downlink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                - qos:
+                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                    arp:
+                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
+                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
+                    mbr:
+                      downlink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                    gbr:
+                      downlink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+      slice:
+        - sst: 1  # 1,2,3,4
+          default_indicator: true
+          session:
+            - name: internet
+              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+              ambr:
+                downlink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                uplink:
+                  value: 1
+                  unit: 3
+              qos:
+                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                arp:
+                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
+                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+            - name: ims
+              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+              ambr:
+                downlink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                uplink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+              qos:
+                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                arp:
+                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
+                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+              pcc_rule:
+                - qos:
+                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                    arp:
+                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
+                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
+                    mbr:
+                      downlink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                    gbr:
+                      downlink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                - qos:
+                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                    arp:
+                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
+                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
+                    mbr:
+                      downlink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                    gbr:
+                      downlink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+
+nssf:
+  sbi:
+    server:
+#      - address: 127.0.1.14
+#        port: 7777
+      - address: nssf.5gc.mnc070.mcc999.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+      nsi:
+        - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+          s_nssai:
+            sst: 1
+bsf:
+  sbi:
+    server:
+      - address: 127.0.1.15
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+
+udr:
+  sbi:
+    server:
+      - address: 127.0.1.20
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org

configs/examples/5gc-no-scp-sepp2-001-01.yaml.in

@@ -0,0 +1,532 @@
+db_uri: mongodb://localhost/open5gs
+
+logger:
+
+global:
+  parameter:
+#    no_nrf: true
+    no_scp: true
+#    no_sepp: 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
+
+mme:
+  freeDiameter:
+    identity: mme.localdomain
+    realm: localdomain
+    listen_on: 127.0.2.2
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: hss.localdomain
+        address: 127.0.2.8
+
+  s1ap:
+    server:
+      - address: 127.0.2.2
+  gtpc:
+    server:
+      - address: 127.0.2.2
+    client:
+      sgwc:
+        - address: 127.0.2.3
+      smf:
+        - address: 127.0.2.4
+  metrics:
+    server:
+      - address: 127.0.2.2
+        port: 9090
+  gummei:
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+      mme_gid: 2
+      mme_code: 1
+  tai:
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+      tac: 1
+  security:
+    integrity_order : [ EIA2, EIA1, EIA0 ]
+    ciphering_order : [ EEA0, EEA1, EEA2 ]
+  network_name:
+    full: Open5GS
+  time:
+    t3412:
+      value: 3240
+
+sgwc:
+  gtpc:
+    server:
+      - address: 127.0.2.3
+  pfcp:
+    server:
+      - address: 127.0.2.3
+    client:
+      sgwu:
+        - address: 127.0.2.6
+
+smf:
+  sbi:
+    server:
+#      - address: 127.0.2.4
+#        port: 7777
+      - address: smf.5gc.mnc001.mcc001.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc001.mcc001.3gppnetwork.org
+  pfcp:
+    server:
+      - address: 127.0.2.4
+    client:
+      upf:
+        - address: 127.0.2.7
+  gtpc:
+    server:
+      - address: 127.0.2.4
+  gtpu:
+    server:
+      - address: 127.0.2.4
+  metrics:
+    server:
+      - address: 127.0.2.4
+        port: 9090
+  session:
+    - subnet: 10.46.0.0/16
+      gateway: 10.46.0.1
+    - subnet: 2001:db8:babe::/48
+      gateway: 2001:db8:babe::1
+  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.2.4
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: pcrf.localdomain
+        address: 127.0.2.9
+
+amf:
+  sbi:
+    server:
+      - address: 127.0.2.5
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc001.mcc001.3gppnetwork.org
+  ngap:
+    server:
+      - address: 127.0.2.5
+  metrics:
+    server:
+      - address: 127.0.2.5
+        port: 9090
+  access_control:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+  guami:
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+      amf_id:
+        region: 2
+        set: 1
+  tai:
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+      tac: 1
+  plmn_support:
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+      s_nssai:
+        - sst: 1
+  security:
+    integrity_order : [ NIA2, NIA1, NIA0 ]
+    ciphering_order : [ NEA0, NEA1, NEA2 ]
+  network_name:
+    full: Open5GS
+  amf_name: open5gs-amf0
+  time:
+    t3512:
+      value: 540     # 9 mintues * 60 = 540 seconds
+
+sgwu:
+  pfcp:
+    server:
+      - address: 127.0.2.6
+  gtpu:
+    server:
+      - address: 127.0.2.6
+
+upf:
+  pfcp:
+    server:
+      - address: 127.0.2.7
+  gtpu:
+    server:
+      - address: 127.0.2.7
+  session:
+    - subnet: 10.46.0.0/16
+      gateway: 10.46.0.1
+      dev: ogstun2
+    - subnet: 2001:db8:babe::/48
+      gateway: 2001:db8:babe::1
+      dev: ogstun2
+  metrics:
+    server:
+      - address: 127.0.2.7
+        port: 9090
+
+hss:
+  freeDiameter:
+    identity: hss.localdomain
+    realm: localdomain
+    listen_on: 127.0.2.8
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: mme.localdomain
+        address: 127.0.2.2
+pcrf:
+  freeDiameter:
+    identity: pcrf.localdomain
+    realm: localdomain
+    listen_on: 127.0.2.9
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: smf.localdomain
+        address: 127.0.2.4
+
+nrf:
+  serving:
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+  sbi:
+    server:
+#      - address: 127.0.2.10
+#        port: 7777
+      - address: nrf.5gc.mnc001.mcc001.3gppnetwork.org
+
+sepp:
+  default:
+    tls:
+      server:
+        private_key: @build_configs_dir@/open5gs/tls/sepp2.key
+        cert: @build_configs_dir@/open5gs/tls/sepp2.crt
+      client:
+        cacert: @build_configs_dir@/open5gs/tls/ca.crt
+  sbi:
+    server:
+      - address: 127.0.2.250
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc001.mcc001.3gppnetwork.org
+  n32:
+    server:
+      - sender: sepp2.localdomain
+        address: 127.0.2.251
+        port: 7777
+        n32f:
+          address: 127.0.2.252
+          port: 7777
+    client:
+      sepp:
+        - receiver: sepp1.localdomain
+          uri: http://127.0.1.251:7777
+          n32f:
+            uri: http://127.0.1.252:7777
+        - receiver: sepp3.localdomain
+          uri: http://127.0.3.251:7777
+          n32f:
+            uri: http://127.0.3.252:7777
+
+ausf:
+  sbi:
+    server:
+#      - address: 127.0.2.11
+#        port: 7777
+      - address: ausf.5gc.mnc001.mcc001.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc001.mcc001.3gppnetwork.org
+
+udm:
+  hnet:
+    - id: 1
+      scheme: 1
+      key: @build_configs_dir@/open5gs/hnet/curve25519-1.key
+    - id: 2
+      scheme: 2
+      key: @build_configs_dir@/open5gs/hnet/secp256r1-2.key
+  sbi:
+    server:
+#        - address: 127.0.2.12
+#          port: 7777
+      - address: udm.5gc.mnc001.mcc001.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc001.mcc001.3gppnetwork.org
+
+pcf:
+  sbi:
+    server:
+      - address: 127.0.2.13
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc001.mcc001.3gppnetwork.org
+  metrics:
+    server:
+      - address: 127.0.2.13
+        port: 9090
+  policy:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+      slice:
+        - sst: 1  # 1,2,3,4
+          default_indicator: true
+          session:
+            - name: internet
+              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+              ambr:
+                downlink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                uplink:
+                  value: 1
+                  unit: 3
+              qos:
+                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                arp:
+                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
+                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+            - name: ims
+              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+              ambr:
+                downlink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                uplink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+              qos:
+                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                arp:
+                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
+                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+              pcc_rule:
+                - qos:
+                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                    arp:
+                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
+                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
+                    mbr:
+                      downlink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                    gbr:
+                      downlink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                - qos:
+                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                    arp:
+                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
+                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
+                    mbr:
+                      downlink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                    gbr:
+                      downlink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+      slice:
+        - sst: 1  # 1,2,3,4
+          default_indicator: true
+          session:
+            - name: internet
+              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+              ambr:
+                downlink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                uplink:
+                  value: 1
+                  unit: 3
+              qos:
+                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                arp:
+                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
+                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+            - name: ims
+              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+              ambr:
+                downlink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                uplink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+              qos:
+                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                arp:
+                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
+                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+              pcc_rule:
+                - qos:
+                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                    arp:
+                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
+                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
+                    mbr:
+                      downlink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                    gbr:
+                      downlink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                - qos:
+                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                    arp:
+                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
+                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
+                    mbr:
+                      downlink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                    gbr:
+                      downlink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+
+nssf:
+  sbi:
+    server:
+#      - address: 127.0.2.14
+#        port: 7777
+      - address: nssf.5gc.mnc001.mcc001.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc001.mcc001.3gppnetwork.org
+      nsi:
+        - uri: http://nrf.5gc.mnc001.mcc001.3gppnetwork.org
+          s_nssai:
+            sst: 1
+bsf:
+  sbi:
+    server:
+      - address: 127.0.2.15
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc001.mcc001.3gppnetwork.org
+
+udr:
+  sbi:
+    server:
+      - address: 127.0.2.20
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc001.mcc001.3gppnetwork.org

configs/examples/5gc-no-scp-sepp3-315-010.yaml.in

@@ -0,0 +1,532 @@
+db_uri: mongodb://localhost/open5gs
+
+logger:
+
+global:
+  parameter:
+#    no_nrf: true
+    no_scp: true
+#    no_sepp: 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
+
+mme:
+  freeDiameter:
+    identity: mme.localdomain
+    realm: localdomain
+    listen_on: 127.0.3.2
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: hss.localdomain
+        address: 127.0.3.8
+
+  s1ap:
+    server:
+      - address: 127.0.3.2
+  gtpc:
+    server:
+      - address: 127.0.3.2
+    client:
+      sgwc:
+        - address: 127.0.3.3
+      smf:
+        - address: 127.0.3.4
+  metrics:
+    server:
+      - address: 127.0.3.2
+        port: 9090
+  gummei:
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+      mme_gid: 2
+      mme_code: 1
+  tai:
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+      tac: 1
+  security:
+    integrity_order : [ EIA2, EIA1, EIA0 ]
+    ciphering_order : [ EEA0, EEA1, EEA2 ]
+  network_name:
+    full: Open5GS
+  time:
+    t3412:
+      value: 3240
+
+sgwc:
+  gtpc:
+    server:
+      - address: 127.0.3.3
+  pfcp:
+    server:
+      - address: 127.0.3.3
+    client:
+      sgwu:
+        - address: 127.0.3.6
+
+smf:
+  sbi:
+    server:
+#      - address: 127.0.3.4
+#        port: 7777
+      - address: smf.5gc.mnc010.mcc315.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc010.mcc315.3gppnetwork.org
+  pfcp:
+    server:
+      - address: 127.0.3.4
+    client:
+      upf:
+        - address: 127.0.3.7
+  gtpc:
+    server:
+      - address: 127.0.3.4
+  gtpu:
+    server:
+      - address: 127.0.3.4
+  metrics:
+    server:
+      - address: 127.0.3.4
+        port: 9090
+  session:
+    - subnet: 10.47.0.0/16
+      gateway: 10.47.0.1
+    - subnet: 2001:db8:face::/48
+      gateway: 2001:db8:face::1
+  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.3.4
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: pcrf.localdomain
+        address: 127.0.3.9
+
+amf:
+  sbi:
+    server:
+      - address: 127.0.3.5
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc010.mcc315.3gppnetwork.org
+  ngap:
+    server:
+      - address: 127.0.3.5
+  metrics:
+    server:
+      - address: 127.0.3.5
+        port: 9090
+  access_control:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+  guami:
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+      amf_id:
+        region: 2
+        set: 1
+  tai:
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+      tac: 1
+  plmn_support:
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+      s_nssai:
+        - sst: 1
+  security:
+    integrity_order : [ NIA2, NIA1, NIA0 ]
+    ciphering_order : [ NEA0, NEA1, NEA2 ]
+  network_name:
+    full: Open5GS
+  amf_name: open5gs-amf0
+  time:
+    t3512:
+      value: 540     # 9 mintues * 60 = 540 seconds
+
+sgwu:
+  pfcp:
+    server:
+      - address: 127.0.3.6
+  gtpu:
+    server:
+      - address: 127.0.3.6
+
+upf:
+  pfcp:
+    server:
+      - address: 127.0.3.7
+  gtpu:
+    server:
+      - address: 127.0.3.7
+  session:
+    - subnet: 10.47.0.0/16
+      gateway: 10.47.0.1
+      dev: ogstun3
+    - subnet: 2001:db8:face::/48
+      gateway: 2001:db8:face::1
+      dev: ogstun3
+  metrics:
+    server:
+      - address: 127.0.3.7
+        port: 9090
+
+hss:
+  freeDiameter:
+    identity: hss.localdomain
+    realm: localdomain
+    listen_on: 127.0.3.8
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: mme.localdomain
+        address: 127.0.3.2
+pcrf:
+  freeDiameter:
+    identity: pcrf.localdomain
+    realm: localdomain
+    listen_on: 127.0.3.9
+    no_fwd: true
+    load_extension:
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: smf.localdomain
+        address: 127.0.3.4
+
+nrf:
+  serving:
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+  sbi:
+    server:
+#      - address: 127.0.3.10
+#        port: 7777
+      - address: nrf.5gc.mnc010.mcc315.3gppnetwork.org
+
+sepp:
+  default:
+    tls:
+      server:
+        private_key: @build_configs_dir@/open5gs/tls/sepp3.key
+        cert: @build_configs_dir@/open5gs/tls/sepp3.crt
+      client:
+        cacert: @build_configs_dir@/open5gs/tls/ca.crt
+  sbi:
+    server:
+      - address: 127.0.3.250
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc010.mcc315.3gppnetwork.org
+  n32:
+    server:
+      - sender: sepp3.localdomain
+        address: 127.0.3.251
+        port: 7777
+        n32f:
+          address: 127.0.3.252
+          port: 7777
+    client:
+      sepp:
+        - receiver: sepp1.localdomain
+          uri: http://127.0.1.251:7777
+          n32f:
+            uri: http://127.0.1.252:7777
+        - receiver: sepp2.localdomain
+          uri: http://127.0.2.251:7777
+          n32f:
+            uri: http://127.0.2.252:7777
+
+ausf:
+  sbi:
+    server:
+#      - address: 127.0.3.11
+#        port: 7777
+      - address: ausf.5gc.mnc010.mcc315.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc010.mcc315.3gppnetwork.org
+
+udm:
+  hnet:
+    - id: 1
+      scheme: 1
+      key: @build_configs_dir@/open5gs/hnet/curve25519-1.key
+    - id: 2
+      scheme: 2
+      key: @build_configs_dir@/open5gs/hnet/secp256r1-2.key
+  sbi:
+    server:
+#      - address: 127.0.3.12
+#        port: 7777
+      - address: udm.5gc.mnc010.mcc315.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc010.mcc315.3gppnetwork.org
+
+pcf:
+  sbi:
+    server:
+      - address: 127.0.3.13
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc010.mcc315.3gppnetwork.org
+  metrics:
+    server:
+      - address: 127.0.3.13
+        port: 9090
+  policy:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+      slice:
+        - sst: 1  # 1,2,3,4
+          default_indicator: true
+          session:
+            - name: internet
+              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+              ambr:
+                downlink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                uplink:
+                  value: 1
+                  unit: 3
+              qos:
+                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                arp:
+                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
+                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+            - name: ims
+              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+              ambr:
+                downlink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                uplink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+              qos:
+                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                arp:
+                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
+                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+              pcc_rule:
+                - qos:
+                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                    arp:
+                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
+                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
+                    mbr:
+                      downlink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                    gbr:
+                      downlink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                - qos:
+                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                    arp:
+                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
+                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
+                    mbr:
+                      downlink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                    gbr:
+                      downlink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+      slice:
+        - sst: 1  # 1,2,3,4
+          default_indicator: true
+          session:
+            - name: internet
+              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+              ambr:
+                downlink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                uplink:
+                  value: 1
+                  unit: 3
+              qos:
+                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                arp:
+                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
+                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+            - name: ims
+              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+              ambr:
+                downlink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                uplink:
+                  value: 1
+                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+              qos:
+                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                arp:
+                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
+                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+              pcc_rule:
+                - qos:
+                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                    arp:
+                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
+                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
+                    mbr:
+                      downlink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                    gbr:
+                      downlink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 82
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                - qos:
+                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+                    arp:
+                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
+                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
+                    mbr:
+                      downlink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                    gbr:
+                      downlink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+                      uplink:
+                        value: 802
+                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+
+nssf:
+  sbi:
+    server:
+#      - address: 127.0.3.14
+#        port: 7777
+      - address: nssf.5gc.mnc010.mcc315.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc010.mcc315.3gppnetwork.org
+      nsi:
+        - uri: http://nrf.5gc.mnc010.mcc315.3gppnetwork.org
+          s_nssai:
+            sst: 1
+bsf:
+  sbi:
+    server:
+      - address: 127.0.3.15
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc010.mcc315.3gppnetwork.org
+
+udr:
+  sbi:
+    server:
+      - address: 127.0.3.20
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc010.mcc315.3gppnetwork.org

configs/examples/5gc-sepp1-999-70.yaml.in

@@ -90,8 +90,9 @@ sgwc:
 smf:
   sbi:
     server:
-      - address: 127.0.1.4
-        port: 7777
+#      - address: 127.0.1.4
+#        port: 7777
+      - address: smf.5gc.mnc070.mcc999.3gppnetwork.org
     client:
       scp:
         - uri: http://127.0.1.200:7777
@@ -350,9 +351,9 @@ pcf:
       - address: 127.0.1.13
         port: 9090
   policy:
-    - plmn_id:
-        mcc: 001
-        mnc: 01
+    - supi_range:
+        - 001010000000001-001019999999999
+        - 315010000000001-315010999999999
       slice:
         - sst: 1  # 1,2,3,4
           default_indicator: true
@@ -428,90 +429,12 @@ pcf:
                       uplink:
                         value: 802
                         unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-    - plmn_id:
-        mcc: 315
-        mnc: 010
-      slice:
-        - sst: 1  # 1,2,3,4
-          default_indicator: true
-          session:
-            - name: internet
-              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-              ambr:
-                downlink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                uplink:
-                  value: 1
-                  unit: 3
-              qos:
-                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                arp:
-                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-            - name: ims
-              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-              ambr:
-                downlink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                uplink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-              qos:
-                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                arp:
-                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-              pcc_rule:
-                - qos:
-                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                    arp:
-                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
-                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
-                    mbr:
-                      downlink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                    gbr:
-                      downlink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                - qos:
-                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                    arp:
-                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
-                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
-                    mbr:
-                      downlink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                    gbr:
-                      downlink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-
 nssf:
   sbi:
     server:
-      - address: 127.0.1.14
-        port: 7777
+#      - address: 127.0.1.14
+#        port: 7777
+      - address: nssf.5gc.mnc070.mcc999.3gppnetwork.org
     client:
       scp:
         - uri: http://127.0.1.200:7777

configs/examples/5gc-sepp2-001-01.yaml.in

@@ -90,8 +90,9 @@ sgwc:
 smf:
   sbi:
     server:
-      - address: 127.0.2.4
-        port: 7777
+#      - address: 127.0.2.4
+#        port: 7777
+      - address: smf.5gc.mnc001.mcc001.3gppnetwork.org
     client:
       scp:
         - uri: http://127.0.2.200:7777
@@ -351,9 +352,9 @@ pcf:
       - address: 127.0.2.13
         port: 9090
   policy:
-    - plmn_id:
-        mcc: 999
-        mnc: 70
+    - supi_range:
+        - 999700000000001-999709999999999
+        - 315010000000001-315010999999999
       slice:
         - sst: 1  # 1,2,3,4
           default_indicator: true
@@ -429,90 +430,12 @@ pcf:
                       uplink:
                         value: 802
                         unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-    - plmn_id:
-        mcc: 315
-        mnc: 010
-      slice:
-        - sst: 1  # 1,2,3,4
-          default_indicator: true
-          session:
-            - name: internet
-              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-              ambr:
-                downlink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                uplink:
-                  value: 1
-                  unit: 3
-              qos:
-                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                arp:
-                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-            - name: ims
-              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-              ambr:
-                downlink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                uplink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-              qos:
-                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                arp:
-                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-              pcc_rule:
-                - qos:
-                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                    arp:
-                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
-                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
-                    mbr:
-                      downlink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                    gbr:
-                      downlink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                - qos:
-                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                    arp:
-                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
-                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
-                    mbr:
-                      downlink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                    gbr:
-                      downlink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-
 nssf:
   sbi:
     server:
-      - address: 127.0.2.14
-        port: 7777
+#      - address: 127.0.2.14
+#        port: 7777
+      - address: nssf.5gc.mnc001.mcc001.3gppnetwork.org
     client:
       scp:
         - uri: http://127.0.2.200:7777

configs/examples/5gc-sepp3-315-010.yaml.in

@@ -90,8 +90,9 @@ sgwc:
 smf:
   sbi:
     server:
-      - address: 127.0.3.4
-        port: 7777
+#      - address: 127.0.3.4
+#        port: 7777
+      - address: smf.5gc.mnc010.mcc315.3gppnetwork.org
     client:
       scp:
         - uri: http://127.0.3.200:7777
@@ -351,9 +352,9 @@ pcf:
       - address: 127.0.3.13
         port: 9090
   policy:
-    - plmn_id:
-        mcc: 999
-        mnc: 70
+    - supi_range:
+        - 999700000000001-999709999999999
+        - 001010000000001-001019999999999
       slice:
         - sst: 1  # 1,2,3,4
           default_indicator: true
@@ -429,90 +430,12 @@ pcf:
                       uplink:
                         value: 802
                         unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-    - plmn_id:
-        mcc: 001
-        mnc: 01
-      slice:
-        - sst: 1  # 1,2,3,4
-          default_indicator: true
-          session:
-            - name: internet
-              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-              ambr:
-                downlink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                uplink:
-                  value: 1
-                  unit: 3
-              qos:
-                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                arp:
-                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-            - name: ims
-              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-              ambr:
-                downlink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                uplink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-              qos:
-                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                arp:
-                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-              pcc_rule:
-                - qos:
-                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                    arp:
-                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
-                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
-                    mbr:
-                      downlink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                    gbr:
-                      downlink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                - qos:
-                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                    arp:
-                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
-                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
-                    mbr:
-                      downlink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                    gbr:
-                      downlink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-
 nssf:
   sbi:
     server:
-      - address: 127.0.3.14
-        port: 7777
+#      - address: 127.0.3.14
+#        port: 7777
+      - address: nssf.5gc.mnc010.mcc315.3gppnetwork.org
     client:
       scp:
         - uri: http://127.0.3.200:7777

configs/examples/5gc-tls-sepp1-999-70.yaml.in

@@ -91,8 +91,9 @@ sgwc:
 smf:
   sbi:
     server:
-      - address: 127.0.1.4
-        port: 7777
+#      - address: 127.0.1.4
+#        port: 7777
+      - address: smf.5gc.mnc070.mcc999.3gppnetwork.org
     client:
       scp:
         - uri: http://127.0.1.200:7777
@@ -355,9 +356,9 @@ pcf:
       - address: 127.0.1.13
         port: 9090
   policy:
-    - plmn_id:
-        mcc: 001
-        mnc: 01
+    - supi_range:
+        - 001010000000001-001019999999999
+        - 315010000000001-315010999999999
       slice:
         - sst: 1  # 1,2,3,4
           default_indicator: true
@@ -433,90 +434,12 @@ pcf:
                       uplink:
                         value: 802
                         unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-    - plmn_id:
-        mcc: 315
-        mnc: 010
-      slice:
-        - sst: 1  # 1,2,3,4
-          default_indicator: true
-          session:
-            - name: internet
-              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-              ambr:
-                downlink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                uplink:
-                  value: 1
-                  unit: 3
-              qos:
-                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                arp:
-                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-            - name: ims
-              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-              ambr:
-                downlink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                uplink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-              qos:
-                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                arp:
-                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-              pcc_rule:
-                - qos:
-                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                    arp:
-                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
-                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
-                    mbr:
-                      downlink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                    gbr:
-                      downlink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                - qos:
-                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                    arp:
-                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
-                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
-                    mbr:
-                      downlink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                    gbr:
-                      downlink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-
 nssf:
   sbi:
     server:
-      - address: 127.0.1.14
-        port: 7777
+#      - address: 127.0.1.14
+#        port: 7777
+      - address: nssf.5gc.mnc070.mcc999.3gppnetwork.org
     client:
       scp:
         - uri: http://127.0.1.200:7777

configs/examples/5gc-tls-sepp2-001-01.yaml.in

@@ -91,8 +91,9 @@ sgwc:
 smf:
   sbi:
     server:
-      - address: 127.0.2.4
-        port: 7777
+#      - address: 127.0.2.4
+#        port: 7777
+      - address: smf.5gc.mnc001.mcc001.3gppnetwork.org
     client:
       scp:
         - uri: http://127.0.2.200:7777
@@ -356,9 +357,9 @@ pcf:
       - address: 127.0.2.13
         port: 9090
   policy:
-    - plmn_id:
-        mcc: 999
-        mnc: 70
+    - supi_range:
+        - 999700000000001-999709999999999
+        - 315010000000001-315010999999999
       slice:
         - sst: 1  # 1,2,3,4
           default_indicator: true
@@ -434,90 +435,12 @@ pcf:
                       uplink:
                         value: 802
                         unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-    - plmn_id:
-        mcc: 315
-        mnc: 010
-      slice:
-        - sst: 1  # 1,2,3,4
-          default_indicator: true
-          session:
-            - name: internet
-              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-              ambr:
-                downlink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                uplink:
-                  value: 1
-                  unit: 3
-              qos:
-                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                arp:
-                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-            - name: ims
-              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-              ambr:
-                downlink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                uplink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-              qos:
-                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                arp:
-                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-              pcc_rule:
-                - qos:
-                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                    arp:
-                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
-                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
-                    mbr:
-                      downlink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                    gbr:
-                      downlink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                - qos:
-                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                    arp:
-                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
-                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
-                    mbr:
-                      downlink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                    gbr:
-                      downlink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-
 nssf:
   sbi:
     server:
-      - address: 127.0.2.14
-        port: 7777
+#      - address: 127.0.2.14
+#        port: 7777
+      - address: nssf.5gc.mnc001.mcc001.3gppnetwork.org
     client:
       scp:
         - uri: http://127.0.2.200:7777

configs/examples/5gc-tls-sepp3-315-010.yaml.in

@@ -91,8 +91,9 @@ sgwc:
 smf:
   sbi:
     server:
-      - address: 127.0.3.4
-        port: 7777
+#      - address: 127.0.3.4
+#        port: 7777
+      - address: smf.5gc.mnc010.mcc315.3gppnetwork.org
     client:
       scp:
         - uri: http://127.0.3.200:7777
@@ -356,9 +357,9 @@ pcf:
       - address: 127.0.3.13
         port: 9090
   policy:
-    - plmn_id:
-        mcc: 999
-        mnc: 70
+    - supi_range:
+        - 999700000000001-999709999999999
+        - 001010000000001-001010999999999
       slice:
         - sst: 1  # 1,2,3,4
           default_indicator: true
@@ -434,90 +435,12 @@ pcf:
                       uplink:
                         value: 802
                         unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-    - plmn_id:
-        mcc: 001
-        mnc: 01
-      slice:
-        - sst: 1  # 1,2,3,4
-          default_indicator: true
-          session:
-            - name: internet
-              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-              ambr:
-                downlink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                uplink:
-                  value: 1
-                  unit: 3
-              qos:
-                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                arp:
-                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-            - name: ims
-              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-              ambr:
-                downlink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                uplink:
-                  value: 1
-                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-              qos:
-                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                arp:
-                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-              pcc_rule:
-                - qos:
-                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                    arp:
-                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
-                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
-                    mbr:
-                      downlink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                    gbr:
-                      downlink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 82
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                - qos:
-                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-                    arp:
-                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
-                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
-                    mbr:
-                      downlink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                    gbr:
-                      downlink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-                      uplink:
-                        value: 802
-                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-
 nssf:
   sbi:
     server:
-      - address: 127.0.3.14
-        port: 7777
+#      - address: 127.0.3.14
+#        port: 7777
+      - address: nssf.5gc.mnc010.mcc315.3gppnetwork.org
     client:
       scp:
         - uri: http://127.0.3.200:7777

configs/examples/gnb-001-01-ue-001-01.yaml.in

@@ -325,6 +325,15 @@ bsf:
       scp:
         - uri: http://127.0.0.200:7777
 
+af:
+  sbi:
+    server:
+      - address: 127.0.0.16
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.2.200:7777
+
 udr:
   sbi:
     server:

configs/examples/gnb-001-01-ue-315-010.yaml.in

@@ -325,6 +325,15 @@ bsf:
       scp:
         - uri: http://127.0.0.200:7777
 
+af:
+  sbi:
+    server:
+      - address: 127.0.0.16
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.3.200:7777
+
 udr:
   sbi:
     server:

configs/examples/gnb-001-01-ue-999-70.yaml.in

@@ -320,6 +320,15 @@ bsf:
       scp:
         - uri: http://127.0.0.200:7777
 
+af:
+  sbi:
+    server:
+      - address: 127.0.0.16
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.1.200:7777
+
 udr:
   sbi:
     server:

configs/examples/gnb-315-010-ue-001-01.yaml.in

@@ -325,6 +325,15 @@ bsf:
       scp:
         - uri: http://127.0.0.200:7777
 
+af:
+  sbi:
+    server:
+      - address: 127.0.0.16
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.2.200:7777
+
 udr:
   sbi:
     server:

configs/examples/gnb-315-010-ue-315-010.yaml.in

@@ -320,6 +320,15 @@ bsf:
         scp:
           - uri: http://127.0.0.200:7777
 
+af:
+  sbi:
+    server:
+      - address: 127.0.0.16
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.3.200:7777
+
 udr:
   sbi:
     server:

configs/examples/gnb-315-010-ue-999-70.yaml.in

@@ -325,6 +325,15 @@ bsf:
       scp:
         - uri: http://127.0.0.200:7777
 
+af:
+  sbi:
+    server:
+      - address: 127.0.0.16
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.1.200:7777
+
 udr:
   sbi:
     server:

configs/examples/gnb-999-70-ue-001-01.yaml.in

@@ -325,6 +325,15 @@ bsf:
         scp:
           - uri: http://127.0.0.200:7777
 
+af:
+  sbi:
+    server:
+      - address: 127.0.0.16
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.2.200:7777
+
 udr:
     sbi:
       server:

configs/examples/gnb-999-70-ue-315-010.yaml.in

@@ -325,6 +325,15 @@ bsf:
       scp:
         - uri: http://127.0.0.200:7777
 
+af:
+  sbi:
+    server:
+      - address: 127.0.0.16
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.3.200:7777
+
 udr:
   sbi:
     server:

configs/examples/gnb-999-70-ue-999-70.yaml.in

@@ -320,6 +320,15 @@ bsf:
       scp:
         - uri: http://127.0.0.200:7777
 
+af:
+  sbi:
+    server:
+      - address: 127.0.0.16
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.1.200:7777
+
 udr:
   sbi:
     server:

configs/examples/meson.build

@@ -19,6 +19,9 @@ examples_conf = '''
     5gc-sepp1-999-70.yaml
     5gc-sepp2-001-01.yaml
     5gc-sepp3-315-010.yaml
+    5gc-no-scp-sepp1-999-70.yaml
+    5gc-no-scp-sepp2-001-01.yaml
+    5gc-no-scp-sepp3-315-010.yaml
     5gc-tls-sepp1-999-70.yaml
     5gc-tls-sepp2-001-01.yaml
     5gc-tls-sepp3-315-010.yaml

configs/meson.build

@@ -32,6 +32,7 @@ conf_data.set('build_subprojects_freeDiameter_extensions_dir',
 
 example_conf = '''
     sample.yaml
+    attach.yaml
     310014.yaml
     csfb.yaml
     volte.yaml
@@ -39,6 +40,8 @@ example_conf = '''
     slice.yaml
     srsenb.yaml
     non3gpp.yaml
+    transfer.yaml
+    transfer-error-case.yaml
 '''.split()
 
 foreach file : example_conf

configs/open5gs/amf.yaml.in

@@ -59,43 +59,83 @@ amf:
 ################################################################################
 # SBI Server
 ################################################################################
-#  o Override SBI address to be advertised to NRF
+#  o Bind to the address on the eth0 and advertise as open5gs-amf.svc.local
 #  sbi:
 #    server:
 #      - dev:eth0
 #        advertise: open5gs-amf.svc.local
 #
+#  o Specify a custom port number 7777 while binding to the given address
 #  sbi:
 #    server:
-#      - address: localhost
-#        advertise:
-#          - 127.0.0.99
-#          - ::1
+#      - address: amf.localdomain
+#        port: 7777
+#
+#  o Bind to 127.0.0.5 and advertise as open5gs-amf.svc.local
+#  sbi:
+#    server:
+#      - address: 127.0.0.5
+#        port: 7777
+#        advertise: open5gs-amf.svc.local
+#
+#  o Bind to port 7777 but advertise with a different port number 8888
+#  sbi:
+#    server:
+#      - address: 127.0.0.5
+#        port: 7777
+#        advertise: open5gs-amf.svc.local:8888
 #
 ################################################################################
 # SBI Client
 ################################################################################
-#  o Direct communication with NRF interaction
+#  o Direct Communication with NRF
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #
-#  o Indirect communication with delegated discovery
+#  o Indirect Communication by Delegating to SCP
 #  sbi:
 #    client:
 #      scp:
 #        - uri: http://127.0.0.200:7777
 #
-#  o Indirect communication without delegated discovery
+#  o Indirect Communication without Delegation
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #      scp:
 #        - uri: http://127.0.0.200:7777
-#  discovery:
-#    delegated: no
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: no   # Directly communicate NRF discovery
+#        scp:
+#          next: no   # Do not delegate to SCP for next-hop
+#
+#  o Indirect Communication with Delegated Discovery
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: yes  # Delegate discovery to SCP
+#        scp:
+#          next: yes  # Delegate to SCP for next-hop communications
+#
+#  o Default delegation: all communications are delegated to the SCP
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      # No 'delegated' section; defaults to AUTO delegation
 #
 ################################################################################
 # HTTPS scheme with TLS
@@ -117,6 +157,27 @@ amf:
 #      nrf:
 #        - uri: https://nrf.localdomain
 #
+#  o Enable SSL key logging for Wireshark
+#    - This configuration allows capturing SSL/TLS session keys
+#      for debugging or analysis purposes using Wireshark.
+#  default:
+#    tls:
+#      server:
+#        scheme: https
+#        private_key: @sysconfdir@/open5gs/tls/amf.key
+#        cert: @sysconfdir@/open5gs/tls/amf.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/amf-server-sslkeylog.log
+#      client:
+#        scheme: https
+#        cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        client_sslkeylogfile: @localstatedir@/log/open5gs/tls/amf-client-sslkeylog.log
+#  sbi:
+#    server:
+#      - address: amf.localdomain
+#    client:
+#      nrf:
+#        - uri: https://nrf.localdomain
+#
 #  o Add client TLS verification
 #  default:
 #    tls:

configs/open5gs/ausf.yaml.in

@@ -22,43 +22,83 @@ ausf:
 ################################################################################
 # SBI Server
 ################################################################################
-#  o Override SBI address to be advertised to NRF
+#  o Bind to the address on the eth0 and advertise as open5gs-ausf.svc.local
 #  sbi:
 #    server:
-#      - dev: eth0
+#      - dev:eth0
 #        advertise: open5gs-ausf.svc.local
 #
+#  o Specify a custom port number 7777 while binding to the given address
 #  sbi:
 #    server:
-#      - address: localhost
-#        advertise:
-#          - 127.0.0.99
-#          - ::1
+#      - address: ausf.localdomain
+#        port: 7777
+#
+#  o Bind to 127.0.0.11 and advertise as open5gs-ausf.svc.local
+#  sbi:
+#    server:
+#      - address: 127.0.0.11
+#        port: 7777
+#        advertise: open5gs-ausf.svc.local
+#
+#  o Bind to port 7777 but advertise with a different port number 8888
+#  sbi:
+#    server:
+#      - address: 127.0.0.11
+#        port: 7777
+#        advertise: open5gs-ausf.svc.local:8888
 #
 ################################################################################
 # SBI Client
 ################################################################################
-#  o Direct communication with NRF interaction
+#  o Direct Communication with NRF
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #
-#  o Indirect communication with delegated discovery
+#  o Indirect Communication by Delegating to SCP
 #  sbi:
 #    client:
 #      scp:
 #        - uri: http://127.0.0.200:7777
 #
-#  o Indirect communication without delegated discovery
+#  o Indirect Communication without Delegation
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #      scp:
 #        - uri: http://127.0.0.200:7777
-#  discovery:
-#    delegated: no
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: no   # Directly communicate NRF discovery
+#        scp:
+#          next: no   # Do not delegate to SCP for next-hop
+#
+#  o Indirect Communication with Delegated Discovery
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: yes  # Delegate discovery to SCP
+#        scp:
+#          next: yes  # Delegate to SCP for next-hop communications
+#
+#  o Default delegation: all communications are delegated to the SCP
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      # No 'delegated' section; defaults to AUTO delegation
 #
 ################################################################################
 # HTTPS scheme with TLS
@@ -80,6 +120,27 @@ ausf:
 #      nrf:
 #        - uri: https://nrf.localdomain
 #
+#  o Enable SSL key logging for Wireshark
+#    - This configuration allows capturing SSL/TLS session keys
+#      for debugging or analysis purposes using Wireshark.
+#  default:
+#    tls:
+#      server:
+#        scheme: https
+#        private_key: @sysconfdir@/open5gs/tls/ausf.key
+#        cert: @sysconfdir@/open5gs/tls/ausf.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/ausf-server-sslkeylog.log
+#      client:
+#        scheme: https
+#        cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        client_sslkeylogfile: @localstatedir@/log/open5gs/tls/ausf-client-sslkeylog.log
+#  sbi:
+#    server:
+#      - address: ausf.localdomain
+#    client:
+#      nrf:
+#        - uri: https://nrf.localdomain
+#
 #  o Add client TLS verification
 #  default:
 #    tls:

configs/open5gs/bsf.yaml.in

@@ -22,43 +22,83 @@ bsf:
 ################################################################################
 # SBI Server
 ################################################################################
-#  o Override SBI address to be advertised to NRF
+#  o Bind to the address on the eth0 and advertise as open5gs-bsf.svc.local
 #  sbi:
 #    server:
-#      - dev: eth0
+#      - dev:eth0
 #        advertise: open5gs-bsf.svc.local
 #
+#  o Specify a custom port number 7777 while binding to the given address
 #  sbi:
 #    server:
-#      - address: localhost
-#        advertise:
-#          - 127.0.0.99
-#          - ::1
+#      - address: bsf.localdomain
+#        port: 7777
+#
+#  o Bind to 127.0.0.15 and advertise as open5gs-bsf.svc.local
+#  sbi:
+#    server:
+#      - address: 127.0.0.15
+#        port: 7777
+#        advertise: open5gs-bsf.svc.local
+#
+#  o Bind to port 7777 but advertise with a different port number 8888
+#  sbi:
+#    server:
+#      - address: 127.0.0.15
+#        port: 7777
+#        advertise: open5gs-bsf.svc.local:8888
 #
 ################################################################################
 # SBI Client
 ################################################################################
-#  o Direct communication with NRF interaction
+#  o Direct Communication with NRF
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #
-#  o Indirect communication with delegated discovery
+#  o Indirect Communication by Delegating to SCP
 #  sbi:
 #    client:
 #      scp:
 #        - uri: http://127.0.0.200:7777
 #
-#  o Indirect communication without delegated discovery
+#  o Indirect Communication without Delegation
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #      scp:
 #        - uri: http://127.0.0.200:7777
-#  discovery:
-#    delegated: no
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: no   # Directly communicate NRF discovery
+#        scp:
+#          next: no   # Do not delegate to SCP for next-hop
+#
+#  o Indirect Communication with Delegated Discovery
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: yes  # Delegate discovery to SCP
+#        scp:
+#          next: yes  # Delegate to SCP for next-hop communications
+#
+#  o Default delegation: all communications are delegated to the SCP
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      # No 'delegated' section; defaults to AUTO delegation
 #
 ################################################################################
 # HTTPS scheme with TLS
@@ -80,6 +120,27 @@ bsf:
 #      nrf:
 #        - uri: https://nrf.localdomain
 #
+#  o Enable SSL key logging for Wireshark
+#    - This configuration allows capturing SSL/TLS session keys
+#      for debugging or analysis purposes using Wireshark.
+#  default:
+#    tls:
+#      server:
+#        scheme: https
+#        private_key: @sysconfdir@/open5gs/tls/bsf.key
+#        cert: @sysconfdir@/open5gs/tls/bsf.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/bsf-server-sslkeylog.log
+#      client:
+#        scheme: https
+#        cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        client_sslkeylogfile: @localstatedir@/log/open5gs/tls/bsf-client-sslkeylog.log
+#  sbi:
+#    server:
+#      - address: bsf.localdomain
+#    client:
+#      nrf:
+#        - uri: https://nrf.localdomain
+#
 #  o Add client TLS verification
 #  default:
 #    tls:

configs/open5gs/hss.yaml.in

@@ -11,5 +11,9 @@ global:
 
 hss:
   freeDiameter: @sysconfdir@/freeDiameter/hss.conf
+  metrics:
+    server:
+      - address: 127.0.0.8
+        port: 9090
 #  sms_over_ims: "sip:smsc.mnc001.mcc001.3gppnetwork.org:7060;transport=tcp"
 #  use_mongodb_change_stream: true

configs/open5gs/mme.yaml.in

@@ -164,8 +164,9 @@ mme:
 ################################################################################
 #  o MSC/VLR
 #  sgsap:
-#    server:
-#      - address: 127.0.0.2
+#    client:
+#      - address: msc.open5gs.org # SCTP server address configured on the MSC/VLR
+#        local_address: 127.0.0.2 # SCTP local IP addresses to be bound in the MME
 #        map:
 #          tai:
 #            plmn_id:
@@ -188,7 +189,15 @@ mme:
 #              mcc: 002
 #              mnc: 02
 #            lac: 43692
-#      - address: msc.open5gs.org
+#      - address:       # SCTP server address configured on the MSC/VLR
+#          - 127.0.0.88
+#          - 10.0.0.88
+#          - 172.16.0.88
+#          - 2001:db8:babe::88
+#        local_address: # SCTP local IP addresses to be bound in the MME
+#          - 127.0.0.2
+#          - 192.168.1.4
+#          - 2001:db8:cafe::2
 #        map:
 #          tai:
 #            plmn_id:
@@ -277,5 +286,23 @@ mme:
 #        mcc: 999
 #        mnc: 70
 #
+#  o HSS Selection
+#    o realm and host are optional
+#    o realm will be generated from plmn_id if not provided
+#    o host will not be used if not provided
+#  hss_map:
+#    - plmn_id:
+#        mcc: 001
+#        mnc: 01
+#    - plmn_id:
+#        mcc: 002
+#        mnc: 02
+#      realm: epc.mnc002.mcc002.3gppnetwork.org
+#    - plmn_id:
+#        mcc: 999
+#        mnc: 70
+#      realm: localdomain
+#      host: hss.localdomain
+#
 #  o Relative Capacity
 #  relative_capacity: 100

configs/open5gs/nrf.yaml.in

@@ -21,18 +21,31 @@ nrf:
 ################################################################################
 # SBI Server
 ################################################################################
-#  o Override SBI address to be advertised to NRF
+#  o Bind to the address on the eth0 and advertise as open5gs-nrf.svc.local
 #  sbi:
 #    server:
-#      - dev: eth0
+#      - dev:eth0
 #        advertise: open5gs-nrf.svc.local
 #
+#  o Specify a custom port number 7777 while binding to the given address
 #  sbi:
 #    server:
-#      - address: localhost
-#        advertise:
-#          - 127.0.0.99
-#          - ::1
+#      - address: nrf.localdomain
+#        port: 7777
+#
+#  o Bind to 127.0.0.10 and advertise as open5gs-nrf.svc.local
+#  sbi:
+#    server:
+#      - address: 127.0.0.10
+#        port: 7777
+#        advertise: open5gs-nrf.svc.local
+#
+#  o Bind to port 7777 but advertise with a different port number 8888
+#  sbi:
+#    server:
+#      - address: 127.0.0.10
+#        port: 7777
+#        advertise: open5gs-nrf.svc.local:8888
 #
 ################################################################################
 # HTTPS scheme with TLS
@@ -51,6 +64,24 @@ nrf:
 #    server:
 #      - address: nrf.localdomain
 #
+#  o Enable SSL key logging for Wireshark
+#    - This configuration allows capturing SSL/TLS session keys
+#      for debugging or analysis purposes using Wireshark.
+#  default:
+#    tls:
+#      server:
+#        scheme: https
+#        private_key: @sysconfdir@/open5gs/tls/nrf.key
+#        cert: @sysconfdir@/open5gs/tls/nrf.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/nrf-server-sslkeylog.log
+#      client:
+#        scheme: https
+#        cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        client_sslkeylogfile: @localstatedir@/log/open5gs/tls/nrf-client-sslkeylog.log
+#  sbi:
+#    server:
+#      - address: nrf.localdomain
+#
 #  o Add client TLS verification
 #  default:
 #    tls:

configs/open5gs/nssf.yaml.in

@@ -25,18 +25,31 @@ nssf:
 ################################################################################
 # SBI Server
 ################################################################################
-#  o Override SBI address to be advertised to NRF
+#  o Bind to the address on the eth0 and advertise as open5gs-nssf.svc.local
 #  sbi:
 #    server:
-#      - dev: eth0
+#      - dev:eth0
 #        advertise: open5gs-nssf.svc.local
 #
+#  o Specify a custom port number 7777 while binding to the given address
 #  sbi:
 #    server:
-#      - address: localhost
-#        advertise:
-#          - 127.0.0.99
-#          - ::1
+#      - address: nssf.localdomain
+#        port: 7777
+#
+#  o Bind to 127.0.0.14 and advertise as open5gs-nssf.svc.local
+#  sbi:
+#    server:
+#      - address: 127.0.0.14
+#        port: 7777
+#        advertise: open5gs-nssf.svc.local
+#
+#  o Bind to port 7777 but advertise with a different port number 8888
+#  sbi:
+#    server:
+#      - address: 127.0.0.14
+#        port: 7777
+#        advertise: open5gs-nssf.svc.local:8888
 #
 ################################################################################
 # SBI Client
@@ -64,27 +77,55 @@ nssf:
 #            sst: 1
 #            sd: 009000
 #
-#  o Direct communication with NRF interaction
+#  o Direct Communication with NRF
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #
-#  o Indirect communication with delegated discovery
+#  o Indirect Communication by Delegating to SCP
 #  sbi:
 #    client:
 #      scp:
 #        - uri: http://127.0.0.200:7777
 #
-#  o Indirect communication without delegated discovery
+#  o Indirect Communication without Delegation
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #      scp:
 #        - uri: http://127.0.0.200:7777
-#  discovery:
-#    delegated: no
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: no   # Directly communicate NRF discovery
+#        scp:
+#          next: no   # Do not delegate to SCP for next-hop
+#
+#  o Indirect Communication with Delegated Discovery
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: yes  # Delegate discovery to SCP
+#        scp:
+#          next: yes  # Delegate to SCP for next-hop communications
+#
+#  o Default delegation: all communications are delegated to the SCP
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      # No 'delegated' section; defaults to AUTO delegation
+#
 #
 ################################################################################
 # HTTPS scheme with TLS
@@ -110,6 +151,31 @@ nssf:
 #          s_nssai:
 #            sst: 1
 #
+#  o Enable SSL key logging for Wireshark
+#    - This configuration allows capturing SSL/TLS session keys
+#      for debugging or analysis purposes using Wireshark.
+#  default:
+#    tls:
+#      server:
+#        scheme: https
+#        private_key: @sysconfdir@/open5gs/tls/nssf.key
+#        cert: @sysconfdir@/open5gs/tls/nssf.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/nssf-server-sslkeylog.log
+#      client:
+#        scheme: https
+#        cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        client_sslkeylogfile: @localstatedir@/log/open5gs/tls/nssf-client-sslkeylog.log
+#  sbi:
+#    server:
+#      - address: nssf.localdomain
+#    client:
+#      nrf:
+#        - uri: https://nrf.localdomain
+#      nsi:
+#        - uri: https://nrf.localdomain
+#          s_nssai:
+#            sst: 1
+#
 #  o Add client TLS verification
 #  default:
 #    tls:

configs/open5gs/pcf.yaml.in

@@ -25,73 +25,85 @@ pcf:
         port: 9090
 
 ################################################################################
-# Locally configured policy
-# - The PCF in the VPLMN uses locally configured policies
-#   according to the roaming agreement with the HPLMN operator
-#   as input for PCC Rule generation.
+# PCF Policy Configuration: UE Home PLMN and SUPI Range Based Policies
 ################################################################################
 #
-#  o You don't have to use MongoDB if you use the policy configuration as below.
+# This configuration applies policies based on the UE's home PLMN ID and
+# SUPI range. When both supi_range and plmn_id are specified in a policy,
+# the policy is applied only if both conditions are met.
+#
+# supi_range: Specifies one or more ranges of SUPIs. A maximum of 16 ranges
+#             can be defined.
+# plmn_id  : Specifies the UE's home PLMN using MCC and MNC.
+#
+# Example:
 #
 #  policy:
-#    - plmn_id:
+#    - supi_range:          # Filter policies by SUPI
+#        - 999700000000001-999709999999999
+#        - 315010000000001-315010999999999
+#      plmn_id:             # Filter policies by home PLMN-ID
 #        mcc: 999
 #        mnc: 70
-#      slice:
-#        - sst: 1  # 1,2,3,4
+#      slice:               # Specify slice configuration
+#        - sst: 1          # Allowed values: 1, 2, 3, 4
 #          default_indicator: true
-#          session:
+#          session:          # Define session based on DNN
 #            - name: internet
-#              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+#              type: 3       # 1: IPv4, 2: IPv6, 3: IPv4v6
 #              ambr:
 #                downlink:
 #                  value: 1
-#                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+#                  unit: 3   # 0: bps, 1: Kbps, 2: Mbps, 3: Gbps, 4: Tbps
 #                uplink:
 #                  value: 1
 #                  unit: 3
 #              qos:
-#                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+#                index: 9      # Allowed values: 1,2,3,4,65,66,67,75,71,72,
+#                              # 73,74,76,5,6,7,8,9,69,70,79,80,82,83,
+#                              # 84,85,86
 #                arp:
-#                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-#                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-#                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+#                  priority_level: 8   # Allowed values: 1 to 15
+#                  pre_emption_vulnerability: 1  # 1: Disabled, 2: Enabled
+#                  pre_emption_capability: 1     # 1: Disabled, 2: Enabled
 #            - name: ims
-#              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+#              type: 3       # 1: IPv4, 2: IPv6, 3: IPv4v6
 #              ambr:
 #                downlink:
 #                  value: 1
-#                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+#                  unit: 3   # 0: bps, 1: Kbps, 2: Mbps, 3: Gbps, 4: Tbps
 #                uplink:
 #                  value: 1
-#                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+#                  unit: 3
 #              qos:
-#                index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+#                index: 5      # Allowed values: 1,2,3,4,65,66,67,75,71,72,
+#                              # 73,74,76,5,6,7,8,9,69,70,79,80,82,83,
+#                              # 84,85,86
 #                arp:
-#                  priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-#                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-#                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+#                  priority_level: 1   # Allowed values: 1 to 15
+#                  pre_emption_vulnerability: 1  # 1: Disabled, 2: Enabled
+#                  pre_emption_capability: 1     # 1: Disabled, 2: Enabled
 #              pcc_rule:
 #                - qos:
-#                    index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+#                    index: 1   # Allowed values as above
 #                    arp:
-#                      priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-#                      pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
-#                      pre_emption_capability: 1   # 1: Disabled, 2:Enabled
+#                      priority_level: 1   # Allowed values: 1 to 15
+#                      pre_emption_vulnerability: 1  # 1: Disabled, 2: Enabled
+#                      pre_emption_capability: 1     # 1: Disabled, 2: Enabled
 #                    mbr:
 #                      downlink:
 #                        value: 82
-#                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+#                        unit: 1   # 0: bps, 1: Kbps, 2: Mbps, 3: Gbps, 4: Tbps
 #                      uplink:
 #                        value: 82
-#                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+#                        unit: 1
 #                    gbr:
 #                      downlink:
 #                        value: 82
-#                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+#                        unit: 1
 #                      uplink:
 #                        value: 82
-#                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+#                        unit: 1
 #                  flow:
 #                    - direction: 2
 #                      description: "permit out icmp from any to assigned"
@@ -102,89 +114,129 @@ pcf:
 #                    - direction: 1
 #                      description: "permit out udp from 10.200.136.98/32 1-65535 to assigned 50021"
 #                - qos:
-#                    index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+#                    index: 2   # Allowed values as above
 #                    arp:
-#                      priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-#                      pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
-#                      pre_emption_capability: 2   # 1: Disabled, 2:Enabled
+#                      priority_level: 4   # Allowed values: 1 to 15
+#                      pre_emption_vulnerability: 2  # 1: Disabled, 2: Enabled
+#                      pre_emption_capability: 2     # 1: Disabled, 2: Enabled
 #                    mbr:
 #                      downlink:
 #                        value: 802
-#                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+#                        unit: 1
 #                      uplink:
 #                        value: 802
-#                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+#                        unit: 1
 #                    gbr:
 #                      downlink:
 #                        value: 802
-#                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+#                        unit: 1
 #                      uplink:
 #                        value: 802
-#                        unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-#    - plmn_id:
-#        mcc: 001
-#        mnc: 01
-#      slice:
-#        - sst: 1  # 1,2,3,4
+#                        unit: 1
+#
+#    - supi_range:         # Filter policies by SUPI only
+#        - 001010000000001-001019999999999
+#      slice:               # Specify slice configuration
+#        - sst: 1          # Allowed values: 1, 2, 3, 4
 #          sd: 000001
 #          default_indicator: true
-#          session:
+#          session:          # Define session based on DNN
 #            - name: internet
-#              type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
+#              type: 3       # 1: IPv4, 2: IPv6, 3: IPv4v6
 #              ambr:
 #                downlink:
 #                  value: 1
-#                  unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+#                  unit: 3   # 0: bps, 1: Kbps, 2: Mbps, 3: Gbps, 4: Tbps
 #                uplink:
 #                  value: 1
 #                  unit: 3
 #              qos:
-#                index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
+#                index: 9      # Allowed values as above
 #                arp:
-#                  priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-#                  pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-#                  pre_emption_capability: 1  # 1: Disabled, 2:Enabled
+#                  priority_level: 8   # Allowed values: 1 to 15
+#                  pre_emption_vulnerability: 1  # 1: Disabled, 2: Enabled
+#                  pre_emption_capability: 1     # 1: Disabled, 2: Enabled
 #
 ################################################################################
 # SBI Server
 ################################################################################
-#  o Override SBI address to be advertised to NRF
+#  o Bind to the address on the eth0 and advertise as open5gs-pcf.svc.local
 #  sbi:
 #    server:
-#      - dev: eth0
+#      - dev:eth0
 #        advertise: open5gs-pcf.svc.local
 #
+#  o Specify a custom port number 7777 while binding to the given address
 #  sbi:
 #    server:
-#      - address: localhost
-#        advertise:
-#          - 127.0.0.99
-#          - ::1
+#      - address: pcf.localdomain
+#        port: 7777
+#
+#  o Bind to 127.0.0.13 and advertise as open5gs-pcf.svc.local
+#  sbi:
+#    server:
+#      - address: 127.0.0.13
+#        port: 7777
+#        advertise: open5gs-pcf.svc.local
+#
+#  o Bind to port 7777 but advertise with a different port number 8888
+#  sbi:
+#    server:
+#      - address: 127.0.0.13
+#        port: 7777
+#        advertise: open5gs-pcf.svc.local:8888
 #
 ################################################################################
 # SBI Client
 ################################################################################
-#  o Direct communication with NRF interaction
+#  o Direct Communication with NRF
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #
-#  o Indirect communication with delegated discovery
+#  o Indirect Communication by Delegating to SCP
 #  sbi:
 #    client:
 #      scp:
 #        - uri: http://127.0.0.200:7777
 #
-#  o Indirect communication without delegated discovery
+#  o Indirect Communication without Delegation
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #      scp:
 #        - uri: http://127.0.0.200:7777
-#  discovery:
-#    delegated: no
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: no   # Directly communicate NRF discovery
+#        scp:
+#          next: no   # Do not delegate to SCP for next-hop
+#
+#  o Indirect Communication with Delegated Discovery
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: yes  # Delegate discovery to SCP
+#        scp:
+#          next: yes  # Delegate to SCP for next-hop communications
+#
+#  o Default delegation: all communications are delegated to the SCP
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      # No 'delegated' section; defaults to AUTO delegation
 #
 ################################################################################
 # HTTPS scheme with TLS
@@ -206,6 +258,27 @@ pcf:
 #      nrf:
 #        - uri: https://nrf.localdomain
 #
+#  o Enable SSL key logging for Wireshark
+#    - This configuration allows capturing SSL/TLS session keys
+#      for debugging or analysis purposes using Wireshark.
+#  default:
+#    tls:
+#      server:
+#        scheme: https
+#        private_key: @sysconfdir@/open5gs/tls/pcf.key
+#        cert: @sysconfdir@/open5gs/tls/pcf.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/pcf-server-sslkeylog.log
+#      client:
+#        scheme: https
+#        cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        client_sslkeylogfile: @localstatedir@/log/open5gs/tls/pcf-client-sslkeylog.log
+#  sbi:
+#    server:
+#      - address: pcf.localdomain
+#    client:
+#      nrf:
+#        - uri: https://nrf.localdomain
+#
 #  o Add client TLS verification
 #  default:
 #    tls:

configs/open5gs/pcrf.yaml.in

@@ -10,92 +10,125 @@ global:
 #    peer: 64
 pcrf:
   freeDiameter: @sysconfdir@/freeDiameter/pcrf.conf
+  metrics:
+    server:
+      - address: 127.0.0.9
+        port: 9090
 
 ################################################################################
-# Locally configured policy
+# PCRF Policy Configuration: SUPI Range Based Policies
 ################################################################################
 #
-#  o You don't have to use MongoDB if you use the policy configuration as below.
+# This configuration applies policies based solely on the UE's SUPI range.
 #
-#  session:
-#    - name: internet
-#      type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-#      ambr:
-#        downlink:
-#          value: 1
-#          unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-#        uplink:
-#          value: 1
-#          unit: 3
-#      qos:
-#        index: 9  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-#        arp:
-#          priority_level: 8  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-#          pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-#          pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-#    - name: ims
-#      type: 3  # 1:IPv4, 2:IPv6, 3:IPv4v6
-#      ambr:
-#        downlink:
-#          value: 1
-#          unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-#        uplink:
-#          value: 1
-#          unit: 3  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-#      qos:
-#        index: 5  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-#        arp:
-#          priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-#          pre_emption_vulnerability: 1  # 1: Disabled, 2:Enabled
-#          pre_emption_capability: 1  # 1: Disabled, 2:Enabled
-#      pcc_rule:
-#        - qos:
-#            index: 1  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-#            arp:
-#              priority_level: 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-#              pre_emption_vulnerability: 1   # 1: Disabled, 2:Enabled
-#              pre_emption_capability: 1   # 1: Disabled, 2:Enabled
-#            mbr:
-#              downlink:
-#                value: 82
-#                unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-#              uplink:
-#                value: 82
-#                unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-#            gbr:
-#              downlink:
-#                value: 82
-#                unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-#              uplink:
-#                value: 82
-#                unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-#          flow:
-#            - direction: 2
-#              description: "permit out icmp from any to assigned"
-#            - direction: 1
-#              description: "permit out icmp from any to assigned"
-#            - direction: 2
-#              description: "permit out udp from 10.200.136.98/32 23455 to assigned 1-65535"
-#            - direction: 1
-#              description: "permit out udp from 10.200.136.98/32 1-65535 to assigned 50021"
-#        - qos:
-#            index: 2  # 1, 2, 3, 4, 65, 66, 67, 75, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86
-#            arp:
-#              priority_level: 4  # 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-#              pre_emption_vulnerability: 2   # 1: Disabled, 2:Enabled
-#              pre_emption_capability: 2   # 1: Disabled, 2:Enabled
-#            mbr:
-#              downlink:
-#                value: 802
-#                unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-#              uplink:
-#                value: 802
-#                unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-#            gbr:
-#              downlink:
-#                value: 802
-#                unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
-#              uplink:
-#                value: 802
-#                unit: 1  # 0:bps, 1:Kbps, 2:Mbps, 3:Gbps, 4:Tbps
+# supi_range: Specifies one or more ranges of SUPIs.
+# session:   Defines the session configuration for each DNN.
 #
+# Example:
+#
+#  policy:
+#    - supi_range:          # Filter policies by SUPI
+#        - 999700000000001-999709999999999
+#        - 315010000000001-315010999999999
+#      session:              # Define session based on DNN
+#        - name: internet
+#          type: 3         # 1: IPv4, 2: IPv6, 3: IPv4v6
+#          ambr:
+#            downlink:
+#              value: 1
+#              unit: 3     # 0: bps, 1: Kbps, 2: Mbps, 3: Gbps, 4: Tbps
+#            uplink:
+#              value: 1
+#              unit: 3
+#          qos:
+#            index: 9        # Allowed values: 1,2,3,4,65,66,67,75,71,72,
+#                             # 73,74,76,5,6,7,8,9,69,70,79,80,82,83,
+#                             # 84,85,86
+#            arp:
+#              priority_level: 8   # Allowed values: 1 to 15
+#              pre_emption_vulnerability: 1  # 1: Disabled, 2: Enabled
+#              pre_emption_capability: 1     # 1: Disabled, 2: Enabled
+#        - name: ims
+#          type: 3         # 1: IPv4, 2: IPv6, 3: IPv4v6
+#          ambr:
+#            downlink:
+#              value: 1
+#              unit: 3
+#            uplink:
+#              value: 1
+#              unit: 3
+#          qos:
+#            index: 5        # Allowed values as above
+#            arp:
+#              priority_level: 1   # Allowed values: 1 to 15
+#              pre_emption_vulnerability: 1  # 1: Disabled, 2: Enabled
+#              pre_emption_capability: 1     # 1: Disabled, 2: Enabled
+#          pcc_rule:
+#            - qos:
+#                index: 1    # Allowed values as above
+#                arp:
+#                  priority_level: 1
+#                  pre_emption_vulnerability: 1
+#                  pre_emption_capability: 1
+#                mbr:
+#                  downlink:
+#                    value: 82
+#                    unit: 1   # 0: bps, 1: Kbps, 2: Mbps, 3: Gbps, 4: Tbps
+#                  uplink:
+#                    value: 82
+#                    unit: 1
+#                gbr:
+#                  downlink:
+#                    value: 82
+#                    unit: 1
+#                  uplink:
+#                    value: 82
+#                    unit: 1
+#              flow:
+#                - direction: 2
+#                  description: "permit out icmp from any to assigned"
+#                - direction: 1
+#                  description: "permit out icmp from any to assigned"
+#                - direction: 2
+#                  description: "permit out udp from 10.200.136.98/32 23455 to assigned 1-65535"
+#                - direction: 1
+#                  description: "permit out udp from 10.200.136.98/32 1-65535 to assigned 50021"
+#            - qos:
+#                index: 2    # Allowed values as above
+#                arp:
+#                  priority_level: 4   # Allowed values: 1 to 15
+#                  pre_emption_vulnerability: 2  # 1: Disabled, 2: Enabled
+#                  pre_emption_capability: 2     # 1: Disabled, 2: Enabled
+#                mbr:
+#                  downlink:
+#                    value: 802
+#                    unit: 1
+#                  uplink:
+#                    value: 802
+#                    unit: 1
+#                gbr:
+#                  downlink:
+#                    value: 802
+#                    unit: 1
+#                  uplink:
+#                    value: 802
+#                    unit: 1
+#
+#    - supi_range:         # Filter policies by SUPI only
+#        - 001010000000001-001019999999999
+#      session:              # Define session based on DNN
+#        - name: internet
+#          type: 3         # 1: IPv4, 2: IPv6, 3: IPv4v6
+#          ambr:
+#            downlink:
+#              value: 1
+#              unit: 3
+#            uplink:
+#              value: 1
+#              unit: 3
+#          qos:
+#            index: 9        # Allowed values as above
+#            arp:
+#              priority_level: 8   # Allowed values: 1 to 15
+#              pre_emption_vulnerability: 1  # 1: Disabled, 2: Enabled
+#              pre_emption_capability: 1     # 1: Disabled, 2: Enabled

configs/open5gs/scp.yaml.in

@@ -63,28 +63,78 @@ scp:
 ################################################################################
 # SBI Server
 ################################################################################
-#  o Override SBI address to be advertised to NRF
+#  o Bind to the address on the eth0 and advertise as open5gs-scp.svc.local
 #  sbi:
 #    server:
-#      - dev: eth0
+#      - dev:eth0
 #        advertise: open5gs-scp.svc.local
 #
+#  o Specify a custom port number 7777 while binding to the given address
 #  sbi:
 #    server:
-#      - address: localhost
-#        advertise:
-#          - 127.0.0.99
-#          - ::1
+#      - address: scp.localdomain
+#        port: 7777
+#
+#  o Bind to 127.0.0.200 and advertise as open5gs-scp.svc.local
+#  sbi:
+#    server:
+#      - address: 127.0.0.200
+#        port: 7777
+#        advertise: open5gs-scp.svc.local
+#
+#  o Bind to port 7777 but advertise with a different port number 8888
+#  sbi:
+#    server:
+#      - address: 127.0.0.200
+#        port: 7777
+#        advertise: open5gs-scp.svc.local:8888
 #
 ################################################################################
 # SBI Client
 ################################################################################
-#  o Direct communication with NRF interaction
+#  o Direct Communication with NRF
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #
+#  o Indirect Communication by Delegating to Next-SCP
+#  sbi:
+#    client:
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#
+#  o Indirect Communication without Delegation
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      delegated:
+#        scp:
+#          next: no   # Do not delegate to SCP for next-hop
+#
+#  o Indirect Communication with Delegation
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      delegated:
+#        scp:
+#          next: yes  # Delegate to SCP for next-hop communications
+#
+#  o Default delegation: all communications are delegated to the Next-SCP
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      # No 'delegated' section; defaults to AUTO delegation
+#
 ################################################################################
 # HTTPS scheme with TLS
 ################################################################################
@@ -105,6 +155,27 @@ scp:
 #      nrf:
 #        - uri: https://nrf.localdomain
 #
+#  o Enable SSL key logging for Wireshark
+#    - This configuration allows capturing SSL/TLS session keys
+#      for debugging or analysis purposes using Wireshark.
+#  default:
+#    tls:
+#      server:
+#        scheme: https
+#        private_key: @sysconfdir@/open5gs/tls/scp.key
+#        cert: @sysconfdir@/open5gs/tls/scp.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/scp-server-sslkeylog.log
+#      client:
+#        scheme: https
+#        cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        client_sslkeylogfile: @localstatedir@/log/open5gs/tls/scp-client-sslkeylog.log
+#  sbi:
+#    server:
+#      - address: scp.localdomain
+#    client:
+#      nrf:
+#        - uri: https://nrf.localdomain
+#
 #  o Add client TLS verification
 #  default:
 #    tls:

configs/open5gs/sepp1.yaml.in

@@ -148,6 +148,36 @@ sepp:
 #          uri: https://sepp2.localdomain
 #          resolve: 127.0.2.251
 #
+#  o Enable SSL key logging for Wireshark
+#    - This configuration allows capturing SSL/TLS session keys
+#      for debugging or analysis purposes using Wireshark.
+#  default:
+#    tls:
+#      server:
+#        private_key: @sysconfdir@/open5gs/tls/sepp1.key
+#        cert: @sysconfdir@/open5gs/tls/sepp1.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/sepp1-server-sslkeylog.log
+#      client:
+#        cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        client_sslkeylogfile: @localstatedir@/log/open5gs/tls/sepp1-client-sslkeylog.log
+#  sbi:
+#    server:
+#      - address: 127.0.1.250
+#        port: 7777
+#    client:
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#  n32:
+#    server:
+#      - sender: sepp1.localdomain
+#        scheme: https
+#        address: 127.0.1.251
+#    client:
+#      sepp:
+#        - receiver: sepp2.localdomain
+#          uri: https://sepp2.localdomain
+#          resolve: 127.0.2.251
+#
 #  o Add client TLS verification to N32 interface
 #  default:
 #    tls:

configs/open5gs/sepp2.yaml.in

@@ -14,8 +14,10 @@ sepp:
       server:
         private_key: @sysconfdir@/open5gs/tls/sepp2.key
         cert: @sysconfdir@/open5gs/tls/sepp2.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/sepp2-server-sslkeylog.log
       client:
         cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/sepp2-client-sslkeylog.log
   sbi:
     server:
       - address: 127.0.2.250
@@ -148,6 +150,36 @@ sepp:
 #          uri: https://sepp1.localdomain
 #          resolve: 127.0.1.251
 #
+#  o Enable SSL key logging for Wireshark
+#    - This configuration allows capturing SSL/TLS session keys
+#      for debugging or analysis purposes using Wireshark.
+#  default:
+#    tls:
+#      server:
+#        private_key: @sysconfdir@/open5gs/tls/sepp2.key
+#        cert: @sysconfdir@/open5gs/tls/sepp2.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/sepp2-server-sslkeylog.log
+#      client:
+#        cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        client_sslkeylogfile: @localstatedir@/log/open5gs/tls/sepp2-client-sslkeylog.log
+#  sbi:
+#    server:
+#      - address: 127.0.2.250
+#        port: 7777
+#    client:
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#  n32:
+#    server:
+#      - sender: sepp2.localdomain
+#        scheme: https
+#        address: 127.0.2.251
+#    client:
+#      sepp:
+#        - receiver: sepp1.localdomain
+#          uri: https://sepp1.localdomain
+#          resolve: 127.0.1.251
+#
 #  o Add client TLS verification to N32 interface
 #  default:
 #    tls:

configs/open5gs/smf.yaml.in

@@ -186,43 +186,83 @@ smf:
 ################################################################################
 # SBI Server
 ################################################################################
-#  o Override SBI address to be advertised to NRF
+#  o Bind to the address on the eth0 and advertise as open5gs-smf.svc.local
 #  sbi:
 #    server:
-#      - dev: eth0
+#      - dev:eth0
 #        advertise: open5gs-smf.svc.local
 #
+#  o Specify a custom port number 7777 while binding to the given address
 #  sbi:
 #    server:
-#      - address: localhost
-#        advertise:
-#          - 127.0.0.99
-#          - ::1
+#      - address: smf.localdomain
+#        port: 7777
+#
+#  o Bind to 127.0.0.4 and advertise as open5gs-smf.svc.local
+#  sbi:
+#    server:
+#      - address: 127.0.0.4
+#        port: 7777
+#        advertise: open5gs-smf.svc.local
+#
+#  o Bind to port 7777 but advertise with a different port number 8888
+#  sbi:
+#    server:
+#      - address: 127.0.0.4
+#        port: 7777
+#        advertise: open5gs-smf.svc.local:8888
 #
 ################################################################################
 # SBI Client
 ################################################################################
-#  o Direct communication with NRF interaction
+#  o Direct Communication with NRF
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #
-#  o Indirect communication with delegated discovery
+#  o Indirect Communication by Delegating to SCP
 #  sbi:
 #    client:
 #      scp:
 #        - uri: http://127.0.0.200:7777
 #
-#  o Indirect communication without delegated discovery
+#  o Indirect Communication without Delegation
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #      scp:
 #        - uri: http://127.0.0.200:7777
-#  discovery:
-#    delegated: no
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: no   # Directly communicate NRF discovery
+#        scp:
+#          next: no   # Do not delegate to SCP for next-hop
+#
+#  o Indirect Communication with Delegated Discovery
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: yes  # Delegate discovery to SCP
+#        scp:
+#          next: yes  # Delegate to SCP for next-hop communications
+#
+#  o Default delegation: all communications are delegated to the SCP
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      # No 'delegated' section; defaults to AUTO delegation
 #
 ################################################################################
 # HTTPS scheme with TLS
@@ -244,6 +284,27 @@ smf:
 #      nrf:
 #        - uri: https://nrf.localdomain
 #
+#  o Enable SSL key logging for Wireshark
+#    - This configuration allows capturing SSL/TLS session keys
+#      for debugging or analysis purposes using Wireshark.
+#  default:
+#    tls:
+#      server:
+#        scheme: https
+#        private_key: @sysconfdir@/open5gs/tls/smf.key
+#        cert: @sysconfdir@/open5gs/tls/smf.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/smf-server-sslkeylog.log
+#      client:
+#        scheme: https
+#        cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        client_sslkeylogfile: @localstatedir@/log/open5gs/tls/smf-client-sslkeylog.log
+#  sbi:
+#    server:
+#      - address: smf.localdomain
+#    client:
+#      nrf:
+#        - uri: https://nrf.localdomain
+#
 #  o Add client TLS verification
 #  default:
 #    tls:

configs/open5gs/udm.yaml.in

@@ -38,7 +38,6 @@ udm:
       scp:
         - uri: http://127.0.0.200:7777
 
-#
 ################################################################################
 # Home Network Public Key
 ################################################################################
@@ -82,43 +81,83 @@ udm:
 ################################################################################
 # SBI Server
 ################################################################################
-#  o Override SBI address to be advertised to NRF
+#  o Bind to the address on the eth0 and advertise as open5gs-udm.svc.local
 #  sbi:
 #    server:
-#      - dev: eth0
+#      - dev:eth0
 #        advertise: open5gs-udm.svc.local
 #
+#  o Specify a custom port number 7777 while binding to the given address
 #  sbi:
 #    server:
-#      - address: localhost
-#        advertise:
-#          - 127.0.0.99
-#          - ::1
+#      - address: udm.localdomain
+#        port: 7777
+#
+#  o Bind to 127.0.0.12 and advertise as open5gs-udm.svc.local
+#  sbi:
+#    server:
+#      - address: 127.0.0.12
+#        port: 7777
+#        advertise: open5gs-udm.svc.local
+#
+#  o Bind to port 7777 but advertise with a different port number 8888
+#  sbi:
+#    server:
+#      - address: 127.0.0.12
+#        port: 7777
+#        advertise: open5gs-udm.svc.local:8888
 #
 ################################################################################
 # SBI Client
 ################################################################################
-#  o Direct communication with NRF interaction
+#  o Direct Communication with NRF
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #
-#  o Indirect communication with delegated discovery
+#  o Indirect Communication by Delegating to SCP
 #  sbi:
 #    client:
 #      scp:
 #        - uri: http://127.0.0.200:7777
 #
-#  o Indirect communication without delegated discovery
+#  o Indirect Communication without Delegation
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #      scp:
 #        - uri: http://127.0.0.200:7777
-#  discovery:
-#    delegated: no
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: no   # Directly communicate NRF discovery
+#        scp:
+#          next: no   # Do not delegate to SCP for next-hop
+#
+#  o Indirect Communication with Delegated Discovery
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: yes  # Delegate discovery to SCP
+#        scp:
+#          next: yes  # Delegate to SCP for next-hop communications
+#
+#  o Default delegation: all communications are delegated to the SCP
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      # No 'delegated' section; defaults to AUTO delegation
 #
 ################################################################################
 # HTTPS scheme with TLS
@@ -140,6 +179,27 @@ udm:
 #      nrf:
 #        - uri: https://nrf.localdomain
 #
+#  o Enable SSL key logging for Wireshark
+#    - This configuration allows capturing SSL/TLS session keys
+#      for debugging or analysis purposes using Wireshark.
+#  default:
+#    tls:
+#      server:
+#        scheme: https
+#        private_key: @sysconfdir@/open5gs/tls/udm.key
+#        cert: @sysconfdir@/open5gs/tls/udm.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/udm-server-sslkeylog.log
+#      client:
+#        scheme: https
+#        cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        client_sslkeylogfile: @localstatedir@/log/open5gs/tls/udm-client-sslkeylog.log
+#  sbi:
+#    server:
+#      - address: udm.localdomain
+#    client:
+#      nrf:
+#        - uri: https://nrf.localdomain
+#
 #  o Add client TLS verification
 #  default:
 #    tls:

configs/open5gs/udr.yaml.in

@@ -23,43 +23,83 @@ udr:
 ################################################################################
 # SBI Server
 ################################################################################
-#  o Override SBI address to be advertised to NRF
+#  o Bind to the address on the eth0 and advertise as open5gs-udr.svc.local
 #  sbi:
 #    server:
-#      - dev: eth0
+#      - dev:eth0
 #        advertise: open5gs-udr.svc.local
 #
+#  o Specify a custom port number 7777 while binding to the given address
 #  sbi:
 #    server:
-#      - address: localhost
-#        advertise:
-#          - 127.0.0.99
-#          - ::1
+#      - address: udr.localdomain
+#        port: 7777
+#
+#  o Bind to 127.0.0.20 and advertise as open5gs-udr.svc.local
+#  sbi:
+#    server:
+#      - address: 127.0.0.20
+#        port: 7777
+#        advertise: open5gs-udr.svc.local
+#
+#  o Bind to port 7777 but advertise with a different port number 8888
+#  sbi:
+#    server:
+#      - address: 127.0.0.20
+#        port: 7777
+#        advertise: open5gs-udr.svc.local:8888
 #
 ################################################################################
 # SBI Client
 ################################################################################
-#  o Direct communication with NRF interaction
+#  o Direct Communication with NRF
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #
-#  o Indirect communication with delegated discovery
+#  o Indirect Communication by Delegating to SCP
 #  sbi:
 #    client:
 #      scp:
 #        - uri: http://127.0.0.200:7777
 #
-#  o Indirect communication without delegated discovery
+#  o Indirect Communication without Delegation
 #  sbi:
 #    client:
 #      nrf:
 #        - uri: http://127.0.0.10:7777
 #      scp:
 #        - uri: http://127.0.0.200:7777
-#  discovery:
-#    delegated: no
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: no   # Directly communicate NRF discovery
+#        scp:
+#          next: no   # Do not delegate to SCP for next-hop
+#
+#  o Indirect Communication with Delegated Discovery
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      delegated:
+#        nrf:
+#          nfm: no    # Directly communicate NRF management functions
+#          disc: yes  # Delegate discovery to SCP
+#        scp:
+#          next: yes  # Delegate to SCP for next-hop communications
+#
+#  o Default delegation: all communications are delegated to the SCP
+#  sbi:
+#    client:
+#      nrf:
+#        - uri: http://127.0.0.10:7777
+#      scp:
+#        - uri: http://127.0.0.200:7777
+#      # No 'delegated' section; defaults to AUTO delegation
 #
 ################################################################################
 # HTTPS scheme with TLS
@@ -81,6 +121,27 @@ udr:
 #      nrf:
 #        - uri: https://nrf.localdomain
 #
+#  o Enable SSL key logging for Wireshark
+#    - This configuration allows capturing SSL/TLS session keys
+#      for debugging or analysis purposes using Wireshark.
+#  default:
+#    tls:
+#      server:
+#        scheme: https
+#        private_key: @sysconfdir@/open5gs/tls/udr.key
+#        cert: @sysconfdir@/open5gs/tls/udr.crt
+#        sslkeylogfile: @localstatedir@/log/open5gs/tls/udr-server-sslkeylog.log
+#      client:
+#        scheme: https
+#        cacert: @sysconfdir@/open5gs/tls/ca.crt
+#        client_sslkeylogfile: @localstatedir@/log/open5gs/tls/udr-client-sslkeylog.log
+#  sbi:
+#    server:
+#      - address: udr.localdomain
+#    client:
+#      nrf:
+#        - uri: https://nrf.localdomain
+#
 #  o Add client TLS verification
 #  default:
 #    tls:

configs/srsenb.yaml.in

@@ -67,7 +67,7 @@ mme:
   tai:
     - plmn_id:
         mcc: 901
-       mnc: 70
+        mnc: 70
       tac: 7
   security:
     integrity_order : [ EIA2, EIA1, EIA0 ]

configs/transfer-error-case.yaml.in

@@ -0,0 +1,266 @@
+db_uri: mongodb://localhost/open5gs
+
+logger:
+
+test:
+  serving:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+
+global:
+  parameter:
+#    no_nrf: true
+    no_scp: true
+    no_sepp: 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
+
+smf:
+  sbi:
+    server:
+      - address: 127.0.0.4
+        port: 7777
+    client:
+      nrf:
+        - uri: http://127.0.0.10:7777
+  pfcp:
+    server:
+      - address: 127.0.0.4
+    client:
+      upf:
+        - address: 127.0.0.7
+  gtpc:
+    server:
+      - address: 127.0.0.4
+  gtpu:
+    server:
+      - address: 127.0.0.4
+  metrics:
+    server:
+      - address: 127.0.0.4
+        port: 9090
+  session:
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
+  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: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: pcrf.localdomain
+        address: 127.0.0.9
+
+amf:
+  sbi:
+    server:
+      - address: 127.0.0.5
+        port: 7777
+    client:
+      nrf:
+        - uri: http://127.0.0.10:7777
+  ngap:
+    server:
+      - address: 127.0.0.5
+  metrics:
+    server:
+      - address: 127.0.0.5
+        port: 9090
+  guami:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+      amf_id:
+        region: 2
+        set: 1
+        pointer: 31
+  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
+  time:
+    t3512:
+      value: 540     # 9 mintues * 60 = 540 seconds
+
+# amf #2
+amf:
+  sbi:
+    server:
+      - address: 127.0.0.50
+        port: 7777
+    client:
+      nrf:
+        - uri: http://127.0.0.10:7777
+  ngap:
+    server:
+      - address: 127.0.0.50
+  metrics:
+    server:
+      - address: 127.0.0.50
+        port: 9090
+  guami:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+      amf_id:
+        region: 2
+        set: 1
+        pointer: 30
+  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-amf1
+  time:
+    t3512:
+      value: 540     # 9 mintues * 60 = 540 seconds
+
+upf:
+  pfcp:
+    server:
+      - address: 127.0.0.7
+  gtpu:
+    server:
+      - address: 127.0.0.7
+  session:
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
+  metrics:
+    server:
+      - address: 127.0.0.7
+        port: 9090
+
+nrf:
+  sbi:
+    server:
+      - address: 127.0.0.10
+        port: 7777
+  serving:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+
+ausf:
+  sbi:
+    server:
+      - address: 127.0.0.11
+        port: 7777
+    client:
+      nrf:
+        - uri: http://127.0.0.10:7777
+
+udm:
+  hnet:
+    - id: 1
+      scheme: 1
+      key: @build_configs_dir@/open5gs/hnet/curve25519-1.key
+    - id: 2
+      scheme: 2
+      key: @build_configs_dir@/open5gs/hnet/secp256r1-2.key
+  sbi:
+    server:
+      - address: 127.0.0.12
+        port: 7777
+    client:
+      nrf:
+        - uri: http://127.0.0.10:7777
+
+pcf:
+  sbi:
+    server:
+      - address: 127.0.0.13
+        port: 7777
+    client:
+      nrf:
+        - uri: http://127.0.0.10:7777
+  metrics:
+    server:
+      - address: 127.0.0.13
+        port: 9090
+
+nssf:
+  sbi:
+    server:
+      - address: 127.0.0.14
+        port: 7777
+    client:
+      nrf:
+        - uri: http://127.0.0.10:7777
+      nsi:
+        - uri: http://127.0.0.10:7777
+          s_nssai:
+            sst: 1
+bsf:
+  sbi:
+    server:
+      - address: 127.0.0.15
+        port: 7777
+    client:
+      nrf:
+        - uri: http://127.0.0.10:7777
+
+udr:
+  sbi:
+    server:
+      - address: 127.0.0.20
+        port: 7777
+    client:
+      nrf:
+        - uri: http://127.0.0.10:7777

configs/transfer.yaml.in

@@ -0,0 +1,271 @@
+db_uri: mongodb://localhost/open5gs
+
+logger:
+
+test:
+  serving:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+
+global:
+  parameter:
+#    no_nrf: true
+#    no_scp: true
+    no_sepp: 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
+
+smf:
+  sbi:
+    server:
+      - address: 127.0.0.4
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+  pfcp:
+    server:
+      - address: 127.0.0.4
+    client:
+      upf:
+        - address: 127.0.0.7
+  gtpc:
+    server:
+      - address: 127.0.0.4
+  gtpu:
+    server:
+      - address: 127.0.0.4
+  metrics:
+    server:
+      - address: 127.0.0.4
+        port: 9090
+  session:
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
+  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: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+        conf: 0x8888
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+    connect:
+      - identity: pcrf.localdomain
+        address: 127.0.0.9
+
+amf:
+  sbi:
+    server:
+      - address: 127.0.0.5
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+  ngap:
+    server:
+      - address: 127.0.0.5
+  metrics:
+    server:
+      - address: 127.0.0.5
+        port: 9090
+  guami:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+      amf_id:
+        region: 2
+        set: 1
+        pointer: 31
+  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
+  time:
+    t3512:
+      value: 540     # 9 mintues * 60 = 540 seconds
+
+# amf #2
+amf:
+  sbi:
+    server:
+      - address: 127.0.0.50
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+  ngap:
+    server:
+      - address: 127.0.0.50
+  metrics:
+    server:
+      - address: 127.0.0.50
+        port: 9090
+  guami:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+      amf_id:
+        region: 2
+        set: 1
+        pointer: 30
+  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-amf1
+  time:
+    t3512:
+      value: 540     # 9 mintues * 60 = 540 seconds
+
+upf:
+  pfcp:
+    server:
+      - address: 127.0.0.7
+  gtpu:
+    server:
+      - address: 127.0.0.7
+  session:
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
+  metrics:
+    server:
+      - address: 127.0.0.7
+        port: 9090
+
+nrf:
+  sbi:
+    server:
+      - address: 127.0.0.10
+        port: 7777
+
+scp:
+  sbi:
+    server:
+      - address: 127.0.0.200
+        port: 7777
+    client:
+      nrf:
+        - uri: http://127.0.0.10:7777
+
+ausf:
+  sbi:
+    server:
+      - address: 127.0.0.11
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+
+udm:
+  hnet:
+    - id: 1
+      scheme: 1
+      key: @build_configs_dir@/open5gs/hnet/curve25519-1.key
+    - id: 2
+      scheme: 2
+      key: @build_configs_dir@/open5gs/hnet/secp256r1-2.key
+  sbi:
+    server:
+      - address: 127.0.0.12
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+
+pcf:
+  sbi:
+    server:
+      - address: 127.0.0.13
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+  metrics:
+    server:
+      - address: 127.0.0.13
+        port: 9090
+
+nssf:
+  sbi:
+    server:
+      - address: 127.0.0.14
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+      nsi:
+        - uri: http://127.0.0.10:7777
+          s_nssai:
+            sst: 1
+bsf:
+  sbi:
+    server:
+      - address: 127.0.0.15
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777
+
+udr:
+  sbi:
+    server:
+      - address: 127.0.0.20
+        port: 7777
+    client:
+      scp:
+        - uri: http://127.0.0.200:7777

debian/changelog

@@ -1,3 +1,81 @@
+open5gs (2.7.6) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 10:02:38 +0900
+
+open5gs (2.7.6~plucky) plucky; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 09:59:50 +0900
+
+open5gs (2.7.6~oracular) oracular; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 09:57:14 +0900
+
+open5gs (2.7.6~noble) noble; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 09:55:32 +0900
+
+open5gs (2.7.6~jammy) jammy; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 09:53:39 +0900
+
+open5gs (2.7.6~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 09:51:57 +0900
+
+open5gs (2.7.6~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 09:49:35 +0900
+
+open5gs (2.7.5) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 30 Mar 2025 22:01:17 +0900
+
+open5gs (2.7.5~oracular) oracular; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 30 Mar 2025 22:00:22 +0900
+
+open5gs (2.7.5~noble) noble; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 30 Mar 2025 21:59:27 +0900
+
+open5gs (2.7.5~jammy) jammy; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 30 Mar 2025 21:58:02 +0900
+
+open5gs (2.7.5~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 30 Mar 2025 21:56:59 +0900
+
+open5gs (2.7.5~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 30 Mar 2025 21:55:48 +0900
+
 open5gs (2.7.2) unstable; urgency=medium
 
   * Bug Fixed

debian/control

@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 11),
                libgnutls28-dev,
                libgcrypt-dev,
                libssl-dev,
-               libidn11-dev,
+               libidn-dev | libidn11-dev,
                libmongoc-dev,
                libbson-dev,
                libsctp-dev,

debian/open5gs-common.dirs

@@ -1 +1 @@
-var/log/open5gs
+var/log/open5gs/tls

docker/debian/latest/base/Dockerfile

@@ -22,7 +22,6 @@ RUN apt-get update && \
         libgnutls28-dev \
         libgcrypt-dev \
         libssl-dev \
-        libidn11-dev \
         libmongoc-dev \
         libbson-dev \
         libyaml-dev \
@@ -35,4 +34,9 @@ RUN apt-get update && \
         ca-certificates \
         netbase \
         pkg-config && \
-    apt-get clean
+    if apt-cache show libidn-dev > /dev/null 2>&1; then \
+        apt-get install -y --no-install-recommends libidn-dev; \
+    else \
+        apt-get install -y --no-install-recommends libidn11-dev; \
+    fi && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*

docker/ubuntu/latest/base/Dockerfile

@@ -22,7 +22,6 @@ RUN apt-get update && \
         libgnutls28-dev \
         libgcrypt-dev \
         libssl-dev \
-        libidn11-dev \
         libmongoc-dev \
         libbson-dev \
         libyaml-dev \
@@ -35,4 +34,9 @@ RUN apt-get update && \
         ca-certificates \
         netbase \
         pkg-config && \
-    apt-get clean
+    if apt-cache show libidn-dev > /dev/null 2>&1; then \
+        apt-get install -y --no-install-recommends libidn-dev; \
+    else \
+        apt-get install -y --no-install-recommends libidn11-dev; \
+    fi && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*

docs/_config.yml

@@ -26,6 +26,9 @@ google_analytics: G-12MQZTB3JH
 
 # Build settings
 markdown: kramdown
+kramdown:
+  parse_block_html: true
+
 plugins:
   - jekyll-feed
   - jekyll-seo-tag

docs/_docs/guide/01-quickstart.md

@@ -80,14 +80,14 @@ Import the public key used by the package management system.
 ```bash
 $ sudo apt update
 $ sudo apt install gnupg
-$ curl -fsSL https://pgp.mongodb.com/server-6.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-6.0.gpg --dearmor
+$ curl -fsSL https://pgp.mongodb.com/server-8.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-8.0.gpg --dearmor
 ```
 
-Create the list file /etc/apt/sources.list.d/mongodb-org-6.0.list for your version of Ubuntu.
+Create the list file /etc/apt/sources.list.d/mongodb-org-8.0.list for your version of Ubuntu.
 
 On ubuntu 22.04 (Jammy)
 ```bash
-$ echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-6.0.gpg] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
+$ echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-8.0.gpg] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/8.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-8.0.list
 ```
 
 Install the MongoDB packages.

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

@@ -18,14 +18,14 @@ Import the public key used by the package management system.
 ```bash
 $ sudo apt update
 $ sudo apt install gnupg
-$ curl -fsSL https://pgp.mongodb.com/server-6.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-6.0.gpg --dearmor
+$ curl -fsSL https://pgp.mongodb.com/server-8.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-8.0.gpg --dearmor
 ```
 
-Create the list file /etc/apt/sources.list.d/mongodb-org-6.0.list for your version of Ubuntu.
+Create the list file /etc/apt/sources.list.d/mongodb-org-8.0.list for your version of Ubuntu.
 
 On ubuntu 22.04 (Jammy)
 ```bash
-$ echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-6.0.gpg] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
+$ echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-8.0.gpg] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/8.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-8.0.list
 ```
 
 Install the MongoDB packages.
@@ -58,10 +58,19 @@ $ sudo ip link set ogstun up
 ### Building Open5GS
 ---
 
-Install the dependencies for building the source code.
+Install the common dependencies for building the source code.
 
 ```bash
-$ sudo apt install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git cmake 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
+$ sudo apt install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git cmake libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev libmongoc-dev libbson-dev libyaml-dev libnghttp2-dev libmicrohttpd-dev libcurl4-gnutls-dev libnghttp2-dev libtins-dev libtalloc-dev meson
+```
+
+Install libidn-dev or libidn11-dev depending on your system
+```bash
+$ if apt-cache show libidn-dev > /dev/null 2>&1; then
+    sudo apt-get install -y --no-install-recommends libidn-dev
+else
+    sudo apt-get install -y --no-install-recommends libidn11-dev
+fi
 ```
 
 Git clone.
@@ -447,7 +456,7 @@ $ cp open5gs* /usr/bin/
 For convenience, you can execute all NFs at once by using the following command.
 ```bash
 $ ./build/tests/app/5gc ## 5G Core Only with ./build/configs/sample.yaml
-$ ./build/tests/app/epc -c ./build/configs/srslte.yaml ## EPC Only with ./build/configs/srslte.yaml
+$ ./build/tests/app/epc -c ./build/configs/srsenb.yaml ## EPC Only with ./build/configs/srsenb.yaml
 $ ./build/tests/app/app ## Both 5G Core and EPC with ./build/configs/sample.yaml
 ```
 

docs/_docs/hardware/01-genodebs.md

@@ -19,12 +19,15 @@ If you have tested radio hardware from a vendor not listed with Open5GS, please
  * 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 Baseband 6648/6651 IRU 8848 Dots 4475 (N78, N1,N3) 
  * Ericsson StreetMacro 6701 (21.Q3 Software) (5G mmWave, n261) (Baseband 6318 and AIR 1281 packaged together)
- * Huawei BTS5900
+ * Huawei BTS5900 V100R019C10SPC220 (N78, N28)
  * 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)
+ * MOSO Networks Canopy 5GID1 Indoor 2T2R (5G n48 n78)
+ * ZTE ITBBU ITRAN-PNF V5.65.20.20F10 (n78, n1, n3) 
 
 ### Commercial 4G
 ---
@@ -42,10 +45,12 @@ If you have tested radio hardware from a vendor not listed with Open5GS, please
  * Baicells Nova 436Q
  * Baicells Nova 227 (EBS & CBRS)
  * Baicells Nova 233
- * Ericsson Baseband 6630 (21Q1 Software)
+ * Baicells Nova 430i (band 48/CBRS, SW version BaiBLQ_3.0.12)
+ * Ericsson Baseband 6630/6648/6651 (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)
+ * Gemtek WLTGFC-105 (band 3, SW version 2.1.2277.1720-wltgfc105-gemtek-fdd)
  * Huawei BTS3900 (S/W version V100R011C10SPC230)
  * Huawei BBU5900 with RRU5304W Band 7 FDD 2600Mhz 40W Version V100R016C10
  * Klas VoyagerCell Duo 4GAP1000/4GAP1000X
@@ -55,7 +60,11 @@ If you have tested radio hardware from a vendor not listed with Open5GS, please
  * Nokia FW2FA Flexi Zone Mini-Macro Outdoor BTS, 2x20w Band 39
  * Nokia FWGR Flexi Zone Mini-Macro Outdoor BTS, 2x20w Band 1
  * Nokia FWHG Flexi Zone Indoor Pico BTS, 2x250 mW Band 7
+ * Nokia FW2HHD Flexi Zone Multiband Indoor Pico BTS, Band 38/41(S/W TLS18SP_ENB)
+ * Mikrotik Intercell B1+B3 IC322GC-b1D+b3D
  * Ruckus Q710 and Q910
+ * Sercomm SCE4255W "Englewood" (band 48/CBRS, SW version DG3934v3@2308041842)
+ * ZTE ITBBU ITRAN-PNF V5.65.20.20F10
 
 ### 4G/5G Software Stacks + SDRs
 ---
@@ -63,9 +72,11 @@ If you have tested radio hardware from a vendor not listed with Open5GS, please
  * [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)
+ * [srsRAN_Project](https://github.com/srsran/srsRAN_Project) 5G O-RAN CU/DU based on USRP SDR.
 
 ### 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
+ * [PacketRusher](https://github.com/HewlettPackard/PacketRusher) 5G performance testing and validation tool

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

@@ -1356,7 +1356,7 @@ $ DIST=debian TAG=stretch docker-compose run dev
 ```bash
 $ sudo dpkg --add-architecture armel
 $ sudo apt update
-$ sudo apt install libsctp-dev:armel libyaml-dev:armel libgnutls28-dev:armel libgcrypt-dev:armel libidn11-dev:armel libssl-dev:armel libmongoc-dev:armel libbson-dev:armel
+$ sudo apt install libsctp-dev:armel libyaml-dev:armel libgnutls28-dev:armel libgcrypt-dev:armel libidn-dev:armel libssl-dev:armel libmongoc-dev:armel libbson-dev:armel
 $ sudo apt install crossbuild-essential-armel
 $ sudo apt install qemu
 $ git clone https://github.com/{{ site.github_username }}/open5gs

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

@@ -165,8 +165,8 @@ $ make test
 The Open5GS package is available on the recent versions of *Ubuntu*.
 ```bash
 # Install the MongoDB Packages
-$ curl -fsSL https://pgp.mongodb.com/server-6.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-6.0.gpg --dearmor
-$ echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-6.0.gpg] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
+$ curl -fsSL https://pgp.mongodb.com/server-8.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-8.0.gpg --dearmor
+$ echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-8.0.gpg] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/8.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-8.0.list
 $ sudo apt update
 $ sudo apt install mongodb-org
 

docs/_docs/tutorial/06-Open5GS-with-5G-Sharp-Orchestrator.md

@@ -0,0 +1,478 @@
+---
+title: Open5GS with 5G Sharp Orchestrator
+---
+
+This tutorial is a guide to configure the tool 5G Sharp Orchestrator with Open5GS. 
+
+5G Sharp Orchestrator is a tool that serves as a comprehensive wrapper for configuring, deploying and monitoring 5G open-source network components, simplifying the orchestration process. 
+
+For more information on 5G Sharp Orchestrator please visit: https://github.com/Ethon-Shield/5g-sharp-orchestrator
+
+![Basic Execution Example](https://raw.githubusercontent.com/Ethon-Shield/5g-sharp-orchestrator/9eddaf0c19d8333708271f1e3d6348735e32ae90/images/basic_execution_example.png)
+
+
+# Usage
+
+To correctly execute the 5G Sharp Orchestrator with Open5GS you will need to:
+
+**0. Install prerequisites**
+**1. Configure the project**
+**2. Check the configuration is valid**
+**3. Execute the tool**
+
+This tutorial has been described with the following setup:
+- Physical machine: 
+  - i7 processor
+  - Ubuntu 22.04 LTS
+  - User "test"
+  - Connectivity - Offline
+  - Open5GS cloned and compiled in /home/test/open5gs
+  - srsRAN cloned and compiled in /home/test/srsRAN_Project
+- Network parameters:
+  - MCC: 001
+  - MNC: 01
+  - TAC: 1
+- SDR device:
+  - Ettus B200 mini
+
+## 0. Install prerequisites
+
+To be able to use the 5G Sharp Orchestrator tool, you will need to meet the following prerequisites. 
+
+<details>
+<summary><strong>Software prerequisites</strong></summary>
+
+This project needs certain binaries to be installed.
+
+- The project has been successfully tested with **Ubuntu 22.04** 
+- UHD built from source (https://files.ettus.com/manual/page_build_guide.html)
+- docker **version 19.03.0 or higher** (https://docs.docker.com/engine/install/ubuntu/)
+```
+# User going to be used should be in the docker group
+sudo usermod -aG docker <user>
+newgrp docker
+```
+- docker-compose **version 1.29.2 or higher** (https://docs.docker.com/compose/install/linux/)
+- tmux **version 3.5a** (https://github.com/tmux/tmux/releases)
+
+```bash
+wget https://github.com/tmux/tmux/releases/download/3.5a/tmux-3.5a.tar.gz
+tar -zxf tmux-3.5a.tar.gz
+cd tmux-3.5a
+./configure
+make
+sudo make install
+```
+
+- wireshark, tshark, expect
+
+```bash
+sudo add-apt-repository ppa:wireshark-dev/stable
+sudo apt update
+sudo apt install wireshark tshark expect
+```
+
+</details>
+<details>
+<summary><strong>Install Open5GS Core</strong></summary>
+
+Official documentation: https://open5gs.org/open5gs/docs/guide/02-building-open5gs-from-sources/
+
+To work with Open5GS core, it is recommended to build the project from source.
+
+**1. Getting MongoDB**
+
+- Install GNU Privacy Guard tool:
+
+```
+sudo apt update
+sudo apt install gnupg
+```
+
+- Import the public key used by the package management system:
+
+```
+curl -fsSL https://pgp.mongodb.com/server-7.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg --dearmor
+
+echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-7.0.list
+```
+
+- Install the MongoDB packages:
+```
+sudo apt update
+sudo apt install -y mongodb-org
+```
+
+**NOTE**: MongoDB service needs to be running in order to execute the project. This can be done using the command ``sudo systemctl start mongod ``
+
+**2. Building Open5GS**
+
+Install the required dependencies:
+
+```
+sudo apt install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git cmake 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
+```
+Clone the official project repository:
+```
+git clone https://github.com/open5gs/open5gs
+```
+Compile with <i>meson</i> and build with <i>ninja</i>:
+```
+cd open5gs/ meson build --prefix=`pwd`/install
+ninja -C build
+```
+Check wether the compilation is correct:
+```
+ ./build/tests/registration/registration
+```
+Run all test programs:
+```
+cd build
+sudo meson test -v
+```
+Perform the installation process:
+```
+cd build
+ninja install
+cd ../
+```
+</details>
+
+<details>
+<summary><strong>Install srsRAN gNB</strong></summary>
+
+Official documentation: https://docs.srsran.com/projects/project/en/latest/user_manuals/source/installation.html
+
+**1. Installing build tools and dependencies**
+
+The required build tools and dependencies for the project can be installed in Ubuntu using the following command:
+```
+sudo apt-get install cmake make gcc g++ pkg-config libfftw3-dev libmbedtls-dev libsctp-dev libyaml-cpp-dev libgtest-devg
+```
+
+**2. Clone and build**
+
+Clone the project repository:
+```
+git clone https://github.com/srsRAN/srsRAN_Project.git
+```
+
+Build the code-base:
+```
+cd srsRAN_Project
+mkdir build
+cd build
+cmake ../
+make -j $(nproc)
+make test -j $(nproc)
+sudo make install
+```
+</details>
+
+<details>
+<summary><strong>Hardware prerequisites</strong></summary>
+
+
+- USRP devices.
+- USB 3.0 port to connect the SDR.
+- It is recommended to at least have an i7 processor.
+
+</details>
+
+
+## 1. Configuring the project
+
+Once the prerequisites have been fullfilled, the next step is to setup the 5G Sharp Orchestrator. First of all, clone the repository:
+
+```
+cd ~/
+git clone https://github.com/Ethon-Shield/5g-sharp-orchestrator.git
+```
+
+To configure the 5G Sharp Orchestrator with Open5GS you will need to modify the corresponding parameters in the file `./conf/sharp-orchestrator.src` .  In this file you will be able to set different network parameters such as the MCC, MNC or TAC, encryption and integrity alogrithms, as well as defining the file paths of the corresponding binaries. 
+
+The following variables are set based on the example setup described at the start of the tutorial. 
+
+**SHARP ORCHESTRATOR**:
+- **SHARP_ORCHESTRATOR_IP_ADDRESS**=127.0.0.1
+- **SHARP_ORCHESTRATOR_USERNAME**="test"
+- **SHARP_ORCHESTRATOR_WORKING_DIR**="/home/test/5g-sharp-orhcestrator/"
+
+**GENERAL**:
+
+- **MCC**=001
+- **MNC**=01
+- **TAC**=1
+- **DEBUG**="false"
+- **DNS_IP_ADDRESS**="8.8.8.8"
+- **DEPLOY_NRCORE_ONLY**="false"
+- **BACKUP_DIR_PREFIX**=""
+
+**NRCORE**:
+
+- **NRCORE_TECH**=OPEN5GS
+- **INT_ALGO_PRIORITY_LIST**=NIA1,NIA2,NIA0
+- **CIPH_ALGO_PRIORITY_LIST**=NEA1,NEA2,NEA0
+- **NRCORE_OPEN5GS_WD**="/home/test/open5gs"
+
+**GNB**:
+
+- **GNB_TECH**=SRS
+- **GNB_IP_ADDRESS**=127.0.0.1
+- **GNB_USERNAME**="test"
+- **GNB_WORKING_DIR**="/home/test/Desktop/gnb"
+- **ARFCN**="641280"
+- **SRS_GNB_BIN**="/home/test/srsRAN_Project/build/apps/gnb/gnb"
+- **BAND**="78"
+- **CHANNEL_BW**="20"
+- **SCS**="15"
+
+### SUDOERS file 
+
+It will be necessary to modify /etc/.sudoers file (via visudo for example) in order to be able to execute certain commands that need root privileges:
+
+```bash
+test ALL=(ALL) NOPASSWD: \
+/usr/bin/kill -9 *, \
+/usr/bin/chown -R * /tmp, \
+/usr/bin/chown -R * /logs, \
+/usr/sbin/ip tuntap add name ogstun mode tun, \
+/usr/sbin/ip addr del 10.45.0.1/16 dev ogstun, \
+/usr/sbin/ip addr add 10.45.0.1/16 dev ogstun, \
+/usr/sbin/ip addr del 2001\:db8\:cafe\:\:1/48 dev ogstun, \
+/usr/sbin/ip addr add 2001\:db8\:cafe\:\:1/48 dev ogstun, \
+/usr/sbin/ip link set ogstun up, \
+/usr/sbin/sysctl net.ipv4.conf.all.forwarding=1, \ 
+/usr/sbin/iptables -P FORWARD ACCEPT, \
+/usr/sbin/iptables -S, \
+/usr/sbin/ip route del *, \
+/usr/sbin/ip route add *, \
+/usr/bin/unbuffer *, \
+/usr/bin/kill -9 * 
+```
+
+### SSH KEYS
+
+Furthermore, although in this example setup we are only using one physical machine, the nodes will talk to each other via ssh. Consequently, it is important to store the public ssh key of the corresponding user. 
+
+1. Generate ssh key pair: `ssh-key-gen -t rsa`
+2. Copy public pair into remote machine (in this example setup - localhost): `ssh-copy-id -i ~/.ssh/id_rsa.pub test@127.0.0.1`
+
+
+## 2. Checking the configuation is valid
+
+Once the project has been configured accordingly, check if it has been correctly configured executing the next script: `./bin/check_conf.sh`. All checks should have a **YES**.
+
+<details>
+    <summary><strong> Example output </strong></summary>
+
+```
+##################################
+Checking basic variables
+##################################
+BASIC variables are OK
+
+##################################
+Checking necessary binaries
+##################################
+tshark ... YES
+expect ... YES
+tmux ... YES
+uhd_find_devices ... YES
+uhd_usrp_probe ... YES
+open5gs-nrfd ... YES
+open5gs-scpd ... YES
+open5gs-amfd ... YES
+open5gs-smfd ... YES
+open5gs-upfd ... YES
+open5gs-ausfd ... YES
+open5gs-udmd ... YES
+open5gs-pcfd ... YES
+open5gs-nssfd ... YES
+open5gs-bsfd ... YES
+open5gs-udrd ... YES
+
+##################################
+Checking CORE IP address, username and working dir
+##################################
+
+CORE IP ADDRESS ... YES
+CORE USERNAME ... YES
+CORE WORKING DIR ... YES
+
+Checking if open5gs services are active 
+
+MongoDB is running ... YES
+
+##################################
+Checking SSH connections
+##################################
+
+CORE --> GNB ... YES
+GNB --> CORE ... YES
+
+##################################
+Checking necessary repositories & binaries
+##################################
+
+OPEN5GS CORE
+        /home/test/open5gs/ directory ... YES 
+     NOTES:
+       - /home/test/open5gs/ in TAG v2.7.2-65-g6d80d4322
+gNB
+     SRS gnb bin ... YES 
+
+##################################
+Checking sudoers file
+##################################
+
+NOPASSWD in ORCH & CORE for test for command /usr/bin/kill -9 \* ... YES
+NOPASSWD in ORCH & CORE for test for command /usr/bin/chown -R \* /tmp ... YES
+NOPASSWD in ORCH & CORE for test for command /usr/bin/chown -R \* /logs ... YES
+NOPASSWD in ORCH & CORE for test for command /usr/sbin/ip tuntap add name ogstun mode tun ... YES
+NOPASSWD in ORCH & CORE for test for command /usr/sbin/ip addr del 10.45.0.1/16 dev ogstun ... YES
+NOPASSWD in ORCH & CORE for test for command /usr/sbin/ip addr add 10.45.0.1/16 dev ogstun ... YES
+NOPASSWD in ORCH & CORE for test for command /usr/sbin/ip addr del 2001\:db8\:cafe\:\:1/48 dev ogstun ... YES
+NOPASSWD in ORCH & CORE for test for command /usr/sbin/ip addr add 2001\:db8\:cafe\:\:1/48 dev ogstun ... YES
+NOPASSWD in ORCH & CORE for test for command /usr/sbin/ip link set ogstun up ... YES
+NOPASSWD in ORCH & CORE for test for command /usr/sbin/sysctl net.ipv4.conf.all.forwarding\=1 ... YES
+NOPASSWD in ORCH & CORE for test for command /usr/sbin/iptables -P FORWARD ACCEPT ... YES
+NOPASSWD in ORCH & CORE for test for command /usr/sbin/iptables -S ... YES
+NOPASSWD in GNB for test for command /usr/sbin/ip route del \* in GNB ... YES
+NOPASSWD in GNB for test for command /usr/sbin/ip route add \* in GNB ... YES
+NOPASSWD in GNB for test for command /usr/bin/unbuffer \* in GNB ... YES
+NOPASSWD in GNB for test for command /usr/bin/kill -9 \* in GNB ... YES
+
+##################################
+Checking sharp-orchestrator.src parameters
+##################################
+
+MCC 001 ... YES
+MNC 01 ... YES
+DEBUG false ... YES
+DEPLOY_NRCORE_ONLY false ... YES
+DNS_IP_ADDRESS 8.8.8.8 ... YES
+AMF_IP_ADDRESS 127.0.0.100 ... YES
+SHARP_ORCHESTRATOR_IP_ADDRESS 127.0.0.1 ... YES
+NRCORE_IP_ADDRESS 127.0.0.1 ... YES
+GNB_IP_ADDRESS 127.0.0.1 ... YES
+
+##################################
+Checking gNB directory
+##################################
+
+GNB directory ... YES
+```
+
+</details>
+
+## 3. Executing the tool
+
+After checking the configuration file and setting every paramater correctly, you will be able to start the orchestration process. 
+
+##### STARTING THE ORCHESTRATOR APP
+
+To start the orchestrator app execute the following command:
+```bash
+./tui.sh
+```
+
+You will have an interactive menu to perform all the needed actions.
+
+![Main Menu](https://raw.githubusercontent.com/Ethon-Shield/5g-sharp-orchestrator/9eddaf0c19d8333708271f1e3d6348735e32ae90/images/MAINMENU.png)
+
+##### STARTING THE NETWORK
+
+Choose the "Start network" option in the interactive menu --> "1"
+
+##### STOPPING THE NETWORK
+
+Choose the "Stop network" option in the interactive menu --> "2"
+
+##### UPDATE GNB PARAMETERS ON REAL-TIME
+
+Some parameters in the gNB can be updated on real-time. This is done to prevent the undeployment of the core network and slowing the whole process. 
+
+The current supported parameters for the srs gNB to be updated are:
+- ARFCN 
+- BAND 
+- CHANNEL_BW 
+- SCS
+
+Choose the "Change network parameters" option in the interactive menu --> "3"
+
+This will show a sub menu with the different options:
+- Setting the different parameters
+- Updating them 
+
+![Submenu Update Parameters](https://raw.githubusercontent.com/Ethon-Shield/5g-sharp-orchestrator/9eddaf0c19d8333708271f1e3d6348735e32ae90/images/SUBMENU_update_parameters.png)
+
+Before updating any parameter, you need to set the value. For that, choose the corresponding "set" option and the value to set will be asked.
+The new set value will appear in the menu, as it is shown in the images below
+
+![Submenu Update Parameters Set ARFCN](https://raw.githubusercontent.com/Ethon-Shield/5g-sharp-orchestrator/9eddaf0c19d8333708271f1e3d6348735e32ae90/images/SUBMENU_update_parameters_set_arfcn.png)
+
+
+![Submenu Update Parameters ARFCN Set](https://raw.githubusercontent.com/Ethon-Shield/5g-sharp-orchestrator/9eddaf0c19d8333708271f1e3d6348735e32ae90/images/SUBMENU_update_parameters_arfcn_setted.png)
+
+
+After setting all the values you want to update, choose the "Update parameters" option in the interactive menu for the changes to take place.
+This action will stop the running gNB instance and start a new one with the updated parameters. 
+Any error in the gNB execution due to invalid parameters selection will be prompted in the log screen.
+
+
+##### BACKING UP FILES DURING EXECUTION
+
+Stopping the network will automatically perform a backup. This options is used if you want to perform a backup during the execution without stopping the network. 
+The backup will be saved in the sharp-orchestrator/backups directory.
+
+Making a backup will save the following files: 
+```
+├── logs -> DIR that includes all the logs from the network nodes
+├── pcaps -> DIR that includes all the pcaps from the network nodes
+├── conf -> DIR that includes the latest configuration files of the network nodes
+└── sharp_orchestrator.log -> Orchestration log
+```
+
+Choose the "Make backup" option in the interactive menu --> "4"
+
+##### MANAGE SUBSCRIBERS IN DATABASE
+
+To be able to connect subscribers to the deployed network they need to be provisioned in the corresponding databases. 
+
+Choose the "Edit Database" option in the interactive menu --> "5"
+
+This will show a sub menu with the different options:
+- Setting the different parameters (IMSI, KI, OPC)
+- Adding a subscriber to the database - needed parameters: IMSI, KI, OPC
+- Updating a subscriber in the database - needed parameters: IMSI, KI, OPC
+- Removing a subscriber from the database - needed parameters: IMSI
+
+![Submenu Edit Database](https://raw.githubusercontent.com/Ethon-Shield/5g-sharp-orchestrator/9eddaf0c19d8333708271f1e3d6348735e32ae90/images/SUBMENU_edit_database.png)
+
+
+Before performing an action to a subscriber, you need to add the required information. For that set the different parameters.
+
+The next image shows an example of setting the IMSI:
+
+![Submenu Edit Database Set IMSI](https://raw.githubusercontent.com/Ethon-Shield/5g-sharp-orchestrator/9eddaf0c19d8333708271f1e3d6348735e32ae90/images/SUBMENU_edit_database_set_imsi.png)
+
+
+After setting the IMSI, you would be able to remove it from the database, by chossing the option "Remove subscriber from the database" --> 6
+
+![Submenu Edit Database Remove Subscriber](https://raw.githubusercontent.com/Ethon-Shield/5g-sharp-orchestrator/9eddaf0c19d8333708271f1e3d6348735e32ae90/images/SUBMENU_edit_database_remove_subscriber.png)
+
+
+</details>
+
+# More configuration options
+
+- If you only want to deploy the Open5GS nrcore network without the radio node, set the DEPLOY_NRCORE_ONLY variable to "true"
+
+
+# Viewing PCAP files
+
+- Go to Analyze --> Enabled Protocols --> check the box mac_nr and mac_nr_udp
+- Sometimes, when debugging the PCAP files, the traffic is encrypted using EEA0. To view this traffic, in Wireshark go to Edit -> Preferences -> Protocols -> NAS-5GS -> check box "Try to detect and decode 5G-EA0 ciphered message"
+
+

docs/_pages/docs.md

@@ -20,7 +20,7 @@ head_inline: "<style> ul { padding-bottom: 1em; } </style>"
 
 - In the lab
   - [A Demonstration of 30 Gbps Load Testing for Accelerated UPF with Open5gs](https://nextepc.com/technology)
-  - [Measurement of UPF Performance](https://github.com/s5uishida/simple_measurement_of_upf_performance)
+  - [Measurement of UPF Performance](https://github.com/s5uishida/sample_config_misc_for_mobile_network#performance_measurement)
 
 - Troubleshooting
   - [Simple Issues](troubleshoot/01-simple-issues)
@@ -43,12 +43,14 @@ head_inline: "<style> ul { padding-bottom: 1em; } </style>"
   - [SMF Code Explanation](https://medium.com/@aditya.koranga/open5gs-smf-code-explanation-with-flow-charts-a3b3cd38c991)
 
 - @infinitydon
+  - [OAI's O-RAN Integration With Open5gs 5G Core](https://futuredon.medium.com/integrating-disaggregated-openairinterface-o-ran-components-with-open5gs-5g-core-76e5deac1730)
   - [Open5GS on Amazon Elastic Kubernetes Service](https://aws.amazon.com/blogs/opensource/open-source-mobile-core-network-implementation-on-amazon-elastic-kubernetes-service/)
   - [Kubernetes Open5GS Deployment](https://dev.to/infinitydon/virtual-4g-simulation-using-kubernetes-and-gns3-3b7k?fbclid=IwAR1p99h13a-mCfejanbBQe0H0-jp5grXkn5mWf1WrTHf47UtegB2-UHGGZQ)
   - [5G Core SBI mTLS Using External Certificate PKI](https://futuredon.medium.com/5g-core-sbi-mtls-using-external-certificate-pki-4ffc02ac7728)
   - [5G Frame Routing](https://futuredon.medium.com/5g-frame-routing-6e34d8587123)
   - [5G SCTP LoadBalancer Using LoxiLB](https://futuredon.medium.com/5g-sctp-loadbalancer-using-loxilb-b525198a9103)([Video Link](https://youtu.be/k3ICc7MXcC8))
   - [5G Roaming With Mutual TLS](https://futuredon.medium.com/5g-roaming-with-mutual-tls-1468d109129c)
+  - [Building a Cloud-Native 5G Roaming Architecture with Open5GS](https://futuredon.medium.com/building-a-cloud-native-5g-roaming-architecture-with-open5gs-cert-manager-and-openbao-supporting-08168a937ddc)
 
 - @nickvsnetworking
   - [My first 5G Core : Open5GS and UERANSIM](http://nickvsnetworking.com/my-first-5g-core-open5gs-and-ueransim/)

docs/_pages/support.md

@@ -5,18 +5,18 @@ subject: Support
 permalink: /support/
 ---
 
-###### Updated Sep, 2022
+Open5GS receives strong and ongoing support from [NewPlane Inc.](https://newplane.io), which proudly backs the project and contributes to its continuous development and success.
 
-### Open5GS Licensing
+### Licensing Options:
 
-Open5GS is licensed under a dual licensing model designed to meet the development and distribution needs of both commercial and open source projects.
+- **Commercial License**: Available for those who wish to develop and distribute their software without adhering to open-source license requirements. This option allows for full utilization of Open5GS capabilities and involves a strategic partnership with NewPlane. For more information, reach out to NewPlane at
+[sales@newplane.io](mailto:sales@newplane.io).
 
-The commercial Open5GS license gives you the full rights to create and distribute software on your own terms without any open source license obligations. You can grow with Open5GS by establishing a close strategic relationship with [NeoPlane](https://neoplane.io).
+- **AGPL-3.0 License**: Ideal for open-source projects, academic research, and internal use where compliance with AGPL-3.0 is feasible. This license supports the open-source ethos and is suitable for a wide range of uses. If you have concerns about AGPL compliance, consider the commercial licensing option instead.
 
+### Support and Customization:
 
-Open5GS is also available under AGPL-3.0 open source licenses. The Open5GS open source licensing is ideal for use cases such as open source projects with open source distribution, student/academic purposes, hobby projects, internal research projects without external distribution, or other projects where all AGPL-3.0 obligations can be met.
-
-If your legal department has policies regarding use of software licensed under the AGPL, you may prefer to have a commercial license. Contact [Sukchan Lee \<sales@neoplane.io\>](mailto:sales@neoplane.io) for more information on commercial licenses.
+NewPlane offers comprehensive support and customization services to enhance your experience with Open5GS. Their team is equipped to assist with troubleshooting, address specific issues, and implement customized solutions. For support and customization inquiries, please contact NewPlane at [support@newplane.io](mailto:support@newplane.io).
 
 ### Our Partners
 

docs/_posts/2024-08-04-release-v2.7.2.md

@@ -0,0 +1,15 @@
+---
+title: "v2.7.2 - ogs_pool_cycle() removed"
+date: 2024-08-04 21:13:00 +0900
+categories:
+  - Release
+tags:
+  - News
+  - Release
+head_inline: "<style> ul { padding-bottom: 1em; } .blue { color: blue; }</style>"
+---
+
+See [Release Note](https://github.com/open5gs/open5gs/releases/tag/v2.7.2)
+
+Download -- [v2.7.2.tar.gz](https://github.com/open5gs/open5gs/archive/v2.7.2.tar.gz)
+{: .notice--info}

docs/_posts/2025-03-30-release-v2.7.5.md

@@ -0,0 +1,50 @@
+---
+title: "v2.7.5 - Bug fixed"
+date: 2025-03-30 22:05:00 +0900
+categories:
+  - Release
+tags:
+  - News
+  - Release
+head_inline: "<style> ul { padding-bottom: 1em; } .blue { color: blue; }</style>"
+---
+
+# Open5GS Release Note Summary
+
+This release introduces numerous improvements and bug fixes across core network components, enhancing overall stability, performance, and security. Below is a concise overview of the key updates:
+
+## Session & Subscription Management
+- **SMF Enhancements:**
+  Improved handling of SDM subscriptions to UDM during the PDU session lifetime.
+- **Optional PLMN-ID:**
+  Added support for an optional PLMN-ID parameter in SDM GET queries (AMF/SMF).
+- **5GMM Cause Reporting:**
+  AMF now sends a 5GMM cause in the request to SMF when initiating a session release.
+
+## Mobility & Authentication Improvements
+- **Mobility Fixes:**
+  Corrected QoS values for 2G to 4G mobility and fixed issues with UE context release and cell reselection.
+- **Security & Authentication:**
+  Enhanced UE authentication processes, prevented crashes during security mode command failures, and implemented HSS selection improvements.
+
+## Interface & Protocol Enhancements
+- **Diameter & PFCP:**
+  - Integrated statistics into the main loop for Diameter interfaces, with enhanced debug logging for HSS and PCRF.
+  - Addressed multiple PFCP issues, including memory management, header handling, and correct TEID restoration.
+- **NAS Module:**
+  Fixed a heap-buffer overflow vulnerability in NAS message decoding.
+
+## SBI and Other Module Updates
+- **SBI Enhancements:**
+  Enabled custom User-Agent header information for HTTP/2 requests, support for custom port numbers, and direct NRF communication.
+- **Additional Fixes:**
+  - Resolved UE context handling issues during handovers and state transitions.
+  - Implemented various cosmetic fixes, typo corrections, and documentation updates.
+  - Introduced support for new parameters and refined subscription conditions.
+
+Overall, this release emphasizes improved network reliability, enhanced security measures, and better support for 5G core operations while also addressing legacy issues.
+
+See [Release Note](https://github.com/open5gs/open5gs/releases/tag/v2.7.5)
+
+Download -- [v2.7.5.tar.gz](https://github.com/open5gs/open5gs/archive/v2.7.5.tar.gz)
+{: .notice--info}

docs/_posts/2025-07-19-release-v2.7.6.md

@@ -0,0 +1,15 @@
+---
+title: "v2.7.6 - Bug fixed"
+date: 2025-07-19 22:05:00 +0900
+categories:
+  - Release
+tags:
+  - News
+  - Release
+head_inline: "<style> ul { padding-bottom: 1em; } .blue { color: blue; }</style>"
+---
+
+See [Release Note](https://github.com/open5gs/open5gs/releases/tag/v2.7.6)
+
+Download -- [v2.7.6.tar.gz](https://github.com/open5gs/open5gs/archive/v2.7.6.tar.gz)
+{: .notice--info}

lib/app/ogs-config.c

@@ -60,8 +60,8 @@ void ogs_app_config_final(void)
 
 static void recalculate_pool_size(void)
 {
-    ogs_app()->pool.packet =
-        global_conf.max.ue * OGS_MAX_NUM_OF_PACKET_BUFFER;
+    ogs_app()->pool.gtpu =
+        global_conf.max.ue * OGS_MAX_NUM_OF_GTPU_BUFFER;
 
 #define MAX_NUM_OF_TUNNEL       3   /* Num of Tunnel per Bearer */
     ogs_app()->pool.sess = global_conf.max.ue * OGS_MAX_NUM_OF_SESS;
@@ -105,7 +105,7 @@ ogs_app_local_conf_t *ogs_local_conf(void)
     return &local_conf;
 }
 
-static int global_conf_prepare(void)
+int ogs_app_global_conf_prepare(void)
 {
     global_conf.sockopt.no_delay = true;
 
@@ -134,6 +134,30 @@ static int global_conf_validation(void)
     return OGS_OK;
 }
 
+int ogs_app_count_nf_conf_sections(const char *conf_section)
+{
+    if (!strcmp(conf_section, "amf"))
+        global_conf.parameter.amf_count++;
+    else if (!strcmp(conf_section, "smf"))
+        global_conf.parameter.smf_count++;
+    else if (!strcmp(conf_section, "upf"))
+        global_conf.parameter.upf_count++;
+    else if (!strcmp(conf_section, "ausf"))
+        global_conf.parameter.ausf_count++;
+    else if (!strcmp(conf_section, "udm"))
+        global_conf.parameter.udm_count++;
+    else if (!strcmp(conf_section, "pcf"))
+        global_conf.parameter.pcf_count++;
+    else if (!strcmp(conf_section, "nssf"))
+        global_conf.parameter.nssf_count++;
+    else if (!strcmp(conf_section, "bsf"))
+        global_conf.parameter.bsf_count++;
+    else if (!strcmp(conf_section, "udr"))
+        global_conf.parameter.udr_count++;
+
+    return OGS_OK;
+}
+
 int ogs_app_parse_global_conf(ogs_yaml_iter_t *parent)
 {
     int rv;
@@ -141,9 +165,6 @@ int ogs_app_parse_global_conf(ogs_yaml_iter_t *parent)
 
     ogs_assert(parent);
 
-    rv = global_conf_prepare();
-    if (rv != OGS_OK) return rv;
-
     ogs_yaml_iter_recurse(parent, &global_iter);
     while (ogs_yaml_iter_next(&global_iter)) {
         const char *global_key = ogs_yaml_iter_key(&global_iter);
@@ -226,6 +247,12 @@ int ogs_app_parse_global_conf(ogs_yaml_iter_t *parent)
                 } else if (!strcmp(parameter_key, "use_openair")) {
                     global_conf.parameter.use_openair =
                         ogs_yaml_iter_bool(&parameter_iter);
+                } else if (!strcmp(parameter_key, "use_upg_vpp")) {
+                    global_conf.parameter.use_upg_vpp =
+                        ogs_yaml_iter_bool(&parameter_iter);
+                } else if (!strcmp(parameter_key, "fake_csfb")) {
+                    global_conf.parameter.fake_csfb =
+                        ogs_yaml_iter_bool(&parameter_iter);
                 } else if (!strcmp(parameter_key,
                             "no_ipv4v6_local_addr_in_packet_filter")) {
                     global_conf.parameter.
@@ -459,6 +486,7 @@ int ogs_app_parse_local_conf(const char *local)
     int rv;
     yaml_document_t *document = NULL;
     ogs_yaml_iter_t root_iter;
+    int idx = 0;
 
     document = ogs_app()->document;
     ogs_assert(document);
@@ -470,7 +498,8 @@ int ogs_app_parse_local_conf(const char *local)
     while (ogs_yaml_iter_next(&root_iter)) {
         const char *root_key = ogs_yaml_iter_key(&root_iter);
         ogs_assert(root_key);
-        if (!strcmp(root_key, local)) {
+        if (!strcmp(root_key, local) &&
+            (idx++ == ogs_app()->config_section_id)) {
             ogs_yaml_iter_t local_iter;
             ogs_yaml_iter_recurse(&root_iter, &local_iter);
             while (ogs_yaml_iter_next(&local_iter)) {
@@ -724,9 +753,83 @@ int ogs_app_parse_sockopt_config(
     return OGS_OK;
 }
 
+/*----------------------------------------------------------------------
+ * Function: ogs_app_parse_supi_range_conf
+ *
+ *   Parse the supi_range configuration from a YAML iterator.
+ *
+ *   The expected YAML format is:
+ *
+ *     supi_range:
+ *       - 999700000000001-999700000099999
+ *       - 310789000000005-310789000000888
+ *
+ *   Both start and end must be provided.
+ *
+ * Returns:
+ *   OGS_OK on success, OGS_ERROR on failure.
+ *----------------------------------------------------------------------*/
+int ogs_app_parse_supi_range_conf(
+        ogs_yaml_iter_t *parent, ogs_supi_range_t *supi_range)
+{
+    ogs_yaml_iter_t range_iter;
+
+    ogs_assert(parent);
+    ogs_assert(supi_range);
+
+    memset(supi_range, 0, sizeof(ogs_supi_range_t));
+
+    /* Recurse into the supi_range array node */
+    ogs_yaml_iter_recurse(parent, &range_iter);
+    ogs_assert(ogs_yaml_iter_type(&range_iter) != YAML_MAPPING_NODE);
+
+    do {
+        char *v = NULL;
+        char *start_str = NULL, *end_str = NULL;
+
+        if (ogs_yaml_iter_type(&range_iter) == YAML_SEQUENCE_NODE) {
+            if (!ogs_yaml_iter_next(&range_iter))
+                break;
+        }
+
+        v = (char *)ogs_yaml_iter_value(&range_iter);
+
+        if (v) {
+            ogs_assert(supi_range->num < OGS_MAX_NUM_OF_SUPI_RANGE);
+
+            /* Split the string on '-' */
+            start_str = strsep(&v, "-");
+            if (start_str == NULL || strlen(start_str) == 0) {
+                ogs_error("Invalid supi_range starter bound: %s", v);
+                return OGS_ERROR;
+            }
+
+            end_str = v;
+            if (end_str == NULL || strlen(end_str) == 0) {
+                ogs_error("Invalid supi_range upper bound: %s", v);
+                return OGS_ERROR;
+            }
+
+            supi_range->start[supi_range->num] =
+                ogs_uint64_from_string_decimal(start_str);
+            supi_range->end[supi_range->num] =
+                ogs_uint64_from_string_decimal(end_str);
+
+            supi_range->num++;
+        }
+
+    } while (ogs_yaml_iter_type(&range_iter) == YAML_SEQUENCE_NODE);
+
+    return OGS_OK;
+}
+
 static int parse_br_conf(ogs_yaml_iter_t *parent, ogs_bitrate_t *br)
 {
     ogs_yaml_iter_t br_iter;
+
+    ogs_assert(parent);
+    ogs_assert(br);
+
     ogs_yaml_iter_recurse(parent, &br_iter);
 
     while (ogs_yaml_iter_next(&br_iter)) {
@@ -1162,11 +1265,12 @@ int ogs_app_parse_session_conf(
     return OGS_OK;
 }
 
-ogs_app_policy_conf_t *ogs_app_policy_conf_add(ogs_plmn_id_t *plmn_id)
+ogs_app_policy_conf_t *ogs_app_policy_conf_add(
+        ogs_supi_range_t *supi_range, ogs_plmn_id_t *plmn_id)
 {
     ogs_app_policy_conf_t *policy_conf = NULL;
 
-    ogs_assert(plmn_id);
+    ogs_assert(supi_range || plmn_id);
 
     ogs_pool_alloc(&policy_conf_pool, &policy_conf);
     if (!policy_conf) {
@@ -1176,7 +1280,25 @@ ogs_app_policy_conf_t *ogs_app_policy_conf_add(ogs_plmn_id_t *plmn_id)
     }
     memset(policy_conf, 0, sizeof *policy_conf);
 
-    memcpy(&policy_conf->plmn_id, plmn_id, sizeof(ogs_plmn_id_t));
+    if (supi_range) {
+        int i;
+
+        memcpy(&policy_conf->supi_range, supi_range, sizeof(ogs_supi_range_t));
+
+        ogs_info("SUPI[%d]", policy_conf->supi_range.num);
+        for (i = 0; i < policy_conf->supi_range.num; i++)
+            ogs_info("    START[%lld]-END[%lld]",
+                    (long long)policy_conf->supi_range.start[i],
+                    (long long)policy_conf->supi_range.end[i]);
+
+    }
+    if (plmn_id) {
+        policy_conf->plmn_id_valid = true;
+        memcpy(&policy_conf->plmn_id, plmn_id, sizeof(ogs_plmn_id_t));
+        ogs_info("PLMN_ID[MCC:%03d.MNC:%03d]",
+                ogs_plmn_id_mcc(&policy_conf->plmn_id),
+                ogs_plmn_id_mnc(&policy_conf->plmn_id));
+    }
 
     ogs_list_init(&policy_conf->slice_list);
 
@@ -1187,19 +1309,60 @@ ogs_app_policy_conf_t *ogs_app_policy_conf_add(ogs_plmn_id_t *plmn_id)
     return policy_conf;
 }
 
-ogs_app_policy_conf_t *ogs_app_policy_conf_find_by_plmn_id(
-        ogs_plmn_id_t *plmn_id)
+ogs_app_policy_conf_t *ogs_app_policy_conf_find(
+        const char *supi, const ogs_plmn_id_t *plmn_id)
 {
-    ogs_app_policy_conf_t *policy_conf = NULL;
+    ogs_app_policy_conf_t *policy_conf;
+    int i;
 
-    ogs_assert(plmn_id);
+    char *supi_type = NULL;
+    char *supi_id = NULL;
+    uint64_t supi_decimal;
+
+    ogs_assert(supi);
+
+    supi_type = ogs_id_get_type(supi);
+    ogs_assert(supi_type);
+    supi_id = ogs_id_get_value(supi);
+    ogs_assert(supi_id);
+
+    supi_decimal = ogs_uint64_from_string_decimal(supi_id);
+
+    ogs_free(supi_type);
+    ogs_free(supi_id);
 
     ogs_list_for_each(&local_conf.policy_list, policy_conf) {
-        if (memcmp(&policy_conf->plmn_id, plmn_id, sizeof(ogs_plmn_id_t)) == 0)
-            break;
+        /* If supi_range is set, check if supi_decimal falls within
+         * any of the defined ranges.
+         */
+        if (policy_conf->supi_range.num > 0) {
+            int in_range = 0;
+            for (i = 0; i < policy_conf->supi_range.num; i++) {
+                if ((supi_decimal >= policy_conf->supi_range.start[i]) &&
+                    (supi_decimal <= policy_conf->supi_range.end[i])) {
+                    in_range = 1;
+                    break;
+                }
+            }
+            if (!in_range) {
+                continue;
+            }
+        }
+
+        /* If a plmn_id is set and it does not match the
+         * current policy's plmn_id, skip this policy.
+         */
+        if (policy_conf->plmn_id_valid &&
+            memcmp(&policy_conf->plmn_id, plmn_id,
+                   sizeof(ogs_plmn_id_t)) != 0) {
+            continue;
+        }
+
+        /* Both conditions met; return this policy configuration */
+        return policy_conf;
     }
 
-    return policy_conf;
+    return NULL;
 }
 void ogs_app_policy_conf_remove(ogs_app_policy_conf_t *policy_conf)
 {
@@ -1223,13 +1386,12 @@ void ogs_app_policy_conf_remove_all(void)
 }
 
 ogs_app_slice_conf_t *ogs_app_slice_conf_add(
-        ogs_app_policy_conf_t *policy_conf, ogs_s_nssai_t *s_nssai)
+        ogs_app_policy_conf_t *policy_conf, const ogs_s_nssai_t *s_nssai)
 {
     ogs_app_slice_conf_t *slice_conf = NULL;
 
     ogs_assert(policy_conf);
     ogs_assert(s_nssai);
-    ogs_assert(s_nssai->sst);
 
     ogs_pool_alloc(&slice_conf_pool, &slice_conf);
     if (!slice_conf) {
@@ -1254,13 +1416,12 @@ ogs_app_slice_conf_t *ogs_app_slice_conf_add(
 }
 
 ogs_app_slice_conf_t *ogs_app_slice_conf_find_by_s_nssai(
-        ogs_app_policy_conf_t *policy_conf, ogs_s_nssai_t *s_nssai)
+        ogs_app_policy_conf_t *policy_conf, const ogs_s_nssai_t *s_nssai)
 {
     ogs_app_slice_conf_t *slice_conf = NULL;
 
     ogs_assert(policy_conf);
     ogs_assert(s_nssai);
-    ogs_assert(s_nssai->sst);
 
     ogs_list_for_each(&policy_conf->slice_list, slice_conf) {
         if (slice_conf->data.s_nssai.sst == s_nssai->sst &&
@@ -1325,7 +1486,7 @@ int ogs_app_check_policy_conf(void)
 }
 
 ogs_app_session_conf_t *ogs_app_session_conf_add(
-        ogs_app_slice_conf_t *slice_conf, char *name)
+        ogs_app_slice_conf_t *slice_conf, const char *name)
 {
     ogs_app_session_conf_t *session_conf = NULL;
 
@@ -1357,7 +1518,7 @@ ogs_app_session_conf_t *ogs_app_session_conf_add(
     return session_conf;
 }
 ogs_app_session_conf_t *ogs_app_session_conf_find_by_dnn(
-        ogs_app_slice_conf_t *slice_conf, char *name)
+        ogs_app_slice_conf_t *slice_conf, const char *name)
 {
     ogs_app_session_conf_t *session_conf = NULL;
 
@@ -1400,29 +1561,27 @@ void ogs_app_session_conf_remove_all(ogs_app_slice_conf_t *slice_conf)
 }
 
 int ogs_app_config_session_data(
-        ogs_plmn_id_t *plmn_id, ogs_s_nssai_t *s_nssai, char *dnn,
+        const char *supi, const ogs_plmn_id_t *plmn_id,
+        const ogs_s_nssai_t *s_nssai, const char *dnn,
         ogs_session_data_t *session_data)
 {
     ogs_app_policy_conf_t *policy_conf = NULL;
     ogs_app_slice_conf_t *slice_conf = NULL;
     ogs_app_session_conf_t *session_conf = NULL;
 
+    ogs_assert(supi);
     ogs_assert(dnn);
     ogs_assert(session_data);
 
-    if (plmn_id) {
-        policy_conf = ogs_app_policy_conf_find_by_plmn_id(plmn_id);
-        if (!policy_conf) {
-            ogs_error("No POLICY [MCC:%03d,MNC:%03d]",
-                    ogs_plmn_id_mcc(plmn_id), ogs_plmn_id_mnc(plmn_id));
-            return OGS_ERROR;
-        }
-    } else {
-        policy_conf = ogs_list_first(&ogs_local_conf()->policy_list);
-        if (!policy_conf) {
-            ogs_error("No default POLICY for EPC");
-            return OGS_ERROR;
-        }
+    policy_conf = ogs_app_policy_conf_find(supi, plmn_id);
+    if (!policy_conf) {
+        if (plmn_id)
+            ogs_error("No POLICY [SUPI:%s] [MCC:%03d,MNC:%03d]",
+                    supi, ogs_plmn_id_mcc(plmn_id), ogs_plmn_id_mnc(plmn_id));
+        else
+            ogs_error("No POLICY [SUPI:%s]", supi);
+
+        return OGS_ERROR;
     }
 
     if (s_nssai) {

lib/app/ogs-config.h

@@ -52,6 +52,16 @@ typedef struct ogs_global_conf_s {
         int no_scp;
         int no_nrf;
 
+        int amf_count;
+        int smf_count;
+        int upf_count;
+        int ausf_count;
+        int udm_count;
+        int pcf_count;
+        int nssf_count;
+        int bsf_count;
+        int udr_count;
+
         /* Network */
         int no_ipv4;
         int no_ipv6;
@@ -59,6 +69,8 @@ typedef struct ogs_global_conf_s {
         int multicast;
 
         int use_openair;
+        int fake_csfb;
+        int use_upg_vpp;
         int no_ipv4v6_local_addr_in_packet_filter;
 
         int no_pfcp_rr_select;
@@ -132,9 +144,24 @@ typedef struct ogs_local_conf_s {
 
 } ogs_app_local_conf_t;
 
+/* Structure for SUPI-range */
+typedef struct {
+    int num;
+#define OGS_MAX_NUM_OF_SUPI_RANGE 16
+    uint64_t start[OGS_MAX_NUM_OF_SUPI_RANGE];
+    uint64_t end[OGS_MAX_NUM_OF_SUPI_RANGE];
+} ogs_supi_range_t;
+
+
+/* Policy configuration structure.  In a real system, additional fields
+ * (e.g., for plmn_id, slice list, etc.) would be added.
+ */
 typedef struct ogs_app_policy_conf_s {
     ogs_lnode_t lnode;
 
+    ogs_supi_range_t supi_range;
+
+    bool plmn_id_valid;
     ogs_plmn_id_t plmn_id;
 
     ogs_list_t slice_list;
@@ -163,39 +190,46 @@ void ogs_app_config_final(void);
 ogs_app_global_conf_t *ogs_global_conf(void);
 ogs_app_local_conf_t *ogs_local_conf(void);
 
+int ogs_app_count_nf_conf_sections(const char *conf_section);
+int ogs_app_global_conf_prepare(void);
 int ogs_app_parse_global_conf(ogs_yaml_iter_t *parent);
 int ogs_app_parse_local_conf(const char *local);
 
 int ogs_app_parse_sockopt_config(
         ogs_yaml_iter_t *parent, ogs_sockopt_t *option);
 
+int ogs_app_parse_supi_range_conf(
+        ogs_yaml_iter_t *parent, ogs_supi_range_t *supi_range);
+
 int ogs_app_check_policy_conf(void);
 int ogs_app_parse_session_conf(
         ogs_yaml_iter_t *parent, ogs_app_slice_conf_t *slice_conf);
 
-ogs_app_policy_conf_t *ogs_app_policy_conf_add(ogs_plmn_id_t *plmn_id);
-ogs_app_policy_conf_t *ogs_app_policy_conf_find_by_plmn_id(
-        ogs_plmn_id_t *plmn_id);
+ogs_app_policy_conf_t *ogs_app_policy_conf_add(
+        ogs_supi_range_t *supi_range, ogs_plmn_id_t *plmn_id);
+ogs_app_policy_conf_t *ogs_app_policy_conf_find(
+        const char *supi, const ogs_plmn_id_t *plmn_id);
 void ogs_app_policy_conf_remove(ogs_app_policy_conf_t *policy_conf);
 void ogs_app_policy_conf_remove_all(void);
 
 ogs_app_slice_conf_t *ogs_app_slice_conf_add(
-        ogs_app_policy_conf_t *policy_conf, ogs_s_nssai_t *s_nssai);
+        ogs_app_policy_conf_t *policy_conf, const ogs_s_nssai_t *s_nssai);
 ogs_app_slice_conf_t *ogs_app_slice_conf_find_by_s_nssai(
-        ogs_app_policy_conf_t *policy_conf, ogs_s_nssai_t *s_nssai);
+        ogs_app_policy_conf_t *policy_conf, const ogs_s_nssai_t *s_nssai);
 void ogs_app_slice_conf_remove(ogs_app_slice_conf_t *slice_conf);
 void ogs_app_slice_conf_remove_all(ogs_app_policy_conf_t *policy_conf);
 
 ogs_app_session_conf_t *ogs_app_session_conf_add(
-        ogs_app_slice_conf_t *slice_conf, char *name);
+        ogs_app_slice_conf_t *slice_conf, const char *name);
 ogs_app_session_conf_t *ogs_app_session_conf_find_by_dnn(
-        ogs_app_slice_conf_t *slice_conf, char *name);
+        ogs_app_slice_conf_t *slice_conf, const char *name);
 void ogs_app_session_conf_remove(ogs_app_session_conf_t *session_conf);
 void ogs_app_session_conf_remove_all(
         ogs_app_slice_conf_t *slice_conf);
 
 int ogs_app_config_session_data(
-        ogs_plmn_id_t *plmn_id, ogs_s_nssai_t *s_nssai, char *dnn,
+        const char *supi, const ogs_plmn_id_t *plmn_id,
+        const ogs_s_nssai_t *s_nssai, const char *dnn,
         ogs_session_data_t *session_data);
 
 #ifdef __cplusplus

lib/app/ogs-context.h

@@ -56,7 +56,7 @@ typedef struct ogs_app_context_s {
     } usrsctp;
 
     struct {
-        uint64_t packet;
+        uint64_t gtpu;
 
         uint64_t sess;
         uint64_t bearer;
@@ -85,6 +85,8 @@ typedef struct ogs_app_context_s {
         uint64_t max_specs;
     } metrics;
 
+    int config_section_id;
+
 } ogs_app_context_t;
 
 int ogs_app_context_init(void);

lib/app/ogs-init.c

@@ -35,6 +35,7 @@ int ogs_app_initialize(
         char *log_file;
         char *log_level;
         char *domain_mask;
+        char *config_section_id;
     } optarg;
 
     ogs_core_initialize();
@@ -50,7 +51,7 @@ int ogs_app_initialize(
     memset(&optarg, 0, sizeof(optarg));
 
     ogs_getopt_init(&options, (char**)argv);
-    while ((opt = ogs_getopt(&options, "c:l:e:m:")) != -1) {
+    while ((opt = ogs_getopt(&options, "c:l:e:m:k:")) != -1) {
         switch (opt) {
         case 'c':
             optarg.config_file = options.optarg;
@@ -64,6 +65,9 @@ int ogs_app_initialize(
         case 'm':
             optarg.domain_mask = options.optarg;
             break;
+        case 'k':
+            optarg.config_section_id = options.optarg;
+            break;
         case '?':
         default:
             ogs_assert_if_reached();
@@ -124,7 +128,14 @@ int ogs_app_initialize(
         ogs_app()->db_uri = ogs_env_get("DB_URI");
 
     /**************************************************************************
-     * Stage 6 : Print Banner
+     * Stage 6 : Setup configuration section ID for running multiple NF from
+     * same config file
+     */
+    if (optarg.config_section_id)
+        ogs_app()->config_section_id = atoi(optarg.config_section_id);
+
+    /**************************************************************************
+     * Stage 7 : Print Banner
      */
     if (ogs_app()->version) {
         ogs_log_print(OGS_LOG_INFO,
@@ -144,7 +155,7 @@ int ogs_app_initialize(
     }
 
     /**************************************************************************
-     * Stage 7 : Queue, Timer and Poll
+     * Stage 8 : Queue, Timer and Poll
      */
     ogs_app()->queue = ogs_queue_create(ogs_app()->pool.event);
     ogs_assert(ogs_app()->queue);
@@ -246,9 +257,14 @@ static int read_config(void)
 
 static int context_prepare(void)
 {
+    int rv;
+
 #define USRSCTP_LOCAL_UDP_PORT      9899
     ogs_app()->usrsctp.udp_port = USRSCTP_LOCAL_UDP_PORT;
 
+    rv = ogs_app_global_conf_prepare();
+    if (rv != OGS_OK) return rv;
+
     return OGS_OK;
 }
 
@@ -347,6 +363,12 @@ static int parse_config(void)
                 ogs_error("ogs_global_conf_parse_config() failed");
                 return rv;
             }
+        } else {
+            rv = ogs_app_count_nf_conf_sections(root_key);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_app_count_nf_conf_sections() failed");
+                return rv;
+            }
         }
     }
 

lib/asn1c/util/conv.c

@@ -205,8 +205,10 @@ int ogs_asn_ip_to_BIT_STRING(ogs_ip_t *ip, BIT_STRING_t *bit_string)
         bit_string->buf = CALLOC(bit_string->size, sizeof(uint8_t));
         memcpy(bit_string->buf, &ip->addr6, OGS_IPV6_LEN);
         ogs_debug("    IPv6[%s]", OGS_INET_NTOP(&ip->addr6, buf));
-    } else
-        ogs_assert_if_reached();
+    } else {
+        ogs_error("No IPv4 or IPv6");
+        return OGS_ERROR;
+    }
 
     return OGS_OK;
 }

lib/core/abts.c

@@ -152,10 +152,17 @@ abts_suite *abts_add_suite(abts_suite *suite, const char *suite_name_full)
         suite = malloc(sizeof(*suite));
         suite->head = subsuite;
         suite->tail = subsuite;
-    }
-    else {
-        suite->tail->next = subsuite;
-        suite->tail = subsuite;
+    } else {
+        /* Clang scan-build SA: NULL pointer dereference: add check for suite->tail=NULL */
+        if (suite->tail) {
+            suite->tail->next = subsuite;
+            suite->tail = subsuite;
+        } else {
+            fprintf(stderr, "suite->tail=NULL\n");
+            fflush(stderr);
+            free(subsuite);
+            return(NULL);
+        }
     }
 
     if (!should_test_run(subsuite->name)) {
@@ -203,6 +210,13 @@ static int report(abts_suite *suite)
         end_suite(suite);
     }
 
+    /* Clang scan-build SA: NULL pointer dereference: suite=NULL */
+    if (!suite) {
+        fprintf(stderr, "suite=NULL\n");
+        fflush(stderr);
+        return(1);
+    }
+
     for (dptr = suite->head; dptr; dptr = dptr->next) {
         count += dptr->failed;
     }
@@ -499,6 +513,7 @@ static void show_help(const char *name)
        "   -q             : turn off status in test\n"
        "   -x             : exclute test-unit (e.g. -x sctp-test)\n"
        "   -l             : list test-unit\n"
+       "   -k             : use <id> config section\n"
        "\n", name);
 }
 
@@ -509,6 +524,7 @@ int abts_main(int argc, const char *const argv[], const char **argv_out)
     ogs_getopt_t options;
     struct {
         char *config_file;
+        char *config_section;
         char *log_level;
         char *domain_mask;
 
@@ -519,7 +535,7 @@ int abts_main(int argc, const char *const argv[], const char **argv_out)
     memset(&optarg, 0, sizeof(optarg));
 
     ogs_getopt_init(&options, (char**)argv);
-    while ((opt = ogs_getopt(&options, "hvxlqc:e:m:dt")) != -1) {
+    while ((opt = ogs_getopt(&options, "hvxlqc:e:m:dtk:")) != -1) {
         switch (opt) {
         case 'h':
             show_help(argv[0]);
@@ -551,6 +567,9 @@ int abts_main(int argc, const char *const argv[], const char **argv_out)
         case 't':
             optarg.enable_trace = true;
             break;
+        case 'k':
+            optarg.config_section = options.optarg;
+            break;
         case '?':
             fprintf(stderr, "%s: %s\n", argv[0], options.errmsg);
             show_help(argv[0]);
@@ -588,6 +607,10 @@ int abts_main(int argc, const char *const argv[], const char **argv_out)
         argv_out[i++] = "-m";
         argv_out[i++] = optarg.domain_mask;
     }
+    if (optarg.config_section) {
+        argv_out[i++] = "-k";
+        argv_out[i++] = optarg.config_section;
+    }
 
     argv_out[i] = NULL;
     

lib/core/ogs-conv.c

@@ -214,17 +214,17 @@ char *ogs_uint64_to_string(uint64_t x)
     return dup;
 }
 
-ogs_uint24_t ogs_uint24_from_string(char *str)
+ogs_uint24_t ogs_uint24_from_string(char *str, int base)
 {
     ogs_uint24_t x;
 
     ogs_assert(str);
 
-    x.v = ogs_uint64_from_string(str);
+    x.v = ogs_uint64_from_string(str, base);
     return x;
 }
 
-uint64_t ogs_uint64_from_string(char *str)
+uint64_t ogs_uint64_from_string(char *str, int base)
 {
     uint64_t x;
 
@@ -234,7 +234,7 @@ uint64_t ogs_uint64_from_string(char *str)
         return 0;
 
     errno = 0;
-    x = strtoll(str, NULL, 16);
+    x = strtoll(str, NULL, base);
 
     if ((errno == ERANGE && (x == LONG_MAX || x == LONG_MIN)) ||
             (errno != 0 && x == 0)) {

lib/core/ogs-conv.h

@@ -53,8 +53,17 @@ char *ogs_uint36_to_0string(uint64_t x);
 char *ogs_uint64_to_0string(uint64_t x);
 char *ogs_uint64_to_string(uint64_t x);
 
-ogs_uint24_t ogs_uint24_from_string(char *str);
-uint64_t ogs_uint64_from_string(char *str);
+#define ogs_uint24_from_string_decimal(str) \
+    ogs_uint24_from_string((str), 10)
+#define ogs_uint24_from_string_hexadecimal(str) \
+    ogs_uint24_from_string((str), 16)
+ogs_uint24_t ogs_uint24_from_string(char *str, int base);
+
+#define ogs_uint64_from_string_decimal(str) \
+    ogs_uint64_from_string((str), 10)
+#define ogs_uint64_from_string_hexadecimal(str) \
+    ogs_uint64_from_string((str), 16)
+uint64_t ogs_uint64_from_string(char *str, int base);
 
 double *ogs_alloc_double(double value);
 

lib/core/ogs-epoll.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -75,7 +75,8 @@ static void epoll_init(ogs_pollset_t *pollset)
 
     context->epfd = epoll_create(pollset->capacity);
     if (context->epfd < 0) {
-        ogs_log_message(OGS_LOG_FATAL, ogs_errno, "epoll_create() failed");
+        ogs_log_message(OGS_LOG_FATAL, ogs_errno,
+                "epoll_create() failed [%d]", pollset->capacity);
         ogs_assert_if_reached();
         return;
     }
@@ -231,22 +232,7 @@ static int epoll_process(ogs_pollset_t *pollset, ogs_time_t timeout)
 
         received = context->event_list[i].events;
         if (received & EPOLLERR) {
-        /*
-         * The libevent library has OGS_POLLOUT turned on in EPOLLERR.
-         *
-         * However, SIGPIPE can occur if write() is called
-         * when the peer connection is closed.
-         *
-         * Therefore, Open5GS turns off OGS_POLLOUT
-         * so that write() cannot be called in case of EPOLLERR.
-         *
-         * See also #2411 and #2312
-         */
-#if 0
             when = OGS_POLLIN|OGS_POLLOUT;
-#else
-            when = OGS_POLLIN;
-#endif
         } else if ((received & EPOLLHUP) && !(received & EPOLLRDHUP)) {
             when = OGS_POLLIN|OGS_POLLOUT;
         } else {

lib/core/ogs-process.c

@@ -370,9 +370,17 @@ int ogs_proc_join(ogs_proc_t *const process, int *const out_return_code)
     }
 
     if (process->child != waitpid(process->child, &status, 0)) {
+        process->child = 0;
+        ogs_error("waitpid failed: %d", status);
         return OGS_ERROR;
     }
 
+    process->child = 0;
+    if (process->nf_name) {
+        ogs_free(process->nf_name);
+        process->nf_name = NULL;
+    }
+
     if (out_return_code) {
         if (WIFEXITED(status)) {
             *out_return_code = WEXITSTATUS(status);
@@ -416,9 +424,17 @@ int ogs_proc_terminate(ogs_proc_t *const process)
         return OGS_ERROR;
     }
 #else
-    if (kill(process->child, SIGTERM) == -1) {
-        return OGS_ERROR;
+
+    if (process->child) {
+        if (kill(process->child, SIGTERM) == -1) {
+            if (errno == ESRCH) {
+                /* No such process */
+                return OGS_OK;
+            }
+            return OGS_ERROR;
+        }
     }
+
 #endif
 
     return OGS_OK;
@@ -434,8 +450,14 @@ int ogs_proc_kill(ogs_proc_t *const process)
         return OGS_ERROR;
     }
 #else
-    if (kill(process->child, SIGKILL) == -1) {
-        return OGS_ERROR;
+    if (process->child) {
+        if (kill(process->child, SIGKILL) == -1) {
+            if (errno == ESRCH) {
+                /* No such process */
+                return OGS_OK;
+            }
+            return OGS_ERROR;
+        }
     }
 #endif
 

lib/core/ogs-process.h

@@ -73,6 +73,10 @@ typedef struct ogs_proc_s {
     unsigned long dwProcessId;
 #else
     pid_t child;
+
+    // to force kill the right NF in tests if needed.
+    char *nf_name;
+    int index;
 #endif
 } ogs_proc_t;
 

lib/core/ogs-signal.c

@@ -15,7 +15,7 @@
  */
 
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -277,9 +277,20 @@ static void remove_sync_sigs(sigset_t *sig_mask)
 #ifdef SIGIOT
     sigdelset(sig_mask, SIGIOT);
 #endif
+
+/*
+ * SIGPIPE can occur if write() is called when the peer connection is closed.
+ *
+ * Therefore, Open5GS ignore SIGPIE signal
+ *
+ * See also #2411 and #2312
+ */
+#if 0
 #ifdef SIGPIPE
     sigdelset(sig_mask, SIGPIPE);
 #endif
+#endif
+
 #ifdef SIGSEGV
     sigdelset(sig_mask, SIGSEGV);
 #endif

lib/core/ogs-sockaddr.c

@@ -55,6 +55,10 @@
 #undef OGS_LOG_DOMAIN
 #define OGS_LOG_DOMAIN __ogs_sock_domain
 
+static bool ogs_sockaddr_compare(const ogs_sockaddr_t *a,
+                                 const ogs_sockaddr_t *b,
+                                 bool compare_port);
+
 /* If you want to use getnameinfo,
  * you need to consider DNS query delay (about 10 seconds) */
 #if 0
@@ -99,11 +103,18 @@ int ogs_addaddrinfo(ogs_sockaddr_t **sa_list,
     int rc;
     char service[NI_MAXSERV];
     struct addrinfo hints, *ai, *ai_list;
-    ogs_sockaddr_t *prev;
+    ogs_sockaddr_t *prev = NULL;
+
+    /* Last node of original list (for appending) */
+    ogs_sockaddr_t *tail = NULL;
+    /* First newly added node (for cleanup on error) */
+    ogs_sockaddr_t *first_new = NULL;
+
     char buf[OGS_ADDRSTRLEN];
 
     ogs_assert(sa_list);
 
+    /* Prepare hints for getaddrinfo() */
     memset(&hints, 0, sizeof(hints));
     hints.ai_family = family;
     hints.ai_socktype = SOCK_STREAM;
@@ -114,24 +125,41 @@ int ogs_addaddrinfo(ogs_sockaddr_t **sa_list,
     rc = getaddrinfo(hostname, service, &hints, &ai_list);
     if (rc != 0) {
         ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
-                "getaddrinfo(%d:%s:%d:0x%x) failed",
-                family, hostname, port, flags);
+                        "getaddrinfo(%d:%s:%d:0x%x) failed: %s",
+                        family, hostname ? hostname : "(null)",
+                        port, flags, gai_strerror(rc));
+        /* Non-fatal: log the error and return */
         return OGS_ERROR;
     }
 
-    prev = NULL;
+    /* Find the end of the existing list, so new entries can be appended */
     if (*sa_list) {
-        prev = *sa_list;
-        while(prev->next) prev = prev->next;
+        tail = *sa_list;
+        while (tail->next)
+            tail = tail->next;
+        prev = tail;
     }
+
+    /* Iterate over each result from getaddrinfo and add to the linked list */
     for (ai = ai_list; ai; ai = ai->ai_next) {
         ogs_sockaddr_t *new, tmp;
         if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6)
-            continue;
+            continue; /* Skip unsupported address families */
 
         new = ogs_calloc(1, sizeof(ogs_sockaddr_t));
         if (!new) {
             ogs_error("ogs_calloc() failed");
+            /* Clean up any partially added entries on memory failure */
+            if (first_new) {
+                if (tail) {
+                    /* detach new sub-list from original list */
+                    tail->next = NULL;
+                } else {
+                    *sa_list = NULL;    /* no original list, reset head */
+                }
+                ogs_freeaddrinfo(first_new);
+            }
+            freeaddrinfo(ai_list);
             return OGS_ERROR;
         }
         memcpy(&new->sa, ai->ai_addr, ai->ai_addrlen);
@@ -139,30 +167,49 @@ int ogs_addaddrinfo(ogs_sockaddr_t **sa_list,
 
         if (hostname) {
             if (ogs_inet_pton(ai->ai_family, hostname, &tmp) == OGS_OK) {
-                /* It's a valid IP address */
+                /* Input string is a valid numeric IP address */
                 ogs_debug("addr:%s, port:%d", OGS_ADDR(new, buf), port);
             } else {
-                /* INVALID IP address! We assume it is a hostname */
+                /* Input string is not a numeric IP; treat it as a hostname */
                 new->hostname = ogs_strdup(hostname);
-                ogs_assert(new->hostname);
+                if (!new->hostname) {
+                    ogs_error("ogs_strdup() failed");
+                    /* Free the new node and any previously added nodes */
+                    ogs_free(new);
+                    if (first_new) {
+                        if (tail) {
+                            tail->next = NULL;
+                        } else {
+                            *sa_list = NULL;
+                        }
+                        ogs_freeaddrinfo(first_new);
+                    }
+                    freeaddrinfo(ai_list);
+                    return OGS_ERROR;
+                }
                 ogs_debug("name:%s, port:%d", new->hostname, port);
             }
         }
 
-        if (!prev)
+        /* Link the new node into the list */
+        if (!prev) {
             *sa_list = new;
-        else
+        } else {
             prev->next = new;
-
+        }
         prev = new;
+        if (!first_new) {
+            first_new = new;  /* mark the first new node added */
+        }
     }
 
     freeaddrinfo(ai_list);
 
-    if (prev == NULL) {
+    if (first_new == NULL) {
+        /* No addresses were added (e.g., no AF_INET/AF_INET6 results) */
         ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
-                "ogs_getaddrinfo(%d:%s:%d:%d) failed",
-                family, hostname, port, flags);
+                        "ogs_addaddrinfo(%d:%s:%d:0x%x) returned no addresses",
+                        family, hostname ? hostname : "(null)", port, flags);
         return OGS_ERROR;
     }
 
@@ -264,6 +311,60 @@ int ogs_sortaddrinfo(ogs_sockaddr_t **sa_list, int family)
     return OGS_OK;
 }
 
+/*--------------------------------------------------------------------------
+ * Merge a single node if not already in "dest" list
+ *--------------------------------------------------------------------------
+ */
+void ogs_merge_single_addrinfo(
+        ogs_sockaddr_t **dest, const ogs_sockaddr_t *item)
+{
+    ogs_sockaddr_t *p;
+    ogs_sockaddr_t *new_sa;
+
+    ogs_assert(dest);
+    ogs_assert(item);
+
+    p = *dest;
+
+    while (p) {
+        if (ogs_sockaddr_is_equal(p, item)) {
+            /* Already exists */
+            return;
+        }
+        p = p->next;
+    }
+    new_sa = (ogs_sockaddr_t *)ogs_malloc(sizeof(*new_sa));
+    ogs_assert(new_sa);
+    memcpy(new_sa, item, sizeof(*new_sa));
+    if (item->hostname) {
+        new_sa->hostname = ogs_strdup(item->hostname);
+        ogs_assert(new_sa->hostname);
+    }
+    new_sa->next = NULL;
+    if (!(*dest)) {
+        *dest = new_sa;
+    } else {
+        p = *dest;
+        while (p->next)
+            p = p->next;
+        p->next = new_sa;
+    }
+}
+
+/*--------------------------------------------------------------------------
+ * Merge an entire src list into dest
+ *--------------------------------------------------------------------------
+ */
+void ogs_merge_addrinfo(ogs_sockaddr_t **dest, const ogs_sockaddr_t *src)
+{
+    const ogs_sockaddr_t *cur;
+    cur = src;
+    while (cur) {
+        ogs_merge_single_addrinfo(dest, cur);
+        cur = cur->next;
+    }
+}
+
 ogs_sockaddr_t *ogs_link_local_addr(const char *dev, const ogs_sockaddr_t *sa)
 {
 #if defined(HAVE_GETIFADDRS)
@@ -419,13 +520,16 @@ socklen_t ogs_sockaddr_len(const void *sa)
     }
 }
 
-bool ogs_sockaddr_is_equal(const void *p, const void *q)
+/*
+ * Helper function to compare two addresses.
+ * If compare_port is true, compare both port and address.
+ * Otherwise, compare address only.
+ */
+static bool ogs_sockaddr_compare(const ogs_sockaddr_t *a,
+                                 const ogs_sockaddr_t *b,
+                                 bool compare_port)
 {
-    const ogs_sockaddr_t *a, *b;
-
-    a = p;
     ogs_assert(a);
-    b = q;
     ogs_assert(b);
 
     if (a->ogs_sa_family != b->ogs_sa_family)
@@ -433,23 +537,68 @@ bool ogs_sockaddr_is_equal(const void *p, const void *q)
 
     switch (a->ogs_sa_family) {
     case AF_INET:
-        if (a->sin.sin_port != b->sin.sin_port)
+        if (compare_port && (a->sin.sin_port != b->sin.sin_port))
             return false;
-        if (memcmp(&a->sin.sin_addr, &b->sin.sin_addr, sizeof(struct in_addr)) != 0)
+        if (memcmp(&a->sin.sin_addr, &b->sin.sin_addr,
+                   sizeof(struct in_addr)) != 0)
             return false;
         return true;
     case AF_INET6:
-        if (a->sin6.sin6_port != b->sin6.sin6_port)
+        if (compare_port && (a->sin6.sin6_port != b->sin6.sin6_port))
             return false;
-        if (memcmp(&a->sin6.sin6_addr, &b->sin6.sin6_addr, sizeof(struct in6_addr)) != 0)
+        if (memcmp(&a->sin6.sin6_addr, &b->sin6.sin6_addr,
+                   sizeof(struct in6_addr)) != 0)
             return false;
         return true;
     default:
-        ogs_error("Unexpected address faimily %u", a->ogs_sa_family);
+        ogs_error("Unexpected address family %u", a->ogs_sa_family);
         ogs_abort();
+        return false; /* Defensive return */
     }
 }
 
+/* Compare addresses including port */
+bool ogs_sockaddr_is_equal(const void *p, const void *q)
+{
+    const ogs_sockaddr_t *a = (const ogs_sockaddr_t *)p;
+    const ogs_sockaddr_t *b = (const ogs_sockaddr_t *)q;
+    return ogs_sockaddr_compare(a, b, true);
+}
+
+/* Compare addresses without considering port */
+bool ogs_sockaddr_is_equal_addr(const void *p, const void *q)
+{
+    const ogs_sockaddr_t *a = (const ogs_sockaddr_t *)p;
+    const ogs_sockaddr_t *b = (const ogs_sockaddr_t *)q;
+    return ogs_sockaddr_compare(a, b, false);
+}
+
+bool ogs_sockaddr_check_any_match(
+        ogs_sockaddr_t *base,
+        ogs_sockaddr_t *list, const ogs_sockaddr_t *single, bool compare_port)
+{
+    ogs_sockaddr_t *p = NULL;
+
+    while (list) {
+        p = base;
+        while (p) {
+            if (ogs_sockaddr_compare(p, list, compare_port) == true)
+                return true;
+            p = p->next;
+        }
+        list = list->next;
+    }
+    if (single) {
+        p = base;
+        while (p) {
+            if (ogs_sockaddr_compare(p, single, compare_port) == true)
+                return true;
+            p = p->next;
+        }
+    }
+    return false;
+}
+
 static int parse_network(ogs_ipsubnet_t *ipsub, const char *network)
 {
     /* legacy syntax for ip addrs: a.b.c. ==> a.b.c.0/24 for example */
@@ -666,3 +815,65 @@ char *ogs_ipstrdup(ogs_sockaddr_t *addr)
 
     return ogs_strdup(buf);
 }
+
+char *ogs_sockaddr_to_string_static(ogs_sockaddr_t *sa_list)
+{
+    static char dumpstr[OGS_HUGE_LEN] = { 0, };
+    char *p, *last;
+    ogs_sockaddr_t *addr = NULL;
+
+    last = dumpstr + OGS_HUGE_LEN;
+    p = dumpstr;
+
+    addr = (ogs_sockaddr_t *)sa_list;
+    while (addr) {
+        char buf[OGS_ADDRSTRLEN];
+        p = ogs_slprintf(p, last, "[%s]:%d ",
+                OGS_ADDR(addr, buf), OGS_PORT(addr));
+        addr = addr->next;
+    }
+
+    if (p > dumpstr) {
+        /* If there is more than one addr, remove the last character */
+        *(p-1) = 0;
+
+        return dumpstr;
+    }
+
+    /* No address */
+    return NULL;
+}
+
+int ogs_sockaddr_from_ip_or_fqdn(ogs_sockaddr_t **sa_list,
+        int family, const char *ip_or_fqdn, uint16_t port)
+{
+    int rc;
+    int flags = 0;
+    ogs_sockaddr_t tmp;
+
+    ogs_assert(sa_list);
+    ogs_assert(ip_or_fqdn);
+
+    /* Determine if the input is an IP literal (numeric address).
+     * If so, use AI_NUMERICHOST to avoid DNS lookup. */
+    if (ogs_inet_pton(AF_INET, ip_or_fqdn, &tmp) == OGS_OK ||
+        ogs_inet_pton(AF_INET6, ip_or_fqdn, &tmp) == OGS_OK) {
+        flags |= AI_NUMERICHOST;
+    }
+
+    /* Use ogs_addaddrinfo
+     * to perform resolution and construct the sockaddr list */
+    *sa_list = NULL;
+    rc = ogs_addaddrinfo(sa_list, family, ip_or_fqdn, port, flags);
+    if (rc != OGS_OK) {
+        ogs_error("Failed to resolve address: %s", ip_or_fqdn);
+        /* Cleanup: free any nodes that might have been added before failure */
+        if (*sa_list) {
+            ogs_freeaddrinfo(*sa_list);
+            *sa_list = NULL;
+        }
+        return OGS_ERROR;
+    }
+
+    return OGS_OK;
+}

lib/core/ogs-sockaddr.h

@@ -67,20 +67,8 @@ struct ogs_sockaddr_s {
      * If there is a name in the configuration file,
      * it is set in the 'hostname' of ogs_sockaddr_t.
      * Then, it immediately call getaddrinfo() to fill addr in ogs_sockaddr_t.
-     *
-     * When it was always possible to convert DNS to addr, that was no problem.
-     * However, in some environments, such as Roaming, there are situations
-     * where it is difficult to always change the DNS to addr.
-     *
-     * So, 'fqdn' was created for the purpose of first use in ogs_sbi_client_t.
-     * 'fqdn' always do not change with addr.
-     * This value is used as it is in the actual client connection.
-     *
-     * Note that 'hostname' is still in use for server or other client
-     * except for ogs_sbi_client_t.
      */
     char *hostname;
-    char *fqdn;
 
     ogs_sockaddr_t *next;
 };
@@ -103,6 +91,10 @@ int ogs_copyaddrinfo(
 int ogs_filteraddrinfo(ogs_sockaddr_t **sa_list, int family);
 int ogs_sortaddrinfo(ogs_sockaddr_t **sa_list, int family);
 
+void ogs_merge_single_addrinfo(
+        ogs_sockaddr_t **dest, const ogs_sockaddr_t *item);
+void ogs_merge_addrinfo(ogs_sockaddr_t **dest, const ogs_sockaddr_t *src);
+
 ogs_sockaddr_t *ogs_link_local_addr(const char *dev, const ogs_sockaddr_t *sa);
 ogs_sockaddr_t *ogs_link_local_addr_by_dev(const char *dev);
 ogs_sockaddr_t *ogs_link_local_addr_by_sa(const ogs_sockaddr_t *sa);
@@ -119,12 +111,20 @@ int ogs_inet_pton(int family, const char *src, void *sa);
 
 socklen_t ogs_sockaddr_len(const void *sa);
 bool ogs_sockaddr_is_equal(const void *p, const void *q);
+bool ogs_sockaddr_is_equal_addr(const void *p, const void *q);
+
+bool ogs_sockaddr_check_any_match(
+        ogs_sockaddr_t *base,
+        ogs_sockaddr_t *list, const ogs_sockaddr_t *single, bool compare_port);
 
 int ogs_ipsubnet(ogs_ipsubnet_t *ipsub,
         const char *ipstr, const char *mask_or_numbits);
 
 char *ogs_gethostname(ogs_sockaddr_t *addr);
 char *ogs_ipstrdup(ogs_sockaddr_t *addr);
+char *ogs_sockaddr_to_string_static(ogs_sockaddr_t *sa_list);
+int ogs_sockaddr_from_ip_or_fqdn(ogs_sockaddr_t **sa_list,
+        int family, const char *ip_or_fqdn, uint16_t port);
 
 #ifdef __cplusplus
 }

lib/crypt/ecc.c

@@ -1075,6 +1075,11 @@ int ecc_make_key(uint8_t p_publicKey[ECC_BYTES+1], uint8_t p_privateKey[ECC_BYTE
     EccPoint l_public;
     unsigned l_tries = 0;
     
+    /* Clang scan-build SA: Branch condition evaluates to garbage value: In 1st pass thru the do loop the struct l_public
+     * will not contain a value in the while() check if vli_isZero(l_private)==true and the continue branch is taken.
+     * Initialize l_public to fix the issue. */
+    memset(&l_public, 0, sizeof(EccPoint));
+
     do
     {
         if(!getRandomNumber(l_private) || (l_tries++ >= MAX_TRIES))
@@ -1255,6 +1260,11 @@ int ecdsa_sign(const uint8_t p_privateKey[ECC_BYTES], const uint8_t p_hash[ECC_B
     EccPoint p;
     unsigned l_tries = 0;
     
+    /* Clang scan-build SA: Branch condition evaluates to garbage value: In 1st pass thru the do loop the struct "p"
+     * will not contain a value in the while() check if vli_isZero(k)==true and the continue branch is taken.
+     * Initialize "p" to fix the issue. */
+    memset(&p, 0, sizeof(EccPoint));
+
     do
     {
         if(!getRandomNumber(k) || (l_tries++ >= MAX_TRIES))

lib/crypt/kasumi.c

@@ -292,7 +292,13 @@ void kasumi_f8(u8 *key, u32 count, u32 bearer, u32 dir, u8 *data, int length)
 	/* Construct the modified key and then "kasumi" A */
 	for( n=0; n<16; ++n )
 		ModKey[n] = (u8)(key[n] ^ 0x55);
+
+	/* Clang scan-build SA: Result of operation is garbage: The function kasumi_key_schedule() is reporting that
+	 * the array parameter "k" (ModKey) has garbage/uninitialized values. Don't see how that is possible
+	 * because the array is fully populated by the loop above. */
+#ifndef __clang_analyzer__
 	kasumi_key_schedule( ModKey );
+#endif
 
 	kasumi( A.b8 );	/* First encryption to create modifier */
 
@@ -454,7 +460,13 @@ u8 *kasumi_f9(u8 *key, u32 count, u32 fresh, u32 dir, u8 *data, int length)
 	 * key XORd with 0xAAAA.....						*/
 	for( n=0; n<16; ++n )
 		ModKey[n] = (u8)*key++ ^ 0xAA;
+
+	/* Clang scan-build SA: Result of operation is garbage: The function kasumi_key_schedule() is reporting that
+	 * the array parameter "k" (ModKey) has garbage/uninitialized values. Don't see how that is possible
+	 * because the array is fully populated by the loop above. */
+#ifndef __clang_analyzer__
 	kasumi_key_schedule( ModKey );
+#endif
 	kasumi( B.b8 );
 
 	/* We return the left-most 32-bits of the result */

lib/crypt/ogs-aes.c

@@ -1255,6 +1255,12 @@ int ogs_aes_cbc_encrypt(const uint8_t *key, const uint32_t keybits,
 
     *outlen = ((inlen - 1) / OGS_AES_BLOCK_SIZE + 1) * OGS_AES_BLOCK_SIZE;
 
+    /* Clang scan-build SA: Result of operation is garbage: The function ogs_aes_encrypt() is reporting that the
+     * array parameter rk has garbage/uninitialized values. The garbage values are because the SA is taking a path
+     * through ogs_aes_setup_enc() that doesn't match a valid keybits value and therefore the function is not
+     * populating rk. Fix the issue by initializing rk to 0 here. */
+    memset(rk, 0, sizeof(rk));
+
     nrounds = ogs_aes_setup_enc(rk, key, keybits);
 
     while (len >= OGS_AES_BLOCK_SIZE)
@@ -1310,6 +1316,12 @@ int ogs_aes_cbc_decrypt(const uint8_t *key, const uint32_t keybits,
 
     *outlen = inlen;
 
+    /* Clang scan-build SA: Result of operation is garbage: The function ogs_aes_decrypt() is reporting that the
+     * array parameter rk has garbage/uninitialized values. The garbage values are because the SA is taking a path
+     * through ogs_aes_setup_enc() (from ogs_aes_setup_dec()) that doesn't match a valid keybits value and
+     * therefore the function is not populating rk. Fix the issue by initializing rk to 0 here. */
+    memset(rk, 0, sizeof(rk));
+
     nrounds = ogs_aes_setup_dec(rk, key, keybits);
 
     if (in != out)

lib/dbi/ims.c

@@ -120,7 +120,8 @@ int ogs_dbi_ims_data(char *supi, ogs_ims_data_t *ims_data)
     bson_error_t error;
     const bson_t *document;
     bson_iter_t iter;
-    bson_iter_t child1_iter;
+    bson_iter_t child1_iter, child2_iter, child3_iter, child4_iter, child5_iter;
+    bson_iter_t child6_iter, child7_iter, child8_iter, child9_iter;
     const char *utf8 = NULL;
     uint32_t length = 0;
 
@@ -190,6 +191,222 @@ int ogs_dbi_ims_data(char *supi, ogs_ims_data_t *ims_data)
                 }
             }
             ims_data->num_of_msisdn = msisdn_index;
+        } else if (!strcmp(key, "ifc") &&
+            BSON_ITER_HOLDS_ARRAY(&iter)) {
+            int ifc_index = 0;
+            bson_iter_recurse(&iter, &child2_iter);
+            while (bson_iter_next(&child2_iter)) {
+                ogs_assert(ifc_index < OGS_MAX_NUM_OF_IFC);
+                bson_iter_recurse(&child2_iter, &child3_iter);
+                while (bson_iter_next(&child3_iter)) {
+                    const char *child3_key = bson_iter_key(&child3_iter);
+                    if (!strcmp(child3_key, "priority") &&
+                        BSON_ITER_HOLDS_INT32(&child3_iter)) {
+                        ims_data->ifc[ifc_index].priority =
+                            bson_iter_int32(&child3_iter);
+                    } else if (!strcmp(child3_key, "application_server") &&
+                        BSON_ITER_HOLDS_DOCUMENT(&child3_iter)) {
+                        bson_iter_recurse(&child3_iter, &child4_iter);
+                        while (bson_iter_next(&child4_iter)) {
+                            const char *child4_key =
+                                bson_iter_key(&child4_iter);
+                            if (!strcmp(child4_key, "server_name") &&
+                                BSON_ITER_HOLDS_UTF8(&child4_iter)) {
+                                utf8 = bson_iter_utf8(&child4_iter, &length);
+                                ims_data->ifc[ifc_index]
+                                    .application_server.server_name =
+                                    ogs_strndup(utf8, length);
+                            } else if (!strcmp(child4_key, "default_handling")
+                                    && BSON_ITER_HOLDS_INT32(&child4_iter)) {
+                                ims_data->ifc[ifc_index]
+                                    .application_server.default_handling =
+                                    bson_iter_int32(&child4_iter);
+                            }
+                        }
+                    } else if (!strcmp(child3_key, "trigger_point") &&
+                               BSON_ITER_HOLDS_DOCUMENT(&child3_iter)) {
+                        bson_iter_recurse(&child3_iter, &child5_iter);
+                        while (bson_iter_next(&child5_iter)) {
+                            const char *child5_key =
+                                bson_iter_key(&child5_iter);
+                            if (!strcmp(child5_key, "condition_type_cnf") &&
+                                BSON_ITER_HOLDS_INT32(&child5_iter)) {
+                                ims_data->ifc[ifc_index]
+                                    .trigger_point.condition_type_cnf =
+                                    bson_iter_int32(&child5_iter);
+                            } else if (!strcmp(child5_key, "spt") &&
+                                       BSON_ITER_HOLDS_ARRAY(&child5_iter)) {
+                                int spt_index = 0;
+                                bson_iter_recurse(&child5_iter, &child6_iter);
+                                while (bson_iter_next(&child6_iter)) {
+                                    ogs_assert(spt_index < OGS_MAX_NUM_OF_SPT);
+                                    bson_iter_recurse(&child6_iter,
+                                                      &child7_iter);
+                                    while (bson_iter_next(&child7_iter)) {
+                                        const char *child7_key =
+                                            bson_iter_key(&child7_iter);
+                                        if (!strcmp(child7_key,
+                                                    "condition_negated") &&
+                                            BSON_ITER_HOLDS_INT32(
+                                                &child7_iter)) {
+                                            ims_data->ifc[ifc_index]
+                                                .trigger_point
+                                                .spt[spt_index]
+                                                .condition_negated =
+                                                bson_iter_int32(
+                                                    &child7_iter);
+                                        } else if (!strcmp(child7_key, "group")
+                                                && BSON_ITER_HOLDS_INT32(
+                                                       &child7_iter)) {
+                                            ims_data->ifc[ifc_index]
+                                                .trigger_point
+                                                .spt[spt_index]
+                                                .group = bson_iter_int32(
+                                                &child7_iter);
+                                        } else if (!strcmp(child7_key,
+                                                           "method") &&
+                                                   BSON_ITER_HOLDS_UTF8(
+                                                       &child7_iter)) {
+                                            utf8 = bson_iter_utf8(&child7_iter,
+                                                                  &length);
+                                            ims_data->ifc[ifc_index]
+                                                .trigger_point
+                                                .spt[spt_index]
+                                                .method =
+                                                ogs_strndup(utf8, length);
+                                            ims_data->ifc[ifc_index]
+                                                .trigger_point
+                                                .spt[spt_index]
+                                                .type = OGS_SPT_HAS_METHOD;
+                                        } else if (!strcmp(child7_key,
+                                                           "session_case") &&
+                                                   BSON_ITER_HOLDS_INT32(
+                                                       &child7_iter)) {
+                                            ims_data->ifc[ifc_index]
+                                                .trigger_point
+                                                .spt[spt_index]
+                                                .session_case =
+                                                bson_iter_int32(
+                                                    &child7_iter);
+                                            ims_data->ifc[ifc_index]
+                                                .trigger_point
+                                                .spt[spt_index]
+                                                .type =
+                                                    OGS_SPT_HAS_SESSION_CASE;
+                                        } else if (!strcmp(child7_key,
+                                                           "sip_header") &&
+                                                   BSON_ITER_HOLDS_DOCUMENT(
+                                                       &child7_iter)) {
+                                            bson_iter_recurse(&child7_iter,
+                                                              &child8_iter);
+                                            while (bson_iter_next(
+                                                        &child8_iter)) {
+                                                const char *child8_key =
+                                                    bson_iter_key(
+                                                        &child8_iter);
+                                                if (!strcmp(child8_key,
+                                                            "header") &&
+                                                    BSON_ITER_HOLDS_UTF8(
+                                                        &child8_iter)) {
+                                                    utf8 = bson_iter_utf8(
+                                                        &child8_iter,
+                                                        &length);
+                                                    ims_data->ifc[ifc_index]
+                                                        .trigger_point
+                                                        .spt[spt_index]
+                                                        .header =
+                                                        ogs_strndup(utf8,
+                                                                    length);
+                                                } else if (!strcmp(child8_key,
+                                                                   "content") &&
+                                                           BSON_ITER_HOLDS_UTF8(
+                                                               &child8_iter)) {
+                                                    utf8 = bson_iter_utf8(
+                                                        &child8_iter,
+                                                        &length);
+                                                    ims_data->ifc[ifc_index]
+                                                        .trigger_point
+                                                        .spt[spt_index]
+                                                        .header_content =
+                                                        ogs_strndup(utf8,
+                                                                    length);
+                                                }
+                                            }
+                                            ims_data->ifc[ifc_index]
+                                                .trigger_point
+                                                .spt[spt_index]
+                                                .type = OGS_SPT_HAS_SIP_HEADER;
+                                        } else if (!strcmp(child7_key,
+                                                           "sdp_line") &&
+                                                   BSON_ITER_HOLDS_DOCUMENT(
+                                                       &child7_iter)) {
+                                            bson_iter_recurse(&child7_iter,
+                                                              &child9_iter);
+                                            while (bson_iter_next(
+                                                        &child9_iter)) {
+                                                const char *child9_key =
+                                                    bson_iter_key(
+                                                        &child9_iter);
+                                                if (!strcmp(child9_key,
+                                                            "line") &&
+                                                    BSON_ITER_HOLDS_UTF8(
+                                                        &child9_iter)) {
+                                                    utf8 = bson_iter_utf8(
+                                                        &child9_iter,
+                                                        &length);
+                                                    ims_data->ifc[ifc_index]
+                                                        .trigger_point
+                                                        .spt[spt_index]
+                                                        .sdp_line =
+                                                        ogs_strndup(utf8,
+                                                                    length);
+                                                } else if (!strcmp(child9_key,
+                                                                   "content") &&
+                                                           BSON_ITER_HOLDS_UTF8(
+                                                               &child9_iter)) {
+                                                    utf8 = bson_iter_utf8(
+                                                        &child9_iter,
+                                                        &length);
+                                                    ims_data->ifc[ifc_index]
+                                                        .trigger_point
+                                                        .spt[spt_index]
+                                                        .sdp_line_content =
+                                                        ogs_strndup(utf8,
+                                                                    length);
+                                                }
+                                            }
+                                            ims_data->ifc[ifc_index]
+                                                .trigger_point
+                                                .spt[spt_index]
+                                                .type = OGS_SPT_HAS_SDP_LINE;
+                                        } else if (!strcmp(child7_key,
+                                                           "request_uri") &&
+                                                   BSON_ITER_HOLDS_UTF8(
+                                                       &child7_iter)) {
+                                            utf8 = bson_iter_utf8(&child7_iter,
+                                                                  &length);
+                                            ims_data->ifc[ifc_index]
+                                                .trigger_point
+                                                .spt[spt_index]
+                                                .request_uri =
+                                                ogs_strndup(utf8, length);
+                                            ims_data->ifc[ifc_index]
+                                                .trigger_point
+                                                .spt[spt_index]
+                                                .type = OGS_SPT_HAS_REQUEST_URI;
+                                        }
+                                    }
+                                    spt_index++;
+                                }
+                                ims_data->ifc->trigger_point.num_of_spt =
+                                    spt_index;
+                            }
+                        }
+                    }
+                }
+                ifc_index++;
+            }
+            ims_data->num_of_ifc = ifc_index;
         }
     }
 

lib/dbi/session.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -19,7 +19,8 @@
 
 #include "ogs-dbi.h"
 
-int ogs_dbi_session_data(char *supi, ogs_s_nssai_t *s_nssai, char *dnn,
+int ogs_dbi_session_data(
+        const char *supi, const ogs_s_nssai_t *s_nssai, const char *dnn,
         ogs_session_data_t *session_data)
 {
     int rv = OGS_OK;
@@ -85,6 +86,7 @@ int ogs_dbi_session_data(char *supi, ogs_s_nssai_t *s_nssai, char *dnn,
         if (!strcmp(key, OGS_SLICE_STRING) && BSON_ITER_HOLDS_ARRAY(&iter)) {
             bson_iter_recurse(&iter, &child1_iter);
             while (bson_iter_next(&child1_iter)) {
+                bool sst_presence = false;
                 uint8_t sst;
                 ogs_uint24_t sd;
 
@@ -97,6 +99,7 @@ int ogs_dbi_session_data(char *supi, ogs_s_nssai_t *s_nssai, char *dnn,
 
                     if (!strcmp(child2_key, OGS_SST_STRING) &&
                         BSON_ITER_HOLDS_INT32(&child2_iter)) {
+                        sst_presence = true;
                         sst = bson_iter_int32(&child2_iter);
                     } else if (!strcmp(child2_key, OGS_SD_STRING) &&
                         BSON_ITER_HOLDS_UTF8(&child2_iter)) {
@@ -109,7 +112,7 @@ int ogs_dbi_session_data(char *supi, ogs_s_nssai_t *s_nssai, char *dnn,
                     }
                 }
 
-                if (!sst) {
+                if (!sst_presence) {
                     ogs_error("No SST");
                     continue;
                 }
@@ -166,6 +169,9 @@ done:
         } else if (!strcmp(child4_key, OGS_TYPE_STRING) &&
             BSON_ITER_HOLDS_INT32(&child4_iter)) {
             session->session_type = bson_iter_int32(&child4_iter);
+        } else if (!strcmp(child4_key, OGS_LBO_ROAMING_ALLOWED_STRING) &&
+            BSON_ITER_HOLDS_BOOL(&child4_iter)) {
+            session->lbo_roaming_allowed = bson_iter_bool(&child4_iter);
         } else if (!strcmp(child4_key, OGS_QOS_STRING) &&
             BSON_ITER_HOLDS_DOCUMENT(&child4_iter)) {
             bson_iter_recurse(&child4_iter, &child5_iter);

lib/dbi/session.h

@@ -28,7 +28,8 @@
 extern "C" {
 #endif
 
-int ogs_dbi_session_data(char *supi, ogs_s_nssai_t *s_nssai, char *dnn,
+int ogs_dbi_session_data(
+        const char *supi, const ogs_s_nssai_t *s_nssai, const char *dnn,
         ogs_session_data_t *session_data);
 
 #ifdef __cplusplus

lib/dbi/subscription.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -39,9 +39,16 @@ int ogs_dbi_auth_info(char *supi, ogs_dbi_auth_info_t *auth_info)
     ogs_assert(auth_info);
 
     supi_type = ogs_id_get_type(supi);
-    ogs_assert(supi_type);
+    if (!supi_type) {
+        ogs_error("Invalid supi=%s", supi);
+        return OGS_ERROR;
+    }
     supi_id = ogs_id_get_value(supi);
-    ogs_assert(supi_id);
+    if (!supi_id) {
+        ogs_error("Invalid supi=%s", supi);
+        ogs_free(supi_type);
+        return OGS_ERROR;
+    }
 
     query = BCON_NEW(supi_type, BCON_UTF8(supi_id));
 #if MONGOC_CHECK_VERSION(1, 5, 0)
@@ -459,6 +466,7 @@ int ogs_dbi_subscription_data(char *supi,
             bson_iter_recurse(&iter, &child1_iter);
             while (bson_iter_next(&child1_iter)) {
                 ogs_slice_data_t *slice_data = NULL;
+                bool sst_presence = false;
 
                 ogs_assert(
                         subscription_data->num_of_slice < OGS_MAX_NUM_OF_SLICE);
@@ -476,6 +484,7 @@ int ogs_dbi_subscription_data(char *supi,
                     if (!strcmp(child2_key, OGS_SST_STRING) &&
                         BSON_ITER_HOLDS_INT32(&child2_iter)) {
                         slice_data->s_nssai.sst = bson_iter_int32(&child2_iter);
+                        sst_presence = true;
                     } else if (!strcmp(child2_key, OGS_SD_STRING) &&
                         BSON_ITER_HOLDS_UTF8(&child2_iter)) {
                         utf8 = bson_iter_utf8(&child2_iter, &length);
@@ -515,6 +524,11 @@ int ogs_dbi_subscription_data(char *supi,
                                     BSON_ITER_HOLDS_INT32(&child4_iter)) {
                                     session->session_type =
                                         bson_iter_int32(&child4_iter);
+                                } else if (!strcmp(child4_key,
+                                            OGS_LBO_ROAMING_ALLOWED_STRING) &&
+                                    BSON_ITER_HOLDS_BOOL(&child4_iter)) {
+                                    session->lbo_roaming_allowed =
+                                        bson_iter_bool(&child4_iter);
                                 } else if (!strcmp(child4_key,
                                             OGS_QOS_STRING) &&
                                     BSON_ITER_HOLDS_DOCUMENT(&child4_iter)) {
@@ -787,6 +801,12 @@ int ogs_dbi_subscription_data(char *supi,
                         }
                     }
                 }
+
+                if (!sst_presence) {
+                    ogs_error("No SST");
+                    continue;
+                }
+
                 subscription_data->num_of_slice++;
             }
         } else if (!strcmp(key, OGS_MME_HOST_STRING) &&

lib/diameter/common/base.h

@@ -28,6 +28,15 @@
 extern "C" {
 #endif
 
+/* Configuration for ogs_diam_stats_ctx_t: */
+typedef struct ogs_diam_config_stats_s {
+    /* Frequency at which freeDiameter thread stats are updated to the app. 0 = default 60 seconds. */
+    unsigned int interval_sec;
+    /* Size of struct to allocate for diameters private statistics, see ogs_diam_stats_ctx_t.
+     * Defaults to 0, no priv_stats allocated. */
+    size_t priv_stats_size;
+} ogs_diam_config_stats_t;
+
 /* This is default diameter configuration if there is no config file
  * The Configuration : No TLS, Only TCP */
 typedef struct ogs_diam_config_s {
@@ -70,6 +79,10 @@ typedef struct ogs_diam_config_s {
         int tc_timer; /* TcTimer value to use for this peer, use default if 0 */
     } conn[MAX_NUM_OF_FD_CONN];
     int num_of_conn;
+
+    /* Configure ogs_diam_stats_ctx_t: */
+    ogs_diam_config_stats_t stats;
+
 } ogs_diam_config_t;
 
 int ogs_diam_init(int mode, const char *conffile, ogs_diam_config_t *fd_config);
@@ -77,7 +90,7 @@ int ogs_diam_start(void);
 void ogs_diam_final(void);
 
 int ogs_diam_config_init(ogs_diam_config_t *fd_config);
-bool ogs_diam_app_connected(uint32_t app_id);
+bool ogs_diam_is_relay_or_app_advertised(uint32_t app_id);
 
 int fd_avp_search_avp ( struct avp * groupedavp,
         struct dict_object * what, struct avp ** avp );

lib/diameter/common/config.c

@@ -105,7 +105,7 @@ static int diam_config_apply(ogs_diam_config_t *fd_config)
                     fd_config->conn[i].addr, errno, strerror(errno));
             return OGS_ERROR;
         }
-        
+
         CHECK_FCT_DO( fd_ep_add_merge(
                 &fddpi.pi_endpoints, ai->ai_addr, ai->ai_addrlen,
                 EP_FL_CONF | (disc ?: EP_ACCEPTALL) ), return OGS_ERROR);
@@ -197,7 +197,7 @@ int ogs_diam_config_init(ogs_diam_config_t *fd_config)
 
     /* Display configuration */
     b = fd_conf_dump(&buf, &len, NULL);
-    LOG_SPLIT(FD_LOG_NOTICE, NULL, 
+    LOG_SPLIT(FD_LOG_NOTICE, NULL,
             b ?: (char*)"<Error during configuration dump...>", NULL);
     free(buf);
 

lib/diameter/common/init.c

@@ -28,6 +28,8 @@ int ogs_diam_init(int mode, const char *conffile, ogs_diam_config_t *fd_config)
 {
     int ret;
 
+    ogs_assert(fd_config);
+
     gnutls_global_set_log_level(0);
     gnutls_global_set_log_function(diam_gnutls_log_func);
 
@@ -36,14 +38,14 @@ int ogs_diam_init(int mode, const char *conffile, ogs_diam_config_t *fd_config)
     if (ret != 0) {
         ogs_error("fd_log_handler_register() failed");
         return ret;
-    } 
+    }
 
     ret = fd_core_initialize();
     if (ret != 0) {
         ogs_error("fd_core_initialize() failed");
         return ret;
-    } 
-    
+    }
+
     /* Parse the configuration file */
     if (conffile) {
         CHECK_FCT_DO( fd_core_parseconf(conffile), goto error );
@@ -55,7 +57,10 @@ int ogs_diam_init(int mode, const char *conffile, ogs_diam_config_t *fd_config)
     CHECK_FCT( ogs_diam_message_init() );
 
     /* Initialize FD logger */
-    CHECK_FCT_DO( ogs_diam_logger_init(mode), goto error );
+    CHECK_FCT_DO( ogs_diam_logger_init(), goto error );
+
+    /* Initialize FD stats */
+    CHECK_FCT_DO( ogs_diam_stats_init(mode, &fd_config->stats), goto error );
 
     return 0;
 error:
@@ -72,7 +77,7 @@ int ogs_diam_start(void)
 
     CHECK_FCT_DO( fd_core_waitstartcomplete(), goto error );
 
-    CHECK_FCT( ogs_diam_logger_stats_start() );
+    CHECK_FCT( ogs_diam_stats_start() );
 
     return 0;
 error:
@@ -84,6 +89,7 @@ error:
 
 void ogs_diam_final()
 {
+    ogs_diam_stats_final();
     ogs_diam_logger_final();
 
     CHECK_FCT_DO( fd_core_shutdown(), ogs_error("fd_core_shutdown() failed") );
@@ -118,12 +124,12 @@ static void diam_log_func(int printlevel, const char *format, va_list ap)
     ogs_log_printf(level, OGS_LOG_DOMAIN, 0, NULL, 0, NULL, 0, __VA_ARGS__)
 
     switch(printlevel) {
-    case FD_LOG_ANNOYING: 
+    case FD_LOG_ANNOYING:
         diam_log_printf(OGS_LOG_TRACE, "[%d] %s\n", printlevel, buffer);
-        break;  
+        break;
     case FD_LOG_DEBUG:
         diam_log_printf(OGS_LOG_TRACE, "[%d] %s\n", printlevel, buffer);
-        break;  
+        break;
     case FD_LOG_INFO:
         diam_log_printf(OGS_LOG_TRACE, "[%d] %s\n", printlevel, buffer);
         break;

lib/diameter/common/logger.c

@@ -19,57 +19,30 @@
 
 #include "ogs-diameter-common.h"
 
-static struct ogs_diam_logger_t self;
-
 static struct fd_hook_hdl *logger_hdl = NULL;
 static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
-static pthread_t fd_stats_th = (pthread_t)NULL;
 
 static ogs_diam_logger_user_handler user_handler = NULL;
 
 static void ogs_diam_logger_cb(enum fd_hook_type type, struct msg * msg,
     struct peer_hdr * peer, void * other, struct fd_hook_permsgdata *pmd,
     void * regdata);
-static void * diam_stats_worker(void * arg);
 
-int ogs_diam_logger_init(int mode)
+int ogs_diam_logger_init()
 {
     uint32_t mask_peers = HOOK_MASK( HOOK_PEER_CONNECT_SUCCESS );
 
-    memset(&self, 0, sizeof(struct ogs_diam_logger_t));
-
-    self.mode = mode;
-    self.duration = 60;       /* 60 seconds */
-
     CHECK_FCT( fd_hook_register(
             mask_peers, ogs_diam_logger_cb, NULL, NULL, &logger_hdl) );
 
-    CHECK_POSIX( pthread_mutex_init(&self.stats_lock, NULL) );
-
     return 0;
 }
 
 void ogs_diam_logger_final()
 {
-    CHECK_FCT_DO( fd_thr_term(&fd_stats_th), );
-    CHECK_POSIX_DO( pthread_mutex_destroy(&self.stats_lock), );
-
     if (logger_hdl) { CHECK_FCT_DO( fd_hook_unregister( logger_hdl ), ); }
 }
 
-struct ogs_diam_logger_t* ogs_diam_logger_self()
-{
-    return &self;
-}
-
-int ogs_diam_logger_stats_start()
-{
-    /* Start the statistics thread */
-    CHECK_POSIX( pthread_create(&fd_stats_th, NULL, diam_stats_worker, NULL) );
-
-    return 0;
-}
-
 void ogs_diam_logger_register(ogs_diam_logger_user_handler instance)
 {
     user_handler = instance;
@@ -116,62 +89,3 @@ static void ogs_diam_logger_cb(enum fd_hook_type type, struct msg * msg,
     CHECK_POSIX_DO( pthread_mutex_unlock(&mtx), );
 }
 
-/* Function to display statistics periodically */
-static void * diam_stats_worker(void * arg)
-{
-    struct timespec start, now;
-    struct fd_stats copy;
-
-    /* Get the start time */
-    CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &start), );
-
-    /* Now, loop until canceled */
-    while (1) {
-        /* Display statistics every XX seconds */
-        sleep(self.duration);
-
-        /* Now, get the current stats */
-        CHECK_POSIX_DO( pthread_mutex_lock(&self.stats_lock), );
-        memcpy(&copy, &self.stats, sizeof(struct fd_stats));
-        CHECK_POSIX_DO( pthread_mutex_unlock(&self.stats_lock), );
-
-        /* Get the current execution time */
-        CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &now), );
-
-        /* Now, display everything */
-        ogs_trace("------- fd statistics ---------");
-        if (now.tv_nsec >= start.tv_nsec)
-        {
-            ogs_trace(" Executing for: %d.%06ld sec",
-                    (int)(now.tv_sec - start.tv_sec),
-                    (long)(now.tv_nsec - start.tv_nsec) / 1000);
-        }
-        else
-        {
-            ogs_trace(" Executing for: %d.%06ld sec",
-                    (int)(now.tv_sec - 1 - start.tv_sec),
-                    (long)(now.tv_nsec + 1000000000 - start.tv_nsec) / 1000);
-        }
-
-        if (self.mode & FD_MODE_SERVER) {
-            ogs_trace(" Server: %llu message(s) echoed",
-                    copy.nb_echoed);
-        }
-        if (self.mode & FD_MODE_CLIENT) {
-            ogs_trace(" Client:");
-            ogs_trace("   %llu message(s) sent", copy.nb_sent);
-            ogs_trace("   %llu error(s) received", copy.nb_errs);
-            ogs_trace("   %llu answer(s) received", copy.nb_recv);
-            ogs_trace("     fastest: %ld.%06ld sec.",
-                    copy.shortest / 1000000, copy.shortest % 1000000);
-            ogs_trace("     slowest: %ld.%06ld sec.",
-                    copy.longest / 1000000, copy.longest % 1000000);
-            ogs_trace("     Average: %ld.%06ld sec.",
-                    copy.avg / 1000000, copy.avg % 1000000);
-        }
-        ogs_trace("-------------------------------------");
-    }
-
-    return NULL; /* never called */
-}
-

lib/diameter/common/logger.h

@@ -28,33 +28,9 @@
 extern "C" {
 #endif
 
-struct ogs_diam_logger_t {
-
-#define FD_MODE_SERVER   0x1
-#define FD_MODE_CLIENT   0x2
-    int mode;        /* default FD_MODE_SERVER | FD_MODE_CLIENT */
-
-    int duration; /* default 10 */
-    struct fd_stats {
-        unsigned long long nb_echoed; /* server */
-        unsigned long long nb_sent;   /* client */
-        unsigned long long nb_recv;   /* client */
-        unsigned long long nb_errs;   /* client */
-        unsigned long shortest;  /* fastest answer, in microseconds */
-        unsigned long longest;   /* slowest answer, in microseconds */
-        unsigned long avg;       /* average answer time, in microseconds */
-    } stats;
-
-    pthread_mutex_t stats_lock;
-};
-
-int ogs_diam_logger_init(int mode);
+int ogs_diam_logger_init(void);
 void ogs_diam_logger_final(void);
 
-struct ogs_diam_logger_t* ogs_diam_logger_self(void);
-
-int ogs_diam_logger_stats_start(void);
-
 typedef void (*ogs_diam_logger_user_handler)(
     enum fd_hook_type type, struct msg *msg, struct peer_hdr *peer,
     void *other, struct fd_hook_permsgdata *pmd, void *regdata);

lib/diameter/common/meson.build

@@ -20,12 +20,14 @@ libdiameter_common_sources = files('''
 
     message.h
     logger.h
+    stats.h
     base.h
 
     libapp_sip.c
     dict.c
     message.c
     logger.c
+    stats.c
     config.c
     util.c
     init.c
@@ -51,10 +53,10 @@ libdiameter_common = library('ogsdiameter-common',
     version : libogslib_version,
     c_args : libdiameter_common_cc_flags,
     include_directories : [libdiameter_common_inc, libinc],
-    dependencies : [libcore_dep, libfdcore_dep],
+    dependencies : [libcore_dep, libfdcore_dep, libapp_dep],
     install : true)
 
 libdiameter_common_dep = declare_dependency(
     link_with : libdiameter_common,
     include_directories : [libdiameter_common_inc, libinc],
-    dependencies : [libcore_dep, libfdcore_dep])
+    dependencies : [libcore_dep, libfdcore_dep, libapp_dep])

lib/diameter/common/message.h

@@ -34,7 +34,9 @@ extern "C" {
 #define OGS_DIAM_AVP_CODE_FRAME_IPV6_PREFIX         97
 
 /* Result-Code AVP */
+#define OGS_DIAM_UNABLE_TO_DELIVER                  3002
 #define OGS_DIAM_UNKNOWN_PEER                       3010
+#define OGS_DIAM_OUT_OF_SPACE                       4002
 #define OGS_DIAM_AVP_UNSUPPORTED                    5001
 #define OGS_DIAM_UNKNOWN_SESSION_ID                 5002
 #define OGS_DIAM_AUTHORIZATION_REJECTED             5003

lib/diameter/common/ogs-diameter-common.h

@@ -44,6 +44,7 @@
 #include "diameter/common/message.h"
 #include "diameter/common/logger.h"
 #include "diameter/common/base.h"
+#include "diameter/common/stats.h"
 
 #undef OGS_DIAMETER_INSIDE
 

lib/diameter/common/stats.c

@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "ogs-diameter-common.h"
+#include "ogs-app.h"
+
+static ogs_diam_stats_ctx_t self;
+
+static void diam_stats_timer_cb(void *data);
+
+int ogs_diam_stats_init(int mode, const ogs_diam_config_stats_t *config)
+{
+    ogs_assert(config);
+    memset(&self, 0, sizeof(ogs_diam_stats_ctx_t));
+
+    self.mode = mode;
+    self.poll.t_interval = config->interval_sec > 0 ?
+                            ogs_time_from_sec(config->interval_sec) :
+                            ogs_time_from_sec(60); /* default 60 seconds */
+    self.poll.timer = ogs_timer_add(ogs_app()->timer_mgr,
+                diam_stats_timer_cb, 0);
+        ogs_assert(self.poll.timer);
+    if (config->priv_stats_size > 0) {
+        self.priv_stats_size = config->priv_stats_size;
+        self.priv_stats = ogs_calloc(1, self.priv_stats_size);
+        self.priv_stats_copy = ogs_calloc(1, self.priv_stats_size);
+        ogs_assert(self.priv_stats);
+    }
+
+    CHECK_POSIX( pthread_mutex_init(&self.stats_lock, NULL) );
+
+    return 0;
+}
+
+void ogs_diam_stats_final()
+{
+    if (self.poll.timer)
+        ogs_timer_delete(self.poll.timer);
+    self.poll.timer = NULL;
+    if (self.priv_stats) {
+        ogs_free(self.priv_stats);
+        ogs_free(self.priv_stats_copy);
+        self.priv_stats = NULL;
+        self.priv_stats_copy = NULL;
+        self.priv_stats_size = 0;
+    }
+}
+
+ogs_diam_stats_ctx_t* ogs_diam_stats_self()
+{
+    return &self;
+}
+
+int ogs_diam_stats_start()
+{
+    /* Get the start time */
+    self.poll.t_start = ogs_get_monotonic_time();
+    /* Start the statistics timer */
+    self.poll.t_prev = self.poll.t_start;
+    ogs_timer_start(self.poll.timer, self.poll.t_interval);
+    ogs_info("Polling freeDiameter stats every %lld usecs", (long long)self.poll.t_interval);
+
+    return 0;
+}
+
+void ogs_diam_stats_update_cb_register(ogs_diam_stats_update_cb cb)
+{
+    self.update_cb = cb;
+}
+
+void ogs_diam_stats_update_cb_unregister(void)
+{
+    self.update_cb = NULL;
+}
+
+static void ogs_diam_stats_log(const ogs_diam_stats_t *stats, ogs_time_t elapsed)
+{
+    ogs_trace("------- fd statistics ---------");
+    ogs_trace(" Executing for: %llu.%06llu sec",
+              (unsigned long long)ogs_time_sec(elapsed),
+              (unsigned long long)ogs_time_usec(elapsed));
+
+    if (self.mode & FD_MODE_SERVER) {
+        ogs_trace(" Server: %llu message(s) echoed",
+                stats->nb_echoed);
+    }
+    if (self.mode & FD_MODE_CLIENT) {
+        ogs_trace(" Client:");
+        ogs_trace("   %llu message(s) sent", stats->nb_sent);
+        ogs_trace("   %llu error(s) received", stats->nb_errs);
+        ogs_trace("   %llu answer(s) received", stats->nb_recv);
+        ogs_trace("     fastest: %ld.%06ld sec.",
+                stats->shortest / 1000000, stats->shortest % 1000000);
+        ogs_trace("     slowest: %ld.%06ld sec.",
+                stats->longest / 1000000, stats->longest % 1000000);
+        ogs_trace("     Average: %ld.%06ld sec.",
+                stats->avg / 1000000, stats->avg % 1000000);
+    }
+    ogs_trace("-------------------------------------");
+}
+
+/* Function to display statistics periodically */
+static void diam_stats_timer_cb(void *data)
+{
+    ogs_time_t now, since_start, since_prev, next_run;
+    ogs_diam_stats_t copy;
+
+    /* Now, get the current stats */
+    CHECK_POSIX_DO( pthread_mutex_lock(&self.stats_lock), );
+    memcpy(&copy, &self.stats, sizeof(ogs_diam_stats_t));
+    if (self.priv_stats_copy)
+        memcpy(self.priv_stats_copy, self.priv_stats, self.priv_stats_size);
+    CHECK_POSIX_DO( pthread_mutex_unlock(&self.stats_lock), );
+
+    /* Get the current execution time */
+    now = ogs_get_monotonic_time();
+    since_start = now - self.poll.t_start;
+
+    /* Now, display everything */
+    ogs_diam_stats_log(&copy, since_start);
+
+    /* Trigger user callback: */
+    if (self.update_cb)
+        self.update_cb(&copy, self.priv_stats_copy);
+
+    /* Re-schedule timer: */
+    now = ogs_get_monotonic_time();
+    since_prev = now - self.poll.t_prev;
+    /* Avoid increasing drift: */
+    if (since_prev > self.poll.t_interval) {
+        if (since_prev - self.poll.t_interval >= self.poll.t_interval)
+            next_run = 1; /* 0 not accepted by ogs_timer_start() */
+        else
+            next_run = self.poll.t_interval - (since_prev - self.poll.t_interval);
+    } else {
+        next_run = self.poll.t_interval;
+    }
+    self.poll.t_prev = now;
+    ogs_timer_start(self.poll.timer, next_run);
+}
+

lib/diameter/common/stats.h

@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#if !defined(OGS_DIAMETER_INSIDE) && !defined(OGS_DIAMETER_COMPILATION)
+#error "This header cannot be included directly."
+#endif
+
+#ifndef OGS_DIAM_STATS_H
+#define OGS_DIAM_STATS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/time.h>
+
+typedef struct ogs_diam_stats_s {
+    unsigned long long nb_echoed; /* server */
+    unsigned long long nb_sent;   /* client */
+    unsigned long long nb_recv;   /* client */
+    unsigned long long nb_errs;   /* client */
+    unsigned long shortest;  /* fastest answer, in microseconds */
+    unsigned long longest;   /* slowest answer, in microseconds */
+    unsigned long avg;       /* average answer time, in microseconds */
+} ogs_diam_stats_t;
+
+typedef void (*ogs_diam_stats_update_cb)(const ogs_diam_stats_t *stats, const void *priv_stats);
+
+typedef struct ogs_diam_stats_ctx_s {
+
+#define FD_MODE_SERVER   0x1
+#define FD_MODE_CLIENT   0x2
+    int mode;        /* default FD_MODE_SERVER | FD_MODE_CLIENT */
+
+    struct poll {
+        ogs_timer_t *timer;
+        ogs_time_t t_start; /* in usecs */
+        ogs_time_t t_prev; /* in usecs */
+        ogs_time_t t_interval; /* in usecs */
+    } poll;
+    ogs_diam_stats_t stats;
+    void *priv_stats; /* if !NULL, allocated struct of size "priv_stats_size" */
+    size_t priv_stats_size;
+    void *priv_stats_copy; /* buffer where priv_state are copied and passed to update_cb */
+    ogs_diam_stats_update_cb update_cb;
+
+    pthread_mutex_t stats_lock;
+} ogs_diam_stats_ctx_t;
+
+int ogs_diam_stats_init(int mode, const ogs_diam_config_stats_t *config);
+void ogs_diam_stats_final(void);
+
+ogs_diam_stats_ctx_t* ogs_diam_stats_self(void);
+#define OGS_DIAM_STATS_ADD(field, val) ogs_diam_stats_self()->stats.field += val
+#define OGS_DIAM_STATS_INC(field) OGS_DIAM_STATS_ADD(field, 1)
+
+#define OGS_DIAM_STATS_MTX(code) \
+    ogs_assert(pthread_mutex_lock(&ogs_diam_stats_self()->stats_lock) == 0); \
+    { code } \
+    ogs_assert(pthread_mutex_unlock(&ogs_diam_stats_self()->stats_lock) == 0);
+
+
+int ogs_diam_stats_start(void);
+
+void ogs_diam_stats_update_cb_register(ogs_diam_stats_update_cb cb);
+void ogs_diam_stats_update_cb_unregister(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OGS_DIAM_STATS_H */

lib/diameter/common/util.c

@@ -19,7 +19,7 @@
 
 #include "ogs-diameter-common.h"
 
-bool ogs_diam_app_connected(uint32_t app_id)
+bool ogs_diam_is_relay_or_app_advertised(uint32_t app_id)
 {
     struct fd_list *li = NULL;
     struct fd_app *found = NULL;
@@ -36,18 +36,23 @@ bool ogs_diam_app_connected(uint32_t app_id)
         if (state == STATE_OPEN) {
             ogs_debug("'%s' STATE is OPEN", p->info.pi_diamid);
 
-            /* Check if the remote peer advertised the message's appli */
-            fd_app_check(&p->info.runtime.pir_apps, app_id, &found);
-
-            if (found) break;
+            if (p->info.runtime.pir_relay) {
+                ogs_debug("'%s' RELAY is enabled", p->info.pi_diamid);
+                CHECK_POSIX( pthread_rwlock_unlock(&fd_g_peers_rw) );
+                return true;
+            } else {
+                /* Check if the remote peer advertised the message's appli */
+                fd_app_check(&p->info.runtime.pir_apps, app_id, &found);
+                if (found) {
+                    CHECK_POSIX( pthread_rwlock_unlock(&fd_g_peers_rw) );
+                    return true;
+                }
+            }
         } else {
             ogs_debug("'%s' STATE[%d] is NOT open ", p->info.pi_diamid, state);
         }
     }
     CHECK_POSIX( pthread_rwlock_unlock(&fd_g_peers_rw) );
 
-    if (found)
-        return true;
-    else
-        return false;
+    return false;
 }

lib/diameter/s6a/message.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -92,6 +92,10 @@ struct dict_object *ogs_diam_s6a_software_version = NULL;
 struct dict_object *ogs_diam_s6a_msisdn = NULL;
 struct dict_object *ogs_diam_s6a_a_msisdn = NULL;
 
+struct dict_object *ogs_diam_s6a_supported_features = NULL;
+struct dict_object *ogs_diam_s6a_feature_list_id = NULL;
+struct dict_object *ogs_diam_s6a_feature_list = NULL;
+
 extern int ogs_dict_s6a_entry(char *conffile);
 
 int ogs_diam_s6a_init(void)
@@ -176,5 +180,9 @@ int ogs_diam_s6a_init(void)
     CHECK_dict_search(DICT_AVP, AVP_BY_NAME_ALL_VENDORS, "MSISDN", &ogs_diam_s6a_msisdn);
     CHECK_dict_search(DICT_AVP, AVP_BY_NAME_ALL_VENDORS, "A-MSISDN", &ogs_diam_s6a_a_msisdn);
 
+    CHECK_dict_search(DICT_AVP, AVP_BY_NAME_ALL_VENDORS, "Supported-Features", &ogs_diam_s6a_supported_features);
+    CHECK_dict_search(DICT_AVP, AVP_BY_NAME_ALL_VENDORS, "Feature-List-ID", &ogs_diam_s6a_feature_list_id);
+    CHECK_dict_search(DICT_AVP, AVP_BY_NAME_ALL_VENDORS, "Feature-List", &ogs_diam_s6a_feature_list);
+
     return 0;
 }

lib/diameter/s6a/message.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -36,6 +36,7 @@ extern "C" {
 #define OGS_DIAM_S6A_AVP_CODE_ALL_APN_CONFIG_INC_IND    (1428)
 #define OGS_DIAM_S6A_AVP_CODE_APN_CONFIGURATION         (1430)
 #define OGS_DIAM_S6A_AVP_CODE_MIP_HOME_AGENT_ADDRESS    (334)
+#define OGS_DIAM_S6A_AVP_CODE_MIP_HOME_AGENT_HOST       (348)
 #define OGS_DIAM_S6A_AVP_CODE_SERVED_PARTY_IP_ADDRESS   (848)
 
 #define OGS_DIAM_S6A_RAT_TYPE_WLAN                      0
@@ -70,7 +71,7 @@ extern "C" {
 
 #define OGS_DIAM_S6A_CT_MME_UPDATE_PROCEDURE            (0)
 #define OGS_DIAM_S6A_CT_SGSN_UPDATE_PROCEDURE           (1)
-#define OGS_DIAM_S6A_CT_SUBSCRIPTION_WITHDRAWL          (2)
+#define OGS_DIAM_S6A_CT_SUBSCRIPTION_WITHDRAWAL          (2)
 #define OGS_DIAM_S6A_CT_UPDATE_PROCEDURE_IWF            (3)
 #define OGS_DIAM_S6A_CT_INITIAL_ATTACH_PROCEDURE        (4)
 
@@ -158,6 +159,10 @@ extern struct dict_object *ogs_diam_s6a_software_version;
 extern struct dict_object *ogs_diam_s6a_msisdn;
 extern struct dict_object *ogs_diam_s6a_a_msisdn;
 
+extern struct dict_object *ogs_diam_s6a_supported_features;
+extern struct dict_object *ogs_diam_s6a_feature_list_id;
+extern struct dict_object *ogs_diam_s6a_feature_list;
+
 typedef struct ogs_diam_e_utran_vector_s {
     uint8_t                 xres[OGS_MAX_RES_LEN];
     uint8_t                 xres_len;

lib/gtp/context.c

@@ -77,6 +77,7 @@ int ogs_gtp_context_parse_config(const char *local, const char *remote)
     int rv;
     yaml_document_t *document = NULL;
     ogs_yaml_iter_t root_iter;
+    int idx = 0;
 
     document = ogs_app()->document;
     ogs_assert(document);
@@ -88,7 +89,8 @@ int ogs_gtp_context_parse_config(const char *local, const char *remote)
     while (ogs_yaml_iter_next(&root_iter)) {
         const char *root_key = ogs_yaml_iter_key(&root_iter);
         ogs_assert(root_key);
-        if (!strcmp(root_key, local)) {
+        if ((!strcmp(root_key, local)) &&
+            (idx++ == ogs_app()->config_section_id)) {
             ogs_yaml_iter_t local_iter;
             ogs_yaml_iter_recurse(&root_iter, &local_iter);
             while (ogs_yaml_iter_next(&local_iter)) {
@@ -198,6 +200,7 @@ int ogs_gtp_context_parse_config(const char *local, const char *remote)
                                                 server_key);
                                 }
 
+                                /* Add address information */
                                 addr = NULL;
                                 for (i = 0; i < num; i++) {
                                     rv = ogs_addaddrinfo(&addr,
@@ -205,17 +208,30 @@ int ogs_gtp_context_parse_config(const char *local, const char *remote)
                                     ogs_assert(rv == OGS_OK);
                                 }
 
+                                /* Add each address as a separate socknode */
                                 if (addr) {
-                                    if (ogs_global_conf()->parameter.
-                                            no_ipv4 == 0)
-                                        ogs_socknode_add(
-                                            &self.gtpc_list, AF_INET, addr,
-                                            is_option ? &option : NULL);
-                                    if (ogs_global_conf()->parameter.
-                                            no_ipv6 == 0)
-                                        ogs_socknode_add(
-                                            &self.gtpc_list6, AF_INET6, addr,
-                                            is_option ? &option : NULL);
+                                    ogs_sockaddr_t *current = addr;
+                                    while (current) {
+                                        if (current->ogs_sa_family ==
+                                                AF_INET &&
+                                            ogs_global_conf()->
+                                                parameter.no_ipv4 == 0) {
+                                            ogs_socknode_add(&self.gtpc_list,
+                                                             AF_INET, current,
+                                                             is_option ?
+                                                             &option : NULL);
+                                        }
+                                        if (current->ogs_sa_family ==
+                                                AF_INET6 &&
+                                            ogs_global_conf()->
+                                                parameter.no_ipv6 == 0) {
+                                            ogs_socknode_add(&self.gtpc_list6,
+                                                             AF_INET6, current,
+                                                             is_option ?
+                                                             &option : NULL);
+                                        }
+                                        current = current->next;
+                                    }
                                     ogs_freeaddrinfo(addr);
                                 }
 
@@ -415,16 +431,28 @@ int ogs_gtp_context_parse_config(const char *local, const char *remote)
                                 ogs_list_init(&list6);
 
                                 if (addr) {
-                                    if (ogs_global_conf()->parameter.
-                                            no_ipv4 == 0)
-                                        ogs_socknode_add(
-                                            &list, AF_INET, addr,
-                                            is_option ? &option : NULL);
-                                    if (ogs_global_conf()->parameter.
-                                            no_ipv6 == 0)
-                                        ogs_socknode_add(
-                                            &list6, AF_INET6, addr,
-                                            is_option ? &option : NULL);
+                                    ogs_sockaddr_t *current = addr;
+                                    while (current) {
+                                        if (current->ogs_sa_family ==
+                                                AF_INET &&
+                                            ogs_global_conf()->
+                                                parameter.no_ipv4 == 0) {
+                                            ogs_socknode_add(&list,
+                                                             AF_INET, current,
+                                                             is_option ?
+                                                             &option : NULL);
+                                        }
+                                        if (current->ogs_sa_family ==
+                                                AF_INET6 &&
+                                            ogs_global_conf()->
+                                                parameter.no_ipv6 == 0) {
+                                            ogs_socknode_add(&list6,
+                                                             AF_INET6, current,
+                                                             is_option ?
+                                                             &option : NULL);
+                                        }
+                                        current = current->next;
+                                    }
                                     ogs_freeaddrinfo(addr);
                                 }
 
@@ -453,11 +481,18 @@ int ogs_gtp_context_parse_config(const char *local, const char *remote)
                                 rv = ogs_filteraddrinfo(&adv_addr6, AF_INET6);
                                 ogs_assert(rv == OGS_OK);
 
+                                if (adv_addr || adv_addr6) {
+                                    rv = ogs_sockaddr_to_ip(
+                                            adv_addr, adv_addr6,
+                                            &self.gtpu_ip);
+                                    ogs_assert(rv == OGS_OK);
+                                }
+
                         /* Find first IPv4/IPv6 address in the list.
                          *
                          * In the following configuration,
                          * 127.0.0.4, 127.0.0.5 and 2001:db8:cafe::1 are ignored
-                         * on PFCP Assocation Response message's
+                         * on PFCP Association Response message's
                          * user plane IP resource information.
                          *
                          * gtpu:

lib/gtp/path.c

@@ -129,6 +129,35 @@ int ogs_gtp_sendto(ogs_gtp_node_t *gnode, ogs_pkbuf_t *pkbuf)
     return OGS_OK;
 }
 
+int ogs_gtp_send_with_teid(
+        ogs_sock_t *sock,
+        ogs_pkbuf_t *pkbuf, uint32_t teid,
+        ogs_sockaddr_t *to)
+{
+    char buf[OGS_ADDRSTRLEN];
+    ssize_t sent;
+    ogs_gtp2_header_t *gtp_h = NULL;
+
+    ogs_assert(sock);
+    ogs_assert(pkbuf);
+    ogs_assert(to);
+
+    gtp_h = (ogs_gtp2_header_t *)pkbuf->data;
+    ogs_assert(gtp_h);
+    gtp_h->teid = htobe32(teid);
+
+    ogs_trace("SEND GTP-U to Peer[%s] : TEID[0x%x]", OGS_ADDR(to, buf), teid);
+
+    sent = ogs_sendto(sock->fd, pkbuf->data, pkbuf->len, 0, to);
+    if (sent < 0 || sent != pkbuf->len) {
+        ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
+                "ogs_sendto() failed");
+        return OGS_ERROR;
+    }
+
+    return OGS_OK;
+}
+
 void ogs_gtp_send_error_message(
         ogs_gtp_xact_t *xact, uint32_t teid, uint8_t type, uint8_t cause_value)
 {

lib/gtp/path.h

@@ -57,9 +57,10 @@ extern "C" {
         \
         ogs_assert(ogs_gtp_self()->gtpu_addr || ogs_gtp_self()->gtpu_addr6); \
         \
-        ogs_sockaddr_to_ip( \
-                ogs_gtp_self()->gtpu_addr, ogs_gtp_self()->gtpu_addr6, \
-                &ogs_gtp_self()->gtpu_ip); \
+        if (!ogs_gtp_self()->gtpu_ip.ipv4 && !ogs_gtp_self()->gtpu_ip.ipv6) \
+            ogs_sockaddr_to_ip( \
+                    ogs_gtp_self()->gtpu_addr, ogs_gtp_self()->gtpu_addr6, \
+                    &ogs_gtp_self()->gtpu_ip); \
     } while(0)
 
 ogs_sock_t *ogs_gtp_server(ogs_socknode_t *node);
@@ -68,6 +69,11 @@ int ogs_gtp_connect(ogs_sock_t *ipv4, ogs_sock_t *ipv6, ogs_gtp_node_t *gnode);
 int ogs_gtp_send(ogs_gtp_node_t *gnode, ogs_pkbuf_t *pkbuf);
 int ogs_gtp_sendto(ogs_gtp_node_t *gnode, ogs_pkbuf_t *pkbuf);
 
+int ogs_gtp_send_with_teid(
+        ogs_sock_t *sock,
+        ogs_pkbuf_t *pkbuf, uint32_t teid,
+        ogs_sockaddr_t *to);
+
 void ogs_gtp_send_error_message(
         ogs_gtp_xact_t *xact, uint32_t teid, uint8_t type, uint8_t cause_value);
 

lib/gtp/v1/types.c

@@ -921,6 +921,12 @@ int ogs_gtp1_parse_pdp_context(
     CHECK_SPACE_ERR(1 + *ptr);
     rv = ogs_fqdn_parse(decoded->apn, (const char *)ptr + 1,
                         ogs_min(*ptr, sizeof(decoded->apn)));
+    /* Clang scan-build SA: Value stored is not used: add check for rv error. */
+    if (rv < 0) {
+        ogs_error("ogs_fqdn_parse() failed");
+        return OGS_ERROR;
+    }
+
     ptr += 1 + *ptr;
 
     CHECK_SPACE_ERR(2);