feat: Add dedicated QoS flow

open5gs · Jan 1, 2021 · 235a041 · 235a041
1 parent 65aea5e
commit 235a041
Show file tree

Hide file tree

Showing 205 changed files with 6,038 additions and 3,816 deletions.
diff --git a/README.md b/README.md
@@ -38,9 +38,13 @@ If you find Open5GS useful for work, please consider supporting this Open Source
 
 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.
 
-## Technical Discussion
+## Community
 
-Problem with Open5GS can be filed as [issues](https://github.com/open5gs/open5gs/issues) in this repository. Voice and text chat are available in Open5GS's [Discord](https://discordapp.com/) workspace. Use [this link](https://discord.gg/GreNkuc) to get started.
+Problem with Open5GS can be filed as [issues](https://github.com/open5gs/open5gs/issues) in this repository.
+
+Other topics related to this project are happening on the [discussions](https://github.com/open5gs/open5gs/discussions).
+
+Voice and text chat are available in Open5GS's [Discord](https://discordapp.com/) workspace. Use [this link](https://discord.gg/GreNkuc) to get started.
 
 ## Contributing
 

diff --git a/configs/310014.yaml.in b/configs/310014.yaml.in
@@ -9,6 +9,7 @@ parameter:
 #    no_upf: true
 #    no_ausf: true
 #    no_udm: true
+#    no_pcf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true

diff --git a/configs/csfb.yaml.in b/configs/csfb.yaml.in
@@ -9,6 +9,7 @@ parameter:
 #    no_upf: true
 #    no_ausf: true
 #    no_udm: true
+#    no_pcf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true
@@ -97,9 +98,9 @@ sgwc:
       - addr: 127.0.0.3
 
 smf:
-    sbi:
-      - addr: 127.0.0.4
-        port: 7777
+#    sbi:
+#      - addr: 127.0.0.4
+#        port: 7777
     gtpc:
       - addr: 127.0.0.4
       - addr: ::1
@@ -211,12 +212,12 @@ pcrf:
         - identity: smf.localdomain
           addr: 127.0.0.4
 
-nrf:
-    sbi:
-      - addr:
-        - 127.0.0.10
-        - ::1
-        port: 7777
+#nrf:
+#    sbi:
+#      - addr:
+#        - 127.0.0.10
+#        - ::1
+#        port: 7777
 
 ausf:
     sbi:

diff --git a/configs/meson.build b/configs/meson.build
@@ -38,6 +38,7 @@ example_conf = '''
     310014.yaml
     csfb.yaml
     volte.yaml
+    vonr.yaml
     minimal.yaml
     srslte.yaml
     sample.yaml

diff --git a/configs/minimal.yaml.in b/configs/minimal.yaml.in
@@ -9,6 +9,7 @@ parameter:
 #    no_upf: true
 #    no_ausf: true
 #    no_udm: true
+#    no_pcf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true

diff --git a/configs/sample.yaml.in b/configs/sample.yaml.in
@@ -9,6 +9,7 @@ parameter:
 #    no_upf: true
 #    no_ausf: true
 #    no_udm: true
+#    no_pcf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true

diff --git a/configs/srslte.yaml.in b/configs/srslte.yaml.in
@@ -9,6 +9,7 @@ parameter:
 #    no_upf: true
 #    no_ausf: true
 #    no_udm: true
+#    no_pcf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true
@@ -63,9 +64,9 @@ sgwc:
       - addr: 127.0.0.3
 
 smf:
-    sbi:
-      - addr: 127.0.0.4
-        port: 7777
+#    sbi:
+#      - addr: 127.0.0.4
+#        port: 7777
     gtpc:
       - addr: 127.0.0.4
       - addr: ::1
@@ -177,12 +178,12 @@ pcrf:
         - identity: smf.localdomain
           addr: 127.0.0.4
 
-nrf:
-    sbi:
-      - addr:
-        - 127.0.0.10
-        - ::1
-        port: 7777
+#nrf:
+#    sbi:
+#      - addr:
+#        - 127.0.0.10
+#        - ::1
+#        port: 7777
 
 ausf:
     sbi:

diff --git a/configs/volte.yaml.in b/configs/volte.yaml.in
@@ -9,6 +9,7 @@ parameter:
 #    no_upf: true
 #    no_ausf: true
 #    no_udm: true
+#    no_pcf: true
 #    no_udr: true
 #    no_mme: true
 #    no_sgwc: true
@@ -63,9 +64,9 @@ sgwc:
       - addr: 127.0.0.3
 
 smf:
-    sbi:
-      - addr: 127.0.0.4
-        port: 7777
+#    sbi:
+#      - addr: 127.0.0.4
+#        port: 7777
     gtpc:
       - addr: 127.0.0.4
       - addr: ::1
@@ -182,12 +183,12 @@ pcrf:
         - identity: pcscf.localdomain
           addr: 127.0.0.1
 
-nrf:
-    sbi:
-      - addr:
-        - 127.0.0.10
-        - ::1
-        port: 7777
+#nrf:
+#    sbi:
+#      - addr:
+#        - 127.0.0.10
+#        - ::1
+#        port: 7777
 
 ausf:
     sbi:

diff --git a/configs/vonr.yaml.in b/configs/vonr.yaml.in
@@ -0,0 +1,211 @@
+db_uri: mongodb://localhost/open5gs
+
+logger:
+
+parameter:
+#    no_nrf: true
+#    no_amf: true
+#    no_smf: true
+#    no_upf: true
+#    no_ausf: true
+#    no_udm: true
+#    no_pcf: true
+#    no_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
+
+mme:
+    freeDiameter:
+      identity: mme.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.2
+      load_extension:
+        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
+        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
+        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
+        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+      connect:
+        - identity: hss.localdomain
+          addr: 127.0.0.8
+
+    s1ap:
+      - addr: 127.0.0.2
+    gtpc:
+      - addr: 127.0.0.2
+    gummei:
+      plmn_id:
+        mcc: 901
+        mnc: 70
+      mme_gid: 2
+      mme_code: 1
+    tai:
+      plmn_id:
+        mcc: 901
+        mnc: 70
+      tac: 1
+    security:
+        integrity_order : [ EIA2, EIA1, EIA0 ]
+        ciphering_order : [ EEA0, EEA1, EEA2 ]
+
+    network_name:
+        full: Open5GS
+
+sgwc:
+    gtpc:
+      - addr: 127.0.0.3
+    pfcp:
+      - addr: 127.0.0.3
+
+smf:
+    sbi:
+      - addr: 127.0.0.4
+        port: 7777
+    gtpc:
+      - addr: 127.0.0.4
+      - addr: ::1
+    pfcp:
+      - addr: 127.0.0.4
+    pdn:
+      - addr: 10.45.0.1/16
+      - addr: cafe::1/64
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+      - 2001:4860:4860::8888
+      - 2001:4860:4860::8844
+    p-cscf:
+      - 127.0.0.1
+      - ::1
+    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.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
+
+sgwu:
+    gtpu:
+      - addr: 127.0.0.6
+    pfcp:
+      - 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
+
+hss:
+    freeDiameter:
+      identity: hss.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.8
+      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
+pcrf:
+    freeDiameter:
+      identity: pcrf.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.9
+      load_extension:
+        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
+        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
+        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
+        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
+        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx
+      connect:
+        - identity: smf.localdomain
+          addr: 127.0.0.4
+        - identity: pcscf.localdomain
+          addr: 127.0.0.1
+
+nrf:
+    sbi:
+      - addr:
+        - 127.0.0.10
+        - ::1
+        port: 7777
+
+ausf:
+    sbi:
+      - addr: 127.0.0.11
+        port: 7777
+
+udm:
+    sbi:
+      - addr: 127.0.0.12
+        port: 7777
+
+pcf:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777
+
+udr:
+    sbi:
+      - addr: 127.0.0.20
+        port: 7777
diff --git a/lib/asn1c/util/message.c b/lib/asn1c/util/message.c
@@ -41,7 +41,7 @@ ogs_pkbuf_t *ogs_asn_encode(const asn_TYPE_descriptor_t *td, void *sptr)
         return NULL;
     }
 
-    ogs_pkbuf_trim(pkbuf, (enc_ret.encoded >> 3));
+    ogs_pkbuf_trim(pkbuf, ((enc_ret.encoded + 7) >> 3));
 
     return pkbuf;
 }