Release v2.1.4

* AAR Media-Sub-Component modification for more UEs support

* Introduce parameter for legacy support for pre-release LTE 11 devices to do calling

IE (IPV4-local-addr field ) is not supported on
the LTE pre release-11 UEs. In order for the call
to work the local address in packet filter must
be replaced by any.

Parameter: no_ipv4v6_local_addr_in_packet_filter

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+#github: [acetcom, open5gs]
+github: acetcom
+#patreon: # Replace with a single Patreon username
+open_collective: open5gs
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+#liberapay: # Replace with a single Liberapay username
+#issuehunt: # Replace with a single IssueHunt username
+#otechie: # Replace with a single Otechie username
+#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/stale.yml

@@ -0,0 +1,61 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 180
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - "[Status] Maybe Later"
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: wontfix
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue/PR has been automatically marked as stale because it has not had
+  recent activity for 180 days. It will be closed if no further activity
+  occurs in 7 dayss. Thank you for your contributions!
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

README.md

@@ -1,14 +1,57 @@
+<h2 align="center">Supporting Open5GS</h2>
+
+If you find Open5GS useful for work, please consider supporting this Open Source project by [Becoming a sponsor](https://github.com/sponsors/acetcom). To manage the funding transactions transparently, you can donate through [OpenCollective](https://opencollective.com/open5gs).
+
+<h3 align="center">Special Sponsor</h3>
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+  <a href="https://nextepc.com/" target="_blank">
+    <img width="260px" src="https://open5gs.org/assets/img/nextepc_logo.jpg">
+  </a>
+      </td>
+      <td align="center" valign="middle">
+  <a href="https://sdr.eee.strath.ac.uk/" target="_blank">
+    <img width="260px" src="https://open5gs.org/assets/img/strath.png">
+  </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<h3 align="center">Sponsors</h3>
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://www.auctionsoftware.com/" target="_blank">
+          <img width="222px" src="https://open5gs.org/assets/img/asLogonew.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://www.wearetriple.com/" target="_blank">
+          <img width="222px" src="https://open5gs.org/assets/img/triple_logo.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://www.accessparks.com/" target="_blank">
+          <img width="222px" src="https://open5gs.org/assets/img/AccessParks.png">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
 ## Documentation
 
 If you don't understand something about Open5GS, the [https://open5gs.org/open5gs/docs/](https://open5gs.org/open5gs/docs/) is a great place to look for answers.
 
-## Support
+## Community
 
-Problem with Open5GS can be filed as [issues](https://github.com/open5gs/open5gs/issues) in this repository. 
-
-Discussions related to this project are happening on the [nextepc@lists.osmocom.org](mailto:nextepc@lists.osmocom.org) mailing list, please see <https://lists.osmocom.org/mailman/listinfo/nextepc> for subscription options and the list archive.
-
-Voice and text chat available in Open5GS's [Discord](https://discordapp.com/) workspace. Use [this link](https://discord.gg/GreNkuc) to get started.
+- Problem with Open5GS can be filed as [issues](https://github.com/open5gs/open5gs/issues) in this repository.
+- Other topics related to this project are happening on the [discussions](https://github.com/open5gs/open5gs/discussions).
+- Voice and text chat are available in Open5GS's [Discord](https://discordapp.com/) workspace. Use [this link](https://discord.gg/GreNkuc) to get started.
 
 ## Contributing
 
@@ -16,4 +59,5 @@ If you're contributing through a pull request to Open5GS project on GitHub, plea
 
 ## License
 
-Open5GS source files are made available under the terms of the GNU Affero General Public License (GNU AGPLv3).
+- Open5GS Open Source files are made available under the terms of the GNU Affero General Public License ([GNU AGPL v3.0](https://www.gnu.org/licenses/agpl-3.0.html)).
+- [Commercial licenses](https://open5gs.org/open5gs/support/) are also available from [NextEPC, Inc.](https://nextepc.com)

configs/00101.yaml.in

@@ -1,101 +0,0 @@
-db_uri: mongodb://localhost/open5gs
-
-logger:
-
-parameter:
-
-amf:
-    sbi:
-      - addr: 127.0.0.2
-        port: 7777
-    ngap:
-      - addr: 127.0.0.2
-    guami:
-      - plmn_id:
-          mcc: 001
-          mnc: 01
-        amf_id:
-          region: 1
-          set: 1
-          pointer: 1
-    tai:
-      - plmn_id:
-          mcc: 001
-          mnc: 01
-        tac: 81
-    plmn:
-      - 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
-
-smf:
-    sbi:
-      - addr: 127.0.0.3
-        port: 7777
-    gtpc:
-      - addr: 127.0.0.3
-      - addr: ::1
-    pfcp:
-      - addr: 127.0.0.3
-    pdn:
-      - addr: 10.45.0.1/16
-      - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-    freeDiameter:
-      identity: pgw.open-ims.test
-      realm: open-ims.test
-      listen_on: 127.0.0.3
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
-      connect:
-        - identity: pcrf.open-ims.test
-          addr: 127.0.0.5
-upf:
-    pfcp:
-      - addr: 127.0.0.4
-    gtpu:
-      - addr:
-        - 127.0.0.4
-        - ::1
-    pdn:
-
-ausf:
-    sbi:
-      - addr: 127.0.0.5
-        port: 7777
-
-udm:
-    sbi:
-      - addr: 127.0.0.6
-        port: 7777
-
-udr:
-    sbi:
-      - addr: 127.0.0.7
-        port: 7777
-nrf:
-    sbi:
-      - addr:
-          - 127.0.0.1
-          - ::1
-        port: 7777

configs/310014.yaml.in

@@ -3,7 +3,19 @@ db_uri: mongodb://localhost/open5gs
 logger:
 
 parameter:
-    no_ipv6: true
+#    no_nrf: true
+#    no_amf: true
+#    no_smf: true
+#    no_upf: true
+#    no_ausf: true
+#    no_udm: true
+#    no_pcf: true
+#    no_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
 
 mme:
     freeDiameter:
@@ -21,33 +33,56 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
-          addr: 127.0.0.4
+          addr: 127.0.0.8
 
     s1ap:
-      addr: 127.0.0.1
+      - addr: 127.0.0.2
     gtpc:
-      addr: 127.0.0.1
-    gummei: 
+      - addr: 127.0.0.2
+    gummei:
       plmn_id:
         mcc: 310
         mnc: 014
-      mme_gid: 32798
-      mme_code: 100
+      mme_gid: 2
+      mme_code: 1
     tai:
       plmn_id:
         mcc: 310
         mnc: 014
-      tac: [50, 51, 52, 53]
+      tac: 1
     security:
-        integrity_order : [ EIA1, EIA2, EIA0 ]
+        integrity_order : [ EIA2, EIA1, EIA0 ]
         ciphering_order : [ EEA0, EEA1, EEA2 ]
 
     network_name:
         full: Open5GS
 
-hss:
+sgwc:
+    gtpc:
+      - addr: 127.0.0.3
+    pfcp:
+      - addr: 127.0.0.3
+
+smf:
+    sbi:
+      - addr: 127.0.0.4
+        port: 7777
+    gtpc:
+      - addr: 127.0.0.4
+      - addr: ::1
+    pfcp:
+      - addr: 127.0.0.4
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+      - 2001:4860:4860::8888
+      - 2001:4860:4860::8844
+    mtu: 1400
     freeDiameter:
-      identity: hss.localdomain
+      identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
       load_extension:
@@ -60,20 +95,59 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: mme.localdomain
-          addr: 127.0.0.2
+        - identity: pcrf.localdomain
+          addr: 127.0.0.9
+amf:
+    sbi:
+      - addr: 127.0.0.5
+        port: 7777
+    ngap:
+      - addr: 127.0.0.5
+    guami:
+      - plmn_id:
+          mcc: 310
+          mnc: 014
+        amf_id:
+          region: 2
+          set: 1
+    tai:
+      - plmn_id:
+          mcc: 310
+          mnc: 014
+        tac: 1
+    plmn_support:
+      - plmn_id:
+          mcc: 310
+          mnc: 014
+        s_nssai:
+          - sst: 1
+    security:
+        integrity_order : [ NIA2, NIA1, NIA0 ]
+        ciphering_order : [ NEA0, NEA1, NEA2 ]
+    network_name:
+        full: Open5GS
+    amf_name: open5gs-amf0
 
-sgw:
-    gtpc:
-      addr: 127.0.0.2
+sgwu:
     gtpu:
-      addr: 127.0.0.2
+      - addr: 127.0.0.6
+    pfcp:
+      - addr: 127.0.0.6
 
-pgw:
+upf:
+    pfcp:
+      - addr: 127.0.0.7
+    gtpu:
+      - addr: 127.0.0.7
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+
+hss:
     freeDiameter:
-      identity: pgw.localdomain
+      identity: hss.localdomain
       realm: localdomain
-      listen_on: 127.0.0.3
+      listen_on: 127.0.0.8
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -84,35 +158,13 @@ pgw:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-      connect:
-        - identity: pcrf.localdomain
-          addr: 127.0.0.5
-
-    gtpc:
-      - addr:
-        - 127.0.0.3
-        - ::1
-      - addr:
-        - 127.0.0.4
-        apn: starent.com
-    gtpu:
-      - addr: 127.0.0.3
-      - addr: ::1
-    pdn:
-      - addr: 10.45.0.1/16
-      - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-
+        - identity: mme.localdomain
+          addr: 127.0.0.2
 pcrf:
     freeDiameter:
       identity: pcrf.localdomain
       realm: localdomain
-      listen_on: 127.0.0.5
+      listen_on: 127.0.0.9
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -123,5 +175,32 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: pgw.localdomain
-          addr: 127.0.0.3
+        - identity: smf.localdomain
+          addr: 127.0.0.4
+
+nrf:
+    sbi:
+      - addr:
+        - 127.0.0.10
+        - ::1
+        port: 7777
+
+ausf:
+    sbi:
+      - addr: 127.0.0.11
+        port: 7777
+
+udm:
+    sbi:
+      - addr: 127.0.0.12
+        port: 7777
+
+pcf:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777
+
+udr:
+    sbi:
+      - addr: 127.0.0.20
+        port: 7777

configs/5gc-sample.yaml.in

@@ -1,100 +0,0 @@
-db_uri: mongodb://localhost/open5gs
-
-logger:
-
-parameter:
-
-amf:
-    sbi:
-      - addr: 127.0.0.2
-        port: 7777
-    ngap:
-      - addr: 127.0.0.2
-    guami:
-      - plmn_id:
-          mcc: 901
-          mnc: 70
-        amf_id:
-          region: 2
-          set: 1
-    tai:
-      - plmn_id:
-          mcc: 901
-          mnc: 70
-        tac: 1
-    plmn:
-      - plmn_id:
-          mcc: 901
-          mnc: 70
-        s_nssai:
-          - sst: 1
-    security:
-        integrity_order : [ NIA1, NIA2, NIA0 ]
-        ciphering_order : [ NEA0, NEA1, NEA2 ]
-    network_name:
-        full: Open5GS
-    amf_name: open5gs-amf0
-
-smf:
-    sbi:
-      - addr: 127.0.0.3
-        port: 7777
-    gtpc:
-      - addr: 127.0.0.3
-      - addr: ::1
-    pfcp:
-      - addr: 127.0.0.3
-    pdn:
-      - addr: 10.45.0.1/16
-      - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-    freeDiameter:
-      identity: pgw.open-ims.test
-      realm: open-ims.test
-      listen_on: 127.0.0.3
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
-      connect:
-        - identity: pcrf.open-ims.test
-          addr: 127.0.0.5
-upf:
-    pfcp:
-      - addr: 127.0.0.4
-    gtpu:
-      - addr:
-        - 127.0.0.4
-        - ::1
-    pdn:
-
-ausf:
-    sbi:
-      - addr: 127.0.0.5
-        port: 7777
-
-udm:
-    sbi:
-      - addr: 127.0.0.6
-        port: 7777
-
-udr:
-    sbi:
-      - addr: 127.0.0.7
-        port: 7777
-nrf:
-    sbi:
-      - addr:
-          - 127.0.0.1
-          - ::1
-        port: 7777

configs/5gc.yaml.in

@@ -1,96 +0,0 @@
-db_uri: mongodb://localhost/open5gs
-
-logger:
-
-parameter:
-
-amf:
-    sbi:
-      - addr: 127.0.0.2
-        port: 7777
-    ngap:
-    guami:
-      - plmn_id:
-          mcc: 901
-          mnc: 70
-        amf_id:
-          region: 2
-          set: 1
-    tai:
-      - plmn_id:
-          mcc: 901
-          mnc: 70
-        tac: 1
-    plmn:
-      - plmn_id:
-          mcc: 901
-          mnc: 70
-        s_nssai:
-          - sst: 1
-    security:
-        integrity_order : [ NIA1, NIA2, NIA0 ]
-        ciphering_order : [ NEA0, NEA1, NEA2 ]
-    network_name:
-        full: Open5GS
-    amf_name: open5gs-amf0
-
-smf:
-    sbi:
-      - addr: 127.0.0.3
-        port: 7777
-    gtpc:
-      - addr: 127.0.0.3
-      - addr: ::1
-    pfcp:
-      - addr: 127.0.0.3
-    pdn:
-      - addr: 10.45.0.1/16
-      - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-    freeDiameter:
-      identity: pgw.open-ims.test
-      realm: open-ims.test
-      listen_on: 127.0.0.3
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
-      connect:
-        - identity: pcrf.open-ims.test
-          addr: 127.0.0.5
-upf:
-    pfcp:
-      addr: 127.0.0.4
-    gtpu:
-    pdn:
-
-ausf:
-    sbi:
-      - addr: 127.0.0.5
-        port: 7777
-
-udm:
-    sbi:
-      - addr: 127.0.0.6
-        port: 7777
-
-udr:
-    sbi:
-      - addr: 127.0.0.7
-        port: 7777
-nrf:
-    sbi:
-      - addr:
-          - 127.0.0.1
-          - ::1
-        port: 7777

configs/csfb.yaml.in

@@ -3,7 +3,19 @@ db_uri: mongodb://localhost/open5gs
 logger:
 
 parameter:
-    no_ipv6: true
+#    no_nrf: true
+#    no_amf: true
+#    no_smf: true
+#    no_upf: true
+#    no_ausf: true
+#    no_udm: true
+#    no_pcf: true
+#    no_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
 
 mme:
     freeDiameter:
@@ -21,12 +33,12 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
-          addr: 127.0.0.4
+          addr: 127.0.0.8
 
     s1ap:
-      addr: 127.0.0.1
+      - addr: 127.0.0.2
     gtpc:
-      addr: 127.0.0.1
+      - addr: 127.0.0.2
     sgsap:
       - addr: 127.0.0.2
         map:
@@ -51,7 +63,7 @@ mme:
               mcc: 724
               mnc: 21
             lac: 51544
-    gummei: 
+    gummei:
       - plmn_id:
           mcc: 901
           mnc: 70
@@ -73,15 +85,38 @@ mme:
         mnc: 21
       tac: 12345
     security:
-        integrity_order : [ EIA1, EIA2, EIA0 ]
+        integrity_order : [ EIA2, EIA1, EIA0 ]
         ciphering_order : [ EEA0, EEA1, EEA2 ]
 
     network_name:
         full: Open5GS
 
-hss:
+sgwc:
+    gtpc:
+      - addr: 127.0.0.3
+    pfcp:
+      - addr: 127.0.0.3
+
+smf:
+#    sbi:
+#      - addr: 127.0.0.4
+#        port: 7777
+    gtpc:
+      - addr: 127.0.0.4
+      - addr: ::1
+    pfcp:
+      - addr: 127.0.0.4
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+      - 2001:4860:4860::8888
+      - 2001:4860:4860::8844
+    mtu: 1400
     freeDiameter:
-      identity: hss.localdomain
+      identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
       load_extension:
@@ -94,20 +129,59 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: mme.localdomain
-          addr: 127.0.0.2
+        - identity: pcrf.localdomain
+          addr: 127.0.0.9
+amf:
+    sbi:
+      - addr: 127.0.0.5
+        port: 7777
+    ngap:
+      - addr: 127.0.0.5
+    guami:
+      - plmn_id:
+          mcc: 901
+          mnc: 70
+        amf_id:
+          region: 2
+          set: 1
+    tai:
+      - plmn_id:
+          mcc: 901
+          mnc: 70
+        tac: 1
+    plmn_support:
+      - plmn_id:
+          mcc: 901
+          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
 
-sgw:
-    gtpc:
-      addr: 127.0.0.2
+sgwu:
     gtpu:
-      addr: 127.0.0.2
+      - addr: 127.0.0.6
+    pfcp:
+      - addr: 127.0.0.6
 
-pgw:
+upf:
+    pfcp:
+      - addr: 127.0.0.7
+    gtpu:
+      - addr: 127.0.0.7
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+
+hss:
     freeDiameter:
-      identity: pgw.localdomain
+      identity: hss.localdomain
       realm: localdomain
-      listen_on: 127.0.0.3
+      listen_on: 127.0.0.8
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -118,31 +192,13 @@ pgw:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: pcrf.localdomain
-          addr: 127.0.0.5
-
-    gtpc:
-      - addr:
-        - 127.0.0.3
-        - ::1
-    gtpu:
-      - addr: 127.0.0.3
-      - addr: ::1
-    pdn:
-      - addr: 10.45.0.1/16
-      - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-
+        - identity: mme.localdomain
+          addr: 127.0.0.2
 pcrf:
     freeDiameter:
       identity: pcrf.localdomain
       realm: localdomain
-      listen_on: 127.0.0.5
+      listen_on: 127.0.0.9
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -153,5 +209,32 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: pgw.localdomain
-          addr: 127.0.0.3
+        - identity: smf.localdomain
+          addr: 127.0.0.4
+
+#nrf:
+#    sbi:
+#      - addr:
+#        - 127.0.0.10
+#        - ::1
+#        port: 7777
+
+ausf:
+    sbi:
+      - addr: 127.0.0.11
+        port: 7777
+
+udm:
+    sbi:
+      - addr: 127.0.0.12
+        port: 7777
+
+pcf:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777
+
+udr:
+    sbi:
+      - addr: 127.0.0.20
+        port: 7777

configs/cups.yaml.in

@@ -1,136 +0,0 @@
-db_uri: mongodb://localhost/open5gs
-
-logger:
-
-parameter:
-
-mme:
-    freeDiameter:
-      identity: mme.open-ims.test
-      realm: open-ims.test
-      listen_on: 127.0.0.2
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
-      connect:
-        - identity: hss.open-ims.test
-          addr: 127.0.0.4
-
-    s1ap:
-      addr: 127.0.0.1
-    gtpc:
-      addr: 127.0.0.1
-    gummei: 
-      plmn_id:
-        mcc: 001
-        mnc: 01
-      mme_gid: 2
-      mme_code: 1
-    tai:
-      plmn_id:
-        mcc: 001
-        mnc: 01
-      tac: 12345
-    security:
-        integrity_order : [ EIA1, EIA2, EIA0 ]
-        ciphering_order : [ EEA0, EEA1, EEA2 ]
-
-hss:
-    freeDiameter:
-      identity: hss.open-ims.test
-      realm: open-ims.test
-      listen_on: 127.0.0.4
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
-      connect:
-        - identity: mme.open-ims.test
-          addr: 127.0.0.2
-
-sgw:
-    gtpc:
-      addr: 127.0.0.2
-    gtpu:
-      addr: 127.0.0.2
-
-smf:
-    sbi:
-      - addr: 127.0.0.3
-        port: 7777
-    gtpc:
-      - addr: 127.0.0.3
-      - addr: ::1
-    pfcp:
-      - addr: 127.0.0.3
-    pdn:
-      - addr: 10.45.0.1/16
-      - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-    freeDiameter:
-      identity: pgw.open-ims.test
-      realm: open-ims.test
-      listen_on: 127.0.0.3
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
-      connect:
-        - identity: pcrf.open-ims.test
-          addr: 127.0.0.5
-nrf:
-    sbi:
-      addr:
-        - 127.0.0.1
-        - ::1
-      port: 7777
-
-upf:
-    pfcp:
-      - addr: 127.0.0.4
-    gtpu:
-      - addr:
-        - 127.0.0.4
-        - ::1
-    pdn:
-
-pcrf:
-    freeDiameter:
-      identity: pcrf.open-ims.test
-      realm: open-ims.test
-      listen_on: 127.0.0.5
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
-      connect:
-        - identity: pgw.open-ims.test
-          addr: 127.0.0.3
-        - identity: pcscf.open-ims.test
-          addr: 127.0.0.1

configs/epc-fdconf.yaml.in

@@ -1,61 +0,0 @@
-db_uri: mongodb://localhost/open5gs
-
-logger:
-    file: @localstatedir@/log/open5gs/open5gs.log
-
-parameter:
-    no_ipv6: true
-
-mme:
-    freeDiameter: @sysconfdir@/freeDiameter/mme.conf
-    s1ap:
-    gtpc:
-    sgsap:
-    gummei:
-      plmn_id:
-        mcc: 001
-        mnc: 01
-      mme_gid: 2
-      mme_code: 1
-    tai:
-      plmn_id:
-        mcc: 001
-        mnc: 01
-      tac: 12345
-
-    security:
-        integrity_order : [ EIA1, EIA2, EIA0 ]
-        ciphering_order : [ EEA0, EEA1, EEA2 ]
-    network_name:
-        full: Open5GS
-
-hss:
-    freeDiameter: @sysconfdir@/freeDiameter/hss.conf
-
-sgw:
-    gtpc:
-      addr: 127.0.0.2
-    gtpu:
-
-pgw:
-    freeDiameter: @sysconfdir@/freeDiameter/pgw.conf
-    gtpc:
-      addr:
-        - 127.0.0.3
-        - ::1
-    gtpu:
-      - addr: 127.0.0.3
-      - addr: ::1
-    pdn:
-      - addr: 10.45.0.1/16
-      - addr: cafe::1/64
-
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-
-pcrf:
-    freeDiameter: @sysconfdir@/freeDiameter/pcrf.conf

configs/epc.yaml.in

@@ -1,123 +0,0 @@
-db_uri: mongodb://localhost/open5gs
-
-logger:
-
-parameter:
-    no_ipv6: true
-
-mme:
-    freeDiameter:
-      identity: mme.localdomain
-      realm: localdomain
-      listen_on: 127.0.0.2
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
-      connect:
-        - identity: hss.localdomain
-          addr: 127.0.0.4
-
-    s1ap:
-      addr: 127.0.0.1
-    gtpc:
-      addr: 127.0.0.1
-    gummei: 
-      plmn_id:
-        mcc: 001
-        mnc: 01
-      mme_gid: 2
-      mme_code: 1
-    tai:
-      plmn_id:
-        mcc: 001
-        mnc: 01
-      tac: 12345
-    security:
-        integrity_order : [ EIA1, EIA2, EIA0 ]
-        ciphering_order : [ EEA0, EEA1, EEA2 ]
-
-    network_name:
-        full: Open5GS
-
-hss:
-    freeDiameter:
-      identity: hss.localdomain
-      realm: localdomain
-      listen_on: 127.0.0.4
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
-      connect:
-        - identity: mme.localdomain
-          addr: 127.0.0.2
-
-sgw:
-    gtpc:
-      addr: 127.0.0.2
-    gtpu:
-      addr: 127.0.0.2
-
-pgw:
-    freeDiameter:
-      identity: pgw.localdomain
-      realm: localdomain
-      listen_on: 127.0.0.3
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
-      connect:
-        - identity: pcrf.localdomain
-          addr: 127.0.0.5
-
-    gtpc:
-      addr:
-        - 127.0.0.3
-        - ::1
-    gtpu:
-      - addr: 127.0.0.3
-      - addr: ::1
-    pdn:
-      - addr: 10.45.0.1/16
-      - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-
-pcrf:
-    freeDiameter:
-      identity: pcrf.localdomain
-      realm: localdomain
-      listen_on: 127.0.0.5
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
-      connect:
-        - identity: pgw.localdomain
-          addr: 127.0.0.3

configs/freeDiameter/cacert.pem

@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICrDCCAhWgAwIBAgIUPoUbKXRTWQbrJYUIvyHdacCzw9cwDQYJKoZIhvcNAQEL
+MIICrDCCAhWgAwIBAgIUX3u0zTLhQTa3lsR92/GelxTGQacwDQYJKoZIhvcNAQEL
 BQAwaDEXMBUGA1UEAwwOY2EubG9jYWxkb21haW4xCzAJBgNVBAYTAktPMQ4wDAYD
 VQQIDAVTZW91bDEOMAwGA1UEBwwFTm93b24xEDAOBgNVBAoMB09wZW41R1MxDjAM
-BgNVBAsMBVRlc3RzMB4XDTE5MTAyMDA2NDM1OFoXDTI5MTAxNzA2NDM1OFowaDEX
+BgNVBAsMBVRlc3RzMB4XDTIwMDgyMjAwMzkxNloXDTMwMDgyMDAwMzkxNlowaDEX
 MBUGA1UEAwwOY2EubG9jYWxkb21haW4xCzAJBgNVBAYTAktPMQ4wDAYDVQQIDAVT
 ZW91bDEOMAwGA1UEBwwFTm93b24xEDAOBgNVBAoMB09wZW41R1MxDjAMBgNVBAsM
-BVRlc3RzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2sDnWMj9oXpIw+vcm
-9k/WidMyhSbImINLe9YgibFfozoxZt51Hvi/aAxlqyq7akGtvpL8yVZD6j7o74z7
-6dlnUFDGC4M0WGEkcxqf5NIWe0QplCsXkEOMYHrXLQisAuUk81DNcsXlZr74bmDI
-B0dUM0xJ2JrA5mx1LzTFHSesIwIDAQABo1MwUTAdBgNVHQ4EFgQUxTjcug/DKW49
-mQeW0IcS/bhIzDcwHwYDVR0jBBgwFoAUxTjcug/DKW49mQeW0IcS/bhIzDcwDwYD
-VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQB533IwIPOEE1w2RLBF9EKX
-UxaDnUYW05t9eZFLsUtOLFiR84xhCawGEWNtaLvoJE42E17qEjnX4+KGOc6/sa6q
-bLskf7BK7496dQrVY5DO9vdSpN1ep3j+1QKae23wYpjqt2UEU3QtIZpsDjUreYri
-YLVacMQydGgizNQrY3iCvQ==
+BVRlc3RzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCuPWKllQ1+hM/wQE08
+xjDBiSx9GQOCEF5dkLK126u4joIhNFig6wfn/Ui0nq88ApUlEREUXB3D33ZEsAkt
+cbwz1UHX2THOeTYX8XdDbkwkbxNOOH902duiQ2UUbf8ve1hsV7+Dr7ue2Fmz4gsR
+lHBv1EsIyPZJQlb4qxET+2++2QIDAQABo1MwUTAdBgNVHQ4EFgQUZPvI16MgF9yo
+OqpLK4XNvT5TSwkwHwYDVR0jBBgwFoAUZPvI16MgF9yoOqpLK4XNvT5TSwkwDwYD
+VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQAwGvKdevLJNDuSXsFpIkTE
+ZRsNnKrprNgbZC4/HkrzpvR1aDQgcSqF12DzSUmoTqzESuMtKvkaLv2IqYko9g4p
+iKVu2jBDKrJq4q63Cy71fxwbtXLrqGaWgbXkepzqyJYjn4Nf/ya0shK7l2rIIDyL
+crvs5/rXN6enLFUQ3n955w==
 -----END CERTIFICATE-----

configs/freeDiameter/hss.cert.pem

@@ -5,22 +5,22 @@ Certificate:
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=ca.localdomain, C=KO, ST=Seoul, L=Nowon, O=Open5GS, OU=Tests
         Validity
-            Not Before: Oct 20 06:43:58 2019 GMT
-            Not After : Oct 17 06:43:58 2029 GMT
+            Not Before: Aug 22 00:39:17 2020 GMT
+            Not After : Aug 20 00:39:17 2030 GMT
         Subject: C=KO, ST=Seoul, O=Open5GS, OU=Tests, CN=hss.localdomain
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 RSA Public-Key: (1024 bit)
                 Modulus:
-                    00:d3:e7:ba:6d:14:65:af:df:90:e5:4a:53:56:a1:
-                    f6:89:2e:cb:ee:ce:d6:73:9f:48:b6:96:78:67:a7:
-                    87:18:b8:ab:c3:0b:31:b3:02:92:48:ed:49:ac:40:
-                    c1:13:3b:13:58:50:cc:2e:59:44:e9:7e:31:02:14:
-                    f0:18:82:95:10:e4:37:b2:5d:14:19:1d:4b:8f:e9:
-                    1f:45:75:cf:0a:e0:8f:7b:e1:70:7b:ab:e4:af:2b:
-                    7c:4d:7f:00:d8:eb:cf:f3:96:ab:fc:04:4f:21:ad:
-                    d8:c4:94:05:02:ff:f3:12:48:88:9e:ce:cf:37:29:
-                    e0:28:39:37:62:05:ed:6d:5d
+                    00:e8:b3:82:96:bd:4a:f6:30:2c:03:60:aa:82:65:
+                    b0:15:32:5f:d3:90:0d:c0:1d:06:62:52:51:c7:12:
+                    36:d7:5c:34:21:ac:4a:44:4d:9b:a5:22:9c:3e:86:
+                    a8:ba:df:02:64:b6:74:f5:95:c4:71:e8:e0:28:1d:
+                    2b:ea:06:94:fa:3c:f1:07:d3:23:55:b6:84:d4:00:
+                    f4:28:08:18:be:c7:38:e1:b7:d9:b4:bf:d3:e1:d3:
+                    d8:13:60:72:e1:e4:d3:31:37:b1:cf:b9:e1:c9:8d:
+                    5e:e2:1c:54:a3:90:b1:69:6f:07:90:ff:68:86:69:
+                    7d:ef:50:69:0d:9d:47:18:39
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -28,33 +28,33 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                AB:0F:C4:B8:B7:6B:56:12:F5:D4:A3:29:B7:D9:5E:3C:DD:8B:79:DD
+                74:20:F9:E9:BD:E1:37:8A:9C:A9:AD:B4:B2:28:7D:44:22:0B:BD:0B
             X509v3 Authority Key Identifier: 
-                keyid:C5:38:DC:BA:0F:C3:29:6E:3D:99:07:96:D0:87:12:FD:B8:48:CC:37
+                keyid:64:FB:C8:D7:A3:20:17:DC:A8:3A:AA:4B:2B:85:CD:BD:3E:53:4B:09
 
     Signature Algorithm: sha256WithRSAEncryption
-         43:95:ee:57:3f:4d:ad:bf:42:6c:48:ae:f8:2f:db:f6:cf:2e:
-         53:a2:3d:48:0a:48:a4:2c:2a:7c:fa:ec:b1:bd:06:a1:21:a5:
-         38:d8:00:05:81:25:91:51:e2:e6:a8:67:a8:c2:f6:5d:2a:f0:
-         40:fe:20:d3:82:2d:d9:8c:4c:61:b7:43:87:7f:fe:e4:a1:b6:
-         fd:54:35:13:4f:63:a5:6b:4a:01:aa:25:e9:80:27:eb:2e:a2:
-         18:e0:36:37:a5:57:09:67:ed:8f:1e:13:fd:b8:b2:d7:4e:cf:
-         93:d4:bf:75:02:38:4e:d4:4a:9c:35:fb:a8:0b:3a:ba:03:1a:
-         e6:9e
+         ac:aa:85:5a:57:61:6d:7d:f3:c4:2a:b7:73:3f:e9:bc:b9:6d:
+         0a:8f:35:24:13:66:46:14:5e:60:90:3e:32:95:72:5a:21:55:
+         15:fe:ef:30:44:fb:fe:3e:cb:bf:f3:30:ce:3b:bb:4f:c1:64:
+         41:ea:db:99:f2:ca:db:78:03:95:81:91:3c:fa:1d:9c:8a:55:
+         eb:9d:6a:c1:b6:de:44:38:0f:99:b4:66:d5:4e:dd:e7:d5:ba:
+         ff:f2:4b:f6:9a:94:53:55:36:4e:73:2d:da:d1:bb:0f:8f:fb:
+         1a:22:43:28:6a:b4:5d:a3:40:2c:cf:7e:0d:3e:fb:60:ef:92:
+         f3:0e
 -----BEGIN CERTIFICATE-----
 MIICsjCCAhugAwIBAgIBAjANBgkqhkiG9w0BAQsFADBoMRcwFQYDVQQDDA5jYS5s
 b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMQ4wDAYDVQQH
-DAVOb3dvbjEQMA4GA1UECgwHT3BlbjVHUzEOMAwGA1UECwwFVGVzdHMwHhcNMTkx
-MDIwMDY0MzU4WhcNMjkxMDE3MDY0MzU4WjBZMQswCQYDVQQGEwJLTzEOMAwGA1UE
+DAVOb3dvbjEQMA4GA1UECgwHT3BlbjVHUzEOMAwGA1UECwwFVGVzdHMwHhcNMjAw
+ODIyMDAzOTE3WhcNMzAwODIwMDAzOTE3WjBZMQswCQYDVQQGEwJLTzEOMAwGA1UE
 CAwFU2VvdWwxEDAOBgNVBAoMB09wZW41R1MxDjAMBgNVBAsMBVRlc3RzMRgwFgYD
 VQQDDA9oc3MubG9jYWxkb21haW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-ANPnum0UZa/fkOVKU1ah9okuy+7O1nOfSLaWeGenhxi4q8MLMbMCkkjtSaxAwRM7
-E1hQzC5ZROl+MQIU8BiClRDkN7JdFBkdS4/pH0V1zwrgj3vhcHur5K8rfE1/ANjr
-z/OWq/wETyGt2MSUBQL/8xJIiJ7Ozzcp4Cg5N2IF7W1dAgMBAAGjezB5MAkGA1Ud
+AOizgpa9SvYwLANgqoJlsBUyX9OQDcAdBmJSUccSNtdcNCGsSkRNm6UinD6GqLrf
+AmS2dPWVxHHo4CgdK+oGlPo88QfTI1W2hNQA9CgIGL7HOOG32bS/0+HT2BNgcuHk
+0zE3sc+54cmNXuIcVKOQsWlvB5D/aIZpfe9QaQ2dRxg5AgMBAAGjezB5MAkGA1Ud
 EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBSrD8S4t2tWEvXUoym32V483Yt53TAfBgNVHSMEGDAWgBTF
-ONy6D8Mpbj2ZB5bQhxL9uEjMNzANBgkqhkiG9w0BAQsFAAOBgQBDle5XP02tv0Js
-SK74L9v2zy5Toj1ICkikLCp8+uyxvQahIaU42AAFgSWRUeLmqGeowvZdKvBA/iDT
-gi3ZjExht0OHf/7kobb9VDUTT2Ola0oBqiXpgCfrLqIY4DY3pVcJZ+2PHhP9uLLX
-Ts+T1L91AjhO1EqcNfuoCzq6Axrmng==
+YXRlMB0GA1UdDgQWBBR0IPnpveE3ipyprbSyKH1EIgu9CzAfBgNVHSMEGDAWgBRk
++8jXoyAX3Kg6qksrhc29PlNLCTANBgkqhkiG9w0BAQsFAAOBgQCsqoVaV2FtffPE
+KrdzP+m8uW0KjzUkE2ZGFF5gkD4ylXJaIVUV/u8wRPv+Psu/8zDOO7tPwWRB6tuZ
+8srbeAOVgZE8+h2cilXrnWrBtt5EOA+ZtGbVTt3n1br/8kv2mpRTVTZOcy3a0bsP
+j/saIkMoarRdo0Asz34NPvtg75LzDg==
 -----END CERTIFICATE-----

configs/freeDiameter/hss.conf.in

@@ -79,7 +79,7 @@ Realm = "localdomain";
 #ListenOn = "202.249.37.5";
 #ListenOn = "2001:200:903:2::202:1";
 #ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
-ListenOn = "127.0.0.4";
+ListenOn = "127.0.0.8";
 
 
 ##############################################################

configs/freeDiameter/hss.key.pem

@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDT57ptFGWv35DlSlNWofaJLsvuztZzn0i2lnhnp4cYuKvDCzGz
-ApJI7UmsQMETOxNYUMwuWUTpfjECFPAYgpUQ5DeyXRQZHUuP6R9Fdc8K4I974XB7
-q+SvK3xNfwDY68/zlqv8BE8hrdjElAUC//MSSIiezs83KeAoOTdiBe1tXQIDAQAB
-AoGBAM7ShI2Ec/9lSInSsmaC7BpW12p87KirFZBIarpYs634SIS0v0xFvTt6hgae
-qRO4/BedvLucG3t91B2BDBoQEaZELCjJ9kCUtzphW+u8/SUvPUCfb5xiLLeDQCVR
-oU45JuqlF+ro9XM0x7f1REuTza1Xr20O5n5TzaCzQkdTlMdtAkEA+Yk9aS589D2c
-TAj7H5nQMFai/z0JKM7kuBmXaqbsPtnYjdNvVYsCRPcjbhyfIjN88o/QGuUuInpb
-PyzUZh3x2wJBANlk8d5ZVco+UE1NX0KzpEXHMY+z8kE4f8IMy0KN1V+An0ZbdxJE
-X0aUMz9/K0+V6n0rlpY4QdOnTnbIEg2hTycCQDXBUM9lylk7JH5kuORX2Ddxkm91
-kJGP8EmQicPZ7a6kczgqQiOlbHm625EO7WEKwnHmdSg2Ergur5VubNsKvF0CQQCc
-sbv8rpu9qOisr2ZIZ7+yY/9/Ow8Un6rGrf4cPKtdqRIk3myXCB08fDnsPLd1J/Pa
-wP5LzMT10BQoXdFVbb3lAkBpNXUkts8O1YxSG5zTruvygjU2n4Lova31icJ8HFaG
-pfKHJpqDGPooupFxeCsPVPBZIRtxW70CZcr77eW/XKXv
+MIICXQIBAAKBgQDos4KWvUr2MCwDYKqCZbAVMl/TkA3AHQZiUlHHEjbXXDQhrEpE
+TZulIpw+hqi63wJktnT1lcRx6OAoHSvqBpT6PPEH0yNVtoTUAPQoCBi+xzjht9m0
+v9Ph09gTYHLh5NMxN7HPueHJjV7iHFSjkLFpbweQ/2iGaX3vUGkNnUcYOQIDAQAB
+AoGAdxNkv74dnd0IqLHOjut6L16XqqsMXkJ8AdQeBMBNT+bexlxjpJASFW6ghV5i
++T0k/GRhdUouPBvumJhU4Gx9zpVYUMzAxZDgWQfoknQ11fs6bi1aH8Fn9NhC3UeB
+ZaSmkAyeTMpJMzVAiVLND3iN/83OcijqSq2MZ4kkdsQngAECQQD/AOBiwlh6AVtZ
+bJMbVSVPLdtQRtGuP29gaC64vROE60qfxUcW7H2rHdMq4AWrlaZ3hXxSLU+TuCDt
+Z7khtHexAkEA6ZxSJfw1SO0qqu/uHBcQTOzoTKPi28fRt2ilEIOhIzuHbJPpjFEp
+snhGfX+XgD4EtXH1ebdmh+rGZ8yRPcjTCQJBAJ170xfq4m1mzR2q+ibVLNd7gIhR
+VEmCj6xAaypYSue50DpfwYmcv/ef0bwW4imXoFkMLT0rEowuGNfFSQZRx+ECQETG
+TrD8JTvJBsy4QiNm7teWz3TwsrL9itIyLpZECkZzGhVvHky/AEWYfzgnPhT1LTG1
+0Qz6X2cYSTz5zrCf1PECQQCPZIkkOUsgq6kGDK5MTzAoTjPxzIDgLX/YdMelwHUA
+pK+nv/gxO9Pjd+wcU4GmaD0KXdLtu+dsKT3bx/7RzGjj
 -----END RSA PRIVATE KEY-----

configs/freeDiameter/meson.build

@@ -22,7 +22,7 @@ meson.add_install_script(python3_exe, '-c',
 freediameter_conf = '''
     mme.conf
     hss.conf
-    pgw.conf
+    smf.conf
     pcrf.conf
 '''.split()
 
@@ -41,8 +41,8 @@ freediameter_pem = '''
     mme.key.pem
     hss.cert.pem
     hss.key.pem
-    pgw.cert.pem
-    pgw.key.pem
+    smf.cert.pem
+    smf.key.pem
     pcrf.cert.pem
     pcrf.key.pem
 '''.split()

configs/freeDiameter/mme.cert.pem

@@ -5,22 +5,22 @@ Certificate:
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=ca.localdomain, C=KO, ST=Seoul, L=Nowon, O=Open5GS, OU=Tests
         Validity
-            Not Before: Oct 20 06:43:58 2019 GMT
-            Not After : Oct 17 06:43:58 2029 GMT
+            Not Before: Aug 22 00:39:17 2020 GMT
+            Not After : Aug 20 00:39:17 2030 GMT
         Subject: C=KO, ST=Seoul, O=Open5GS, OU=Tests, CN=mme.localdomain
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 RSA Public-Key: (1024 bit)
                 Modulus:
-                    00:b5:3a:31:ed:bf:fe:cd:e7:50:cc:94:ba:3d:fd:
-                    2f:e6:cb:83:25:3d:82:93:26:57:b4:2f:6b:29:d9:
-                    fd:80:c8:c5:82:9c:09:17:14:38:91:57:ac:72:b0:
-                    86:d4:6f:bd:6b:fa:b9:60:51:9b:ab:6b:68:37:15:
-                    c7:de:8b:bd:e8:da:5a:49:75:03:33:09:8e:49:e4:
-                    d9:5b:3c:2f:ca:47:9b:95:d5:6f:16:e4:8d:39:b4:
-                    39:dd:51:1a:55:27:68:b9:a0:24:ad:1c:18:48:bb:
-                    49:54:ae:03:a3:0b:b8:e5:da:b4:c2:7f:09:a4:12:
-                    8e:97:08:58:24:6a:4b:f4:87
+                    00:9c:69:25:fc:ee:7f:11:e0:81:f7:b5:51:8f:01:
+                    b8:9e:01:74:03:3e:a5:25:de:6f:28:66:05:6f:7b:
+                    ab:86:0f:09:fc:94:7b:e8:aa:9f:0b:5f:32:27:46:
+                    f0:ca:e2:12:f3:5d:03:80:e9:9a:1d:f0:20:d6:5c:
+                    1b:4b:65:d4:66:e3:b7:63:19:6e:b1:e8:db:6c:24:
+                    df:24:2c:50:f2:1c:8a:33:c1:f7:27:b8:3c:6e:c6:
+                    90:98:ac:43:67:00:6b:3d:ab:39:49:3d:d5:74:77:
+                    6a:0e:38:4e:41:cd:e4:15:63:27:76:b5:9c:75:f8:
+                    cb:6f:cc:5e:f3:a7:68:ef:a5
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -28,33 +28,33 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                20:74:06:F0:AF:F6:2D:90:D1:CB:8C:5C:AB:73:D7:45:99:31:DD:AA
+                92:69:1E:3F:9F:E2:40:2F:81:24:05:B4:13:AA:8A:65:5C:7C:71:1D
             X509v3 Authority Key Identifier: 
-                keyid:C5:38:DC:BA:0F:C3:29:6E:3D:99:07:96:D0:87:12:FD:B8:48:CC:37
+                keyid:64:FB:C8:D7:A3:20:17:DC:A8:3A:AA:4B:2B:85:CD:BD:3E:53:4B:09
 
     Signature Algorithm: sha256WithRSAEncryption
-         0a:f5:fd:1f:19:52:9a:99:ec:34:67:e8:57:dc:61:73:c0:05:
-         b0:53:e3:8f:66:86:c9:99:af:28:5a:2a:06:a8:53:b1:80:ea:
-         5c:c9:ad:93:ec:b8:b4:b0:e4:04:8b:85:1b:08:93:f2:71:b1:
-         21:ab:80:40:e4:27:c6:c5:7a:56:f2:d2:33:6c:f0:1d:f4:99:
-         85:55:60:9c:eb:d3:b8:e3:4b:e5:be:1e:d2:39:d5:55:6f:4c:
-         20:07:c8:24:1c:21:70:e4:54:17:0b:a5:66:17:be:8b:5c:73:
-         ca:5e:42:6e:27:15:18:69:dc:c6:49:97:d7:66:e0:a8:ad:9c:
-         f1:b7
+         74:fc:32:ee:e6:2b:a5:f5:a4:71:64:49:ff:eb:6f:01:30:32:
+         b7:61:62:97:e1:2c:0f:50:62:a8:71:9a:bd:8b:d8:0d:4b:28:
+         ea:b4:5f:1c:30:3e:4c:23:2f:c5:5b:77:ed:48:c2:bb:b7:0c:
+         d9:50:4d:7f:7f:a3:b9:1e:2c:19:33:1e:41:94:e1:14:1b:45:
+         e8:ae:27:aa:5e:78:8e:67:67:19:69:48:e3:e4:c0:c3:a7:85:
+         fd:fd:d6:62:6e:dd:1f:31:2f:bc:9a:d2:fa:82:eb:4b:3e:35:
+         e0:90:db:ed:de:1a:68:33:6f:e6:90:9f:08:64:60:46:91:09:
+         74:15
 -----BEGIN CERTIFICATE-----
 MIICsjCCAhugAwIBAgIBATANBgkqhkiG9w0BAQsFADBoMRcwFQYDVQQDDA5jYS5s
 b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMQ4wDAYDVQQH
-DAVOb3dvbjEQMA4GA1UECgwHT3BlbjVHUzEOMAwGA1UECwwFVGVzdHMwHhcNMTkx
-MDIwMDY0MzU4WhcNMjkxMDE3MDY0MzU4WjBZMQswCQYDVQQGEwJLTzEOMAwGA1UE
+DAVOb3dvbjEQMA4GA1UECgwHT3BlbjVHUzEOMAwGA1UECwwFVGVzdHMwHhcNMjAw
+ODIyMDAzOTE3WhcNMzAwODIwMDAzOTE3WjBZMQswCQYDVQQGEwJLTzEOMAwGA1UE
 CAwFU2VvdWwxEDAOBgNVBAoMB09wZW41R1MxDjAMBgNVBAsMBVRlc3RzMRgwFgYD
 VQQDDA9tbWUubG9jYWxkb21haW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-ALU6Me2//s3nUMyUuj39L+bLgyU9gpMmV7QvaynZ/YDIxYKcCRcUOJFXrHKwhtRv
-vWv6uWBRm6traDcVx96LvejaWkl1AzMJjknk2Vs8L8pHm5XVbxbkjTm0Od1RGlUn
-aLmgJK0cGEi7SVSuA6MLuOXatMJ/CaQSjpcIWCRqS/SHAgMBAAGjezB5MAkGA1Ud
+AJxpJfzufxHggfe1UY8BuJ4BdAM+pSXebyhmBW97q4YPCfyUe+iqnwtfMidG8Mri
+EvNdA4Dpmh3wINZcG0tl1Gbjt2MZbrHo22wk3yQsUPIcijPB9ye4PG7GkJisQ2cA
+az2rOUk91XR3ag44TkHN5BVjJ3a1nHX4y2/MXvOnaO+lAgMBAAGjezB5MAkGA1Ud
 EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBQgdAbwr/YtkNHLjFyrc9dFmTHdqjAfBgNVHSMEGDAWgBTF
-ONy6D8Mpbj2ZB5bQhxL9uEjMNzANBgkqhkiG9w0BAQsFAAOBgQAK9f0fGVKamew0
-Z+hX3GFzwAWwU+OPZobJma8oWioGqFOxgOpcya2T7Li0sOQEi4UbCJPycbEhq4BA
-5CfGxXpW8tIzbPAd9JmFVWCc69O440vlvh7SOdVVb0wgB8gkHCFw5FQXC6VmF76L
-XHPKXkJuJxUYadzGSZfXZuCorZzxtw==
+YXRlMB0GA1UdDgQWBBSSaR4/n+JAL4EkBbQTqoplXHxxHTAfBgNVHSMEGDAWgBRk
++8jXoyAX3Kg6qksrhc29PlNLCTANBgkqhkiG9w0BAQsFAAOBgQB0/DLu5iul9aRx
+ZEn/628BMDK3YWKX4SwPUGKocZq9i9gNSyjqtF8cMD5MIy/FW3ftSMK7twzZUE1/
+f6O5HiwZMx5BlOEUG0XorieqXniOZ2cZaUjj5MDDp4X9/dZibt0fMS+8mtL6gutL
+PjXgkNvt3hpoM2/mkJ8IZGBGkQl0FQ==
 -----END CERTIFICATE-----

configs/freeDiameter/mme.conf.in

@@ -260,7 +260,7 @@ LoadExtension = "@libdir@/freeDiameter/dict_dcca_3gpp.fdx";
 # Examples:
 #ConnectPeer = "aaa.wide.ad.jp";
 #ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ;
-ConnectPeer = "hss.localdomain" { ConnectTo = "127.0.0.4"; No_TLS; };
+ConnectPeer = "hss.localdomain" { ConnectTo = "127.0.0.8"; No_TLS; };
 
 
 ##############################################################

configs/freeDiameter/mme.key.pem

@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC1OjHtv/7N51DMlLo9/S/my4MlPYKTJle0L2sp2f2AyMWCnAkX
-FDiRV6xysIbUb71r+rlgUZura2g3Fcfei73o2lpJdQMzCY5J5NlbPC/KR5uV1W8W
-5I05tDndURpVJ2i5oCStHBhIu0lUrgOjC7jl2rTCfwmkEo6XCFgkakv0hwIDAQAB
-AoGBALL3ID1H/8m4Z9tP+EelEzvYt8772kmUcMHYnfw7cJNQMXQUwQlQh7hIG107
-JDr/idDrTUtn69GxhL35PWJxH3z7b9nPQCcPZQ3PZWW8lDXNqNCjV5j+2zDAXqkc
-IyxLQuPnTyn9kcB/OIjNGrr86/6JKS1ipbT9AIllV+br5OMhAkEA7KMLbiAI03JH
-wBhtnHdtj7NETXDnZd0Plj3ATpa7SOtxmBtqVVOH/1ghAqJ0YScrqa9+eEqcn6mv
-sHoJ10wVVwJBAMQOdR6b6H3Swy5dZNYzSKDsWRf4cNK5Kz8HJ8UOLbHTjzcDHNsD
-n09McdcnWgNAxV6J0YJzu4LWQjT4b1e77FECQAd+8rG+Wgk4qYUwQOif79yJdTRu
-yyWy5vd/ZUQYCj65FpQW6jthtgEkrYcD1mPtdbieUodE9cko+uPAOeeUBWkCQQCt
-lL9NImxtOjVkz3t/ylf7YkZfWq9JYnhPjV5AsZTzZIPgCPl7T3G1G9GO1GB1kNsu
-IIdGIIFcDacAjxTFcLSBAkA1Bl7gARE2XZR9iVVJ/On2hWFZhtG9RId+k0pVUxKs
-KXYnYSiD/WIeVZ6IBswqL2AnEV+kBBuZ7D9aEiDYbXQ/
+MIICXQIBAAKBgQCcaSX87n8R4IH3tVGPAbieAXQDPqUl3m8oZgVve6uGDwn8lHvo
+qp8LXzInRvDK4hLzXQOA6Zod8CDWXBtLZdRm47djGW6x6NtsJN8kLFDyHIozwfcn
+uDxuxpCYrENnAGs9qzlJPdV0d2oOOE5BzeQVYyd2tZx1+MtvzF7zp2jvpQIDAQAB
+AoGARr3D4a7Yp/Q7tBY86gokPsp3dxQ5S3RcIBBseuybOknJAYUCucuZnWIT4/HQ
+7GHtokY6VG7TNqEpqOoFqkdHFgDZQlJPG+N2B63JEGxAL0RedHsTbnYQ8MFqrixb
+U59yDfwudrlEYAQNML51pEp7D06Add+CPubcFLO8Tnh/z20CQQDQCWRPP0ZdfYk1
+NZFS82fWxWE0jhxEu8nFXCh4uawlSOyyl8RFKyvwFhs+u8DAS+ntSA5nBIkglLW5
+aM+WbJerAkEAwHi5BIojXNmqjrfDDDaD3jM5/Ug2SOuReVz/7JDoPC/w9rob37RM
+pz0bWrtOVCud+mD0WeOjsxfsb6ixpjMF7wJBAI9zmnbG0/eNo/pL6NzBOP4w9rlt
+sPJ4Z0avKL0ukxTWt1jjLBTiExcntzvH7b7r2e+ju0KwLvqHcNPcASDh2qcCQBQ4
+Wo+ch4yInX9y1L3iuEXOsefm/zT38oeCeqx6qLsx+imhca41vdvP8qC8jsUO9ADK
+0MDkxlzZRZCRc2BXeecCQQCl+Ac9n+gtpIUFNmwvgtOnnjDAEDhGgi4lR45frT75
+t57D+YTERbn2pygttzhZ6imWMEUnSQJQSGpDAUnVsIUg
 -----END RSA PRIVATE KEY-----

configs/freeDiameter/pcrf.cert.pem

@@ -5,22 +5,22 @@ Certificate:
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=ca.localdomain, C=KO, ST=Seoul, L=Nowon, O=Open5GS, OU=Tests
         Validity
-            Not Before: Oct 20 06:43:58 2019 GMT
-            Not After : Oct 17 06:43:58 2029 GMT
+            Not Before: Aug 22 00:39:17 2020 GMT
+            Not After : Aug 20 00:39:17 2030 GMT
         Subject: C=KO, ST=Seoul, O=Open5GS, OU=Tests, CN=pcrf.localdomain
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 RSA Public-Key: (1024 bit)
                 Modulus:
-                    00:c4:63:95:b8:b2:99:ca:4d:dd:ac:b8:e2:78:29:
-                    43:03:8a:de:6b:05:99:97:b7:90:39:f8:f6:b8:20:
-                    77:44:4b:1b:95:6c:ad:e1:5f:2c:48:a2:8a:d2:95:
-                    72:0e:f9:e1:cf:70:4e:45:6e:71:7e:2a:41:29:93:
-                    7a:12:01:73:0b:10:20:7a:38:66:9f:75:76:21:d6:
-                    7d:0c:ea:35:47:16:d6:c3:9f:41:ec:e9:98:36:16:
-                    84:9f:43:38:2b:b2:c8:d9:f3:6c:07:82:e4:ce:c8:
-                    a3:f3:c3:60:13:f3:46:44:fa:f0:ee:a9:48:40:8f:
-                    80:3e:60:73:ff:6d:59:03:2f
+                    00:b9:1f:b3:a5:74:de:31:97:ac:fa:86:1d:65:86:
+                    c7:be:b1:25:07:01:f3:69:21:7a:6d:ec:d7:c8:ec:
+                    e2:c9:e8:71:a1:07:ce:0e:68:e5:0f:a9:ec:f3:5e:
+                    5e:3e:a4:ea:27:f3:fa:65:36:2d:7c:ce:a8:70:cc:
+                    34:db:51:b2:28:7b:03:bf:78:06:61:7c:44:81:17:
+                    88:f9:c9:16:cb:2e:9f:21:4a:24:28:0a:0f:76:ef:
+                    63:0f:05:a4:ee:52:64:1f:4f:0b:ec:4e:6c:1b:12:
+                    40:43:75:ed:62:16:ec:6a:ba:15:dd:c4:b9:fa:a9:
+                    de:2c:80:f5:84:c5:97:ec:7b
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -28,33 +28,33 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                53:A8:0E:78:45:FB:38:A6:CF:30:E5:FF:BB:CA:E6:CF:A3:4A:DC:53
+                CD:C4:C9:C1:7F:D9:34:1F:DB:08:61:27:FC:59:A2:C2:CC:19:9A:7B
             X509v3 Authority Key Identifier: 
-                keyid:C5:38:DC:BA:0F:C3:29:6E:3D:99:07:96:D0:87:12:FD:B8:48:CC:37
+                keyid:64:FB:C8:D7:A3:20:17:DC:A8:3A:AA:4B:2B:85:CD:BD:3E:53:4B:09
 
     Signature Algorithm: sha256WithRSAEncryption
-         47:6b:2b:f9:03:8d:c1:fd:84:21:fe:3c:5b:8c:9d:c1:48:bc:
-         ae:90:67:c5:ad:1a:80:e9:97:9c:c2:d4:31:1b:7d:4e:1a:72:
-         09:fb:92:32:b3:82:79:59:cd:92:21:27:c7:34:c3:76:27:a8:
-         11:33:cd:4a:ec:10:cb:44:89:da:47:1a:a4:6a:06:10:fb:f1:
-         6a:de:d5:1a:15:de:4a:54:6f:29:b8:de:ec:20:f2:d1:c3:0c:
-         9a:8e:97:46:8c:21:c3:63:7f:41:52:41:7e:73:47:43:0a:d1:
-         86:0b:f0:fb:9a:1f:6d:b5:93:88:95:88:84:6d:28:8e:29:2e:
-         66:9d
+         24:3a:da:a7:50:b3:42:ab:e9:87:21:b2:d9:2b:a1:44:0b:5f:
+         bd:ad:c9:8b:b1:ca:d5:2e:65:46:55:80:11:00:33:03:f9:04:
+         b1:31:a2:c9:d2:41:e0:ec:73:bc:9a:3c:31:06:cc:d0:2d:73:
+         1f:b4:93:1c:b0:99:dd:14:27:64:39:7e:c5:ab:53:48:c5:25:
+         e8:88:fd:4e:b8:dd:64:88:b5:b4:89:8b:15:97:8b:e7:c9:fb:
+         23:6c:ed:60:9b:2f:f0:99:7a:75:6c:8e:ea:09:c6:ba:ff:e9:
+         81:3f:97:96:8b:00:58:5b:88:13:e8:8a:39:4c:f6:c9:06:d3:
+         24:66
 -----BEGIN CERTIFICATE-----
 MIICszCCAhygAwIBAgIBBDANBgkqhkiG9w0BAQsFADBoMRcwFQYDVQQDDA5jYS5s
 b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMQ4wDAYDVQQH
-DAVOb3dvbjEQMA4GA1UECgwHT3BlbjVHUzEOMAwGA1UECwwFVGVzdHMwHhcNMTkx
-MDIwMDY0MzU4WhcNMjkxMDE3MDY0MzU4WjBaMQswCQYDVQQGEwJLTzEOMAwGA1UE
+DAVOb3dvbjEQMA4GA1UECgwHT3BlbjVHUzEOMAwGA1UECwwFVGVzdHMwHhcNMjAw
+ODIyMDAzOTE3WhcNMzAwODIwMDAzOTE3WjBaMQswCQYDVQQGEwJLTzEOMAwGA1UE
 CAwFU2VvdWwxEDAOBgNVBAoMB09wZW41R1MxDjAMBgNVBAsMBVRlc3RzMRkwFwYD
 VQQDDBBwY3JmLmxvY2FsZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQDEY5W4spnKTd2suOJ4KUMDit5rBZmXt5A5+Pa4IHdESxuVbK3hXyxIoorSlXIO
-+eHPcE5FbnF+KkEpk3oSAXMLECB6OGafdXYh1n0M6jVHFtbDn0Hs6Zg2FoSfQzgr
-ssjZ82wHguTOyKPzw2AT80ZE+vDuqUhAj4A+YHP/bVkDLwIDAQABo3sweTAJBgNV
+gQC5H7OldN4xl6z6hh1lhse+sSUHAfNpIXpt7NfI7OLJ6HGhB84OaOUPqezzXl4+
+pOon8/plNi18zqhwzDTbUbIoewO/eAZhfESBF4j5yRbLLp8hSiQoCg9272MPBaTu
+UmQfTwvsTmwbEkBDde1iFuxquhXdxLn6qd4sgPWExZfsewIDAQABo3sweTAJBgNV
 HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
-Y2F0ZTAdBgNVHQ4EFgQUU6gOeEX7OKbPMOX/u8rmz6NK3FMwHwYDVR0jBBgwFoAU
-xTjcug/DKW49mQeW0IcS/bhIzDcwDQYJKoZIhvcNAQELBQADgYEAR2sr+QONwf2E
-If48W4ydwUi8rpBnxa0agOmXnMLUMRt9ThpyCfuSMrOCeVnNkiEnxzTDdieoETPN
-SuwQy0SJ2kcapGoGEPvxat7VGhXeSlRvKbje7CDy0cMMmo6XRowhw2N/QVJBfnNH
-QwrRhgvw+5ofbbWTiJWIhG0ojikuZp0=
+Y2F0ZTAdBgNVHQ4EFgQUzcTJwX/ZNB/bCGEn/FmiwswZmnswHwYDVR0jBBgwFoAU
+ZPvI16MgF9yoOqpLK4XNvT5TSwkwDQYJKoZIhvcNAQELBQADgYEAJDrap1CzQqvp
+hyGy2SuhRAtfva3Ji7HK1S5lRlWAEQAzA/kEsTGiydJB4OxzvJo8MQbM0C1zH7ST
+HLCZ3RQnZDl+xatTSMUl6Ij9TrjdZIi1tImLFZeL58n7I2ztYJsv8Jl6dWyO6gnG
+uv/pgT+XlosAWFuIE+iKOUz2yQbTJGY=
 -----END CERTIFICATE-----

configs/freeDiameter/pcrf.conf.in

@@ -79,7 +79,7 @@ Realm = "localdomain";
 #ListenOn = "202.249.37.5";
 #ListenOn = "2001:200:903:2::202:1";
 #ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
-ListenOn = "127.0.0.5";
+ListenOn = "127.0.0.9";
 
 
 ##############################################################
@@ -260,6 +260,6 @@ LoadExtension = "@libdir@/freeDiameter/dict_dcca_3gpp.fdx";
 # Examples:
 #ConnectPeer = "aaa.wide.ad.jp";
 #ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ;
-ConnectPeer = "pgw.localdomain" { ConnectTo = "127.0.0.3"; No_TLS; };
+ConnectPeer = "smf.localdomain" { ConnectTo = "127.0.0.4"; No_TLS; };
 
 ##############################################################

configs/freeDiameter/pcrf.key.pem

@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDEY5W4spnKTd2suOJ4KUMDit5rBZmXt5A5+Pa4IHdESxuVbK3h
-XyxIoorSlXIO+eHPcE5FbnF+KkEpk3oSAXMLECB6OGafdXYh1n0M6jVHFtbDn0Hs
-6Zg2FoSfQzgrssjZ82wHguTOyKPzw2AT80ZE+vDuqUhAj4A+YHP/bVkDLwIDAQAB
-AoGBAJG6b+RhK3uSMjcz7mFKBP9A8fCqdCG/xdcu5i0VcksMDMjhn1mIXPz9GFRR
-LxTr2eMrK/mbjb4YLshiNgfcaXdzpZGauK15PNEHemygI4et9b0iE3ZfGM3dGEGi
-UmWzXgO347S8CNmm6JX/gtAaCafeapmyms6E4teYFp1UMRIBAkEA7zrq9HZT1CZu
-fWN9DraOUVrgMdV8Q/qdKzAqMsTf95r43aRxxe8ZkXpQuf1X0kBDH8cIeOAVu96/
-hmfxCcVZAQJBANIn3YU7xCnUbdK29tYuxAzEw7j4pdfjHEPgkvjV1xsGVwM+DQkF
-/yrSgAujxR70uGfBcUF/M9XRniBWg+FRrC8CQBXJ5vZnBJGRAoU3F3/Mjr/IKB1B
-1XSXkdMKKv2+wqtZmQsO3DHr6gc+/bVC5snGgpaVWScxOamHyyfhtalvKQECQG+w
-PCyo3NIWUd+g2YJvDEZ09EgD7a/UxZrVaYbRryZvsiLJAYiAJWKOyPpmqUaQbMjH
-p/dVMSk75Dvvfttq2oUCQQDuEO0xY0gHxzFYH1K82Yw5aDdRsryEQYpb5e+jduH1
-EHACfc2H4Oc3/a39q7On+HnZgxK7gFMpGW+D0MdDDoL6
+MIICWgIBAAKBgQC5H7OldN4xl6z6hh1lhse+sSUHAfNpIXpt7NfI7OLJ6HGhB84O
+aOUPqezzXl4+pOon8/plNi18zqhwzDTbUbIoewO/eAZhfESBF4j5yRbLLp8hSiQo
+Cg9272MPBaTuUmQfTwvsTmwbEkBDde1iFuxquhXdxLn6qd4sgPWExZfsewIDAQAB
+An8UP2NmtWGYCv7gZ8rPT+6I7Ncf7RayaPb7DuyLDV3At6u18SSYbuCe1fcUpz2n
+nGH//K9mYoaXIANMUwl083qIwxT0VbarpTCgiHT8afdISe6Bm8B8Xs0ITEikRHiG
+vmI/oCbCA1DkXZlf4jpQbGdet2DyxnJTXv+W9vDkqHOhAkEA74Y+MQgf3eaz/on9
+2I5S0kvFJxBYjkAcbkzHmytA5cT45KoCIF+6oPAnBoDkLq3fUotOgWzX2pnWHzMu
++VLtrwJBAMXbhpxQflZ/4eqDYbD49ggVO8VJzl3Ch1B7ZvKW/b+6plRwsdHx0RFk
+xbwz02GuJbwf6UjVW1VyaQF6fgkdzPUCQQCYhK+nQxgfkV69zxpvwbilJhBFHph1
+BAfWiFd1y+YIKROfb03pVWuePS1sa7hgrOCOTBxSN39/OAPrXAkmQ5MLAkBbNSZp
+eoWy1ELNe4EWNr4b3cXu3WYfPKRqCmjbnZUdxCoWtNiUAlgxH3YzmuRvm/rTLRa6
+N3hh/FrBjrj49N7dAkA5SaCw2WFulgLRPA6QwfObrQEYkHgtF2++r9jhane5nfq3
+/kcrlFnfDfT7ITc32Hmvgj7wJud7w8ANukPXG7DU
 -----END RSA PRIVATE KEY-----

configs/freeDiameter/pgw.cert.pem

@@ -1,60 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 3 (0x3)
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=ca.localdomain, C=KO, ST=Seoul, L=Nowon, O=Open5GS, OU=Tests
-        Validity
-            Not Before: Oct 20 06:43:58 2019 GMT
-            Not After : Oct 17 06:43:58 2029 GMT
-        Subject: C=KO, ST=Seoul, O=Open5GS, OU=Tests, CN=pgw.localdomain
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
-                Modulus:
-                    00:bf:bc:94:38:f4:03:a5:23:8c:21:ba:4e:5e:51:
-                    f7:76:f5:e1:1e:43:fc:04:a0:f9:b9:9f:47:dd:d3:
-                    b5:aa:83:e8:cb:d0:3c:56:0e:4d:fd:de:b6:93:fa:
-                    eb:a3:94:4a:79:68:1d:84:61:cf:b7:d0:ac:d0:41:
-                    ef:66:e0:8a:40:ec:b4:d2:5b:ce:cc:2c:cd:7d:7e:
-                    87:73:b0:4b:4d:79:54:3b:a4:48:bb:19:4f:9f:7e:
-                    30:e7:af:17:32:a3:95:af:c4:a5:19:8f:53:3c:16:
-                    cd:54:9d:38:98:2b:0f:b7:cd:33:91:f0:ef:b8:d2:
-                    9f:0e:fe:8e:77:9d:e8:ba:f3
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                EB:F6:EA:D3:F2:F2:C6:C6:83:EF:13:CD:AF:49:A8:ED:03:DF:7F:ED
-            X509v3 Authority Key Identifier: 
-                keyid:C5:38:DC:BA:0F:C3:29:6E:3D:99:07:96:D0:87:12:FD:B8:48:CC:37
-
-    Signature Algorithm: sha256WithRSAEncryption
-         3b:00:ef:c4:9f:69:c3:22:06:76:6f:70:88:50:1c:f3:a2:9a:
-         68:00:34:fa:3a:68:b2:94:fe:7c:31:7d:4e:95:bd:47:4d:69:
-         1f:76:32:64:83:1b:5b:11:71:bb:0a:7a:af:72:54:7a:dc:30:
-         51:e5:93:27:8c:8a:51:e6:e5:15:53:70:14:85:3b:77:1a:87:
-         ce:d0:6f:31:07:5d:14:30:d7:de:a0:b5:a7:a1:96:18:1a:fd:
-         ea:9f:c2:ea:bb:72:52:84:b6:57:6d:70:93:35:64:d3:8b:82:
-         1b:7b:ea:85:8a:fb:c6:b3:e0:66:ad:db:11:dd:5e:6e:22:dd:
-         b4:23
------BEGIN CERTIFICATE-----
-MIICsjCCAhugAwIBAgIBAzANBgkqhkiG9w0BAQsFADBoMRcwFQYDVQQDDA5jYS5s
-b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMQ4wDAYDVQQH
-DAVOb3dvbjEQMA4GA1UECgwHT3BlbjVHUzEOMAwGA1UECwwFVGVzdHMwHhcNMTkx
-MDIwMDY0MzU4WhcNMjkxMDE3MDY0MzU4WjBZMQswCQYDVQQGEwJLTzEOMAwGA1UE
-CAwFU2VvdWwxEDAOBgNVBAoMB09wZW41R1MxDjAMBgNVBAsMBVRlc3RzMRgwFgYD
-VQQDDA9wZ3cubG9jYWxkb21haW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-AL+8lDj0A6UjjCG6Tl5R93b14R5D/ASg+bmfR93TtaqD6MvQPFYOTf3etpP666OU
-SnloHYRhz7fQrNBB72bgikDstNJbzswszX1+h3OwS015VDukSLsZT59+MOevFzKj
-la/EpRmPUzwWzVSdOJgrD7fNM5Hw77jSnw7+jned6LrzAgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBTr9urT8vLGxoPvE82vSajtA99/7TAfBgNVHSMEGDAWgBTF
-ONy6D8Mpbj2ZB5bQhxL9uEjMNzANBgkqhkiG9w0BAQsFAAOBgQA7AO/En2nDIgZ2
-b3CIUBzzoppoADT6OmiylP58MX1Olb1HTWkfdjJkgxtbEXG7CnqvclR63DBR5ZMn
-jIpR5uUVU3AUhTt3GofO0G8xB10UMNfeoLWnoZYYGv3qn8Lqu3JShLZXbXCTNWTT
-i4Ibe+qFivvGs+BmrdsR3V5uIt20Iw==
------END CERTIFICATE-----

configs/freeDiameter/pgw.key.pem

@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC/vJQ49AOlI4whuk5eUfd29eEeQ/wEoPm5n0fd07Wqg+jL0DxW
-Dk393raT+uujlEp5aB2EYc+30KzQQe9m4IpA7LTSW87MLM19fodzsEtNeVQ7pEi7
-GU+ffjDnrxcyo5WvxKUZj1M8Fs1UnTiYKw+3zTOR8O+40p8O/o53nei68wIDAQAB
-AoGAarZPHH+aw79MD718PnyKKVhhqZGW4xCgzFG9EtXwpu1xlHXaDt85QxFANo4R
-teIjrPxoaTRzAlAOzn3T+0L/TnhU67WUOvSQEhGzS1liNNw024NekOy3rrqAvB3D
-esmOtR5+LtadCb2CuJdL0XALUp+F/g25CoryXsKMIg4Eg9ECQQD9fbT7n3GurBlF
-s1E+Ah1+fpD2qOvyFrK4Yzs/CYn5s1yEO0AMwLavO71Y+SIGzFnuIASbyEX4Adl/
-hxSvDp5ZAkEAwaJmOzgLsLvSf5RkYzaX+/IO/DBYowDknalMobDplaOlK5LLFNiM
-naEH6A6UV981OnIr6ScU8knC0HyDmmTyKwJAfu3jIdvE4OHsBaq0k4gbnKtjix8q
-hh43f3ywve/Y1t+pA81nVPtqfnQ7a8HT9/N7VHFT3W17G6RRdDn/cWiwgQJAOuD+
-5RLtuxfhshmVTPXU0S+Rju3EhgxHeAl628/Ht1DDcLR6PCR83ZGRreaBBRdCQDtn
-TsYrgGEdc/forJH1cQJBAMzBcACt51/OuHtPF+kxeRqgLINji82EQOGmZBvtWySI
-cRFndLh6N8OOkDnP2MwGY7j0jWveKE8mVA12ymMWZuU=
------END RSA PRIVATE KEY-----

configs/freeDiameter/smf.cert.pem

@@ -0,0 +1,60 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 3 (0x3)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=ca.localdomain, C=KO, ST=Seoul, L=Nowon, O=Open5GS, OU=Tests
+        Validity
+            Not Before: Aug 22 00:39:17 2020 GMT
+            Not After : Aug 20 00:39:17 2030 GMT
+        Subject: C=KO, ST=Seoul, O=Open5GS, OU=Tests, CN=smf.localdomain
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (1024 bit)
+                Modulus:
+                    00:ad:d6:cb:88:33:51:23:72:f1:16:29:2a:df:b7:
+                    75:d7:38:9e:da:18:b6:27:73:a8:60:ec:04:8f:d0:
+                    cd:c6:2e:10:ff:bd:c3:c2:a3:d7:53:e7:9e:73:07:
+                    07:a9:59:16:b1:7f:92:79:4d:d8:ee:5a:c7:ed:ef:
+                    37:83:8a:7d:94:08:41:0b:34:68:27:a5:4b:7d:cb:
+                    29:fb:85:c0:21:6e:17:72:32:29:7a:28:be:94:31:
+                    56:d2:85:9f:4b:b1:33:6f:f9:eb:01:9c:e7:2f:68:
+                    94:6b:91:58:a7:80:04:94:3c:b3:19:96:91:31:f7:
+                    c4:81:98:2b:85:8f:5c:f0:fd
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                91:4B:EF:65:02:0D:C8:85:FA:4A:3F:29:C0:10:3C:1B:AE:E4:AD:A4
+            X509v3 Authority Key Identifier: 
+                keyid:64:FB:C8:D7:A3:20:17:DC:A8:3A:AA:4B:2B:85:CD:BD:3E:53:4B:09
+
+    Signature Algorithm: sha256WithRSAEncryption
+         a3:6e:4f:00:bd:1a:62:b9:86:0f:35:f6:18:8d:15:61:a2:bc:
+         05:07:f1:73:8d:70:6f:e1:34:f1:ae:87:26:87:13:0b:c8:d8:
+         29:16:70:02:12:73:36:f9:de:43:26:12:7d:9f:d2:20:7c:e2:
+         76:47:0b:14:ba:67:e5:5a:0d:22:3b:00:c8:35:ab:dd:b1:9a:
+         e5:75:b0:86:89:02:15:32:b3:e9:48:c3:e0:38:e1:56:4c:fd:
+         aa:12:96:00:6d:a6:c3:ab:b0:8c:4b:ab:b2:4c:c2:08:26:ab:
+         d6:3f:26:95:4a:da:b8:dd:9a:f8:fe:b9:c2:e3:7a:a3:2f:2c:
+         7f:df
+-----BEGIN CERTIFICATE-----
+MIICsjCCAhugAwIBAgIBAzANBgkqhkiG9w0BAQsFADBoMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMQ4wDAYDVQQH
+DAVOb3dvbjEQMA4GA1UECgwHT3BlbjVHUzEOMAwGA1UECwwFVGVzdHMwHhcNMjAw
+ODIyMDAzOTE3WhcNMzAwODIwMDAzOTE3WjBZMQswCQYDVQQGEwJLTzEOMAwGA1UE
+CAwFU2VvdWwxEDAOBgNVBAoMB09wZW41R1MxDjAMBgNVBAsMBVRlc3RzMRgwFgYD
+VQQDDA9zbWYubG9jYWxkb21haW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+AK3Wy4gzUSNy8RYpKt+3ddc4ntoYtidzqGDsBI/QzcYuEP+9w8Kj11PnnnMHB6lZ
+FrF/knlN2O5ax+3vN4OKfZQIQQs0aCelS33LKfuFwCFuF3IyKXoovpQxVtKFn0ux
+M2/56wGc5y9olGuRWKeABJQ8sxmWkTH3xIGYK4WPXPD9AgMBAAGjezB5MAkGA1Ud
+EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
+YXRlMB0GA1UdDgQWBBSRS+9lAg3IhfpKPynAEDwbruStpDAfBgNVHSMEGDAWgBRk
++8jXoyAX3Kg6qksrhc29PlNLCTANBgkqhkiG9w0BAQsFAAOBgQCjbk8AvRpiuYYP
+NfYYjRVhorwFB/FzjXBv4TTxrocmhxMLyNgpFnACEnM2+d5DJhJ9n9IgfOJ2RwsU
+umflWg0iOwDINavdsZrldbCGiQIVMrPpSMPgOOFWTP2qEpYAbabDq7CMS6uyTMII
+JqvWPyaVStq43Zr4/rnC43qjLyx/3w==
+-----END CERTIFICATE-----

configs/freeDiameter/smf.conf.in

@@ -16,7 +16,7 @@
 # This must be a valid FQDN that resolves to the local host.
 # Default: hostname's FQDN
 #Identity = "aaa.koganei.freediameter.net";
-Identity = "pgw.localdomain";
+Identity = "smf.localdomain";
 
 # The Diameter Realm of this daemon.
 # Default: the domain part of Identity (after the first dot).
@@ -79,7 +79,7 @@ Realm = "localdomain";
 #ListenOn = "202.249.37.5";
 #ListenOn = "2001:200:903:2::202:1";
 #ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
-ListenOn = "127.0.0.3";
+ListenOn = "127.0.0.4";
 
 
 ##############################################################
@@ -106,7 +106,7 @@ ListenOn = "127.0.0.3";
 # Default : NO DEFAULT
 #TLS_Cred = "<x509 certif file.PEM>" , "<x509 private key file.PEM>";
 #TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key";
-TLS_Cred = "@sysconfdir@/freeDiameter/pgw.cert.pem", "@sysconfdir@/freeDiameter/pgw.key.pem";
+TLS_Cred = "@sysconfdir@/freeDiameter/smf.cert.pem", "@sysconfdir@/freeDiameter/smf.key.pem";
 
 # Certificate authority / trust anchors
 # The file containing the list of trusted Certificate Authorities (PEM list)
@@ -260,7 +260,7 @@ LoadExtension = "@libdir@/freeDiameter/dict_dcca_3gpp.fdx";
 # Examples:
 #ConnectPeer = "aaa.wide.ad.jp";
 #ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ;
-ConnectPeer = "pcrf.localdomain" { ConnectTo = "127.0.0.5"; No_TLS; };
+ConnectPeer = "pcrf.localdomain" { ConnectTo = "127.0.0.9"; No_TLS; };
 
 
 ##############################################################

configs/freeDiameter/smf.key.pem

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCt1suIM1EjcvEWKSrft3XXOJ7aGLYnc6hg7ASP0M3GLhD/vcPC
+o9dT555zBwepWRaxf5J5TdjuWsft7zeDin2UCEELNGgnpUt9yyn7hcAhbhdyMil6
+KL6UMVbShZ9LsTNv+esBnOcvaJRrkVingASUPLMZlpEx98SBmCuFj1zw/QIDAQAB
+AoGAV1x1hmn7oav22mMv56PD9be/pOz8RZFLEgIqPLf7YVfvNQaBpYQ/ByyEJVxo
+DkP2Mpdg3dMwbIB0ru8j39guSO0evsCG95u5L3lUMLFh/+WTt4W0g4+9y0qD1dUy
+y7kk+gKLlbPvyRNr+CiEnpz/rxdWC3J+tVBsWJGNjBGtZWECQQDdn5q7FUrF6HHQ
+O5iJYCbeL+Xn4Ajwrr4M9OeGhMz4pTTtE45jjGi2ykFa9TJFMqjLuClBXw5FkIOe
+S4unTO7JAkEAyM268Z558xHHnRl6uEN1NrqqpdXtZYnK9lm4/kZRs2mKm/98fjf0
+GiHwiKqONP7si4ARE2Ws1wKmXmCe0nNGlQJBAMw8KFCd95FYe4IlWZXHySnaxCki
+WbrLnhK8opxhx66gOJz996sfmuRQkVfsPE5uuAU9Cq/WlIVg/xoijmk3yZkCQEFu
+YCsZM62TrpKvWcCvIoOZ4b817Sw38S3C4LfiW/71NhhM8NkEDINzabhusvXr11JB
+gc7rQ52wHFwGadoze90CQF9qOBatpIFlEDkhzKofRILCWIzSrfhFdcCZqe6K8G10
+ngbk3Xg3I0I+qWViDivOm689SC9xniF7wJ1XH0BRBKE=
+-----END RSA PRIVATE KEY-----

configs/logrotate/open5gs.in

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

configs/meson.build

@@ -34,19 +34,14 @@ else
 endif
 
 example_conf = '''
-    5gc.yaml
-    5gc-sample.yaml
-    00101.yaml
-    23504.yaml
-    minimal.yaml
-    epc.yaml
-    epc-fdconf.yaml
-    epc-custom.yaml
-    mnc3.yaml
+    sample.yaml
+    310014.yaml
     csfb.yaml
     volte.yaml
+    vonr.yaml
+    minimal.yaml
     srslte.yaml
-    cups.yaml
+    sample.yaml
 '''.split()
 
 foreach file : example_conf

configs/minimal.yaml.in

@@ -3,13 +3,106 @@ db_uri: mongodb://localhost/open5gs
 logger:
 
 parameter:
+#    no_nrf: true
+#    no_amf: true
+#    no_smf: true
+#    no_upf: true
+#    no_ausf: true
+#    no_udm: true
+#    no_pcf: 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
+      load_extension:
+        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
+        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
+        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
+        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+      connect:
+        - identity: hss.localdomain
+          addr: 127.0.0.8
+
+    s1ap:
+      - addr: 127.0.0.2
+    gtpc:
+      - addr: 127.0.0.2
+    gummei:
+      plmn_id:
+        mcc: 901
+        mnc: 70
+      mme_gid: 2
+      mme_code: 1
+    tai:
+      plmn_id:
+        mcc: 901
+        mnc: 70
+      tac: 1
+    security:
+        integrity_order : [ EIA2, EIA1, EIA0 ]
+        ciphering_order : [ EEA0, EEA1, EEA2 ]
+
+    network_name:
+        full: Open5GS
+
+sgwc:
+    gtpc:
+      - addr: 127.0.0.3
+    pfcp:
+      - addr: 127.0.0.3
+
+smf:
+    sbi:
+      - addr: 127.0.0.4
+        port: 7777
+    gtpc:
+      - addr: 127.0.0.4
+      - addr: ::1
+    pfcp:
+      - addr: 127.0.0.4
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+    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
+      load_extension:
+        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
+        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
+        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
+        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+      connect:
+        - identity: pcrf.localdomain
+          addr: 127.0.0.9
 amf:
     sbi:
-      - addr: 127.0.0.2
+      - addr: 127.0.0.5
         port: 7777
     ngap:
-      - addr: 127.0.0.2
+      - addr: 127.0.0.5
     guami:
       - plmn_id:
           mcc: 208
@@ -22,7 +115,7 @@ amf:
           mcc: 208
           mnc: 93
         tac: 1
-    plmn:
+    plmn_support:
       - plmn_id:
           mcc: 208
           mnc: 93
@@ -38,28 +131,26 @@ amf:
         full: Open5GS
     amf_name: open5gs-amf0
 
-smf:
-    sbi:
-      - addr: 127.0.0.3
-        port: 7777
-    gtpc:
-      - addr: 127.0.0.3
-      - addr: ::1
+sgwu:
+    gtpu:
+      - addr: 127.0.0.6
     pfcp:
-      - addr: 127.0.0.3
+      - addr: 127.0.0.6
+
+upf:
+    pfcp:
+      - addr: 127.0.0.7
+    gtpu:
+      - addr: 127.0.0.7
     pdn:
       - addr: 10.45.0.1/16
       - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
+
+hss:
     freeDiameter:
-      identity: pgw.open-ims.test
-      realm: open-ims.test
-      listen_on: 127.0.0.3
+      identity: hss.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.8
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -70,34 +161,49 @@ smf:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: pcrf.open-ims.test
-          addr: 127.0.0.5
-upf:
-    pfcp:
-      - addr: 127.0.0.4
-    gtpu:
+        - identity: mme.localdomain
+          addr: 127.0.0.2
+pcrf:
+    freeDiameter:
+      identity: pcrf.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.9
+      load_extension:
+        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
+        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
+        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
+        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+      connect:
+        - identity: smf.localdomain
+          addr: 127.0.0.4
+
+nrf:
+    sbi:
       - addr:
-        - 127.0.0.4
+        - 127.0.0.10
         - ::1
-    pdn:
+        port: 7777
 
 ausf:
     sbi:
-      - addr: 127.0.0.5
+      - addr: 127.0.0.11
         port: 7777
 
 udm:
     sbi:
-      - addr: 127.0.0.6
+      - addr: 127.0.0.12
+        port: 7777
+
+pcf:
+    sbi:
+      - addr: 127.0.0.13
         port: 7777
 
 udr:
     sbi:
-      - addr: 127.0.0.7
-        port: 7777
-nrf:
-    sbi:
-      - addr:
-          - 127.0.0.1
-          - ::1
+      - addr: 127.0.0.20
         port: 7777

configs/newsyslog/open5gs.conf.in

@@ -1,8 +1,15 @@
 # truncate rails logs every day at midnight, keep 14 previous logs, compress previous logs
 #
 # logfilename                         [owner:group] mode count size  when  flags [/pid_file]        [sig_num]
-@localstatedir@/log/open5gs/pcrf.log              644  14    *     $D0   GZ    @localstatedir@/run/open5gs-pcrfd/pid`
-@localstatedir@/log/open5gs/pgw.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-pgwd/pid`
-@localstatedir@/log/open5gs/sgw.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-sgwd/pid`
+@localstatedir@/log/open5gs/nrf.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-nrfd/pid`
+@localstatedir@/log/open5gs/pcrf.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-pcrfd/pid`
 @localstatedir@/log/open5gs/hss.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-hssd/pid`
+@localstatedir@/log/open5gs/ausf.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-ausfd/pid`
+@localstatedir@/log/open5gs/udm.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-udmd/pid`
+@localstatedir@/log/open5gs/udr.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-udrd/pid`
+@localstatedir@/log/open5gs/upf.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-upfd/pid`
+@localstatedir@/log/open5gs/sgwc.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-sgwcd/pid`
+@localstatedir@/log/open5gs/sgwu.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-sgwud/pid`
+@localstatedir@/log/open5gs/smf.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-smfd/pid`
 @localstatedir@/log/open5gs/mme.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-mmed/pid`
+@localstatedir@/log/open5gs/amf.log               644  14    *     $D0   GZ    @localstatedir@/run/open5gs-amfd/pid`

configs/open5gs/amf.yaml.in

@@ -16,7 +16,7 @@
 #
 #  o Set OGS_LOG_TRACE to all domain level
 #    level: trace
-#    domain: core,pfcp,fd,gtp,amf,event,tlv,mem,sock
+#    domain: core,ngap,nas,gmm,sbi,amf,event,tlv,mem,sock
 #
 logger:
     file: @localstatedir@/log/open5gs/amf.log
@@ -41,9 +41,9 @@ logger:
 #          key: amf.key
 #          pem: amf.pem
 #
-#  o SBI Server(https://127.0.0.2:443, http://[::1]:80)
+#  o SBI Server(https://127.0.0.5:443, http://[::1]:80)
 #    sbi:
-#      - addr: 127.0.0.2
+#      - addr: 127.0.0.5
 #        tls:
 #          key: amf.key
 #          pem: amf.pem
@@ -53,9 +53,9 @@ logger:
 #    sbi:
 #      name: amf.open5gs.org
 #
-#  o SBI Server(http://127.0.0.2:7777)
+#  o SBI Server(http://127.0.0.5:7777)
 #    sbi:
-#      - addr: 127.0.0.2
+#      - addr: 127.0.0.5
 #        port: 7777
 #
 #  o SBI Server(http://<eth0 IP address>:80)
@@ -71,14 +71,14 @@ logger:
 #    ngap:
 #      addr: 0.0.0.0
 #
-#  o NGAP Server(127.0.0.1:38412, [::1]:38412)
+#  o NGAP Server(127.0.0.5:38412, [::1]:38412)
 #    ngap:
-#      - addr: 127.0.0.1
+#      - addr: 127.0.0.5
 #      - addr: ::1
 #
 #  o NGAP Server(different port)
 #    ngap:
-#      - addr: 127.0.0.1
+#      - addr: 127.0.0.5
 #        port: 38413
 #
 #  o NGAP Server(address avaiable in `eth0` interface)
@@ -137,7 +137,7 @@ logger:
 #  <PLMN Support>
 #
 #  o Multiple PLMN Support
-#    plmn:
+#    plmn_support:
 #      - plmn_id:
 #          mcc: 901
 #          mnc: 70
@@ -162,10 +162,10 @@ logger:
 #
 amf:
     sbi:
-      - addr: 127.0.0.2
+      - addr: 127.0.0.5
         port: 7777
     ngap:
-      - addr: 127.0.0.2
+      - addr: 127.0.0.5
     guami:
       - plmn_id:
           mcc: 901
@@ -178,14 +178,14 @@ amf:
           mcc: 901
           mnc: 70
         tac: 1
-    plmn:
+    plmn_support:
       - plmn_id:
           mcc: 901
           mnc: 70
         s_nssai:
           - sst: 1
     security:
-        integrity_order : [ NIA1, NIA2, NIA0 ]
+        integrity_order : [ NIA2, NIA1, NIA0 ]
         ciphering_order : [ NEA0, NEA1, NEA2 ]
     network_name:
         full: Open5GS
@@ -196,31 +196,31 @@ amf:
 #
 #  <SBI Client>>
 #
-#  o SBI Client(http://127.0.0.1:7777)
+#  o SBI Client(http://127.0.0.10:7777)
 #    sbi:
-#      addr: 127.0.0.1
+#      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.1:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
 #    sbi:
-#      - addr: 127.0.0.1
+#      - addr: 127.0.0.10
 #        tls:
 #          key: nrf.key
 #          pem: nrf.pem
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
-#    If prefer_ipv4 is true, http://127.0.0.1:80 is selected.
+#    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #
 #    sbi:
 #      addr:
-#        - 127.0.0.1
+#        - 127.0.0.10
 #        - fe80::1%@loopback_devname@
 #
 nrf:
     sbi:
       - addr:
-          - 127.0.0.1
+          - 127.0.0.10
           - ::1
         port: 7777
 
@@ -250,54 +250,54 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of gNB per AMF
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
 #    gnb: 32
-# o Maximum Number of UE per gNB
-#    ue: 128
-# o Maximum Number of NF Instance
-#    nf: 512
 #
 max:
 
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 8192 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
 #    big:  8
 #
-# o Memory of Packet Buffering in UPF/SGW
-#   - Maximum Number of packet(SDU size = 8Kbytes) pool in UPF/SGW
-#   - UPF/SGW Memory Usage : 65536 * 8Kbytes = 512Mbytes
-#
-#   packet: 65536
-#
 pool:
 
 #
 # time:
 #
-#  o NF Instance Heartbeat (Default : 10 seconds)
+#  o NF Instance Heartbeat (Default : 0)
+#    NFs will not send heart-beat timer in NFProfile
+#    NRF will send heart-beat timer in NFProfile
 #
-#  o NF Instance Heartbeat (Disabled)
-#    nf_instance:
-#      heartbeat: 0
+#  o NF Instance Heartbeat (20 seconds)
+#    NFs will send heart-beat timer (20 seconds) in NFProfile
+#    NRF can change heart-beat timer in NFProfile
 #
-#  o NF Instance Heartbeat (10 seconds)
 #    nf_instance:
-#      heartbeat: 10
+#      heartbeat: 20
+#
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
 time:

configs/open5gs/ausf.yaml.in

@@ -16,7 +16,7 @@
 #
 #  o Set OGS_LOG_TRACE to all domain level
 #    level: trace
-#    domain: core,pfcp,fd,gtp,ausf,event,tlv,mem,sock
+#    domain: core,sbi,ausf,event,tlv,mem,sock
 #
 logger:
     file: @localstatedir@/log/open5gs/ausf.log
@@ -41,9 +41,9 @@ logger:
 #          key: ausf.key
 #          pem: ausf.pem
 #
-#  o SBI Server(https://127.0.0.5:443, http://[::1]:80)
+#  o SBI Server(https://127.0.0.11:443, http://[::1]:80)
 #    sbi:
-#      - addr: 127.0.0.5
+#      - addr: 127.0.0.11
 #        tls:
 #          key: ausf.key
 #          pem: ausf.pem
@@ -53,9 +53,9 @@ logger:
 #    sbi:
 #      name: ausf.open5gs.org
 #
-#  o SBI Server(http://127.0.0.5:7777)
+#  o SBI Server(http://127.0.0.11:7777)
 #    sbi:
-#      - addr: 127.0.0.5
+#      - addr: 127.0.0.11
 #        port: 7777
 #
 #  o SBI Server(http://<eth0 IP address>:80)
@@ -64,7 +64,7 @@ logger:
 #
 ausf:
     sbi:
-      - addr: 127.0.0.5
+      - addr: 127.0.0.11
         port: 7777
 
 #
@@ -72,31 +72,31 @@ ausf:
 #
 #  <SBI Client>>
 #
-#  o SBI Client(http://127.0.0.1:7777)
+#  o SBI Client(http://127.0.0.10:7777)
 #    sbi:
-#      addr: 127.0.0.1
+#      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.1:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
 #    sbi:
-#      - addr: 127.0.0.1
+#      - addr: 127.0.0.10
 #        tls:
 #          key: nrf.key
 #          pem: nrf.pem
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
-#    If prefer_ipv4 is true, http://127.0.0.1:80 is selected.
+#    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #
 #    sbi:
 #      addr:
-#        - 127.0.0.1
+#        - 127.0.0.10
 #        - fe80::1%@loopback_devname@
 #
 nrf:
     sbi:
       - addr:
-          - 127.0.0.1
+          - 127.0.0.10
           - ::1
         port: 7777
 
@@ -126,54 +126,54 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of gNB per AMF
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
 #    gnb: 32
-# o Maximum Number of UE per gNB
-#    ue: 128
-# o Maximum Number of NF Instance
-#    nf: 512
 #
 max:
 
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 8192 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
 #    big:  8
 #
-# o Memory of Packet Buffering in UPF/SGW
-#   - Maximum Number of packet(SDU size = 8Kbytes) pool in UPF/SGW
-#   - UPF/SGW Memory Usage : 65536 * 8Kbytes = 512Mbytes
-#
-#   packet: 65536
-#
 pool:
 
 #
 # time:
 #
-#  o NF Instance Heartbeat (Default : 10 seconds)
+#  o NF Instance Heartbeat (Default : 0)
+#    NFs will not send heart-beat timer in NFProfile
+#    NRF will send heart-beat timer in NFProfile
 #
-#  o NF Instance Heartbeat (Disabled)
-#    nf_instance:
-#      heartbeat: 0
+#  o NF Instance Heartbeat (20 seconds)
+#    NFs will send heart-beat timer (20 seconds) in NFProfile
+#    NRF can change heart-beat timer in NFProfile
 #
-#  o NF Instance Heartbeat (10 seconds)
 #    nf_instance:
-#      heartbeat: 10
+#      heartbeat: 20
+#
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
 time:

configs/open5gs/hss.yaml.in

@@ -52,44 +52,33 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of SGW per MME
-#    sgw: 32
-# o Maximum Number of PGW per MME
-#    pgw: 32
-# o Maximum Number of VLR per MME
-#    vlr: 32
-# o Maximum Number of eNodeB per MME
-#    enb: 32
-# o Maximum Number of UE per eNodeB
-#    ue: 128
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
+#    gnb: 32
 #
 max:
 
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 8192 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
 #    big:  8
 #
-# o Memory of Packet Buffering in UPF/SGW
-#   - Maximum Number of packet(SDU size = 8Kbytes) pool in UPF/SGW
-#   - UPF/SGW Memory Usage : 65536 * 8Kbytes = 512Mbytes
-#
-#   packet: 65536
-#
 pool:

configs/open5gs/meson.build

@@ -21,18 +21,18 @@ meson.add_install_script(python3_exe, '-c',
 
 open5gs_conf = '''
     mme.yaml
-    hss.yaml
-    sgw.yaml
-    pgw.yaml
-    pcrf.yaml
-
-    nrf.yaml
-    udr.yaml
-    udm.yaml
-    ausf.yaml
-    upf.yaml
+    sgwc.yaml
+    sgwu.yaml
     smf.yaml
     amf.yaml
+    upf.yaml
+    hss.yaml
+    pcrf.yaml
+    nrf.yaml
+    ausf.yaml
+    udm.yaml
+    udr.yaml
+    pcf.yaml
 '''.split()
 
 foreach file : open5gs_conf

configs/open5gs/mme.yaml.in

@@ -33,14 +33,14 @@ logger:
 #    s1ap:
 #      addr: 0.0.0.0
 #
-#  o S1AP Server(127.0.0.1:36412, [::1]:36412)
+#  o S1AP Server(127.0.0.2:36412, [::1]:36412)
 #    s1ap:
-#      - addr: 127.0.0.1
+#      - addr: 127.0.0.2
 #      - addr: ::1
 #
 #  o S1AP Server(different port)
 #    s1ap:
-#      - addr: 127.0.0.1
+#      - addr: 127.0.0.2
 #        port: 36413
 #
 #  o S1AP Server(address avaiable in `eth0` interface)
@@ -52,9 +52,9 @@ logger:
 #  o GTP-C Server(all address avaiable)
 #    gtpc:
 #
-#  o GTP-C Server(127.0.0.1:2123, [::1]:2123)
+#  o GTP-C Server(127.0.0.2:2123, [::1]:2123)
 #    gtpc:
-#      - addr: 127.0.0.1
+#      - addr: 127.0.0.2
 #      - addr: ::1
 #
 #  <SGsAP>
@@ -112,7 +112,7 @@ logger:
 #              mnc: 02
 #            lac: 43692
 #      - addr
-#         - 127.0.0.3
+#         - 127.0.0.4
 #         - fe80::2%@loopback_devname@
 #        map:
 #          tai:
@@ -204,27 +204,29 @@ logger:
 mme:
     freeDiameter: @sysconfdir@/freeDiameter/mme.conf
     s1ap:
+      - addr: 127.0.0.2
     gtpc:
+      - addr: 127.0.0.2
     gummei: 
       plmn_id:
-        mcc: 001
-        mnc: 01
+        mcc: 901
+        mnc: 70
       mme_gid: 2
       mme_code: 1
     tai:
       plmn_id:
-        mcc: 001
-        mnc: 01
-      tac: 12345
+        mcc: 901
+        mnc: 70
+      tac: 1
     security:
-        integrity_order : [ EIA1, EIA2, EIA0 ]
+        integrity_order : [ EIA2, EIA1, EIA0 ]
         ciphering_order : [ EEA0, EEA1, EEA2 ]
     network_name:
         full: Open5GS
     mme_name: open5gs-mme0
 
 #
-# sgw:
+# sgwc:
 #
 # <GTP-C Client>
 #
@@ -234,21 +236,21 @@ mme:
 #    If prefer_ipv4 is not true, [fe80::2%@loopback_devname@] is selected.
 #    gtpc:
 #      addr:
-#        - 127.0.0.2
+#        - 127.0.0.3
 #        - fe80::2%@loopback_devname@
 #
 #  o Two SGW are defined. MME selects SGW with round-robin manner per UE
 #    gtpc:
-#      - addr: 127.0.0.2
+#      - addr: 127.0.0.3
 #      - addr: fe80::2%@loopback_devname@
 #
 #  o Three SGW are defined. MME selects SGW with round-robin manner per UE
 #    gtpc:
 #      - addr
-#        - 127.0.0.2
+#        - 127.0.0.3
 #        - fe80::2%@loopback_devname@
 #      - addr
-#        - 127.0.0.12
+#        - 127.0.0.22
 #        - fe80::12%@loopback_devname@
 #      - name: sgw3.open5gs.org
 #
@@ -257,7 +259,7 @@ mme:
 # o Round-Robin
 #
 #   gtpc:
-#     addr: 127.0.0.2
+#     addr: 127.0.0.3
 #     addr: 127.0.2.2
 #     addr: 127.0.4.2
 #
@@ -265,7 +267,7 @@ mme:
 #   (either single TAC or multiple TACs, DECIMAL representation)
 #
 #   gtpc:
-#     - addr: 127.0.0.2
+#     - addr: 127.0.0.3
 #       tac: 26000
 #     - addr: 127.0.2.2
 #       tac: [25000, 27000, 28000]
@@ -274,56 +276,56 @@ mme:
 #   (either single or multiple e_cell_id, HEX representation)
 #
 #   gtpc:
-#     - addr: 127.0.0.2
+#     - addr: 127.0.0.3
 #       e_cell_id: abcde01
 #     - addr: 127.0.2.2
 #       e_cell_id: [12345, a9413, 98765]
 #
-sgw:
+sgwc:
     gtpc:
-      addr: 127.0.0.2
+      - addr: 127.0.0.3
 
 #
-# pgw:
+# smf:
 #
 #  <GTP-C Client>
 #
-#  o By default, the PGW uses the first PGW node.
-#    - To use a different APN for each PGW, specify gtpc.apn as the APN name.
-#    - If the HSS uses WebUI to set the PGW IP for eacho UE,
-#      you can use a specific PGW node for each UE.
+#  o By default, the SMF uses the first SMF node.
+#    - To use a different APN for each SMF, specify gtpc.apn as the APN name.
+#    - If the HSS uses WebUI to set the SMF IP for each UE,
+#      you can use a specific SMF node for each UE.
 #
-#  o Two PGW are defined. 127.0.0.3:2123 is used.
+#  o Two SMF are defined. 127.0.0.4:2123 is used.
 #    [fe80::3%@loopback_devname@]:2123 is ignored.
 #    gtpc:
-#      - addr: 127.0.0.3
+#      - addr: 127.0.0.4
 #      - addr: fe80::3%@loopback_devname@
 #
-#  o One PGW is defined. if prefer_ipv4 is not true,
+#  o One SMF is defined. if prefer_ipv4 is not true,
 #    [fe80::3%@loopback_devname@] is selected.
 #    gtpc:
 #      - addr:
-#        - 127.0.0.3
+#        - 127.0.0.4
 #        - fe80::3%@loopback_devname@
 #
-#  o Two PGW are defined with a different APN.
-#    - Note that if PGW IP for UE is configured in HSS,
+#  o Two SMF are defined with a different APN.
+#    - Note that if SMF IP for UE is configured in HSS,
 #      the following configurion for this UE is ignored.
 #    gtpc:
-#      - addr: 127.0.0.3
+#      - addr: 127.0.0.4
 #        apn: internet
 #      - addr: 127.0.0.5
 #        apn: volte
 #
-#  o If APN is omitted, the default APN uses the first PGW node.
+#  o If APN is omitted, the default APN uses the first SMF node.
 #    gtpc:
-#      - addr: 127.0.0.3
+#      - addr: 127.0.0.4
 #      - addr: 127.0.0.5
 #        apn: volte
-pgw:
+smf:
     gtpc:
-      addr:
-        - 127.0.0.3
+      - addr:
+        - 127.0.0.4
         - ::1
 
 #
@@ -347,51 +349,45 @@ pgw:
 #  o Disable Stateless Address Autoconfiguration for IPv6
 #      no_slaac: true
 #
+#  o Use OAI UE
+#    - Remove HashMME in Security-mode command message
+#    - Use the length 1 of EPS network feature support in Attach accept message
+#      use_openair: true
+#
 parameter:
 
 #
 # max:
 #
-# o Maximum Number of SGW per MME
-#    sgw: 32
-# o Maximum Number of PGW per MME
-#    pgw: 32
-# o Maximum Number of VLR per MME
-#    vlr: 32
-# o Maximum Number of eNodeB per MME
-#    enb: 32
-# o Maximum Number of UE per eNodeB
-#    ue: 128
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
+#    gnb: 32
 #
 max:
 
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 8192 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
 #    big:  8
 #
-# o Memory of Packet Buffering in UPF/SGW
-#   - Maximum Number of packet(SDU size = 8Kbytes) pool in UPF/SGW
-#   - UPF/SGW Memory Usage : 65536 * 8Kbytes = 512Mbytes
-#
-#   packet: 65536
-#
 pool:
 
 #
@@ -408,3 +404,13 @@ pool:
 #  o usrsctp_udp_port : 9899
 #
 sctp:
+
+#
+# time:
+#
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
+time:

configs/open5gs/nrf.yaml.in

@@ -18,7 +18,7 @@ db_uri: mongodb://localhost/open5gs
 #
 #  o Set OGS_LOG_TRACE to all domain level
 #    level: trace
-#    domain: core,fd,nrf,event,mem,sock
+#    domain: core,sbi,nrf,event,mem,sock
 #
 logger:
     file: @localstatedir@/log/open5gs/nrf.log
@@ -44,9 +44,9 @@ logger:
 #          key: nrf.key
 #          pem: nrf.pem
 #
-#  o SBI Server(https://127.0.0.1:443, http://[::1]:80)
+#  o SBI Server(https://127.0.0.10:443, http://[::1]:80)
 #    sbi:
-#      - addr: 127.0.0.1
+#      - addr: 127.0.0.10
 #        tls:
 #          key: nrf.key
 #          pem: nrf.pem
@@ -56,9 +56,9 @@ logger:
 #    sbi:
 #      name: nrf.open5gs.org
 #
-#  o SBI Server(http://127.0.0.1:7777)
+#  o SBI Server(http://127.0.0.10:7777)
 #    sbi:
-#      - addr: 127.0.0.1
+#      - addr: 127.0.0.10
 #        port: 7777
 #
 #  o SBI Server(http://<eth0 IP address>:80)
@@ -68,7 +68,7 @@ logger:
 nrf:
     sbi:
       addr:
-        - 127.0.0.1
+        - 127.0.0.10
         - ::1
       port: 7777
 
@@ -98,47 +98,50 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of gNB per MME
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
 #    gnb: 32
-# o Maximum Number of UE per gNB
-#    ue: 128
-# o Maximum Number of NF Instance
-#    nf: 512
 #
 max:
 
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 8192 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
 #    big:  8
 #
-# o Memory of Packet Buffering in UPF/SGW
-#   - Maximum Number of packet(SDU size = 8Kbytes) pool in UPF/SGW
-#   - UPF/SGW Memory Usage : 65536 * 8Kbytes = 512Mbytes
-#
-#   packet: 65536
-#
 pool:
 
 #
 # time:
 #
+#  o NF Instance Heartbeat (Default : 10 seconds)
+#
+#  o NF Instance Heartbeat (Disabled)
+#    nf_instance:
+#      heartbeat: 0
+#
+#  o NF Instance Heartbeat (5 seconds)
+#    nf_instance:
+#      heartbeat: 5
+#
 #  o NF Instance Validity (Default : 3600 seconds = 1 hour)
 #
 #  o NF Instance Validity (10 seconds)
@@ -155,4 +158,9 @@ pool:
 #    subscription:
 #      validity: 3600
 #
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
 time:

configs/open5gs/pcf.yaml.in

@@ -0,0 +1,181 @@
+db_uri: mongodb://localhost/open5gs
+
+#
+# logger:
+#
+#  o Set OGS_LOG_INFO to all domain level
+#   - If `level` is omitted, the default level is OGS_LOG_INFO)
+#   - If `domain` is omitted, the all domain level is set from 'level'
+#    (Nothing is needed)
+#
+#  o Set OGS_LOG_ERROR to all domain level
+#   - `level` can be set with none, fatal, error, warn, info, debug, trace
+#    level: error
+#
+#  o Set OGS_LOG_DEBUG to mme/emm domain level
+#    level: debug
+#    domain: mme,emm
+#
+#  o Set OGS_LOG_TRACE to all domain level
+#    level: trace
+#    domain: core,sbi,pcf,event,tlv,mem,sock
+#
+logger:
+    file: @localstatedir@/log/open5gs/pcf.log
+#
+# pcf:
+#
+#  <SBI Server>
+#
+#  o SBI Server(http://<all address available>:80)
+#    sbi:
+#
+#  o SBI Server(http://<any address>:80)
+#    sbi:
+#      - addr:
+#          - 0.0.0.0
+#          - ::0
+#        port: 7777
+#
+#  o SBI Server(https://<all address avaiable>:443)
+#    sbi:
+#        tls:
+#          key: pcf.key
+#          pem: pcf.pem
+#
+#  o SBI Server(https://127.0.0.13:443, http://[::1]:80)
+#    sbi:
+#      - addr: 127.0.0.13
+#        tls:
+#          key: pcf.key
+#          pem: pcf.pem
+#      - addr: ::1
+#
+#  o SBI Server(http://pcf.open5gs.org:80)
+#    sbi:
+#      name: pcf.open5gs.org
+#
+#  o SBI Server(http://127.0.0.13:7777)
+#    sbi:
+#      - addr: 127.0.0.13
+#        port: 7777
+#
+#  o SBI Server(http://<eth0 IP address>:80)
+#    sbi:
+#      dev: eth0
+#
+pcf:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777
+
+#
+# nrf:
+#
+#  <SBI Client>>
+#
+#  o SBI Client(http://127.0.0.10:7777)
+#    sbi:
+#      addr: 127.0.0.10
+#      port: 7777
+#
+#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
+#    sbi:
+#      - addr: 127.0.0.10
+#        tls:
+#          key: nrf.key
+#          pem: nrf.pem
+#      - name: nrf.open5gs.org
+#
+#  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
+#    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
+#
+#    sbi:
+#      addr:
+#        - 127.0.0.10
+#        - fe80::1%@loopback_devname@
+#
+nrf:
+    sbi:
+      - addr:
+          - 127.0.0.10
+          - ::1
+        port: 7777
+
+#
+# parameter:
+#
+#  o Number of output streams per SCTP associations.
+#      sctp_streams: 30
+#
+#  o Disable use of IPv4 addresses (only IPv6)
+#      no_ipv4: true
+#
+#  o Disable use of IPv6 addresses (only IPv4)
+#      no_ipv6: true
+#
+#  o Prefer IPv4 instead of IPv6 for estabishing new GTP connections.
+#      prefer_ipv4: true
+#
+#  o Enable Multicast traffic to the UE
+#      multicast: true
+#
+#  o Disable Stateless Address Autoconfiguration for IPv6
+#      no_slaac: true
+#
+parameter:
+
+#
+# max:
+#
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
+#    gnb: 32
+#
+max:
+
+#
+# pool:
+#
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
+#
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
+#   - Pool-size 1024        => 1024 Number
+#   - Pool-size 2048        => 512 Number
+#   - Pool-size 8192        => 128 Number
+#   - Pool-size 1024*1024   => 8 Number
+#
+#    128:  65536
+#    256:  8192
+#    512:  4096
+#    1024: 1024
+#    2048: 512
+#    8192: 128
+#    big:  8
+#
+pool:
+
+#
+# time:
+#
+#  o NF Instance Heartbeat (Default : 0)
+#    NFs will not send heart-beat timer in NFProfile
+#    NRF will send heart-beat timer in NFProfile
+#
+#  o NF Instance Heartbeat (20 seconds)
+#    NFs will send heart-beat timer (20 seconds) in NFProfile
+#    NRF can change heart-beat timer in NFProfile
+#
+#    nf_instance:
+#      heartbeat: 20
+#
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
+time:

configs/open5gs/pcrf.yaml.in

@@ -46,49 +46,42 @@ pcrf:
 #  o Disable Stateless Address Autoconfiguration for IPv6
 #      no_slaac: true
 #
+#  o Legacy support for pre-release LTE 11 devices to do calling
+#    - Replace IPv4/v6 local addr field in AAR Media-Subcomponent AVP by any
+#      no_ipv4v6_local_addr_in_packet_filter: true
+#
 parameter:
 
 #
 # max:
 #
-# o Maximum Number of SGW per MME
-#    sgw: 32
-# o Maximum Number of PGW per MME
-#    pgw: 32
-# o Maximum Number of VLR per MME
-#    vlr: 32
-# o Maximum Number of eNodeB per MME
-#    enb: 32
-# o Maximum Number of UE per eNodeB
-#    ue: 128
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
+#    gnb: 32
 #
 max:
 
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 8192 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
 #    big:  8
 #
-# o Memory of Packet Buffering in UPF/SGW
-#   - Maximum Number of packet(SDU size = 8Kbytes) pool in UPF/SGW
-#   - UPF/SGW Memory Usage : 65536 * 8Kbytes = 512Mbytes
-#
-#   packet: 65536
-#
 pool:

configs/open5gs/pgw.yaml.in

@@ -1,234 +0,0 @@
-#
-# logger:
-#
-#  o Set OGS_LOG_INFO to all domain level
-#   - If `level` is omitted, the default level is OGS_LOG_INFO)
-#   - If `domain` is omitted, the all domain level is set from 'level'
-#    (Nothing is needed)
-#
-#  o Set OGS_LOG_ERROR to all domain level
-#   - `level` can be set with none, fatal, error, warn, info, debug, trace
-#    level: error
-#
-#  o Set OGS_LOG_DEBUG to mme/emm domain level
-#    level: debug
-#    domain: mme,emm
-#
-#  o Set OGS_LOG_TRACE to all domain level
-#    level: trace
-#    domain: core,fd,gtp,pgw,event,tlv,mem,sock
-#
-logger:
-    file: @localstatedir@/log/open5gs/pgw.log
-
-
-#
-# pgw:
-#
-#  <GTP-C Server>
-#
-#  o GTP-C Server(127.0.0.3:2123, [fe80::3%@loopback_devname@]:2123)
-#    gtpc:
-#      addr:
-#        - 127.0.0.3
-#        - fe80::3%@loopback_devname@
-#
-#  o On PGW, Same configuration
-#    (127.0.0.3:2123, [fe80::3%@loopback_devname@]:2123).
-#    gtpc:
-#      - addr: 127.0.0.3
-#      - addr: fe80::3%@loopback_devname@
-#
-#
-#  <GTP-U Server>>
-#
-#  o GTP-U Server(127.0.0.3:2152, [::1]:2152)
-#    gtpu:
-#      - addr: 127.0.0.3
-#      - addr: ::1
-#
-#  o Same configuration(127.0.0.3:2152, [::1]:2152) as below.
-#    gtpu:
-#      name: localhost
-#
-#  <PDN Configuration with UE Pool>
-#
-#  o IPv4 Pool
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#
-#    pdn:
-#      addr: 10.45.0.1/16
-#
-#  o IPv4/IPv6 Pool
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#    $ sudo ip addr add cafe:1::1/64 dev ogstun
-#
-#    pdn:
-#      - addr: 10.45.0.1/16
-#      - addr: cafe:1::1/64
-#
-#
-#  o Specific APN(e.g 'volte') uses 10.46.0.1/16, cafe:2::1/64
-#    All other APNs use 10.45.0.1/16, cafe:1::1/64
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#    $ sudo ip addr add 10.46.0.1/16 dev ogstun
-#    $ sudo ip addr add cafe:1::1/64 dev ogstun
-#    $ sudo ip addr add cafe:2::1/64 dev ogstun
-#
-#    pdn:
-#      - addr: 10.45.0.1/16
-#      - addr: cafe:1::1/64
-#      - addr: 10.46.0.1/16
-#        apn: volte
-#      - addr: cafe:2::1/64
-#        apn: volte
-#
-#  o Multiple Devices (default: ogstun)
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#    $ sudo ip addr add cafe:1::1/64 dev ogstun2
-#    $ sudo ip addr add 10.46.0.1/16 dev ogstun3
-#    $ sudo ip addr add cafe:2::1/64 dev ogstun3
-#
-#    pdn:
-#      - addr: 10.45.0.1/16
-#      - addr: cafe:1::1/64
-#        dev: ogstun2
-#      - addr: 10.46.0.1/16
-#        apn: volte
-#        dev: ogstun3
-#      - addr: cafe:2::1/64
-#        apn: volte
-#        dev: ogstun3
-#
-#  o Pool Range Sample
-#    pdn:
-#      - addr: 10.45.0.1/24
-#        range: 10.45.0.100-10.45.0.200
-#
-#    pdn:
-#      - addr: 10.45.0.1/24
-#        range:
-#          - 10.45.0.5-10.45.0.50
-#          - 10.45.0.100-
-#
-#    pdn:
-#      - addr: 10.45.0.1/24
-#        range:
-#          - -10.45.0.200
-#          - 10.45.0.210-10.45.0.220
-#
-#    pdn:
-#      - addr: 10.45.0.1/16
-#        range:
-#          - 10.45.0.100-10.45.0.200
-#          - 10.45.1.100-10.45.1.200
-#      - addr: cafe::1/64
-#        range:
-#          - cafe::a0-cafe:b0
-#          - cafe::c0-cafe:d0
-#
-#  <Domain Name Server>
-#
-#  o Primary/Secondary can be configured. Others are ignored.
-#
-#  <MTU Size>
-#
-#  o Provisioning a limit on the size of the packets sent by the MS
-#    to avoid packet fragmentation in the backbone network
-#    between the MS and the GGSN/PGW and/or across the (S)Gi reference point)
-#    when some of the backbone links does not support
-#    packets larger then 1500 octets
-#
-#  <P-CSCF>
-#
-#  o Proxy Call Session Control Function
-#
-#    p-cscf:
-#      - 127.0.0.1
-#      - ::1
-#
-pgw:
-    freeDiameter: @sysconfdir@/freeDiameter/pgw.conf
-    gtpc:
-      - addr: 127.0.0.3
-      - addr: ::1
-    gtpu:
-      - addr: 127.0.0.3
-      - addr: ::1
-    pdn:
-      - addr: 10.45.0.1/16
-      - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-
-#
-# parameter:
-#
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
-#
-#  o Disable use of IPv4 addresses (only IPv6)
-#      no_ipv4: true
-#
-#  o Disable use of IPv6 addresses (only IPv4)
-#      no_ipv6: true
-#
-#  o Prefer IPv4 instead of IPv6 for estabishing new GTP connections.
-#      prefer_ipv4: true
-#
-#  o Enable Multicast traffic to the UE
-#      multicast: true
-#
-#  o Disable Stateless Address Autoconfiguration for IPv6
-#      no_slaac: true
-#
-parameter:
-
-#
-# max:
-#
-# o Maximum Number of SGW per MME
-#    sgw: 32
-# o Maximum Number of PGW per MME
-#    pgw: 32
-# o Maximum Number of VLR per MME
-#    vlr: 32
-# o Maximum Number of eNodeB per MME
-#    enb: 32
-# o Maximum Number of UE per eNodeB
-#    ue: 128
-#
-max:
-
-#
-# pool:
-#
-# o The Number of Default Memory Pool Size
-#
-#   - Pool-size 128         => 8192 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  8192
-#    256:  4096
-#    512:  2048
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-# o Memory of Packet Buffering in UPF/SGW
-#   - Maximum Number of packet(SDU size = 8Kbytes) pool in UPF/SGW
-#   - UPF/SGW Memory Usage : 65536 * 8Kbytes = 512Mbytes
-#
-#   packet: 65536
-#
-pool:

configs/open5gs/sgw.yaml.in

@@ -1,131 +0,0 @@
-#
-# logger:
-#
-#  o Set OGS_LOG_INFO to all domain level
-#   - If `level` is omitted, the default level is OGS_LOG_INFO)
-#   - If `domain` is omitted, the all domain level is set from 'level'
-#    (Nothing is needed)
-#
-#  o Set OGS_LOG_ERROR to all domain level
-#   - `level` can be set with none, fatal, error, warn, info, debug, trace
-#    level: error
-#
-#  o Set OGS_LOG_DEBUG to mme/emm domain level
-#    level: debug
-#    domain: mme,emm
-#
-#  o Set OGS_LOG_TRACE to all domain level
-#    level: trace
-#    domain: core,gtp,sgw,event,tlv,mem,sock
-#
-logger:
-    file: @localstatedir@/log/open5gs/sgw.log
-
-#
-# sgw:
-#
-#  <GTP-C Server>
-#
-#  o GTP-C Server(127.0.0.2:2123, [fe80::2%@loopback_devname@]:2123)
-#    gtpc:
-#      addr:
-#        - 127.0.0.2
-#        - fe80::2%@loopback_devname@
-#
-#  o On SGW, Same Configuration(127.0.0.2:2123,
-#  [fe80::2%@loopback_devname@]:2123) as below.
-#    gtpc:
-#      - addr: 127.0.0.2
-#      - addr: fe80::2%@loopback_devname@
-#
-#  <GTP-U Server>
-#
-#  o GTP-U Server(all address avaiable)
-#    gtpu:
-#
-#  o Provide custom SGW GTP-U address to be advertised inside S1AP messages
-#    gtpu:
-#      addr: 10.4.128.21
-#      advertise_addr: 172.24.15.30
-#
-#    gtpu:
-#      addr: 10.4.128.21
-#      advertise_name: sgw1.epc.mnc001.mcc001.3gppnetwork.org
-#
-#    gtpu:
-#     dev: ens3
-#     advertise_name: sgw1.epc.mnc001.mcc001.3gppnetwork.org
-#
-sgw:
-    gtpc:
-      addr: 127.0.0.2
-    gtpu:
-
-#
-# parameter:
-#
-#  o Number of output streams per SCTP associations.
-#      sctp_streams: 30
-#
-#  o Disable use of IPv4 addresses (only IPv6)
-#      no_ipv4: true
-#
-#  o Disable use of IPv6 addresses (only IPv4)
-#      no_ipv6: true
-#
-#  o Prefer IPv4 instead of IPv6 for estabishing new GTP connections.
-#      prefer_ipv4: true
-#
-#  o Enable Multicast traffic to the UE
-#      multicast: true
-#
-#  o Disable Stateless Address Autoconfiguration for IPv6
-#      no_slaac: true
-#
-parameter:
-    no_ipv6: true
-
-#
-# max:
-#
-# o Maximum Number of SGW per MME
-#    sgw: 32
-# o Maximum Number of PGW per MME
-#    pgw: 32
-# o Maximum Number of VLR per MME
-#    vlr: 32
-# o Maximum Number of eNodeB per MME
-#    enb: 32
-# o Maximum Number of UE per eNodeB
-#    ue: 128
-#
-max:
-
-#
-# pool:
-#
-# o The Number of Default Memory Pool Size
-#
-#   - Pool-size 128         => 8192 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
-#   - Pool-size 1024        => 1024 Number
-#   - Pool-size 2048        => 512 Number
-#   - Pool-size 8192        => 128 Number
-#   - Pool-size 1024*1024   => 8 Number
-#
-#    128:  8192
-#    256:  4096
-#    512:  2048
-#    1024: 1024
-#    2048: 512
-#    8192: 128
-#    big:  8
-#
-# o Memory of Packet Buffering in UPF/SGW
-#   - Maximum Number of packet(SDU size = 8Kbytes) pool in UPF/SGW
-#   - UPF/SGW Memory Usage : 65536 * 8Kbytes = 512Mbytes
-#
-#   packet: 65536
-#
-pool:

configs/open5gs/sgwc.yaml.in

@@ -0,0 +1,175 @@
+#
+# logger:
+#
+#  o Set OGS_LOG_INFO to all domain level
+#   - If `level` is omitted, the default level is OGS_LOG_INFO)
+#   - If `domain` is omitted, the all domain level is set from 'level'
+#    (Nothing is needed)
+#
+#  o Set OGS_LOG_ERROR to all domain level
+#   - `level` can be set with none, fatal, error, warn, info, debug, trace
+#    level: error
+#
+#  o Set OGS_LOG_DEBUG to mme/emm domain level
+#    level: debug
+#    domain: mme,emm
+#
+#  o Set OGS_LOG_TRACE to all domain level
+#    level: trace
+#    domain: core,pfcp,gtp,sgwc,event,tlv,mem,sock
+#
+logger:
+    file: @localstatedir@/log/open5gs/sgwc.log
+
+#
+# sgwc:
+#
+#  <GTP-C Server>
+#
+#  o GTP-C Server(127.0.0.3:2123, [fe80::2%@loopback_devname@]:2123)
+#    gtpc:
+#      addr:
+#        - 127.0.0.3
+#        - fe80::2%@loopback_devname@
+#
+#  o On SGW, Same Configuration(127.0.0.3:2123,
+#  [fe80::2%@loopback_devname@]:2123) as below.
+#    gtpc:
+#      - addr: 127.0.0.3
+#      - addr: fe80::2%@loopback_devname@
+#
+#  <PFCP Server>
+#
+#  o PFCP Server(127.0.0.3:8805, ::1:8805)
+#    pfcp:
+#      - addr: 127.0.0.3
+#      - addr: ::1
+#
+sgwc:
+    gtpc:
+      - addr: 127.0.0.3
+    pfcp:
+      - addr: 127.0.0.3
+
+#
+# sgwu:
+#
+#  <PFCP Client>>
+#
+#  o PFCP Client(127.0.0.6:8805)
+#
+#    pfcp:
+#      addr: 127.0.0.6
+#
+#  <SGWU_SELECTION_MODE - EPC only>
+#
+# o Round-Robin
+#   (note that round robin can be disabled for a particular node
+#     by setting flag 'rr' to 0)
+#
+#  sgwu:
+#    pfcp:
+#      - addr: 127.0.0.6
+#      - addr: 127.0.0.12
+#        rr: 0
+#      - addr: 127.0.0.18
+#
+# o SGWU selection by eNodeB TAC
+#   (either single TAC or multiple TACs, DECIMAL representation)
+#
+#  sgwu:
+#    pfcp:
+#      - addr: 127.0.0.6
+#        tac: 1
+#      - addr: 127.0.0.12
+#        tac: [3,5,8]
+#
+# o SGWU selection by UE's APN (either single APN or multiple APNs)
+#
+#  sgwu:
+#    pfcp:
+#      - addr: 127.0.0.6
+#        apn: ims
+#      - addr: 127.0.0.12
+#        apn: [internet, web]
+#
+# o SGWU selection by CellID(e_cell_id: 28bit)
+#   (either single e_cell_id or multiple e_cell_id, HEX representation)
+#
+#  sgwu:
+#    pfcp:
+#      - addr: 127.0.0.6
+#        e_cell_id: 463
+#      - addr: 127.0.0.12
+#        e_cell_id: [123456789, 9413]
+#
+sgwu:
+    pfcp:
+      - addr: 127.0.0.6
+
+#
+# parameter:
+#
+#  o Number of output streams per SCTP associations.
+#      sctp_streams: 30
+#
+#  o Disable use of IPv4 addresses (only IPv6)
+#      no_ipv4: true
+#
+#  o Disable use of IPv6 addresses (only IPv4)
+#      no_ipv6: true
+#
+#  o Prefer IPv4 instead of IPv6 for estabishing new GTP connections.
+#      prefer_ipv4: true
+#
+#  o Enable Multicast traffic to the UE
+#      multicast: true
+#
+#  o Disable Stateless Address Autoconfiguration for IPv6
+#      no_slaac: true
+#
+parameter:
+
+#
+# max:
+#
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
+#    gnb: 32
+#
+max:
+
+#
+# pool:
+#
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
+#
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
+#   - Pool-size 1024        => 1024 Number
+#   - Pool-size 2048        => 512 Number
+#   - Pool-size 8192        => 128 Number
+#   - Pool-size 1024*1024   => 8 Number
+#
+#    128:  65536
+#    256:  8192
+#    512:  4096
+#    1024: 1024
+#    2048: 512
+#    8192: 128
+#    big:  8
+#
+pool:
+
+#
+# time:
+#
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
+time:

configs/open5gs/sgwu.yaml.in

@@ -0,0 +1,166 @@
+#
+# logger:
+#
+#  o Set OGS_LOG_INFO to all domain level
+#   - If `level` is omitted, the default level is OGS_LOG_INFO)
+#   - If `domain` is omitted, the all domain level is set from 'level'
+#    (Nothing is needed)
+#
+#  o Set OGS_LOG_ERROR to all domain level
+#   - `level` can be set with none, fatal, error, warn, info, debug, trace
+#    level: error
+#
+#  o Set OGS_LOG_DEBUG to mme/emm domain level
+#    level: debug
+#    domain: mme,emm
+#
+#  o Set OGS_LOG_TRACE to all domain level
+#    level: trace
+#    domain: core,pfcp,gtp,sgwu,event,tlv,mem,sock
+#
+logger:
+    file: @localstatedir@/log/open5gs/sgwu.log
+
+#
+# sgwu:
+#
+#  <GTP-U Server>
+#
+#  o GTP-U Server(all address available)
+#    gtpu:
+#
+#  o GTP-U Server(127.0.0.6:2152, [::1]:2152)
+#    gtpu:
+#      - addr:
+#        - 127.0.0.6
+#        - ::1
+#
+#  o GTP-U Server(127.0.0.1:2152, [::1]:2152)
+#    gtpu:
+#      - name: localhost
+#
+#  o User Plane IP Resource information
+#    gtpu:
+#      - addr:
+#        - 127.0.0.6
+#        - ::1
+#        teid_range_indication: 4
+#        teid_range: 10
+#        network_instance: internet
+#        source_interface: 0
+#      - addr: 127.0.10.4
+#        teid_range_indication: 4
+#        teid_range: 5
+#        network_instance: ims
+#        source_interface: 1
+#
+#  o Provide custom SGW-U GTP-U address to be advertised inside S1AP messages
+#    gtpu:
+#      - addr: 10.4.128.21
+#        advertise_addr: 172.24.15.30
+#
+#    gtpu:
+#      - addr: 10.4.128.21
+#        advertise_addr:
+#        - 127.0.0.1
+#        - ::1
+#
+#    gtpu:
+#      - addr: 10.4.128.21
+#        advertise_name: sgw1.epc.mnc001.mcc001.3gppnetwork.org
+#
+#    gtpu:
+#      - dev: ens3
+#        advertise_name: sgw1.epc.mnc001.mcc001.3gppnetwork.org
+#
+#  <PFCP Server>
+#
+#  o PFCP Server(127.0.0.6:8805, ::1:8805)
+#    pfcp:
+#      - addr: 127.0.0.6
+#      - addr: ::1
+#
+sgwu:
+    gtpu:
+      - addr: 127.0.0.6
+    pfcp:
+      - addr: 127.0.0.6
+
+#
+# sgwc:
+#
+#  <PFCP Client>>
+#
+#  o PFCP Client(127.0.0.6:8805)
+#
+#    pfcp:
+#      addr: 127.0.0.6
+#
+sgwc:
+
+#
+# parameter:
+#
+#  o Number of output streams per SCTP associations.
+#      sctp_streams: 30
+#
+#  o Disable use of IPv4 addresses (only IPv6)
+#      no_ipv4: true
+#
+#  o Disable use of IPv6 addresses (only IPv4)
+#      no_ipv6: true
+#
+#  o Prefer IPv4 instead of IPv6 for estabishing new GTP connections.
+#      prefer_ipv4: true
+#
+#  o Enable Multicast traffic to the UE
+#      multicast: true
+#
+#  o Disable Stateless Address Autoconfiguration for IPv6
+#      no_slaac: true
+#
+parameter:
+
+#
+# max:
+#
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
+#    gnb: 32
+#
+max:
+
+#
+# pool:
+#
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
+#
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
+#   - Pool-size 1024        => 1024 Number
+#   - Pool-size 2048        => 512 Number
+#   - Pool-size 8192        => 128 Number
+#   - Pool-size 1024*1024   => 8 Number
+#
+#    128:  65536
+#    256:  8192
+#    512:  4096
+#    1024: 1024
+#    2048: 512
+#    8192: 128
+#    big:  8
+#
+pool:
+
+#
+# time:
+#
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
+time:

configs/open5gs/smf.yaml.in

@@ -16,7 +16,7 @@
 #
 #  o Set OGS_LOG_TRACE to all domain level
 #    level: trace
-#    domain: core,pfcp,fd,gtp,smf,event,tlv,mem,sock
+#    domain: core,pfcp,fd,pfcp,gtp,smf,event,tlv,mem,sock
 #
 logger:
     file: @localstatedir@/log/open5gs/smf.log
@@ -41,9 +41,9 @@ logger:
 #          key: smf.key
 #          pem: smf.pem
 #
-#  o SBI Server(https://127.0.0.3:443, http://[::1]:80)
+#  o SBI Server(https://127.0.0.4:443, http://[::1]:80)
 #    sbi:
-#      - addr: 127.0.0.3
+#      - addr: 127.0.0.4
 #        tls:
 #          key: smf.key
 #          pem: smf.pem
@@ -53,9 +53,9 @@ logger:
 #    sbi:
 #      name: smf.open5gs.org
 #
-#  o SBI Server(http://127.0.0.3:7777)
+#  o SBI Server(http://127.0.0.4:7777)
 #    sbi:
-#      - addr: 127.0.0.3
+#      - addr: 127.0.0.4
 #        port: 7777
 #
 #  o SBI Server(http://<eth0 IP address>:80)
@@ -64,72 +64,60 @@ logger:
 #
 #  <PFCP Server>
 #
-#  o PFCP Server(127.0.0.3:8805, ::1:8805)
+#  o PFCP Server(127.0.0.4:8805, ::1:8805)
 #    pfcp:
-#      - addr: 127.0.0.3
+#      - addr: 127.0.0.4
 #      - addr: ::1
 #
 #  <GTP-C Server>
 #
-#  o GTP-C Server(127.0.0.3:2123, [fe80::3%@loopback_devname@]:2123)
+#  o GTP-C Server(127.0.0.4:2123, [fe80::3%@loopback_devname@]:2123)
 #    gtpc:
 #      addr:
-#        - 127.0.0.3
+#        - 127.0.0.4
 #        - fe80::3%@loopback_devname@
 #
 #  o On SMF, Same configuration
-#    (127.0.0.3:2123, [fe80::3%@loopback_devname@]:2123).
+#    (127.0.0.4:2123, [fe80::3%@loopback_devname@]:2123).
 #    gtpc:
-#      - addr: 127.0.0.3
+#      - addr: 127.0.0.4
 #      - addr: fe80::3%@loopback_devname@
 #
 #  <PDN Configuration with UE Pool>
 #
 #  o IPv4 Pool
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#
 #    pdn:
 #      addr: 10.45.0.1/16
 #
 #  o IPv4/IPv6 Pool
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#    $ sudo ip addr add cafe:1::1/64 dev ogstun
-#
 #    pdn:
 #      - addr: 10.45.0.1/16
 #      - addr: cafe:1::1/64
 #
 #
-#  o Specific APN(e.g 'volte') uses 10.46.0.1/16, cafe:2::1/64
-#    All other APNs use 10.45.0.1/16, cafe:1::1/64
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#    $ sudo ip addr add 10.46.0.1/16 dev ogstun
-#    $ sudo ip addr add cafe:1::1/64 dev ogstun
-#    $ sudo ip addr add cafe:2::1/64 dev ogstun
-#
+#  o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, cafe:2::1/64
 #    pdn:
 #      - addr: 10.45.0.1/16
+#        dnn: internet
 #      - addr: cafe:1::1/64
+#        dnn: internet
 #      - addr: 10.46.0.1/16
-#        apn: volte
+#        dnn: ims
 #      - addr: cafe:2::1/64
-#        apn: volte
+#        dnn: ims
 #
 #  o Multiple Devices (default: ogstun)
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#    $ sudo ip addr add cafe:1::1/64 dev ogstun2
-#    $ sudo ip addr add 10.46.0.1/16 dev ogstun3
-#    $ sudo ip addr add cafe:2::1/64 dev ogstun3
-#
 #    pdn:
 #      - addr: 10.45.0.1/16
+#        dnn: internet
 #      - addr: cafe:1::1/64
+#        dnn: internet
 #        dev: ogstun2
 #      - addr: 10.46.0.1/16
-#        apn: volte
+#        dnn: ims
 #        dev: ogstun3
 #      - addr: cafe:2::1/64
-#        apn: volte
+#        dnn: ims
 #        dev: ogstun3
 #
 #  o Pool Range Sample
@@ -181,13 +169,13 @@ logger:
 #
 smf:
     sbi:
-      - addr: 127.0.0.3
+      - addr: 127.0.0.4
         port: 7777
     gtpc:
-      - addr: 127.0.0.3
+      - addr: 127.0.0.4
       - addr: ::1
     pfcp:
-      - addr: 127.0.0.3
+      - addr: 127.0.0.4
       - addr: ::1
     pdn:
       - addr: 10.45.0.1/16
@@ -198,7 +186,7 @@ smf:
       - 2001:4860:4860::8888
       - 2001:4860:4860::8844
     mtu: 1400
-    freeDiameter: @sysconfdir@/freeDiameter/pgw.conf
+    freeDiameter: @sysconfdir@/freeDiameter/smf.conf
 
 #
 # nrf:
@@ -207,29 +195,29 @@ smf:
 #
 #  o SBI Client(http://127.0.0.1:7777)
 #    sbi:
-#      addr: 127.0.0.1
+#      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.1:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
 #    sbi:
-#      - addr: 127.0.0.1
+#      - addr: 127.0.0.10
 #        tls:
 #          key: nrf.key
 #          pem: nrf.pem
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
-#    If prefer_ipv4 is true, http://127.0.0.1:80 is selected.
+#    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #
 #    sbi:
 #      addr:
-#        - 127.0.0.1
+#        - 127.0.0.10
 #        - fe80::1%@loopback_devname@
 #
 nrf:
     sbi:
       - addr:
-          - 127.0.0.1
+          - 127.0.0.10
           - ::1
         port: 7777
 
@@ -238,25 +226,30 @@ nrf:
 #
 #  <PFCP Client>>
 #
-#  o PFCP Client(127.0.0.4:8805)
+#  o PFCP Client(127.0.0.7:8805)
 # 
 #    pfcp:
-#      addr: 127.0.0.4
+#      addr: 127.0.0.7
 #
 #  <UPF_SELECTION_MODE - EPC only>
 #
 # o Round-Robin
+#   (note that round robin can be disabled for a particular node
+#     by setting flag 'rr' to 0)
+#
 #  upf:
 #    pfcp:
-#      - addr: 127.0.0.4
+#      - addr: 127.0.0.7
 #      - addr: 127.0.0.12
+#        rr: 0
+#      - addr: 127.0.0.19
 #
 # o UPF selection by eNodeB TAC
 #   (either single TAC or multiple TACs, DECIMAL representation)
 #
 #  upf:
 #    pfcp:
-#      - addr: 127.0.0.4
+#      - addr: 127.0.0.7
 #        tac: 1
 #      - addr: 127.0.0.12
 #        tac: [3,5,8]
@@ -265,24 +258,24 @@ nrf:
 #
 #  upf:
 #    pfcp:
-#      - addr: 127.0.0.4
+#      - addr: 127.0.0.7
 #        dnn: ims
 #      - addr: 127.0.0.12
-#        apn: [internet, web]
+#        dnn: [internet, web]
 #
 # o UPF selection by CellID(e_cell_id: 28bit, nr_cell_id: 36bit)
 #   (either single enb_id or multiple enb_ids, HEX representation)
 #
 #  upf:
 #    pfcp:
-#      - addr: 127.0.0.4
+#      - addr: 127.0.0.7
 #        e_cell_id: 463
 #      - addr: 127.0.0.12
 #        nr_cell_id: [123456789, 9413]
 #
 upf:
     pfcp:
-      - addr: 127.0.0.4
+      - addr: 127.0.0.7
 
 #
 # parameter:
@@ -310,54 +303,54 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of gNB per AMF
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
 #    gnb: 32
-# o Maximum Number of UE per gNB
-#    ue: 128
-# o Maximum Number of NF Instance
-#    nf: 512
 #
 max:
 
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 8192 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
 #    big:  8
 #
-# o Memory of Packet Buffering in UPF/SGW
-#   - Maximum Number of packet(SDU size = 8Kbytes) pool in UPF/SGW
-#   - UPF/SGW Memory Usage : 65536 * 8Kbytes = 512Mbytes
-#
-#   packet: 65536
-#
 pool:
 
 #
 # time:
 #
-#  o NF Instance Heartbeat (Default : 10 seconds)
+#  o NF Instance Heartbeat (Default : 0)
+#    NFs will not send heart-beat timer in NFProfile
+#    NRF will send heart-beat timer in NFProfile
 #
-#  o NF Instance Heartbeat (Disabled)
-#    nf_instance:
-#      heartbeat: 0
+#  o NF Instance Heartbeat (20 seconds)
+#    NFs will send heart-beat timer (20 seconds) in NFProfile
+#    NRF can change heart-beat timer in NFProfile
 #
-#  o NF Instance Heartbeat (10 seconds)
 #    nf_instance:
-#      heartbeat: 10
+#      heartbeat: 20
+#
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
 time:

configs/open5gs/udm.yaml.in

@@ -16,7 +16,7 @@
 #
 #  o Set OGS_LOG_TRACE to all domain level
 #    level: trace
-#    domain: core,pfcp,fd,gtp,udm,event,tlv,mem,sock
+#    domain: core,sbi,udm,event,tlv,mem,sock
 #
 logger:
     file: @localstatedir@/log/open5gs/udm.log
@@ -41,9 +41,9 @@ logger:
 #          key: udm.key
 #          pem: udm.pem
 #
-#  o SBI Server(https://127.0.0.6:443, http://[::1]:80)
+#  o SBI Server(https://127.0.0.12:443, http://[::1]:80)
 #    sbi:
-#      - addr: 127.0.0.6
+#      - addr: 127.0.0.12
 #        tls:
 #          key: udm.key
 #          pem: udm.pem
@@ -53,9 +53,9 @@ logger:
 #    sbi:
 #      name: udm.open5gs.org
 #
-#  o SBI Server(http://127.0.0.6:7777)
+#  o SBI Server(http://127.0.0.12:7777)
 #    sbi:
-#      - addr: 127.0.0.6
+#      - addr: 127.0.0.12
 #        port: 7777
 #
 #  o SBI Server(http://<eth0 IP address>:80)
@@ -64,7 +64,7 @@ logger:
 #
 udm:
     sbi:
-      - addr: 127.0.0.6
+      - addr: 127.0.0.12
         port: 7777
 
 #
@@ -72,31 +72,31 @@ udm:
 #
 #  <SBI Client>>
 #
-#  o SBI Client(http://127.0.0.1:7777)
+#  o SBI Client(http://127.0.0.10:7777)
 #    sbi:
-#      addr: 127.0.0.1
+#      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.1:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
 #    sbi:
-#      - addr: 127.0.0.1
+#      - addr: 127.0.0.10
 #        tls:
 #          key: nrf.key
 #          pem: nrf.pem
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
-#    If prefer_ipv4 is true, http://127.0.0.1:80 is selected.
+#    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #
 #    sbi:
 #      addr:
-#        - 127.0.0.1
+#        - 127.0.0.10
 #        - fe80::1%@loopback_devname@
 #
 nrf:
     sbi:
       - addr:
-          - 127.0.0.1
+          - 127.0.0.10
           - ::1
         port: 7777
 
@@ -126,54 +126,54 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of gNB per AMF
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
 #    gnb: 32
-# o Maximum Number of UE per gNB
-#    ue: 128
-# o Maximum Number of NF Instance
-#    nf: 512
 #
 max:
 
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 8192 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
 #    big:  8
 #
-# o Memory of Packet Buffering in UPF/SGW
-#   - Maximum Number of packet(SDU size = 8Kbytes) pool in UPF/SGW
-#   - UPF/SGW Memory Usage : 65536 * 8Kbytes = 512Mbytes
-#
-#   packet: 65536
-#
 pool:
 
 #
 # time:
 #
-#  o NF Instance Heartbeat (Default : 10 seconds)
+#  o NF Instance Heartbeat (Default : 0)
+#    NFs will not send heart-beat timer in NFProfile
+#    NRF will send heart-beat timer in NFProfile
 #
-#  o NF Instance Heartbeat (Disabled)
-#    nf_instance:
-#      heartbeat: 0
+#  o NF Instance Heartbeat (20 seconds)
+#    NFs will send heart-beat timer (20 seconds) in NFProfile
+#    NRF can change heart-beat timer in NFProfile
 #
-#  o NF Instance Heartbeat (10 seconds)
 #    nf_instance:
-#      heartbeat: 10
+#      heartbeat: 20
+#
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
 time:

configs/open5gs/udr.yaml.in

@@ -18,7 +18,7 @@ db_uri: mongodb://localhost/open5gs
 #
 #  o Set OGS_LOG_TRACE to all domain level
 #    level: trace
-#    domain: core,pfcp,fd,gtp,udr,event,tlv,mem,sock
+#    domain: core,sbi,udr,event,tlv,mem,sock
 #
 logger:
     file: @localstatedir@/log/open5gs/udr.log
@@ -43,9 +43,9 @@ logger:
 #          key: udr.key
 #          pem: udr.pem
 #
-#  o SBI Server(https://127.0.0.7:443, http://[::1]:80)
+#  o SBI Server(https://127.0.0.20:443, http://[::1]:80)
 #    sbi:
-#      - addr: 127.0.0.7
+#      - addr: 127.0.0.20
 #        tls:
 #          key: udr.key
 #          pem: udr.pem
@@ -55,9 +55,9 @@ logger:
 #    sbi:
 #      name: udr.open5gs.org
 #
-#  o SBI Server(http://127.0.0.7:7777)
+#  o SBI Server(http://127.0.0.20:7777)
 #    sbi:
-#      - addr: 127.0.0.7
+#      - addr: 127.0.0.20
 #        port: 7777
 #
 #  o SBI Server(http://<eth0 IP address>:80)
@@ -66,7 +66,7 @@ logger:
 #
 udr:
     sbi:
-      - addr: 127.0.0.7
+      - addr: 127.0.0.20
         port: 7777
 
 #
@@ -74,31 +74,31 @@ udr:
 #
 #  <SBI Client>>
 #
-#  o SBI Client(http://127.0.0.1:7777)
+#  o SBI Client(http://127.0.0.10:7777)
 #    sbi:
-#      addr: 127.0.0.1
+#      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.1:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
 #    sbi:
-#      - addr: 127.0.0.1
+#      - addr: 127.0.0.10
 #        tls:
 #          key: nrf.key
 #          pem: nrf.pem
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://[fe80::1%@loopback_devname@]:80)
-#    If prefer_ipv4 is true, http://127.0.0.1:80 is selected.
+#    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #
 #    sbi:
 #      addr:
-#        - 127.0.0.1
+#        - 127.0.0.10
 #        - fe80::1%@loopback_devname@
 #
 nrf:
     sbi:
       - addr:
-          - 127.0.0.1
+          - 127.0.0.10
           - ::1
         port: 7777
 
@@ -128,48 +128,50 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of gNB per AMF
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
 #    gnb: 32
-# o Maximum Number of UE per gNB
-#    ue: 128
-# o Maximum Number of NF Instance
-#    nf: 512
 #
 max:
 
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 8192 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
 #    big:  8
 #
-# o Memory of Packet Buffering in UPF/SGW
-#   - Maximum Number of packet(SDU size = 8Kbytes) pool in UPF/SGW
-#   - UPF/SGW Memory Usage : 65536 * 8Kbytes = 512Mbytes
-#
-#   packet: 65536
-#
 pool:
 
 #
 # time:
 #
-#  o NF Instance Heartbeat (Default : 10 seconds)
+#  o NF Instance Heartbeat (Default : 0)
+#    NFs will not send heart-beat timer in NFProfile
+#    NRF will send heart-beat timer in NFProfile
+#
+#  o NF Instance Heartbeat (20 seconds)
+#    NFs will send heart-beat timer (20 seconds) in NFProfile
+#    NRF can change heart-beat timer in NFProfile
+#
+#    nf_instance:
+#      heartbeat: 20
 #
 #  o NF Instance Heartbeat (Disabled)
 #    nf_instance:
@@ -178,4 +180,10 @@ pool:
 #  o NF Instance Heartbeat (10 seconds)
 #    nf_instance:
 #      heartbeat: 10
+#
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
 time:

configs/open5gs/upf.yaml.in

@@ -26,26 +26,30 @@ logger:
 #
 #  <PFCP Server>
 #
-#  o PFCP Server(127.0.0.4:8805)
+#  o PFCP Server(127.0.0.7:8805, ::1:8805)
 #    pfcp:
-#      addr: 127.0.0.4
+#      - addr: 127.0.0.7
+#      - addr: ::1
 #
 #  <GTP-U Server>>
 #
-#  o GTP-U Server(127.0.0.4:2152, [::1]:2152)
+#  o GTP-U Server(all address available)
+#    gtpu:
+#
+#  o GTP-U Server(127.0.0.7:2152, [::1]:2152)
 #    gtpu:
 #      - addr:
-#        - 127.0.0.4
+#        - 127.0.0.7
 #        - ::1
 #
-#  o Same configuration(127.0.0.4:2152, [::1]:2152) as below.
+#  o GTP-U Server(127.0.0.1:2152, [::1]:2152)
 #    gtpu:
 #      name: localhost
 #
 #  o User Plane IP Resource information
 #    gtpu:
 #      - addr:
-#        - 127.0.0.4
+#        - 127.0.0.7
 #        - ::1
 #        teid_range_indication: 4
 #        teid_range: 10
@@ -57,14 +61,114 @@ logger:
 #        network_instance: ims
 #        source_interface: 1
 #
+#  o Provide custom UPF GTP-U address to be advertised inside NGAP messages
+#    gtpu:
+#      - addr: 10.4.128.21
+#        advertise_addr: 172.24.15.30
+#
+#    gtpu:
+#      - addr: 10.4.128.21
+#        advertise_addr:
+#        - 127.0.0.1
+#        - ::1
+#
+#    gtpu:
+#      - addr: 10.4.128.21
+#        advertise_name: upf1.5gc.mnc001.mcc001.3gppnetwork.org
+#
+#    gtpu:
+#      - dev: ens3
+#        advertise_name: upf1.5gc.mnc001.mcc001.3gppnetwork.org
+#
+#
+#  <PDN Configuration with UE Pool>
+#
+#  o IPv4 Pool
+#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
+#
+#    pdn:
+#      addr: 10.45.0.1/16
+#
+#  o IPv4/IPv6 Pool
+#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
+#    $ sudo ip addr add cafe:1::1/64 dev ogstun
+#
+#    pdn:
+#      - addr: 10.45.0.1/16
+#      - addr: cafe:1::1/64
+#
+#
+#  o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, cafe:2::1/64
+#    All other APNs use 10.45.0.1/16, cafe:1::1/64
+#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
+#    $ sudo ip addr add 10.46.0.1/16 dev ogstun
+#    $ sudo ip addr add cafe:1::1/64 dev ogstun
+#    $ sudo ip addr add cafe:2::1/64 dev ogstun
+#
+#    pdn:
+#      - addr: 10.45.0.1/16
+#        dnn: internet
+#      - addr: cafe:1::1/64
+#        dnn: internet
+#      - addr: 10.46.0.1/16
+#        dnn: ims
+#      - addr: cafe:2::1/64
+#        dnn: ims
+#
+#  o Multiple Devices (default: ogstun)
+#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
+#    $ sudo ip addr add cafe:1::1/64 dev ogstun2
+#    $ sudo ip addr add 10.46.0.1/16 dev ogstun3
+#    $ sudo ip addr add cafe:2::1/64 dev ogstun3
+#
+#    pdn:
+#      - addr: 10.45.0.1/16
+#        dnn: internet
+#      - addr: cafe:1::1/64
+#        dnn: internet
+#        dev: ogstun2
+#      - addr: 10.46.0.1/16
+#        dnn: ims
+#        dev: ogstun3
+#      - addr: cafe:2::1/64
+#        dnn: ims
+#        dev: ogstun3
+#
+#  o Pool Range Sample
+#    pdn:
+#      - addr: 10.45.0.1/24
+#        range: 10.45.0.100-10.45.0.200
+#
+#    pdn:
+#      - addr: 10.45.0.1/24
+#        range:
+#          - 10.45.0.5-10.45.0.50
+#          - 10.45.0.100-
+#
+#    pdn:
+#      - addr: 10.45.0.1/24
+#        range:
+#          - -10.45.0.200
+#          - 10.45.0.210-10.45.0.220
+#
+#    pdn:
+#      - addr: 10.45.0.1/16
+#        range:
+#          - 10.45.0.100-10.45.0.200
+#          - 10.45.1.100-10.45.1.200
+#      - addr: cafe::1/64
+#        range:
+#          - cafe::a0-cafe:b0
+#          - cafe::c0-cafe:d0
+#
 upf:
     pfcp:
-      - addr: 127.0.0.4
+      - addr: 127.0.0.7
     gtpu:
-      - addr:
-        - 127.0.0.4
-        - ::1
+      - addr: 127.0.0.7
     pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
 
 #
 # smf:
@@ -77,8 +181,6 @@ upf:
 #      addr: 127.0.0.3
 #
 smf:
-    pfcp:
-      - addr: 127.0.0.3
 
 #
 # parameter:
@@ -107,39 +209,43 @@ parameter:
 #
 # max:
 #
-# o Maximum Number of gNB per AMF
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
 #    gnb: 32
-# o Maximum Number of UE per gNB
-#    ue: 128
-# o Maximum Number of NF Instance
-#    nf: 512
 #
 max:
 
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 8192 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
 #    big:  8
 #
-# o Memory of Packet Buffering in UPF/SGW
-#   - Maximum Number of packet(SDU size = 8Kbytes) pool in UPF/SGW
-#   - UPF/SGW Memory Usage : 65536 * 8Kbytes = 512Mbytes
-#
-#   packet: 65536
 pool:
+
+#
+# time:
+#
+#  o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
+time:

configs/sample.yaml.in

@@ -3,7 +3,19 @@ db_uri: mongodb://localhost/open5gs
 logger:
 
 parameter:
-    no_ipv6: true
+#    no_nrf: true
+#    no_amf: true
+#    no_smf: true
+#    no_upf: true
+#    no_ausf: true
+#    no_udm: true
+#    no_pcf: true
+#    no_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
 
 mme:
     freeDiameter:
@@ -21,12 +33,13 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
-          addr: 127.0.0.4
+          addr: 127.0.0.8
 
     s1ap:
+      - addr: 127.0.0.2
     gtpc:
-      addr: 127.0.0.1
-    gummei: 
+      - addr: 127.0.0.2
+    gummei:
       plmn_id:
         mcc: 901
         mnc: 70
@@ -36,17 +49,40 @@ mme:
       plmn_id:
         mcc: 901
         mnc: 70
-      tac: 7
+      tac: 1
     security:
-        integrity_order : [ EIA1, EIA2, EIA0 ]
+        integrity_order : [ EIA2, EIA1, EIA0 ]
         ciphering_order : [ EEA0, EEA1, EEA2 ]
 
     network_name:
         full: Open5GS
 
-hss:
+sgwc:
+    gtpc:
+      - addr: 127.0.0.3
+    pfcp:
+      - addr: 127.0.0.3
+
+smf:
+    sbi:
+      - addr: 127.0.0.4
+        port: 7777
+    gtpc:
+      - addr: 127.0.0.4
+      - addr: ::1
+    pfcp:
+      - addr: 127.0.0.4
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+      - 2001:4860:4860::8888
+      - 2001:4860:4860::8844
+    mtu: 1400
     freeDiameter:
-      identity: hss.localdomain
+      identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
       load_extension:
@@ -59,19 +95,59 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: mme.localdomain
-          addr: 127.0.0.2
+        - identity: pcrf.localdomain
+          addr: 127.0.0.9
+amf:
+    sbi:
+      - addr: 127.0.0.5
+        port: 7777
+    ngap:
+      - addr: 127.0.0.5
+    guami:
+      - plmn_id:
+          mcc: 901
+          mnc: 70
+        amf_id:
+          region: 2
+          set: 1
+    tai:
+      - plmn_id:
+          mcc: 901
+          mnc: 70
+        tac: 1
+    plmn_support:
+      - plmn_id:
+          mcc: 901
+          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
 
-sgw:
-    gtpc:
-      addr: 127.0.0.2
+sgwu:
     gtpu:
+      - addr: 127.0.0.6
+    pfcp:
+      - addr: 127.0.0.6
 
-pgw:
+upf:
+    pfcp:
+      - addr: 127.0.0.7
+    gtpu:
+      - addr: 127.0.0.7
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+
+hss:
     freeDiameter:
-      identity: pgw.localdomain
+      identity: hss.localdomain
       realm: localdomain
-      listen_on: 127.0.0.3
+      listen_on: 127.0.0.8
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -82,31 +158,13 @@ pgw:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: pcrf.localdomain
-          addr: 127.0.0.5
-
-    gtpc:
-      addr:
-        - 127.0.0.3
-        - ::1
-    gtpu:
-      - addr: 127.0.0.3
-      - addr: ::1
-    pdn:
-      - addr: 10.45.0.1/16
-      - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-
+        - identity: mme.localdomain
+          addr: 127.0.0.2
 pcrf:
     freeDiameter:
       identity: pcrf.localdomain
       realm: localdomain
-      listen_on: 127.0.0.5
+      listen_on: 127.0.0.9
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -117,5 +175,32 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: pgw.localdomain
-          addr: 127.0.0.3
+        - identity: smf.localdomain
+          addr: 127.0.0.4
+
+nrf:
+    sbi:
+      - addr:
+        - 127.0.0.10
+        - ::1
+        port: 7777
+
+ausf:
+    sbi:
+      - addr: 127.0.0.11
+        port: 7777
+
+udm:
+    sbi:
+      - addr: 127.0.0.12
+        port: 7777
+
+pcf:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777
+
+udr:
+    sbi:
+      - addr: 127.0.0.20
+        port: 7777

configs/srslte.yaml.in

@@ -3,7 +3,19 @@ db_uri: mongodb://localhost/open5gs
 logger:
 
 parameter:
-    no_ipv6: true
+#    no_nrf: true
+#    no_amf: true
+#    no_smf: true
+#    no_upf: true
+#    no_ausf: true
+#    no_udm: true
+#    no_pcf: true
+#    no_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
 
 mme:
     freeDiameter:
@@ -21,13 +33,13 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
-          addr: 127.0.0.4
+          addr: 127.0.0.8
 
     s1ap:
-      addr: 127.0.1.100
+      - addr: 127.0.1.100
     gtpc:
-      addr: 127.0.1.100
-    gummei: 
+      - addr: 127.0.0.2
+    gummei:
       plmn_id:
         mcc: 901
         mnc: 70
@@ -39,15 +51,38 @@ mme:
         mnc: 70
       tac: 7
     security:
-        integrity_order : [ EIA1, EIA2, EIA0 ]
+        integrity_order : [ EIA2, EIA1, EIA0 ]
         ciphering_order : [ EEA0, EEA1, EEA2 ]
 
     network_name:
         full: Open5GS
 
-hss:
+sgwc:
+    gtpc:
+      - addr: 127.0.0.3
+    pfcp:
+      - addr: 127.0.0.3
+
+smf:
+#    sbi:
+#      - addr: 127.0.0.4
+#        port: 7777
+    gtpc:
+      - addr: 127.0.0.4
+      - addr: ::1
+    pfcp:
+      - addr: 127.0.0.4
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+      - 2001:4860:4860::8888
+      - 2001:4860:4860::8844
+    mtu: 1400
     freeDiameter:
-      identity: hss.localdomain
+      identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
       load_extension:
@@ -60,20 +95,59 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: mme.localdomain
-          addr: 127.0.0.2
+        - identity: pcrf.localdomain
+          addr: 127.0.0.9
+amf:
+    sbi:
+      - addr: 127.0.0.5
+        port: 7777
+    ngap:
+      - addr: 127.0.0.5
+    guami:
+      - plmn_id:
+          mcc: 901
+          mnc: 70
+        amf_id:
+          region: 2
+          set: 1
+    tai:
+      - plmn_id:
+          mcc: 901
+          mnc: 70
+        tac: 1
+    plmn_support:
+      - plmn_id:
+          mcc: 901
+          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
 
-sgw:
-    gtpc:
-      addr: 127.0.0.2
+sgwu:
     gtpu:
-      addr: 127.0.0.2
+      - addr: 127.0.0.6
+    pfcp:
+      - addr: 127.0.0.6
 
-pgw:
+upf:
+    pfcp:
+      - addr: 127.0.0.7
+    gtpu:
+      - addr: 127.0.0.7
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+
+hss:
     freeDiameter:
-      identity: pgw.localdomain
+      identity: hss.localdomain
       realm: localdomain
-      listen_on: 127.0.0.3
+      listen_on: 127.0.0.8
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -84,31 +158,13 @@ pgw:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: pcrf.localdomain
-          addr: 127.0.0.5
-
-    gtpc:
-      addr:
-        - 127.0.0.3
-        - ::1
-    gtpu:
-      - addr: 127.0.0.3
-      - addr: ::1
-    pdn:
-      - addr: 10.45.0.1/16
-      - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-
+        - identity: mme.localdomain
+          addr: 127.0.0.2
 pcrf:
     freeDiameter:
       identity: pcrf.localdomain
       realm: localdomain
-      listen_on: 127.0.0.5
+      listen_on: 127.0.0.9
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -119,5 +175,32 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: pgw.localdomain
-          addr: 127.0.0.3
+        - identity: smf.localdomain
+          addr: 127.0.0.4
+
+#nrf:
+#    sbi:
+#      - addr:
+#        - 127.0.0.10
+#        - ::1
+#        port: 7777
+
+ausf:
+    sbi:
+      - addr: 127.0.0.11
+        port: 7777
+
+udm:
+    sbi:
+      - addr: 127.0.0.12
+        port: 7777
+
+pcf:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777
+
+udr:
+    sbi:
+      - addr: 127.0.0.20
+        port: 7777

configs/systemd/meson.build

@@ -16,11 +16,19 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 systemd_conf_in = '''
-    open5gs-hssd.service
-    open5gs-pgwd.service
     open5gs-mmed.service
-    open5gs-sgwd.service
+    open5gs-sgwcd.service
+    open5gs-smfd.service
+    open5gs-amfd.service
+    open5gs-sgwud.service
+    open5gs-upfd.service
+    open5gs-hssd.service
     open5gs-pcrfd.service
+    open5gs-nrfd.service
+    open5gs-ausfd.service
+    open5gs-udmd.service
+    open5gs-pcfd.service
+    open5gs-udrd.service
 '''.split()
 
 foreach file : systemd_conf_in

configs/systemd/open5gs-amfd.service.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=Open5GS S-GW Daemon
+Description=Open5GS AMF Daemon
 After=networking.service
 
 [Service]
@@ -9,7 +9,7 @@ User=open5gs
 Group=open5gs
 
 Restart=always
-ExecStart=@bindir@/open5gs-sgwd -c @sysconfdir@/open5gs/sgw.yaml
+ExecStart=@bindir@/open5gs-amfd -c @sysconfdir@/open5gs/amf.yaml
 RestartSec=2
 RestartPreventExitStatus=1
 ExecReload=/bin/kill -HUP $MAINPID

configs/systemd/open5gs-ausfd.service.in

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

configs/systemd/open5gs-nrfd.service.in

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

configs/systemd/open5gs-pcfd.service.in

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

configs/systemd/open5gs-sgwcd.service.in

@@ -0,0 +1,18 @@
+[Unit]
+Description=Open5GS SGW-C Daemon
+After=networking.service
+
+[Service]
+Type=simple
+
+User=open5gs
+Group=open5gs
+
+Restart=always
+ExecStart=@bindir@/open5gs-sgwcd -c @sysconfdir@/open5gs/sgwc.yaml
+RestartSec=2
+RestartPreventExitStatus=1
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

configs/systemd/open5gs-sgwud.service.in

@@ -0,0 +1,18 @@
+[Unit]
+Description=Open5GS SGW-U Daemon
+After=networking.service
+
+[Service]
+Type=simple
+
+User=open5gs
+Group=open5gs
+
+Restart=always
+ExecStart=@bindir@/open5gs-sgwud -c @sysconfdir@/open5gs/sgwu.yaml
+RestartSec=2
+RestartPreventExitStatus=1
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

configs/systemd/open5gs-smfd.service.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=Open5GS P-GW Daemon
+Description=Open5GS SMF Daemon
 After=networking.service
 Requires=systemd-networkd.service
 
@@ -10,7 +10,7 @@ User=open5gs
 Group=open5gs
 
 Restart=always
-ExecStart=@bindir@/open5gs-pgwd -c @sysconfdir@/open5gs/pgw.yaml
+ExecStart=@bindir@/open5gs-smfd -c @sysconfdir@/open5gs/smf.yaml
 RestartSec=2
 RestartPreventExitStatus=1
 ExecReload=/bin/kill -HUP $MAINPID

configs/systemd/open5gs-udmd.service.in

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

configs/systemd/open5gs-udrd.service.in

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

configs/systemd/open5gs-upfd.service.in

@@ -0,0 +1,19 @@
+[Unit]
+Description=Open5GS UPF Daemon
+After=networking.service
+Requires=systemd-networkd.service
+
+[Service]
+Type=simple
+
+User=open5gs
+Group=open5gs
+
+Restart=always
+ExecStart=@bindir@/open5gs-upfd -c @sysconfdir@/open5gs/upf.yaml
+RestartSec=2
+RestartPreventExitStatus=1
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

configs/volte.yaml.in

@@ -3,13 +3,24 @@ db_uri: mongodb://localhost/open5gs
 logger:
 
 parameter:
+#    no_nrf: true
+#    no_amf: true
+#    no_smf: true
+#    no_upf: true
+#    no_ausf: true
+#    no_udm: true
+#    no_pcf: true
+#    no_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
 
 mme:
     freeDiameter:
-      identity: mme.open-ims.test
-      realm: open-ims.test
-#      port: 3868
-#      sec_port: 5868
+      identity: mme.localdomain
+      realm: localdomain
       listen_on: 127.0.0.2
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
@@ -21,15 +32,14 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: hss.open-ims.test
-          addr: 127.0.0.4
-#          port: 3868
+        - identity: hss.localdomain
+          addr: 127.0.0.8
 
     s1ap:
-      addr: 127.0.0.1
+      - addr: 127.0.0.2
     gtpc:
-      addr: 127.0.0.1
-    gummei: 
+      - addr: 127.0.0.2
+    gummei:
       plmn_id:
         mcc: 001
         mnc: 01
@@ -41,15 +51,42 @@ mme:
         mnc: 01
       tac: 12345
     security:
-        integrity_order : [ EIA1, EIA2, EIA0 ]
+        integrity_order : [ EIA2, EIA1, EIA0 ]
         ciphering_order : [ EEA0, EEA1, EEA2 ]
 
-hss:
+    network_name:
+        full: Open5GS
+
+sgwc:
+    gtpc:
+      - addr: 127.0.0.3
+    pfcp:
+      - addr: 127.0.0.3
+
+smf:
+#    sbi:
+#      - addr: 127.0.0.4
+#        port: 7777
+    gtpc:
+      - addr: 127.0.0.4
+      - addr: ::1
+    pfcp:
+      - addr: 127.0.0.4
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+      - 2001:4860:4860::8888
+      - 2001:4860:4860::8844
+    p-cscf:
+      - 127.0.0.1
+      - ::1
+    mtu: 1400
     freeDiameter:
-      identity: hss.open-ims.test
-      realm: open-ims.test
-#      port: 3868
-#      sec_port: 5868
+      identity: smf.localdomain
+      realm: localdomain
       listen_on: 127.0.0.4
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
@@ -61,71 +98,59 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: mme.open-ims.test
-          addr: 127.0.0.2
-#          port: 3868
+        - identity: pcrf.localdomain
+          addr: 127.0.0.9
+amf:
+    sbi:
+      - addr: 127.0.0.5
+        port: 7777
+    ngap:
+      - addr: 127.0.0.5
+    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
 
-sgw:
-    gtpc:
-      addr: 127.0.0.2
+sgwu:
     gtpu:
-      addr: 127.0.0.2
+      - addr: 127.0.0.6
+    pfcp:
+      - addr: 127.0.0.6
 
-pgw:
-    freeDiameter:
-      identity: pgw.open-ims.test
-      realm: open-ims.test
-#      port: 3868
-#      sec_port: 5868
-      listen_on: 127.0.0.3
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
-      connect:
-        - identity: pcrf.open-ims.test
-          addr: 127.0.0.5
-#          port: 3868
-
-    gtpc:
-      addr:
-        - 127.0.0.3
-        - ::1
+upf:
+    pfcp:
+      - addr: 127.0.0.7
     gtpu:
-      - addr: 127.0.0.3
-      - addr: ::1
+      - addr: 127.0.0.7
     pdn:
       - addr: 10.45.0.1/16
       - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
 
-#
-#  <P-CSCF>
-#
-#  o Proxy Call Session Control Function
-#
-#    p-cscf:
-#      - 127.0.0.1
-#      - ::1
-#
-
-pcrf:
+hss:
     freeDiameter:
-      identity: pcrf.open-ims.test
-      realm: open-ims.test
-#      port: 3868
-#      sec_port: 5868
-      listen_on: 127.0.0.5
+      identity: hss.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.8
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -136,7 +161,51 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: pgw.open-ims.test
-          addr: 127.0.0.3
-        - identity: pcscf.open-ims.test
+        - identity: mme.localdomain
+          addr: 127.0.0.2
+pcrf:
+    freeDiameter:
+      identity: pcrf.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.9
+      load_extension:
+        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
+        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
+        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
+        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+      connect:
+        - identity: smf.localdomain
+          addr: 127.0.0.4
+        - identity: pcscf.localdomain
           addr: 127.0.0.1
+
+#nrf:
+#    sbi:
+#      - addr:
+#        - 127.0.0.10
+#        - ::1
+#        port: 7777
+
+ausf:
+    sbi:
+      - addr: 127.0.0.11
+        port: 7777
+
+udm:
+    sbi:
+      - addr: 127.0.0.12
+        port: 7777
+
+pcf:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777
+
+udr:
+    sbi:
+      - addr: 127.0.0.20
+        port: 7777

configs/vonr.yaml.in

@@ -3,7 +3,19 @@ db_uri: mongodb://localhost/open5gs
 logger:
 
 parameter:
-    no_ipv6: true
+#    no_nrf: true
+#    no_amf: true
+#    no_smf: true
+#    no_upf: true
+#    no_ausf: true
+#    no_udm: true
+#    no_pcf: true
+#    no_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
 
 mme:
     freeDiameter:
@@ -21,22 +33,22 @@ mme:
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
-          addr: 127.0.0.4
+          addr: 127.0.0.8
 
     s1ap:
-      addr: 127.0.0.1
+      - addr: 127.0.0.2
     gtpc:
-      addr: 127.0.0.1
-    gummei: 
+      - addr: 127.0.0.2
+    gummei:
       plmn_id:
-        mcc: 235
-        mnc: 04
-      mme_gid: 32769
+        mcc: 901
+        mnc: 70
+      mme_gid: 2
       mme_code: 1
     tai:
       plmn_id:
-        mcc: 235
-        mnc: 04
+        mcc: 901
+        mnc: 70
       tac: 1
     security:
         integrity_order : [ EIA2, EIA1, EIA0 ]
@@ -45,9 +57,35 @@ mme:
     network_name:
         full: Open5GS
 
-hss:
+sgwc:
+    gtpc:
+      - addr: 127.0.0.3
+    pfcp:
+      - addr: 127.0.0.3
+
+smf:
+    sbi:
+      - addr: 127.0.0.4
+        port: 7777
+    gtpc:
+      - addr: 127.0.0.4
+      - addr: ::1
+    pfcp:
+      - addr: 127.0.0.4
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+      - 2001:4860:4860::8888
+      - 2001:4860:4860::8844
+    p-cscf:
+      - 127.0.0.1
+      - ::1
+    mtu: 1400
     freeDiameter:
-      identity: hss.localdomain
+      identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
       load_extension:
@@ -60,20 +98,59 @@ hss:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: mme.localdomain
-          addr: 127.0.0.2
+        - identity: pcrf.localdomain
+          addr: 127.0.0.9
+amf:
+    sbi:
+      - addr: 127.0.0.5
+        port: 7777
+    ngap:
+      - addr: 127.0.0.5
+    guami:
+      - plmn_id:
+          mcc: 901
+          mnc: 70
+        amf_id:
+          region: 2
+          set: 1
+    tai:
+      - plmn_id:
+          mcc: 901
+          mnc: 70
+        tac: 1
+    plmn_support:
+      - plmn_id:
+          mcc: 901
+          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
 
-sgw:
-    gtpc:
-      addr: 127.0.0.2
+sgwu:
     gtpu:
-      addr: 127.0.0.2
+      - addr: 127.0.0.6
+    pfcp:
+      - addr: 127.0.0.6
 
-pgw:
+upf:
+    pfcp:
+      - addr: 127.0.0.7
+    gtpu:
+      - addr: 127.0.0.7
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+
+hss:
     freeDiameter:
-      identity: pgw.localdomain
+      identity: hss.localdomain
       realm: localdomain
-      listen_on: 127.0.0.3
+      listen_on: 127.0.0.8
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -84,34 +161,13 @@ pgw:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-      connect:
-        - identity: pcrf.localdomain
-          addr: 127.0.0.5
-
-    gtpc:
-      - addr:
-        - 127.0.0.3
-        - ::1
-      - addr:
-        - 127.0.0.4
-    gtpu:
-      - addr: 127.0.0.3
-      - addr: ::1
-    pdn:
-      - addr: 10.45.0.1/16
-      - addr: cafe::1/64
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-
+        - identity: mme.localdomain
+          addr: 127.0.0.2
 pcrf:
     freeDiameter:
       identity: pcrf.localdomain
       realm: localdomain
-      listen_on: 127.0.0.5
+      listen_on: 127.0.0.9
       load_extension:
         - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
           conf: 0x8888
@@ -122,5 +178,34 @@ pcrf:
         - module: @freediameter_extensions_builddir@/dict_dcca.fdx
         - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
       connect:
-        - identity: pgw.localdomain
-          addr: 127.0.0.3
+        - identity: smf.localdomain
+          addr: 127.0.0.4
+        - identity: pcscf.localdomain
+          addr: 127.0.0.1
+
+nrf:
+    sbi:
+      - addr:
+        - 127.0.0.10
+        - ::1
+        port: 7777
+
+ausf:
+    sbi:
+      - addr: 127.0.0.11
+        port: 7777
+
+udm:
+    sbi:
+      - addr: 127.0.0.12
+        port: 7777
+
+pcf:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777
+
+udr:
+    sbi:
+      - addr: 127.0.0.20
+        port: 7777

debian/changelog

@@ -1,3 +1,495 @@
+open5gs (2.1.4) unstable; urgency=medium
+
+  * Paging was added
+
+ -- Sukchan Lee <acetcom@gmail.com>  Mon, 18 Jan 2021 19:14:26 -0500
+
+open5gs (2.1.4~bionic) bionic; urgency=medium
+
+  * Paging was added
+
+ -- Sukchan Lee <acetcom@gmail.com>  Mon, 18 Jan 2021 19:13:26 -0500
+
+open5gs (2.1.4~focal) focal; urgency=medium
+
+  * Paging was added
+
+ -- Sukchan Lee <acetcom@gmail.com>  Mon, 18 Jan 2021 19:12:06 -0500
+
+open5gs (2.1.3) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 08 Jan 2021 23:20:33 -0500
+
+open5gs (2.1.3~bionic1) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 08 Jan 2021 23:19:22 -0500
+
+open5gs (2.1.3~focal1) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 08 Jan 2021 23:17:48 -0500
+
+open5gs (2.1.2) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 08 Jan 2021 00:28:16 -0500
+
+open5gs (2.1.2~bionic1) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 08 Jan 2021 00:27:09 -0500
+
+open5gs (2.1.2~focal1) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 08 Jan 2021 00:25:31 -0500
+
+open5gs (2.1.1) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 16 Dec 2020 23:04:41 -0500
+
+open5gs (2.1.1~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 16 Dec 2020 23:03:25 -0500
+
+open5gs (2.1.1~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 16 Dec 2020 23:02:04 -0500
+
+open5gs (2.1.0) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 11 Dec 2020 14:16:21 -0500
+
+open5gs (2.1.0~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 11 Dec 2020 14:15:00 -0500
+
+open5gs (2.1.0~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 11 Dec 2020 14:13:40 -0500
+
+open5gs (2.0.22) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 19 Nov 2020 07:55:27 -0500
+
+open5gs (2.0.22~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 19 Nov 2020 07:54:23 -0500
+
+open5gs (2.0.22~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 19 Nov 2020 07:53:15 -0500
+
+open5gs (2.0.21) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 11 Nov 2020 14:16:54 -0500
+
+open5gs (2.0.21~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 11 Nov 2020 14:12:36 -0500
+
+open5gs (2.0.21~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 11 Nov 2020 14:11:17 -0500
+
+open5gs (2.0.20) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 01 Nov 2020 23:05:14 -0500
+
+open5gs (2.0.20~bionic3) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 01 Nov 2020 23:04:15 -0500
+
+open5gs (2.0.20~focal3) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 01 Nov 2020 23:03:11 -0500
+
+open5gs (2.0.19) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 01 Nov 2020 01:49:04 -0400
+
+open5gs (2.0.19~bionic3) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 01 Nov 2020 01:47:12 -0400
+
+open5gs (2.0.19~focal3) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 01 Nov 2020 01:46:05 -0400
+
+open5gs (2.0.18) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 09 Oct 2020 07:51:09 -0400
+
+open5gs (2.0.18~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 09 Oct 2020 07:48:43 -0400
+
+open5gs (2.0.18~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 09 Oct 2020 07:47:23 -0400
+
+open5gs (2.0.17) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 08 Oct 2020 23:06:11 -0400
+
+open5gs (2.0.17~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 08 Oct 2020 23:05:03 -0400
+
+open5gs (2.0.17~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 08 Oct 2020 23:03:46 -0400
+
+open5gs (2.0.16) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 07 Oct 2020 21:31:32 -0400
+
+open5gs (2.0.16~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 07 Oct 2020 21:30:17 -0400
+
+open5gs (2.0.16~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 07 Oct 2020 21:28:04 -0400
+
+open5gs (2.0.15) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Mon, 05 Oct 2020 14:10:57 -0400
+
+open5gs (2.0.15~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Mon, 05 Oct 2020 14:09:37 -0400
+
+open5gs (2.0.15~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Mon, 05 Oct 2020 14:08:21 -0400
+
+open5gs (2.0.13) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 03 Oct 2020 22:44:15 -0400
+
+open5gs (2.0.13~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 03 Oct 2020 22:42:55 -0400
+
+open5gs (2.0.13~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 03 Oct 2020 22:41:30 -0400
+
+open5gs (2.0.12) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 01 Oct 2020 13:50:03 -0400
+
+open5gs (2.0.12~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 01 Oct 2020 13:48:56 -0400
+
+open5gs (2.0.12~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 01 Oct 2020 13:46:28 -0400
+
+open5gs (2.0.11) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 24 Sep 2020 22:06:23 -0400
+
+open5gs (2.0.11~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 24 Sep 2020 22:04:37 -0400
+
+open5gs (2.0.11~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 24 Sep 2020 22:03:26 -0400
+
+open5gs (2.0.10) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 22 Sep 2020 21:25:27 -0400
+
+open5gs (2.0.10~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 22 Sep 2020 21:23:46 -0400
+
+open5gs (2.0.10~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 22 Sep 2020 21:22:40 -0400
+
+open5gs (2.0.9) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 22 Sep 2020 14:08:35 -0400
+
+open5gs (2.0.9~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 22 Sep 2020 14:07:27 -0400
+
+open5gs (2.0.9~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 22 Sep 2020 14:06:05 -0400
+
+open5gs (2.0.8) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 22 Sep 2020 00:49:15 -0400
+
+open5gs (2.0.8~focal2) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 22 Sep 2020 00:48:02 -0400
+
+open5gs (2.0.8~bionic2) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 22 Sep 2020 00:46:46 -0400
+
+open5gs (2.0.7) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 18 Sep 2020 21:51:37 -0400
+
+open5gs (2.0.7~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 18 Sep 2020 21:55:36 -0400
+
+open5gs (2.0.7~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 18 Sep 2020 21:54:21 -0400
+
+open5gs (2.0.6) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 15 Sep 2020 12:37:53 -0400
+
+open5gs (2.0.6~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 15 Sep 2020 12:40:53 -0400
+
+open5gs (2.0.6~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 15 Sep 2020 12:39:41 -0400
+
+open5gs (2.0.5~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 10 Sep 2020 21:59:27 -0400
+
+open5gs (2.0.5~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 10 Sep 2020 21:58:12 -0400
+
+open5gs (2.0.5) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Thu, 10 Sep 2020 21:56:16 -0400
+
+open5gs (2.0.4~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 09 Sep 2020 02:39:43 +0000
+
+open5gs (2.0.4~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 09 Sep 2020 02:38:39 +0000
+
+open5gs (2.0.4) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Wed, 09 Sep 2020 02:35:55 +0000
+
+open5gs (2.0.3~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 08 Sep 2020 02:40:37 +0000
+
+open5gs (2.0.3~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 08 Sep 2020 02:38:57 +0000
+
+open5gs (2.0.3) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Tue, 08 Sep 2020 02:33:07 +0000
+
+open5gs (2.0.2~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 06 Sep 2020 23:59:56 -0400
+
+open5gs (2.0.2~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 06 Sep 2020 23:58:40 -0400
+
+open5gs (2.0.2) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sun, 06 Sep 2020 23:54:34 -0400
+
+open5gs (2.0.1~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 05 Sep 2020 19:39:51 -0400
+
+open5gs (2.0.1~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 05 Sep 2020 19:36:22 -0400
+
+open5gs (2.0.1) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 05 Sep 2020 16:43:24 -0400
+
+open5gs (2.0.0~focal) focal; urgency=medium
+
+  * 5G Core and EPC (Hybrid)
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 21 Aug 2020 23:40:12 -0400
+
+open5gs (2.0.0~bionic) bionic; urgency=medium
+
+  * 5G Core and EPC (Hybrid)
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 21 Aug 2020 23:38:44 -0400
+
+open5gs (2.0.0) unstable; urgency=medium
+
+  * 5G Core and EPC (Hybrid)
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 21 Aug 2020 22:18:53 -0400
+
+open5gs (1.3.0) unstable; urgency=medium
+
+  * Release-16
+
+ -- Sukchan Lee <acetcom@gmail.com>  Fri, 10 Jul 2020 17:29:33 -0400
+
 open5gs (1.3.0~eoan1) eoan; urgency=medium
 
   * Release-16
@@ -16,12 +508,6 @@ open5gs (1.3.0~bionic1) bionic; urgency=medium
 
  -- Sukchan Lee <acetcom@gmail.com>  Fri, 10 Jul 2020 17:30:57 -0400
 
-open5gs (1.3.0) unstable; urgency=medium
-
-  * Release-16
-
- -- Sukchan Lee <acetcom@gmail.com>  Fri, 10 Jul 2020 17:29:33 -0400
-
 open5gs (1.2.4~eoan) eoan; urgency=medium
 
   * Bug Fixed

debian/control

@@ -19,6 +19,7 @@ Build-Depends: debhelper (>= 11),
                libyaml-dev,
                libmicrohttpd-dev,
                libcurl4-gnutls-dev,
+               libnghttp2-dev,
 Standards-Version: 4.3.0
 Rules-Requires-Root: no
 Homepage: https://open5gs.org
@@ -30,12 +31,12 @@ Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: Open Source based 3GPP EPC (Shared Files)
- Open5GS is a C-language Open Source implementation of the 3GPP Evolved
- Packet Core, i.e. the core network of an LTE network.
+Description: 5G Core and EPC (Shared Files)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
  .
  This package contains some core libraries/plugins required by the other
- binary packages such as open5gs-{mme,sgw,pgw,pcrf,hss}.
+ binary packages such as open5gs-{mme,sgwc,sgwu,amf,smf,upf,...}.
 
 Package: open5gs-mme
 Architecture: any
@@ -43,61 +44,79 @@ Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          open5gs-common (= ${binary:Version})
-Description: Open Source based 3GPP EPC MME (Mobility Management Entity)
- Open5GS is a C-language Open Source implementation of the 3GPP Evolved
- Packet Core, i.e. the core network of an LTE network.
+Description: MME (Mobility Management Entity)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
  .
  This package provides the MME (Mobility Management Engine), which
  terminates the S1 interfaces from the eNodeBs cells in the cellular
- network, and interfaces via S11 to the SGW as well as via S6a to the
+ network, and interfaces via S11 to the SGW-C as well as via S6a to the
  HSS.
 
-Package: open5gs-sgw
+Package: open5gs-sgwc
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          open5gs-common (= ${binary:Version})
-Description: Open Source based 3GPP EPC SGW (Serving Gateway)
- Open5GS is a C-language Open Source implementation of the 3GPP Evolved
- Packet Core, i.e. the core network of an LTE network.
+Description: SGW-C (Serving Gateway - Control Plane)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
  .
- This package provides the SGW (Serving Gateway) which is situated
- between the MME and PGW.  It implements the S11 interface to the MME,
- and the S5 interface to the PGW.
+ This package provides the SGW-C (Serving Gateway - Control Plane)
+ which is situated between the MME and PGW. It implements the S11 interface
+ to the MME, and the S5 interface to the SMF-C.
 
-Package: open5gs-pgw
+Package: open5gs-smf
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         open5gs-common (= ${binary:Version})
+Description: SMF (Session Management Function)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
+ .
+ This package provides the SMF (Session Management Function)
+
+Package: open5gs-amf
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         open5gs-common (= ${binary:Version})
+Description: AMF (Access and Mobility Management Function)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
+ .
+ This package provides the AMF (Access and Mobility Management Function)
+
+Package: open5gs-sgwu
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         open5gs-common (= ${binary:Version})
+Description: SGW-U (Serving Gateway - User Plane)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
+ .
+ This package provides the SGW-U (Serving Gateway - User Plane)
+ which is situated between the eNB and UPF. It implements the S1U interface
+ to the eNB, and the S5U interface to the SMF-U.
+
+Package: open5gs-upf
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          udev,
          open5gs-common (= ${binary:Version})
-Description: Open Source based 3GPP EPC PGW (Packet Data Network Gateway)
- Open5GS is a C-language Open Source implementation of the 3GPP Evolved
- Packet Core, i.e. the core network of an LTE network.
+Description: UPF (User Plane Function)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
  .
- This package provides the PGW or PDN-GW (Packet Data Network Gateway)
- element of the EPC, i.e. the gateway between the EPC and the external
- packet data network, such as the public Internet.  It implements the S5
- interface towards the S-GW, the SGi interface towards the Internet,
- and the S7 interface towards the PCRF.
-
-Package: open5gs-pcrf
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         mongodb-org | mongodb,
-         open5gs-common (= ${binary:Version})
-Description: Open Source based 3GPP EPC PCRF (Policy and Charging Rules Function)
- Open5GS is a C-language Open Source implementation of the 3GPP Evolved
- Packet Core, i.e. the core network of an LTE network.
- .
- This package contains the PCRF (Policy and Charging Rules Function),
- which controls the service quality (QoS) of individual connections and
- how to account/charge related traffic.  It implements the Gx interface
- towards the PGW using the DIAMETER protocol.
+ This package provides the UPF (User Plane Function)
 
 Package: open5gs-hss
 Architecture: any
@@ -106,9 +125,9 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          mongodb-org | mongodb,
          open5gs-common (= ${binary:Version})
-Description: Open Source based 3GPP EPC HSS (Home Subscriber Server)
- Open5GS is a C-language Open Source implementation of the 3GPP Evolved
- Packet Core, i.e. the core network of an LTE network.
+Description: HSS (Home Subscriber Server)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
  .
  This package provides the HSS (Home Subscriber Server) element of the
  EPC, i.e. the central database of mobile network subscribers, with
@@ -116,22 +135,105 @@ Description: Open Source based 3GPP EPC HSS (Home Subscriber Server)
  information, etc.  It implements the S6a interface towards the MME
  using the DIAMETER protocol.
 
+Package: open5gs-pcrf
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         mongodb-org | mongodb,
+         open5gs-common (= ${binary:Version})
+Description: PCRF (Policy and Charging Rules Function)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
+ .
+ This package contains the PCRF (Policy and Charging Rules Function),
+ which controls the service quality (QoS) of individual connections and
+ how to account/charge related traffic.  It implements the Gx interface
+ towards the SMF-C using the DIAMETER protocol.
+
+Package: open5gs-nrf
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         open5gs-common (= ${binary:Version})
+Description: NRF (Network Repository Function)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
+ .
+ This package provides the NRF (Network Repository Function)
+
+Package: open5gs-ausf
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         open5gs-common (= ${binary:Version})
+Description: AUSF (Authentication Server Function)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
+ .
+ This package provides the AUSF (Authentication Server Function)
+
+Package: open5gs-udm
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         open5gs-common (= ${binary:Version})
+Description: UDM (Unified Data Management)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
+ .
+ This package provides the UDM (Unified Data Managemement)
+
+Package: open5gs-pcf
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         open5gs-common (= ${binary:Version})
+Description: PCF (Policy Control Function)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
+ .
+ This package provides the PCF (Policy Control Function)
+
+Package: open5gs-udr
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         open5gs-common (= ${binary:Version})
+Description: UDR (Unified Data Repository)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
+ .
+ This package provides the UDR (Unified Data Repository)
+
 Package: open5gs
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
          open5gs-common (= ${binary:Version}),
          open5gs-mme (= ${binary:Version}),
-         open5gs-sgw (= ${binary:Version}),
-         open5gs-pgw (= ${binary:Version}),
+         open5gs-sgwc (= ${binary:Version}),
+         open5gs-smf (= ${binary:Version}),
+         open5gs-amf (= ${binary:Version}),
+         open5gs-sgwu (= ${binary:Version}),
+         open5gs-upf (= ${binary:Version}),
          open5gs-hss (= ${binary:Version}),
-         open5gs-pcrf (= ${binary:Version})
-Description: Open Source based 3GPP EPC (metapackage)
- Open5GS is a C-language Open Source implementation of the 3GPP Evolved
- Packet Core, i.e. the core network of an LTE network.
+         open5gs-pcrf (= ${binary:Version}),
+         open5gs-nrf (= ${binary:Version}),
+         open5gs-ausf (= ${binary:Version}),
+         open5gs-udm (= ${binary:Version}),
+         open5gs-pcf (= ${binary:Version}),
+         open5gs-udr (= ${binary:Version})
+Description: 5G Core and EPC (metapackage)
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
  .
  This is a metapackage that depends on all the open5gs parts.
- (MME, SGW, PGW, HSS, PCRF)
 
 Package: open5gs-dbg
 Architecture: any
@@ -139,7 +241,7 @@ Multi-Arch: same
 Depends: ${misc:Depends},
          open5gs (= ${binary:Version})
 Description: Debug symbols for Open5GS
- Open5GS is a C-language Open Source implementation of the 3GPP Evolved
- Packet Core, i.e. the core network of an LTE network.
+ Open5GS is a C-language implementation of 5G Core and EPC
+ Packet Core, i.e. the core network of an NR/LTE network (Release-16)
  .
  This package contains debug symbols for Open5GS.

debian/open5gs-amf.install

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

debian/open5gs-ausf.install

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

debian/open5gs-nrf.install

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

debian/open5gs-pcf.install

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

debian/open5gs-pgw.install

@@ -1,5 +0,0 @@
-usr/bin/open5gs-pgwd
-configs/freeDiameter/pgw.* etc/freeDiameter
-configs/open5gs/pgw.yaml etc/open5gs
-configs/systemd/99-open5gs.net* etc/systemd/network
-configs/systemd/open5gs-pgwd.service lib/systemd/system

debian/open5gs-sgw.install

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

debian/open5gs-sgwc.install

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

debian/open5gs-sgwu.install

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

debian/open5gs-smf.install

@@ -0,0 +1,4 @@
+usr/bin/open5gs-smfd
+configs/freeDiameter/smf.* etc/freeDiameter
+configs/open5gs/smf.yaml etc/open5gs
+configs/systemd/open5gs-smfd.service lib/systemd/system

debian/open5gs-udm.install

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

debian/open5gs-udr.install

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

debian/open5gs-upf.install

@@ -0,0 +1,4 @@
+usr/bin/open5gs-upfd
+configs/open5gs/upf.yaml etc/open5gs
+configs/systemd/99-open5gs.net* etc/systemd/network
+configs/systemd/open5gs-upfd.service lib/systemd/system

debian/rules

@@ -14,4 +14,4 @@ override_dh_install:
 	dh_install --sourcedir=obj-$(DEB_HOST_GNU_TYPE)
 
 override_dh_auto_test:
-	cd obj-$(DEB_HOST_GNU_TYPE) && meson test --suite unit
+	cd obj-$(DEB_HOST_GNU_TYPE) && meson test -v --suite unit

docker/centos/7/base/Dockerfile

@@ -26,4 +26,5 @@ RUN yum -y install \
         mongo-c-driver-devel \
         libmicrohttpd-devel \
         libcurl-devel \
+        libnghttp2-devel \
         iproute

docker/centos/latest/base/Dockerfile

@@ -31,6 +31,7 @@ RUN dnf -y install \
         mongo-c-driver-devel \
         libmicrohttpd-devel \
         libcurl-devel \
+        libnghttp2-devel \
         iproute
 
 RUN dnf -y install meson

docker/check.sh

@@ -3,25 +3,16 @@
 docker-compose build
 docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
 
-TAG=eoan docker-compose build
-TAG=eoan docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
+TAG=bionic docker-compose build
+TAG=bionic docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
 
-DIST=fedora docker-compose build
-DIST=fedora docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
-
-DIST=fedora TAG=29 docker-compose build
-DIST=fedora TAG=29 docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
+DIST=fedora TAG=32 docker-compose build
+DIST=fedora TAG=32 docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
 
 DIST=centos docker-compose build
 DIST=centos docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
 
-DIST=centos TAG=7 docker-compose build
-DIST=centos TAG=7 docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
-
 DIST=debian docker-compose build
 DIST=debian docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
 
-DIST=debian TAG=stretch docker-compose build
-DIST=debian TAG=stretch docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
-
 docker rm $(docker ps -qa --no-trunc --filter "status=exited")

docker/debian/buster

@@ -1 +1 @@
-../ubuntu/latest
+latest

docker/debian/latest

@@ -1 +0,0 @@
-../ubuntu/latest

docker/debian/latest/base/Dockerfile

@@ -0,0 +1,35 @@
+ARG dist=ubuntu
+ARG tag=latest
+FROM ${dist}:${tag}
+
+MAINTAINER Sukchan Lee <acetcom@gmail.com>
+
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -y --no-install-recommends \
+        python3-pip \
+        python3-setuptools \
+        python3-wheel \
+        ninja-build \
+        build-essential \
+        flex \
+        bison \
+        git \
+        meson \
+        libsctp-dev \
+        libgnutls28-dev \
+        libgcrypt-dev \
+        libssl-dev \
+        libidn11-dev \
+        libmongoc-dev \
+        libbson-dev \
+        libyaml-dev \
+        libmicrohttpd-dev \
+        libcurl4-gnutls-dev \
+        libnghttp2-dev \
+        iproute2 \
+        ca-certificates \
+        netbase \
+        pkg-config && \
+    apt-get clean

docker/debian/latest/dev/Dockerfile

@@ -0,0 +1,34 @@
+ARG dist=ubuntu
+ARG tag=latest
+ARG username=acetcom
+FROM ${username}/${dist}-${tag}-open5gs-base
+
+MAINTAINER Sukchan Lee <acetcom@gmail.com>
+
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -y --no-install-recommends \
+        git-buildpackage \
+        debhelper \
+        devscripts \
+        osc \
+        dput \
+        manpages-dev \
+        fakeroot \
+        cscope \
+        vim \
+        sudo \
+        wireshark \
+        iputils-ping \
+        net-tools && \
+    apt-get clean
+
+COPY setup.sh /root
+
+ARG username=acetcom
+RUN useradd -m --uid=1000 ${username} && \
+    echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \
+    chmod 0440 /etc/sudoers.d/${username}
+
+WORKDIR /home/${username}

docker/debian/latest/dev/setup.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if ! grep "ogstun" /proc/net/dev > /dev/null; then
+    ip tuntap add name ogstun mode tun
+fi
+ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null
+ip addr add 10.45.0.1/16 dev ogstun
+ip addr del cafe::1/64 dev ogstun 2> /dev/null
+ip addr add cafe::1/64 dev ogstun
+ip link set ogstun up

docker/debian/stable

@@ -1 +0,0 @@
-../ubuntu/latest

docker/debian/stretch

@@ -1 +1 @@
-../ubuntu/latest
+latest

docker/docker-compose.yml

@@ -57,7 +57,7 @@ services:
     environment:
       - DB_URI=mongodb://mongodb/open5gs
       - DISPLAY=$DISPLAY
-    # - DISPLAY=docker.for.mac.localhost:0
+    # - DISPLAY=host.docker.internal:0
     cap_add:
       - NET_ADMIN
     devices:

docker/fedora/33

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

docker/fedora/latest/base/Dockerfile

@@ -21,6 +21,7 @@ RUN dnf -y install \
         mongo-c-driver-devel \
         libmicrohttpd-devel \
         libcurl-devel \
+        libnghttp2-devel \
         iproute
 
 RUN dnf -y install meson

docker/ubuntu/groovy

@@ -0,0 +1 @@
+../debian/latest

docker/ubuntu/latest/base/Dockerfile

@@ -27,6 +27,7 @@ RUN apt-get update && \
         libyaml-dev \
         libmicrohttpd-dev \
         libcurl4-gnutls-dev \
+        libnghttp2-dev \
         iproute2 \
         ca-certificates \
         netbase \

docker/ubuntu/latest/dev/Dockerfile

@@ -20,10 +20,16 @@ RUN apt-get update && \
         vim \
         sudo \
         iputils-ping \
-        wireshark \
         net-tools && \
     apt-get clean
 
+RUN apt-get update && \
+    apt-get install -y software-properties-common && \
+    sudo add-apt-repository ppa:wireshark-dev/stable -y && \
+    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -y wireshark
+
 COPY setup.sh /root
 
 ARG username=acetcom

docs/_config.yml

@@ -16,7 +16,7 @@
 title: Open5GS
 email: acetcom@gmail.com
 description: >- # this means to ignore newlines until "baseurl:"
-  Open5GS is a C-language Open Source implementation of 5GC and EPC,
+  Open5GS is a C-language implementation of 5G Core and EPC,
   i.e. the core network of NR/LTE network (Release-16)
 baseurl: "/open5gs" # the subpath of your site, e.g. /blog
 url: "https://open5gs.org" # the base hostname & protocol for your site, e.g. http://example.com
@@ -53,12 +53,12 @@ minima_reboot:
 
 footer_icons:
   - username: open5gs
-    url: https://open5gs.org
+    url: https://github.com/open5gs/open5gs
     icon: icon-github.svg
 
 header_pages:
   - _pages/docs.md
-  - _pages/faq.md
+  - _pages/support.md
   - _pages/about.md
   - _pages/github.md
 

docs/_docs/guide/01-quickstart.md

@@ -2,11 +2,72 @@
 title: Quickstart
 ---
 
-**Note:** Open5GS supports installation of packages in *Debian/Ubuntu and openSUSE* environments. *CentOS, Fedora, FreeBSD, and Mac OSX* require you to [build with source code]({{ site.url }}{{ site.baseurl }}/docs/guide/02-building-open5gs-from-sources)
+## 1. Introduction to Open5GS
+---
+
+Welcome! If you want to set up your first Open5GS core you have come to the right place. Before we get started, we'll spend a moment to understand the basic architecture of the software.
+
+**TL;DR:** Open5GS contains a series of software components and network functions that implement the 4G/ 5G NSA and 5G SA core functions. If you know what each of these do already and how they interface with each other, skip to section 2.
+{: .notice--info}
+
+<style>
+  img {
+    max-width: 100%;
+    height: auto;
+  }
+</style>
+
+![Open5GS Diagram]({{ site.url }}{{ site.baseurl }}/assets/images/Open5GS_CUPS-01.jpg)
+
+[[Higher quality PDF diagram available HERE]]({{ site.url }}{{ site.baseurl }}/assets/images/Open5GS_CUPS-01.pdf)
+
+#### 4G/ 5G NSA Core
+
+The Open5GS 4G/ 5G NSA Core contains the following components:
+* MME - Mobility Management Entity
+* HSS - Home Subscriber Server
+* PCRF - Policy and Charging Rules Function
+* SGWC - Serving Gateway Control Plane
+* SGWU - Serving Gateway User Plane
+* PGWC/SMF - Packet Gateway Control Plane / (component contained in Open5GS SMF)
+* PGWU/UPF - Packet Gateway User Plane / (component contained in Open5GS UPF)
+
+The core has two main planes: the control plane and the user plane. These are physically separated in Open5GS as CUPS (control/ user plane separation) is implemented.
+
+The MME is the main **control plane** hub of the core. It primarily manages sessions, mobilty, paging and bearers. It links to the HSS, which generates SIM authentication vectors and holds the subscriber profile; and also to the SGWC and PGWC/SMF, which are the control planes of the gateway servers. All the eNBs in the mobile network (4G basestations) connect to the MME. The final element of the control plane is the PCRF, which sits in-between the PGWC/SMF and the HSS, and handles charging and enforces subscriber policies.
+
+The **user plane** carries user data packets between the eNB/ NSA gNB (5G NSA basestations) and the external WAN. The two user plane core components are the SGWU and PGWU/UPF. Each of these connect back to their control plane counterparts. eNBs/ NSA gNBs connect to the SGWU, which connects to the PGWU/UPF, and on to the WAN.  *By having the control and user planes physically separated like this, it means you can deploy multiple user plane servers in the field (eg somewhere with a high speed Internet connection), whilst keeping control functionality centralised. This enables support of MEC use cases, for example.*
+
+All of these Open5GS components have config files. Each config file contains the component's IP bind addresses/ local Interface names **and** the IP addresses/ DNS names of the other components it needs to connect to. We'll come back to this in Section 3.
+
+
+#### 5G SA Core
+
+The Open5GS 5G SA Core contains the following functions:
+* AMF - Access and Mobility Management Function
+* SMF - Session Management Function
+* UPF - User Plane Function
+* AUSF - Authentication Server Function
+* NRF - NF Repository Function
+* UDM - Unified Data Management
+* UDR - Unified Data Repository
+* PCF - Policy and Charging Function
+
+The 5G SA core works in a different way to the 4G core - it uses a **Service Based Architecture** (SBI). **Control plane** functions are configured to register with the NRF, and the NRF then helps them discover the other core functions. Running through the other functions: The AMF handles connection and mobility management; a subset of what the 4G MME is tasked with. gNBs (5G basestations) connect to the AMF. The UDM, AUSF and UDR carry out similar operations as the 4G HSS, generating SIM authentication vectors and holding the subscriber profile. Session management is all handled by the SMF (previously the responsibility of the 4G MME/ SGWC/ PGWC). Finally there is the PCF, used for charging and enforcing subscriber policies.
+
+The 5G SA core **user plane** is much simpler, as it only contains a single function. The UPF carries user data packets between the gNB and the external WAN. It connects back to the SMF too. 
+
+With the exception of the SMF and UPF, all config files for the 5G SA core functions only contain the function's IP bind addresses/ local Interface names and the IP address/ DNS name of the NRF.
+
+
+## 2. Install Open5GS with a Package Manager
+---
+
+**Note:** Package managers can be used to install Open5GS in *Debian/Ubuntu and openSUSE* environments (for major and minor builds). *CentOS, Fedora, and Mac OSX* require you to [build with source code]({{ site.url }}{{ site.baseurl }}/docs/guide/02-building-open5gs-from-sources).
+{: .notice--warning}
+**Note:** Nighly builds are offered by [Osmocom](https://osmocom.org) on [OBS](https://build.opensuse.org/package/show/network:osmocom:nightly/open5gs). Scroll down to use a nightly build package.
 {: .notice--warning}
 
-### Install Open5GS with a Package Manager
----
 
 #### Ubuntu
 
@@ -48,19 +109,7 @@ https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbunt
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_19.04/
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_19.10/
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_20.04/
-```
-
-Nightly package build are provided by [Osmocom](https://osmocom.org) on [OBS](https://build.opensuse.org/package/show/network:osmocom:nightly/open5gs).
-
-```
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_10/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_Testing/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_Unstable/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/Raspbian_10/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_18.04/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_18.10/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_19.04/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_19.10/
+https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_20.10/
 ```
 
 #### openSUSE
@@ -73,66 +122,41 @@ $ sudo zypper install mongodb-server mongodb-shell
 $ sudo zypper install open5gs
 ```
 
-### Configure Open5GS
----
+#### Nightly Builds
 
-Modify [/etc/open5gs/mme.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/mme.yaml.in) to set the S1AP/GTP-C IP address, PLMN ID, and TAC
-
-```diff
-diff -u /etc/open5gs/mme.yaml.old /etc/open5gs/mme.yaml
---- mme.yaml.old	2018-04-15 18:28:31.000000000 +0900
-+++ mme.yaml	2018-04-15 19:53:10.000000000 +0900
-@@ -8,18 +8,20 @@ parameter:
- mme:
-     freeDiameter: /etc/freeDiameter/mme.conf
-     s1ap:
-+      addr: 192.168.0.100
-     gtpc:
-+      addr: 192.168.0.100
-     gummei:
-       plmn_id:
--        mcc: 001
--        mnc: 01
-+        mcc: 901
-+        mnc: 70
-       mme_gid: 2
-       mme_code: 1
-     tai:
-       plmn_id:
--        mcc: 001
--        mnc: 01
--      tac: 12345
-+        mcc: 901
-+        mnc: 70
-+      tac: 7
-     security:
-         integrity_order : [ EIA1, EIA2, EIA0 ]
-         ciphering_order : [ EEA0, EEA1, EEA2 ]
-```
-
-Modify [/etc/open5gs/sgw.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/sgw.yaml.in) to set the GTP-U IP address.  
-```diff
-diff -u /etc/open5gs/sgw.yaml.old /etc/open5gs/sgw.yaml
---- sgw.yaml.old	2018-04-15 18:30:25.000000000 +0900
-+++ sgw.yaml	2018-04-15 18:30:30.000000000 +0900
-@@ -14,3 +14,4 @@
-     gtpc:
-       addr: 127.0.0.2
-     gtpu:
-+      addr: 192.168.0.100
-```
-
-After changing conf files, please restart Open5GS daemons.
+Nightly bulit package are provided by [Osmocom](https://osmocom.org) on [OBS](https://build.opensuse.org/package/show/network:osmocom:nightly/open5gs). On *Ubuntu 20.04* you can install it like this:
 
 ```bash
-$ sudo systemctl restart open5gs-mmed
-$ sudo systemctl restart open5gs-sgwd
+$ sudo apt update
+$ sudo apt install wget gnupg
+$ wget -qO - https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_20.04/Release.key | sudo apt-key add -
+$ sudo sh -c "echo 'deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_20.04/ ./' > /etc/apt/sources.list.d/open5gs.list"
+$ sudo apt update
+$ sudo apt install open5gs
 ```
 
-### Install WebUI of Open5GS
+Other distributions can be installed by changing the path.
+
+```
+https://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_10/
+https://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_Testing/
+https://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_Unstable/
+https://download.opensuse.org/repositories/network:/osmocom:/nightly/Raspbian_10/
+https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_18.04/
+https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_19.04/
+https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_19.10/
+https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_20.04/
+https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_20.10/
+```
+
+
+## 3. Install the  WebUI of Open5GS
 ---
 
-[Node.js](https://nodejs.org/) is required to install WebUI of Open5GS
+The WebUI allows you to interactively edit subscriber data. While it is not essential to use this, it makes things easier when you are just starting out on your Open5GS adventure. (A [command line tool](https://github.com/{{ site.github_username }}/open5gs/blob/master/misc/db/open5gs-dbctl) is available for advanced users).
+
+
+[Node.js](https://nodejs.org/) is required to install the WebUI of Open5GS
 
 1. *Debian and Ubuntu* based Linux distributions can install [Node.js](https://nodejs.org/) as follows:
 
@@ -155,7 +179,180 @@ You can now install WebUI of Open5GS.
 $ curl -sL {{ site.url }}{{ site.baseurl }}/assets/webui/install | sudo -E bash -
 ```
 
-### Register Subscriber Information
+## 4. Configure Open5GS
+---
+
+Okay - you have installed the software, now what to do with it? Well, there are some tweaks you will need to make to the config files, and you will need to enter subscriber data into your HSS/ UDR. You will also need to set some IP Table rules to bridge the PGWU/UPF to the WAN.
+
+Out of the box, the default configurations see all of the Open5GS components fully configured for use on a single computer. They are set to communicate with each other using the local loopback address space (`127.0.0.X`). The default addresses for each of the bind interfaces for these components and functions are as follows:
+
+```
+MongoDB   = 127.0.0.1 (subscriber data) - http://localhost:3000
+
+MME-s1ap  = 127.0.0.2 :36412 for S1-MME
+MME-gtpc  = 127.0.0.2 :2123 for S11
+MME-frDi  = 127.0.0.2 :3868 for S6a auth
+
+SGWC-gtpc = 127.0.0.3 :2123 for S11
+SGWC-pfcp = 127.0.0.3 :8805 for Sxa
+
+SMF-gtpc  = 127.0.0.4 :2123 for S5/8c, N11
+SMF-pfcp  = 127.0.0.4 :8805 for N4
+SMF-frDi  = 127.0.0.4 :3868 for Gx auth
+SMF-sbi   = 127.0.0.4 :7777 for 5G SBI (N7,N10,N11)
+
+AMF-ngap  = 127.0.0.5 :38412 for N2
+AMF-sbi   = 127.0.0.5 :7777 for 5G SBI (N8,N12,N11)
+
+SGWU-pfcp = 127.0.0.6 :8805 for Sxa
+SGWU-gtpu = 127.0.0.6 :2152 for S1-U, S5/8u
+
+UPF-pfcp  = 127.0.0.7 :8805 for N4
+UPF-gtpu  = 127.0.0.7 :2152 for S5/8u, N3
+
+HSS-frDi  = 127.0.0.8 :3868 for S6a auth
+
+PCRF-frDi = 127.0.0.9 :3868 for Gx auth
+
+NRF-sbi   = 127.0.0.10:7777 for 5G SBI
+AUSF-sbi  = 127.0.0.11:7777 for 5G SBI
+UDM-sbi   = 127.0.0.12:7777 for 5G SBI
+PCF-sbi   = 127.0.0.13:7777 for 5G SBI
+UDR-sbi   = 127.0.0.20:7777 for 5G SBI
+```
+
+#### Setup a 4G/ 5G NSA Core
+
+You will need to modify your 4G MME config to support your PLMN and TAC. The international test PLMN is 001/01, and the international private network PLMN is 999/99. You should stick to using either of these PLMNs unless you have been issued a PLMN by your national regulator. (This PLMN will need to be configured in your eNB).
+
+If you are aiming to connect an external eNB to your core, you will also need to change the S1AP bind address of the MME **and** the GTP-U bind address of the SGWU. If you are running an eNB stack locally, you will not need to make these changes.
+
+
+Modify [/etc/open5gs/mme.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/mme.yaml.in) to set the S1AP IP address, PLMN ID, and TAC.
+
+```diff
+$ diff -u /etc/open5gs/mme.yaml.old /etc/open5gs/mme.yaml
+
+ mme:
+     freeDiameter: /etc/freeDiameter/mme.conf
+     s1ap:
+-      addr: 127.0.0.2
++      addr: 10.10.0.2 # for external eNB - a local address that can be reached by the eNB
+     gtpc:
+       addr: 127.0.0.2
+     gummei:
+       plmn_id:
+-        mcc: 901
+-        mnc: 70
++        mcc: 001 # set your PLMN-MCC
++        mnc: 01  # set your PLMN-MNC
+       mme_gid: 2
+       mme_code: 1
+     tai:
+       plmn_id:
+-        mcc: 901
+-        mnc: 70
+-      tac: 1
++        mcc: 001 # set your PLMN-MCC
++        mnc: 01  # set your PLMN-MNC
++      tac: 2 # should match the TAC used by your eNB
+     security:
+
+```
+
+Modify [/etc/open5gs/sgwu.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/sgwu.yaml.in) to set the GTP-U IP address.
+```diff
+$ diff -u /etc/open5gs/sgwu.yaml.old /etc/open5gs/sgwu.yaml
+
+ sgwu:
+     gtpu:
+-      addr: 127.0.0.6
++      addr: 10.11.0.6  # for external eNB - a local address that can be reached by the eNB
+     pfcp:
+       addr: 127.0.0.6
+
+```
+
+After changing config files, please restart Open5GS daemons.
+
+```bash
+$ sudo systemctl restart open5gs-mmed
+$ sudo systemctl restart open5gs-sgwud
+```
+
+#### Setup a 5G Core
+
+You will need to modify your 5G AMF config to support your PLMN and TAC. The international test PLMN is 001/01, and the international private network PLMN is 999/99. You should stick to using either of these PLMNs unless you have been issued a PLMN by your national regulator. (This PLMN will need to be configured in your gNB).
+
+If you are aiming to connect an external gNB to your core, you will also need to change the NGAP bind address of the AMF **and** the GTPU bind address of the UPF. If you are running an gNB stack locally, you will not need to make these changes.
+
+
+Modify [/etc/open5gs/amf.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/amf.yaml.in) to set the NGAP IP address, PLMN ID, TAC and NSSAI.
+
+```diff
+$ diff -u /etc/open5gs/amf.yaml.old /etc/open5gs/amf.yaml
+
+amf:
+    sbi:
+      - addr: 127.0.0.5
+        port: 7777
+     ngap:
+-      - addr: 127.0.0.5
++      - addr: 10.10.0.5 # for external gNB - a local address that can be reached by the gNB
+     guami:
+       - plmn_id:
+-          mcc: 901
+-          mnc: 70
++          mcc: 001 # set your PLMN-MCC
++          mnc: 01  # set your PLMN-MNC
+         amf_id:
+           region: 2
+           set: 1
+     tai:
+       - plmn_id:
+-          mcc: 901
+-          mnc: 70
+-        tac: 1
++          mcc: 001 # set your PLMN-MCC
++          mnc: 01  # set your PLMN-MNC
++        tac: 2 # should match the TAC used by your gNB
+     plmn:
+       - plmn_id:
+-          mcc: 901
+-          mnc: 70
++          mcc: 001 # set your PLMN-MCC
++          mnc: 01  # set your PLMN-MNC
+         s_nssai:
+           - sst: 1
+     security:
+
+```
+
+Modify [/etc/open5gs/upf.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/upf.yaml.in) to set the GTP-U address.
+```diff
+$ diff -u /etc/open5gs/upf.yaml.old /etc/open5gs/upf.yaml
+
+upf:
+     pfcp:
+       - addr: 127.0.0.7
+     gtpu:
+-      - addr: 127.0.0.7
++      - addr: 10.11.0.7 # for external gNB - a local address that can be reached by the gNB
+     pdn:
+       - addr: 10.45.0.1/16
+       - addr: cafe::1/64
+
+```
+
+After changing config files, please restart Open5GS daemons.
+
+```bash
+$ sudo systemctl restart open5gs-amfd
+$ sudo systemctl restart open5gs-upfd
+```
+
+
+#### Register Subscriber Information
 ---
 
 Connect to `http://localhost:3000` and login with **admin** account.
@@ -173,15 +370,21 @@ To add subscriber information, you can do WebUI operations in the following orde
   3. Fill the IMSI, security context(K, OPc, AMF), and APN of the subscriber.
   4. Click `SAVE` Button
 
-**Tip:** This addition immediately affects Open5GS without restaring any daemon.
+Enter the subscriber details of your SIM cards using this tool, to save the subscriber profile in the HSS and UDR MongoDB database backend. If you are using test SIMs, the details are normally printed on the card.
+
+**Tip:** Subscribers added with this tool immediately register in the Open5GS HSS/ UDR without the need to restart any daemon.
 {: .notice--info}
 
 
-### Adding a route for UE to have Internet connectivity {#UEInternet}
+#### Adding a route for the UE to have WAN connectivity {#UEInternet}
 ---
 
-If your phone can connect to internet, you must run the following command in Open5GS-PGW installed host. 
+In order to bridge between the PGWU/UPF and WAN (Internet), you must enable IP forwarding and add a NAT rule to your IP Tables.  
 
+**Note:** For the first run, it makes things simpler if you do not have any rules in the IP/NAT tables. If a program such as docker has already set up a rule, you will need to add rules differently.
+{: .notice--danger}
+
+You can check your current IP Table rules with the following commands (these tables are empty):
 ```bash
 ### Check IP Tables
 $ sudo iptables -L
@@ -207,7 +410,10 @@ target     prot opt source               destination
 
 Chain POSTROUTING (policy ACCEPT)
 target     prot opt source               destination
+```
 
+To enable forwarding and add the NAT rule, enter
+```bash
 ### Enable IPv4 Forwarding
 $ sudo sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
@@ -215,19 +421,71 @@ $ sudo sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward"
 $ sudo iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE
 ```
 
-**Note:** For the first time, it is a good condition if you do not have any rules in the IP/NAT tables. If a program such as docker has already set up a rule, you will need to add a rule differently.
-{: .notice--danger}
 
-### Turn on your eNodeB and Phone
+## 5. Turn on your eNB/gNB and UE
 ---
-- Connect your eNodeB to the IP of your server via the standard S1AP port of SCTP 36412 (for MME)
-- You can see actual traffic through wireshark -- [[srsenb.pcapng]]({{ site.url }}{{ site.baseurl }}/assets/pcapng/srsenb.pcapng).
-- You can view the log at `/var/log/open5gs/*.log`.
+
+First, connect your eNB/gNB to the Open5GS core:
+* Make sure the PLMN and TAC of the eNB/gNB matches the settings in your MME/AMF
+* Connect your eNB/gNB to the IP of your server via the standard S1AP/NGAP SCTP port 36412/38412 (for MME/AMF)
+* Your eNB/gNB should report a successful S1/NG connection - congrats, your core is fully working!
+* You can see actual traffic through wireshark -- [[srsenb.pcapng]]({{ site.url }}{{ site.baseurl }}/assets/pcapng/srsenb.pcapng).
+* You can view the log at `/var/log/open5gs/*.log`, eg:
+```bash
+### Watch the live MME log
+tail -f /var/log/open5gs/mme.log
+```
+
+Next, try to attach a UE to the basestation:
+* Insert your SIM card to the UE
+* Set the UE's APN to match the APN you configured in the Open5GS WebUI
+* Toggle the UE in and out of flight mode
+* If it doesn't automatically connect, try manually searching for a network
+* If the PLMN set on the SIM card does not match the PLMN being used by the radio, you will need to ensure 'data roaming' on the UE is switched on
+
+## 6. Starting and Stopping Open5GS
+---
+
+When you install the software using the package manager, it is setup to run as a systemd service. You can stop and restart the components and network functions as follows:
+
+```bash
+$ sudo systemctl stop open5gs-mmed
+$ sudo systemctl stop open5gs-sgwcd
+$ sudo systemctl stop open5gs-smfd
+$ sudo systemctl stop open5gs-amfd
+$ sudo systemctl stop open5gs-sgwud
+$ sudo systemctl stop open5gs-upfd
+$ sudo systemctl stop open5gs-hssd
+$ sudo systemctl stop open5gs-pcrfd
+$ sudo systemctl stop open5gs-nrfd
+$ sudo systemctl stop open5gs-ausfd
+$ sudo systemctl stop open5gs-udmd
+$ sudo systemctl stop open5gs-pcfd
+$ sudo systemctl stop open5gs-udrd
+$ sudo systemctl stop open5gs-webui
+```
+
+```bash
+$ sudo systemctl restart open5gs-mmed
+$ sudo systemctl restart open5gs-sgwcd
+$ sudo systemctl restart open5gs-smfd
+$ sudo systemctl restart open5gs-amfd
+$ sudo systemctl restart open5gs-sgwud
+$ sudo systemctl restart open5gs-upfd
+$ sudo systemctl restart open5gs-hssd
+$ sudo systemctl restart open5gs-pcrfd
+$ sudo systemctl restart open5gs-nrfd
+$ sudo systemctl restart open5gs-ausfd
+$ sudo systemctl restart open5gs-udmd
+$ sudo systemctl restart open5gs-pcfd
+$ sudo systemctl restart open5gs-udrd
+$ sudo systemctl restart open5gs-webui
+```
 
 
-### Uninstall Open5GS and WebUI
+## 7. Uninstall Open5GS and WebUI
 
-How to remove Open5GS package:
+To remove the Open5GS packages:
 
 1. On *Ubuntu/Debian*:
 

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

@@ -6,10 +6,14 @@ head_inline: "<style> .blue { color: blue; } </style>"
 This post explains how to compile and install the source code on **Debian/Ubuntu** based Linux Distribution.
 {: .blue}
 
+**Note:** Ubuntu 16.04(xenial) and earlier versions, and Debian 9(stretch) and earlier versions are not supported.
+{: .notice--danger}
+
+
 ### Getting MongoDB
 ---
 
-Install MongoDB with package manager.  It is used as database for the HSS and PCRF.
+Install MongoDB with package manager. It is used as database for NRF/PCF/UDR and PCRF/HSS.
 
 ```bash
 $ sudo apt update
@@ -40,7 +44,7 @@ $ sudo ip link set ogstun up
 Install the dependencies for building the source code.
 
 ```bash
-$ sudo apt install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev libidn11-dev libmongoc-dev libbson-dev libyaml-dev libmicrohttpd-dev libcurl4-gnutls-dev meson
+$ sudo apt install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev libidn11-dev libmongoc-dev libbson-dev libyaml-dev libnghttp2-dev libmicrohttpd-dev libcurl4-gnutls-dev libnghttp2-dev meson
 ```
 
 Git clone.
@@ -57,12 +61,24 @@ $ meson build --prefix=`pwd`/install
 $ ninja -C build
 ```
 
+Please free up enough memory space on the VM and run the test program.
+
+The test program has been run on [VirtualBox - CPU: 1, Memory: 4.00 GB] and [Docker for Mac - CPU: 2, Memory: 2.00 GB] with default setting (max.ue: 4,096, pool.packet: 32,768).
+{: .notice--danger}
+
 Check whether the compilation is correct.
 ```bash
-$ ninja -C build test
+$ ./build/tests/attach/attach ## EPC Only
+$ ./build/tests/registration/registration ## 5G Core Only
 ```
 
-**Tip:** You can also check the result of `ninja -C build test` with a tool that captures packets. If you are running `wireshark`, select the `loopback` interface and set FILTER to `s1ap || gtpv2 || diameter || gtp`.  You can see the virtually created packets. [[testsimple.pcapng]]({{ site.url }}{{ site.baseurl }}/assets/pcapng/testsimple.pcapng)
+Run all test programs as below.
+```bash
+$ cd build
+$ meson test -v
+```
+
+**Tip:** You can also check the result of `ninja -C build test` with a tool that captures packets. If you are running `wireshark`, select the `loopback` interface and set FILTER to `s1ap || gtpv2 || pfcp || diameter || gtp || ngap || http2.data.data || http2.headers`.  You can see the virtually created packets. [testattach.pcapng]({{ site.url }}{{ site.baseurl }}/assets/pcapng/testattach.pcapng)/[testregistration.pcapng]({{ site.url }}{{ site.baseurl }}/assets/pcapng/testregistration.pcapng)
 {: .notice--info}
 
 You need to perform the **installation process**.
@@ -75,55 +91,116 @@ $ cd ../
 ### Configure Open5GS
 ---
 
-Modify [install/etc/open5gs/mme.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/mme.yaml.in) to set the S1AP/GTP-C IP address, PLMN ID, and TAC. 
+##### 5G Core
 
-In the below example we
-
-- use MCC-MNC of 901-70, as this is the home network of the default IMSIs of the sysmoUSIM-SJS1 cards.
-- use 192.168.0.100 for the S1AP +GTP-U connection of MME/SGW to the eNB
+Modify [install/etc/open5gs/amf.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/amf.yaml.in) to set the NGAP IP address, PLMN ID, TAC and NSSAI.
 
 ```diff
-diff -u /etc/open5gs/mme.yaml.old /etc/open5gs/mme.yaml
---- mme.yaml.old	2018-04-15 18:28:31.000000000 +0900
-+++ mme.yaml	2018-04-15 19:53:10.000000000 +0900
-@@ -8,18 +8,20 @@ parameter:
+$ diff -u /etc/open5gs/amf.yaml.old /etc/open5gs/amf.yaml
+--- amf.yaml	2020-09-05 20:52:28.652234967 -0400
++++ amf.yaml.new	2020-09-05 20:55:07.453114885 -0400
+@@ -165,23 +165,23 @@
+       - addr: 127.0.0.5
+         port: 7777
+     ngap:
+-      - addr: 127.0.0.5
++      - addr: 10.10.0.5
+     guami:
+       - plmn_id:
+-          mcc: 901
+-          mnc: 70
++          mcc: 001
++          mnc: 01
+         amf_id:
+           region: 2
+           set: 1
+     tai:
+       - plmn_id:
+-          mcc: 901
+-          mnc: 70
+-        tac: 1
++          mcc: 001
++          mnc: 01
++        tac: 2
+     plmn:
+       - plmn_id:
+-          mcc: 901
+-          mnc: 70
++          mcc: 001
++          mnc: 01
+         s_nssai:
+           - sst: 1
+     security:
+```
+
+Modify [install/etc/open5gs/upf.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/upf.yaml.in) to set the GTP-U and PFCP IP address.
+```diff
+$ diff -u /etc/open5gs/upf.yaml.old /etc/open5gs/upf.yaml
+--- upf.yaml	2020-09-05 20:52:28.652234967 -0400
++++ upf.yaml.new	2020-09-05 20:52:55.279052142 -0400
+@@ -137,9 +137,7 @@
+     pfcp:
+       - addr: 127.0.0.7
+     gtpu:
+-      - addr:
+-        - 127.0.0.7
+-        - ::1
++      - addr: 10.11.0.7
+     pdn:
+       - addr: 10.45.0.1/16
+       - addr: cafe::1/64
+```
+##### 4G EPC
+
+Modify [install/etc/open5gs/mme.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/mme.yaml.in) to set the S1AP IP address, PLMN ID, and TAC.
+
+```diff
+$ diff -u /etc/open5gs/mme.yaml.old /etc/open5gs/mme.yaml
+--- mme.yaml	2020-09-05 20:52:28.648235143 -0400
++++ mme.yaml.new	2020-09-05 20:56:05.434484208 -0400
+@@ -204,20 +204,20 @@
  mme:
-     freeDiameter: /etc/freeDiameter/mme.conf
+     freeDiameter: /home/acetcom/Documents/git/open5gs/install/etc/freeDiameter/mme.conf
      s1ap:
-+      addr: 192.168.0.100
+-      addr: 127.0.0.2
++      addr: 10.10.0.2
      gtpc:
-+      addr: 192.168.0.100
+       addr: 127.0.0.2
      gummei:
        plmn_id:
--        mcc: 001
--        mnc: 01
-+        mcc: 901
-+        mnc: 70
+-        mcc: 901
+-        mnc: 70
++        mcc: 001
++        mnc: 01
        mme_gid: 2
        mme_code: 1
      tai:
        plmn_id:
--        mcc: 001
--        mnc: 01
--      tac: 12345
-+        mcc: 901
-+        mnc: 70
-+      tac: 7
+-        mcc: 901
+-        mnc: 70
+-      tac: 1
++        mcc: 001
++        mnc: 01
++      tac: 2
      security:
          integrity_order : [ EIA1, EIA2, EIA0 ]
          ciphering_order : [ EEA0, EEA1, EEA2 ]
 ```
 
-Modify [install/etc/open5gs/sgw.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/sgw.yaml.in) to set the GTP-U IP address.  
+Modify [install/etc/open5gs/sgwu.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/sgwu.yaml.in) to set the GTP-U IP address.
 ```diff
-diff -u /etc/open5gs/sgw.yaml.old /etc/open5gs/sgw.yaml
---- sgw.yaml.old	2018-04-15 18:30:25.000000000 +0900
-+++ sgw.yaml	2018-04-15 18:30:30.000000000 +0900
-@@ -14,3 +14,4 @@
-     gtpc:
-       addr: 127.0.0.2
+$ diff -u /etc/open5gs/sgwu.yaml.old /etc/open5gs/sgwu.yaml
+--- sgwu.yaml	2020-09-05 20:50:39.393022566 -0400
++++ sgwu.yaml.new	2020-09-05 20:51:06.667838823 -0400
+@@ -51,7 +51,7 @@
+ #
+ sgwu:
      gtpu:
-+      addr: 192.168.0.100
+-      addr: 127.0.0.6
++      addr: 10.11.0.6
+     pfcp:
+       addr: 127.0.0.6
+
 ```
 
 If you modify the config files while Open5GS daemons are running, please restart them
@@ -132,83 +209,133 @@ If you modify the config files while Open5GS daemons are running, please restart
 ### Running Open5GS
 ---
 
-Specify the absolute path to the sharead library as follows.
-
-```bash
-$ echo $(cd $(dirname ./install/lib/x86_64-linux-gnu/) && pwd -P)/$(basename ./install/lib/x86_64-linux-gnu/)
-/home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu
-$ export LD_LIBRARY_PATH=/home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu
-$ ldd ./install/bin/open5gs-mmed
-...
-	libogsapp.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogsapp.so.1 (0x00007f161ab51000)
-	libogscore.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogscore.so.1 (0x00007f161a922000)
-	libogssctp.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogssctp.so.1 (0x00007f161a71d000)
-	libogss1ap.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogss1ap.so.1 (0x00007f161a519000)
-...
-```
-
-If you want to set the shared library path permanently, you can use ldconfig.
-```bash
-$ sudo sh -c "echo /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu > /etc/ld.so.conf.d/open5gs.conf"
-$ sudo ldconfig
-```
-
-Now let's get started.
-
 ```bash
 $ cd install/bin/
-$ ./open5gs-pcrfd
-Open5GS daemon v1.0.0
+$ ./install/bin/open5gs-mmed 
+Open5GS daemon v2.1.0
 
-10/27 15:47:55.821: [app] INFO: Configuration: '/Users/acetcom/Documents/git/open5gs/install/etc/open5gs/pcrf.yaml' (../src/main.c:54)
-10/27 15:47:55.822: [app] INFO: File Logging: '/Users/acetcom/Documents/git/open5gs/install/var/log/open5gs/pcrf.log' (../src/main.c:57)
-10/27 15:47:55.868: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:99)
-10/27 15:47:55.965: [app] INFO: PCRF initialize...done (../src/pcrf/app-init.c:31)
+08/21 22:53:47.328: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/mme.yaml' (../src/main.c:54)
+08/21 22:53:47.328: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/mme.log' (../src/main.c:57)
+08/21 22:53:47.365: [app] INFO: MME initialize...done (../src/mme/app-init.c:33)
+08/21 22:53:47.365: [gtp] INFO: gtp_server() [127.0.0.2]:2123 (../lib/gtp/path.c:32)
+08/21 22:53:47.365: [gtp] INFO: gtp_connect() [127.0.0.3]:2123 (../lib/gtp/path.c:59)
+08/21 22:53:47.366: [mme] INFO: s1ap_server() [127.0.0.2]:36412 (../src/mme/s1ap-sctp.c:57)
 
-$ ./open5gs-pgwd
-Open5GS daemon v1.0.0
+$ ./install/bin/open5gs-sgwcd 
+Open5GS daemon v2.1.0
 
-10/27 15:48:11.198: [app] INFO: Configuration: '/Users/acetcom/Documents/git/open5gs/install/etc/open5gs/pgw.yaml' (../src/main.c:54)
-10/27 15:48:11.199: [app] INFO: File Logging: '/Users/acetcom/Documents/git/open5gs/install/var/log/open5gs/pgw.log' (../src/main.c:57)
-10/27 15:48:11.292: [app] INFO: PGW initialize...done (../src/pgw/app-init.c:31)
-10/27 15:48:11.293: [gtp] INFO: gtp_server() [127.0.0.3]:2123 (../lib/gtp/path.c:32)
-10/27 15:48:11.293: [gtp] INFO: gtp_server() [::1]:2123 (../lib/gtp/path.c:32)
-10/27 15:48:11.293: [gtp] INFO: gtp_server() [127.0.0.3]:2152 (../lib/gtp/path.c:32)
-10/27 15:48:11.293: [gtp] INFO: gtp_server() [::1]:2152 (../lib/gtp/path.c:32)
+08/21 22:54:43.059: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/sgwc.yaml' (../src/main.c:54)
+08/21 22:54:43.059: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/sgwc.log' (../src/main.c:57)
+08/21 22:54:43.065: [app] INFO: SGW-C initialize...done (../src/sgwc/app.c:31)
+08/21 22:54:43.066: [gtp] INFO: gtp_server() [127.0.0.3]:2123 (../lib/gtp/path.c:32)
+08/21 22:54:43.066: [pfcp] INFO: pfcp_server() [127.0.0.3]:8805 (../lib/pfcp/path.c:32)
+08/21 22:54:43.066: [pfcp] INFO: ogs_pfcp_connect() [127.0.0.6]:8805 (../lib/pfcp/path.c:60)
 
-$ ./open5gs-sgwd
-Open5GS daemon v1.0.0
+$ ./install/bin/open5gs-smfd
+Open5GS daemon v2.1.0
 
-10/27 15:48:21.526: [app] INFO: Configuration: '/Users/acetcom/Documents/git/open5gs/install/etc/open5gs/sgw.yaml' (../src/main.c:54)
-10/27 15:48:21.527: [app] INFO: File Logging: '/Users/acetcom/Documents/git/open5gs/install/var/log/open5gs/sgw.log' (../src/main.c:57)
-10/27 15:48:21.533: [app] INFO: SGW initialize...done (../src/sgw/app-init.c:31)
-10/27 15:48:21.537: [gtp] INFO: gtp_server() [127.0.0.2]:2123 (../lib/gtp/path.c:32)
-10/27 15:48:21.537: [gtp] INFO: gtp_server() [192.168.0.3]:2152 (../lib/gtp/path.c:32)
+08/21 22:54:56.000: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/smf.yaml' (../src/main.c:54)
+08/21 22:54:56.000: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/smf.log' (../src/main.c:57)
+08/21 22:54:56.050: [gtp] INFO: gtp_server() [127.0.0.4]:2123 (../lib/gtp/path.c:32)
+08/21 22:54:56.050: [app] INFO: SMF initialize...done (../src/smf/app.c:31)
+08/21 22:54:56.050: [gtp] INFO: gtp_server() [::1]:2123 (../lib/gtp/path.c:32)
+08/21 22:54:56.050: [pfcp] INFO: pfcp_server() [127.0.0.4]:8805 (../lib/pfcp/path.c:32)
+08/21 22:54:56.050: [pfcp] INFO: pfcp_server() [::1]:8805 (../lib/pfcp/path.c:32)
+08/21 22:54:56.050: [pfcp] INFO: ogs_pfcp_connect() [127.0.0.7]:8805 (../lib/pfcp/path.c:60)
+08/21 22:54:56.051: [sbi] INFO: sbi_server() [127.0.0.4]:7777 (../lib/sbi/server.c:298)
 
-$ ./open5gs-hssd
-Open5GS daemon v1.0.0
+$ ./install/bin/open5gs-amfd
+Open5GS daemon v2.1.0
 
-10/27 15:48:32.802: [app] INFO: Configuration: '/Users/acetcom/Documents/git/open5gs/install/etc/open5gs/hss.yaml' (../src/main.c:54)
-10/27 15:48:32.803: [app] INFO: File Logging: '/Users/acetcom/Documents/git/open5gs/install/var/log/open5gs/hss.log' (../src/main.c:57)
-10/27 15:48:32.815: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:99)
-10/27 15:48:32.861: [app] INFO: HSS initialize...done (../src/hss/app-init.c:31)
+08/21 22:55:14.015: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/amf.yaml' (../src/main.c:54)
+08/21 22:55:14.015: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/amf.log' (../src/main.c:57)
+08/21 22:55:14.039: [app] INFO: AMF initialize...done (../src/amf/app.c:33)
+08/21 22:55:14.040: [sbi] INFO: sbi_server() [127.0.0.5]:7777 (../lib/sbi/server.c:298)
+08/21 22:55:14.040: [amf] INFO: ngap_server() [127.0.0.5]:38412 (../src/amf/ngap-sctp.c:56)
 
-$ ./open5gs-mmed
-Open5GS daemon v1.0.0
+$ ./install/bin/open5gs-sgwud 
+Open5GS daemon v2.1.0
 
-10/27 15:46:23.539: [app] INFO: Configuration: '/Users/acetcom/Documents/git/open5gs/install/etc/open5gs/mme.yaml' (../src/main.c:54)
-10/27 15:46:23.540: [app] INFO: File Logging: '/Users/acetcom/Documents/git/open5gs/install/var/log/open5gs/mme.log' (../src/main.c:57)
-10/27 15:46:23.682: [app] INFO: MME initialize...done (../src/mme/app-init.c:33)
-10/27 15:46:23.682: [gtp] INFO: gtp_server() [192.168.0.3]:2123 (../lib/gtp/path.c:32)
-10/27 15:46:23.683: [gtp] INFO: gtp_connect() [127.0.0.2]:2123 (../lib/gtp/path.c:57)
-10/27 15:46:23.683: [mme] INFO: s1ap_server() [192.168.0.3]:36412 (../src/mme/s1ap-usrpath.c:46)
+08/21 22:54:10.357: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/sgwu.yaml' (../src/main.c:54)
+08/21 22:54:10.357: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/sgwu.log' (../src/main.c:57)
+08/21 22:54:10.360: [pfcp] INFO: pfcp_server() [127.0.0.6]:8805 (../lib/pfcp/path.c:32)
+08/21 22:54:10.360: [app] INFO: SGW-U initialize...done (../src/sgwu/app.c:31)
+08/21 22:54:10.361: [gtp] INFO: gtp_server() [127.0.0.6]:2152 (../lib/gtp/path.c:32)
+
+$ ./install/bin/open5gs-upfd 
+Open5GS daemon v2.1.0
+
+08/21 22:54:21.596: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/upf.yaml' (../src/main.c:54)
+08/21 22:54:21.596: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/upf.log' (../src/main.c:57)
+08/21 22:54:21.601: [pfcp] INFO: pfcp_server() [127.0.0.7]:8805 (../lib/pfcp/path.c:32)
+08/21 22:54:21.601: [app] INFO: UPF initialize...done (../src/upf/app.c:31)
+08/21 22:54:21.601: [gtp] INFO: gtp_server() [127.0.0.7]:2152 (../lib/gtp/path.c:32)
+08/21 22:54:21.601: [gtp] INFO: gtp_server() [::1]:2152 (../lib/gtp/path.c:32)
+
+$ ./install/bin/open5gs-hssd
+Open5GS daemon v2.1.0
+
+08/21 22:57:17.450: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/hss.yaml' (../src/main.c:54)
+08/21 22:57:17.450: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/hss.log' (../src/main.c:57)
+08/21 22:57:17.451: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:99)
+08/21 22:57:17.519: [app] INFO: HSS initialize...done (../src/hss/app-init.c:31)
+
+$ ./install/bin/open5gs-pcrfd 
+Open5GS daemon v2.1.0
+
+08/21 22:57:45.894: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/pcrf.yaml' (../src/main.c:54)
+08/21 22:57:45.894: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/pcrf.log' (../src/main.c:57)
+08/21 22:57:45.896: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:99)
+08/21 22:57:45.997: [app] INFO: PCRF initialize...done (../src/pcrf/app-init.c:31)
+
+$ ./install/bin/open5gs-nrfd
+Open5GS daemon v2.1.0
+
+08/21 22:56:35.472: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/nrf.yaml' (../src/main.c:54)
+08/21 22:56:35.472: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/nrf.log' (../src/main.c:57)
+08/21 22:56:35.472: [app] INFO: NRF initialize...done (../src/nrf/app.c:31)
+08/21 22:56:35.473: [sbi] INFO: sbi_server() [127.0.0.10]:7777 (../lib/sbi/server.c:298)
+08/21 22:56:35.473: [sbi] INFO: sbi_server() [::1]:7777 (../lib/sbi/server.c:298
+
+$ ./install/bin/open5gs-ausfd
+Open5GS daemon v2.1.0
+
+08/21 22:55:41.899: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/ausf.yaml' (../src/main.c:54)
+08/21 22:55:41.899: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/ausf.log' (../src/main.c:57)
+08/21 22:55:41.900: [app] INFO: AUSF initialize...done (../src/ausf/app.c:31)
+08/21 22:55:41.900: [sbi] INFO: sbi_server() [127.0.0.11]:7777 (../lib/sbi/server.c:298)
+
+$ ./install/bin/open5gs-udmd 
+Open5GS daemon v2.1.0
+
+08/21 22:56:02.154: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/udm.yaml' (../src/main.c:54)
+08/21 22:56:02.154: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/udm.log' (../src/main.c:57)
+08/21 22:56:02.155: [app] INFO: UDM initialize...done (../src/udm/app.c:31)
+08/21 22:56:02.155: [sbi] INFO: sbi_server() [127.0.0.12]:7777 (../lib/sbi/server.c:298)
+
+$ ./install/bin/open5gs-pcfd 
+Open5GS daemon v2.1.0
+
+08/21 22:56:02.154: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/pcf.yaml' (../src/main.c:54)
+08/21 22:56:02.154: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/pcf.log' (../src/main.c:57)
+08/21 22:56:02.155: [app] INFO: PCF initialize...done (../src/pcf/app.c:31)
+08/21 22:56:02.155: [sbi] INFO: sbi_server() [127.0.0.12]:7777 (../lib/sbi/server.c:298)
+
+$ ./install/bin/open5gs-udrd 
+Open5GS daemon v2.1.0
+
+08/21 22:56:15.810: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/udr.yaml' (../src/main.c:54)
+08/21 22:56:15.810: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/udr.log' (../src/main.c:57)
+08/21 22:56:15.813: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:99)
+08/21 22:56:15.813: [app] INFO: UDR initialize...done (../src/udr/app.c:31)
+08/21 22:56:15.813: [sbi] INFO: sbi_server() [127.0.0.13]:7777 (../lib/sbi/server.c:298)
 ```
 
 Several command line options are provided.
 
 ```bash
-$ ./open5gs-mmed -h
-Usage: ./open5gs-mmed [options]
+$ ./install/bin/open5gs-amfd -h
+Usage: ./install/bin/open5gs-amfd [options]
 Options:
    -c filename    : set configuration file
    -l filename    : set logging file
@@ -226,6 +353,13 @@ You can also copy the binaries to /usr/bin to be able to run them from anywhere
 $ 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/app ## Both 5G Core and EPC with ./build/configs/sample.yaml
+```
+
 ### Building the WebUI of Open5GS
 ---
 
@@ -250,10 +384,17 @@ The WebUI runs as an [npm](https://www.npmjs.com/) script.
 $ npm run dev
 ```
 
+Server listening can be changed by setting the environment variable HOSTNAME or PORT as below.
+
+```bash
+$ HOSTNAME=192.168.0.11 npm run dev
+$ PORT=7777 npm run dev
+```
+
 ### Register Subscriber Information
 ---
 
-Connect to `http://localhost:3000` and login with **admin** account.
+Connect to `http://127.0.0.1:3000` and login with **admin** account.
 
 > Username : admin  
 > Password : 1423
@@ -327,38 +468,45 @@ Debugging tools can help you troubleshoot problems.
 - [GDB](https://www.gnu.org/software/gdb/) can be used as below:
 
   ```bash
-  $ gdb ./open5gs-mmed
+  $ gdb ./open5gs-amfd
   ```
 
 - On *Mac OS X*, you can use the [LLDB](https://lldb.llvm.org/).
 
   ```bash
-  $ lldb ./open5gs-mmed
+  $ lldb ./open5gs-amfd
   ```
 
 You can use the command line option[`-d`] to record more logs.
 
 ```bash
-Open5GS daemon v1.0.0
+$ ./tests/app/app -d
+Open5GS daemon v1.3.0-213-gd190548+
+
+08/21 23:01:54.246: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/build/configs/sample.yaml' (../src/main.c:54)
+08/21 23:01:54.246: [thread] DEBUG: [0x7f8de4d25018] worker signal (../lib/core/ogs-thread.c:66)
+08/21 23:01:54.246: [thread] DEBUG: [0x7f8de4d25018] thread started (../lib/core/ogs-thread.c:101)
+Open5GS daemon v1.3.0-213-gd190548+
+
+08/21 23:01:54.254: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/build/configs/sample.yaml' (../src/main.c:54)
+08/21 23:01:54.254: [thread] DEBUG: [0x7ff8d13be818] worker signal (../lib/core/ogs-thread.c:66)
+08/21 23:01:54.254: [nrf] DEBUG: nrf_state_initial(): INIT (../src/nrf/nrf-sm.c:25)
+08/21 23:01:54.254: [nrf] DEBUG: nrf_state_operational(): ENTRY (../src/nrf/nrf-sm.c:50)
+08/21 23:01:54.254: [thread] DEBUG: [0x7ff8d13be818] thread started (../lib/core/ogs-thread.c:101)
+08/21 23:01:54.254: [app] INFO: NRF initialize...done (../src/nrf/app.c:31)
+08/21 23:01:54.255: [sbi] INFO: sbi_server() [127.0.0.10]:7777 (../lib/sbi/server.c:298)
+08/21 23:01:54.255: [sbi] INFO: sbi_server() [::1]:7777 (../lib/sbi/server.c:298)
+08/21 23:01:54.296: [thread] DEBUG: [0x7f8de4d25098] worker signal (../lib/core/ogs-thread.c:66)
+08/21 23:01:54.296: [thread] DEBUG: [0x7f8de4d25098] thread started (../lib/core/ogs-thread.c:101)
+Open5GS daemon v1.3.0-213-gd190548+
+
+08/21 23:01:54.315: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/build/configs/sample.yaml' (../src/main.c:54)
+08/21 23:01:54.319: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:99)
+08/21 23:01:54.332: [app] INFO: PCRF initialize...done (../src/pcrf/app-init.c:31)
+08/21 23:01:54.347: [thread] DEBUG: [0x7f8de4d25118] worker signal (../lib/core/ogs-thread.c:66)
+08/21 23:01:54.347: [thread] DEBUG: [0x7f8de4d25118] thread started (../lib/core/ogs-thread.c:101)
+Open5GS daemon v1.3.0-213-gd190548+
+
+...
 
-10/27 15:50:45.170: [app] INFO: Configuration: '/Users/acetcom/Documents/git/open5gs/install/etc/open5gs/mme.yaml' (../src/main.c:54)
-10/27 15:50:45.171: [app] INFO: File Logging: '/Users/acetcom/Documents/git/open5gs/install/var/log/open5gs/mme.log' (../src/main.c:57)
-10/27 15:50:45.171: [app] INFO: LOG-LEVEL: 'debug' (../src/main.c:60)
-10/27 15:50:45.267: [thread] DEBUG: [0x10b52ed08] thread started (../lib/core/ogs-thread.c:101)
-10/27 15:50:45.267: [thread] DEBUG: [0x10b52ed08] worker signal (../lib/core/ogs-thread.c:66)
-10/27 15:50:45.268: [app] INFO: MME initialize...done (../src/mme/app-init.c:33)
-10/27 15:50:45.268: [mme] DEBUG: mme_state_initial(): INIT
- (../src/mme/mme-sm.c:38)
-10/27 15:50:45.268: [mme] DEBUG: mme_state_operational(): ENTRY
- (../src/mme/mme-sm.c:83)
-10/27 15:50:45.269: [sock] DEBUG: socket create(2:2:17) (../lib/core/ogs-socket.c:92)
-10/27 15:50:45.269: [sock] DEBUG: udp_socket() family:2 (../lib/core/ogs-udp.c:31)
-10/27 15:50:45.269: [sock] DEBUG: socket bind 192.168.0.3:2123 (../lib/core/ogs-socket.c:117)
-10/27 15:50:45.269: [sock] DEBUG: udp_server() [192.168.0.3]:2123 (../lib/core/ogs-udp.c:55)
-10/27 15:50:45.269: [gtp] INFO: gtp_server() [192.168.0.3]:2123 (../lib/gtp/path.c:32)
-10/27 15:50:45.269: [gtp] INFO: gtp_connect() [127.0.0.2]:2123 (../lib/gtp/path.c:57)
-10/27 15:50:45.270: [sctp] DEBUG: Old INITMSG (numout:10 maxin:2048 maxattempt:8 maxinit_to:60000) (../lib/sctp/ogs-usrsctp.c:132)
-10/27 15:50:45.271: [sctp] DEBUG: New INITMSG (numout:30 maxin:65535 maxattempt:4 maxinit_to:8000) (../lib/sctp/ogs-usrsctp.c:152)
-10/27 15:50:45.271: [sctp] DEBUG: sctp_bind() [192.168.0.3]:36412 (../lib/sctp/ogs-usrsctp.c:261)
-10/27 15:50:45.271: [mme] INFO: s1ap_server() [192.168.0.3]:36412 (../src/mme/s1ap-usrpath.c:46)
 ```