July 2025 - gerrit-log - lists.osmocom.org

[L] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce test TC_register_ping4

by fixeria

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40764?usp=email ) Change subject: 5gc: Introduce test TC_register_ping4 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40764?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I66737a94eedcf4184aa59bbbd7cc700d1e9d1521 Gerrit-Change-Number: 40764 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Jul 2025 09:34:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: drop PDUs that we failed to process

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40767?usp=email ) Change subject: s1ap_proxy: drop PDUs that we failed to process ...................................................................... s1ap_proxy: drop PDUs that we failed to process Previously, the strategy was to forward PDUs as-is when processing failed - whether due to decoding errors or issues like referencing an unknown E-RAB. This patch changes the behavior to drop such PDUs, which is more logical. This prevents forwarding PDUs with unexpected contents, like unknown TEIDs or unreachable IP addresses. Change-Id: I6345b4ce63e8fc5588de02fe921fa61807d97d91 Related: SYS#7352 --- M include/s1gw_metrics.hrl M src/s1ap_proxy.erl M src/s1gw_metrics.erl M src/sctp_proxy.erl M test/s1ap_proxy_test.erl 5 files changed, 67 insertions(+), 25 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/s1gw_metrics.hrl b/include/s1gw_metrics.hrl index 83ab46d..db087c5 100644 --- a/include/s1gw_metrics.hrl +++ b/include/s1gw_metrics.hrl @@ -14,6 +14,7 @@ -define(S1GW_CTR_S1AP_PROXY_UPLINK_PACKETS_QUEUED, [ctr, s1ap, proxy, uplink_packets_queued]). -define(S1GW_CTR_S1AP_PROXY_EXCEPTION, [ctr, s1ap, proxy, exception]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, [ctr, s1ap, proxy, in_pkt, all]). +-define(S1GW_CTR_S1AP_PROXY_IN_PKT_DROP_ALL, [ctr, s1ap, proxy, in_pkt, drop, all]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_DECODE_ERROR, [ctr, s1ap, proxy, in_pkt, decode_error]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, [ctr, s1ap, proxy, in_pkt, proc_error]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ, [ctr, s1ap, proxy, in_pkt, erab_setup_req]). diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 953cf66..06e5302 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -82,7 +82,7 @@ }). -type proxy_state() :: #proxy_state{}. --type proxy_action() :: forward | reply. +-type proxy_action() :: forward | reply | drop. -export_type([proxy_action/0]). @@ -324,33 +324,40 @@ ?LOG_DEBUG("Tx (forward) S1AP PDU unmodified"), ctr_inc(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, S1), ctr_inc(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, S1), - {{forward, OrigData}, S1} + {{forward, OrigData}, S1}; + {drop, S1} -> + ?LOG_NOTICE("Drop received S1AP PDU: ~p", [PDU]), + ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_DROP_ALL, S1), + {{drop, OrigData}, S1} catch Exception:Reason:StackTrace -> ?LOG_ERROR("An exception occurred: ~p, ~p, ~p", [Exception, Reason, StackTrace]), ctr_inc(?S1GW_CTR_S1AP_PROXY_EXCEPTION, S0), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, S0), - ctr_inc(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, S0), - {{forward, OrigData}, S0} %% XXX: proxy as-is or drop? + ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_DROP_ALL, S0), + {{drop, OrigData}, S0} end; {error, {asn1, Error}} -> ?LOG_ERROR("S1AP PDU decoding failed: ~p", [Error]), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_DECODE_ERROR, S0), - ctr_inc(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, S0), - {{forward, OrigData}, S0} %% XXX: forward as-is or drop? + ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_DROP_ALL, S0), + {{drop, OrigData}, S0} catch Exception:Reason:StackTrace -> ?LOG_ERROR("An exception occurred: ~p, ~p, ~p", [Exception, Reason, StackTrace]), ctr_inc(?S1GW_CTR_S1AP_PROXY_EXCEPTION, S0), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_DECODE_ERROR, S0), - ctr_inc(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, S0), - {{forward, OrigData}, S0} %% XXX: proxy as-is or drop? + ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_DROP_ALL, S0), + {{drop, OrigData}, S0} end. %% Process an S1AP PDU (decoded) --spec handle_pdu(s1ap_pdu(), proxy_state()) -> {{proxy_action(), s1ap_pdu()}, proxy_state()} | - {forward, proxy_state()}. +-spec handle_pdu(PDU, S0) -> {Result, S1} + when PDU :: s1ap_pdu(), + S0 :: proxy_state(), + S1 :: proxy_state(), + Result :: {forward | reply, s1ap_pdu()} | forward | drop. %% 9.1.8.4 S1 SETUP REQUEST handle_pdu({initiatingMessage, @@ -407,7 +414,7 @@ {{error, Reason}, S1} -> ?LOG_NOTICE("Failed to process E-RAB SETUP RESPONSE: ~p", [Reason]), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, S1), - {forward, S1} %% XXX: forward as-is or drop? + {drop, S1} %% drop this PDU end; %% 9.1.3.3 E-RAB MODIFY REQUEST @@ -425,7 +432,7 @@ {{error, Reason}, S1} -> ?LOG_NOTICE("Failed to process E-RAB MODIFY REQUEST: ~p", [Reason]), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, S1), - {forward, S1} %% XXX: forward as-is or drop? + {drop, S1} %% drop this PDU end; %% 9.1.3.4 E-RAB MODIFY RESPONSE @@ -448,15 +455,15 @@ value = C0}}, S0) -> ?LOG_DEBUG("Processing E-RAB RELEASE COMMAND"), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_CMD, S0), + %% there's nothing to patch in this PDU, so we forward it as-is case handle_ies(?'id-E-RABToBeReleasedList', C0#'E-RABReleaseCommand'.protocolIEs, S0) of {{ok, _}, S1} -> - %% there's nothing to patch in this PDU, so we forward it as-is - {forward, S1}; %% forward patched PDU + {forward, S1}; {{error, Reason}, S1} -> ?LOG_NOTICE("Failed to process E-RAB RELEASE COMMAND: ~p", [Reason]), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, S1), - {forward, S1} %% XXX: forward as-is or drop? + {forward, S1} end; %% 9.1.3.6 E-RAB RELEASE RESPONSE @@ -465,15 +472,15 @@ value = C0}}, S0) -> ?LOG_DEBUG("Processing E-RAB RELEASE RESPONSE"), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_RSP, S0), + %% there's nothing to patch in this PDU, so we forward it as-is case handle_ies(?'id-E-RABReleaseListBearerRelComp', C0#'E-RABReleaseResponse'.protocolIEs, S0) of {{ok, _}, S1} -> - %% there's nothing to patch in this PDU, so we forward it as-is - {forward, S1}; %% forward patched PDU + {forward, S1}; {{error, Reason}, S1} -> ?LOG_NOTICE("Failed to process E-RAB RELEASE RESPONSE: ~p", [Reason]), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, S1), - {forward, S1} %% XXX: forward as-is or drop? + {forward, S1} end; %% 9.1.3.7 E-RAB RELEASE INDICATION @@ -482,15 +489,15 @@ value = C0}}, S0) -> ?LOG_DEBUG("Processing E-RAB RELEASE INDICATION"), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_IND, S0), + %% there's nothing to patch in this PDU, so we forward it as-is case handle_ies(?'id-E-RABReleasedList', C0#'E-RABReleaseIndication'.protocolIEs, S0) of {{ok, _}, S1} -> - %% there's nothing to patch in this PDU, so we forward it as-is {forward, S1}; {{error, Reason}, S1} -> ?LOG_NOTICE("Failed to process E-RAB RELEASE INDICATION: ~p", [Reason]), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, S1), - {forward, S1} %% XXX: forward as-is or drop? + {forward, S1} end; %% 9.1.3.8 E-RAB MODIFICATION INDICATION @@ -544,7 +551,7 @@ {{error, Reason}, S1} -> ?LOG_NOTICE("Failed to process INITIAL CONTEXT SETUP REQUEST: ~p", [Reason]), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, S1), - {forward, S1} %% XXX: forward as-is or drop? + {drop, S1} %% drop this PDU end; %% 9.1.4.3 INITIAL CONTEXT SETUP RESPONSE @@ -563,7 +570,7 @@ {{error, Reason}, S1} -> ?LOG_NOTICE("Failed to process INITIAL CONTEXT SETUP RESPONSE: ~p", [Reason]), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, S1), - {forward, S1} %% XXX: forward as-is or drop? + {drop, S1} %% drop this PDU end; %% 9.1.4.5 UE CONTEXT RELEASE REQUEST diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index 9272033..1c3d76e 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -69,6 +69,7 @@ ?S1GW_CTR_S1AP_PROXY_EXCEPTION, %% exception(s) occurred %% s1ap_proxy: INcoming PDU counters ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, %% received total + ?S1GW_CTR_S1AP_PROXY_IN_PKT_DROP_ALL, %% dropped total ?S1GW_CTR_S1AP_PROXY_IN_PKT_DECODE_ERROR, %% failed to decode ?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, %% failed to process ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ, %% E-RAB SETUP.req PDUs diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index d475b20..e8460a4 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -186,7 +186,9 @@ {forward, FwdData} -> sctp_server:send_data(EnbAid, FwdData); {reply, ReData} -> - ok = sctp_common:send_data({Sock, Aid}, ReData) + ok = sctp_common:send_data({Sock, Aid}, ReData); + {drop, Data} -> + ok %% no-op end, {keep_state, S}; @@ -251,7 +253,9 @@ {forward, FwdData} -> ok = sctp_common:send_data({Sock, Aid}, FwdData); {reply, ReData} -> - sctp_server:send_data(EnbAid, ReData) + sctp_server:send_data(EnbAid, ReData); + {drop, Data} -> + ok %% no-op end. diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 61f4511..1145bc5 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -71,7 +71,11 @@ {"UE CONTEXT RELEASE REQUEST", ?TC(fun test_ue_ctx_release_req/1)}, {"UE CONTEXT RELEASE COMMAND/COMPLETE", - ?TC(fun test_ue_ctx_release_cmd/1)}]. + ?TC(fun test_ue_ctx_release_cmd/1)}, + {"ASN.1 parsing error (drop)", + ?TC(fun test_drop_asn1_error/1)}, + {"PDU processing error (drop)", + ?TC(fun test_drop_proc_error/1)}]. %% ------------------------------------------------------------------ @@ -395,6 +399,31 @@ ?_assertMatch([], s1ap_proxy:fetch_erab_list(Pid))]. +test_drop_asn1_error(#{handler := Pid}) -> + PDU = << 16#de, 16#ad, 16#be, 16#ef >>, + [?_assertEqual({drop, PDU}, s1ap_proxy:process_pdu(Pid, PDU)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_DROP_ALL, 1)]. + + +test_drop_proc_error(#{handler := Pid}) -> + %% [eNB <- MME] INITIAL CONTEXT SETUP REQUEST + InitCtxSetupReq = initial_context_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + %% [eNB -> MME] INITIAL CONTEXT SETUP RESPONSE + InitCtxSetupRsp = initial_context_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + %% [eNB <- MME] UE CONTEXT RELEASE COMMAND + UeCtxReleaseCmd = ue_ctx_release_cmd_pdu(), + + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReq)), + %% eNB does not respond in time, so the MME releases the UE context + ?_assertEqual({forward, UeCtxReleaseCmd}, s1ap_proxy:process_pdu(Pid, UeCtxReleaseCmd)), + %% eNB is late to the party, perhaps because of increased link latency? + ?_assertEqual({drop, InitCtxSetupRsp}, s1ap_proxy:process_pdu(Pid, InitCtxSetupRsp)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 3), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_DROP_ALL, 1)]. + + %% ------------------------------------------------------------------ %% S1AP PDU templates %% ------------------------------------------------------------------ -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40767?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I6345b4ce63e8fc5588de02fe921fa61807d97d91 Gerrit-Change-Number: 40767 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce test TC_register_ping4

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40764?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: 5gc: Introduce test TC_register_ping4 ...................................................................... 5gc: Introduce test TC_register_ping4 osmo-uecups is used to set up a GTPv1U tundev with the PDU session params configured over NGAP/NAS, similar to what is already done in PGW_Tests. Depends: osmo-uecups.git Change-Id I6262c3dfbf774b361aadf0aa53ce09b5fdc38da4 Change-Id: I66737a94eedcf4184aa59bbbd7cc700d1e9d1521 --- M 5gc/C5G_Tests.cfg M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M 5gc/expected-results.xml M 5gc/gen_links.sh M 5gc/open5gs/open5gs-smf.yaml M 5gc/open5gs/open5gs-upf.yaml A 5gc/osmo-uecups-daemon.cfg M 5gc/regen_makefile.sh M 5gc/testenv.cfg R 5gc/testenv.sh A 5gc/testsuite_prepare.sh M deps/Makefile 13 files changed, 227 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/40764/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40764?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: I66737a94eedcf4184aa59bbbd7cc700d1e9d1521 Gerrit-Change-Number: 40764 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 month, 3 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: contrib/osmo-s1gw.sh: add help

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40766?usp=email ) Change subject: contrib/osmo-s1gw.sh: add help ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40766?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: Id6ff9af8b7ec6602b4d8316d9ba499b59a483271 Gerrit-Change-Number: 40766 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Jul 2025 08:57:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: drop PDUs that we failed to process

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40767?usp=email ) Change subject: s1ap_proxy: drop PDUs that we failed to process ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40767?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: I6345b4ce63e8fc5588de02fe921fa61807d97d91 Gerrit-Change-Number: 40767 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Jul 2025 08:56:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pgw: Use templates to generate UECUPS commands

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40762?usp=email ) Change subject: pgw: Use templates to generate UECUPS commands ...................................................................... pgw: Use templates to generate UECUPS commands This way if commands are extended with optional fields, we don't need to update these since default params in templates will take care of it. Related: SYS#7073 Depends: osmo-uecups.git Change-Id If524b0a122d1217fcd39e4633835a1a7d0620c7a Change-Id: I4de6623318fe2abf9807702251fe420eb14de2cc --- M deps/Makefile M pgw/PGW_Tests.ttcn 2 files changed, 9 insertions(+), 8 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/deps/Makefile b/deps/Makefile index 0f710e8..b0b18b3 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -124,7 +124,7 @@ titan.TestPorts.UDPasp_commit= 54176e95850654e5e8b0ffa2f1b5f35c412b949c titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-13-gd34ab71 titan.TestPorts.USB_commit= a9470fdc99c82fbf988f4508c3161118c9106e28 -osmo-uecups_commit= 8362efef7c6fa341eb947a75786878e0685767b7 +osmo-uecups_commit= 0eb4f08a31fd1d7aac6ffe9c6a60503f17c01787 all: $(foreach dir,$(ALL_REPOS),$(dir)/update) clean: $(foreach dir,$(ALL_REPOS),$(dir)/clean) diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index c63568e..1ba58f4 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -702,7 +702,7 @@ g_gtpu6_remote := rx_fteid.iPv6_Address; } - var UECUPS_CreateTun uecups_create := { + var template (value) UECUPS_CreateTun uecups_create := ts_UECUPS_CreateTun( tx_teid := oct2int(g_pars.bearer.teid_remote), rx_teid := oct2int(g_pars.bearer.teid_local), user_addr_type := IPV4, @@ -711,7 +711,7 @@ remote_gtp_ep := valueof(ts_UECUPS_SockAddr(g_gtpu4_remote)), tun_dev_name := g_pars.tun_dev_name, tun_netns_name := g_pars.tun_netns_name - }; + ); /* create tunnel in daemon */ if (isbound(g_ip4_addr)) { @@ -889,10 +889,11 @@ /* destroy tunnel in daemon */ if (isbound(g_pars.bearer.teid_local)) { - var UECUPS_DestroyTun uecups_destroy := { + var template (value) UECUPS_DestroyTun uecups_destroy; + uecups_destroy := ts_UECUPS_DestroyTun( local_gtp_ep := valueof(ts_UECUPS_SockAddr(f_inet_addr(mp_local_hostname_u))), rx_teid := oct2int(g_pars.bearer.teid_local) - }; + ); /* FIXME: what about IPv4/IPv6 differentiation? */ f_gtp1u_destroy_tunnel(uecups_destroy); } @@ -901,13 +902,13 @@ private function f_run_prog_init(charstring command) runs on PGW_Session_CT return UECUPS_StartProgram { - var UECUPS_StartProgram sprog := { + var template (value) UECUPS_StartProgram sprog := ts_UECUPS_StartProgram( command := command, environment := {}, run_as_user := mp_run_prog_as_user, tun_netns_name := g_pars.tun_netns_name - }; - return sprog; + ); + return valueof(sprog); } private function f_run_prog_unique_log_path() runs on PGW_Session_CT return charstring -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40762?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: I4de6623318fe2abf9807702251fe420eb14de2cc Gerrit-Change-Number: 40762 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: GTPv1U_Emulation: support multiple client ports per GTP1U_ConnHdlr

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40746?usp=email ) Change subject: GTPv1U_Emulation: support multiple client ports per GTP1U_ConnHdlr ...................................................................... GTPv1U_Emulation: support multiple client ports per GTP1U_ConnHdlr This feature is already present in GTP1U code of GTP_Emulation. That part of the code will be removed and ported to use GTPv1U_Emulation, so we need to also support this feature here. Change-Id: I10ce33f30a2da5159f8040725df619844a71d6bc --- M epdg/EPDG_Tests.ttcn M library/GTPv1U_Emulation.ttcnpp M pgw/PGW_Tests.ttcn 3 files changed, 33 insertions(+), 31 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index f67fc2c..9d22b15 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -371,8 +371,8 @@ connect(vc_conn:GTP2, vc_GTP2:CLIENT); connect(vc_conn:GTP2_PROC, vc_GTP2:CLIENT_PROC); /* GTP1U */ - connect(vc_conn:GTP1U, vc_GTP1U:CLIENT); - connect(vc_conn:GTP1U_PROC, vc_GTP1U:CLIENT_PROC); + connect(vc_conn:GTP1U[0], vc_GTP1U:CLIENT); + connect(vc_conn:GTP1U_PROC[0], vc_GTP1U:CLIENT_PROC); /* SWx */ vc_conn_swx := DIAMETER_ConnHdlr_CT.create(id); @@ -880,18 +880,18 @@ } private function f_GTP1U_send(octetstring payload) runs on EPDG_ConnHdlr { var Gtp1uPeer peer := valueof(ts_GtpPeerU(f_inet_addr(g_pars.bearer.gtpu_addr_remote))); - GTP1U.send(ts_GTP1U_GPDU(peer, omit /*opt_part*/, g_pars.bearer.teid_remote, payload)); + GTP1U[0].send(ts_GTP1U_GPDU(peer, omit /*opt_part*/, g_pars.bearer.teid_remote, payload)); } private function f_GTP1U_echo_ping_pong(uint16_t seq_nr := 0) runs on EPDG_ConnHdlr { var Gtp1uPeer peer := valueof(ts_GtpPeerU(f_inet_addr(g_pars.bearer.gtpu_addr_remote))); - GTP1U.send(ts_GTPU_PING(peer, seq := seq_nr)); - GTP1U.receive(tr_GTPU_PONG(peer)); + GTP1U[0].send(ts_GTPU_PING(peer, seq := seq_nr)); + GTP1U[0].receive(tr_GTPU_PONG(peer)); } private altstep as_GTPU_rx_icmp4(template (present) PDU_ICMP expected := ?) runs on EPDG_ConnHdlr { var Gtp1uUnitdata rx_msg; var template (value) Gtp1uPeer peer := ts_GtpPeerU(f_inet_addr(g_pars.bearer.gtpu_addr_remote)); - [] GTP1U.receive(tr_GTPU_GPDU(peer, g_pars.bearer.teid_local)) -> value rx_msg { + [] GTP1U[0].receive(tr_GTPU_GPDU(peer, g_pars.bearer.teid_local)) -> value rx_msg { /*TODO: verify gtpu txseq: if (f_verify_gtpu_txseq(ud.gtpu, use_gtpu_txseq) == false) { setverdict(fail); @@ -908,7 +908,7 @@ repeat; } } - [] GTP1U.receive(Gtp1uUnitdata:?) -> value rx_msg { + [] GTP1U[0].receive(Gtp1uUnitdata:?) -> value rx_msg { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected GTP msg rx: ", rx_msg)); } } diff --git a/library/GTPv1U_Emulation.ttcnpp b/library/GTPv1U_Emulation.ttcnpp index b3de2ab..8b76379 100644 --- a/library/GTPv1U_Emulation.ttcnpp +++ b/library/GTPv1U_Emulation.ttcnpp @@ -342,48 +342,50 @@ /*********************************************************************** * Client Component ***********************************************************************/ +/* maximum number of GTP ports a GTP_ConnHdlr component can manage. This allows + * connection one GTP_ConnHdlr to several GTP_Emulation(s). */ +const integer NUM_MAX_GTP := 4; type component GTP1U_ConnHdlr { - port GTP1UEM_PT GTP1U; - port GTP1UEM_PROC_PT GTP1U_PROC; + port GTP1UEM_PT GTP1U[NUM_MAX_GTP]; + port GTP1UEM_PROC_PT GTP1U_PROC[NUM_MAX_GTP]; }; - -function f_gtp1u_register_teid(OCT4 teid) runs on GTP1U_ConnHdlr { - GTP1U_PROC.call(GTP1UEM_register_teid:{teid}) { - [] GTP1U_PROC.getreply(GTP1UEM_register_teid:{teid}); +function f_gtp1u_register_teid(OCT4 teid, integer port_idx := 0) runs on GTP1U_ConnHdlr { + GTP1U_PROC[port_idx].call(GTP1UEM_register_teid:{teid}) { + [] GTP1U_PROC[port_idx].getreply(GTP1UEM_register_teid:{teid}); } } -function f_gtp1u_allocate_teid() runs on GTP1U_ConnHdlr return OCT4 { +function f_gtp1u_allocate_teid(integer port_idx := 0) runs on GTP1U_ConnHdlr return OCT4 { var OCT4 t; - GTP1U_PROC.call(GTP1UEM_allocate_teid:{}) { - [] GTP1U_PROC.getreply(GTP1UEM_allocate_teid:{}) -> value t { + GTP1U_PROC[port_idx].call(GTP1UEM_allocate_teid:{}) { + [] GTP1U_PROC[port_idx].getreply(GTP1UEM_allocate_teid:{}) -> value t { return t; } } } #ifdef GTP1U_EMULATION_HAVE_UECUPS -function f_gtp1u_create_tunnel(template (value) UECUPS_CreateTun gtc) +function f_gtp1u_create_tunnel(template (value) UECUPS_CreateTun gtc, integer port_idx := 0) runs on GTP1U_ConnHdlr { - GTP1U_PROC.call(GTP1UEM_create_tunnel:{valueof(gtc)}) { - [] GTP1U_PROC.getreply(GTP1UEM_create_tunnel:{gtc}); + GTP1U_PROC[port_idx].call(GTP1UEM_create_tunnel:{valueof(gtc)}) { + [] GTP1U_PROC[port_idx].getreply(GTP1UEM_create_tunnel:{gtc}); } } -function f_gtp1u_destroy_tunnel(template (value) UECUPS_DestroyTun gtd) +function f_gtp1u_destroy_tunnel(template (value) UECUPS_DestroyTun gtd, integer port_idx := 0) runs on GTP1U_ConnHdlr { - GTP1U_PROC.call(GTP1UEM_destroy_tunnel:{valueof(gtd)}) { - [] GTP1U_PROC.getreply(GTP1UEM_destroy_tunnel:{gtd}); + GTP1U_PROC[port_idx].call(GTP1UEM_destroy_tunnel:{valueof(gtd)}) { + [] GTP1U_PROC[port_idx].getreply(GTP1UEM_destroy_tunnel:{gtd}); } } -function f_gtp1u_start_program(template (value) UECUPS_StartProgram sprog) +function f_gtp1u_start_program(template (value) UECUPS_StartProgram sprog, integer port_idx := 0) runs on GTP1U_ConnHdlr return UECUPS_StartProgramRes { var UECUPS_StartProgramRes res; - GTP1U_PROC.call(GTP1UEM_start_program:{valueof(sprog)}) { - [] GTP1U_PROC.getreply(GTP1UEM_start_program:{sprog}) -> value res; + GTP1U_PROC[port_idx].call(GTP1UEM_start_program:{valueof(sprog)}) { + [] GTP1U_PROC[port_idx].getreply(GTP1UEM_start_program:{sprog}) -> value res; } return res; } diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 4d225fa..16ac9ee 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -311,8 +311,8 @@ vc_GTP1U := GTPv1U_Emulation_CT.create("GTP1U_EM"); map(vc_GTP1U:GTP1U, system:GTP1U); connect(vc_GTP1U:TEID0, self:TEID0); - connect(vc_GTP1U:CLIENT, self:GTP1U); - connect(vc_GTP1U:CLIENT_PROC, self:GTP1U_PROC); + connect(vc_GTP1U:CLIENT, self:GTP1U[0]); + connect(vc_GTP1U:CLIENT_PROC, self:GTP1U_PROC[0]); vc_GTP1U.start(GTPv1U_Emulation.main(cfg)); } @@ -344,8 +344,8 @@ vc_conn := PGW_Session_CT.create(id); connect(vc_conn:GTP2, vc_GTP2:CLIENT); connect(vc_conn:GTP2_PROC, vc_GTP2:CLIENT_PROC); - connect(vc_conn:GTP1U, vc_GTP1U:CLIENT); - connect(vc_conn:GTP1U_PROC, vc_GTP1U:CLIENT_PROC); + connect(vc_conn:GTP1U[0], vc_GTP1U:CLIENT); + connect(vc_conn:GTP1U_PROC[0], vc_GTP1U:CLIENT_PROC); if (isbound(vc_Gx)) { vc_conn_gx := DIAMETER_ConnHdlr_CT.create(id); @@ -937,10 +937,10 @@ T.start; alt { - [] GTP1U.receive(UECUPS_ProgramTermInd:{pid := pid, exit_code := exit_code}) { + [] GTP1U[0].receive(UECUPS_ProgramTermInd:{pid := pid, exit_code := exit_code}) { setverdict(pass); } - [] GTP1U.receive(UECUPS_ProgramTermInd:?) -> value pti { + [] GTP1U[0].receive(UECUPS_ProgramTermInd:?) -> value pti { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected ProgramTermInd := ", pti)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40746?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: I10ce33f30a2da5159f8040725df619844a71d6bc Gerrit-Change-Number: 40746 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Rework init code

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40750?usp=email ) Change subject: 5gc: Rework init code ...................................................................... 5gc: Rework init code * Move T_Guard to MTC, there's no need to have multiple of them (one per ConnHdlr). * Call f_init_handler() internally so it doesn't need to be called by each ConnHdlr test. * Change function attribute friend to private Change-Id: I71e5d552a6c0089345982a403285f66a92397413 --- M 5gc/C5G_Tests.ttcn 1 file changed, 28 insertions(+), 23 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index f5b0931..3b84a58 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -114,12 +114,13 @@ port NGAP_PT NGAP_UNIT[NUM_NGRAN]; port NGAPEM_PROC_PT NGAP_PROC[NUM_NGRAN]; + timer g_Tguard := 30.0; + var UeParams g_ue_pars[NUM_UE]; } type component ConnHdlr extends NGAP_ConnHdlr { var ConnHdlrPars g_pars; - timer g_Tguard := 30.0; } type record ConnHdlrPars { @@ -134,13 +135,13 @@ } /* send incoming unit data messages (like reset) to global NGAP_UNIT port */ -friend function NGapForwardUnitdataCallback(NGAP_PDU msg) +private function NGapForwardUnitdataCallback(NGAP_PDU msg) runs on NGAP_Emulation_CT return template NGAP_PDU { NGAP_UNIT.send(msg); return omit; } -friend function f_init_one_ngran(integer num := 0) runs on MTC_CT { +private function f_init_one_ngran(integer num := 0) runs on MTC_CT { var charstring id := testcasename() & "-NGAP" & int2str(num); var NGAPOps ops := { create_cb := refers(NGAP_Emulation.ExpectedCreateCallback), @@ -177,12 +178,12 @@ NGAP_UNIT[num].receive(NGAPEM_Event:{up_down:=NGAPEM_EVENT_UP}); } -friend function f_init_one_ue(inout UeParams uep, integer imsi_suffix) { +private function f_init_one_ue(inout UeParams uep, integer imsi_suffix) { uep := valueof(ts_UeParams(imsi_suffix)); } -friend function f_init_ngap(integer imsi_suffix := 0) runs on MTC_CT { +private function f_init_ngap(integer imsi_suffix := 0) runs on MTC_CT { var integer i; for (i := 0; i < NUM_NGRAN; i := i+1) { f_init_one_ngran(i); @@ -192,8 +193,16 @@ } } +private function f_init(integer imsi_suffix := 0, float t_guard := 30.0) runs on MTC_CT { + /* start guard timer and activate it as default */ + g_Tguard.start(t_guard); + activate(as_Tguard()); + + f_init_ngap(imsi_suffix); +} + /* generate parameters for a connection handler */ -friend function f_init_pars(integer ue_idx := 0) +private function f_init_pars(integer ue_idx := 0) runs on MTC_CT return ConnHdlrPars { var ConnHdlrPars pars := { ngran_pars := g_ngran_pars, @@ -204,10 +213,10 @@ return pars; } -type function void_fn(ConnHdlrPars pars) runs on ConnHdlr; +type function void_fn() runs on ConnHdlr; /* start a connection handler with given parameters */ -friend function f_start_handler_with_pars(void_fn fn, ConnHdlrPars pars, integer ngap_idx := 0) +private function f_start_handler_with_pars(void_fn fn, ConnHdlrPars pars, integer ngap_idx := 0) runs on MTC_CT return ConnHdlr { var ConnHdlr vc_conn; var charstring id := testcasename() & int2str(ngap_idx); @@ -219,24 +228,21 @@ /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ - vc_conn.start(derefers(fn)(pars)); + vc_conn.start(f_init_handler(fn, pars)); return vc_conn; } /* altstep for the global guard timer */ -private altstep as_Tguard()runs on ConnHdlr { +private altstep as_Tguard()runs on MTC_CT { [] g_Tguard.timeout { - setverdict(fail, "Tguard timeout"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout"); } } -friend function f_init_handler(ConnHdlrPars pars, float t_guard := 30.0) runs on ConnHdlr { +private function f_init_handler(void_fn fn, ConnHdlrPars pars) runs on ConnHdlr { /* make parameters available via component variable */ g_pars := pars; - /* start guard timre and activate it as default */ - g_Tguard.start(t_guard); - activate(as_Tguard()); + fn.apply(); } private template (value) NGAP_IEs.TAI ts_ngran_NGAP_TAI(NGRANParams ngran_pars) := { @@ -277,7 +283,7 @@ return valueof(p_ueLocInf); } -friend function f_ngap_setup(integer idx := 0, template (omit) NGAP_IEs.Cause cause := omit) runs on MTC_CT { +private function f_ngap_setup(integer idx := 0, template (omit) NGAP_IEs.Cause cause := omit) runs on MTC_CT { var template (present) NGAP_IEs.Cause exp_cause := ?; var boolean exp_fail := false; timer T := 5.0; @@ -563,30 +569,29 @@ /* NG Setup procedure to 5GC using a Global gNB ID containing unknown/foreign PLMN. * Related: https://github.com/open5gs/open5gs/issues/3544 */ testcase TC_ng_setup_unknown_global_gnb_id_plmn() runs on MTC_CT { - f_init_ngap(); + f_init(); g_ngran_pars[0].global_ngran_id.globalGNB_ID.pLMNIdentity := '62F224'O; f_ngap_setup(0); } /* Unsuccessful NG Setup procedure to AMF (wrong PLMN) */ testcase TC_ng_setup_wrong_tac() runs on MTC_CT { - f_init_ngap(); + f_init(); g_ngran_pars[0].supported_ta_list[0].broadcastPLMNList[0].pLMNIdentity := '62F224'O; f_ngap_setup(0, {misc:=unknown_PLMN_or_SNPN}); } /* NG Setup procedure to 5GC using a correct Global gNB ID. */ testcase TC_ng_setup() runs on MTC_CT { - f_init_ngap(); + f_init(); f_ngap_setup(0); } -private function f_TC_register(ConnHdlrPars pars) runs on ConnHdlr { - f_init_handler(pars); +private function f_TC_register() runs on ConnHdlr { f_register(); } testcase TC_ng_register() runs on MTC_CT { - f_init_ngap(); + f_init(); f_ngap_setup(0); var ConnHdlrPars pars := f_init_pars(ue_idx := 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40750?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: I71e5d552a6c0089345982a403285f66a92397413 Gerrit-Change-Number: 40750 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: Split GTPv1U out of GTP_Emulation

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40749?usp=email ) Change subject: Split GTPv1U out of GTP_Emulation ...................................................................... Split GTPv1U out of GTP_Emulation We already have a GTPv1U_Emulation, use it. Change-Id: I5b3da248719b79d402b945904e3840a2ec387dab --- M hnodeb/HNBGW_ConnectionHandler.ttcn M hnodeb/HNB_Tests.ttcn M hnodeb/gen_links.sh M hnodeb/regen_makefile.sh M library/GTP_Emulation.ttcn M mme/MME_Tests.ttcn M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/SGSN_Tests.ttcn M sgsn/SGSN_Tests_Iu.ttcn M sgsn/gen_links.sh 10 files changed, 99 insertions(+), 120 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn index 5afeede..b1b2463 100644 --- a/hnodeb/HNBGW_ConnectionHandler.ttcn +++ b/hnodeb/HNBGW_ConnectionHandler.ttcn @@ -34,13 +34,13 @@ import from HNBLLIF_Types all; import from HNBLLIF_Templates all; -import from GTP_Emulation all; import from GTPv1U_Templates all; import from GTPv1U_CodecPort all; import from GTPU_Types all; +import from GTPv1U_Emulation all; /* this component represents a single Iuh connection at the HNBGW. */ -type component HNBGW_ConnHdlr extends Iuh_ConnHdlr, GTP_ConnHdlr, StatsD_ConnHdlr { +type component HNBGW_ConnHdlr extends Iuh_ConnHdlr, GTP1U_ConnHdlr, StatsD_ConnHdlr { port TELNETasp_PT HNBVTY; /* HNBLLIF Interface of HNodeB */ port HNBLLIF_CODEC_PT LLSK; @@ -50,7 +50,7 @@ port RTPEM_CTRL_PT RTPEM_CTRL; port RTPEM_DATA_PT RTPEM_DATA; - var GTP_Emulation_CT vc_GTP; + var GTPv1U_Emulation_CT vc_GTP1U; var TestHdlrParams g_pars; @@ -81,28 +81,26 @@ vc_Iuh.start(Iuh_Emulation.main(iuh_pars, id & "-Iuh")); } -private function f_HNBGW_ConnHdlr_init_gtp(charstring id) runs on HNBGW_ConnHdlr { - id := id & "-GTP"; +private function f_HNBGW_ConnHdlr_init_gtp1u(charstring id) runs on HNBGW_ConnHdlr { + id := id & "-GTP1U"; - var GtpEmulationCfg gtp_cfg := { - gtpc_bind_ip := g_pars.hnbgw_addr, - gtpc_bind_port := GTP1C_PORT, + var Gtp1uEmulationCfg gtp_cfg := { gtpu_bind_ip := g_pars.hnbgw_addr, gtpu_bind_port := GTP1U_PORT, - sgsn_role := false + use_gtpu_daemon := false }; - vc_GTP := GTP_Emulation_CT.create(id) alive; - connect(self:GTP[0], vc_GTP:CLIENT); - connect(self:GTP_PROC[0], vc_GTP:CLIENT_PROC); - vc_GTP.start(GTP_Emulation.main(gtp_cfg)); + vc_GTP1U := GTPv1U_Emulation_CT.create(id) alive; + connect(self:GTP1U[0], vc_GTP1U:CLIENT); + connect(self:GTP1U_PROC[0], vc_GTP1U:CLIENT_PROC); + vc_GTP1U.start(GTPv1U_Emulation.main(gtp_cfg)); } /* initialize all parameters */ function f_HNBGW_ConnHdlr_init(charstring id, TestHdlrParams pars) runs on HNBGW_ConnHdlr { g_pars := valueof(pars); f_HNBGW_ConnHdlr_init_iuh(id); - f_HNBGW_ConnHdlr_init_gtp(id); + f_HNBGW_ConnHdlr_init_gtp1u(id); f_HNBGW_ConnHdlr_init_vty(); /* Connect to HNB on LLSK and do HELLO ping-pong */ @@ -200,7 +198,7 @@ function f_gtpu_send(uint32_t tei, octetstring payload) runs on HNBGW_ConnHdlr { var Gtp1uPeer peer := valueof(ts_GtpPeerU(g_pars.hnodeb_addr)); - GTP[0].send(ts_GTP1U_GPDU(peer, omit /*opt_part*/, int2oct(tei, 4), payload)); + GTP1U[0].send(ts_GTP1U_GPDU(peer, omit /*opt_part*/, int2oct(tei, 4), payload)); } /* HNBLLIF socket may at any time receive a new INFO.ind */ diff --git a/hnodeb/HNB_Tests.ttcn b/hnodeb/HNB_Tests.ttcn index 987108a..e848686 100644 --- a/hnodeb/HNB_Tests.ttcn +++ b/hnodeb/HNB_Tests.ttcn @@ -54,7 +54,7 @@ import from GTPU_Types all; import from GTPv1U_Templates all; -import from GTP_Emulation all; +import from GTPv1U_Emulation all; import from IuUP_Types all; @@ -409,7 +409,7 @@ var HNBLLIF_send_data sd; var uint32_t gtp_conn_id; - f_gtp_register_teid(int2oct(remote_tei, 4)); + f_gtp1u_register_teid(int2oct(remote_tei, 4)); f_handle_hnbap_hnb_register_req(); @@ -438,7 +438,7 @@ /* Forward GTP data in both directions */ LLSK.send(f_llsk_tx(ts_HNBLLIF_GTP_CONN_DATA_REQ(gtp_conn_id, gtp_payload))); - GTP[0].receive(tr_GTPU_GPDU(ts_GtpPeerU(g_pars.hnodeb_addr), int2oct(remote_tei, 4), gtp_payload)); + GTP1U[0].receive(tr_GTPU_GPDU(ts_GtpPeerU(g_pars.hnodeb_addr), int2oct(remote_tei, 4), gtp_payload)); f_gtpu_send(local_tei, gtp_payload); LLSK.receive(f_llsk_rx(tr_HNBLLIF_GTP_CONN_DATA_IND(gtp_conn_id, gtp_payload))); diff --git a/hnodeb/gen_links.sh b/hnodeb/gen_links.sh index 118bb8b..91dced9 100755 --- a/hnodeb/gen_links.sh +++ b/hnodeb/gen_links.sh @@ -45,7 +45,7 @@ gen_links $DIR $FILES DIR=$BASEDIR/titan.ProtocolModules.GTP_v13.5.0/src -FILES="GTPC_EncDec.cc GTPC_Types.ttcn GTPU_EncDec.cc GTPU_Types.ttcn" +FILES="GTPU_EncDec.cc GTPU_Types.ttcn" gen_links $DIR $FILES DIR=../library/hnbap @@ -63,9 +63,8 @@ FILES+="Iuh_Types.ttcn Iuh_CodecPort.ttcn Iuh_CodecPort_CtrlFunctDef.cc Iuh_CodecPort_CtrlFunct.ttcn Iuh_Emulation.ttcn DNS_Helpers.ttcn " FILES+="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " -FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn " -FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn " -FILES+="GTP_Emulation.ttcn IPCP_Types.ttcn IPCP_Templates.ttcn GSM_Types.ttcn " +FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn GTPv1U_Emulation.ttcnpp " +FILES+="IPCP_Types.ttcn IPCP_Templates.ttcn GSM_Types.ttcn " FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES diff --git a/hnodeb/regen_makefile.sh b/hnodeb/regen_makefile.sh index 6505cf6..2d86343 100755 --- a/hnodeb/regen_makefile.sh +++ b/hnodeb/regen_makefile.sh @@ -25,9 +25,7 @@ HNBAP_EncDec.cc RUA_EncDec.cc UD_PT.cc - GTPC_EncDec.cc GTPU_EncDec.cc - GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1U_CodecPort_CtrlFunctDef.cc " diff --git a/library/GTP_Emulation.ttcn b/library/GTP_Emulation.ttcn index c5e4e24..83aa42f 100644 --- a/library/GTP_Emulation.ttcn +++ b/library/GTP_Emulation.ttcn @@ -1,6 +1,7 @@ /* GTP Emulation in TTCN-3 * * (C) 2018 Harald Welte <laforge(a)gnumonks.org> + * (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * All rights reserved. * * Released under the terms of GNU General Public License, Version 2 or @@ -15,11 +16,8 @@ import from General_Types all; import from Osmocom_Types all; import from GTPC_Types all; -import from GTPU_Types all; import from GTPv1C_CodecPort all; -import from GTPv1U_CodecPort all; import from GTPv1C_CodecPort_CtrlFunct all; -import from GTPv1U_CodecPort_CtrlFunct all; /*********************************************************************** * Main Emulation Component @@ -27,20 +25,16 @@ const integer GTP0_PORT := 3386; const integer GTP1C_PORT := 2123; -const integer GTP1U_PORT := 2152; type record GtpEmulationCfg { HostName gtpc_bind_ip optional, PortNumber gtpc_bind_port optional, - HostName gtpu_bind_ip optional, - PortNumber gtpu_bind_port optional, boolean sgsn_role }; type component GTP_Emulation_CT { /* Communication with underlying GTP CodecPort */ port GTPC_PT GTPC; - port GTPU_PT GTPU; /* Communication with Clients */ port GTPEM_PT CLIENT; @@ -51,15 +45,15 @@ var GtpEmulationCfg g_gtp_cfg; /* State */ - var integer g_gtpc_id, g_gtpu_id; + var integer g_gtpc_id; var OCT1 g_restart_ctr; - var uint16_t g_c_seq_nr, g_u_seq_nr; + var uint16_t g_c_seq_nr; var TidTableRec TidTable[16]; var ImsiTableRec ImsiTable[16]; }; type record TidTableRec { - OCT4 teid, + OCT4 teic, GTP_ConnHdlr vc_conn }; @@ -68,14 +62,14 @@ GTP_ConnHdlr vc_conn }; -private function f_comp_by_teid(OCT4 teid) runs on GTP_Emulation_CT return GTP_ConnHdlr { +private function f_comp_by_teic(OCT4 teic) runs on GTP_Emulation_CT return GTP_ConnHdlr { var integer i; for (i := 0; i < sizeof(TidTable); i := i+1) { - if (isbound(TidTable[i].teid) and TidTable[i].teid == teid) { + if (isbound(TidTable[i].teic) and TidTable[i].teic == teic) { return TidTable[i].vc_conn; } } - setverdict(fail, "No Component for TEID ", teid); + setverdict(fail, "No Component for TEIC ", teic); mtc.stop; } @@ -90,16 +84,16 @@ mtc.stop; } -private function f_tid_tbl_add(OCT4 teid, GTP_ConnHdlr vc_conn) runs on GTP_Emulation_CT { +private function f_tid_tbl_add(OCT4 teic, GTP_ConnHdlr vc_conn) runs on GTP_Emulation_CT { var integer i; for (i := 0; i < sizeof(TidTable); i := i+1) { - if (not isbound(TidTable[i].teid)) { - TidTable[i].teid := teid; + if (not isbound(TidTable[i].teic)) { + TidTable[i].teic := teic; TidTable[i].vc_conn := vc_conn; return; } } - testcase.stop("No Space in TidTable for ", teid); + testcase.stop("No Space in TidTable for ", teic); } private function f_imsi_tbl_add(hexstring imsi, GTP_ConnHdlr vc_conn) runs on GTP_Emulation_CT { @@ -220,38 +214,29 @@ g_gtpc_id := res.connId; } - if (isvalue(cfg.gtpu_bind_ip) and isvalue(cfg.gtpu_bind_port)) { - map(self:GTPU, system:GTPU); - res := GTPv1U_CodecPort_CtrlFunct.f_GTPU_listen(GTPU, cfg.gtpu_bind_ip, - cfg.gtpu_bind_port, {udp:={}}); - g_gtpu_id := res.connId; - } - g_restart_ctr := f_rnd_octstring(1); g_c_seq_nr := f_rnd_int(65535); - g_u_seq_nr := f_rnd_int(65535); g_gtp_cfg := cfg; } function main(GtpEmulationCfg cfg) runs on GTP_Emulation_CT { var Gtp1cUnitdata g1c_ud; - var Gtp1uUnitdata g1u_ud; var GTP_ConnHdlr vc_conn; var hexstring imsi; - var OCT4 teid; + var OCT4 teic; f_init(cfg); while (true) { alt { - /* route inbound GTP-C based on IMSI or TEID */ + /* route inbound GTP-C based on IMSI or TEIC */ [] GTPC.receive(Gtp1cUnitdata:?) -> value g1c_ud { var template hexstring imsi_t := f_gtpc_extract_imsi(g1c_ud.gtpc); if (isvalue(imsi_t)) { vc_conn := f_comp_by_imsi(valueof(imsi_t)); CLIENT.send(g1c_ud) to vc_conn; } else if(g1c_ud.gtpc.teid != int2oct(0, 4)) { - vc_conn := f_comp_by_teid(g1c_ud.gtpc.teid); + vc_conn := f_comp_by_teic(g1c_ud.gtpc.teid); CLIENT.send(g1c_ud) to vc_conn; } else { /* Check if a default port is set: */ @@ -261,25 +246,18 @@ /* Send to all clients */ var integer i; for (i := 0; i < sizeof(TidTable); i := i+1) { - if (isbound(TidTable[i].teid) and TidTable[i].teid == teid) { + if (isbound(TidTable[i].teic) and TidTable[i].teic == teic) { CLIENT.send(g1c_ud) to TidTable[i].vc_conn; } } } } } - [] GTPU.receive(Gtp1uUnitdata:?) -> value g1u_ud { - vc_conn := f_comp_by_teid(g1u_ud.gtpu.teid); - CLIENT.send(g1u_ud) to vc_conn; - } /* transparently forward any GTP-C / GTP-U from clients to peer[s] */ [] CLIENT.receive(Gtp1cUnitdata:?) -> value g1c_ud sender vc_conn { GTPC.send(g1c_ud); } - [] CLIENT.receive(Gtp1uUnitdata:?) -> value g1u_ud sender vc_conn { - GTPU.send(g1u_ud); - } [] CLIENT_DEFAULT.receive(Gtp1cUnitdata:?) -> value g1c_ud sender vc_conn { GTPC.send(g1c_ud); } @@ -289,9 +267,9 @@ CLIENT_PROC.reply(GTPEM_register_imsi:{imsi}) to vc_conn; } - [] CLIENT_PROC.getcall(GTPEM_register_teid:{?}) -> param(teid) sender vc_conn { - f_tid_tbl_add(teid, vc_conn); - CLIENT_PROC.reply(GTPEM_register_teid:{teid}) to vc_conn; + [] CLIENT_PROC.getcall(GTPEM_register_teic:{?}) -> param(teic) sender vc_conn { + f_tid_tbl_add(teic, vc_conn); + CLIENT_PROC.reply(GTPEM_register_teic:{teic}) to vc_conn; } } @@ -303,14 +281,14 @@ * Interaction between Main and Client Components ***********************************************************************/ type port GTPEM_PT message { - inout Gtp1cUnitdata, Gtp1uUnitdata; + inout Gtp1cUnitdata; } with { extension "internal" }; signature GTPEM_register_imsi(hexstring imsi); -signature GTPEM_register_teid(OCT4 teid); +signature GTPEM_register_teic(OCT4 teic); type port GTPEM_PROC_PT procedure { - inout GTPEM_register_imsi, GTPEM_register_teid; + inout GTPEM_register_imsi, GTPEM_register_teic; } with { extension "internal" }; /*********************************************************************** @@ -331,13 +309,13 @@ } } -function f_gtp_register_teid(OCT4 teid, integer gtp_idx := 0) runs on GTP_ConnHdlr { - GTP_PROC[gtp_idx].call(GTPEM_register_teid:{teid}) { - [] GTP_PROC[gtp_idx].getreply(GTPEM_register_teid:{teid}); +function f_gtp_register_teic(OCT4 teic, integer gtp_idx := 0) runs on GTP_ConnHdlr { + GTP_PROC[gtp_idx].call(GTPEM_register_teic:{teic}) { + [] GTP_PROC[gtp_idx].getreply(GTPEM_register_teic:{teic}); } } -function f_gtp_teid_random() return OCT4 { +function f_gtp_teic_random() return OCT4 { return f_rnd_octstring(4); } } diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 4885b1e..e039cfe 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -354,8 +354,6 @@ var GtpEmulationCfg gtp_cfg := { gtpc_bind_ip := mp_gn_local_ip, gtpc_bind_port := mp_gn_local_port, - gtpu_bind_ip := omit, - gtpu_bind_port := omit, sgsn_role := true }; @@ -1118,7 +1116,7 @@ private function f_TC_gn_echo_request(ConnHdlrPars pars) runs on ConnHdlr { timer T := 5.0; f_init_handler(pars); - f_gtp_register_teid('00000000'O); + f_gtp_register_teic('00000000'O); GTP[0].send(ts_GTPC_PING(g_gn_iface_peer, 1)); T.start; @@ -1323,7 +1321,7 @@ private function f_TC_RIM_RAN_INF(ConnHdlrPars pars) runs on ConnHdlr { timer T := 5.0; f_init_handler(pars); - f_gtp_register_teid('00000000'O); + f_gtp_register_teic('00000000'O); var Gtp1cUnitdata req_gtpc_pdu; var Gtp1cUnitdata resp_gtpc_pdu; var GTP_CellId geran_gtp_ci; @@ -1529,10 +1527,10 @@ f_gtp_register_imsi(g_pars.ue_pars.imsi); f_gtp2_register_imsi(g_pars.ue_pars.imsi); /* SGSN Context Req doesn't necessarily contain IMSI, hence expect it through TEID=0 */ - f_gtp_register_teid('00000000'O); + f_gtp_register_teic('00000000'O); /* passed in SGSN Context Resp to MME, will be used by MME when answering with SGSN Context Ack: */ const OCT4 new_sgsn_teid := 'ABABABAB'O; - f_gtp_register_teid(new_sgsn_teid); + f_gtp_register_teic(new_sgsn_teid); var template (value) EPS_MobileIdentityV mi := ts_NAS_MobileId_IMSI(pars.ue_pars.imsi); var template (value) S1AP_PDU tx; diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn index 6e2e611..aea981c 100644 --- a/sgsn/BSSGP_ConnHdlr.ttcn +++ b/sgsn/BSSGP_ConnHdlr.ttcn @@ -39,6 +39,7 @@ import from GTPv1C_Templates all; import from GTPv1U_Templates all; import from GTP_Emulation all; +import from GTPv1U_Emulation all; import from LLC_Types all; import from LLC_Templates all; @@ -59,7 +60,7 @@ return ran_index + 1 - NUM_GB; } -type component BSSGP_ConnHdlr extends BSSGP_Client_CT, GSUP_ConnHdlr, GTP_ConnHdlr, RAN_ConnHdlr { +type component BSSGP_ConnHdlr extends BSSGP_Client_CT, GSUP_ConnHdlr, GTP_ConnHdlr, GTP1U_ConnHdlr, RAN_ConnHdlr { var BSSGP_ConnHdlrPars g_pars; timer g_Tguard; var LLC_Entities llc; @@ -907,8 +908,8 @@ apars.sgsn_tei_u := gtpc_rx.createPDPContextRequest.teidDataI.teidDataI; apars.sgsn_ip_c := gtpc_rx.createPDPContextRequest.sgsn_addr_signalling.addressf; apars.sgsn_ip_u := gtpc_rx.createPDPContextRequest.sgsn_addr_traffic.addressf; - f_gtp_register_teid(apars.ggsn_tei_c, GTP_GGSN_IDX); - f_gtp_register_teid(apars.ggsn_tei_u, GTP_GGSN_IDX); + f_gtp_register_teic(apars.ggsn_tei_c, GTP_GGSN_IDX); + f_gtp1u_register_teid(apars.ggsn_tei_u, GTP_GGSN_IDX); } altstep as_ggsn_gtp_ctx_act_req(inout PdpActPars apars, boolean send_recovery := false) runs on BSSGP_ConnHdlr { var Gtp1cUnitdata g_ud; @@ -953,7 +954,7 @@ upd.sgsn_addr_traffic.addressf, ":", upd.teidDataI.teidDataI, " vs exp ", apars.rnc_ip_u, ":", apars.rnc_tei_u)); } - f_gtp_register_teid(apars.rnc_tei_u, ran2gtp_idx(ran_index)); + f_gtp1u_register_teid(apars.rnc_tei_u, ran2gtp_idx(ran_index)); } else { apars.sgsn_ip_u := upd.sgsn_addr_traffic.addressf; apars.sgsn_tei_u := upd.teidDataI.teidDataI; @@ -1114,7 +1115,7 @@ BSSGP[ran_index].clear; if (error_ind) { var Gtp1uPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_c)); - GTP[GTP_GGSN_IDX].send(ts_GTPU_ErrorIndication(peer, 0 /* seq */, apars.ggsn_tei_u, apars.ggsn_ip_u)); + GTP1U[GTP_GGSN_IDX].send(ts_GTPU_ErrorIndication(peer, 0 /* seq */, apars.ggsn_tei_u, apars.ggsn_ip_u)); } else { var Gtp1cPeer peer := valueof(ts_GtpPeerC(apars.sgsn_ip_c)); GTP[GTP_GGSN_IDX].send(ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B)); @@ -1237,7 +1238,7 @@ peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); rem_teid := apars.sgsn_tei_u; } - GTP[GTP_GGSN_IDX].send(ts_GTP1U_GPDU(peer, omit /*opt_part*/, rem_teid, payload)); + GTP1U[GTP_GGSN_IDX].send(ts_GTP1U_GPDU(peer, omit /*opt_part*/, rem_teid, payload)); } altstep as_xid(PdpActPars apars, integer ran_index := 0) runs on BSSGP_ConnHdlr { @@ -1296,8 +1297,8 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "GTP-U forwarded to BSSGP but not expected"); } /* Expect PDU directly from RNC (Direct Tunnel): */ - [is_iu(ran_index) and expect_fwd] GTP[ran2gtp_idx(ran_index)].receive(tr_GTPU_GPDU(valueof(ts_GtpPeerU(apars.ggsn_ip_u)), apars.rnc_tei_u, payload)); - [is_iu(ran_index) and not expect_fwd] GTP[ran2gtp_idx(ran_index)].receive(tr_GTPU_GPDU(valueof(ts_GtpPeerU(apars.ggsn_ip_u)), apars.rnc_tei_u, payload)) { + [is_iu(ran_index) and expect_fwd] GTP1U[ran2gtp_idx(ran_index)].receive(tr_GTPU_GPDU(valueof(ts_GtpPeerU(apars.ggsn_ip_u)), apars.rnc_tei_u, payload)); + [is_iu(ran_index) and not expect_fwd] GTP1U[ran2gtp_idx(ran_index)].receive(tr_GTPU_GPDU(valueof(ts_GtpPeerU(apars.ggsn_ip_u)), apars.rnc_tei_u, payload)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "GTP-U forwarded to BSSGP but not expected") } [expect_fwd] T.timeout { @@ -1320,11 +1321,11 @@ } else if (is_iu(ran_index)) { /* Send PDU via GTPv1U from simulated MS/RNC directly to the simulated GGSN: */ rx_peer := valueof(ts_GtpPeerU(apars.rnc_ip_u)); - GTP[ran2gtp_idx(ran_index)].send(ts_GTP1U_GPDU(valueof(ts_GtpPeerU(apars.ggsn_ip_u)), omit /*opt_part*/, apars.ggsn_tei_u, payload)); + GTP1U[ran2gtp_idx(ran_index)].send(ts_GTP1U_GPDU(valueof(ts_GtpPeerU(apars.ggsn_ip_u)), omit /*opt_part*/, apars.ggsn_tei_u, payload)); } /* Expect PDU via GTP from RNC/SGSN on simulated GGSN */ alt { - [] GTP[GTP_GGSN_IDX].receive(tr_GTPU_GPDU(rx_peer, apars.ggsn_tei_u, payload)); + [] GTP1U[GTP_GGSN_IDX].receive(tr_GTPU_GPDU(rx_peer, apars.ggsn_tei_u, payload)); } } diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index d5f98ce..3ab2485 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -50,6 +50,7 @@ import from GTPv1C_Templates all; import from GTPv1U_Templates all; import from GTP_Emulation all; +import from GTPv1U_Emulation all; import from LLC_Types all; import from LLC_Templates all; @@ -167,12 +168,12 @@ const integer NUM_RNC := 1; type record IuInstance { RAN_Adapter ranap, - GTP_Emulation_CT vc_RNC_GTP + GTPv1U_Emulation_CT vc_RNC_GTP1U }; type record length(NUM_RNC) of IuInstance IuInstances; type record of RAN_Configuration RAN_Configurations; -type component test_CT { +type component test_CT extends GTP_ConnHdlr { var GbInstances g_gb; var IuInstances g_iu; var boolean g_iu_enable := false; @@ -187,9 +188,9 @@ /* used by RIM related test */ port BSSGP_PT RIM[NUM_GB]; - port GTPEM_PT GTPC; - var GTP_Emulation_CT vc_GGSN_GTP; + var GTP_Emulation_CT vc_GGSN_GTP1C; + var GTPv1U_Emulation_CT vc_GGSN_GTP1U; port TELNETasp_PT SGSNVTY; port TELNETasp_PT STPVTY; @@ -277,31 +278,34 @@ private function f_init_rnc_gtp(charstring id, integer rnc_idx) runs on test_CT { id := id & "-RNC_GTP"; - var GtpEmulationCfg gtp_cfg := { - gtpc_bind_ip := omit, - gtpc_bind_port := omit, + var Gtp1uEmulationCfg gtp_cfg := { gtpu_bind_ip := mp_ranap_cfg[rnc_idx].sctp_addr.local_ip_addr, gtpu_bind_port := GTP1U_PORT, - sgsn_role := false + use_gtpu_daemon := false }; - g_iu[rnc_idx].vc_RNC_GTP := GTP_Emulation_CT.create(id); - g_iu[rnc_idx].vc_RNC_GTP.start(GTP_Emulation.main(gtp_cfg)); + g_iu[rnc_idx].vc_RNC_GTP1U := GTPv1U_Emulation_CT.create(id); + g_iu[rnc_idx].vc_RNC_GTP1U.start(GTPv1U_Emulation.main(gtp_cfg)); } private function f_init_ggsn_gtp(charstring id) runs on test_CT { - id := id & "-GGSN_GTP"; - - var GtpEmulationCfg gtp_cfg := { + var GtpEmulationCfg gtp1c_cfg := { gtpc_bind_ip := mp_ggsn_ip, gtpc_bind_port := GTP1C_PORT, - gtpu_bind_ip := mp_ggsn_ip, - gtpu_bind_port := GTP1U_PORT, sgsn_role := false }; - vc_GGSN_GTP := GTP_Emulation_CT.create(id); - vc_GGSN_GTP.start(GTP_Emulation.main(gtp_cfg)); + vc_GGSN_GTP1C := GTP_Emulation_CT.create(id & "-GGSN_GTP1C"); + vc_GGSN_GTP1C.start(GTP_Emulation.main(gtp1c_cfg)); + + var Gtp1uEmulationCfg gtp1u_cfg := { + gtpu_bind_ip := mp_ggsn_ip, + gtpu_bind_port := GTP1U_PORT, + use_gtpu_daemon := false + }; + + vc_GGSN_GTP1U := GTPv1U_Emulation_CT.create(id & "-GGSN_GTP1U"); + vc_GGSN_GTP1U.start(GTPv1U_Emulation.main(gtp1u_cfg)); } friend function f_init_vty() runs on test_CT { @@ -521,16 +525,18 @@ for (var integer i := 0; i < NUM_RNC; i := i+1) { /* GTP[0] is used by emulated GGSN: */ - connect(vc_conn:GTP[i + 1], g_iu[i].vc_RNC_GTP:CLIENT); - connect(vc_conn:GTP_PROC[i + 1], g_iu[i].vc_RNC_GTP:CLIENT_PROC); + connect(vc_conn:GTP1U[i + 1], g_iu[i].vc_RNC_GTP1U:CLIENT); + connect(vc_conn:GTP1U_PROC[i + 1], g_iu[i].vc_RNC_GTP1U:CLIENT_PROC); } } connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); - connect(vc_conn:GTP[GTP_GGSN_IDX], vc_GGSN_GTP:CLIENT); - connect(vc_conn:GTP_PROC[GTP_GGSN_IDX], vc_GGSN_GTP:CLIENT_PROC); + connect(vc_conn:GTP[GTP_GGSN_IDX], vc_GGSN_GTP1C:CLIENT); + connect(vc_conn:GTP_PROC[GTP_GGSN_IDX], vc_GGSN_GTP1C:CLIENT_PROC); + connect(vc_conn:GTP1U[GTP_GGSN_IDX], vc_GGSN_GTP1U:CLIENT); + connect(vc_conn:GTP1U_PROC[GTP_GGSN_IDX], vc_GGSN_GTP1U:CLIENT_PROC); vc_conn.start(f_handler_init(fn, id, pars)); return vc_conn; @@ -2818,7 +2824,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); /* connect RIM related port */ - connect(vc_GGSN_GTP:CLIENT_DEFAULT, self:GTPC); + connect(vc_GGSN_GTP1C:CLIENT_DEFAULT, self:GTP[0]); var Gtp1cPeer peer := { connId := 1, @@ -2852,7 +2858,7 @@ gtpc_rim_ra_discr := ts_RIM_RoutingAddress_Discriminator(hex2bit(RIM_ADDR_GERAN_CELL_ID)); gtpc_pdu := ts_GTPC_RANInfoRelay(peer, ts_RANTransparentContainer_RAN_INFO_REQ(gtpc_bssgp_cont), gtpc_rim_ra, gtpc_rim_ra_discr); - GTPC.send(gtpc_pdu); + GTP[0].send(gtpc_pdu); var template RIM_Routing_Address bssgp_dst_addr, bssgp_src_addr; var template PDU_BSSGP bssgp_rim_pdu_expect; @@ -2908,11 +2914,11 @@ T.start; alt { - [] GTPC.receive(gtpc_pdu_exp) { + [] GTP[0].receive(gtpc_pdu_exp) { setverdict(pass); T.stop; } - [] GTPC.receive { + [] GTP[0].receive { setverdict(fail, "Unexpected GTPC RIM PDU received"); } [] T.timeout { @@ -3004,7 +3010,7 @@ timer T := 2.0; T.start; alt { - [] GTP[GTP_GGSN_IDX].receive(tr_GTPU_GPDU(peer, apars.ggsn_tei_u, payload)) { + [] GTP1U[GTP_GGSN_IDX].receive(tr_GTPU_GPDU(peer, apars.ggsn_tei_u, payload)) { setverdict(fail, "Unexpected GTP message"); } [] T.timeout { setverdict(pass); } @@ -3058,7 +3064,7 @@ private function f_TC_sgsn_context_req_in(charstring id) runs on BSSGP_ConnHdlr { var integer seq_nr := f_rnd_int(65535); var Gtp1cUnitdata gtpc_ud; - var OCT4 teidc := f_gtp_teid_random(); + var OCT4 teidc := f_gtp_teic_random(); timer T; var Gtp1cPeer peer := { @@ -3130,7 +3136,7 @@ private function f_TC_sgsn_context_req_out(charstring id) runs on BSSGP_ConnHdlr { var integer seq_nr := f_rnd_int(65535); var Gtp1cUnitdata gtpc_ud; - var OCT4 teidc := f_gtp_teid_random(); + var OCT4 teidc := f_gtp_teic_random(); timer T; /* The MS goes to GERAN/UTRAN from an LTE cell */ diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index 776c333..e84869f 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -16,6 +16,7 @@ import from GTPv1C_Templates all; import from GTPv1U_Templates all; import from GTP_Emulation all; +import from GTPv1U_Emulation all; import from BSSGP_ConnHdlr all; @@ -329,7 +330,7 @@ as_ggsn_gtp_ctx_upd_req(apars, exp_dir_tun := false, ran_index := 3); /* Now GGSN receives new MT data and forwards it to SGSN: */ - f_gtp_register_teid('00000000'O, GTP_GGSN_IDX); /* Ease debugging in case SGSN sends ErrorInd */ + f_gtp_register_teic('00000000'O, GTP_GGSN_IDX); /* Ease debugging in case SGSN sends ErrorInd */ f_ran_register_imsi(g_pars.imsi, g_pars.p_tmsi); /* Forward Paging below to this component */ var octetstring payload := f_rnd_octstring(100); f_ggsn_gtpu_send(apars, payload); @@ -374,12 +375,12 @@ /* then transceive a downlink PDU */ f_gtpu_xceive_mt(apars, f_rnd_octstring(100), ran_index := ran_index); /* RNC answers with Error Indication, it probably crashed and lost state: */ - f_gtp_register_teid('00000000'O, GTP_GGSN_IDX); /* Ease debugging in case SGSN sends ErrorInd */ + f_gtp1u_register_teid('00000000'O, GTP_GGSN_IDX); /* Ease debugging in case SGSN sends ErrorInd */ f_ran_register_imsi(g_pars.imsi, g_pars.p_tmsi); /* Forward Paging below to this component */ - GTP[ran2gtp_idx(ran_index)].send(ts_GTPU_ErrorIndication(ts_GtpPeerU(apars.ggsn_ip_u), + GTP1U[ran2gtp_idx(ran_index)].send(ts_GTPU_ErrorIndication(ts_GtpPeerU(apars.ggsn_ip_u), 0, apars.rnc_tei_u, apars.rnc_ip_u)); - GTP[GTP_GGSN_IDX].receive(tr_GTPU_ErrorIndication(ts_GtpPeerU(apars.rnc_ip_u), + GTP1U[GTP_GGSN_IDX].receive(tr_GTPU_ErrorIndication(ts_GtpPeerU(apars.rnc_ip_u), apars.rnc_tei_u, apars.rnc_ip_u)); diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index 992e757..fe1bf08 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -95,7 +95,7 @@ FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn Osmocom_Gb_Types.ttcn " -FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn " +FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn GTPv1U_Emulation.ttcnpp " FILES+="GTP_Emulation.ttcn IPCP_Types.ttcn IPCP_Templates.ttcn RAW_NS.ttcnpp " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40749?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: I5b3da248719b79d402b945904e3840a2ec387dab Gerrit-Change-Number: 40749 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: 5gc: C5G_Tests.cfg: Set module name of multiple module params

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40751?usp=email ) Change subject: 5gc: C5G_Tests.cfg: Set module name of multiple module params ...................................................................... 5gc: C5G_Tests.cfg: Set module name of multiple module params Change-Id: I936240af988d4727516b5722dd360a907d70eee7 --- M 5gc/C5G_Tests.cfg 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/5gc/C5G_Tests.cfg b/5gc/C5G_Tests.cfg index d45b963..ec6f129 100644 --- a/5gc/C5G_Tests.cfg +++ b/5gc/C5G_Tests.cfg @@ -12,13 +12,13 @@ [MODULE_PARAMETERS] # S1 interface -mp_5gc_ngap_ip := "127.0.0.5"; -mp_5gc_ngap_port := 38412; -mp_local_ngap_ip := "127.0.0.202"; -mp_local_ngap_port := 50000; -mp_imsi := '999700000000000'H; -mp_usim_key := '762a2206fe0b4151ace403c86a11e479'O; -mp_usim_opc := '3c6e0b8a9c15224a8228b9a98ca1531d'O; +C5G_Tests.mp_5gc_ngap_ip := "127.0.0.5"; +C5G_Tests.mp_5gc_ngap_port := 38412; +C5G_Tests.mp_local_ngap_ip := "127.0.0.202"; +C5G_Tests.mp_local_ngap_port := 50000; +C5G_Tests.mp_imsi := '999700000000000'H; +C5G_Tests.mp_usim_key := '762a2206fe0b4151ace403c86a11e479'O; +C5G_Tests.mp_usim_opc := '3c6e0b8a9c15224a8228b9a98ca1531d'O; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40751?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: I936240af988d4727516b5722dd360a907d70eee7 Gerrit-Change-Number: 40751 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2025