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

[XL] Change in docker-playground[master]: open5gs configs: remove comments
by osmith 24 Nov '23

24 Nov '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35103?usp=email ) Change subject: open5gs configs: remove comments ...................................................................... open5gs configs: remove comments A lot of these comments got outdated with recent config changes in the related PR. Instead of syncing the comments again and having a big diff, remove the comments once and then only have diffs of actual config changes in future patches. This will make it easier to maintain these configs. Related: https://github.com/open5gs/open5gs/pull/2739 Change-Id: I67c2a198b9682e15e23a466380e62a976e6236cd --- M ttcn3-ggsn-test/ogs/open5gs-smf.yaml M ttcn3-ggsn-test/ogs/open5gs-upf.yaml M ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml M ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml M ttcn3-pgw-test/open5gs-nrf.yaml M ttcn3-pgw-test/open5gs-smf.yaml M ttcn3-pgw-test/open5gs-upf.yaml 7 files changed, 32 insertions(+), 2,973 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml index 045c585..afb5cf2 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml @@ -1,63 +1,8 @@ -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/smf.yaml.in + logger: level: info -# -# 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 @@ -70,525 +15,6 @@ 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>:7777) -# sbi: -# server: -# no_tls: true -# smf: -# sbi: -# - addr: -# - 0.0.0.0 -# - ::0 -# port: 7777 -# -# o SBI Server(https://<all address available>:443) -# sbi: -# server: -# key: /etc/open5gs/tls/smf.key -# cert: /etc/open5gs/tls/smf.crt -# smf: -# sbi: -# -# 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 -# - addr: ::1 -# -# 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 -# - fd69:f21d:873c:fa::3 -# -# 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 -# -# <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 -# -# -# 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 -# - addr: 2001:db8:cafe::1/48 -# dnn: internet -# - addr: 10.46.0.1/16 -# dnn: ims -# - addr: 2001:db8:babe::1/48 -# dnn: ims -# -# 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 -# - addr: 10.46.0.1/16 -# dnn: ims -# - 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: -# - 10.45.0.100-10.45.0.200 -# - 10.45.1.100-10.45.1.200 -# - addr: 2001:db8:cafe::1/48 -# range: -# - 2001:db8:cafe:a0::0-2001:db8:cafe:b0::0 -# - 2001:db8:cafe:c0::0-2001:db8:cafe:d0::0 -# -# <Domain Name Server> -# -# o Primary/Secondary can be configured. Others are ignored. -# -# smf: -# dns: -# - 8.8.8.8 -# - 8.8.4.4 -# - 2001:4860:4860::8888 -# - 2001:4860:4860::8844 -# -# <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 -# -# 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. -# 3. AMF selects SMF based on S-NSSAI, DNN and TAI in SmfInfo. -# -# 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 -# dnn: -# - internet -# -# o S-NSSAI[SST:1 SD:009000] and DNN[internet or ims] -# smf: -# info: -# - s_nssai: -# - sst: 1 -# sd: 009000 -# dnn: -# - internet -# - ims -# -# o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:99970 TAC:1] -# smf: -# info: -# - s_nssai: -# - sst: 1 -# dnn: -# - internet -# tai: -# - plmn_id: -# 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: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:99970 TAC:10-20,30-40] -# -# smf: -# info: -# - s_nssai: -# - sst: 1 -# dnn: -# - internet -# tai: -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 1-9 -# - s_nssai: -# - sst: 2 -# sd: 000080 -# dnn: -# - internet -# - ims -# - s_nssai: -# - sst: 4 -# dnn: -# - internet -# tai: -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 10-20 -# - 30-40 -# -# o Complex Example -# smf: -# info: -# - s_nssai: -# - sst: 1 -# dnn: -# - internet -# - sst: 1 -# sd: 000080 -# dnn: -# - internet -# - ims -# - sst: 1 -# sd: 009000 -# dnn: -# [internet, ims] -# - sst: 2 -# dnn: -# - internet -# - sst: 3 -# sd: 123456 -# dnn: -# - internet -# tai: -# - plmn_id: -# mcc: 999 -# mnc: 70 -# tac: [1, 2, 3] -# - plmn_id: -# mcc: 999 -# mnc: 70 -# tac: 4 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# tac: -# - 5 -# - 6 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 100-200 -# - 300-400 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 500-600 -# - 700-800 -# - 900-1000 -# - s_nssai: -# - sst: 4 -# dnn: -# - internet -# tai: -# - plmn_id: -# 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 @@ -626,262 +52,23 @@ enabled: auto freeDiameter: /data/freediameter.conf -# -# <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.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, 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 -# - 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) -# If prefer_ipv4 is true, http://127.0.0.10:80 is selected. -# -# sbi: -# addr: -# - 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: - 172.18.3.201 port: 7777 -# -# <PFCP Client>> -# -# o PFCP Client(127.0.0.7:8805) -# upf: -# pfcp: -# addr: 127.0.0.7 -# -# <UPF Selection> -# -# 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.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.7 -# tac: 1 -# - addr: 127.0.0.12 -# tac: [3,5,8] -# -# o UPF selection by UE's DNN/APN (either single DNN/APN or multiple DNNs/APNs) -# -# upf: -# pfcp: -# - addr: 127.0.0.7 -# dnn: ims -# - addr: 127.0.0.12 -# dnn: [internet, web] -# -# o UPF selection by CellID(e_cell_id: 28bit, nr_cell_id: 36bit) -# (either single enb_id or multiple enb_ids, HEX representation) -# -# upf: -# pfcp: -# - addr: 127.0.0.7 -# e_cell_id: 463 -# - addr: 127.0.0.12 -# nr_cell_id: [123456789, 9413] -# upf: pfcp: - addr: 172.18.3.222 -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# -# o Disable selection of UPF PFCP in Round-Robin manner -# 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 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: -# -# 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 -# -# o Handover Wait Duration (Default : 300 ms) -# 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 c82a80c..73e1bac 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml @@ -1,192 +1,8 @@ -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/upf.yaml.in + logger: level: info -# -# <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 -# - ::1 -# teid_range_indication: 4 -# teid_range: 10 -# network_instance: internet -# source_interface: 0 -# - addr: 127.0.10.4 -# teid_range_indication: 4 -# teid_range: 5 -# network_instance: ims -# source_interface: 1 -# -# o Provide custom 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. -# (ogstun, ogstun2, ogstunX, ..) -# -# o IPv4 Pool -# $ sudo ip addr add 10.45.0.1/16 dev ogstun -# -# upf: -# subnet: -# 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 2001:db8:cafe::1/48 dev ogstun -# -# upf: -# subnet: -# - addr: 10.45.0.1/16 -# - addr: 2001:db8:cafe::1/48 -# -# -# o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48 -# All other APNs use 10.45.0.1/16, 2001:db8:cafe::1/48 -# $ 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 2001:db8:cafe::1/48 dev ogstun -# $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun -# -# ; If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash. -# -# upf: -# subnet: -# - addr: 10.45.0.1/16 -# dnn: internet -# - addr: 2001:db8:cafe::1/48 -# dnn: internet -# - addr: 10.46.0.1/16 -# dnn: ims -# - addr: 2001:db8:babe::1/48 -# dnn: ims -# -# 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 -# - addr: 10.46.0.1/16 -# dnn: ims -# - addr: 10.50.0.1/16 ## FALLBACK SUBNET -# -# o Multiple Devices (default: ogstun) -# $ sudo ip addr add 10.45.0.1/16 dev ogstun -# $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun2 -# $ 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 -# - addr: 2001:db8:cafe::1/48 -# dnn: internet -# dev: ogstun2 -# - addr: 10.46.0.1/16 -# dnn: ims -# dev: ogstun3 -# - addr: 2001:db8:babe::1/48 -# 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 @@ -209,54 +25,12 @@ dnn: inet46 dev: ogstun46 -# -# <PFCP Client>> -# -# o PFCP Client(127.0.0.4:8805) -# smf: -# pfcp: -# addr: 127.0.0.4 -# smf: pfcp: - addr: 172.18.3.201 -# -# o Number of output streams per SCTP associations. -# parameter: -# sctp_streams: 30 -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# parameter: -# -# o Maximum Number of UE -# max: -# ue: 1024 -# -# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) -# max: -# peer: 64 -# max: -# -# 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: diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml index 5f38e58..8d1f42e 100644 --- a/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml +++ b/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml @@ -1,63 +1,13 @@ +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/hss.yaml.in + db_uri: mongodb://172.18.3.103/open5gs -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# logger: level: trace hss: freeDiameter: /data/freediameter.conf -# -# hss: -# sms_over_ims: "sip:smsc.mnc001.mcc001.3gppnetwork.org:7060;transport=tcp" -# - -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# -# o Use MongoDB Change Stream -# parameter: -# use_mongodb_change_stream: true -# parameter: -# -# o Maximum Number of UE -# max: -# ue: 1024 -# -# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) -# max: -# peer: 64 -# max: diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml index 74229ea..35b718d 100644 --- a/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml +++ b/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml @@ -1,323 +1,8 @@ -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/mme.yaml.in + logger: level: info -# -# <S1AP Server>> -# -# o S1AP Server(all address available) -# mme: -# s1ap: -# -# o S1AP Server(0.0.0.0:36412) -# mme: -# s1ap: -# addr: 0.0.0.0 -# -# o S1AP Server(127.0.0.2:36412, [::1]:36412) -# mme: -# s1ap: -# - addr: 127.0.0.2 -# - addr: ::1 -# -# o S1AP Server(different port) -# mme: -# s1ap: -# - addr: 127.0.0.2 -# port: 36413 -# -# o S1AP Server(address available in `eth0` interface) -# mme: -# s1ap: -# dev: eth0 -# -# o S1AP Option (Default) -# - sctp_nodelay : true -# - so_linger.l_onoff : false -# -# mme: -# s1ap: -# addr: 127.0.0.2 -# option: -# stcp_nodelay: false -# so_linger: -# l_onoff: true -# l_linger: 10 -# -# o S1AP SCTP Option (Default) -# - spp_hbinterval : 5000 (5secs) -# - spp_sackdelay : 200 (200ms) -# - srto_initial : 3000 (3secs) -# - srto_min : 1000 (1sec) -# - srto_max : 5000 (5secs) -# - sinit_num_ostreams : 30 -# - sinit_max_instreams : 65535 -# - sinit_max_attempts : 4 -# - sinit_max_init_timeo : 8000(8secs) -# -# mme: -# s1ap: -# addr: 127.0.0.2 -# option: -# sctp: -# spp_hbinterval : 5000 -# spp_sackdelay : 200 -# srto_initial : 3000 -# srto_min : 1000 -# srto_max : 5000 -# sinit_num_ostreams : 30 -# sinit_max_instreams : 65535 -# sinit_max_attempts : 4 -# sinit_max_init_timeo : 8000 -# -# <GTP-C Server>> -# -# o GTP-C Server(all address available) -# mme: -# gtpc: -# -# o GTP-C Server(127.0.0.2:2123, [::1]:2123) -# mme: -# gtpc: -# - addr: 127.0.0.2 -# - addr: ::1 -# -# <SGsAP> -# -# o Single MSC/VLR(127.0.0.2) -# mme: -# sgsap: -# addr: 127.0.0.2 -# map: -# tai: -# plmn_id: -# mcc: 001 -# mnc: 01 -# tac: 4130 -# lai: -# plmn_id: -# mcc: 001 -# mnc: 01 -# lac: 43690 -# map: -# tai: -# plmn_id: -# mcc: 002 -# mnc: 02 -# tac: 4132 -# lai: -# plmn_id: -# mcc: 002 -# mnc: 02 -# lac: 43692 -# -# o Multiple MSC/VLR -# mme: -# sgsap: -# - addr: 127.0.0.2 -# port: 29119 -# map: -# tai: -# plmn_id: -# mcc: 001 -# mnc: 01 -# tac: 4131 -# lai: -# plmn_id: -# mcc: 001 -# mnc: 01 -# lac: 43691 -# map: -# tai: -# plmn_id: -# mcc: 002 -# mnc: 02 -# tac: 4132 -# lai: -# plmn_id: -# mcc: 002 -# mnc: 02 -# lac: 43692 -# - addr -# - 127.0.0.4 -# - fd69:f21d:873c:fa::2 -# map: -# tai: -# plmn_id: -# mcc: 001 -# mnc: 01 -# tac: 4132 -# lai: -# plmn_id: -# mcc: 002 -# mnc: 02 -# lac: 43692 -# - name: msc.open5gs.org -# map: -# tai: -# plmn_id: -# mcc: 001 -# mnc: 01 -# tac: 4133 -# lai: -# plmn_id: -# mcc: 002 -# mnc: 02 -# lac: 43693 -# -# <Metrics Server> -# -# o Metrics Server(http://<any address>:9090) -# mme: -# metrics: -# - addr: 0.0.0.0 -# port: 9090 -# -# <GUMMEI> -# -# o Multiple GUMMEI -# mme: -# gummei: -# - plmn_id: -# mcc: 001 -# mnc: 01 -# mme_gid: 2 -# mme_code: 1 -# - plmn_id: -# - mcc: 002 -# mnc: 02 -# - mcc: 003 -# mnc: 03 -# mme_gid: [3, 4] -# mme_code: -# - 2 -# - 3 -# -# -# <TAI> -# -# o Multiple TAI -# -# When multiple TAIs are configured as shown below, -# the Served TAI is determined by comparing UserLocationInformation -# of UplinkNASTransport sent from eNB. -# -# For example, if the eNB sends TAC with 30 to the MME, -# the fourth TAI (TAC: 20, 28, 29-32, 36-38, 40-42, 50, 60, 70, 70) -# is determined as the Served TAI. The result is transmitted to the eNB -# as a Tracking Area identity List in Registration Accept. -# -# mme: -# tai: -# - plmn_id: -# mcc: 001 -# mnc: 01 -# tac: [1, 3, 5] -# tai: -# - plmn_id: -# mcc: 002 -# mnc: 02 -# tac: [6-10, 15-18] -# tai: -# - plmn_id: -# mcc: 003 -# mnc: 03 -# tac: 20 -# - plmn_id: -# mcc: 004 -# mnc: 04 -# tac: 21 -# tai: -# - plmn_id: -# mcc: 005 -# mnc: 05 -# tac: [22, 28] -# - plmn_id: -# mcc: 006 -# mnc: 06 -# tac: [30-32, 34, 36-38, 40-42, 44, 46, 48] -# - plmn_id: -# mcc: 007 -# mnc: 07 -# tac: 50 -# - plmn_id: -# mcc: 008 -# mnc: 08 -# tac: 60 -# - plmn_id: -# mcc: 009 -# mnc: 09 -# tac: [70, 80] -# -# -# <Access Control> -# -# If access_control is not specified, then all networks are allowed -# If access_control is defined, -# no other networks are allowed other than matching plmn_id. -# -# default_reject_cause may be used to overwrite the default error cause #11 -# for non matching plmn_id -# -# for matching plmn_id with reject_cause defined, -# the MME rejects access with the reject_cause error cause -# -# for matching plmn_id without reject_cause defined, -# the MME accepts the PLMN traffic -# -# o The example below only accepts 002/02 and 999/70 PLMNs. -# 001/01 is rejected with cause 15, -# and the rest of the PLMNs are rejected with default cause 13. -# -# mme: -# access_control: -# - default_reject_cause: 13 -# - plmn_id: -# reject_cause: 15 -# mcc: 001 -# mnc: 01 -# - plmn_id: -# mcc: 002 -# mnc: 02 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# -# -# <Network Name> -# mme: -# network_name: -# full: Open5GS -# short: Next -# -# <MME Name> -# mme: -# mme_name: open5gs-mme0 -# -# <Relative Capacity> - Default(255) -# mme: -# relative_capacity: 100 -# mme: freeDiameter: /data/freediameter.conf s1ap: @@ -345,172 +30,16 @@ full: Open5GS mme_name: open5gs-mme0 -# -# <GTP-C Client> -# -# o Specify SGW addresses the GTP-C must connect to -# -# o One SGW is defined. -# If prefer_ipv4 is not true, [fd69:f21d:873c:fa::2] is selected. -# sgwc: -# gtpc: -# addr: -# - 127.0.0.3 -# - fd69:f21d:873c:fa::2 -# -# o Two SGW are defined. MME selects SGW with round-robin manner per UE -# sgwc: -# gtpc: -# - addr: 127.0.0.3 -# - addr: fd69:f21d:873c:fa::2 -# -# o Three SGW are defined. MME selects SGW with round-robin manner per UE -# sgwc: -# gtpc: -# - addr -# - 127.0.0.3 -# - fd69:f21d:873c:fa::2 -# - addr -# - 127.0.0.22 -# - fd69:f21d:873c:fa::12 -# - name: sgw3.open5gs.org -# -# <SGW Selection Mode> -# -# o Round-Robin -# sgwc: -# gtpc: -# addr: 127.0.0.3 -# addr: 127.0.2.2 -# addr: 127.0.4.2 -# -# o SGW selection by eNodeB TAC -# (either single TAC or multiple TACs, DECIMAL representation) -# -# sgwc: -# gtpc: -# - addr: 127.0.0.3 -# tac: 26000 -# - addr: 127.0.2.2 -# tac: [25000, 27000, 28000] -# -# o SGW selection by e_cell_id(28bit) -# (either single or multiple e_cell_id, HEX representation) -# -# sgwc: -# gtpc: -# - addr: 127.0.0.3 -# e_cell_id: abcde01 -# - addr: 127.0.2.2 -# e_cell_id: [12345, a9413, 98765] -# sgwc: gtpc: - addr: 172.18.3.202 -# -# 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. -# (Default values are used, so no configuration is required) -# -# o Two SMF are defined. 127.0.0.4:2123 is used. -# [fd69:f21d:873c:fa::3]:2123 is ignored. -# smf: -# gtpc: -# - addr: 127.0.0.4 -# - addr: fd69:f21d:873c:fa::3 -# -# o One SMF is defined. if prefer_ipv4 is not true, -# [fd69:f21d:873c:fa::3] is selected. -# smf: -# gtpc: -# - addr: -# - 127.0.0.4 -# - fd69:f21d:873c:fa::3 -# -# 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. -# smf: -# gtpc: -# - 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 SMF node. -# smf: -# gtpc: -# - addr: 127.0.0.4 -# - addr: 127.0.0.5 -# apn: volte -# -# o SMF selection by eNodeB TAC -# (either single TAC or multiple TACs, DECIMAL representation) -# -# gtpc: -# - addr: 127.0.0.4 -# tac: 26000 -# - addr: 127.0.2.4 -# tac: [25000, 27000, 28000] -# -# o SMF selection by e_cell_id(28bit) -# (either single or multiple e_cell_id, HEX representation) -# -# gtpc: -# - addr: 127.0.0.4 -# e_cell_id: abcde01 -# - addr: 127.0.2.4 -# e_cell_id: [12345, a9413, 98765] smf: gtpc: - addr: - 172.18.3.201 - ::1 - -# <GTP-C Client> -# -# o Specify SGSN addresses the GTP-C must connect to -# -# o One SGSN is defined. -# If prefer_ipv4 is not true, [fd69:f21d:873c:fa::2] is selected. -# sgsn: -# - gtpc: -# addr: -# - 127.0.0.3 -# - fd69:f21d:873c:fa::2 -# routes: -# - rai: XYZ -# ci: XYZ -# -# o Three SGW are defined. MME selects SGW with round-robin manner per UE -# sgsn: -# - gtpc: -# addr: -# - 127.0.0.3 -# - fd69:f21d:873c:fa::2 -# routes: -# - rai: XYZ -# ci: XYZ -# - gtpc: -# addr -# - 127.0.0.22 -# - fd69:f21d:873c:fa::12 -# routes: -# - rai: XYZ -# ci: XYZ -# - name: sgsn3.open5gs.org -# routes: -# - rai: XYZ -# ci: XYZ -# sgsn: - gtpc: addr: @@ -526,63 +55,10 @@ rac: 187 ci: 1223 -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# parameter: -# -# o Maximum Number of UE -# max: -# ue: 1024 -# -# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) -# max: -# peer: 64 -# max: -# -# usrsctp: -# udp_port : 9899 -# usrsctp: -# -# 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 -# -# o Handover Wait Duration (Default : 300 ms) -# Time to wait for MME to send UEContextReleaseCommand -# to the source eNB after receiving HandoverNotify -# (Default values are used, so no configuration is required) -# -# o Handover Wait Duration (500ms) -# time: -# handover: -# duration: 500 -# -# o Timers of EPS mobility/session management -# time: -# t3402: -# value: 720 # 12 minutes * 60 = 720 seconds -# t3412: -# value: 3240 # 54 minutes * 60 = 3240 seconds -# t3423: -# value: 720 # 12 minutes * 60 = 720 seconds time: diff --git a/ttcn3-pgw-test/open5gs-nrf.yaml b/ttcn3-pgw-test/open5gs-nrf.yaml index a7b615f..b37ec0d 100644 --- a/ttcn3-pgw-test/open5gs-nrf.yaml +++ b/ttcn3-pgw-test/open5gs-nrf.yaml @@ -1,68 +1,10 @@ +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/nrf.yaml.in + db_uri: mongodb://localhost/open5gs -# -# logger: -# -# o Set OGS_LOG_INFO to all domain level -# - If `level` is omitted, the default level is OGS_LOG_INFO) -# - If `domain` is omitted, the all domain level is set from 'level' -# (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,sbi,ausf,event,tlv,mem,sock -# logger: level: info -# -# 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 @@ -75,266 +17,20 @@ key: /etc/open5gs/tls/nrf.key cert: /etc/open5gs/tls/nrf.crt -# -# <SBI Server> -# -# o SBI Server(http://<all address available>:80) -# sbi: -# server: -# no_tls: true -# nrf: -# sbi: -# -# o SBI Server(http://<any address>:7777) -# sbi: -# server: -# no_tls: true -# nrf: -# sbi: -# - addr: -# - 0.0.0.0 -# - ::0 -# port: 7777 -# -# o SBI Server(https://<all address available>:443) -# sbi: -# server: -# key: /etc/open5gs/tls/nrf.key -# cert: /etc/open5gs/tls/nrf.crt -# nrf: -# sbi: -# -# o SBI Server(https://127.0.0.10:443, https://[::1]:443) without verification -# sbi: -# server: -# no_verify: true -# key: /etc/open5gs/tls/nrf.key -# cert: /etc/open5gs/tls/nrf.crt -# nrf: -# sbi: -# - addr: 127.0.0.10 -# - addr: ::1 -# -# o SBI Server(https://nrf.open5gs.org:443) -# Use the specified certificate while verifying the client -# -# sbi: -# server: -# cacert: /etc/open5gs/tls/ca.crt -# key: /etc/open5gs/tls/nrf.key -# cert: /etc/open5gs/tls/nrf.crt -# nrf: -# sbi: -# - name: nrf.open5gs.org -# -# o SBI Server(http://127.0.0.10:7777) -# sbi: -# server: -# no_tls: true -# nrf: -# sbi: -# - addr: 127.0.0.10 -# port: 7777 -# -# o SBI Server(http://<eth0 IP address>:80) -# sbi: -# server: -# no_tls: true -# nrf: -# sbi: -# - dev: eth0 -# -# o Provide custom SBI address to be advertised to NRF -# sbi: -# server: -# no_tls: true -# nrf: -# sbi: -# - dev: eth0 -# advertise: open5gs-nrf.svc.local -# -# o Another example of advertising on NRF -# sbi: -# server: -# no_tls: true -# nrf: -# 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 -# nrf: -# sbi: -# addr: 127.0.0.10 -# option: -# tcp_nodelay: false -# so_linger: -# l_onoff: true -# l_linger: 10 -# -# <NF Service> -# -# o NF Service Name(Default : all NF services available) -# nrf: -# service_name: -# -# o NF Service Name(Only some NF services are available) -# nrf: -# service_name: -# - nnrf-nfm -# - nnrf-disc -# nrf: sbi: addr: - 172.18.18.10 port: 7777 -# -# <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 -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# parameter: -# -# o Maximum Number of UE -# max: -# ue: 1024 -# -# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) -# max: -# peer: 64 -# max: -# -# -# o NF Instance Heartbeat (Default : 10 seconds) -# (Default values are used, so no configuration is required) -# -# o NF Instance Heartbeat (Disabled) -# time: -# nf_instance: -# heartbeat: 0 -# -# o NF Instance Heartbeat (5 seconds) -# time: -# nf_instance: -# heartbeat: 5 -# -# o NF Instance Validity (Default : 3600 seconds = 1 hour) -# (Default values are used, so no configuration is required) -# -# o NF Instance Validity (10 seconds) -# time: -# nf_instance: -# validity: 10 -# -# o Subscription Validity (Default : 86400 seconds = 1 day) -# (Default values are used, so no configuration is required) -# -# o Subscription Validity (Disabled) -# time: -# subscription: -# validity: 0 -# -# o Subscription Validity (3600 seconds = 1 hour) -# time: -# subscription: -# validity: 3600 -# -# 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: diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf.yaml index f75a6e6..622618b 100644 --- a/ttcn3-pgw-test/open5gs-smf.yaml +++ b/ttcn3-pgw-test/open5gs-smf.yaml @@ -1,63 +1,8 @@ -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/smf.yaml.in + logger: level: info -# -# 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 @@ -70,525 +15,6 @@ 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>:7777) -# sbi: -# server: -# no_tls: true -# smf: -# sbi: -# - addr: -# - 0.0.0.0 -# - ::0 -# port: 7777 -# -# o SBI Server(https://<all address available>:443) -# sbi: -# server: -# key: /etc/open5gs/tls/smf.key -# cert: /etc/open5gs/tls/smf.crt -# smf: -# sbi: -# -# 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 -# - addr: ::1 -# -# 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 -# - fd69:f21d:873c:fa::3 -# -# 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 -# -# <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 -# -# -# 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 -# - addr: 2001:db8:cafe::1/48 -# dnn: internet -# - addr: 10.46.0.1/16 -# dnn: ims -# - addr: 2001:db8:babe::1/48 -# dnn: ims -# -# 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 -# - addr: 10.46.0.1/16 -# dnn: ims -# - 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: -# - 10.45.0.100-10.45.0.200 -# - 10.45.1.100-10.45.1.200 -# - addr: 2001:db8:cafe::1/48 -# range: -# - 2001:db8:cafe:a0::0-2001:db8:cafe:b0::0 -# - 2001:db8:cafe:c0::0-2001:db8:cafe:d0::0 -# -# <Domain Name Server> -# -# o Primary/Secondary can be configured. Others are ignored. -# -# smf: -# dns: -# - 8.8.8.8 -# - 8.8.4.4 -# - 2001:4860:4860::8888 -# - 2001:4860:4860::8844 -# -# <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 -# -# 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. -# 3. AMF selects SMF based on S-NSSAI, DNN and TAI in SmfInfo. -# -# 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 -# dnn: -# - internet -# -# o S-NSSAI[SST:1 SD:009000] and DNN[internet or ims] -# smf: -# info: -# - s_nssai: -# - sst: 1 -# sd: 009000 -# dnn: -# - internet -# - ims -# -# o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:99970 TAC:1] -# smf: -# info: -# - s_nssai: -# - sst: 1 -# dnn: -# - internet -# tai: -# - plmn_id: -# 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: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:99970 TAC:10-20,30-40] -# -# smf: -# info: -# - s_nssai: -# - sst: 1 -# dnn: -# - internet -# tai: -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 1-9 -# - s_nssai: -# - sst: 2 -# sd: 000080 -# dnn: -# - internet -# - ims -# - s_nssai: -# - sst: 4 -# dnn: -# - internet -# tai: -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 10-20 -# - 30-40 -# -# o Complex Example -# smf: -# info: -# - s_nssai: -# - sst: 1 -# dnn: -# - internet -# - sst: 1 -# sd: 000080 -# dnn: -# - internet -# - ims -# - sst: 1 -# sd: 009000 -# dnn: -# [internet, ims] -# - sst: 2 -# dnn: -# - internet -# - sst: 3 -# sd: 123456 -# dnn: -# - internet -# tai: -# - plmn_id: -# mcc: 999 -# mnc: 70 -# tac: [1, 2, 3] -# - plmn_id: -# mcc: 999 -# mnc: 70 -# tac: 4 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# tac: -# - 5 -# - 6 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 100-200 -# - 300-400 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 500-600 -# - 700-800 -# - 900-1000 -# - s_nssai: -# - sst: 4 -# dnn: -# - internet -# tai: -# - plmn_id: -# 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.18.4 @@ -617,262 +43,22 @@ enabled: auto freeDiameter: /data/freeDiameter-smf.conf -# -# <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.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, 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 -# - 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) -# If prefer_ipv4 is true, http://127.0.0.10:80 is selected. -# -# sbi: -# addr: -# - 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: - 172.18.18.10 port: 7777 -# -# <PFCP Client>> -# -# o PFCP Client(127.0.0.7:8805) -# upf: -# pfcp: -# addr: 127.0.0.7 -# -# <UPF Selection> -# -# 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.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.7 -# tac: 1 -# - addr: 127.0.0.12 -# tac: [3,5,8] -# -# o UPF selection by UE's DNN/APN (either single DNN/APN or multiple DNNs/APNs) -# -# upf: -# pfcp: -# - addr: 127.0.0.7 -# dnn: ims -# - addr: 127.0.0.12 -# dnn: [internet, web] -# -# o UPF selection by CellID(e_cell_id: 28bit, nr_cell_id: 36bit) -# (either single enb_id or multiple enb_ids, HEX representation) -# -# upf: -# pfcp: -# - addr: 127.0.0.7 -# e_cell_id: 463 -# - addr: 127.0.0.12 -# nr_cell_id: [123456789, 9413] -# upf: pfcp: - addr: 172.18.18.7 -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# -# o Disable selection of UPF PFCP in Round-Robin manner -# 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 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: -# -# 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 -# -# o Handover Wait Duration (Default : 300 ms) -# 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-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf.yaml index 693a1d7..fec9fc7 100644 --- a/ttcn3-pgw-test/open5gs-upf.yaml +++ b/ttcn3-pgw-test/open5gs-upf.yaml @@ -1,192 +1,8 @@ -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/upf.yaml.in + logger: level: info -# -# <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 -# - ::1 -# teid_range_indication: 4 -# teid_range: 10 -# network_instance: internet -# source_interface: 0 -# - addr: 127.0.10.4 -# teid_range_indication: 4 -# teid_range: 5 -# network_instance: ims -# source_interface: 1 -# -# o Provide custom 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. -# (ogstun, ogstun2, ogstunX, ..) -# -# o IPv4 Pool -# $ sudo ip addr add 10.45.0.1/16 dev ogstun -# -# upf: -# subnet: -# 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 2001:db8:cafe::1/48 dev ogstun -# -# upf: -# subnet: -# - addr: 10.45.0.1/16 -# - addr: 2001:db8:cafe::1/48 -# -# -# o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48 -# All other APNs use 10.45.0.1/16, 2001:db8:cafe::1/48 -# $ 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 2001:db8:cafe::1/48 dev ogstun -# $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun -# -# ; If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash. -# -# upf: -# subnet: -# - addr: 10.45.0.1/16 -# dnn: internet -# - addr: 2001:db8:cafe::1/48 -# dnn: internet -# - addr: 10.46.0.1/16 -# dnn: ims -# - addr: 2001:db8:babe::1/48 -# dnn: ims -# -# 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 -# - addr: 10.46.0.1/16 -# dnn: ims -# - addr: 10.50.0.1/16 ## FALLBACK SUBNET -# -# o Multiple Devices (default: ogstun) -# $ sudo ip addr add 10.45.0.1/16 dev ogstun -# $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun2 -# $ 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 -# - addr: 2001:db8:cafe::1/48 -# dnn: internet -# dev: ogstun2 -# - addr: 10.46.0.1/16 -# dnn: ims -# dev: ogstun3 -# - addr: 2001:db8:babe::1/48 -# 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.18.7 @@ -200,54 +16,12 @@ dnn: internet dev: ogstun46 -# -# <PFCP Client>> -# -# o PFCP Client(127.0.0.4:8805) -# smf: -# pfcp: -# addr: 127.0.0.4 -# smf: pfcp: addr: 172.18.18.4 -# -# o Number of output streams per SCTP associations. -# parameter: -# sctp_streams: 30 -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# parameter: -# -# o Maximum Number of UE -# max: -# ue: 1024 -# -# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) -# max: -# peer: 64 -# max: -# -# 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/+/35103?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I67c2a198b9682e15e23a466380e62a976e6236cd Gerrit-Change-Number: 35103 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
by fixeria 24 Nov '23

