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

[M] Change in osmocom-bb[master]: mobile: set TRAFFIC.{ind,req} mode during call establishment

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35740?usp=email ) Change subject: mobile: set TRAFFIC.{ind,req} mode during call establishment ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iab68cb47c28380a9c1efc149c6196ea54f75fdb8 Gerrit-Change-Number: 35740 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Feb 2024 20:12:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: init TCH state earlier (on receipt of CC ALERTING)

by fixeria

Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email ) Change subject: mobile: init TCH state earlier (on receipt of CC ALERTING) ...................................................................... Patch Set 3: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/35739/comment/23d201da_53c09b20 PS1, Line 9: The MS would usually start receiving traffic indications with > I've updated the COMMIT_MSG, hope it's better now. Done Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/35739/comment/b24815ba_528af712 PS2, Line 19: Rx only mode makes no sense for data calls, so in tch_recv_cb() we > You may have a race condition between dropping rx valid data and signalling data transfer started he […] I do not understand what you mean here, sorry. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Gerrit-Change-Number: 35739 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Feb 2024 20:11:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: init TCH state earlier (on receipt of CC ALERTING)

by Jenkins Builder

Attention is currently required from: fixeria, jolly. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email ) Change subject: mobile: init TCH state earlier (on receipt of CC ALERTING) ...................................................................... Patch Set 3: (1 comment) File src/host/layer23/src/mobile/tch.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-14233): https://gerrit.osmocom.org/c/osmocom-bb/+/35739/comment/34784643_03abba9b PS3, Line 62: } else { else is not generally useful after a break or return -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Gerrit-Change-Number: 35739 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Feb 2024 20:10:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: disable TCH/F14.4 (not implemented)

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, jolly, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/35738?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: mobile: disable TCH/F14.4 (not implemented) ...................................................................... mobile: disable TCH/F14.4 (not implemented) Change-Id: Ia8dff81d4b56c9d6599059f3a5a2964d3cd95829 Related: OS#4396, OS#6346 --- M doc/examples/mobile/default.cfg M src/host/layer23/src/common/support.c 2 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/38/35738/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35738?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia8dff81d4b56c9d6599059f3a5a2964d3cd95829 Gerrit-Change-Number: 35738 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: cosmetic: fix '(ptr *) foo' shour be '(ptr *)foo'

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35867?usp=email ) Change subject: mobile: cosmetic: fix '(ptr *) foo' shour be '(ptr *)foo' ...................................................................... mobile: cosmetic: fix '(ptr *) foo' shour be '(ptr *)foo' Change-Id: Id6ed92b27c61ae9dfbb702a3abdc75e5daa8235d --- M src/host/layer23/src/mobile/vty_interface.c 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/35867/1 diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index b0457e3..a4da22a 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -2695,7 +2695,7 @@ static int set_tch_voice_io_handler(struct vty *vty, enum tch_voice_io_handler val) { - struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; + struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; struct gsm_settings *set = &ms->settings; /* Don't restart on unchanged value */ @@ -2718,7 +2718,7 @@ "External MNCC application (e.g. LCR) via MNCC socket\n" "Return TCH frame payload back to sender\n") { - struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; + struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; int val = get_string_value(tch_voice_io_handler_names, argv[0]); if (val == TCH_VOICE_IOH_MNCC_SOCK) { @@ -2752,7 +2752,7 @@ "Texas Instruments format, used by Calypso based phones (e.g. Motorola C1xx)\n") { int val = get_string_value(tch_voice_io_format_names, argv[0]); - struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; + struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; struct gsm_settings *set = &ms->settings; if (set->tch_voice.io_handler != TCH_VOICE_IOH_GAPK) { @@ -2804,7 +2804,7 @@ static int set_tch_data_io_handler(struct vty *vty, enum tch_data_io_handler val) { - struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; + struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; struct gsm_settings *set = &ms->settings; /* Don't restart on unchanged value */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35867?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id6ed92b27c61ae9dfbb702a3abdc75e5daa8235d Gerrit-Change-Number: 35867 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: set TRAFFIC.{ind,req} mode during call establishment

by fixeria

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/osmocom-bb/+/35740?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: mobile: set TRAFFIC.{ind,req} mode during call establishment ...................................................................... mobile: set TRAFFIC.{ind,req} mode during call establishment Now that we support data (CSD) calls in addition to voice calls, we can no longer initialize the TRAFFIC.{ind,req} routing mode in gsm48_rr_init(). We need to apply the appropriate TCH routing mode *during call establishment* based on its type and the configured I/O handler type. After this patch, one can have the following configuration: tch-voice io-handler l1phy tch-data io-handler unix-sock io-tch-format ti so that the io-handler setting for voice would not affect data calls. Before this patch, the L1 PHY (specifically, Calypso firmware) would not route TRAFFIC.{ind,req} during data calls at all. Thanks to this patch, it's also no longer required to restart the mobile application after changing voice or data I/O handler. Change-Id: Iab68cb47c28380a9c1efc149c6196ea54f75fdb8 Related: OS#4396 --- M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/tch.c M src/host/layer23/src/mobile/tch_data.c M src/host/layer23/src/mobile/tch_voice.c M src/host/layer23/src/mobile/vty_interface.c 5 files changed, 82 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/40/35740/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iab68cb47c28380a9c1efc149c6196ea54f75fdb8 Gerrit-Change-Number: 35740 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: assert() values returned by get_string_value()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35868?usp=email ) Change subject: mobile: assert() values returned by get_string_value() ...................................................................... mobile: assert() values returned by get_string_value() Change-Id: I58bc31a4c3d952f71ed2c53b65bb30538172ca4e --- M src/host/layer23/src/mobile/vty_interface.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/68/35868/1 diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index a4da22a..87c8045 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -2721,6 +2721,8 @@ struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; int val = get_string_value(tch_voice_io_handler_names, argv[0]); + OSMO_ASSERT(val >= 0); + if (val == TCH_VOICE_IOH_MNCC_SOCK) { if (ms->settings.mncc_handler != MNCC_HANDLER_INTERNAL) { vty_out(vty, "TCH voice I/O handler 'mncc-sock' can only be used " @@ -2755,12 +2757,13 @@ struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; struct gsm_settings *set = &ms->settings; + OSMO_ASSERT(val >= 0); + if (set->tch_voice.io_handler != TCH_VOICE_IOH_GAPK) { vty_out(vty, "This parameter is only valid for GAPK%s", VTY_NEWLINE); return CMD_WARNING; } - OSMO_ASSERT(val >= 0); set->tch_voice.io_format = val; return CMD_SUCCESS; @@ -2828,6 +2831,8 @@ { int val = get_string_value(tch_data_io_handler_names, argv[0]); + OSMO_ASSERT(val >= 0); + return set_tch_data_io_handler(vty, val); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35868?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I58bc31a4c3d952f71ed2c53b65bb30538172ca4e Gerrit-Change-Number: 35868 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Avoid tx PurgeMS before doing handover in TC_ho_wifi_to_lte

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35866?usp=email ) Change subject: epdg: Avoid tx PurgeMS before doing handover in TC_ho_wifi_to_lte ...................................................................... epdg: Avoid tx PurgeMS before doing handover in TC_ho_wifi_to_lte Change-Id: Ic6db92c79e055bc98d502620930ab36e9a4fd4fd --- M epdg/EPDG_Tests.ttcn 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/35866/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 82a2375..becf2e9 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -585,10 +585,14 @@ setverdict(pass); } -private function f_TC_authinfo_normal(charstring id) runs on EPDG_ConnHdlr { +private function f_initial_attach() runs on EPDG_ConnHdlr { f_GSUP_AI_success(); f_GSUP_LU_success(); f_GSUP_EPDGTunnel_success(); +} + +private function f_TC_authinfo_normal(charstring id) runs on EPDG_ConnHdlr { + f_initial_attach(); f_GSUP_PurgeMS_success(); } @@ -602,7 +606,7 @@ } private function f_TC_ho_wifi_to_lte(charstring id) runs on EPDG_ConnHdlr { - f_TC_authinfo_normal(id); + f_initial_attach(); /* Whenever UE goes back to 3GPP, PGW will notify ePDG with a Delete Bearer Request * cause="Access changed from non-3gpp to 3gpp" */ f_GTP2C_DeleteBearer_success(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35866?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: Ic6db92c79e055bc98d502620930ab36e9a4fd4fd Gerrit-Change-Number: 35866 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg: Do CEAI CancelLocationReq upon rx of S2B Delete Bearer Req

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35865?usp=email ) Change subject: epdg: Do CEAI CancelLocationReq upon rx of S2B Delete Bearer Req ...................................................................... epdg: Do CEAI CancelLocationReq upon rx of S2B Delete Bearer Req Change-Id: Iee20619902db74da4b8cec5ba767f7c5c9bb3907 --- M src/epdg_ue_fsm.erl M src/gsup_server.erl 2 files changed, 36 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/65/35865/1 diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 350a991..3d325a0 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -244,6 +244,7 @@ state_authenticated({call, From}, received_gtpc_delete_bearer_request, Data) -> lager:info("ue_fsm state_authenticated event=received_gtpc_delete_bearer_request, ~p~n", [Data]), + gsup_server:cancel_location_request(Data#ue_fsm_data.imsi), Data1 = Data#ue_fsm_data{tear_down_gsup_needed = false}, {next_state, state_wait_swm_session_termination_answer, Data1, [{reply,From,ok}]}; diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 4d50fba..8659c95 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -62,7 +62,7 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). --export([auth_response/2, lu_response/2, tunnel_response/2, purge_ms_response/2]). +-export([auth_response/2, lu_response/2, tunnel_response/2, purge_ms_response/2, cancel_location_request/1]). % TODO: -spec dia_sip2gsup('SIP-Auth-Data-Item'()) -> #'GSUPAuthTuple'{}. dia_sip2gsup(#'SIP-Auth-Data-Item'{'SIP-Authenticate' = [Authenticate], 'SIP-Authorization' = [Authorization], @@ -201,6 +201,16 @@ State1 = delete_gsups_ue(Imsi, State0), {noreply, State1}; +% Our GSUP CEAI implementation for "IKEv2 Information Delete Request" +handle_cast({cancel_location_request, Imsi}, State) -> + lager:info("cancel_location_request for ~p~n", [Imsi]), + Socket = State#gsups_state.socket, + Resp = #{message_type => location_cancellation_req, + imsi => Imsi + }, + tx_gsup(Socket, Resp), + {noreply, State}; + handle_cast(Info, S) -> error_logger:error_report(["unknown handle_cast", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. @@ -313,6 +323,16 @@ end, {noreply, State}; +% Our GSUP CEAI implementation for "IKEv2 Information Delete Response". +handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := location_cancellation_res, imsi := Imsi}}, State0) -> + lager:info("GSUP: Rx ~p~n", [GsupMsgRx]), + UE = find_gsups_ue_by_imsi(Imsi, State0), + case UE of + #gsups_ue{imsi = Imsi} -> State1 = delete_gsups_ue(Imsi, State0); + undefined -> State1 = State0 + end, + {noreply, State1}; + handle_info(Info, S) -> error_logger:error_report(["unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. @@ -339,6 +359,11 @@ lager:info("purge_ms_response(~p): ~p~n", [Imsi, Result]), gen_server:cast(?SERVER, {purge_ms_response, {Imsi, Result}}). +% Our GSUP CEAI implementation for "IKEv2 Information Delete Request" +cancel_location_request(Imsi) -> + lager:info("cancel_location_request(~p): ~p~n", [Imsi]), + gen_server:cast(?SERVER, {cancel_location_request, Imsi}). + %% ------------------------------------------------------------------ %% Internal Function Definitions %% ------------------------------------------------------------------ -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35865?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: Iee20619902db74da4b8cec5ba767f7c5c9bb3907 Gerrit-Change-Number: 35865 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: epdg: Do SWm STR+STA upon rx of Delete Bearer Req

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35864?usp=email ) Change subject: epdg: Do SWm STR+STA upon rx of Delete Bearer Req ...................................................................... epdg: Do SWm STR+STA upon rx of Delete Bearer Req Change-Id: I795d973dc472f55d18048025ef4ffe1552dfdf26 --- M src/epdg_gtpc_s2b.erl M src/epdg_ue_fsm.erl 2 files changed, 43 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/64/35864/1 diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index ca05d9b..349aac6 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -312,6 +312,7 @@ Sess -> Resp = gen_delete_bearer_response(Req, Sess, request_accepted, State), tx_gtp(Resp, State), + epdg_ue_fsm:received_gtpc_delete_bearer_request(Sess#gtp_session.pid), State1 = delete_gtp_session(Sess, State), {noreply, State1} end; diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 3e9d1be..350a991 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -41,13 +41,14 @@ -export([init/1,callback_mode/0,terminate/3]). -export([auth_request/1, lu_request/1, tunnel_request/1, purge_ms_request/1]). -export([received_swm_auth_response/2, received_swm_auth_compl_response/2, received_swm_session_termination_answer/2]). --export([received_gtpc_create_session_response/2, received_gtpc_delete_session_response/2]). +-export([received_gtpc_create_session_response/2, received_gtpc_delete_session_response/2, received_gtpc_delete_bearer_request/1]). -export([state_new/3, state_wait_auth_resp/3, state_authenticating/3, state_authenticated/3, state_wait_delete_session_resp/3, state_wait_swm_session_termination_answer/3]). -record(ue_fsm_data, { imsi, apn = "internet" :: string(), + tear_down_gsup_needed = false :: boolean(), %% need to send GSUP PurgeMSResp after STR+STA? tear_down_gsup_cause = 0 :: integer() }). @@ -137,6 +138,16 @@ {error, Err} end. +received_gtpc_delete_bearer_request(Pid) -> + lager:info("ue_fsm received_gtpc_delete_bearer_request~n", []), + try + gen_statem:call(Pid, received_gtpc_delete_bearer_request) + catch + exit:Err -> + {error, Err} + end. + + %% ------------------------------------------------------------------ %% Internal helpers %% ------------------------------------------------------------------ @@ -231,6 +242,11 @@ {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} end; +state_authenticated({call, From}, received_gtpc_delete_bearer_request, Data) -> + lager:info("ue_fsm state_authenticated event=received_gtpc_delete_bearer_request, ~p~n", [Data]), + Data1 = Data#ue_fsm_data{tear_down_gsup_needed = false}, + {next_state, state_wait_swm_session_termination_answer, Data1, [{reply,From,ok}]}; + state_authenticated({call, From}, _Whatever, Data) -> lager:error("ue_fsm state_authenticated: Unexpected call event, ~p~n", [Data]), {keep_state, Data, [{reply,From,ok}]}; @@ -248,11 +264,12 @@ GtpCause = gtp_utils:enum_v2_cause(CauseIE#v2_cause.v2_cause), GsupCause = conv:cause_gtp2gsup(GtpCause), lager:debug("Cause: GTP_atom=~p -> GTP_int=~p -> GSUP_int=~p~n", [CauseIE#v2_cause.v2_cause, GtpCause, GsupCause]), + Data1 = Data#ue_fsm_data{tear_down_gsup_needed = true}, case GsupCause of - 0 -> Data1 = Data; - _ -> Data1 = Data#ue_fsm_data{tear_down_gsup_cause = GsupCause} + 0 -> Data2 = Data1; + _ -> Data2 = Data1#ue_fsm_data{tear_down_gsup_cause = GsupCause} end, - {next_state, state_wait_swm_session_termination_answer, Data1, [{reply,From,ok}]}; + {next_state, state_wait_swm_session_termination_answer, Data2, [{reply,From,ok}]}; state_wait_delete_session_resp({call, From}, Event, Data) -> lager:error("ue_fsm state_wait_delete_session_resp: Unexpected call event ~p, ~p~n", [Event, Data]), @@ -265,16 +282,23 @@ case epdg_diameter_swm:session_termination_request(Data#ue_fsm_data.imsi) of ok -> {keep_state, Data}; {error, _Err} -> - gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_NET_FAIL}), + case Data#ue_fsm_data.tear_down_gsup_needed of + true -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_NET_FAIL}); + false -> ok + end, {keep_state, Data} end; state_wait_swm_session_termination_answer({call, From}, {received_swm_sta, DiaResultCode}, Data) -> lager:info("ue_fsm state_wait_swm_session_termination_answer event=received_swm_sta, ~p~n", [Data]), - case {DiaResultCode, Data#ue_fsm_data.tear_down_gsup_cause} of - {2001, 0} -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, ok); - {2001, _} -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, Data#ue_fsm_data.tear_down_gsup_cause}); - _ -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_NET_FAIL}) + case Data#ue_fsm_data.tear_down_gsup_needed of + true -> + case {DiaResultCode, Data#ue_fsm_data.tear_down_gsup_cause} of + {2001, 0} -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, ok); + {2001, _} -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, Data#ue_fsm_data.tear_down_gsup_cause}); + _ -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_NET_FAIL}) + end; + false -> ok end, {keep_state, Data, [{reply,From,ok}]}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35864?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: I795d973dc472f55d18048025ef4ffe1552dfdf26 Gerrit-Change-Number: 35864 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024