Release v2.0.18

* Add Vendor-Specific-Application-Id in CER of PCRF

Not advertising a Vendor-Specific-Application-Id in CER may result in
Diameter Peer rejecting the CER with a DIAMETER_NO_COMMON_APPLICATION error

* Add Vendor-Specific-Application-Id in CER of HSS and MME

Not advertising a Vendor-Specific-Application-Id in CER may result in
Diameter Peer rejecting the CER with a DIAMETER_NO_COMMON_APPLICATION error

.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,41 @@
+<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 Sponsors</h3>
+<!--special start-->
+
+<p align="center">
+  <a href="https://nextepc.com/" target="_blank">
+    <img width="260px" src="https://open5gs.org/assets/img/nextepc_logo.jpg">
+  </a>
+</p>
+
+<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.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
+## Technical Discussion
 
-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. Voice and text chat available in Open5GS's [Discord](https://discordapp.com/) workspace. Use [this link](https://discord.gg/GreNkuc) to get started.
 
 ## Contributing
 
@@ -16,4 +43,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,18 @@ 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_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
 
 mme:
     freeDiameter:
@@ -21,22 +32,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: 310
+        mnc: 014
+      mme_gid: 2
       mme_code: 1
     tai:
       plmn_id:
-        mcc: 235
-        mnc: 04
+        mcc: 310
+        mnc: 014
       tac: 1
     security:
         integrity_order : [ EIA2, EIA1, EIA0 ]
@@ -45,9 +56,32 @@ 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
+    mtu: 1400
     freeDiameter:
-      identity: hss.localdomain
+      identity: smf.localdomain
       realm: localdomain
       listen_on: 127.0.0.4
       load_extension:
@@ -60,20 +94,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,34 +157,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 +174,27 @@ 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
+
+udr:
+    sbi:
+      - addr: 127.0.0.13
+        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,18 @@ 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_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
 
 mme:
     freeDiameter:
@@ -21,12 +32,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 +62,7 @@ mme:
               mcc: 724
               mnc: 21
             lac: 51544
-    gummei: 
+    gummei:
       - plmn_id:
           mcc: 901
           mnc: 70
@@ -73,15 +84,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 +128,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 +191,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 +208,27 @@ 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
+
+udr:
+    sbi:
+      - addr: 127.0.0.13
+        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,13 @@ 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
+    minimal.yaml
     srslte.yaml
-    cups.yaml
+    sample.yaml
 '''.split()
 
 foreach file : example_conf

configs/minimal.yaml.in

@@ -3,13 +3,105 @@ 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_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 +114,7 @@ amf:
           mcc: 208
           mnc: 93
         tac: 1
-    plmn:
+    plmn_support:
       - plmn_id:
           mcc: 208
           mnc: 93
@@ -38,28 +130,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 +160,44 @@ 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
 
 udr:
     sbi:
-      - addr: 127.0.0.7
-        port: 7777
-nrf:
-    sbi:
-      - addr:
-          - 127.0.0.1
-          - ::1
+      - addr: 127.0.0.13
         port: 7777

configs/mnc3.yaml.in

@@ -1,127 +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: 310
-        mnc: 014
-      mme_gid: 32798
-      mme_code: 100
-    tai:
-      plmn_id:
-        mcc: 310
-        mnc: 014
-      tac: [50, 51, 52, 53]
-    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:
-      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
-
-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/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,12 +250,10 @@ 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:
 
@@ -264,7 +262,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -272,7 +270,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024
@@ -280,12 +278,6 @@ max:
 #    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:
 
 #
@@ -300,4 +292,10 @@ pool:
 #  o NF Instance Heartbeat (10 seconds)
 #    nf_instance:
 #      heartbeat: 10
+#
+#  o Message Wait Duration (Default : 2000ms = 2 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,12 +126,10 @@ 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:
 
@@ -140,7 +138,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -148,7 +146,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024
@@ -156,12 +154,6 @@ max:
 #    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:
 
 #
@@ -176,4 +168,10 @@ pool:
 #  o NF Instance Heartbeat (10 seconds)
 #    nf_instance:
 #      heartbeat: 10
+#
+#  o Message Wait Duration (Default : 2000ms = 2 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
 time:

configs/open5gs/hss.yaml.in

@@ -52,16 +52,10 @@ 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:
 
@@ -70,7 +64,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -78,7 +72,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024
@@ -86,10 +80,4 @@ max:
 #    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,17 @@ 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
 '''.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
 
 #
@@ -352,16 +354,10 @@ 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:
 
@@ -370,7 +366,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -378,7 +374,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024
@@ -386,12 +382,6 @@ max:
 #    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/nrf.yaml.in

@@ -1,5 +1,3 @@
-db_uri: mongodb://localhost/open5gs
-
 #
 # logger:
 #
@@ -18,7 +16,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 +42,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 +54,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 +66,7 @@ logger:
 nrf:
     sbi:
       addr:
-        - 127.0.0.1
+        - 127.0.0.10
         - ::1
       port: 7777
 
@@ -98,12 +96,10 @@ 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:
 
@@ -112,7 +108,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -120,7 +116,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024
@@ -128,12 +124,6 @@ max:
 #    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:
 
 #
@@ -155,4 +145,9 @@ pool:
 #    subscription:
 #      validity: 3600
 #
+#  o Message Wait Duration (Default : 2000ms = 2 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
 time:

configs/open5gs/pcrf.yaml.in

@@ -51,16 +51,10 @@ 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:
 
@@ -69,7 +63,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -77,7 +71,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024
@@ -85,10 +79,4 @@ max:
 #    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/sgwc.yaml.in

@@ -0,0 +1,164 @@
+#
+# 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 Number of Default Memory Pool Size
+#
+#   - Pool-size 128         => 32768 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:  32768
+#    256:  4096
+#    512:  2048
+#    1024: 1024
+#    2048: 512
+#    8192: 128
+#    big:  8
+#
+pool:

configs/open5gs/sgwu.yaml.in

@@ -16,31 +16,17 @@
 #
 #  o Set OGS_LOG_TRACE to all domain level
 #    level: trace
-#    domain: core,gtp,sgw,event,tlv,mem,sock
+#    domain: core,pfcp,gtp,sgwu,event,tlv,mem,sock
 #
 logger:
-    file: @localstatedir@/log/open5gs/sgw.log
+    file: @localstatedir@/log/open5gs/sgwu.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@
+# sgwu:
 #
 #  <GTP-U Server>
 #
-#  o GTP-U Server(all address avaiable)
+#  o GTP-U Server(all address available)
 #    gtpu:
 #
 #  o Provide custom SGW GTP-U address to be advertised inside S1AP messages
@@ -53,13 +39,33 @@ logger:
 #      advertise_name: sgw1.epc.mnc001.mcc001.3gppnetwork.org
 #
 #    gtpu:
-#     dev: ens3
-#     advertise_name: sgw1.epc.mnc001.mcc001.3gppnetwork.org
+#      dev: ens3
+#      advertise_name: sgw1.epc.mnc001.mcc001.3gppnetwork.org
 #
-sgw:
-    gtpc:
-      addr: 127.0.0.2
+#  <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:
@@ -83,21 +89,14 @@ sgw:
 #      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
+# o Maximum Number of UE per AMF/MME
+#    ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
+#    gnb: 32
 #
 max:
 
@@ -106,7 +105,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -114,7 +113,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024
@@ -122,10 +121,4 @@ max:
 #    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/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
+#        apn: internet
 #      - addr: cafe:1::1/64
+#        apn: internet
 #      - addr: 10.46.0.1/16
-#        apn: volte
+#        apn: ims
 #      - addr: cafe:2::1/64
-#        apn: volte
+#        apn: 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
+#        apn: internet
 #      - addr: cafe:1::1/64
+#        apn: internet
 #        dev: ogstun2
 #      - addr: 10.46.0.1/16
-#        apn: volte
+#        apn: ims
 #        dev: ogstun3
 #      - addr: cafe:2::1/64
-#        apn: volte
+#        apn: 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,7 +258,7 @@ nrf:
 #
 #  upf:
 #    pfcp:
-#      - addr: 127.0.0.4
+#      - addr: 127.0.0.7
 #        dnn: ims
 #      - addr: 127.0.0.12
 #        apn: [internet, web]
@@ -275,14 +268,14 @@ nrf:
 #
 #  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,12 +303,10 @@ 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:
 
@@ -324,7 +315,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -332,7 +323,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024
@@ -340,12 +331,6 @@ max:
 #    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:
 
 #
@@ -360,4 +345,10 @@ pool:
 #  o NF Instance Heartbeat (10 seconds)
 #    nf_instance:
 #      heartbeat: 10
+#
+#  o Message Wait Duration (Default : 2000ms = 2 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,12 +126,10 @@ 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:
 
@@ -140,7 +138,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -148,7 +146,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024
@@ -156,12 +154,6 @@ max:
 #    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:
 
 #
@@ -176,4 +168,10 @@ pool:
 #  o NF Instance Heartbeat (10 seconds)
 #    nf_instance:
 #      heartbeat: 10
+#
+#  o Message Wait Duration (Default : 2000ms = 2 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.13:443, http://[::1]:80)
 #    sbi:
-#      - addr: 127.0.0.7
+#      - addr: 127.0.0.13
 #        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.13:7777)
 #    sbi:
-#      - addr: 127.0.0.7
+#      - addr: 127.0.0.13
 #        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.13
         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,12 +128,10 @@ 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:
 
@@ -142,7 +140,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -150,7 +148,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024
@@ -158,12 +156,6 @@ max:
 #    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:
 
 #
@@ -178,4 +170,10 @@ pool:
 #  o NF Instance Heartbeat (10 seconds)
 #    nf_instance:
 #      heartbeat: 10
+#
+#  o Message Wait Duration (Default : 2000ms = 2 seconds)
+#
+#  o Message Wait Duration (3000 ms)
+#    message:
+#        duration: 3000
 time:

configs/open5gs/upf.yaml.in

@@ -26,26 +26,26 @@ logger:
 #
 #  <PFCP Server>
 #
-#  o PFCP Server(127.0.0.4:8805)
+#  o PFCP Server(127.0.0.7:8805)
 #    pfcp:
-#      addr: 127.0.0.4
+#      addr: 127.0.0.7
 #
 #  <GTP-U Server>>
 #
-#  o GTP-U Server(127.0.0.4:2152, [::1]:2152)
+#  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 Same configuration(127.0.0.7:2152, [::1]:2152) as below.
 #    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 +57,94 @@ logger:
 #        network_instance: ims
 #        source_interface: 1
 #
+#  <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
+#        apn: internet
+#      - addr: cafe:1::1/64
+#        apn: internet
+#      - addr: 10.46.0.1/16
+#        apn: ims
+#      - addr: cafe:2::1/64
+#        apn: 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
+#        apn: internet
+#      - addr: cafe:1::1/64
+#        apn: internet
+#        dev: ogstun2
+#      - addr: 10.46.0.1/16
+#        apn: ims
+#        dev: ogstun3
+#      - addr: cafe:2::1/64
+#        apn: 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 +157,6 @@ upf:
 #      addr: 127.0.0.3
 #
 smf:
-    pfcp:
-      - addr: 127.0.0.3
 
 #
 # parameter:
@@ -107,12 +185,10 @@ 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:
 
@@ -121,7 +197,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -129,7 +205,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024
@@ -137,9 +213,4 @@ max:
 #    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/sample.yaml.in

@@ -3,7 +3,18 @@ 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_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
 
 mme:
     freeDiameter:
@@ -21,12 +32,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 +48,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 +94,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 +157,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 +174,27 @@ 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
+
+udr:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777

configs/srslte.yaml.in

@@ -3,7 +3,18 @@ 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_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
 
 mme:
     freeDiameter:
@@ -21,13 +32,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 +50,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 +94,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 +157,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 +174,27 @@ 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
+
+udr:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777