24 Nov '23

Attention is currently required from: daniel, laforge, lynxis lazus, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email ) Change subject: libgtp: Check for all successful create_pdp_conf causes ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/sgsn/sgsn_libgtp.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/35094/comment/bf8cb339_100396de PS2, Line 420: if (gtp_cause_successful(cause)) { > true is false ☯ Done -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 Gerrit-Change-Number: 35094 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 24 Nov 2023 07:44:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
by fixeria 24 Nov '23

24 Nov '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email ) Change subject: Add a GSM RLP decoder and encoder ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: Would be also nice to have some unit test coverage. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917 Gerrit-Change-Number: 35123 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 24 Nov 2023 07:42:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
by fixeria 24 Nov '23

24 Nov '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email ) Change subject: Add a GSM RLP decoder and encoder ...................................................................... Patch Set 2: (6 comments) File include/osmocom/gsm/rlp.h: https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/e6e943e7_0d077a3a PS2, Line 24: GSM A5 ciphering algorithm copy-paste https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/db8bb2e2_82c0f279 PS2, Line 28: 24.002 It should actually be TS 24.022. https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/4d173cf8_6ad9a36f PS2, Line 75: osmo_rlp_decode also expose `osmo_rlp_encode`? File src/gsm/libosmogsm.map: https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/9ecd737a_db24db2c PS2, Line 863: osmo_rlp_decode also expose `osmo_rlp_encode`? File src/gsm/rlp.c: https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/e86caeff_197bfc48 PS2, Line 77: EINVAL `ENOTSUP` https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/3c8d5198_9efab098 PS2, Line 121: EINVAL `ENOTSUP` -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917 Gerrit-Change-Number: 35123 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 24 Nov 2023 07:42:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: call_leg: silence some false errors
by fixeria 24 Nov '23

24 Nov '23

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35100?usp=email ) Change subject: call_leg: silence some false errors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35100?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b1fd63ed1ee7ed2877a4b2059386354598f4ea4 Gerrit-Change-Number: 35100 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 24 Nov 2023 07:32:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle
by fixeria 24 Nov '23

