February 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-pfcp[master]: libosmo-pfcp.pc.in: add missing libosmogsm

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31504 ) Change subject: libosmo-pfcp.pc.in: add missing libosmogsm ...................................................................... libosmo-pfcp.pc.in: add missing libosmogsm We use osmo_apn_from_str() and osmo_apn_to_str(), defined in libosmogsm, since this commit: "fix coding of Network Instance IE" 8368e7d5d59140fc77b890493a47a08cd644e2f8 I9d67464ef0f92b0512cfd6e48d203f8828a82a19 Since libosmo-pfcp merely calls the two functions and none of libosmogsm is exposed in the libosmo-pfcp API, it suffices to use Requires.private in the .pc file. Change-Id: Ie1c92d251af6a3e42759ff0da0d3693356b5e1d3 --- M libosmo-pfcp.pc.in 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/libosmo-pfcp.pc.in b/libosmo-pfcp.pc.in index 0ed5160..58a6164 100644 --- a/libosmo-pfcp.pc.in +++ b/libosmo-pfcp.pc.in @@ -7,5 +7,6 @@ Description: C Utility Library that implements the PFCP protocol and endpoint Version: @VERSION@ Requires: libosmo-gtlv, libosmocore, talloc +Requires.private: libosmogsm Libs: -L${libdir} -losmo-pfcp Cflags: -I${includedir}/ -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Ie1c92d251af6a3e42759ff0da0d3693356b5e1d3 Gerrit-Change-Number: 31504 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[S] Change in libosmo-pfcp[master]: libosmo-pfcp.pc.in: add missing libosmogsm

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31504 ) Change subject: libosmo-pfcp.pc.in: add missing libosmogsm ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Ie1c92d251af6a3e42759ff0da0d3693356b5e1d3 Gerrit-Change-Number: 31504 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Feb 2023 08:11:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[M] Change in libosmocore[master]: gsm0808: add logging for some IE encoding errors

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30581 ) Change subject: gsm0808: add logging for some IE encoding errors ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: (others feel free to outvote me if you disagree with my stance) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd9c490e7a2d37817004590629092c4bb6f2d758 Gerrit-Change-Number: 30581 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Feb 2023 01:38:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[M] Change in libosmocore[master]: gsm0808: add logging for some IE encoding errors

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30581 ) Change subject: gsm0808: add logging for some IE encoding errors ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: "It can still be used without having to initialize logging, as we do have a fallback mechanism: see #define LOGPSRCC and logp_stub()." but then you get printf() on stderr, which may not be desirable? i think that's a cheap excuse =) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd9c490e7a2d37817004590629092c4bb6f2d758 Gerrit-Change-Number: 30581 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Feb 2023 01:37:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[M] Change in libosmocore[master]: gsm0808: add logging for some IE encoding errors

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30581 ) Change subject: gsm0808: add logging for some IE encoding errors ...................................................................... Patch Set 2: Code-Review-1 (1 comment) Patchset: PS2: i still think I'd rather avoid adding LOGP() to a protocol coding implementation, because all callers have to use osmo logging then... that's also why there is no LOGP() in my recently implemented libosmo-gtlv and libosmo-pfcp implementations -- by using an error cb instead, the API caller can choose whether to use osmo logging or be independent from it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd9c490e7a2d37817004590629092c4bb6f2d758 Gerrit-Change-Number: 30581 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Feb 2023 01:36:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[M] Change in libosmocore[master]: gsm/{bsslap,bssmap_le}: zero-initialize structs using memset()

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31505 ) Change subject: gsm/{bsslap,bssmap_le}: zero-initialize structs using memset() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: btw in your link "The proposed change for C23 is that the = {} (functionally equivalent to = { 0 } on modern compilers) will also initialize padding bits to 0" ... from then on no-one will be able to argue against my favorite "= {}" syntax =) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib16964b16eb04315efc416164ed46c15b5dc7254 Gerrit-Change-Number: 31505 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Feb 2023 01:28:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[M] Change in libosmocore[master]: gsm/{bsslap,bssmap_le}: zero-initialize structs using memset()

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31505 ) Change subject: gsm/{bsslap,bssmap_le}: zero-initialize structs using memset() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: oh. Actually in API functions it is fine for padding bytes to be returned random. I thought we were chatting about regression test functions only, my bad, I probably didn't look closely enough. So the nicest solution IMHO is to use memset(0) in the *regression tests* only, before feeding the struct pointers to the API functions... because only the regression tests even care about the padding bytes. except if you are saying, a struct that has been memset(0) has its padding bytes overwritten randomly by *foo = (struct foo){} ... in my world so far that does not happen, but if zero padding does not stay zero, that would be a reason to memset(0) in the API implementation too, and that would change how I understand struct initialization. Anyway, it's not really critical. I just find memset(0) looks ugly, and regression tests are allowed to look ugly, API implementations not so much. Also, theoretically, a type's constructor doesn't necessarily mean to initialize with zero; nonzero constructors happen a lot in C++ -- but in all practicality in our C code it means exactly zero. So it's academic nitpick, and just my personal taste... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib16964b16eb04315efc416164ed46c15b5dc7254 Gerrit-Change-Number: 31505 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Feb 2023 01:24:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[L] Change in docker-playground[master]: ttcn3-ggsn-test-ogs: update open5gs-{smf,upf} config files

