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

[XS] Change in osmo-remsim[master]: rspro_server: use correct byte order in log message "Bankd IP/Port ch...
by pespin 26 Mar '26

26 Mar '26

Attention is currently required from: lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-remsim/+/42502?usp=email ) Change subject: rspro_server: use correct byte order in log message "Bankd IP/Port changed to <IP>:<Port> ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/server/rspro_server.c: https://gerrit.osmocom.org/c/osmo-remsim/+/42502/comment/624eb505_db857699?… : PS1, Line 328: bankd_ip = ntohl(inet_addr(ip_str)); I wonder why are we actually storing conn->client.bankd.ip as a host-order buffer... Maybe it makes sense to simply store it as network byte and use it that way everywhere? -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/42502?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I288ea70091d24fa95732f7035ab50100831be841 Gerrit-Change-Number: 42502 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 26 Mar 2026 09:28:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in ...osmo-s1gw[master]: pfcp_peer: implement periodic PFCP heartbeat
by fixeria 25 Mar '26

25 Mar '26

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42487?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: pfcp_peer: implement periodic PFCP heartbeat ...................................................................... pfcp_peer: implement periodic PFCP heartbeat Add a heartbeat_interval parameter to the pfcp_peer config section. When non-zero, pfcp_peer sends a periodic Heartbeat Request to the UPF at the configured interval using a named gen_statem timeout (hb_timer). The timer is started on entry to the connected state and cancelled on re-entry to the connecting state. Default is 10000 ms (10 seconds). Change-Id: I306324f8eca325202a3fa23125854db9d5eaab38 --- M config/sys.config M contrib/openapi.yaml M doc/manuals/chapters/configuration.adoc M doc/manuals/chapters/rest.adoc M include/osmo_s1gw.hrl M priv/openapi.json M src/osmo_s1gw_sup.erl M src/pfcp_peer.erl M src/rest_server.erl 9 files changed, 46 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/87/42487/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42487?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I306324f8eca325202a3fa23125854db9d5eaab38 Gerrit-Change-Number: 42487 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: pfcp_peer: add configurable heartbeat fail threshold + association reset
by fixeria 25 Mar '26

25 Mar '26

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42489?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: pfcp_peer: add configurable heartbeat fail threshold + association reset ...................................................................... pfcp_peer: add configurable heartbeat fail threshold + association reset Introduce heartbeat_fail_threshold (default: 3) that tracks consecutive unanswered PFCP Heartbeat Requests via the heartbeat_fail_count field and resets the association when the threshold is reached. The counter applies to both periodic heartbeats and those triggered via the REST API, and resets to zero on any successful Heartbeat Response. Change-Id: I8cb0fb23468aba4dead9865a90d893c78c6ae074 --- M config/sys.config M contrib/openapi.yaml M doc/manuals/chapters/configuration.adoc M doc/manuals/chapters/rest.adoc M include/osmo_s1gw.hrl M priv/openapi.json M src/osmo_s1gw_sup.erl M src/pfcp_peer.erl M src/rest_server.erl 9 files changed, 55 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/89/42489/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42489?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8cb0fb23468aba4dead9865a90d893c78c6ae074 Gerrit-Change-Number: 42489 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: pfcp_peer: detect UPF restart via RTS mismatch in Heartbeat Response
by fixeria 25 Mar '26

25 Mar '26

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42490?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: pfcp_peer: detect UPF restart via RTS mismatch in Heartbeat Response ...................................................................... pfcp_peer: detect UPF restart via RTS mismatch in Heartbeat Response Check the Recovery Timestamp (RTS) in each Heartbeat Response against the value stored during Association Setup (`rem_rts`). A mismatch means the UPF has restarted; log a warning, increment the new `pfcp.peer_restart counter`, and reset the PFCP association so it is re-established with the restarted peer. The `is_integer(ExpRTS)` guard prevents a spurious reset when a stale Heartbeat Response arrives in the connecting state (where `rem_rts` is still undefined). Change-Id: I00a8384db1ea9c38d0ad9ff90b3d45ad86c3a020 --- M doc/manuals/chapters/metrics.adoc M include/s1gw_metrics.hrl M src/pfcp_peer.erl M src/s1gw_metrics.erl 4 files changed, 32 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/90/42490/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42490?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I00a8384db1ea9c38d0ad9ff90b3d45ad86c3a020 Gerrit-Change-Number: 42490 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: pfcp_peer: tune Heartbeat Request/Response logging
by fixeria 25 Mar '26