24 Nov '23

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email ) Change subject: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/bts.h: https://gerrit.osmocom.org/c/osmo-pcu/+/35096/comment/b6be7124_a8a58beb PS1, Line 282: idele idle -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7a08d8cc670fa14f7206ffffdbc22351f3668a17 Gerrit-Change-Number: 35096 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 24 Nov 2023 07:29:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
by laforge 23 Nov '23

23 Nov '23

Attention is currently required from: fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Add a GSM RLP decoder and encoder ...................................................................... Add a GSM RLP decoder and encoder This code implements a decoder and encoder for the RLP (Radio Link Protocol) as used in the bearer channel of GSM CSD (Circuit Switched Data). Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917 --- M include/osmocom/gsm/Makefile.am A include/osmocom/gsm/rlp.h M src/gsm/Makefile.am M src/gsm/libosmogsm.map A src/gsm/rlp.c 5 files changed, 329 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/35123/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917 Gerrit-Change-Number: 35123 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-bts[master]: Add GSMTAP encapsulation of RLP frames in CSD NT mode
by laforge 23 Nov '23

23 Nov '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email ) Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: this needs to be vty-configurable and should likely contain a [default] setting of suppressing any NULL Frames to avoid filling the pcap with uesless info -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6a258458822bcb3fe7290a9b9b3d104beecda219 Gerrit-Change-Number: 35124 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 23 Nov 2023 22:19:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: Add GSMTAP encapsulation of RLP frames in CSD NT mode
by laforge 23 Nov '23