configs/systemd/meson.build

@@ -16,11 +16,18 @@
 # 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-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-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,23 @@ 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_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 +31,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 +50,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 +97,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 +160,46 @@ 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
+
+udr:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777

debian/changelog

@@ -1,3 +1,333 @@
+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 +346,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

@@ -30,12 +30,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 +43,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 +124,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 +134,92 @@ 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-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-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 +227,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-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

docker/debian/buster

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

docker/debian/latest

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

docker/debian/latest/base/Dockerfile

@@ -0,0 +1,34 @@
+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 \
+        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/latest/stretch

@@ -0,0 +1 @@
+stretch

docker/debian/stable

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

docker/debian/stretch

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

docker/debian/unstable

@@ -0,0 +1 @@
+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/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

@@ -76,57 +76,125 @@ $ sudo zypper install open5gs
 ### Configure Open5GS
 ---
 
-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
+##### 5G Core
+
+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 [/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
+
 ```
 
 After changing conf files, please restart Open5GS daemons.
 
 ```bash
-$ sudo systemctl restart open5gs-mmed
-$ sudo systemctl restart open5gs-sgwd
+$ sudo systemctl restart open5gs-amfd.service
+$ sudo systemctl restart open5gs-upfd.service
+$ sudo systemctl restart open5gs-mmed.service
+$ sudo systemctl restart open5gs-sgwud.service
 ```
 
 ### Install WebUI of Open5GS
@@ -218,9 +286,9 @@ $ 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
+### Turn on your gNB/eNB and Phone
 ---
-- Connect your eNodeB to the IP of your server via the standard S1AP port of SCTP 36412 (for MME)
+- Connect your gNB/eNB to the IP of your server via the standard NGAP/S1AP port of SCTP 38412/36412 (for AMF/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`.
 

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

@@ -57,12 +57,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 || http`.  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 +87,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,13 +205,13 @@ 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.
+Specify the absolute path to the shared 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
+$ ldd ./install/bin/open5gs-amfd
 ...
 	libogsapp.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogsapp.so.1 (0x00007f161ab51000)
 	libogscore.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogscore.so.1 (0x00007f161a922000)
@@ -157,58 +230,123 @@ Now let's get started.
 
 ```bash
 $ cd install/bin/
-$ ./open5gs-pcrfd
-Open5GS daemon v1.0.0
+$ ./install/bin/open5gs-mmed 
+Open5GS daemon v1.3.0-213-gd190548+
 
-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 v1.3.0-213-gd190548+
 
-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 v1.3.0-213-gd190548+
 
-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 v1.3.0-213-gd190548+
 
-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 v1.3.0-213-gd190548+
 
-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 v1.3.0-213-gd190548+
+
+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 v1.3.0-213-gd190548+
+
+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 v1.3.0-213-gd190548+
+
+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 v1.3.0-213-gd190548+
+
+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 v1.3.0-213-gd190548+
+
+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 v1.3.0-213-gd190548+
+
+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-udrd 
+Open5GS daemon v1.3.0-213-gd190548+
+
+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 +364,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/config/sample.yaml
+$ ./build/tests/app/epc -c ./build/config/srslte.yaml ## EPC Only with ./build/config/srslte.yaml
+$ ./build/tests/app/app ## Both 5G Core and EPC with ./build/config/sample.yaml
+```
+
 ### Building the WebUI of Open5GS
 ---
 
@@ -327,38 +472,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)
 ```

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

@@ -1,169 +0,0 @@
----
-title: Open5GS Splitting Network Elements
-head_inline: "<style> .blue { color: blue; } </style>"
----
-
-In a production network network elements would typically not all be on the same machine, as is the default example that ships with Open5GS.
-
-Open5GS is designed to be standards compliant, so in theory you can connect any core network element (MME, PGW, SGW, PCRF, HSS) from Open5GS or any other vendor to form a functioning network, so long as they are 3GPP compliant. 
-
-To demonstrate this we will cover isolating each network element onto it's on machine and connect each network element to the other. For some interfaces specifying multiple interfaces is supported to allow connection to multiple
-
-In these examples we'll be connecting Open5GS elements together, but it could just as easily be EPC elements from a different vendor in the place of any Open5GS network element.
-
-| Service        | IP           | Identity |
-| ------------- |:-------------:|:-------------:|
-| P-GW | 10.0.1.121 | pgw.localdomain |
-| S-GW | 10.0.1.122 | |
-| PCRF | 10.0.1.123 | pcrf.localdomain |
-| MME | 10.0.1.124 | mme.localdomain |
-| HSS | 10.0.1.118 | hss.localdomain |
-
-
-# External P-GW
-In it's simplest from the P-GW has 3 interfaces:
- * S5 - Connection to home network S-GW (GTP-C)
- * Gx - Connection to PCRF (Diameter)
- * Sgi - Connection to external network (Generally the Internet via standard TCP/IP)
- 
-### S5 Interface Configuration
-Edit ```/etc/open5gs/pgw.yaml``` and change the address to IP of the server running the P-GW for the listener on GTP-C and GTP-U interfaces.
-
-```
-pgw:
-    freeDiameter: /etc/freeDiameter/pgw.conf
-    gtpc: 
-      addr:
-        - 10.0.1.121
-     gtpu: 
-      addr:
-        - 10.0.1.121
-```
-
-
-
-
-### Gx Interface Configuration
-Edit ```/etc/freeDiameter/pgw.conf```
-
-Update ```ListenOn``` address to IP of the server running the P-GW:
-
-``` ListenOn = "10.0.1.121"; ``` 
-
-Update ConnectPeer to connect to the PCRF on it's IP.
-
-```ConnectPeer = "pcrf.localdomain" { ConnectTo = "10.0.1.123"; No_TLS; };```
-
-
-### Restart Services
-Restart Open5GS PGW Daemon:
-
-``` $ sudo systemctl restart open5gs-pgwd ```
-
-
-# External S-GW
-In it's simplest form the S-GW has 2 interfaces:
- * S11 - Connection to MME (GTP-C)
- * S5 - Connection to the home network P-GW (GTP-C)
-
-### S5 Interface Configuration
-Edit ```/etc/open5gs/sgw.yaml``` and change the address to IP of the server running the S-GW for the listener on GTP-C interface.
-
-```
-sgw:
-    freeDiameter: /etc/freeDiameter/pgw.conf
-    gtpc: 
-      addr:
-        - 10.0.1.122
-```
- 
- Restart Open5GS SGW Daemon:
-
-``` $ sudo systemctl restart open5gs-sgwd ```
-
-
-# External PCRF
-In it's simplest from the PCRF has 1 network interface:
- * Gx - Connection to P-GW (Diameter)
-
-### Gx Interface Configuration
-Edit ```/etc/freeDiameter/hss.conf```
-
-Update ```ListenOn``` address to IP of the server running the HSS on it's IP:
-
-``` ListenOn = "10.0.1.123"; ``` 
-
-Update ConnectPeer to connect to the MME.
-
-```ConnectPeer = "pgw.localdomain" { ConnectTo = "10.0.1.121"; No_TLS; };```
-
-### MongoDB Interface Configuration (Open5GS HSS only)
-Edit ```/etc/freeDiameter/hss.conf``` and change the ```db_uri:``` to point at the HSS: ```db_uri: mongodb://10.0.1.118/open5gs``` 
-
-Restart Open5GS PCRF Daemon:
-
-``` $ sudo systemctl restart open5gs-pcrfd ```
-
-# External HSS
-In it's simplest form the HSS has 1 network interface:
- * S6a - Connection to MME (Diameter)
-
-### S6a Interface Configuration
-Edit ```/etc/freeDiameter/hss.conf```
-
-Update ```ListenOn``` address to IP of the server running the HSS on it's IP:
-
-``` ListenOn = "10.0.1.118"; ``` 
-
-Update ConnectPeer to connect to the MME.
-
-```ConnectPeer = "mme.localdomain" { ConnectTo = "10.0.1.124"; No_TLS; };```
-
-Restart Open5GS HSS Daemon:
-
-``` $ sudo systemctl restart open5gs-hssd ```
-
-### MongoDB Interface Configuration (Open5GS specific)
-If you are using Open5GS's HSS you may need to enable MongoDB access from the PCRF. This is done by editing ''/etc/mongodb.conf'' and changing the bind IP to:
-``` bind_ip = 0.0.0.0 ```
-
-Restart MongoDB for changes to take effect.
-
-``` $ /etc/init.d/mongodb restart ```
-
-# External MME
-In it's simplest form the MME has 3 interfaces:
- * S1AP - Connections from eNodeBs
- * S6a - Connection to HSS (Diameter)
- * S11 - Connection to S-GW (GTP-C)
- 
-### S11 Interface Configuration
-Edit ```/etc/open5gs/mme.yaml``` and filling the IP address of the S-GW and P-GW servers.
-```
-sgw:
-    gtpc:
-      addr: 10.0.1.122
-
-pgw:
-    gtpc:
-      addr:
-        - 10.0.1.121
-```
-
-### S6a Interface Configuration
-Edit ```/etc/freeDiameter/mme.conf```
-
-Update ```ListenOn``` address to IP of the server running the MME:
-
-``` ListenOn = "10.0.1.124"; ``` 
-
-Update ConnectPeer to connect to the PCRF on it's IP.
-
-```ConnectPeer = "hss.localdomain" { ConnectTo = "10.0.1.118"; No_TLS; };```
-
-
-### Restart Services
-Restart Open5GS MME Daemon:
-
-``` $ sudo systemctl restart open5gs-mmed ```
- 

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

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

docs/_docs/new/02-installing-5g-core.md

@@ -1,426 +0,0 @@
----
-title: Installing 5G Core from Sources
-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}
-
-### Getting MongoDB
----
-
-Install MongoDB with package manager.  It is used as database for the UDR.
-
-```bash
-$ sudo apt update
-$ sudo apt install mongodb
-$ sudo systemctl start mongodb (if '/usr/bin/mongod' is not running)
-$ sudo systemctl enable mongodb (ensure to automatically start it on system boot)
-```
-
-### Setting up TUN device (not persistent after rebooting)
----
-
-Create the TUN device with the interface name `ogstun`.
-
-```bash
-$ sudo ip tuntap add name ogstun mode tun
-$ sudo ip addr add 10.45.0.1/16 dev ogstun
-$ sudo ip addr add cafe::1/64 dev ogstun
-$ sudo ip link set ogstun up
-```
-
-**Tip:** The script provided in [$GIT_REPO/misc/netconf.sh](https://github.com/{{ site.github_username }}/open5gs/blob/master/misc/netconf.sh) makes it easy to configure the TUN device as follows:  
-`$ sudo ./misc/netconf.sh`
-{: .notice--info}
-
-### Building Open5GS
----
-
-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
-```
-
-Git clone.
-
-```bash
-$ git clone https://github.com/{{ site.github_username }}/open5gs
-```
-
-To compile with meson:
-
-```bash
-$ cd open5gs
-$ meson build --prefix=`pwd`/install
-$ ninja -C build
-```
-
-Check whether the compilation is correct in your environment.
-```bash
-$ cd build
-$ ./tests/registration/registration
-```
-
-**Tip:** You can also check the result of `./test/registration/registration` with a tool that captures packets. If you are running `wireshark`, select the `any` interface and set FILTER to `ngap || http || pfcp || gtp`.
-{: .notice--info}
-
-You need to perform the **installation process**.
-```bash
-$ cd build
-$ ninja install
-$ cd ../
-```
-
-### Configure Open5GS
----
-
-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. 
-
-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 NGAP connection of AMF to the gNB
-
-```diff
-diff -u amf.yaml.old amf.yaml
---- amf.yaml.old	2020-06-21 23:34:14.643114779 -0400
-+++ amf.yaml	2020-06-21 23:34:28.718482095 -0400
-@@ -67,25 +67,25 @@
-       - addr: 127.0.0.2
-         port: 7777
-     ngap:
-+      - addr: 192.168.0.100
-     guami:
-       - plmn_id:
--          mcc: 001
--          mnc: 01
-+          mcc: 901
-+          mnc: 70
-         amf_id:
-           region: 2
-           set: 1
-     tai:
-       - plmn_id:
--          mcc: 001
--          mnc: 01
--        tac: 1
-+          mcc: 901
-+          mnc: 70
-+        tac: 7
-     plmn:
-       - plmn_id:
--          mcc: 001
--          mnc: 01
-+          mcc: 901
-+          mnc: 70
-         s_nssai:
-           - sst: 1
--          - sd: 2
-     security:
-         integrity_order : [ NIA1, NIA2, NIA0 ]
-         ciphering_order : [ NEA0, NEA1, NEA2 ]
-```
-
-Modify [install/etc/open5gs/upf.yaml](https://github.com/{{ site.github_username }}/open5gs/blob/master/configs/open5gs/upf.yaml.in) to set the GTP-U IP address.  
-```diff
-diff -u upf.yaml.old upf.yaml
---- upf.yaml.old	2020-06-21 23:35:54.378631781 -0400
-+++ upf.yaml	2020-06-21 23:36:02.978245251 -0400
-@@ -61,6 +61,7 @@
-     pfcp:
-       - addr: 127.0.0.4
-     gtpu:
-+      - addr: 192.168.0.100
-     pdn:
-```
-
-If you modify the config files while Open5GS daemons are running, please restart them
-
-
-### 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-amfd
-...
-	libogsapp.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogsapp.so.1 (0x00007f161ab51000)
-	libogscore.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogscore.so.1 (0x00007f161a922000)
-	libogssctp.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogssctp.so.1 (0x00007f161a71d000)
-	libogss1ap.so.1 => /home/acetcom/Documents/git/open5gs/install/lib/x86_64-linux-gnu/libogss1ap.so.1 (0x00007f161a519000)
-...
-```
-
-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/
-$ ./install/bin/open5gs-nrfd 
-Open5GS daemon v1.3.0
-
-06/21 23:37:46.749: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/nrf.yaml' (../src/main.c:54)
-06/21 23:37:46.749: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/nrf.log' (../src/main.c:57)
-06/21 23:37:46.749: [app] INFO: NRF initialize...done (../src/nrf/app.c:31)
-06/21 23:37:46.749: [sbi] INFO: sbi_server() [127.0.0.1]:7777 (../lib/sbi/server.c:291)
-06/21 23:37:46.749: [sbi] INFO: sbi_server() [::1]:7777 (../lib/sbi/server.c:291
-
-
-$ ./install/bin/open5gs-amfd 
-Open5GS daemon v1.3.0
-
-06/21 23:38:15.834: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/amf.yaml' (../src/main.c:54)
-06/21 23:38:15.834: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/amf.log' (../src/main.c:57)
-06/21 23:38:15.876: [app] INFO: AMF initialize...done (../src/amf/app.c:33)
-06/21 23:38:15.876: [sbi] INFO: sbi_server() [127.0.0.2]:7777 (../lib/sbi/server.c:291)
-06/21 23:38:15.877: [amf] INFO: ngap_server() [192.168.0.11]:38412 (../src/amf/ngap-sctp.c:56)
-06/21 23:38:15.877: [amf] INFO: ngap_server() [172.19.0.1]:38412 (../src/amf/ngap-sctp.c:56)
-06/21 23:38:15.877: [amf] INFO: ngap_server() [172.17.0.1]:38412 (../src/amf/ngap-sctp.c:56)
-06/21 23:38:15.877: [amf] INFO: ngap_server() [2601:144:4100:a220:ee:f149:8f28:9572]:38412 (../src/amf/ngap-sctp.c:56)
-06/21 23:38:15.877: [amf] INFO: ngap_server() [2601:144:4100:a220:c643:4b3a:b0ee:c446]:38412 (../src/amf/ngap-sctp.c:56)
-06/21 23:38:15.877: [amf] INFO: [ce785804-b439-41ea-9c93-399fce5a75a5] NF registered (../src/amf/nf-sm.c:209)
-
-$ ./install/bin/open5gs-smfd
-Open5GS daemon v1.3.0
-
-06/21 23:38:35.313: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/smf.yaml' (../src/main.c:54)
-06/21 23:38:35.313: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/smf.log' (../src/main.c:57)
-06/21 23:38:35.350: [gtp] INFO: gtp_server() [127.0.0.3]:2123 (../lib/gtp/path.c:32)
-06/21 23:38:35.350: [gtp] INFO: gtp_server() [::1]:2123 (../lib/gtp/path.c:32)
-06/21 23:38:35.350: [app] INFO: SMF initialize...done (../src/smf/app.c:31)
-06/21 23:38:35.350: [pfcp] INFO: pfcp_server() [127.0.0.3]:8805 (../lib/pfcp/path.c:32)
-06/21 23:38:35.350: [pfcp] INFO: pfcp_server() [::1]:8805 (../lib/pfcp/path.c:32)
-06/21 23:38:35.350: [pfcp] INFO: ogs_pfcp_connect() [127.0.0.4]:8805 (../lib/pfcp/path.c:60)
-06/21 23:38:35.351: [sbi] INFO: sbi_server() [127.0.0.3]:7777 (../lib/sbi/server.c:291)
-06/21 23:38:35.352: [smf] INFO: [da15f3e2-b439-41ea-bd58-c3fe61467c94] NF registered (../src/smf/nf-sm.c:210)
-
-$ ./install/bin/open5gs-upfd 
-Open5GS daemon v1.3.0
-
-06/21 23:38:52.832: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/upf.yaml' (../src/main.c:54)
-06/21 23:38:52.832: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/upf.log' (../src/main.c:57)
-06/21 23:38:52.844: [app] INFO: UPF initialize...done (../src/upf/app.c:31)
-06/21 23:38:52.844: [pfcp] INFO: pfcp_server() [127.0.0.4]:8805 (../lib/pfcp/path.c:32)
-06/21 23:38:52.844: [pfcp] INFO: ogs_pfcp_connect() [127.0.0.3]:8805 (../lib/pfcp/path.c:60)
-06/21 23:38:52.846: [gtp] INFO: gtp_server() [192.168.0.11]:2152 (../lib/gtp/path.c:32)
-06/21 23:38:52.846: [gtp] INFO: gtp_server() [172.19.0.1]:2152 (../lib/gtp/path.c:32)
-06/21 23:38:52.846: [gtp] INFO: gtp_server() [172.17.0.1]:2152 (../lib/gtp/path.c:32)
-06/21 23:38:52.846: [gtp] INFO: gtp_server() [2601:144:4100:a220:ee:f149:8f28:9572]:2152 (../lib/gtp/path.c:32)
-06/21 23:38:52.846: [gtp] INFO: gtp_server() [2601:144:4100:a220:c643:4b3a:b0ee:c446]:2152 (../lib/gtp/path.c:32)
-06/21 23:38:52.848: [upf] INFO: PFCP associated (../src/upf/pfcp-sm.c:171)
-06/21 23:38:53.358: [upf] WARNING: PFCP[REQ] has already been associated (../src/upf/pfcp-sm.c:201)
-
-$ ./install/bin/open5gs-ausfd 
-Open5GS daemon v1.3.0
-
-06/21 23:39:11.641: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/ausf.yaml' (../src/main.c:54)
-06/21 23:39:11.641: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/ausf.log' (../src/main.c:57)
-06/21 23:39:11.641: [app] INFO: AUSF initialize...done (../src/ausf/app.c:31)
-06/21 23:39:11.642: [sbi] INFO: sbi_server() [127.0.0.5]:7777 (../lib/sbi/server.c:291)
-06/21 23:39:11.643: [ausf] INFO: [efbbbe5c-b439-41ea-b95c-039d7a609671] NF registered (../src/ausf/nf-sm.c:209)
-
-$ ./install/bin/open5gs-udmd
-Open5GS daemon v1.3.0
-
-06/21 23:39:28.792: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/udm.yaml' (../src/main.c:54)
-06/21 23:39:28.792: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/udm.log' (../src/main.c:57)
-06/21 23:39:28.792: [app] INFO: UDM initialize...done (../src/udm/app.c:31)
-06/21 23:39:28.793: [sbi] INFO: sbi_server() [127.0.0.6]:7777 (../lib/sbi/server.c:291)
-06/21 23:39:29.390: [udm] INFO: [f9f4ce22-b439-41ea-bf29-c309f36c787f] NF registered (../src/udm/nf-sm.c:209)
-
-$ ./install/bin/open5gs-udrd
-Open5GS daemon v1.3.0
-
-06/21 23:39:41.763: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/install/etc/open5gs/udr.yaml' (../src/main.c:54)
-06/21 23:39:41.763: [app] INFO: File Logging: '/home/acetcom/Documents/git/open5gs/install/var/log/open5gs/udr.log' (../src/main.c:57)
-06/21 23:39:41.765: [dbi] INFO: MongoDB URI: 'mongodb://localhost/open5gs' (../lib/dbi/ogs-mongoc.c:99)
-06/21 23:39:41.765: [app] INFO: UDR initialize...done (../src/udr/app.c:31)
-06/21 23:39:41.765: [sbi] INFO: sbi_server() [127.0.0.7]:7777 (../lib/sbi/server.c:291)
-06/21 23:39:41.767: [udr] INFO: [01b0191e-b43a-41ea-9abb-df3b42196e0a] NF registered (../src/udr/nf-sm.c:209)
-
-```
-
-Several command line options are provided.
-
-```bash
-$ ./install/bin/open5gs-amfd -h
-Usage: ./install/bin/open5gs-amfd [options]
-Options:
-   -c filename    : set configuration file
-   -l filename    : set logging file
-   -e level       : set global log-level (default:info)
-   -m domain      : set log-domain (e.g. mme:sgw:gtp)
-   -d             : print lots of debugging information
-   -t             : print tracing information for developer
-   -D             : start as a daemon
-   -v             : show version number and exit
-   -h             : show this message and exit
-```
-
-You can also copy the binaries to /usr/bin to be able to run them from anywhere on the system.
-```bash
-$ cp open5gs* /usr/bin/
-```
-
-For convenience, you can execute all NFs at once by using the following command.
-```bash
-$ cd build
-$ vi configs/5gc.yaml ## check the configuration
-$ ./test/app/5gc ## run all NFs
-```
-
-### Building the WebUI of Open5GS
----
-
-[Node.js](https://nodejs.org/) is required to build WebUI of Open5GS
-
-```bash
-$ sudo apt install curl
-$ curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
-$ sudo apt install nodejs
-```
-
-Install the dependencies to run WebUI
-
-```bash
-$ cd webui
-$ npm install
-```
-
-The WebUI runs as an [npm](https://www.npmjs.com/) script.
-
-```bash
-$ npm run dev
-```
-
-### Register Subscriber Information
----
-
-Connect to `http://localhost:3000` and login with **admin** account.
-
-> Username : admin  
-> Password : 1423
-
-**Note:**
-You can change the password in _Account_ Menu.
-{: .notice--info}
-
-To add subscriber information, you can do WebUI operations in the following order:
-
-  1. Go to `Subscriber` Menu.
-  2. Click `+` Button to add a new subscriber.
-  3. Fill the IMSI, security context(K, OPc, AMF), and APN of the subscriber.
-  4. Click `SAVE` Button
-
-**Tip:** This addition immediately affects Open5GS without restarting any daemon.
-{: .notice--warning}
-
-### IP routing + NAT for UE internet connectivity
----
-
-To allow your phones to connect to the internet, you must run the following command on the host running Open5GS-PGW:
-
-```bash
-### Check IP Table 'forward'
-$ sudo iptables -L
-Chain INPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain FORWARD (policy ACCEPT)
-target     prot opt source               destination
-
-Chain OUTPUT (policy ACCEPT)
-target     prot opt source               destination
-
-### Check IP Table 'nat'
-$ sudo iptables -L -t nat
-Chain PREROUTING (policy ACCEPT)
-target     prot opt source               destination
-
-Chain INPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain OUTPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain POSTROUTING (policy ACCEPT)
-target     prot opt source               destination
-
-### Enable IPv4 Forwarding
-$ sudo sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward"
-
-### Add NAT Rule
-$ sudo iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE
-```
-
-**Note:** The above assumes you do not have any existing rules in the filter and nat tables. If a program such as docker has already set up rules, you may need to add the Open5GS related rules differently.
-{: .notice--danger}
-
-### Turn on your gNB and Phone
----
-
-- You can view the log at `$INSTALL_PREFIX/var/log/open5gs/*.log`.
-
-### Troubleshooting
----
-
-If you run into any problems, please post the github issue. Providing packets using wireshark can help a lot.
-{: .blue}
-
-To fix the problem yourself, debugging tools can help you troubleshoot problems.
-
-- [GDB](https://www.gnu.org/software/gdb/) can be used as below:
-
-  ```bash
-  $ gdb ./open5gs-amfd
-  ```
-
-- On *Mac OS X*, you can use the [LLDB](https://lldb.llvm.org/).
-
-  ```bash
-  $ lldb ./open5gs-amfd
-  ```
-
-You can use the command line option[`-d`] to record more logs.
-
-```bash
-$ ./test/app/5gc -d
-Open5GS daemon v1.3.0
-
-06/21 23:44:54.500: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/build/configs/5gc.yaml' (../src/main.c:54)
-06/21 23:44:54.500: [thread] DEBUG: [0x7f3342a7d018] worker signal (../lib/core/ogs-thread.c:66)
-06/21 23:44:54.500: [thread] DEBUG: [0x7f3342a7d018] thread started (../lib/core/ogs-thread.c:101)
-Open5GS daemon v1.3.0
-
-06/21 23:44:54.508: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/build/configs/5gc.yaml' (../src/main.c:54)
-06/21 23:44:54.508: [thread] DEBUG: [0x7f31d3620818] worker signal (../lib/core/ogs-thread.c:66)
-06/21 23:44:54.508: [nrf] DEBUG: nrf_state_initial(): INIT (../src/nrf/nrf-sm.c:25)
-06/21 23:44:54.508: [nrf] DEBUG: nrf_state_operational(): ENTRY (../src/nrf/nrf-sm.c:50)
-06/21 23:44:54.508: [thread] DEBUG: [0x7f31d3620818] thread started (../lib/core/ogs-thread.c:101)
-06/21 23:44:54.508: [app] INFO: NRF initialize...done (../src/nrf/app.c:31)
-06/21 23:44:54.509: [sbi] INFO: sbi_server() [127.0.0.1]:7777 (../lib/sbi/server.c:291)
-06/21 23:44:54.509: [sbi] INFO: sbi_server() [::1]:7777 (../lib/sbi/server.c:291)
-06/21 23:44:54.551: [thread] DEBUG: [0x7f3342a7d098] worker signal (../lib/core/ogs-thread.c:66)
-06/21 23:44:54.551: [thread] DEBUG: [0x7f3342a7d098] thread started (../lib/core/ogs-thread.c:101)
-Open5GS daemon v1.3.0
-
-06/21 23:44:54.575: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/build/configs/5gc.yaml' (../src/main.c:54)
-06/21 23:44:54.601: [thread] DEBUG: [0x7f3342a7d118] worker signal (../lib/core/ogs-thread.c:66)
-06/21 23:44:54.601: [thread] DEBUG: [0x7f3342a7d118] thread started (../lib/core/ogs-thread.c:101)
-Open5GS daemon v1.3.0
-
-06/21 23:44:54.607: [app] INFO: Configuration: '/home/acetcom/Documents/git/open5gs/build/configs/5gc.yaml' (../src/main.c:54)
-06/21 23:44:54.608: [thread] DEBUG: [0x7f996e1b2918] worker signal (../lib/core/ogs-thread.c:66)
-06/21 23:44:54.608: [ausf] DEBUG: ausf_state_initial(): INIT (../src/ausf/ausf-sm.c:25)
-```

docs/_docs/platform/02-centos.md

@@ -123,16 +123,24 @@ $ ninja -C build
 
 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 || http`.  You can see the virtually created packets. [testattach.pcapng]({{ site.url }}{{ site.baseurl }}/assets/pcapng/testattach.pcapng)/[testregistration.pcapng]({{ site.url }}{{ site.baseurl }}/assets/pcapng/testregistration.pcapng)
 {: .notice--info}
 
 You need to perform the **installation process**.
 ```bash
 $ cd build
 $ ninja install
+$ cd ../
 ```
 
 ### Building WebUI of Open5GS

docs/_docs/platform/03-fedora.md

@@ -91,16 +91,24 @@ $ ninja -C build
 
 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 || http`.  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**.
+You need to perform the **installation process**.
 ```bash
 $ cd build
 $ ninja install
+$ cd ../
 ```
 
 ### Building WebUI of Open5GS

docs/_docs/platform/04-freebsd.md

@@ -29,6 +29,15 @@ $ sudo ifconfig lo0 alias 127.0.0.2 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.3 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.4 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.5 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.5 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.6 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.7 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.8 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.9 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.10 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.11 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.12 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.13 netmask 255.255.255.255
 ```
 
 Enable IP forwarding
@@ -60,7 +69,7 @@ Git clone.
 $ git clone https://github.com/{{ site.github_username }}/open5gs
 ```
 
-To compile with autotools:
+To compile with meson:
 
 ```bash
 $ cd open5gs
@@ -72,17 +81,30 @@ Check whether the compilation is correct.
 
 **Note:** This should require *sudo* due to access `/dev/tun0`.
 {: .notice--danger}
+
 ```bash
-$ sudo ninja -C build test
+$ sudo ./build/tests/attach/attach ## EPC Only
+$ sudo ./build/tests/registration/registration ## 5G Core Only
 ```
 
-**Tip:** You can also check the result of `sudo 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.
+
+**Note:** This should require *sudo* due to access `/dev/tun0`.
+{: .notice--danger}
+
+```bash
+$ cd build
+$ sudo 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 || http`.  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**.
+You need to perform the **installation process**.
 ```bash
 $ cd build
 $ ninja install
+$ cd ../
 ```
 
 ### Building WebUI of Open5GS

docs/_docs/platform/05-macosx.md

@@ -24,8 +24,7 @@ $ brew install mongodb-community
 
 Run MongoDB server.
 ```bash
-$ mkdir -p ./data/db
-$ mongod --dbpath ./data/db
+$ mongod --config /usr/local/etc/mongod.conf
 ```
 
 **Tip:** MongoDB is persistent after rebooting with the following commands:
@@ -38,6 +37,7 @@ $ mongod --dbpath ./data/db
 
 Install TUN/TAP driver
 - You can download it from [http://tuntaposx.sourceforge.net/](http://tuntaposx.sourceforge.net/)
+- And then, run tuntap_20150118.pkg to install TUN/TAP driver.
 
 Configure the TUN device.
 ```bash
@@ -45,6 +45,15 @@ $ sudo ifconfig lo0 alias 127.0.0.2 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.3 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.4 netmask 255.255.255.255
 $ sudo ifconfig lo0 alias 127.0.0.5 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.5 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.6 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.7 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.8 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.9 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.10 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.11 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.12 netmask 255.255.255.255
+$ sudo ifconfig lo0 alias 127.0.0.13 netmask 255.255.255.255
 ```
 
 Enable IP forwarding & Masquerading
@@ -87,21 +96,35 @@ $ ninja -C build
 
 Check whether the compilation is correct.
 
-**Note:** This should require `sudo` due to access `/dev/tun0`.
+**Note:** This should require *sudo* due to access `/dev/tun0`.
 {: .notice--danger}
+
 ```bash
-$ sudo ninja -C build test
+$ sudo ./build/tests/attach/attach ## EPC Only
+$ sudo ./build/tests/registration/registration ## 5G Core Only
 ```
 
-**Tip:** You can also check the result of `sudo 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.
+
+**Note:** This should require *sudo* due to access `/dev/tun0`.
+{: .notice--danger}
+
+```bash
+$ cd build
+$ sudo 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 || http`.  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**.
+You need to perform the **installation process**.
 ```bash
 $ cd build
 $ ninja install
+$ cd ../
 ```
 
+
 ### Building WebUI of Open5GS
 ---
 

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

@@ -11,25 +11,42 @@ title: Simple Issue
 Before we get too far in troubleshooting let's first check all our services are running.
 
 ```bash
-$ ps aux | grep open5gs
-open5gs    3434  0.2  2.8 1074020 27972 ?       Ssl  02:39   0:00 /usr/bin/open5gs-pgwd -c /etc/open5gs/pgw.yaml
-open5gs    3672  0.0  1.0 922972 10408 ?        Ssl  02:39   0:00 /usr/bin/open5gs-sgwd -c /etc/open5gs/sgw.yaml
-open5gs    3893  0.1  1.3 958412 13260 ?        Ssl  02:39   0:00 /usr/bin/open5gs-hssd -c /etc/open5gs/hss.yaml
-open5gs    4011  0.1  1.3 956320 13140 ?        Ssl  02:39   0:00 /usr/bin/open5gs-pcrfd -c /etc/open5gs/pcrf.yaml
-open5gs    4138  0.3  1.2 986524 12608 ?        Ssl  02:40   0:00 /usr/bin/open5gs-mmed -c /etc/open5gs/mme.yaml
-root       4198  0.0  0.1  13136  1060 pts/0    S+   02:40   0:00 grep --color=auto open5gs
+ps aux | grep open5gs
+open5gs  26633  0.1  0.0 2890828 12308 ?       Ssl  12:13   0:00 /usr/bin/open5gs-mmed -c /etc/open5gs/mme.yaml
+open5gs  26784  0.0  0.1 1534456 18344 ?       Ssl  12:13   0:00 /usr/bin/open5gs-sgwcd -c /etc/open5gs/sgwc.yaml
+open5gs  27076  0.1  0.2 3811148 42192 ?       Ssl  12:13   0:00 /usr/bin/open5gs-smfd -c /etc/open5gs/smf.yaml
+open5gs  27174  0.0  0.0 258096 12720 ?        Ssl  12:13   0:00 /usr/bin/open5gs-amfd -c /etc/open5gs/amf.yaml
+open5gs  26844  0.0  0.0 1237524 14084 ?       Ssl  12:13   0:00 /usr/bin/open5gs-sgwud -c /etc/open5gs/sgwu.yaml
+open5gs  26934  0.0  0.0 707472 12732 ?        Ssl  12:13   0:00 /usr/bin/open5gs-upfd -c /etc/open5gs/upf.yaml
+open5gs  27244  0.2  0.0 2861424 13584 ?       Ssl  12:13   0:00 /usr/bin/open5gs-hssd -c /etc/open5gs/hss.yaml
+open5gs  27366  0.0  0.0 2890772 14380 ?       Ssl  12:13   0:00 /usr/bin/open5gs-pcrfd -c /etc/open5gs/pcrf.yaml
+open5gs  27485  0.0  0.0 243816 15064 ?        Ssl  12:13   0:00 /usr/bin/open5gs-nrfd -c /etc/open5gs/nrf.yaml
+open5gs  27543  0.0  0.0 222416  9672 ?        Ssl  12:13   0:00 /usr/bin/open5gs-ausfd -c /etc/open5gs/ausf.yaml
+open5gs  27600  0.0  0.0 222328  9668 ?        Ssl  12:13   0:00 /usr/bin/open5gs-udmd -c /etc/open5gs/udm.yaml
+open5gs  27697  0.0  0.0 243976 13716 ?        Ssl  12:13   0:00 /usr/bin/open5gs-udrd -c /etc/open5gs/udr.yaml
 ```
 
-You should see each of the services above, PGW, SGW, HSS, PCRF & MME all running. 
+You should see each of the above services, MME, SGW-C, SMF, AMF, SGW-U, UPF, HSS, PCRF, NRF, AUSF, UDM & UDR are all running.
 
 If your instance doesn't show this make sure you're started each service:
 ```bash
-$ systemctl start open5gs-*
+$ systemctl start open5gs-mmed.service
+$ systemctl start open5gs-sgwcd.service
+$ systemctl start open5gs-smfd.service
+$ systemctl start open5gs-amfd.service
+$ systemctl start open5gs-sgwud.service
+$ systemctl start open5gs-upfd.service
+$ systemctl start open5gs-hssd.service
+$ systemctl start open5gs-pcrfd.service
+$ systemctl start open5gs-nrfd.service
+$ systemctl start open5gs-ausfd.service
+$ systemctl start open5gs-udmd.service
+$ systemctl start open5gs-udrd.service
 ```
 
 #### Finding out why a Service isn't Starting
 
-If a service isn't running check the log for that service - logs for each service live in */var/log/open5gs/* where each service logs to it's own file - MME logs in mme.log, PGW logs in pgw.log, and so on. 
+If a service isn't running check the log for that service - logs for each service live in */var/log/open5gs/* where each service logs to it's own file - MME logs in mme.log, AMF logs in amf.log, and so on. 
 
 ```bash
 $ cat /var/log/open5gs/mme.log
@@ -37,7 +54,7 @@ Open5GS daemon v1.0.0
 
 [app] INFO: Configuration: '/etc/open5gs/mme.yaml' (../src/main.c:54)
 [app] INFO: File Logging: '/var/log/open5gs/mme.log' (../src/main.c:57)
-[mme] ERROR: No sgw.gtpc in '/etc/open5gs/mme.yaml' (../src/mme/mme-context.c:192)
+[mme] ERROR: No sgwc.gtpc in '/etc/open5gs/mme.yaml' (../src/mme/mme-context.c:192)
 [app] ERROR: Failed to intialize MME (../src/mme/app-init.c:30)
 [app] FATAL: Open5GS initialization failed. Aborted (../src/main.c:222)
 ```
@@ -48,38 +65,38 @@ Or, you can use `journalctl` like below to view live log.
 $ journalctl -u open5gs-mmed.service --since today -f
 ```
 
-In the example above we can see the error - no SGW GTPC address is configured in the mme.yaml file, meaning Open5GS MME is failing to start.
+In the example above we can see the error - no SGW-C GTP-C address is configured in the mme.yaml file, meaning Open5GS MME is failing to start.
 
 The errors you experience may be different, but if a service is failing to start it's most often due to a misconfiguration issue in one or more of the Open5GS *.yaml* configuration files. The log should tell you which section of the yaml file is missing or invalid.
 
 
-## eNB Connection Issues
+## gNB/eNB Connection Issues
 ---
-When a UE connects to Open5GS MME the log shows the presence of a new S1AP connection the log at */var/log/open5gs/mme.log*:
+When a UE connects to Open5GS AMF/MME the log shows the presence of a new NGAP/S1AP connection the log at */var/log/open5gs/mme.log*:
 
-##### No S1AP Connection
-If you're not seeing any S1AP connection attempts check the eNB can contact the IP the MME is on (No firewall / ACLs etc blocking) and that SCTP Traffic is able to be carried across your transmission network. 
+##### No NGAP/S1AP Connection
+If you're not seeing any NGAP/S1AP connection attempts check the gNB/eNB can contact the IP the AMF/MME is on (No firewall / ACLs etc blocking) and that SCTP Traffic is able to be carried across your transmission network. 
 
-**Note:** 3GPP defines SCTP as the transport protocol for S1-AP/S1-CP traffic (not TCP/UDP). Not all devices / routers support S1AP, particularly over the Internet.
+**Note:** 3GPP defines SCTP as the transport protocol for NGAP/S1AP traffic (not TCP/UDP). Not all devices / routers support NGAP/S1AP, particularly over the Internet.
 
 If you're confident the service is running and connectivity is able to be established across your transmission network, you should see the *SCTP INIT* packets in Wireshark. If you're not seeing these packets go back and check your network.
 
-If you are seeing the SCTP INIT messages and seeing an ABORT after each one, that suggests the SCTP connection is trying to be established. Check that the MME service is started and listening on the interface / IP you're sending traffic to.
+If you are seeing the SCTP INIT messages and seeing an ABORT after each one, that suggests the SCTP connection is trying to be established. Check that the AMF/MME service is started and listening on the interface / IP you're sending traffic to.
 
-##### S1AP Connection Rejected
-If you're seeing S1AP Connection attempts but seeing them rejected by Open5GS, the S1AP message show in a packet capture will indicate the rejection reason, as well as in the mme log.
+##### NGAP/S1AP Connection Rejected
+If you're seeing NGAP/S1AP Connection attempts but seeing them rejected by Open5GS, the NGAP/S1AP message show in a packet capture will indicate the rejection reason, as well as in the mme log.
 ```
 $ tail -f /var/log/open5gs/mme.log
 [mme] INFO: eNB-S1[10.0.1.14] connection refused!!! (mme-sm.c:176)
 ```
 
-Typically S1AP connections are rejected due to one of these reasons:
-* MNC / MCC in eNB does not match *gummei* and *tai* MCC/MNC pair in (mme.yaml*.
-* Tracking Area Code does not match configured TACs in *mme.yaml*.
+Typically NGAP/S1AP connections are rejected due to one of these reasons:
+* MNC / MCC in gNB/eNB does not match *guami/gummei* and *tai* MCC/MNC pair in amf.yaml/mme.yaml*.
+* Tracking Area Code does not match configured TACs in *amf.yaml/mme.yaml*.
 
-Each of these can be addressed by editing the relevant section in the MME config in */etc/open5gs/mme.yaml*
+Each of these can be addressed by editing the relevant section in the AMF/MME config in */etc/open5gs/amf.yaml* OR */etc/open5gs/mme.yaml*
 
-__Example of sucesful eNB connection to MME:__
+__Example of successful eNB connection to MME:__
 ```
 $ tail -f /var/log/open5gs/mme.log
 [mme] INFO: eNB-S1 accepted[10.0.1.14]:3223 in s1_path module (s1ap-lkpath.c:70)
@@ -92,42 +109,42 @@ If your network is setup there are a variety of reasons your network may not per
 
 #### UE cannot See Network
 If while scanning for the networks on your UE / Phone you're not seeing your network, there's a few things to check:
-* Check your eNB is connected to the MME
-* Check the eNB status
+* Check your gNB/eNB is connected to the AMF/MME
+* Check the gNB/eNB status
 * Check the UE you are scanning with is capable of working on the frequencies / bands and duplex mode (TDD or FDD) used by the UE
-* Check UE is within range of eNB
+* Check UE is within range of gNB/eNB
 * Check PLMN is not forbidden on USIM (F-PLMN List)
 
-#### UE Fails to Attach to the Network
+#### UE Fails to Register/Attach to the Network
 Assuming while scanning for networks the UE can see the network, but not connect, the most common issues stem from Authentication.
 
-LTE/E-UTRAN employs *Mutual Authentication* of both the network and the subscriber. This means the credentials in the HSS must match the credentials on the USIM and the credentials in the USIM must match those in the HSS. This means unlike GSM, you cannot use just any SIM and disable crypto, you have to know the details on the USIM or be able to program this yourself in order to authenticate.
+NR/LTE employs *Mutual Authentication* of both the network and the subscriber. This means the credentials in the UDM/HSS must match the credentials on the USIM and the credentials in the USIM must match those in the UDM/HSS. This means unlike GSM, you cannot use just any SIM and disable crypto, you have to know the details on the USIM or be able to program this yourself in order to authenticate.
 
-If the issue is authentication, the mme and hss log will give you an indication as to which side is rejecting the authentication, the UE or the Network (Open5GS);
+If the issue is authentication, the amf/mme and udm/hss log will give you an indication as to which side is rejecting the authentication, the UE or the Network (Open5GS);
 
-__IMSI/Subscriber not present in HSS:__
-If the USIM's IMSI is not present in the HSS the HSS will reject the Authentication.
+__IMSI/Subscriber not present in UDM/HSS:__
+If the USIM's IMSI is not present in the UDM/HSS the UDM/HSS will reject the Authentication.
 
 ```
 $ tail -f /var/log/open5gs/hss.log
 [hss] WARNING: Cannot find IMSI in DB : 001000000000001 (hss-context.c:309)
 ```
 
-__IMSI/Subscriber configured in HSS with wrong credentails:__
-If the credentials on the HSS do not match what is configured on the USIM, the USIM will reject the connection (MAC Error).
+__IMSI/Subscriber configured in UDM/HSS with wrong credentails:__
+If the credentials on the UDM/HSS do not match what is configured on the USIM, the USIM will reject the connection (MAC Error).
 
 ```
 $ tail -f /var/log/open5gs/mme.log
 [emm] WARNING: Authentication failure(MAC failure) (emm-sm.c:573)
 ```
 
-__APN Requested by UE not present in HSS:__
-Ensure the APNs requested by the UE are present in the HSS.
+__DNN/APN Requested by UE not present in UDM/HSS:__
+Ensure the DNNs/APNs requested by the UE are present in the UDM/HSS.
 
 
-#### UE shows "4G" or "LTE" Connection but has no IP Connectivity to the outside World
-If your device shows as connected (Includes LTE/4G symbol) there are a few simple things to check to diagnose connectivity issues:
-* The PGW can contact the outside world (Can resolve DNS, browse, etc)
+#### UE shows "5G" or "LTE" Connection but has no IP Connectivity to the outside World
+If your device shows as connected (Includes 5G/LTE symbol) there are a few simple things to check to diagnose connectivity issues:
+* The UPF can contact the outside world (Can resolve DNS, browse, etc)
 * Check if the interface connected to the internet is correctly `NAT` with the `ogstun` interface.
    - Ensure that the packets in the `INPUT` chain to the `ogstun` interface are accepted 
    ```
@@ -143,7 +160,7 @@ If your device shows as connected (Includes LTE/4G symbol) there are a few simpl
 ## Further Debugging
 ---
 
-Problem with Open5GS can be filed as [GitHub Issues](https://github.com/open5gs/open5gs/issues). Please include the following to get help:
+Problem with Open5GS can be filed as [GitHub Issues](https://github.com/{{ site.github_username }}/open5gs/issues). Please include the following to get help:
 
 - Attach `*.pcapng` file created by wireskark.
 - Attach configuration files at `/etc/open5gs/*.yaml`.
@@ -152,22 +169,22 @@ Problem with Open5GS can be filed as [GitHub Issues](https://github.com/open5gs/
 You can modify the configuration file to record more logs.
 
 ```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
-@@ -2,6 +2,7 @@
-
+$ diff -u /etc/open5gs/amf.yaml.old /etc/open5gs/amf.yaml
+--- amf.yaml.old	2020-08-22 12:26:56.132213488 -0400
++++ amf.yaml	2020-08-22 12:27:04.135901201 -0400
+@@ -20,6 +20,7 @@
+ #
  logger:
-     file: /var/log/open5gs/mme.log
+     file: /home/acetcom/Documents/git/open5gs/install/var/log/open5gs/amf.log
 +    level: debug
-
- parameter:
+ #
+ # amf:
+ #
 ```
 
 After changing conf files, please restart Open5GS daemons.
 
 ```bash
-$ sudo systemctl restart open5gs-mmed
-$ sudo systemctl restart open5gs-sgwd
+$ sudo systemctl restart open5gs-amfd.service
 ```
 

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

@@ -3,98 +3,126 @@ title: Now in the Github Issue
 head_inline: "<style> .blue { color: blue; } </style>"
 ---
 
-#### Test failed (e.g. `meson test`)
+#### How to change UE IP Pool
 
-Sometimes you may get a message like the one below due to a problem with the freeDiameter library.
+The Open5GS package contains a systemd-networkd configuration file for `ogstun`. Therefore, you must first modify the configuration file as follows.
+
+```diff
+$ diff -u /etc/systemd/network/99-open5gs.network /etc/systemd/network/99-open5gs.network.new
+--- /etc/systemd/network/99-open5gs.network	2020-09-17 09:29:09.137392040 -0400
++++ /etc/systemd/network/99-open5gs.network.new	2020-09-17 09:29:03.375719620 -0400
+@@ -2,5 +2,5 @@
+ Name=ogstun
+
+ [Network]
+-Address=10.45.0.1/16
++Address=10.46.0.1/16
+ Address=cafe::1/64
+```
+
+Restart systemd-networkd
+```
+$ sudo systemctl restart systemd-networkd
+```
+
+Now, you need to modify the configuration file of Open5GS to adjust the UE IP Pool. UE IP Pool can be allocated by SMF or UPF, but in this tutorial, we will modify both configuration files.
+
+```diff
+$ diff -u smf.yaml smf.yaml.new
+--- smf.yaml	2020-09-17 09:31:16.547882093 -0400
++++ smf.yaml.new	2020-09-17 09:32:18.267726844 -0400
+@@ -190,7 +190,7 @@
+       - addr: 127.0.0.4
+       - addr: ::1
+     pdn:
+-      - addr: 10.45.0.1/16
++      - addr: 10.46.0.1/16
+       - addr: cafe::1/64
+     dns:
+       - 8.8.8.8
+```
+
+```diff
+$ diff -u upf.yaml upf.yaml.new
+--- upf.yaml	2020-09-17 09:31:16.547882093 -0400
++++ upf.yaml.new	2020-09-17 09:32:25.199619989 -0400
+@@ -139,7 +139,7 @@
+     gtpu:
+       - addr: 127.0.0.7
+     pdn:
+-      - addr: 10.45.0.1/16
++      - addr: 10.46.0.1/16
+       - addr: cafe::1/64
+
+ #
+```
+
+Restart SMF/UPF
+```
+$ sudo systemctl restart open5gs-smfd.service
+$ sudo systemctl restart open5gs-upfd.service
+```
+
+#### Wireshark cannot decode NAS-5GS
+
+By default, wireshark cannot decode NAS-5GS message when the security header type is "Integrity protected and ciphered".
+
+![Wireshark cannot decode]({{ site.url }}{{ site.baseurl }}/assets/images/wireshark_cannot_decode_nas_5gs.png){: height="100%" width="100%"}
+
+You need to turn on "Try to detect and decode 5G-EA0 ciphered messages" in the wireshark perference menu.
+
+![Wireshark perference]({{ site.url }}{{ site.baseurl }}/assets/images/wireshark_preference.png){: height="100%" width="100%"}
+
+Now, you can see the NAS-5GS message in the wireshark.
+
+![Wireshark can decode]({{ site.url }}{{ site.baseurl }}/assets/images/wireshark_can_decode_nas_5gs.png){: height="100%" width="100%"}
+
+#### Test failed (e.g. `meson test -v`)
+
+If MongoDB server is not started, you may get a message like this:
 
 ```
-$ meson test
+$ meson test -v
 
 ...
-5/8 open5gs:epc / simple                    OK       7.69 s
-
---- command ---
-08:06:23 /home/parallels/open5gs/build/tests/epc/simple
---- stdout ---
-s1setup-test        :  SUCCESS
-attach-test         :  SUCCESS
-volte-test          :  SUCCESS
-handover-test       :  SUCCESS
-crash-test          :  SUCCESS
-All tests passed.
--------
-
-6/8 open5gs:system / mnc3                   FAIL    12.80 s (exit status 1)
-
---- command ---
-08:06:31 /home/parallels/open5gs/build/tests/mnc3/mnc3
---- stdout ---
-mnc3-test           :  ERROR: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:112 ROUTING ERROR 'No remaining suitable candidate to route the message to' for:  (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113      'Credit-Control-Request' (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113        Version: 0x01 (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113        Length: 20 (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113        Flags: 0xC0 (RP--) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113        Command Code: 272 (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113        ApplicationId: 16777238 (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113        Hop-by-Hop Identifier: 0x00000000 (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113        End-to-End Identifier: 0x2875502B (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         {internal data}: src:(nil)(0) rwb:(nil) rt:0 cb:0x564527642502,(nil)(0x7f71a86df418) qry:(nil) asso:0 sess:0x7f7158001140 (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'Session-Id'(263) l=8 f=-M val="pgw.localdomain;1585209991;1;app_gx" (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'Origin-Host'(264) l=8 f=-M val="pgw.localdomain" (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'Origin-Realm'(296) l=8 f=-M val="localdomain" (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'Destination-Realm'(283) l=8 f=-M val="localdomain" (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'Auth-Application-Id'(258) l=12 f=-M val=16777238 (0x1000016) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'CC-Request-Type'(416) l=12 f=-M val='INITIAL_REQUEST' (1 (0x1)) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'CC-Request-Number'(415) l=12 f=-M val=0 (0x0) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'Subscription-Id'(443) l=8 f=-M val=(grouped) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113            AVP: 'Subscription-Id-Type'(450) l=12 f=-M val='END_USER_IMSI' (1 (0x1)) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113            AVP: 'Subscription-Id-Data'(444) l=8 f=-M val="310014987654004" (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'Supported-Features'(628) vend='3GPP'(10415) l=12 f=V- val=(grouped) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113            AVP: 'Feature-List-ID'(629) vend='3GPP'(10415) l=16 f=V- val=1 (0x1) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113            AVP: 'Feature-List'(630) vend='3GPP'(10415) l=16 f=V- val=11 (0xb) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'Network-Request-Support'(1024) vend='3GPP'(10415) l=16 f=VM val=1 (0x1) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'Framed-IP-Address'(8) l=8 f=-M val=<0A 2D 00 02> (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'IP-CAN-Type'(1027) vend='3GPP'(10415) l=16 f=VM val=5 (0x5) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'RAT-Type'(1032) vend='3GPP'(10415) l=16 f=V- val=1004 (0x3ec) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'QoS-Information'(1016) vend='3GPP'(10415) l=12 f=VM val=(grouped) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113            AVP: 'APN-Aggregate-Max-Bitrate-UL'(1041) vend='3GPP'(10415) l=16 f=V- val=1024000000 (0x3d090000) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113            AVP: 'APN-Aggregate-Max-Bitrate-DL'(1040) vend='3GPP'(10415) l=16 f=V- val=1024000000 (0x3d090000) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'Default-EPS-Bearer-QoS'(1049) vend='3GPP'(10415) l=12 f=V- val=(grouped) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113            AVP: 'QoS-Class-Identifier'(1028) vend='3GPP'(10415) l=16 f=VM val=9 (0x9) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113            AVP: 'Allocation-Retention-Priority'(1034) vend='3GPP'(10415) l=12 f=V- val=(grouped) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113               AVP: 'Priority-Level'(1046) vend='3GPP'(10415) l=16 f=V- val=15 (0xf) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113               AVP: 'Pre-emption-Capability'(1047) vend='3GPP'(10415) l=16 f=V- val=1 (0x1) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113               AVP: 'Pre-emption-Vulnerability'(1048) vend='3GPP'(10415) l=16 f=V- val=0 (0x0) (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: '3GPP-User-Location-Info'(22) vend='3GPP'(10415) l=12 f=VM val=<82 13 00 41 00 33 13 00 41 08 D0 1B 78> (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: '3GPP-MS-TimeZone'(23) vend='3GPP'(10415) l=12 f=VM val=<23 00> (../lib/diameter/common/init.c:116)
-: ../subprojects/freeDiameter/extensions/dbg_msg_dumps/dbg_msg_dumps.c:113         AVP: 'Called-Station-Id'(30) l=8 f=-M val=<73 74 61 72 65 6E 74 2E 63 6F 6D> (../lib/diameter/common/init.c:116)
-: no_CC-Request-Number (../src/pgw/pgw-fd-path.c:505)
-/home/parallels/open5gs/build/src/pgw/../../lib/core/libogscore.so.1(ogs_abort+0x2e)[0x7f71abdbdbf8]
-/home/parallels/open5gs/build/src/pgw/open5gs-pgwd(+0x1cb8f)[0x564527642b8f]
-/home/parallels/open5gs/build/src/pgw/../../subprojects/freeDiameter/libfdcore/libfdcore.so.7(+0x492d7)[0x7f71ab7702d7]
-/home/parallels/open5gs/build/src/pgw/../../subprojects/freeDiameter/libfdcore/libfdcore.so.7(+0x4cb63)[0x7f71ab773b63]
-/home/parallels/open5gs/build/src/pgw/../../subprojects/freeDiameter/libfdcore/libfdcore.so.7(+0x4ccef)[0x7f71ab773cef]
-/lib/x86_64-linux-gnu/libpthread.so.0(+0x76db)[0x7f71aae686db]
-/lib/x86_64-linux-gnu/libc.so.6(clone+0x3f)[0x7f71aab9188f]
-03/26 16:06:43.674ERROR: GTP Timeout : IMSI[310014987654004] Message-Type[32] (../src/sgw/sgw-s11-handler.c:39)
-FAILED 1 of 1
-Failed Tests   		Total	Fail	Failed %
-===================================================
-mnc3-test      		    1	   1	100.00%
---- stderr ---
-03/26 16:06:43.681: [ERROR: GTP Timeout : IMSI[310014987654004] Message-Type[32] (../src/mme/mme-gtp-path.c:110)
-Line 202: Condition is false, but expected true
--------
-
-7/8 open5gs:system / volte                  FAIL    10.57 s (killed by signal 6 SIGABRT)
-
+4/10 open5gs:unit / unit OK 0.06 s
+09/30 01:12:37.829: [core] FATAL: test_5gc_init: Assertion ogs_dbi_init(ogs_app()->db_uri) == OGS_OK' failed. (../tests/app/5gc-init.c:100)
+09/30 01:12:37.830: [core] FATAL: backtrace() returned 8 addresses (../lib/core/ogs-abort.c:37)
+/home/open5gs/build/tests/registration/registration(+0x1bfd0) [0x55af96a05fd0]
+/home/open5gs/build/tests/registration/registration(+0x3c2e) [0x55af969edc2e]
+/home/open5gs/build/tests/registration/registration(+0x25151) [0x55af96a0f151]
+/home/open5gs/build/tests/registration/registration(+0x251a5) [0x55af96a0f1a5]
+/home/open5gs/build/tests/registration/registration(+0x3cde) [0x55af969edcde]
+/lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xe7) [0x7f3c2bb97b97]
+/home/open5gs/build/tests/registration/registration(+0x39aa) [0x55af969ed9aa]
+5/10 open5gs:5gc / registration FAIL 0.27 s
+09/30 01:12:38.073: [core] FATAL: test_epc_init: Assertion ogs_dbi_init(ogs_app()->db_uri) == OGS_OK' failed. (../tests/app/epc-init.c:105)
+09/30 01:12:38.073: [core] FATAL: backtrace() returned 8 addresses (../lib/core/ogs-abort.c:37)
+/home/open5gs/build/tests/attach/attach(+0x12362) [0x55ef42081362]
+/home/open5gs/build/tests/attach/attach(+0x367e) [0x55ef4207267e]
+/home/open5gs/build/tests/attach/attach(+0x1b4e3) [0x55ef4208a4e3]
+/home/open5gs/build/tests/attach/attach(+0x1b537) [0x55ef4208a537]
+/home/open5gs/build/tests/attach/attach(+0x372e) [0x55ef4207272e]
+/lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xe7) [0x7f10b2e30b97]
+/home/open5gs/build/tests/attach/attach(+0x33fa) [0x55ef420723fa]
+6/10 open5gs:epc / attach FAIL 0.17 s
+09/30 01:12:38.239: [core] FATAL: test_epc_init: Assertion `ogs_dbi_init(ogs_app()->db_uri) == OGS_OK' failed. (../tests/app/epc-init.c:105)
+09/30 01:12:38.239: [core] FATAL: backtrace() returned 8 addresses (../lib/core/ogs-abort.c:37)
+/home/open5gs/build/tests/volte/volte(+0x22272) [0x555df9643272]
+/home/open5gs/build/tests/volte/volte(+0x1210a) [0x555df963310a]
+/home/open5gs/build/tests/volte/volte(+0x2b3f3) [0x555df964c3f3]
+/home/open5gs/build/tests/volte/volte(+0x2b447) [0x555df964c447]
+/home/open5gs/build/tests/volte/volte(+0x12221) [0x555df9633221]
+/lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xe7) [0x7fd1df6b6b97]
+/home/open5gs/build/tests/volte/volte(+0x4daa) [0x555df9625daa]
+7/10 open5gs:epc / volte FAIL 0.17 s
 ...
 ```
 
-I cannot solve the problem exactly at this point.
+Please make sure that MongoDB server daemon is running.
 {: .blue}
 
-Remove all subscriber information using MongoDB Client
+Then, remove all subscriber information using MongoDB Client
 ```
 $ mongo
 > use open5gs
@@ -107,40 +135,109 @@ switched to db open5gs
 Kill all processes.
 ```bash
 $ ps -ef | grep open5gs
+$ sudo pkill -9 open5gs-mmed
+$ sudo pkill -9 open5gs-sgwcd
+$ sudo pkill -9 open5gs-smfd
+$ sudo pkill -9 open5gs-amfd
+$ sudo pkill -9 open5gs-sgwud
+$ sudo pkill -9 open5gs-upfd
 $ sudo pkill -9 open5gs-hssd
 $ sudo pkill -9 open5gs-pcrfd
-$ sudo pkill -9 open5gs-pgwd
-$ sudo pkill -9 open5gs-sgwd
-$ sudo pkill -9 open5gs-mmed
+$ sudo pkill -9 open5gs-nrfd
+$ sudo pkill -9 open5gs-ausfd
+$ sudo pkill -9 open5gs-udmd
+$ sudo pkill -9 open5gs-udrd
 ```
 
-Run `meson test` again
+Run `meson test -v` again
 ```
-$ meson test
-ninja: Entering directory `/Users/acetcom/Documents/git/open5gs/build'
+$ meson test -v
+ninja: Entering directory `/home/acetcom/Documents/git/open5gs/build'
 ninja: no work to do.
-1/8 open5gs:unit / core                     OK       6.93 s
-2/8 open5gs:unit / crypt                    OK       0.08 s
-3/8 open5gs:system / sctp                   OK       1.09 s
-4/8 open5gs:unit / unit                     OK       0.04 s
-5/8 open5gs:epc / simple                    OK       5.07 s
-6/8 open5gs:epc / mnc3                      OK       1.18 s
-7/8 open5gs:epc / volte                     OK       2.99 s
-8/8 open5gs:epc / csfb                      OK       6.53 s
+list-test           : SUCCESS
+pool-test           : SUCCESS
+strings-test        : SUCCESS
+time-test           : SUCCESS
+conv-test           : SUCCESS
+log-test            : SUCCESS
+pkbuf-test          : SUCCESS
+memory-test         : SUCCESS
+rbtree-test         : SUCCESS
+timer-test          : SUCCESS
+thread-test         : SUCCESS
+socket-test         : SUCCESS
+queue-test          : SUCCESS
+poll-test           : SUCCESS
+tlv-test            : SUCCESS
+fsm-test            : SUCCESS
+hash-test           : SUCCESS
+uuid-test           : SUCCESS
+All tests passed.
+ 1/10 open5gs:unit / core                     OK       6.89 s
+aes-test            : SUCCESS
+sha-test            : SUCCESS
+base64-test         : SUCCESS
+All tests passed.
+ 2/10 open5gs:unit / crypt                    OK       0.12 s
+sctp-test           : SUCCESS
+All tests passed.
+ 3/10 open5gs:app / sctp                      OK       0.02 s
+s1ap-message-test   : SUCCESS
+nas-message-test    : SUCCESS
+gtp-message-test    : SUCCESS
+sbi-message-test    : SUCCESS
+security-test       : SUCCESS
+crash-test          : SUCCESS
+All tests passed.
+ 4/10 open5gs:unit / unit                     OK       0.03 s
+guti-test           : SUCCESS
+auth-test           : SUCCESS
+idle-test           : SUCCESS
+dereg-test          : SUCCESS
+identity-test       : SUCCESS
+gmm-status-test     : SUCCESS
+ue-context-test     : SUCCESS
+All tests passed.
+ 5/10 open5gs:5gc / registration              OK       4.98 s
+s1setup-test        : SUCCESS
+guti-test           : SUCCESS
+auth-test           : SUCCESS
+idle-test           : SUCCESS
+emm-status-test     : SUCCESS
+reset-test          : SUCCESS
+ue-context-test     : SUCCESS
+All tests passed.
+ 6/10 open5gs:epc / attach                    OK       4.68 s
+bearer-test         : SUCCESS
+session-test        : SUCCESS
+rx-test             : SUCCESS
+All tests passed.
+ 7/10 open5gs:epc / volte                     OK       4.33 s
+mo-idle-test        : SUCCESS
+mt-idle-test        : SUCCESS
+mo-active-test      : SUCCESS
+mt-active-test      : SUCCESS
+mo-sms-test         : SUCCESS
+mt-sms-test         : SUCCESS
+crash-test          : SUCCESS
+All tests passed.
+ 8/10 open5gs:epc / csfb                      OK       4.08 s
+epc-test            : SUCCESS
+All tests passed.
+ 9/10 open5gs:app / 310014                    OK       2.37 s
+epc-x2-test         : SUCCESS
+epc-s1-test         : SUCCESS
+All tests passed.
+10/10 open5gs:app / handover                  OK       4.78 s
 
-Ok:                    8
+Ok:                   10
 Expected Fail:         0
 Fail:                  0
 Unexpected Pass:       0
 Skipped:               0
 Timeout:               0
-
-Full log written to /Users/acetcom/Documents/git/open5gs/build/meson-logs/testlog.txt
 ```
 
-**Note:** If your test result more than once is same as above, there should be no problem with code you modified.
-{: .notice--danger}
-
 #### Is it possible to setup IP/NAT table along with Docker?
 
 Enable IP Forward.
@@ -255,64 +352,70 @@ $ 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
 ```
 
-#### How to use a different APN for each PGW
+#### How to use a different APN for each SMF
 
-By default, MME selects the PGW as 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 each UE, you can use a specific PGW node for each UE.
+By default, MME selects the SMF as 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.
 
 See the following example.
 
 ```
-### For reference, see `pgw.yaml`
-#------------------------ MME --------------------------
+### For reference, see `smf.yaml`
 #
-#  o Two PGW are defined. 127.0.0.3:2123 is used.
-#    [fe80::3%lo]:2123 is ignored.
+# smf:
+#
+#  <GTP-C Client>
+#
+#  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 SMF are defined. 127.0.0.4:2123 is used.
+#    [fe80::3%@loopback_devname@]:2123 is ignored.
 #    gtpc:
-#      - addr: 127.0.0.3
-#      - addr: fe80::3%lo
+#      - addr: 127.0.0.4
+#      - addr: fe80::3%@loopback_devname@
 #
-#  o One PGW is defined. if prefer_ipv4 is not true,
-#    [fe80::3%lo] is selected.
+#  o One SMF is defined. if prefer_ipv4 is not true,
+#    [fe80::3%@loopback_devname@] is selected.
 #    gtpc:
 #      - addr:
-#        - 127.0.0.3
-#        - fe80::3%lo
+#        - 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
-#
 ```
 
 The IP address of the UE can also use a different UE pool depending on the APN.
 
 ```
-### For reference, see `pgw.yaml`
-#
-#  <UE Pool>
+### For reference, see `smf.yaml`
+#  <PDN Configuration with UE Pool>
 #
 #  o IPv4 Pool
 #    $ sudo ip addr add 10.45.0.1/16 dev ogstun
 #
-#    ue_pool:
+#    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
 #
-#    ue_pool:
+#    pdn:
 #      - addr: 10.45.0.1/16
 #      - addr: cafe:1::1/64
 #
@@ -324,7 +427,7 @@ The IP address of the UE can also use a different UE pool depending on the APN.
 #    $ sudo ip addr add cafe:1::1/64 dev ogstun
 #    $ sudo ip addr add cafe:2::1/64 dev ogstun
 #
-#    ue_pool:
+#    pdn:
 #      - addr: 10.45.0.1/16
 #      - addr: cafe:1::1/64
 #      - addr: 10.46.0.1/16
@@ -338,7 +441,7 @@ The IP address of the UE can also use a different UE pool depending on the APN.
 #    $ sudo ip addr add 10.46.0.1/16 dev ogstun3
 #    $ sudo ip addr add cafe:2::1/64 dev ogstun3
 #
-#    ue_pool:
+#    pdn:
 #      - addr: 10.45.0.1/16
 #      - addr: cafe:1::1/64
 #        dev: ogstun2
@@ -349,6 +452,33 @@ The IP address of the UE can also use a different UE pool depending on the APN.
 #        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
+#
 ```
 
 #### Failing to run `./open5gs-mmed`
@@ -385,11 +515,11 @@ You can start MongoDB using systemctl.
 $ sudo systemctl start mongodb
 ```
 
-#### I have some error when running `./build/test/epc/simple`
+#### I have some error when running `./build/tests/attach/attach`
 
-Did you see the following error after executing `./build/test/epc/simple`?
+Did you see the following error after executing `./build/tests/attach/attach`?
 ```bash
-$ ./build/test/epc/simple
+$ ./build/tests/attach/attach
 s1setup_test        : SUCCESS  
 attach_test         : -Line 134: Condition is false, but expected true  
 \04/09 15:49:09.285: [esm] FATAL: esm_handle_pdn_connectivity_request: Assertion `SECURITY_CONTEXT_IS_VALID(mme_ue)' failed. (esm_handler.c:29)  
@@ -409,29 +539,29 @@ $ mongo
 
 Kill all processes.
 ```bash
-$ ps -ef | grep simple
+$ ps -ef | grep attach
 $ ps -ef | grep open5gs
-$ sudo pkill -9 simple
+$ sudo pkill -9 attach
 $ sudo pkill -9 open5gs-mmed ...
 ```
 
-Execute `./build/test/epc/simple`
+Execute `./build/tests/attach/attach`
 ```bash
-$ ./build/test/epc/simple
+$ ./build/tests/attach/attach
 ```
 
-#### My eNB does not support IPv6.
+#### My gNB/eNB does not support IPv6.
 
 Your eNodeB don't have to support IPv6.
 
-If the sgw.gtpu configuration does not have an IPv6 address, the eNodeB can use IPv4 to connect to the MME and SGW. If the sgw.gtpu setting has an IPv6 address, you can disable the IPv6 address as shown below.
+If the sgwu.gtpu configuration does not have an IPv6 address, the gNB/eNB can use IPv4 to connect to the MME and SGW-U. If the sgwu.gtpu setting has an IPv6 address, you can disable the IPv6 address as shown below.
 
 ```yaml
 parameter:
     no_ipv6: true
 ```
 
-**Note:** This parameter `no_ipv6` is only applied to EPC Elements such as MME, SGW, and so on. The parameter `no_ipv6` does not affect to UE. So, IPv6-enabled UE can connect to Open5GS LTE network.
+**Note:** This parameter `no_ipv6` is only applied to NFs such as AMF, MME, SGW-C, and so on. The parameter `no_ipv6` does not affect to UE. So, IPv6-enabled UE can connect to Open5GS LTE network.
 {: .notice--warning}
 
 #### Unable to add new user by WebUI 
@@ -470,45 +600,55 @@ Currently, the number of UE is limited to `128*128`.
 - Network
 
 ```
-* MME
-  S1AP: listen on all address avaiable in system
-  GTP-C: listen on the first IP address in system
-  DIAMETER: 127.0.0.2 (No TLS)
+* MongoDB : 127.0.0.1
+* MME : 127.0.0.2
+* SGW-C : 127.0.0.3
+* SMF : 127.0.0.4
+* AMF : 127.0.0.5
+* SGW-U : 127.0.0.6
+* UPF : 127.0.0.7
+* HSS : 127.0.0.8
+* PCRF : 127.0.0.9
+* NRF : 127.0.0.10
+* AUSF : 127.0.0.11
+* UDM : 127.0.0.12
+* UDR : 127.0.0.13
+```
 
-* SGW
-  GTP-C: 127.0.0.2
-  GTP-U: listen on the first IP address in system
+- AMF_ID, TAC and S_NSSAI
 
-* PGW
-  GTP-C: Both 127.0.0.3 and [::1]
-  GTP-U: Both 127.0.0.3 and [::1]
-  DIAMETER: 127.0.0.3 (No TLS)
+```
+* AMF_ID
+  PLMN ID - MNC: 901, MCC: 70
+  Region : 2
+  Set : 1
 
-* HSS
-  DIAMETER: 127.0.0.4 (No TLS)
+* TAI
+  PLMN ID - MNC: 901, MCC: 70
+  TAC : 1
 
-* PCRF
-  DIAMETER: 127.0.0.5 (No TLS)
+* S_NSSASI
+  SST : 1
 ```
 
 - GUMMEI, PLMN and TAC
 
 ```
 * GUMMEI
-  PLMN ID - MNC: 001, MCC: 01
+  PLMN ID - MNC: 901, MCC: 70
   MME Group : 2
   MME Code : 1
 
 * TAI
-  PLMN ID - MNC: 001, MCC: 01
-  TAC : 12345
+  PLMN ID - MNC: 901, MCC: 70
+  TAC : 1
 ```
 
 - Security
 
 ```
-* Integrity : EIA1 - Snow 3G
-* Ciphering : EEA0 - Nothing
+* Integrity : NIA1/EIA1 - Snow 3G
+* Ciphering : NEA0/EEA0 - Nothing
 ```
 
 - UE Network
@@ -547,7 +687,7 @@ By default, Open5GS is designed to support the Embedding System. To do so, we in
 - We'll use Debian Docker Environment.
 
 ```bash
-$ git clone https://github.com/acetcom/open5gs
+$ git clone https://github.com/{{ site.github_username }}/open5gs
 $ cd open5gs/docker
 $ DIST=debian TAG=stretch docker-compose run dev
 ```
@@ -560,7 +700,7 @@ $ sudo apt update
 $ sudo apt install libsctp-dev:armel libyaml-dev:armel libgnutls28-dev:armel libgcrypt-dev:armel libidn11-dev:armel libssl-dev:armel libmongoc-dev:armel libbson-dev:armel
 $ sudo apt install crossbuild-essential-armel
 $ sudo apt install qemu
-$ git clone https://github.com/acetcom/open5gs
+$ git clone https://github.com/{{ site.github_username }}/open5gs
 $ cd open5gs/
 
 $ cat << EOF > cross_file.txt

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

@@ -222,32 +222,33 @@ Then proceed as follows:
   3. Fill the IMSI, security context(K, OPc, AMF), and APN of the subscriber.
   4. Click `SAVE` Button
 
-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
+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 mme.yaml.old mme.yaml
---- mme.yaml.old	2018-04-15 18:28:31.000000000 +0900
-+++ mme.yaml	2018-04-15 19:53:10.000000000 +0900
-@@ -14,18 +14,20 @@
+$ diff -u /etc/open5gs/mme.yaml.old /etc/open5gs/mme.yaml
+--- mme.yaml.old	2020-08-22 12:07:32.755250028 -0400
++++ mme.yaml	2020-08-22 12:08:17.309320211 -0400
+@@ -204,20 +204,20 @@
  mme:
-     freeDiameter: mme.conf
+     freeDiameter: /home/acetcom/Documents/git/open5gs/install/etc/freeDiameter/mme.conf
      s1ap:
+-      addr: 127.0.0.2
 +      addr: 127.0.1.100
      gtpc:
-+      addr: 127.0.1.100
+       addr: 127.0.0.2
      gummei:
        plmn_id:
--        mcc: 001
--        mnc: 01
+-        mcc: 901
+-        mnc: 70
 +        mcc: 310
 +        mnc: 789
        mme_gid: 2
        mme_code: 1
      tai:
        plmn_id:
--        mcc: 001
--        mnc: 01
--      tac: 12345
+-        mcc: 901
+-        mnc: 70
+-      tac: 1
 +        mcc: 310
 +        mnc: 789
 +      tac: 7
@@ -256,34 +257,27 @@ diff -u mme.yaml.old mme.yaml
          ciphering_order : [ EEA0, EEA1, EEA2 ]
 ```
 
-S1AP/GTP-C IP address, PLMN ID, TAC are changed as follows.
-
-```
-S1AP address : 127.0.1.100 - srsENB default value
-GTP-C address : 127.0.1.100 - Use loopback interface
-PLMN ID : MNC(310), MCC(789) - Programmed USIM with a card reader
-TAC : 7 - srsENB default value
-```
-
-
-The GTP-U IP address will be set to 127.0.0.2. To do this, 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.  
-
+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.old	2020-08-22 12:08:44.782880778 -0400
++++ sgwu.yaml	2020-08-22 12:06:49.809299514 -0400
+@@ -51,7 +51,7 @@
+ #
+ sgwu:
      gtpu:
-+      addr: 127.0.0.2
+-      addr: 10.11.0.6
++      addr: 127.0.0.6
+     pfcp:
+       addr: 127.0.0.6
 ```
 
+
 After changing conf files, please restart Open5GS daemons.
 
 ```bash
-$ sudo systemctl restart open5gs-mmed
-$ sudo systemctl restart open5gs-sgwd
+$ sudo systemctl restart open5gs-mmed.service
+$ sudo systemctl restart open5gs-sgwud.service
 ```
 
 If your phone can connect to internet, you must run the following command in Open5GS-PGW installed host. 

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

@@ -378,7 +378,7 @@ $ mysql -u root -p scscf < standard-create.sql
 $ mysql -u root -p scscf < presence-create.sql
 $ mysql -u root -p scscf < ims_usrloc_scscf-create.sql
 $ mysql -u root -p scscf < ims_dialog-create.sql
-$ mysql -u root -p scscf < ims_charging_create.sql
+$ mysql -u root -p scscf < ims_charging-create.sql
 
 $ cd /usr/local/src/kamailio/misc/examples/ims/icscf
 $ mysql -u root -p icscf < icscf.sql
@@ -740,7 +740,7 @@ Please refer to instructions at [https://open5gs.org/open5gs/docs/guide/02-build
 If you are using OpenStack, installing Open5GS and Kamailio IMS on the same machine is very important because the **Framed-IP-Address** in the AAR request via Rx interface takes received IP address and port in ims_qos module, hence, if the Open5GS is on a separate VM/machine, the IP and port received in received_ip and received_port values seen by Kamailio IMS will be the NATed IP of the Open5GS machine resulting in failing of AAR request.
 {: .notice--danger}
 
-Modify below mentioned parts of configuration files in addition to **Configure Open5GS** section. For reference, look at the configuration files at [https://github.com/herlesupreeth/Open5gs_Config](https://github.com/herlesupreeth/Open5gs_Config)
+Modify below mentioned parts of configuration files in addition to **Configure Open5GS** section. For reference, look at the configuration files at [https://github.com/herlesupreeth/Open5gs_Config](https://github.com/herlesupreeth/Open5gs_Config). These configuration only holds for open5gs tag v1.3.0, please tweak configuration files based on the open5gs tag you use.
 {: .notice--warning}
 
 - Change realm of components to `epc.mnc001.mcc001.3gppnetwork.org`
@@ -772,8 +772,6 @@ ip addr add 192.168.101.1/24 dev ogstun2
 ip addr add fd1f:76f3:da9b:0101::/64 dev ogstun2
 ip link set ogstun2 mtu 1400
 ip link set ogstun2 up
-iptables -t nat -A POSTROUTING -s 192.168.101.0/24 ! -o ogstun2 -j MASQUERADE
-ip6tables -t nat -A POSTROUTING -s fd1f:76f3:da9b:0101::/64 ! -o ogstun2 -j MASQUERADE
 iptables -I INPUT -i ogstun2 -j ACCEPT
 ip6tables -I INPUT -i ogstun2 -j ACCEPT
 ```
@@ -782,14 +780,14 @@ Add users with following APN settings in Open5GS:
 
 <pre>
 APN Configuration:
--------------------------------------------------------------------------------------------------------------------------
-| APN      | QCI | ARP | Capability | Vulnerablility | MBR DL/UL(Kbps)     | GBR DL/UL(Kbps) | PGW IP        |
--------------------------------------------------------------------------------------------------------------------------
-| internet | 9   | 8   | Disabled   | Disabled       | unlimited/unlimited |                 |               |           
--------------------------------------------------------------------------------------------------------------------------
-| ims      | 5   | 1   | Disabled   | Disabled       | 3850/1530           |                 |               |           
-|          | 1   | 2   | Enabled    | Enabled        | 128/128             | 128/128         |               |
--------------------------------------------------------------------------------------------------------------------------
+---------------------------------------------------------------------------------------------------------------------
+| APN      | Type | QCI | ARP | Capability | Vulnerablility | MBR DL/UL(Kbps)     | GBR DL/UL(Kbps) | PGW IP        |
+---------------------------------------------------------------------------------------------------------------------
+| internet | IPv4 | 9   | 8   | Disabled   | Disabled       | unlimited/unlimited |                 |               |
+---------------------------------------------------------------------------------------------------------------------
+| ims      | IPv4 | 5   | 1   | Disabled   | Disabled       | 3850/1530           |                 |               |
+|          |      | 1   | 2   | Enabled    | Enabled        | 128/128             | 128/128         |               |
+---------------------------------------------------------------------------------------------------------------------
 </pre>
 
 Finally, make sure of the following in Open5GS
@@ -873,8 +871,7 @@ $ cd /opt/OpenIMSCore
 Download:
 
 ```
-$ svn checkout svn://svn.code.sf.net/p/openimscore/code/FHoSS/trunk
-$ mv trunk FHoSS
+$ git clone https://github.com/herlesupreeth/FHoSS
 ```
 
 Compile:
@@ -1204,7 +1201,7 @@ Assuming IMSI of the user1 as 001010123456791 and MSISDN is 0198765432100 and IM
 Debug using wireshark at Open5GS machine and following wireshark display filter
 
 ```
-s1ap || gtpv2 || diameter || diameter.3gpp || sip
+s1ap || gtpv2 || pfcp || diameter || diameter.3gpp || sip
 ```
 
 Also,

docs/_includes/footer.html

@@ -14,7 +14,6 @@
             </li>
             {% if site.email %}
               <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
-              <li><i><font size="2">(Please do not mail me directly for technical support. Instead, use <a href="https://github.com/{{ site.github_username }}/open5gs/issues">GitHub Issues</a>.)</font></i></li>
             {% endif %}
         </ul>
       </div>