25 Mar '26

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42488?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+2 by pespin, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: pfcp_peer: tune Heartbeat Request/Response logging ...................................................................... pfcp_peer: tune Heartbeat Request/Response logging Reduce verbosity of the Tx/Rx Heartbeat Req/Resp log messages from LOG_INFO to LOG_DEBUG in preparation for periodic heartbeat support. Without this change, periodic heartbeats would flood the logging. Change-Id: I6435cdf64fd86fa5358d57ea4d56dcad8eb9e69e --- M src/pfcp_peer.erl 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/88/42488/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42488?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I6435cdf64fd86fa5358d57ea4d56dcad8eb9e69e Gerrit-Change-Number: 42488 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: pfcp_peer: implement periodic PFCP heartbeat
by fixeria 25 Mar '26

25 Mar '26

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42487?usp=email ) Change subject: pfcp_peer: implement periodic PFCP heartbeat ...................................................................... Patch Set 1: (1 comment) File include/osmo_s1gw.hrl: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42487/comment/0391a86e_eaf2… : PS1, Line 46: -define(ENV_DEFAULT_PFCP_HEARTBEAT_INTERVAL, 0). %% disabled > imho this should be enabled by default, afair it's the only way for a pfcp node to detect the peer r […] Acknowledged -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42487?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I306324f8eca325202a3fa23125854db9d5eaab38 Gerrit-Change-Number: 42487 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 Mar 2026 21:45:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-remsim[master]: rspro_server: use correct byte order in log message "Bankd IP/Port ch...
by lynxis lazus 25 Mar '26