23 Nov '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email ) Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode ...................................................................... Add GSMTAP encapsulation of RLP frames in CSD NT mode In CSD (Circuit Switched Data) NT (Non-Transparent) mode, there are RLP (Radio Link Protocol) frames inside the modified V.110. wireshark alrady has a dissector for this, and we've introduced a GSMTAP type for RLP some time ago. So with this patch, we now generate such GSMTAP RLP frames. Change-Id: I6a258458822bcb3fe7290a9b9b3d104beecda219 --- M src/common/l1sap.c 1 file changed, 55 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/35124/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index c599726..4b2ca02 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1841,19 +1841,54 @@ return 1; } -static void send_ul_rtp_packet_data(struct gsm_lchan *lchan, uint32_t fn, +static void gsmtap_csd_ul(struct gsm_lchan *lchan, const struct ph_tch_param *tch_ind, const uint8_t *data, unsigned int data_len) +{ + struct gsm_bts_trx *trx = lchan->ts->trx; + struct gsmtap_inst *inst = trx->bts->gsmtap.inst; + if (!inst) + return; + + if (lchan->csd_mode == LCHAN_CSD_M_NT) { + pbit_t buf[data_len/8+1]; + int len = osmo_ubit2pbit_ext(buf, 0, data, 0, data_len, 1); + gsmtap_send_ex(inst, GSMTAP_TYPE_GSM_RLP, trx->arfcn | GSMTAP_ARFCN_F_UPLINK, lchan->ts->nr, + lchan->type == GSM_LCHAN_TCH_H ? GSMTAP_CHANNEL_TCH_H : GSMTAP_CHANNEL_TCH_F, + lchan->nr, tch_ind->fn, tch_ind->rssi, 0, buf, len); + + } +} + +static void gsmtap_csd_dl(struct gsm_lchan *lchan, const uint8_t *data, unsigned int data_len) +{ + struct gsm_bts_trx *trx = lchan->ts->trx; + struct gsmtap_inst *inst = trx->bts->gsmtap.inst; + if (!inst) + return; + + if (lchan->csd_mode == LCHAN_CSD_M_NT) { + pbit_t buf[data_len/8+1]; + int len = osmo_ubit2pbit_ext(buf, 0, data, 0, data_len, 1); + gsmtap_send_ex(inst, GSMTAP_TYPE_GSM_RLP, trx->arfcn, lchan->ts->nr, + lchan->type == GSM_LCHAN_TCH_H ? GSMTAP_CHANNEL_TCH_H : GSMTAP_CHANNEL_TCH_F, + lchan->nr, 0, 0, 0, buf, len); + } +} + +static void send_ul_rtp_packet_data(struct gsm_lchan *lchan, const struct ph_tch_param *tch_ind, const uint8_t *data, uint16_t data_len) { uint8_t rtp_pl[RFC4040_RTP_PLEN]; int rc; + gsmtap_csd_ul(lchan, tch_ind, data, data_len); + rc = csd_v110_rtp_encode(lchan, &rtp_pl[0], data, data_len); if (rc < 0) return; osmo_rtp_send_frame_ext(lchan->abis_ip.rtp_socket, &rtp_pl[0], sizeof(rtp_pl), - fn_ms_adj(fn, lchan), + fn_ms_adj(tch_ind->fn, lchan), lchan->rtp_tx_marker); /* Only clear the marker bit once we have sent a RTP packet with it */ lchan->rtp_tx_marker = false; @@ -1987,7 +2022,7 @@ send_ul_rtp_packet_speech(lchan, fn, msg->data, msg->len); break; case RSL_CMOD_SPD_DATA: - send_ul_rtp_packet_data(lchan, fn, msg->data, msg->len); + send_ul_rtp_packet_data(lchan, tch_ind, msg->data, msg->len); break; case RSL_CMOD_SPD_SIGN: return 0; /* drop stale TCH.ind */ @@ -2296,6 +2331,7 @@ int rc = csd_v110_rtp_decode(lchan, msg->tail, rtp_pl, rtp_pl_len); if (rc > 0) { + gsmtap_csd_dl(lchan, msg->tail, rc); msgb_put(msg, rc); } else { msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6a258458822bcb3fe7290a9b9b3d104beecda219 Gerrit-Change-Number: 35124 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
by Jenkins Builder 23 Nov '23

23 Nov '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email ) Change subject: Add a GSM RLP decoder and encoder ...................................................................... Patch Set 1: (1 comment) File src/gsm/rlp.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12602): https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/02357150_8ba1b962 PS1, Line 169: fcs = osmo_rlp_fcs_compute(out, out_len -3); need consistent spacing around '-' (ctx:WxV) (or typedef missing in osmo-ci/lint/checkpatch/typedefs_osmo.txt?) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917 Gerrit-Change-Number: 35123 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 23 Nov 2023 22:13:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0