March 2026 - gerrit-log - lists.osmocom.org

[XS] Change in ...osmo-s1gw[master]: [REST] PfcpAssocState: field 'lrts' is required
by fixeria 24 Mar '26

24 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42483?usp=email ) Change subject: [REST] PfcpAssocState: field 'lrts' is required ...................................................................... [REST] PfcpAssocState: field 'lrts' is required The local RTS is always known and thus always gets included regardless of the PFCP association state. Only the remote RTS is optional. Change-Id: Ic766ebc56ce1810fc27cb49ddcac50bc94e539d9 Related: osmo-ttcn3-hacks.git I332e95a32935e0c8da99e600e8d30af14bd36b16 --- M contrib/openapi.yaml M priv/openapi.json 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/83/42483/1 diff --git a/contrib/openapi.yaml b/contrib/openapi.yaml index 9308027..59de93f 100644 --- a/contrib/openapi.yaml +++ b/contrib/openapi.yaml @@ -333,6 +333,7 @@ - state - laddr - raddr + - lrts properties: state: type: string diff --git a/priv/openapi.json b/priv/openapi.json index f305739..cf2fb50 100644 --- a/priv/openapi.json +++ b/priv/openapi.json @@ -500,7 +500,8 @@ "required": [ "state", "laddr", - "raddr" + "raddr", + "lrts" ], "properties": { "state": { -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic766ebc56ce1810fc27cb49ddcac50bc94e539d9 Gerrit-Change-Number: 42483 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: gtpu_kpi: use ?ENV_DEFAULT_GTPU_KPI_{TABLE_NAME,INTERVAL}
by fixeria 24 Mar '26

24 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42484?usp=email ) Change subject: gtpu_kpi: use ?ENV_DEFAULT_GTPU_KPI_{TABLE_NAME,INTERVAL} ...................................................................... gtpu_kpi: use ?ENV_DEFAULT_GTPU_KPI_{TABLE_NAME,INTERVAL} Change-Id: Ia8194966b20da1adc26c02f416b8ec0508191d98 --- M src/gtpu_kpi.erl 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/84/42484/1 diff --git a/src/gtpu_kpi.erl b/src/gtpu_kpi.erl index 9432626..309f554 100644 --- a/src/gtpu_kpi.erl +++ b/src/gtpu_kpi.erl @@ -49,6 +49,7 @@ -include_lib("kernel/include/logger.hrl"). +-include("osmo_s1gw.hrl"). -include("s1gw_metrics.hrl"). -define(GTPU_PORT, 2152). @@ -146,8 +147,8 @@ %% ------------------------------------------------------------------ init([#{enable := true} = Cfg]) -> - TName = maps:get(table_name, Cfg, "osmo-s1gw"), - Interval = maps:get(interval, Cfg, 3000), + TName = maps:get(table_name, Cfg, ?ENV_DEFAULT_GTPU_KPI_TABLE_NAME), + Interval = maps:get(interval, Cfg, ?ENV_DEFAULT_GTPU_KPI_INTERVAL), %% flush the table, in case it remained %% it may not exist, so we ignore the result nft_flush_table(TName), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42484?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ia8194966b20da1adc26c02f416b8ec0508191d98 Gerrit-Change-Number: 42484 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: config/sys.config: group pfcp_peer params into a map
by fixeria 24 Mar '26

24 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42485?usp=email ) Change subject: config/sys.config: group pfcp_peer params into a map ...................................................................... config/sys.config: group pfcp_peer params into a map Following the same pattern as sctp_{client,server}, group the flat pfcp_loc_addr/pfcp_rem_addr environment variables into a pfcp_peer map. The old flat keys are still supported for backwards compat. Changes: * osmo_s1gw_sup: add pfcp_cfg(), merging legacy flat keys with the new pfcp_peer map (new takes priority); store the resolved config back via set_env(pfcp_peer, ...) so all consumers see a single canonical map * pfcp_peer: change start_link/2 to start_link/1 taking a cfg() map; simplify init() using sctp_common:parse_addr/1; add cfg() type * rest_server: read pfcp laddr/raddr from the pfcp_peer map Change-Id: Iba954746fe20e6b9eeaec3196e1f83e3fc3e7fc2 --- M config/sys.config M doc/manuals/chapters/configuration.adoc M src/osmo_s1gw_sup.erl M src/pfcp_peer.erl M src/rest_server.erl 5 files changed, 49 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/85/42485/1 diff --git a/config/sys.config b/config/sys.config index d428765..af6480b 100644 --- a/config/sys.config +++ b/config/sys.config @@ -26,8 +26,13 @@ %% socket options (if omitted or left empty, defaults apply) - see above sockopts => #{ } }}, - {pfcp_loc_addr, "127.0.1.1"}, %% local address for incoming PFCP PDUs from the UPF - {pfcp_rem_addr, "127.0.1.2"} %% remote address for outgoing PFCP PDUs to the UPF + %% PFCP peer (UPF) configuration + {pfcp_peer, #{ + %% local address for incoming PFCP PDUs from the UPF + laddr => "127.0.1.1", + %% remote address for outgoing PFCP PDUs to the UPF + raddr => "127.0.1.2" + }} %% Optional PFCP Network Instance IEs (omitted if not configured) %% {pfcp_net_inst_core, "core-side"}, %% PFCP Network Instance IE value (to core) %% {pfcp_net_inst_access, "radio-side"} %% PFCP Network Instance IE value (to access) diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 0d4315f..a43c9ad 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -134,21 +134,27 @@ These parameters control the PFCP session between OsmoS1GW and the UPF. ---- -{pfcp_loc_addr, "127.0.1.1"}, %% local address for PFCP (UDP) -{pfcp_rem_addr, "127.0.1.2"}, %% remote address of the UPF +{pfcp_peer, #{ + laddr => "127.0.1.1", %% local address for PFCP (UDP) + raddr => "127.0.1.2" %% remote address of the UPF +}}, %% Optional Network Instance IEs: %% {pfcp_net_inst_core, "core-side"}, %% {pfcp_net_inst_access, "radio-side"} ---- -`pfcp_loc_addr`:: +`laddr`:: Local IP address on which OsmoS1GW listens for PFCP messages from the UPF. Default: `"127.0.1.1"`. -`pfcp_rem_addr`:: +`raddr`:: Remote IP address of the UPF. Default: `"127.0.1.2"`. +NOTE: The legacy flat keys `pfcp_loc_addr` and `pfcp_rem_addr` are still +accepted for backwards compatibility. The `pfcp_peer` map takes priority +if both are present. + `pfcp_net_inst_core`:: Value for the PFCP Network Instance IE on the core-network side of each GTP-U session. Omit if the UPF does not require Network Instance IEs. diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index fd89b3c..573f2cb 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -52,16 +52,17 @@ init([]) -> - PfcpLocAddr = osmo_s1gw:get_env(pfcp_loc_addr, ?ENV_DEFAULT_PFCP_LOC_ADDR), - PfcpRemAddr = osmo_s1gw:get_env(pfcp_rem_addr, ?ENV_DEFAULT_PFCP_REM_ADDR), - ClientCfg = client_cfg(), ServerCfg = server_cfg(), + PfcpCfg = pfcp_cfg(), %% Set a complete 'sctp_client' section with all fields populated. %% This may be used by mme_registry:mme_list_from_sctp_client/0 %% if the 'mme_pool' is missing in the configuration file. osmo_s1gw:set_env(sctp_client, ClientCfg), + %% Set a complete 'pfcp_peer' section with all fields populated. + %% This way the rest_server can read from it without legacy key handling. + osmo_s1gw:set_env(pfcp_peer, PfcpCfg), EnbRegistry = {enb_registry, {enb_registry, start_link, []}, permanent, @@ -78,8 +79,7 @@ 5000, worker, [sctp_server]}, - PfcpPeer = {pfcp_peer, {pfcp_peer, start_link, - [PfcpLocAddr, PfcpRemAddr]}, + PfcpPeer = {pfcp_peer, {pfcp_peer, start_link, [PfcpCfg]}, permanent, 5000, worker, @@ -151,6 +151,17 @@ priv => undefined}. +-spec pfcp_cfg() -> pfcp_peer:cfg(). +pfcp_cfg() -> + %% parse old/legacy environment options, if any + OldCfg = parse_env_map(#{laddr => pfcp_loc_addr, + raddr => pfcp_rem_addr}), + %% parse the new pfcp configuration block (takes priority) + Cfg = maps:merge(OldCfg, osmo_s1gw:get_env(pfcp_peer, #{ })), + #{laddr => maps:get(laddr, Cfg, ?ENV_DEFAULT_PFCP_LOC_ADDR), + raddr => maps:get(raddr, Cfg, ?ENV_DEFAULT_PFCP_REM_ADDR)}. + + -spec gtpu_kpi_cfg() -> gtpu_kpi:cfg(). gtpu_kpi_cfg() -> #{enable => osmo_s1gw:get_env(gtpu_kpi_enable, ?ENV_DEFAULT_GTPU_KPI_ENABLE), diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index aee679a..3423237 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -41,7 +41,7 @@ connected/3, code_change/4, terminate/3]). --export([start_link/2, +-export([start_link/1, assoc_setup/0, assoc_release/0, seid_alloc/0, @@ -74,13 +74,17 @@ -type pfcp_msg() :: {pfcp_msg_type(), pfcp_ies()}. -type pfcp_pdu() :: #pfcp{}. +-type cfg() :: #{laddr := string() | inet:ip_address(), + raddr := string() | inet:ip_address()}. + -type peer_info() :: #{state := atom(), laddr := inet:ip_address(), raddr := inet:ip_address(), lrts := pos_integer(), rrts => pos_integer()}. --export_type([peer_info/0, +-export_type([cfg/0, + peer_info/0, pfcp_session_rsp/0, pfcp_msg_type/0, pfcp_seq_nr/0, @@ -111,10 +115,9 @@ %% public API %% ------------------------------------------------------------------ -start_link(LocAddr, RemAddr) -> - gen_statem:start_link({local, ?MODULE}, ?MODULE, - [LocAddr, RemAddr], - []). +-spec start_link(cfg()) -> gen_statem:start_ret(). +start_link(Cfg) -> + gen_statem:start_link({local, ?MODULE}, ?MODULE, [Cfg], []). %% Initiate the PFCP Association Setup procedure @@ -176,15 +179,10 @@ %% gen_statem API %% ------------------------------------------------------------------ -init([LocAddrStr, RemAddr]) when is_list(LocAddrStr) -> - {ok, LocAddr} = inet:parse_address(LocAddrStr), - init([LocAddr, RemAddr]); - -init([LocAddr, RemAddrStr]) when is_list(RemAddrStr) -> - {ok, RemAddr} = inet:parse_address(RemAddrStr), - init([LocAddr, RemAddr]); - -init([LocAddr, RemAddr]) -> +init([Cfg]) -> + %% XXX: sctp_common:parse_addr/1 is not specific to SCTP + LocAddr = sctp_common:parse_addr(maps:get(laddr, Cfg)), + RemAddr = sctp_common:parse_addr(maps:get(raddr, Cfg)), s1gw_metrics:gauge_set(?S1GW_GAUGE_PFCP_ASSOCIATED, 0), {ok, Sock} = gen_udp:open(?PFCP_PORT, [binary, {ip, LocAddr}, diff --git a/src/rest_server.erl b/src/rest_server.erl index f9176cb..24ca33b 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -279,8 +279,9 @@ -spec config_pfcp() -> map(). config_pfcp() -> - #{<<"laddr">> => bval(osmo_s1gw:get_env(pfcp_loc_addr, ?ENV_DEFAULT_PFCP_LOC_ADDR)), - <<"raddr">> => bval(osmo_s1gw:get_env(pfcp_rem_addr, ?ENV_DEFAULT_PFCP_REM_ADDR))}. + Cfg = osmo_s1gw:get_env(pfcp_peer, #{}), + #{<<"laddr">> => bval(maps:get(laddr, Cfg, ?ENV_DEFAULT_PFCP_LOC_ADDR)), + <<"raddr">> => bval(maps:get(raddr, Cfg, ?ENV_DEFAULT_PFCP_REM_ADDR))}. -spec config_gtpu_kpi() -> map(). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Iba954746fe20e6b9eeaec3196e1f83e3fc3e7fc2 Gerrit-Change-Number: 42485 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-gsm-tester[master]: contrib/jenkins-build-osmo-ggsn.sh: Depend on libosmo-netif
by pespin 24 Mar '26

24 Mar '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/42479?usp=email ) Change subject: contrib/jenkins-build-osmo-ggsn.sh: Depend on libosmo-netif ...................................................................... contrib/jenkins-build-osmo-ggsn.sh: Depend on libosmo-netif Since osmo-ggsn.git Change-Id I8d8fae362f302d48afaed28a9c664f76ca4a2739, osmo-ggsn depends on libosmo-netif. Change-Id: I72dfdd937cfc34fce1137515e6f4828807c40b08 --- M contrib/jenkins-build-osmo-ggsn.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved pespin: Verified diff --git a/contrib/jenkins-build-osmo-ggsn.sh b/contrib/jenkins-build-osmo-ggsn.sh index d727eab..c07e4c5 100755 --- a/contrib/jenkins-build-osmo-ggsn.sh +++ b/contrib/jenkins-build-osmo-ggsn.sh @@ -5,6 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen --disable-uring +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo osmo-ggsn ${SANITIZE_FLAGS} create_bin_tgz osmo-ggsn -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/42479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I72dfdd937cfc34fce1137515e6f4828807c40b08 Gerrit-Change-Number: 42479 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-gsm-tester[master]: contrib/jenkins-build-osmo-ggsn.sh: Depend on libosmo-netif
by pespin 24 Mar '26

24 Mar '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/42479?usp=email ) Change subject: contrib/jenkins-build-osmo-ggsn.sh: Depend on libosmo-netif ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/42479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I72dfdd937cfc34fce1137515e6f4828807c40b08 Gerrit-Change-Number: 42479 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Mar 2026 20:52:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: 5gc: Remove arleady tested TODO
by pespin 24 Mar '26

24 Mar '26

Attention is currently required from: pespin. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42480?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: 5gc: Remove arleady tested TODO ...................................................................... 5gc: Remove arleady tested TODO PDU Sess Est Req with emeregency services is already tested in test TC_normal_reg_emergency_services. Change-Id: I5e2d202ffd019b22a006637534922e0ba1d09ca0 --- M 5gc/C5G_Tests.ttcn 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/42480/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42480?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5e2d202ffd019b22a006637534922e0ba1d09ca0 Gerrit-Change-Number: 42480 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce test TC_pdu_sess_est_pco_pcscf
by pespin 24 Mar '26

24 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42482?usp=email ) Change subject: 5gc: Introduce test TC_pdu_sess_est_pco_pcscf ...................................................................... 5gc: Introduce test TC_pdu_sess_est_pco_pcscf Our deps/nas fork is modified to fix multiple incorrect definitions around ProtocolContainer record. Change-Id: Ic7b22ad647bcac944551ac1c29080f895ca72cf8 --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M 5gc/expected-results.xml M 5gc/open5gs/open5gs-smf.yaml M deps/Makefile M library/NG_NAS_Osmo_Templates.ttcn 6 files changed, 59 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/42482/1 diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 2bcc1d3..f710141 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -66,6 +66,8 @@ charstring mp_local_gtpu_ip := "127.0.0.20"; charstring mp_ping_hostname := "10.45.0.1"; charstring mp_ping_hostname6 := "cafe::1"; + charstring mp_pcscf_hostname4 := "127.0.0.7"; + charstring mp_pcscf_hostname6 := "fd02:db8:18::7"; charstring mp_run_prog_log_path := "/tmp"; charstring mp_run_prog_as_user := "osmocom"; @@ -398,6 +400,42 @@ /* 3GPP TS 24.501 8.3.1.7 Always-on PDU session requested (see also 9.11.4.4) * 3GPP TS 24.501 8.3.2.6 Always-on PDU session indication (see also 9.11.4.3) */ +private function f_TC_pdu_sess_est_pco_pcscf() runs on ConnHdlr { + var template (value) ExtdProtocolConfigOptions pco_req; + var template (present) ExtdProtocolConfigOptions pco_exp; + var NG_PDU_SESSION_ESTABLISHMENT_ACCEPT sess_acc; + + f_register(); + pco_req := cs_ExtdPCO('0000'O, + { valueof(cs_ProtocolContainer('000C'O, ''O)), + valueof(cs_ProtocolContainer('0001'O, ''O)) }); + pco_exp := cr_ExtdPCO(?, + { valueof(cs_ProtocolContainer('000C'O, f_inet_addr(C5G_Tests.mp_pcscf_hostname4))), + valueof(cs_ProtocolContainer('0001'O, f_inet6_addr(C5G_Tests.mp_pcscf_hostname6))) }); + + sess_acc := f_pdu_sess_establish(p_ExtdPCO := pco_req, configure_userplane := false); + + if (not match(sess_acc.extdProtocolConfigurationOptions, pco_exp)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Requested ExtPCO ", pco_req, " expected ", pco_exp, + " got ", sess_acc.extdProtocolConfigurationOptions)); + } + + f_pdu_sess_release(); + f_deregister(); +} +testcase TC_pdu_sess_est_pco_pcscf() runs on MTC_CT { + f_init(); + f_ngap_setup(0); + + var ConnHdlrPars pars := f_init_pars(ue_idx := 0); + var ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_TC_pdu_sess_est_pco_pcscf), pars); + vc_conn.done; +} + +/* 3GPP TS 24.501 8.3.1.7 Always-on PDU session requested (see also 9.11.4.4) + * 3GPP TS 24.501 8.3.2.6 Always-on PDU session indication (see also 9.11.4.3) */ private function f_TC_pdu_sess_est_always_on() runs on ConnHdlr { var NG_PDU_SESSION_ESTABLISHMENT_ACCEPT sess_acc; @@ -1077,6 +1115,7 @@ execute( TC_ue_context_release_with_pdu_session() ); execute( TC_pdu_sess_modification() ); execute( TC_pdu_sess_est_always_on() ); + execute( TC_pdu_sess_est_pco_pcscf() ); execute( TC_ng_register_ping4() ); execute( TC_ng_register_ping4_256() ); @@ -1145,10 +1184,6 @@ * - 3GPP TS 23.632 5.3.3 Mobility from EPC to 5GC: Not supported by open5gs (missing Nhss interface use in UDM) * - 3GPP TS 23.632 5.2.3 Vector Generation in UDM/ARPF: Not supported by open5gs (missing Nudm_UEAuthentication_GetHssAv in UDM) * - 3GPP TS 23.502 Annex G (normative): Support of GERAN/UTRAN access by SMF+PGW-C: Not supported by open5gs (Gn<->N7 (to PCF) in open5gs-smfd) - * - * - VoLTE: - * -- " If the UE requested P-CSCF discovery then the message shall also include the P-CSCF IP address(es) as determined by the SMF and as described in clause 5.16.3.4 of TS 23.50" - * - Fill in PCO during PDU Sess Establish Req. */ } diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 69daa3e..5294b50 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -549,6 +549,7 @@ function f_pdu_sess_establish(BIT3 request_type := c_RequestType_initial_request, BIT3 pdu_sess_type := c_PDU_SessionType_IPv4, template (omit) AlwaysOnPDUSessionReq p_AlwaysOnPDUSessionReq := omit, + template (omit) ExtdProtocolConfigOptions p_ExtdPCO := omit, boolean configure_userplane := true) runs on ConnHdlr return NG_PDU_SESSION_ESTABLISHMENT_ACCEPT { var template (value) NG_NAS_UL_Message_Type nas_ul_msg; var NAS_PDU nas_pdu; @@ -561,7 +562,8 @@ p_IntegrityProtMaxDataRate := cs_IntegrityProtMaxDataRateV('FF'O, 'FF'O), p_PDU_SessionType := cs_PDU_SessionTypeTV(pdu_sess_type), p_SSC_Mode := cs_SSC_ModeTV('001'B), - p_AlwaysOnPDUSessionReq := p_AlwaysOnPDUSessionReq); + p_AlwaysOnPDUSessionReq := p_AlwaysOnPDUSessionReq, + p_ExtdPCO := p_ExtdPCO); nas_pdu := enc_NG_NAS_UL_Message_Type(valueof(nas_ul_msg)); nas_ul_msg := cs_NG_UL_NAS_TRANSPORT(cs_PayloadContainerType(tsc_PayloadContainerESMMsg), cs_PayloadContainerLV(nas_pdu), diff --git a/5gc/expected-results.xml b/5gc/expected-results.xml index 155fd95..bbdc0b2 100644 --- a/5gc/expected-results.xml +++ b/5gc/expected-results.xml @@ -13,6 +13,7 @@ C5G_Tests.ttcn:MASKED TC_pdu_sess_est_always_on testcase </failure> </testcase> + <testcase classname='C5G_Tests' name='TC_pdu_sess_est_pco_pcscf' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_register_ping4' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_register_ping4_256' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_register_ping6' time='MASKED'/> diff --git a/5gc/open5gs/open5gs-smf.yaml b/5gc/open5gs/open5gs-smf.yaml index f925af1..8792971 100644 --- a/5gc/open5gs/open5gs-smf.yaml +++ b/5gc/open5gs/open5gs-smf.yaml @@ -46,9 +46,9 @@ - 2001:4860:4860::8888 - 2001:4860:4860::8844 mtu: 1400 -# p-cscf: -# - 127.0.0.1 -# - ::1 + p-cscf: + - 127.0.0.7 + - fd02:db8:18::7 # ctf: # enabled: auto # auto(default)|yes|no freeDiameter: open5gs-smf-freediameter.conf diff --git a/deps/Makefile b/deps/Makefile index 61dfe48..49f601b 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -72,7 +72,7 @@ # Use tag names from 'git describe --tags' or commit hashes. This way we get # exact commits of deps when doing regression testing. -nas_commit= 60a69a44cc6bbb32d96aecc4e355128ac5f95a5e +nas_commit= c8fb0b1dd96f45fbfdc93ffc73ffb3ca6ced47cc titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= a70095b9113b23d2ea2405a5775befec18dd0fe0 titan.ProtocolEmulations.SCCP_commit= 744f3eeb58d7b5bc372c9fd01db737a20bae069a diff --git a/library/NG_NAS_Osmo_Templates.ttcn b/library/NG_NAS_Osmo_Templates.ttcn index 7edb9f5..92e59c7 100644 --- a/library/NG_NAS_Osmo_Templates.ttcn +++ b/library/NG_NAS_Osmo_Templates.ttcn @@ -20,6 +20,18 @@ import from NG_NAS_Osmo_Types all; +/* 24.301 cl. 9.9.4.26 */ +template (present) ExtdProtocolConfigOptions cr_ExtdPCO(template (present) Type6Length_Type p_Length := ?, + template NAS_ExtdProtocolConfigOptions_Type p_ProtocolContainers := *) := +{ + iei := '7B'O, + iel := p_Length, + ext := '1'B, + spare := tsc_Spare4, + configProtocol := tsc_Spare3, + pco := p_ProtocolContainers + }; + /* 24.501 cl. 9.11.3.54 */ template (value) NG_UE_SecurityCapability cs_NG_UE_SecurityCapabilityTLV(template (value) O1_Type ngeaCap := 'f0'O, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42482?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic7b22ad647bcac944551ac1c29080f895ca72cf8 Gerrit-Change-Number: 42482 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce test TC_pdu_sess_est_always_on
by pespin 24 Mar '26

24 Mar '26

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42478?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: 5gc: Introduce test TC_pdu_sess_est_always_on ...................................................................... 5gc: Introduce test TC_pdu_sess_est_always_on This feature is right now not implemented in open5gs and hence the test is expected to fail, since it returns no AlwaysOn Indication in PDU Session Establishment Accept. Change-Id: I282e0c8072172fa633bf82ed6b9492b0bb4362cc --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M 5gc/expected-results.xml 3 files changed, 52 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/42478/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42478?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I282e0c8072172fa633bf82ed6b9492b0bb4362cc Gerrit-Change-Number: 42478 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ccid-firmware[master]: firmware: replace libosmocore fsm timers
by Hoernchen 24 Mar '26

24 Mar '26

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42481?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: firmware: replace libosmocore fsm timers ...................................................................... firmware: replace libosmocore fsm timers Concurrent access from main loop and the different uart irqs was not going well and caused crashes. The libosmocore fsm does still allocate one internal timer, but it is not used by the firmware, so libosmocore will not touch the rbtree. This clashes with the host build which does not have jiffies, and is pretty much a burden because it requires special casing code due to the completely different targets even though it was last used many years ago and might not even work, so disable it. Additionally ignore checkpatch jiffies complaints because we're trying to do firmware here. Closes: SYS#7877 Change-Id: Id2bd67b3946bb451008965f0b68b4a919f4d10bd --- M .checkpatch.conf M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.c M ccid_common/cuart.h M ccid_common/iso7816_fsm.c M contrib/jenkins.sh M sysmoOCTSIM/main.c 7 files changed, 61 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/81/42481/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Id2bd67b3946bb451008965f0b68b4a919f4d10bd Gerrit-Change-Number: 42481 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 0

[M] Change in osmo-ccid-firmware[master]: firmware: replace libosmocore fsm timers
by Hoernchen 24 Mar '26

24 Mar '26

Attention is currently required from: laforge. Hoernchen has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42481?usp=email ) Change subject: firmware: replace libosmocore fsm timers ...................................................................... Patch Set 3: (1 comment) File ccid_common/cuart.c: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42481/comment/b11bdeff_4f… : PS3, Line 87: if (deadline && jiffies >= deadline) { > what's the jiffies frequency? do we have to worry about it wrapping ever and hence jiffies could be […] clocked at coreclock/1000=1ms as per libosmo_emb.c, so it wraps after 584 million years. yes yes, serial number arithmetic, but I'm somewhat confident that this is fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Id2bd67b3946bb451008965f0b68b4a919f4d10bd Gerrit-Change-Number: 42481 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 24 Mar 2026 16:40:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log March 2026