25 Mar '26

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/42502?usp=email ) Change subject: rspro_server: use correct byte order in log message "Bankd IP/Port changed to <IP>:<Port> ...................................................................... rspro_server: use correct byte order in log message "Bankd IP/Port changed to <IP>:<Port> The byte order is wrong and results in printing the IP as reverse. "Bankd IP/Port changed to 1.0.0.127:9999". Change-Id: I288ea70091d24fa95732f7035ab50100831be841 --- M src/server/rspro_server.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/02/42502/1 diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index 70d59c1..8e3cfe5 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -331,7 +331,7 @@ /* determine if IP/port of bankd have changed */ if (conn->client.bankd.port != bankd_port || conn->client.bankd.ip != bankd_ip) { - struct in_addr ia = { .s_addr = bankd_ip }; + struct in_addr ia = { .s_addr = htonl(bankd_ip) }; LOGPFSML(conn->fi, LOGL_NOTICE, "Bankd IP/Port changed to %s:%u\n", inet_ntoa(ia), bankd_port); conn->client.bankd.ip = bankd_ip; conn->client.bankd.port = bankd_port; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/42502?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I288ea70091d24fa95732f7035ab50100831be841 Gerrit-Change-Number: 42502 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Add enum for PDN Type and use it in pgw testsuite
by pespin 25 Mar '26

25 Mar '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42498?usp=email ) Change subject: GTPv2_Templates: Add enum for PDN Type and use it in pgw testsuite ...................................................................... GTPv2_Templates: Add enum for PDN Type and use it in pgw testsuite Change-Id: I9833e998522a09a15b93c8fed0e18a5e8159d760 --- M library/GTPv2_Templates.ttcn M pgw/PGW_Tests.ttcn 2 files changed, 12 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index 925735a..539251c 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -13,6 +13,15 @@ import from Osmocom_Types all; import from GTPv2_Types all; +/* 8.14 */ +type enumerated GTP2C_PDN_Type { + GTP2C_PDN_IPv4 ('001'B), + GTP2C_PDN_IPv6 ('010'B), + GTP2C_PDN_IPv4v6 ('011'B), + GTP2C_PDN_non_IP ('100'B), + GTP2C_PDN_Ethernet ('101'B) +} with { variant "FIELDLENGTH(3)" encode "RAW" }; + private function fs_GTP2C_t_bit(template (omit) OCT4 teid) return BIT1 { if (istemplatekind(teid, "omit")) { return '0'B; diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 1ba58f4..9f15919 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -154,7 +154,7 @@ charstring apn, /* Apn subscribed or non-subscribed */ boolean selection_mode, - BIT3 pdn_type, + GTP2C_PDN_Type pdn_type, /* PAA */ /* Max APN Restriction */ /* APN-AMBR */ @@ -181,7 +181,7 @@ GTP2C_RAT_Type rat_type := GTP2C_RAT_EUTRAN, charstring apn := "internet", boolean selection_mode := false, - BIT3 pdn_type := '001'B) := { + GTP2C_PDN_Type pdn_type := GTP2C_PDN_IPv4) := { imsi := imsi, msisdn := msisdn, rat_type := rat_type, @@ -748,7 +748,7 @@ rat_type := enum2int(g_pars.rat_type), sender_fteid := fteid_c_ie, apn := f_enc_dns_hostname(g_pars.apn), - pdn_type := g_pars.pdn_type, + pdn_type := int2bit(enum2int(g_pars.pdn_type), 3), teid_list := { fteid_u_ie }, chg_car := '0000'O, bearer_id := g_pars.bearer.ebi, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42498?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9833e998522a09a15b93c8fed0e18a5e8159d760 Gerrit-Change-Number: 42498 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTPv1U_Emulation: Rename s/f_gtp1u_ping4/f_gtp1u_ping/
by pespin 25 Mar '26

25 Mar '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42499?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: GTPv1U_Emulation: Rename s/f_gtp1u_ping4/f_gtp1u_ping/ ...................................................................... GTPv1U_Emulation: Rename s/f_gtp1u_ping4/f_gtp1u_ping/ The function can also be (and is) used to ping IPv6 hosts. Change-Id: I195cb048176aefddcb477083ddc949b86ec592fa --- M 5gc/ConnHdlr.ttcn M library/GTPv1U_Emulation.ttcnpp M pgw/PGW_Tests.ttcn 3 files changed, 13 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 5294b50..8f5e5c5 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -1406,7 +1406,7 @@ /* execute ping command and wait for result */ function f_ping(charstring host, integer interval := 1, integer count := 10) runs on ConnHdlr { - /* command will be filled in by f_gtp1u_ping4() below: */ + /* command will be filled in by f_gtp1u_ping() below: */ var UECUPS_StartProgram sprog := f_run_prog_init(""); var charstring bind_addr; @@ -1416,14 +1416,14 @@ bind_addr := g_pars.ue_pars.sess_pars.ue_ip4; } - f_gtp1u_ping4(sprog, host, interval, count, bind_addr, + f_gtp1u_ping(sprog, host, interval, count, bind_addr, redirect_output := true, redirect_output_path_prefix := f_run_prog_unique_log_path()); } function f_ping_async(charstring host, integer interval := 1, integer count := 10) runs on ConnHdlr return integer { - /* command will be filled in by f_gtp1u_ping4() below: */ + /* command will be filled in by f_gtp1u_ping() below: */ var UECUPS_StartProgram sprog := f_run_prog_init(""); var charstring bind_addr; @@ -1433,10 +1433,10 @@ bind_addr := g_pars.ue_pars.sess_pars.ue_ip4; } - var integer pid := f_gtp1u_ping4_async(sprog, host, - interval, count, bind_addr, - redirect_output := true, - redirect_output_path_prefix := f_run_prog_unique_log_path()); + var integer pid := f_gtp1u_ping_async(sprog, host, + interval, count, bind_addr, + redirect_output := true, + redirect_output_path_prefix := f_run_prog_unique_log_path()); return pid; } diff --git a/library/GTPv1U_Emulation.ttcnpp b/library/GTPv1U_Emulation.ttcnpp index 7b1db12..0d3abb8 100644 --- a/library/GTPv1U_Emulation.ttcnpp +++ b/library/GTPv1U_Emulation.ttcnpp @@ -502,7 +502,7 @@ f_gtp1u_wait_term(pid, exit_code, tout, port_idx); } -function f_gtp1u_ping4_async(UECUPS_StartProgram sprog, +function f_gtp1u_ping_async(UECUPS_StartProgram sprog, charstring host, integer interval := 1, integer count := 10, template (omit) charstring src_ip := omit, boolean redirect_output := false, @@ -523,7 +523,7 @@ } /* execute ping command and wait for result. sprog.command is filled in based on params. */ -function f_gtp1u_ping4(UECUPS_StartProgram sprog, +function f_gtp1u_ping(UECUPS_StartProgram sprog, charstring host, integer interval := 1, integer count := 10, template (omit) charstring src_ip := omit, boolean redirect_output := false, diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 9f15919..a670881 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -925,11 +925,11 @@ if (not isbound(g_ip4_addr)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "f_ping4(): g_ip4_addr is unset!"); } - /* command will be filled in by f_gtp1u_ping4() below: */ + /* command will be filled in by f_gtp1u_ping() below: */ var UECUPS_StartProgram sprog := f_run_prog_init(""); - f_gtp1u_ping4(sprog, host, interval, count, f_inet_ntoa(g_ip4_addr), - redirect_output := true, - redirect_output_path_prefix := f_run_prog_unique_log_path()); + f_gtp1u_ping(sprog, host, interval, count, f_inet_ntoa(g_ip4_addr), + redirect_output := true, + redirect_output_path_prefix := f_run_prog_unique_log_path()); } /* send echo request; expect response */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42499?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I195cb048176aefddcb477083ddc949b86ec592fa Gerrit-Change-Number: 42499 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: 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 25 Mar '26

25 Mar '26

pespin has submitted this change. ( 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(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 2bcc1d3..f1c46c8 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, + { cs_ProtocolContainer('000C'O, ''O), + cs_ProtocolContainer('0001'O, ''O) }); + pco_exp := cr_ExtdPCO(?, + { cs_ProtocolContainer('000C'O, f_inet_addr(C5G_Tests.mp_pcscf_hostname4)), + 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: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic7b22ad647bcac944551ac1c29080f895ca72cf8 Gerrit-Change-Number: 42482 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log March 2026