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

[S] Change in ...osmo_ss7[master]: ipa_proto: start_listen: use correct ok/error pattern

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36104?usp=email ) Change subject: ipa_proto: start_listen: use correct ok/error pattern ...................................................................... ipa_proto: start_listen: use correct ok/error pattern The ok path only returned the port without an "ok". Also path back the ListenSock. Change-Id: I9b317c13089fae2406f401a1f420623de9a2dffa --- M src/ipa_proto.erl 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipa_proto.erl b/src/ipa_proto.erl index fcd594b..c96d6bb 100644 --- a/src/ipa_proto.erl +++ b/src/ipa_proto.erl @@ -367,7 +367,7 @@ {ok, ListenSock} -> start_servers(NumServers, ListenSock, self()), {ok, Port} = inet:port(ListenSock), - Port; + {ok, ListenSock, Port}; {error, Reason} -> {error, Reason} end. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36104?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I9b317c13089fae2406f401a1f420623de9a2dffa Gerrit-Change-Number: 36104 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in ...osmo_ss7[master]: ipa: fix empty IPA CCM ID Tags

by laforge

Attention is currently required from: fixeria, lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36105?usp=email ) Change subject: ipa: fix empty IPA CCM ID Tags ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36105?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I6f44561f83c84bac7e5c98747f969f5436617f90 Gerrit-Change-Number: 36105 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 28 Feb 2024 17:00:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in ...osmo_ss7[master]: ipa_proto: start_listen: use correct ok/error pattern

by laforge