by fixeria

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31506 ) Change subject: ttcn3-ggsn-test-ogs: update open5gs-{smf,upf} config files ...................................................................... Patch Set 1: Verified+1 (1 comment) This change is ready for review. Patchset: PS1: Confirmed to fix the problem by running tests in docker images locally. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic92d73e93b47abb4fae99fc9bece0c93bf9b91ef Gerrit-Change-Number: 31506 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Feb 2023 01:05:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[L] Change in docker-playground[master]: ttcn3-ggsn-test-ogs: update open5gs-{smf,upf} config files

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/31506 ) Change subject: ttcn3-ggsn-test-ogs: update open5gs-{smf,upf} config files ...................................................................... ttcn3-ggsn-test-ogs: update open5gs-{smf,upf} config files Change-Id: Ic92d73e93b47abb4fae99fc9bece0c93bf9b91ef Related: I27adbab6a6b95ddf4c6d39803e4f7dd079f11a4c Related: OS#5913 --- M ttcn3-ggsn-test/ogs/open5gs-smf.yaml M ttcn3-ggsn-test/ogs/open5gs-upf.yaml 2 files changed, 494 insertions(+), 124 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/06/31506/1 diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml index 38579be..045c585 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml @@ -1,92 +1,282 @@ # -# 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) +# (Default values are used, so no configuration is required) # # o Set OGS_LOG_ERROR to all domain level # - `level` can be set with none, fatal, error, warn, info, debug, trace +# logger: # level: error # # o Set OGS_LOG_DEBUG to mme/emm domain level +# logger: # level: debug # domain: mme,emm # # o Set OGS_LOG_TRACE to all domain level +# logger: # level: trace -# domain: core,pfcp,fd,pfcp,gtp,smf,event,tlv,mem,sock +# domain: core,sbi,ausf,event,tlv,mem,sock # logger: level: info # -# smf: +# o TLS enable/disable +# sbi: +# server|client: +# no_tls: false|true +# - false: (Default) Use TLS +# - true: TLS disabled +# +# o Verification enable/disable +# sbi: +# server|client: +# no_verify: false|true +# - false: (Default) Verify the PEER +# - true: Skip the verification step +# +# o Server-side does not use TLS +# sbi: +# server: +# no_tls: true +# +# o Client-side skips the verification step +# sbi: +# client: +# no_verify: true +# key: /etc/open5gs/tls/amf.key +# cert: /etc/open5gs/tls/amf.crt +# +# o Use the specified certificate while verifying the client +# sbi: +# server +# cacert: /etc/open5gs/tls/ca.crt +# +# o Use the specified certificate while verifying the server +# sbi: +# client +# cacert: /etc/open5gs/tls/ca.crt +# +sbi: + server: + no_tls: true + cacert: /etc/open5gs/tls/ca.crt + key: /etc/open5gs/tls/smf.key + cert: /etc/open5gs/tls/smf.crt + client: + no_tls: true + cacert: /etc/open5gs/tls/ca.crt + key: /etc/open5gs/tls/smf.key + cert: /etc/open5gs/tls/smf.crt + # # <SBI Server> # # o SBI Server(http://<all address available>:80) +# sbi: +# server: +# no_tls: true +# smf: # sbi: # -# o SBI Server(http://<any address>:80) +# o SBI Server(http://<any address>:7777) +# sbi: +# server: +# no_tls: true +# smf: # sbi: # - addr: # - 0.0.0.0 # - ::0 # port: 7777 # -# o SBI Server(https://<all address avaiable>:443) +# o SBI Server(https://<all address available>:443) +# sbi: +# server: +# key: /etc/open5gs/tls/smf.key +# cert: /etc/open5gs/tls/smf.crt +# smf: # sbi: -# - tls: -# key: smf.key -# pem: smf.pem # -# o SBI Server(https://127.0.0.4:443, http://[::1]:80) +# o SBI Server(https://127.0.0.4:443, https://[::1]:443) without verification +# sbi: +# server: +# no_verify: true +# key: /etc/open5gs/tls/smf.key +# cert: /etc/open5gs/tls/smf.crt +# smf: # sbi: # - addr: 127.0.0.4 -# tls: -# key: smf.key -# pem: smf.pem # - addr: ::1 # -# o SBI Server(http://smf.open5gs.org:80) +# o SBI Server(https://smf.open5gs.org:443) +# Use the specified certificate while verifying the client +# +# sbi: +# server: +# cacert: /etc/open5gs/tls/ca.crt +# key: /etc/open5gs/tls/smf.key +# cert: /etc/open5gs/tls/smf.crt +# smf: # sbi: # - name: smf.open5gs.org # # o SBI Server(http://127.0.0.4:7777) +# sbi: +# server: +# no_tls: true +# smf: # sbi: # - addr: 127.0.0.4 # port: 7777 # # o SBI Server(http://<eth0 IP address>:80) +# sbi: +# server: +# no_tls: true +# smf: # sbi: # - dev: eth0 # # o Provide custom SBI address to be advertised to NRF +# sbi: +# server: +# no_tls: true +# smf: # sbi: # - dev: eth0 # advertise: open5gs-smf.svc.local # +# o Another example of advertising on NRF +# sbi: +# server: +# no_tls: true +# smf: # sbi: # - addr: localhost # advertise: # - 127.0.0.99 # - ::1 # +# o SBI Option (Default) +# - tcp_nodelay : true +# - so_linger.l_onoff : false +# +# sbi: +# server: +# no_tls: true +# smf: +# sbi: +# addr: 127.0.0.4 +# option: +# tcp_nodelay: false +# so_linger: +# l_onoff: true +# l_linger: 10 +# +# +# <NF Service> +# +# o NF Service Name(Default : all NF services available) +# smf: +# service_name: +# +# o NF Service Name(Only some NF services are available) +# smf: +# service_name: +# - nsmf-pdusession +# +# <NF Discovery Query Parameter> +# +# o (Default) If you do not set Query Parameter as shown below, +# +# sbi: +# server: +# no_tls: true +# smf: +# sbi: +# - addr: 127.0.0.4 +# port: 7777 +# +# - 'service-names' is included. +# +# o Service-Names are not included +# sbi: +# server: +# no_tls: true +# smf: +# sbi: +# - addr: 127.0.0.4 +# port: 7777 +# discovery: +# option: +# no_service_names: false +# +# o To remove 'service-names' from URI query parameters in NS Discovery +# no_service_names: true +# +# * For Indirect Communication with Delegated Discovery, +# 'service-names' is always included in the URI query parameter. +# * That is, 'no_service_names' has no effect. +# +# <For Indirect Communication with Delegated Discovery> +# +# o (Default) If you do not set Delegated Discovery as shown below, +# +# sbi: +# server: +# no_tls: true +# smf: +# sbi: +# - addr: 127.0.0.4 +# port: 7777 +# +# - Use SCP if SCP available. Otherwise NRF is used. +# => App fails if both NRF and SCP are unavailable. +# +# sbi: +# server: +# no_tls: true +# smf: +# sbi: +# - addr: 127.0.0.4 +# port: 7777 +# discovery: +# delegated: auto +# +# o To use SCP always => App fails if no SCP available. +# delegated: yes +# +# o Don't use SCP server => App fails if no NRF available. +# delegated: no +# # <PFCP Server> # # o PFCP Server(127.0.0.4:8805, ::1:8805) +# smf: # pfcp: # - addr: 127.0.0.4 # - addr: ::1 # # o PFCP-U Server(127.0.0.1:2152, [::1]:2152) +# smf: # pfcp: # name: localhost # +# o PFCP Option (Default) +# - so_bindtodevice : NULL +# +# smf: +# pfcp: +# addr: 127.0.0.4 +# option: +# so_bindtodevice: vrf-blue +# # <GTP-C Server> # # o GTP-C Server(127.0.0.4:2123, [fd69:f21d:873c:fa::3]:2123) +# smf: # gtpc: # addr: # - 127.0.0.4 @@ -94,35 +284,59 @@ # # o On SMF, Same configuration # (127.0.0.4:2123, [fd69:f21d:873c:fa::3]:2123). +# smf: # gtpc: # - addr: 127.0.0.4 # - addr: fd69:f21d:873c:fa::3 # +# o GTP-C Option (Default) +# - so_bindtodevice : NULL +# +# smf: +# gtpc: +# addr: 127.0.0.4 +# option: +# so_bindtodevice: vrf-blue +# # <GTP-U Server>> # # o GTP-U Server(127.0.0.4:2152, [::1]:2152) +# smf: # gtpu: # - addr: 127.0.0.4 # - addr: ::1 # # o GTP-U Server(127.0.0.1:2152, [::1]:2152) +# smf: # gtpu: # name: localhost # +# o GTP-U Option (Default) +# - so_bindtodevice : NULL +# +# smf: +# gtpu: +# addr: 127.0.0.4 +# option: +# so_bindtodevice: vrf-blue +# # <Metrics Server> # # o Metrics Server(http://<any address>:9090) +# smf: # metrics: -# addr: 0.0.0.0 -# port: 9090 +# - addr: 0.0.0.0 +# port: 9090 # # <Subnet for UE Pool> # # o IPv4 Pool +# smf: # subnet: # addr: 10.45.0.1/16 # # o IPv4/IPv6 Pool +# smf: # subnet: # - addr: 10.45.0.1/16 # - addr: 2001:db8:cafe::1/48 @@ -131,6 +345,7 @@ # o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48 # ; If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash. # +# smf: # subnet: # - addr: 10.45.0.1/16 # dnn: internet @@ -144,6 +359,7 @@ # o Specific DNN/APN with the FALLBACK SUBNET(10.47.0.1/16) # ; Note that put the FALLBACK SUBNET last to avoid SMF/UPF crash. # +# smf: # subnet: # - addr: 10.45.0.1/16 # dnn: internet @@ -152,22 +368,26 @@ # - addr: 10.50.0.1/16 ## FALLBACK SUBNET # # o Pool Range Sample +# smf: # subnet: # - addr: 10.45.0.1/24 # range: 10.45.0.100-10.45.0.200 # +# smf: # subnet: # - addr: 10.45.0.1/24 # range: # - 10.45.0.5-10.45.0.50 # - 10.45.0.100- # +# smf: # subnet: # - addr: 10.45.0.1/24 # range: # - -10.45.0.200 # - 10.45.0.210-10.45.0.220 # +# smf: # subnet: # - addr: 10.45.0.1/16 # range: @@ -182,6 +402,7 @@ # # o Primary/Secondary can be configured. Others are ignored. # +# smf: # dns: # - 8.8.8.8 # - 8.8.4.4 @@ -200,10 +421,25 @@ # # o Proxy Call Session Control Function # +# smf: # p-cscf: # - 127.0.0.1 # - ::1 # +# <CTF> +# +# o Gy interface parameters towards OCS. +# o enabled: +# o auto: Default. Use Gy only if OCS available among Diameter peers +# o yes: Use Gy always; +# reject subscribers if no OCS available among Diameter peers +# o no: Don't use Gy interface if there is an OCS available +# +# smf: +# ctf: +# enabled: auto|yes|no +# +# # <SMF Selection - 5G Core only> # 1. SMF sends SmfInfo(S-NSSAI, DNN, TAI) to the NRF # 2. NRF responds to AMF with SmfInfo during NF-Discovery. @@ -212,6 +448,7 @@ # Note that if there is no SmfInfo, any AMF can select this SMF. # # o S-NSSAI[SST:1] and DNN[internet] - At least 1 DNN is required in S-NSSAI +# smf: # info: # - s_nssai: # - sst: 1 @@ -219,6 +456,7 @@ # - internet # # o S-NSSAI[SST:1 SD:009000] and DNN[internet or ims] +# smf: # info: # - s_nssai: # - sst: 1 @@ -227,7 +465,8 @@ # - internet # - ims # -# o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:90170 TAC:1] +# o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:99970 TAC:1] +# smf: # info: # - s_nssai: # - sst: 1 @@ -235,15 +474,16 @@ # - internet # tai: # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # tac: 1 # # o If any of conditions below are met: -# - S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:90170 TAC:1-9] +# - S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:99970 TAC:1-9] # - S-NSSAI[SST:2 SD:000080] and DNN[internet or ims] -# - S-NSSAI[SST:4] and DNN[internet] and TAI[PLMN-ID:90170 TAC:10-20,30-40] +# - S-NSSAI[SST:4] and DNN[internet] and TAI[PLMN-ID:99970 TAC:10-20,30-40] # +# smf: # info: # - s_nssai: # - sst: 1 @@ -251,7 +491,7 @@ # - internet # tai: # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # range: # - 1-9 @@ -267,13 +507,14 @@ # - internet # tai: # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # range: # - 10-20 # - 30-40 # # o Complex Example +# smf: # info: # - s_nssai: # - sst: 1 @@ -297,27 +538,27 @@ # - internet # tai: # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # tac: [1, 2, 3] # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # tac: 4 # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # tac: # - 5 # - 6 # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # range: # - 100-200 # - 300-400 # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # range: # - 500-600 @@ -329,11 +570,25 @@ # - internet # tai: # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # tac: 99 # - +# <Security Indication - 5G Core only> +# +# According to 3GPP TS38.413 Section 9.3.1.27, +# Security Indication IE may be instructed to 5G gNB. +# +# If you set the security_indication in smf.yaml, +# this information is delivered using PDU Session Resource Request Transfer IE +# +# smf: +# security_indication: +# integrity_protection_indication: required|preferred|not-needed +# confidentiality_protection_indication: required|preferred|not-needed +# maximum_integrity_protected_data_rate_uplink: bitrate64kbs|maximum-UE-rate +# maximum_integrity_protected_data_rate_downlink: bitrate64kbs|maximum-UE-rate +# smf: sbi: - addr: 172.18.3.201 @@ -372,21 +627,107 @@ freeDiameter: /data/freediameter.conf # -# nrf: +# <SBI Client>> +# +# o SBI Client(http://127.0.1.10:7777) +# sbi: +# client: +# no_tls: true +# scp: +# sbi: +# addr: 127.0.1.10 +# port: 7777 +# +# o SBI Client(https://127.0.1.10:443, https://[::1]:443) without verification +# sbi: +# client: +# no_verify: true +# key: /etc/open5gs/tls/amf.key +# cert: /etc/open5gs/tls/amf.crt +# scp: +# sbi: +# - addr: 127.0.1.10 +# - addr: ::1 +# +# o SBI Client(https://scp.open5gs.org:443) +# Use the specified certificate while verifying the server +# +# sbi: +# client: +# cacert: /etc/open5gs/tls/ca.crt +# key: /etc/open5gs/tls/amf.key +# cert: /etc/open5gs/tls/amf.crt +# scp: +# sbi: +# - name: scp.open5gs.org +# +# o SBI Client(http://[fd69:f21d:873c:fb::1]:80) +# If prefer_ipv4 is true, http://127.0.1.10:80 is selected. +# +# sbi: +# client: +# no_tls: true +# scp: +# sbi: +# addr: +# - 127.0.1.10 +# - fd69:f21d:873c:fb::1 +# +# o SBI Option (Default) +# - tcp_nodelay : true +# - so_linger.l_onoff : false +# +# sbi: +# client: +# no_tls: true +# scp: +# sbi: +# addr: 127.0.1.10 +# option: +# tcp_nodelay: false +# so_linger: +# l_onoff: true +# l_linger: 10 +# +# +scp: + sbi: + - addr: 127.0.1.10 + port: 7777 + # # <SBI Client>> # -# o SBI Client(http://127.0.0.1:7777) +# o SBI Client(http://127.0.0.10:7777) +# sbi: +# client: +# no_tls: true +# nrf: # sbi: # addr: 127.0.0.10 # port: 7777 # -# o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80) +# o SBI Client(https://127.0.0.10:443, https://[::1]:443) without verification +# sbi: +# client: +# no_verify: true +# key: /etc/open5gs/tls/amf.key +# cert: /etc/open5gs/tls/amf.crt +# nrf: # sbi: # - addr: 127.0.0.10 -# tls: -# key: nrf.key -# pem: nrf.pem +# - addr: ::1 +# +# o SBI Client(https://nrf.open5gs.org:443) +# Use the specified certificate while verifying the server +# +# sbi: +# client: +# cacert: /etc/open5gs/tls/ca.crt +# key: /etc/open5gs/tls/amf.key +# cert: /etc/open5gs/tls/amf.crt +# nrf: +# sbi: # - name: nrf.open5gs.org # # o SBI Client(http://[fd69:f21d:873c:fa::1]:80) @@ -397,6 +738,22 @@ # - 127.0.0.10 # - fd69:f21d:873c:fa::1 # +# o SBI Option (Default) +# - tcp_nodelay : true +# - so_linger.l_onoff : false +# +# sbi: +# client: +# no_tls: true +# nrf: +# sbi: +# addr: 127.0.0.10 +# option: +# tcp_nodelay: false +# so_linger: +# l_onoff: true +# l_linger: 10 +# nrf: sbi: - addr: @@ -404,12 +761,10 @@ port: 7777 # -# upf: -# # <PFCP Client>> # # o PFCP Client(127.0.0.7:8805) -# +# upf: # pfcp: # addr: 127.0.0.7 # @@ -460,76 +815,62 @@ - addr: 172.18.3.222 # -# parameter: -# -# o Number of output streams per SCTP associations. -# sctp_streams: 30 -# # o Disable use of IPv4 addresses (only IPv6) -# no_ipv4: true +# parameter: +# no_ipv4: true # # o Disable use of IPv6 addresses (only IPv4) -# no_ipv6: true +# parameter: +# no_ipv6: true # # o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# prefer_ipv4: true +# parameter: +# prefer_ipv4: true # # o Disable selection of UPF PFCP in Round-Robin manner -# no_pfcp_rr_select: true +# parameter: +# no_pfcp_rr_select: true +# +# o Legacy support for pre-release LTE 11 devices +# - Omits adding local address in packet filters for compatibility +# parameter: +# no_ipv4v6_local_addr_in_packet_filter: true # parameter: # +# o Maximum Number of UE # max: +# ue: 1024 # -# o Maximum Number of UE per AMF/MME -# ue: 1024 -# o Maximum Number of gNB/eNB per AMF/MME -# gnb: 64 +# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) +# max: +# peer: 64 +# +# o Maximum Number of GTP peer nodes per SGWC/SMF +# max: +# gtp_peer: 64 # max: # -# pool: -# -# o The default memory pool size was set assuming 1024 UEs. -# To connect more UEs, you need to increase the size further. -# -# - Pool-size 128 => 65536 Number -# - Pool-size 256 => 16384 Number -# - Pool-size 512 => 4096 Number -# - Pool-size 1024 => 1024 Number -# - Pool-size 2048 => 512 Number -# - Pool-size 8192 => 128 Number -# - Pool-size 1024*1024 => 8 Number -# -# 128: 65536 -# 256: 16384 -# 512: 4096 -# 1024: 1024 -# 2048: 512 -# 8192: 128 -# big: 8 -# -pool: - -# -# time: -# # o NF Instance Heartbeat (Default : 0) # NFs will not send heart-beat timer in NFProfile # NRF will send heart-beat timer in NFProfile +# (Default values are used, so no configuration is required) # # o NF Instance Heartbeat (20 seconds) # NFs will send heart-beat timer (20 seconds) in NFProfile # NRF can change heart-beat timer in NFProfile -# +# time: # nf_instance: # heartbeat: 20 # # o Message Wait Duration (Default : 10,000 ms = 10 seconds) +# (Default values are used, so no configuration is required) # # o Message Wait Duration (3000 ms) +# time: # message: # duration: 3000 # @@ -537,8 +878,10 @@ # Time to wait for SMF to send # PFCP Session Modification Request(Remove Indirect Tunnel) to the UPF # after sending Nsmf_PDUSession_UpdateSMContext Response(hoState:COMPLETED) +# (Default values are used, so no configuration is required) # # o Handover Wait Duration (500ms) +# time: # handover: # duration: 500 time: diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml index 96368b7..c82a80c 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml @@ -1,52 +1,65 @@ # -# 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) +# (Default values are used, so no configuration is required) # # o Set OGS_LOG_ERROR to all domain level # - `level` can be set with none, fatal, error, warn, info, debug, trace +# logger: # level: error # # o Set OGS_LOG_DEBUG to mme/emm domain level +# logger: # level: debug # domain: mme,emm # # o Set OGS_LOG_TRACE to all domain level +# logger: # level: trace -# domain: core,pfcp,gtp,upf,event,tlv,mem,sock +# domain: core,sbi,ausf,event,tlv,mem,sock # logger: level: info # -# upf: -# # <PFCP Server> # # o PFCP Server(127.0.0.7:8805, ::1:8805) +# upf: # pfcp: # - addr: 127.0.0.7 # - addr: ::1 # # o PFCP-U Server(127.0.0.1:2152, [::1]:2152) +# upf: # pfcp: # name: localhost # +# o PFCP Option (Default) +# - so_bindtodevice : NULL +# +# upf: +# pfcp: +# addr: 127.0.0.7 +# option: +# so_bindtodevice: vrf-blue +# # <GTP-U Server>> # # o GTP-U Server(127.0.0.7:2152, [::1]:2152) +# upf: # gtpu: # - addr: 127.0.0.7 # - addr: ::1 # # o GTP-U Server(127.0.0.1:2152, [::1]:2152) +# upf: # gtpu: # name: localhost # # o User Plane IP Resource information +# upf: # gtpu: # - addr: # - 127.0.0.7 @@ -62,24 +75,37 @@ # source_interface: 1 # # o Provide custom UPF GTP-U address to be advertised inside NGAP messages +# upf: # gtpu: # - addr: 10.4.128.21 # advertise: 172.24.15.30 # +# upf: # gtpu: # - addr: 10.4.128.21 # advertise: # - 127.0.0.1 # - ::1 # +# upf: # gtpu: # - addr: 10.4.128.21 # advertise: upf1.5gc.mnc001.mcc001.3gppnetwork.org # +# upf: # gtpu: # - dev: ens3 # advertise: upf1.5gc.mnc001.mcc001.3gppnetwork.org # +# o GTP-U Option (Default) +# - so_bindtodevice : NULL +# +# upf: +# gtpu: +# addr: 127.0.0.7 +# option: +# so_bindtodevice: vrf-blue +# # <Subnet for UE network> # # Note that you need to setup your UE network using TUN device. @@ -88,6 +114,7 @@ # o IPv4 Pool # $ sudo ip addr add 10.45.0.1/16 dev ogstun # +# upf: # subnet: # addr: 10.45.0.1/16 # @@ -95,6 +122,7 @@ # $ sudo ip addr add 10.45.0.1/16 dev ogstun # $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun # +# upf: # subnet: # - addr: 10.45.0.1/16 # - addr: 2001:db8:cafe::1/48 @@ -109,6 +137,7 @@ # # ; If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash. # +# upf: # subnet: # - addr: 10.45.0.1/16 # dnn: internet @@ -122,6 +151,7 @@ # o Specific DNN/APN with the FALLBACK SUBNET(10.47.0.1/16) # ; Note that put the FALLBACK SUBNET last to avoid SMF/UPF crash. # +# upf: # subnet: # - addr: 10.45.0.1/16 # dnn: internet @@ -135,6 +165,7 @@ # $ sudo ip addr add 10.46.0.1/16 dev ogstun3 # $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun3 # +# upf: # subnet: # - addr: 10.45.0.1/16 # dnn: internet @@ -148,6 +179,14 @@ # dnn: ims # dev: ogstun3 # +# <Metrics Server> +# +# o Metrics Server(http://<any address>:9090) +# upf: +# metrics: +# - addr: 0.0.0.0 +# port: 9090 +# upf: pfcp: - addr: 172.18.3.222 @@ -171,12 +210,10 @@ dev: ogstun46 # -# smf: -# # <PFCP Client>> # # o PFCP Client(127.0.0.4:8805) -# +# smf: # pfcp: # addr: 127.0.0.4 # @@ -185,62 +222,41 @@ - addr: 172.18.3.201 # -# parameter: -# # o Number of output streams per SCTP associations. -# sctp_streams: 30 +# parameter: +# sctp_streams: 30 # # o Disable use of IPv4 addresses (only IPv6) -# no_ipv4: true +# parameter: +# no_ipv4: true # # o Disable use of IPv6 addresses (only IPv4) -# no_ipv6: true +# parameter: +# no_ipv6: true # # o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# prefer_ipv4: true +# parameter: +# prefer_ipv4: true # parameter: # +# o Maximum Number of UE # max: +# ue: 1024 # -# o Maximum Number of UE per AMF/MME -# ue: 1024 -# o Maximum Number of gNB/eNB per AMF/MME -# gnb: 64 +# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) +# max: +# peer: 64 # max: # -# pool: -# -# o The default memory pool size was set assuming 1024 UEs. -# To connect more UEs, you need to increase the size further. -# -# - Pool-size 128 => 65536 Number -# - Pool-size 256 => 16384 Number -# - Pool-size 512 => 4096 Number -# - Pool-size 1024 => 1024 Number -# - Pool-size 2048 => 512 Number -# - Pool-size 8192 => 128 Number -# - Pool-size 1024*1024 => 8 Number -# -# 128: 65536 -# 256: 16384 -# 512: 4096 -# 1024: 1024 -# 2048: 512 -# 8192: 128 -# big: 8 -# -pool: - -# -# time: -# # o Message Wait Duration (Default : 10,000 ms = 10 seconds) +# (Default values are used, so no configuration is required) # # o Message Wait Duration (3000 ms) +# time: # message: # duration: 3000 time: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic92d73e93b47abb4fae99fc9bece0c93bf9b91ef Gerrit-Change-Number: 31506 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[M] Change in libosmocore[master]: gsm/{bsslap,bssmap_le}: zero-initialize structs using memset()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31505 ) Change subject: gsm/{bsslap,bssmap_le}: zero-initialize structs using memset() ...................................................................... gsm/{bsslap,bssmap_le}: zero-initialize structs using memset() In the unit tests we're using memcmp() to compare decoding results against the expected results. This is a reasonable approach, but there is a pitfall: not only the struct fields are compared, but also the padding bytes preceding/following them. When using gcc's extension zero-initializer {} or even the standard approved { 0 } zero-initializer, padding bytes are not guaranteed to be zeroed. Even worse, according to [1], the init behavior is inconsistent between gcc and clang and optimization levels. All decoding functions in {bsslap,bssmap_le}.c currently use gcc's extension zero-initializer {}. This is not a problem when building with CC=gcc, but with CC=clang the bssmap_le_test fails due to mismatch of padding bytes in struct lcs_cause_ie: [4] PERFORM LOCATION RESPONSE: ERROR: decoded PDU != encoded PDU [5] PERFORM LOCATION RESPONSE: ERROR: decoded PDU != encoded PDU [6] PERFORM LOCATION ABORT: ERROR: decoded PDU != encoded PDU Out of the known struct initialization methods, only the memset() has consistent behavior and sets all bytes to zero, including the padding ones. Using it fixes the bssmap_le_test for CC=clang. [1] https://interrupt.memfault.com/blog/c-struct-padding-initialization Change-Id: Ib16964b16eb04315efc416164ed46c15b5dc7254 Fixes: OS#5923 --- M src/gsm/bsslap.c M src/gsm/bssmap_le.c 2 files changed, 45 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/31505/1 diff --git a/src/gsm/bsslap.c b/src/gsm/bsslap.c index 7b31d1f..70ded13 100644 --- a/src/gsm/bsslap.c +++ b/src/gsm/bsslap.c @@ -217,7 +217,7 @@ int ies_len; struct tlv_parsed tp; - *pdu = (struct bsslap_pdu){}; + memset(pdu, 0x00, sizeof(*pdu)); if (err) *err = NULL; diff --git a/src/gsm/bssmap_le.c b/src/gsm/bssmap_le.c index 3e90a43..1ee4551 100644 --- a/src/gsm/bssmap_le.c +++ b/src/gsm/bssmap_le.c @@ -180,7 +180,7 @@ struct osmo_bssmap_le_err **err, void *err_ctx, const uint8_t *elem, uint8_t len) { - *lt = (struct bssmap_le_location_type){}; + memset(lt, 0x00, sizeof(*lt)); if (!elem || len < 1) DEC_ERR(-EINVAL, msgt, iei, LCS_CAUSE_UNSPECIFIED, "zero length"); @@ -348,7 +348,7 @@ struct osmo_bssmap_le_err **err, void *err_ctx, const uint8_t *data, uint8_t len) { - *lcs_cause = (struct lcs_cause_ie){}; + memset(lcs_cause, 0x00, sizeof(*lcs_cause)); if (!data || len < 1) DEC_ERR(-EINVAL, msgt, iei, LCS_CAUSE_UNSPECIFIED, "zero length"); @@ -558,7 +558,7 @@ struct osmo_bssmap_le_err **err, void *err_ctx, const struct tlv_parsed *tp) { - *params = (struct bssmap_le_perform_loc_req){}; + memset(params, 0x00, sizeof(*params)); DEC_IE_MANDATORY(msgt, BSSMAP_LE_IEI_LOCATION_TYPE, osmo_bssmap_le_ie_dec_location_type, &params->location_type); @@ -606,7 +606,7 @@ struct osmo_bssmap_le_err **err, void *err_ctx, const struct tlv_parsed *tp) { - *params = (struct bssmap_le_perform_loc_resp){}; + memset(params, 0x00, sizeof(*params)); DEC_IE_OPTIONAL_FLAG(msgt, BSSMAP_LE_IEI_GEO_LOCATION, osmo_bssmap_le_ie_dec_gad, &params->location_estimate, params->location_estimate_present); @@ -630,7 +630,7 @@ struct osmo_bssmap_le_err **err, void *err_ctx, const struct tlv_parsed *tp) { - *params = (struct lcs_cause_ie){}; + memset(params, 0x00, sizeof(*params)); DEC_IE_MANDATORY(msgt, BSSMAP_LE_IEI_LCS_CAUSE, osmo_lcs_cause_dec, params); return 0; @@ -647,7 +647,8 @@ struct osmo_bssmap_le_err **err, void *err_ctx, const struct tlv_parsed *tp) { - *params = (struct bssmap_le_conn_oriented_info){}; + memset(params, 0x00, sizeof(*params)); + DEC_IE_MANDATORY(msgt, BSSMAP_LE_IEI_APDU, osmo_bssmap_le_ie_dec_apdu, &params->apdu); return 0; } @@ -711,7 +712,7 @@ int ies_len; struct tlv_parsed tp; - *pdu = (struct bssmap_le_pdu){}; + memset(pdu, 0x00, sizeof(*pdu)); if (len < 1) DEC_ERR(-EINVAL, -1, -1, LCS_CAUSE_UNSPECIFIED, "zero length"); @@ -798,7 +799,7 @@ return RC; \ } while(0) - *pdu = (struct bssap_le_pdu){}; + memset(pdu, 0x00, sizeof(*pdu)); h = msgb_l2(msg); if (!h) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib16964b16eb04315efc416164ed46c15b5dc7254 Gerrit-Change-Number: 31505 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023