Freeze usrsctp version to 0.9.5.0

2025-11-03 21:33:14 +00:00 · 2021-03-21 20:06:24 +09:00
parent b07d12d3be
commit ebb48ede53
7 changed files with 130 additions and 37 deletions
--- a/docs/_docs/platform/05-macosx-apple-silicon.md
+++ b/docs/_docs/platform/05-macosx-apple-silicon.md
@@ -89,7 +89,7 @@ $ sudo pfctl -e -f /etc/pf.anchors/org.open5gs

 Install the depedencies for building the source code.
 ```bash
-$ brew install mongo-c-driver gnutls libgcrypt libidn libyaml libmicrohttpd nghttp2 pkg-config bison
+$ brew install mongo-c-driver gnutls libgcrypt libidn libyaml libmicrohttpd nghttp2 pkg-config bison libusrsctp
 ```

 Configure Homebrew PATH
@@ -114,7 +114,7 @@ To compile with meson:

 ```bash
 $ cd open5gs
-$ meson build --prefix=`pwd`/install -D c_std=c99
+$ meson build --prefix=`pwd`/install
 $ ninja -C build
 ```

--- a/docs/_docs/platform/06-macosx-intel.md
+++ b/docs/_docs/platform/06-macosx-intel.md
@@ -89,7 +89,7 @@ $ sudo pfctl -e -f /etc/pf.anchors/org.open5gs

 Install the depedencies for building the source code.
 ```bash
-$ brew install mongo-c-driver gnutls libgcrypt libidn libyaml libmicrohttpd nghttp2 pkg-config
+$ brew install mongo-c-driver gnutls libgcrypt libidn libyaml libmicrohttpd nghttp2 pkg-config libusrsctp
 ```

 Install Bison and Create soft link.
@@ -113,7 +113,7 @@ To compile with meson:

 ```bash
 $ cd open5gs
-$ meson build --prefix=`pwd`/install -D c_std=c99
+$ meson build --prefix=`pwd`/install
 $ ninja -C build
 ```

--- a/docs/_docs/troubleshoot/02-now-in-github-issues.md
+++ b/docs/_docs/troubleshoot/02-now-in-github-issues.md
@@ -10,35 +10,93 @@ head_inline: "<style> .blue { color: blue; } </style>"
  }
 </style>

-#### Cannot open shared object file when running daemon
+#### How to use a different Slice for each SMF

-An error occurred when running as follows.
+To add a slice with SST of 1 and SD of 000080, you need to update the configuration file as shown below.

-```
-$ ./install/bin/open5gs-nrfd
-./install/bin/open5gs-nrfd: error while loading shared libraries: libogscrypt.so.2: cannot open shared object file: No such file or directory
+```diff
+### amf.yaml
+
+$ diff --git a/configs/open5gs/amf.yaml.in b/configs/open5gs/amf.yaml.in
+index 7e939e81..dfe4456d 100644
+--- a/configs/open5gs/amf.yaml.in
+++ b/configs/open5gs/amf.yaml.in
+@@ -199,6 +199,12 @@ amf:
+           mnc: 70
+         s_nssai:
+           - sst: 1
+      - plmn_id:
+          mcc: 901
+          mnc: 70
+        s_nssai:
+          - sst: 1
+            sd: 000080
+     security:
+         integrity_order : [ NIA2, NIA1, NIA0 ]
+         ciphering_order : [ NEA0, NEA1, NEA2 ]
+
+### FIRST smf.yaml
+
+$ diff --git a/configs/open5gs/smf.yaml.in b/configs/open5gs/smf.yaml.in
+index d45aa60f..701ee533 100644
+--- a/configs/open5gs/smf.yaml.in
+++ b/configs/open5gs/smf.yaml.in
+@@ -317,6 +317,11 @@ logger:
+ # 
+ 
+ smf:
+    info:
+      - s_nssai:
+          - sst: 1
+            dnn:
+              - internet
+     sbi:
+       - addr: 127.0.0.4
+         port: 7777
+
+### SECOND smf.yaml
+
+$ diff --git a/configs/open5gs/smf.yaml.in b/configs/open5gs/smf.yaml.in
+index d45aa60f..949da220 100644
+--- a/configs/open5gs/smf.yaml.in
+++ b/configs/open5gs/smf.yaml.in
+@@ -317,6 +317,12 @@ logger:
+ #
+
+ smf:
+    info:
+      - s_nssai:
+          - sst: 1
+            sd: 000080
+            dnn:
+              - internet
+     sbi:
+       - addr: 127.0.0.4
+         port: 7777
+
+### nssf.yaml
+$ diff --git a/configs/open5gs/nssf.yaml.in b/configs/open5gs/nssf.yaml.in
+index ecd4f7e2..04d9c4ba 100644
+--- a/configs/open5gs/nssf.yaml.in
+++ b/configs/open5gs/nssf.yaml.in
+@@ -119,6 +119,11 @@ nssf:
+         port: 7777
+         s_nssai:
+           sst: 1
+      - addr: 127.0.0.10
+        port: 7777
+        s_nssai:
+          sst: 1
+          sd: 000080
+ 
+ #
+ # nrf:
 ```

-You need to specify the absolute path to the shared library as follows.
+Then add a slice to MongoDB's subscriber info.

-```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)
-...
-```
+![Subscriber Info]({{ site.url }}{{ site.baseurl }}/assets/images/subscriber_info_with_two_slice.png)

-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
-```

 #### Can I disable specific services if 5G functionally is not needed?