Attention is currently required from: fixeria, lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36104?usp=email ) Change subject: ipa_proto: start_listen: use correct ok/error pattern ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36104?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I9b317c13089fae2406f401a1f420623de9a2dffa Gerrit-Change-Number: 36104 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 28 Feb 2024 17:00:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in libosmo-abis[master]: input/ipaccess: fix regression in ipaccess_bts_handle_ccm()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36100?usp=email ) Change subject: input/ipaccess: fix regression in ipaccess_bts_handle_ccm() ...................................................................... input/ipaccess: fix regression in ipaccess_bts_handle_ccm() As stated in a comment in this function, link->line might be NULL: /* line might not exist if != bsc||bts */ struct e1inp_line *line = link->line; so we cannot use LOGPIL, which dereferences it unconditionally. Change-Id: Ic26181b580724a70c2af8a224155430902fe4101 Fixes: a87de3cd "input/ipaccess: Always log with context, if we have any" Related: OS#6379 --- M src/input/ipaccess.c 1 file changed, 24 insertions(+), 6 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 22ac0ef..da2f04d 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -894,13 +894,13 @@ if (link->ofd->priv_nr >= E1INP_SIGN_RSL) trx_nr = link->ofd->priv_nr - E1INP_SIGN_RSL; - LOGPIL(line, DLINP, LOGL_NOTICE, "received ID_GET for unit ID %u/%u/%u\n", - dev->site_id, dev->bts_id, trx_nr); + LOGP(DLINP, LOGL_NOTICE, "received ID_GET for unit ID %u/%u/%u\n", + dev->site_id, dev->bts_id, trx_nr); rmsg = ipa_bts_id_resp(dev, data + 1, len - 1, trx_nr); ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); if (ret != rmsg->len) { - LOGPIL(line, DLINP, LOGL_ERROR, "cannot send ID_RESP message. Reason: %s\n", - strerror(errno)); + LOGP(DLINP, LOGL_ERROR, "cannot send ID_RESP message. Reason: %s\n", + strerror(errno)); goto err_rmsg; } msgb_free(rmsg); @@ -909,8 +909,8 @@ rmsg = ipa_bts_id_ack(); ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); if (ret != rmsg->len) { - LOGPIL(line, DLINP, LOGL_ERROR, "cannot send ID_ACK message. Reason: %s\n", - strerror(errno)); + LOGP(DLINP, LOGL_ERROR, "cannot send ID_ACK message. Reason: %s\n", + strerror(errno)); goto err_rmsg; } msgb_free(rmsg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36100?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic26181b580724a70c2af8a224155430902fe4101 Gerrit-Change-Number: 36100 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in libosmo-abis[master]: input/ipaccess: fix regression in ipaccess_bts_handle_ccm()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36100?usp=email ) Change subject: input/ipaccess: fix regression in ipaccess_bts_handle_ccm() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36100?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic26181b580724a70c2af8a224155430902fe4101 Gerrit-Change-Number: 36100 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 16:58:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: s2b: Spawn process for each received packet

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36109?usp=email ) Change subject: s2b: Spawn process for each received packet ...................................................................... s2b: Spawn process for each received packet Change-Id: I460b382aedbc10b06d846131b4cd838e30668df4 --- M src/epdg_gtpc_s2b.erl 1 file changed, 35 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/09/36109/1 diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index a4ab573..cef9bab 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -179,10 +179,11 @@ %% @callback gen_server handle_info({udp, _Socket, IP, InPortNo, RxMsg}, State) -> - lager:info("S2b: Rx from IP ~p port ~p: ~p~n", [IP, InPortNo, RxMsg]), - Req = gtp_packet:decode(RxMsg), - lager:info("S2b: Rx from IP ~p port ~p: ~p~n", [IP, InPortNo, Req]), - rx_gtp(Req, State); + lager:debug("S2b: Rx from IP ~p port ~p: ~p~n", [IP, InPortNo, RxMsg]), + spawn_wait_ret(fun() -> + rx_udp(IP, InPortNo, RxMsg, State) + end, + {noreply, State}); handle_info(Info, State) -> lager:info("S2b handle_info: ~p ~n", [Info]), {noreply, State}. @@ -359,6 +360,27 @@ connect(Address) -> connect(?SVC_NAME, Address). +%% Calls Fun on a spawned monitored process and returns Fun ret. +%% If spawned process crashes, return DefaultRet. +spawn_wait_ret(Fun, DefaultRet) -> + MyPID=self(), + {Pid, MRef} = spawn_monitor(fun() -> + Ret = Fun(), + MyPID ! {self(), Ret} + end), + receive + {'DOWN', MRef, process, _, _Reason} -> + DefaultRet; + {Pid, Ret} -> + erlang:demonitor(MRef, [flush]), + Ret + end. + +rx_udp(IP, InPortNo, RxMsg, State) -> + Req = gtp_packet:decode(RxMsg), + lager:debug("S2b: Rx from IP ~p port ~p: ~p~n", [IP, InPortNo, Req]), + rx_gtp(Req, State). + rx_gtp(Resp = #gtp{version = v2, type = create_session_response}, State0) -> Sess0 = find_gtp_session_by_local_teic(Resp#gtp.tei, State0), case Sess0 of -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36109?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I460b382aedbc10b06d846131b4cd838e30668df4 Gerrit-Change-Number: 36109 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in libosmocore[master]: osmo_io: Move notify_connected function to backend

by jolly

Attention is currently required from: daniel, laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35909?usp=email ) Change subject: osmo_io: Move notify_connected function to backend ...................................................................... Patch Set 5: (1 comment) File src/core/osmo_io_poll.c: https://gerrit.osmocom.org/c/libosmocore/+/35909/comment/214f5e38_39197e3a PS4, Line 116: if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_FD_REGISTERED)) > is this something we silently want to accept? or something which should be debugged and hence at lea […] If the user enables notification when the socket is connects (osmo_iofd_notify_connected) and also wants to register the file descriptor (osmo_iofd_register) at the same time, this function is called twice. The user does not need to wait until the socket is connected before calling osmo_iofd_register() this way. This means that no error should be logged here. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35909?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I905ec85210570aff8addadfc9603335d04eb057a Gerrit-Change-Number: 35909 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 15:45:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: *_Emulation: Allow running ePDG against 512 concurrent connections

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36107?usp=email ) Change subject: *_Emulation: Allow running ePDG against 512 concurrent connections ...................................................................... *_Emulation: Allow running ePDG against 512 concurrent connections Change-Id: Ic0646b7db22ae970882b9266eaa8c1a6df0780e1 --- M library/DIAMETER_Emulation.ttcn M library/GSUP_Emulation.ttcn M library/GTPv2_Emulation.ttcn 3 files changed, 19 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/36107/1 diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index 69107d4..14926a4 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -85,11 +85,11 @@ * to send where with CLIENT.send() to vc_conn */ port DIAMETER_Conn_PT DIAMETER_CLIENT; /* currently tracked connections */ - var AssociationData DiameterAssocTable[256]; + var AssociationData DiameterAssocTable[512]; /* Forward reply messages not containing IMSI to correct client port */ - var ETEIDData DiameterETEIDTable[256]; + var ETEIDData DiameterETEIDTable[512]; /* pending expected CRCX */ - var ExpectData DiameterExpectTable[256]; + var ExpectData DiameterExpectTable[512]; /* procedure based port to register for incoming connections */ port DIAMETEREM_PROC_PT DIAMETER_PROC; /* test port for unit data messages */ diff --git a/library/GSUP_Emulation.ttcn b/library/GSUP_Emulation.ttcn index 4f7e5d6..b959277 100644 --- a/library/GSUP_Emulation.ttcn +++ b/library/GSUP_Emulation.ttcn @@ -60,10 +60,10 @@ /* GSUP port to the per-connection clients */ port GSUP_Conn_PT GSUP_CLIENT; - var ConnectionData GsupImsiTable[256]; + var ConnectionData GsupImsiTable[512]; /* pending expected incoming connections */ - var ExpectData GsupExpectTable[256]; + var ExpectData GsupExpectTable[512]; /* procedure based port to register for incoming connections */ port GSUPEM_PROC_PT GSUP_PROC; }; diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn index 240cce4..6662e33 100644 --- a/library/GTPv2_Emulation.ttcn +++ b/library/GTPv2_Emulation.ttcn @@ -66,11 +66,11 @@ var integer g_gtp2c_id; var OCT1 g_restart_ctr; var uint16_t g_c_seq_nr; - var TidTableRec TidTable[256]; - var SeqTableRec SeqTable[256]; - var ImsiTableRec ImsiTable[256]; - var UdMsgTableRec UdMsgTable[256]; - var PidTableRec PidTable[256]; + var TidTableRec TidTable[512]; + var SeqTableRec SeqTable[512]; + var ImsiTableRec ImsiTable[512]; + var UdMsgTableRec UdMsgTable[512]; + var PidTableRec PidTable[512]; var integer g_uecups_conn_id; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36107?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic0646b7db22ae970882b9266eaa8c1a6df0780e1 Gerrit-Change-Number: 36107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_s2b_CreateSession_rejected

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36108?usp=email ) Change subject: epdg: Introduce test TC_s2b_CreateSession_rejected ...................................................................... epdg: Introduce test TC_s2b_CreateSession_rejected Related: OS#6371 Change-Id: Ide1df9e359b12094f82e54a7824c83f515aedcc3 --- M epdg/EPDG_Tests.ttcn M library/GTPv2_Templates.ttcn M mme/MME_Tests.ttcn 3 files changed, 91 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/36108/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 1ff4629..8c0d7cd 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -499,24 +499,29 @@ return ts_GTP2C_APCO(apco_req.instance, proto_list_resp); } +private function f_EPDG_ConnHdlr_parse_CreateSessionReq(PDU_GTPCv2 rx_msg) runs on EPDG_ConnHdlr { + var BearerContextIEs rx_bctx_ies; + + /* Parse TEIC and Bearer EBI and TEID and store it in g_pars */ + g_pars.teic_remote := rx_msg.gtpcv2_pdu.createSessionRequest.fullyQualifiedTEID[0].tEID_GRE_Key; + rx_bctx_ies := rx_msg.gtpcv2_pdu.createSessionRequest.bearerContextGrouped[0].bearerContextIEs; + g_pars.bearer.ebi := rx_bctx_ies.ePS_Bearer_ID.ePS_Bearer_ID_Value; + g_pars.bearer.teid_remote := rx_bctx_ies.fullyQualifiedTEID[0].tEID_GRE_Key; + + /* allocate + register TEID-C on local side */ + g_pars.teic_local := f_gtp2_allocate_teid(); + g_pars.bearer.teid_local := g_pars.teic_local; +} + /* ePDG Creates session at the PGW. PGW sends Diameter s6b AAR + AAA. */ private altstep as_GTP2C_CreateSession_success() runs on EPDG_ConnHdlr { var PDU_GTPCv2 rx_msg; - var BearerContextIEs rx_bctx_ies; var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; var template (value) PDN_AddressAllocation paa; var template (value) BearerContextIEs bctx_ies; [] GTP2.receive(tr_GTP2C_CreateSessionReq(g_pars.imsi, apco := f_exp_tr_GTP2C_APCO_in_CreateSessionReq())) -> value rx_msg { - /* Parse TEIC and Bearer EBI and TEID and store it in g_pars */ - g_pars.teic_remote := rx_msg.gtpcv2_pdu.createSessionRequest.fullyQualifiedTEID[0].tEID_GRE_Key; - rx_bctx_ies := rx_msg.gtpcv2_pdu.createSessionRequest.bearerContextGrouped[0].bearerContextIEs; - g_pars.bearer.ebi := rx_bctx_ies.ePS_Bearer_ID.ePS_Bearer_ID_Value; - g_pars.bearer.teid_remote := rx_bctx_ies.fullyQualifiedTEID[0].tEID_GRE_Key; - - /* allocate + register TEID-C on local side */ - g_pars.teic_local := f_gtp2_allocate_teid(); - g_pars.bearer.teid_local := g_pars.teic_local; + f_EPDG_ConnHdlr_parse_CreateSessionReq(rx_msg); /* Upon rx of CreateSession, emulate PGW asking the AAA server. */ f_S6b_AA_success(); @@ -531,6 +536,7 @@ qos := ts_GTP2C_BearerQos('09'O, 0,0,0,0), charging_id := ts_GTP2C_ChargingID(g_pars.teic_local)); GTP2.send(ts_GTP2C_CreateSessionResp(g_pars.teic_remote, rx_msg.sequenceNumber, + Request_accepted, { fteid_c_ie }, paa, { ts_GTP2C_BcGrouped(bctx_ies) }, f_GTPv2C_gen_APCO_response(rx_msg.gtpcv2_pdu.createSessionRequest.aPCO) )); @@ -541,6 +547,34 @@ } } +/* ePDG Creates session at the PGW. PGW sends Diameter s6b AAR + AAA. */ +private altstep as_GTP2C_CreateSession_error(GTP2C_Cause resp_cause, boolean do_s6b_aar := false) runs on EPDG_ConnHdlr { + var PDU_GTPCv2 rx_msg; + var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; + var template (value) PDN_AddressAllocation paa; + var template (value) BearerContextIEs bctx_ies; + + [] GTP2.receive(tr_GTP2C_CreateSessionReq(g_pars.imsi, apco := f_exp_tr_GTP2C_APCO_in_CreateSessionReq())) -> value rx_msg { + f_EPDG_ConnHdlr_parse_CreateSessionReq(rx_msg); + + /* Upon rx of CreateSession, emulate PGW asking the AAA server. */ + if (do_s6b_aar) { + f_S6b_AA_success(); + } + + fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S2b_PGW_GTPC, g_pars.teic_local, 1, + f_inet_addr(mp_s2b_local_ip), omit); + fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_PGW_GTPU, g_pars.bearer.teid_local, 4, + f_inet_addr(mp_s2b_local_ip), omit); + GTP2.send(ts_GTP2C_CreateSessionResp(g_pars.teic_remote, rx_msg.sequenceNumber, + resp_cause)); + setverdict(pass); + } + [] GTP2.receive(PDU_GTPCv2:?) -> value rx_msg { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected GTP2C msg rx: ", rx_msg)); + } +} + /* ePDG Deletes session at the PGW. PGW sends Diameter s6b AAR + AAA. */ private altstep as_GTP2C_DeleteSession_success() runs on EPDG_ConnHdlr { var PDU_GTPCv2 rx_msg; @@ -693,6 +727,21 @@ setverdict(pass); } +/* GSUP TunnelEPDG Tunnel Req + Resp, triggers S2b CreateSession Req + Response (rejected). */ +private function f_GSUP_EPDGTunnel_error() runs on EPDG_ConnHdlr { + var GSUP_PDU rx_gsup; + var template (value) PCO_DATA pco := ts_PCO({ ts_PCO_P_DNS_IPv4, ts_PCO_P_PCSCF_IPv4 }); + GSUP.send(ts_GSUP_EPDGTunnel_REQ(g_pars.imsi, pco)); + as_GTP2C_CreateSession_error(APN_access_denied__no_subscription); + alt { + [] GSUP.receive(tr_GSUP_EPDGTunnel_ERR(g_pars.imsi)); + [] GSUP.receive(GSUP_PDU:?) -> value rx_gsup { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected GSUP msg rx: ", rx_gsup)); + } + } + setverdict(pass); +} + /* GSUP Purge MS Req + Resp, triggers S2b DeleteSession Req + Response. */ private function f_GSUP_PurgeMS_success() runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; @@ -774,6 +823,20 @@ setverdict(pass); } +private function f_TC_s2b_CreateSession_rejected(charstring id) runs on EPDG_ConnHdlr { + f_GSUP_AI_success(); + f_GSUP_LU_success(); + f_GSUP_EPDGTunnel_error(); +} +testcase TC_s2b_CreateSession_rejected() runs on MTC_CT { + var EPDG_ConnHdlrPars pars := f_init_pars(); + var EPDG_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_s2b_CreateSession_rejected), pars); + vc_conn.done; + setverdict(pass); +} + private function f_TC_concurrent_ues(charstring id) runs on EPDG_ConnHdlr { COORD.send(COORD_CMD_READY); COORD.receive(COORD_CMD_START); @@ -829,6 +892,7 @@ execute ( TC_authinfo_normal() ); execute ( TC_ho_lte_to_wifi() ); execute ( TC_ho_wifi_to_lte() ); + execute ( TC_s2b_CreateSession_rejected() ); execute ( TC_concurrent_ues2() ); execute ( TC_concurrent_ues100() ); } diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index a86145d..752e85c 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -145,7 +145,6 @@ } } - /* 8.4-1 */ type enumerated GTP2C_Cause { Local_Detach (2), @@ -167,7 +166,8 @@ New_PDN_type_due_to_network_preference (18), New_PDN_type_due_to_single_address_bearer_only (19), /* ... */ - Context_Not_Found (64) + Context_Not_Found (64), + APN_access_denied__no_subscription (93) } with { variant "FIELDLENGTH(8)" encode "RAW" }; /* 8.4 */ @@ -1021,13 +1021,14 @@ template (value) PDU_GTPCv2 ts_GTP2C_CreateSessionResp(template (value) OCT4 d_teid, template (value) OCT3 seq, - template (value) FullyQualifiedTEID_List fteids, - template (value) PDN_AddressAllocation addr, + template (value) GTP2C_Cause cause := Request_accepted, + template (omit) FullyQualifiedTEID_List fteids := omit, + template (omit) PDN_AddressAllocation addr := omit, template (omit) BearerContextGrouped_List bearerContextGrouped := omit, template (omit) APCO apco := omit) := ts_PDU_GTP2C(d_teid, seq, '21'O, { createSessionResponse := { - cause := ts_GTP2C_Cause(Request_accepted, '0'B), + cause := ts_GTP2C_Cause(cause, '0'B), changeReportingAction := omit, cSG_InformationReportingAction := omit, heNBInformationReporting := omit, diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index aa23a84..1cacbd9 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -831,6 +831,7 @@ GTP2.send(ts_GTP2C_CreateSessionResp(g_pars.ue_pars.s11_teic_remote, rx_msg.sequenceNumber, + Request_accepted, { s11_fteid_c_ie, s5c_fteid_c_ie }, paa, { ts_GTP2C_BcGrouped(bctx_ies) } )); setverdict(pass); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36108?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ide1df9e359b12094f82e54a7824c83f515aedcc3 Gerrit-Change-Number: 36108 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Add tests to validate concurrent connections

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?usp=email ) Change subject: epdg: Add tests to validate concurrent connections ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File epdg/EPDG_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093/comment/9846fe76_28de… PS1, Line 747: maybe put the several deleted lines in an extra patch? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I842dacda56abe47afb19e951eaae746b5e8d9fe7 Gerrit-Change-Number: 36093 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 15:04:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024