@@ -903,3 +961,33 @@ getsockopt level=132 optname=0 not yet supported

 The SCTP module is not included in the QEMU kernel. I believe that if the Linux kernel installed on your target platform contains an SCTP module, it will work normally.
 {: .notice--warning}
+
+#### Cannot open shared object file when running daemon
+
+An error occurred when running as follows.
+
+```
+$ ./install/bin/open5gs-nrfd
+./install/bin/open5gs-nrfd: error while loading shared libraries: libogscrypt.so.2: cannot open shared object file: No such file or directory
+```
+
+You need to 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-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
+```
--- a/docs/_pages/docs.md
+++ b/docs/_pages/docs.md
@@ -8,19 +8,11 @@ head_inline: "<style> ul { padding-bottom: 1em; } </style>"
 - User's Guide
  - [Quickstart](guide/01-quickstart)
  - [Building Open5GS from Sources](guide/02-building-open5gs-from-sources)
-  - [Splitting Network Functions](guide/03-splitting-network-functions)

 - Tutorials
  - [Your First LTE](tutorial/01-your-first-lte)
-  - [EPC Advanced Example with OpenAirInterface UE/RAN](https://github.com/s5uishida/open5gs_epc_oai_sample_config)
  - [VoLTE Setup with Kamailio IMS and Open5GS](tutorial/02-VoLTE-setup)
  - [Dockerized VoLTE Setup](tutorial/03-VoLTE-dockerized)
-  - [My first 5G Core : Open5GS and UERANSIM](http://nickvsnetworking.com/my-first-5g-core-open5gs-and-ueransim/)
-  - [5GC Advanced Example with UERANSIM](https://github.com/s5uishida/open5gs_5gc_ueransim_sample_config)
-  - [Sending SMS in Open5GS LTE Networks using the SGs Interface and OsmoMSC](https://nickvsnetworking.com/sending-sms-in-open5gs-lte-networks-using-the-sgs-interface-and-osmomsc-with-smsos/)
-  - [OsmoMSC and Open5GS MME – SGs Interface for CSCF / InterRAT Handover](https://nickvsnetworking.com/osmomsc-and-open5gs-mme-sgs-interface-for-cscf-interran-handover/)
-  - [Static IPs for UEs](http://nickvsnetworking.com/open5gs-epc-static-ip-addresses-for-ues-apns-subscribers/)
-  - [Kubernetes Open5GS Deployment](https://dev.to/infinitydon/virtual-4g-simulation-using-kubernetes-and-gns3-3b7k?fbclid=IwAR1p99h13a-mCfejanbBQe0H0-jp5grXkn5mWf1WrTHf47UtegB2-UHGGZQ)

 - Troubleshooting
  - [Simple Issues](troubleshoot/01-simple-issues)
@@ -37,3 +29,16 @@ head_inline: "<style> ul { padding-bottom: 1em; } </style>"
 - Hardware Specific Notes
  - [Tested e/gNodeBs](hardware/01-genodebs)
  
+- @infinitydon
+  - [Kubernetes Open5GS Deployment](https://dev.to/infinitydon/virtual-4g-simulation-using-kubernetes-and-gns3-3b7k?fbclid=IwAR1p99h13a-mCfejanbBQe0H0-jp5grXkn5mWf1WrTHf47UtegB2-UHGGZQ)
+
+- @nickvsnetworking
+  - [My first 5G Core : Open5GS and UERANSIM](http://nickvsnetworking.com/my-first-5g-core-open5gs-and-ueransim/)
+  - [Sending SMS in Open5GS LTE Networks using the SGs Interface and OsmoMSC](https://nickvsnetworking.com/sending-sms-in-open5gs-lte-networks-using-the-sgs-interface-and-osmomsc-with-smsos/)
+  - [OsmoMSC and Open5GS MME – SGs Interface for CSCF / InterRAT Handover](https://nickvsnetworking.com/osmomsc-and-open5gs-mme-sgs-interface-for-cscf-interran-handover/)
+  - [Static IPs for UEs](http://nickvsnetworking.com/open5gs-epc-static-ip-addresses-for-ues-apns-subscribers/)
+
+- @s5uishida
+  - [EPC Advanced Example with OpenAirInterface UE/RAN](https://github.com/s5uishida/open5gs_epc_oai_sample_config)
+  - [5GC Advanced Example with UERANSIM](https://github.com/s5uishida/open5gs_5gc_ueransim_sample_config)
+
--- a/docs/assets/images/subscriber_info_with_two_slice.png
+++ b/docs/assets/images/subscriber_info_with_two_slice.png
--- a/lib/sctp/meson.build
+++ b/lib/sctp/meson.build
@@ -36,7 +36,7 @@ libsctp_sources = files('''

 if host_system == 'darwin'
    sctp_dep = dependency('usrsctp',
-        version: ['>=1.0.0', '<2'],
+        version: ['>=0.9.5'],
        fallback: ['usrsctp', 'usrsctp_dep'],
        default_options: [
            'sctp_build_programs=false',
--- a/subprojects/usrsctp.wrap
+++ b/subprojects/usrsctp.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 directory = usrsctp
 url = https://github.com/sctplab/usrsctp.git
-revision = 995c0b84414466d77d52011e5b572cbe213b770a
+revision = 0.9.5.0