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

[M] Change in ...osmo-epdg[master]: AAA-Server: s6b: Fetch UE FSM Pid without asking SWm module

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35893?usp=email ) Change subject: AAA-Server: s6b: Fetch UE FSM Pid without asking SWm module ...................................................................... AAA-Server: s6b: Fetch UE FSM Pid without asking SWm module Instead, keep the implementation in the UE FSM module itself, and take advantage of the fact that the PID is registered and can be derived from the IMSI. Change-Id: I0e62f3715da61d2d8cfabaf89557aeb1cd95f89a --- M src/aaa_diameter_s6b_cb.erl M src/aaa_diameter_swm.erl M src/aaa_ue_fsm.erl 3 files changed, 34 insertions(+), 26 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/aaa_diameter_s6b_cb.erl b/src/aaa_diameter_s6b_cb.erl index 339f735..7e3915d 100644 --- a/src/aaa_diameter_s6b_cb.erl +++ b/src/aaa_diameter_s6b_cb.erl @@ -59,15 +59,15 @@ 'Auth-Request-Type' = AuthReqType, 'User-Name' = [UserName], 'Service-Selection' = [Apn]} = Req, - Result = aaa_diameter_swm:get_ue_fsm_by_imsi(UserName), - case Result of - {ok, Pid} -> - ok = aaa_ue_fsm:ev_rx_s6b_aar(Pid, Apn), + PidRes = aaa_ue_fsm:get_pid_by_imsi(UserName), + case PidRes of + PidRes when is_pid(PidRes) -> + ok = aaa_ue_fsm:ev_rx_s6b_aar(PidRes, Apn), lager:debug("Waiting for S6b AAA~n", []), receive {aaa, ResultCode} -> lager:debug("Rx AAA with ResultCode=~p~n", [ResultCode]) end; - _ -> lager:error("Error looking up FSM for IMSI~n", [UserName]), + undefined -> lager:error("Error looking up FSM for IMSI~n", [UserName]), ResultCode = ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED' end, Resp = #'AAA'{'Session-Id'= SessionId, @@ -88,10 +88,10 @@ 'Auth-Application-Id' = _AuthAppId, 'Termination-Cause' = _TermCause, 'User-Name' = [UserName]} = Req, - Result = aaa_diameter_swm:get_ue_fsm_by_imsi(UserName), - case Result of - {ok, Pid} -> - case aaa_ue_fsm:ev_rx_s6b_str(Pid) of + PidRes = aaa_ue_fsm:get_pid_by_imsi(UserName), + case PidRes of + PidRes when is_pid(PidRes) -> + case aaa_ue_fsm:ev_rx_s6b_str(PidRes) of ok -> lager:debug("Waiting for S6b STA~n", []), receive @@ -104,7 +104,7 @@ {error, _} -> ResultCode = ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED' end; - _ -> lager:error("Error looking up FSM for IMSI~n", [UserName]), + undefined -> lager:error("Error looking up FSM for IMSI~n", [UserName]), ResultCode = ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED' end, % 3GPP TS 29.273 9.2.2.3.2 Session-Termination-Answer (STA) Command: diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index bcedcac..ee3a8cb 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -19,7 +19,6 @@ -export([start_link/0]). -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). --export([get_ue_fsm_by_imsi/1]). -export([auth_request/1, auth_compl_request/2, session_termination_request/1]). -export([auth_response/2, auth_compl_response/2, session_termination_answer/2]). @@ -33,9 +32,6 @@ TableId = ets:new(auth_req, [bag, named_table]), {ok, #swm_state{table_id = TableId}}. -get_ue_fsm_by_imsi(Imsi) -> - _Result = gen_server:call(?SERVER, {get_ue_fsm_by_imsi, Imsi}). - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Tx over emulated SWm wire: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -101,16 +97,6 @@ error_logger:error_report(["unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. -handle_call({get_ue_fsm_by_imsi, Imsi}, _From, State) -> - Sess = find_swm_session_by_imsi(Imsi, State), - lager:debug("find_swm_session_by_imsi(~p) returned ~p~n", [Imsi, Sess]), - case Sess of - #swm_session{} -> - {reply, {ok ,Sess#swm_session.pid}, State}; - undefined -> - {reply, {error, imsi_unknown}, State} - end; - handle_call({epdg_auth_resp, Imsi, Result}, _From, State) -> epdg_diameter_swm:auth_response(Imsi, Result), {reply, ok, State}; diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index 52918d2..5cdb553 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -40,6 +40,7 @@ -export([start_link/1]). -export([init/1,callback_mode/0,terminate/3]). +-export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). -export([ev_swm_auth_req/1, ev_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swx_maa/2, ev_rx_swx_saa/2, ev_rx_s6b_aar/2, ev_rx_s6b_str/1]). -export([state_new/3, state_wait_swx_maa/3, state_wait_swx_saa/3, state_authenticated/3, state_authenticated_wait_swx_saa/3]). @@ -52,10 +53,18 @@ s6b_resp_pid :: pid() }). -start_link(Imsi) -> +get_server_name_by_imsi(Imsi) -> ServerName = lists:concat([?NAME, "_", Imsi]), + list_to_atom(ServerName). + +get_pid_by_imsi(Imsi) -> + ServerName = get_server_name_by_imsi(Imsi), + whereis(ServerName). + +start_link(Imsi) -> + ServerName = get_server_name_by_imsi(Imsi), lager:info("ue_fsm start_link(~p)~n", [ServerName]), - gen_statem:start_link({local, list_to_atom(ServerName)}, ?MODULE, Imsi, [{debug, [trace]}]). + gen_statem:start_link({local, ServerName}, ?MODULE, Imsi, [{debug, [trace]}]). ev_swm_auth_req(Pid) -> lager:info("ue_fsm ev_swm_auth_req~n", []), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35893?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: I0e62f3715da61d2d8cfabaf89557aeb1cd95f89a Gerrit-Change-Number: 35893 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg_diameter_swm: Update PID if session already exists

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35895?usp=email ) Change subject: epdg_diameter_swm: Update PID if session already exists ...................................................................... epdg_diameter_swm: Update PID if session already exists If the FSM was recreated, during the first step it may have a different PID. Update it so that we send the answer back to the proper PID. Change-Id: I5e4f0ff4292c364f47d61ba629df50e8e3d35017 --- M src/epdg_diameter_swm.erl 1 file changed, 22 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index 57c0921..800df44 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -181,7 +181,15 @@ Sess = find_swm_session_by_imsi(Imsi, State), case Sess of #swm_session{imsi = Imsi} -> - {Sess, State}; + % Update Pid since it may have changed: + Sess1 = Sess#swm_session{pid = Pid}, + State1 = update_swm_session(Sess, Sess1, State), + {Sess1, State1}; undefined -> new_swm_session(Imsi, Pid, State) - end. \ No newline at end of file + end. + +update_swm_session(OldSess, NewSess, State) -> + SetRemoved = sets:del_element(OldSess, State#swm_state.sessions), + SetUpdated = sets:add_element(NewSess, SetRemoved), + State#swm_state{sessions = SetUpdated}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35895?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: I5e4f0ff4292c364f47d61ba629df50e8e3d35017 Gerrit-Change-Number: 35895 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: gsup_server: Fix removal of session from set

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35894?usp=email ) Change subject: gsup_server: Fix removal of session from set ...................................................................... gsup_server: Fix removal of session from set Change-Id: Iec9bce7494e3849c9e94158516f471f97182725b --- M src/gsup_server.erl 1 file changed, 22 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsup_server.erl b/src/gsup_server.erl index fd2a8b5..8a070bf 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -198,7 +198,7 @@ } end, tx_gsup(Socket, Resp), - State1 = delete_gsups_ue(Imsi, State0), + State1 = delete_gsups_ue_by_imsi(Imsi, State0), {noreply, State1}; % Our GSUP CEAI implementation for "IKEv2 Information Delete Request" @@ -244,7 +244,7 @@ }, tx_gsup(Socket, Resp), epdg_ue_fsm:stop(UE#gsups_ue.pid), - State2 = delete_gsups_ue(Imsi, State1) + State2 = delete_gsups_ue(UE, State1) end, {noreply, State2}; @@ -331,7 +331,7 @@ 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); + #gsups_ue{imsi = Imsi} -> State1 = delete_gsups_ue(UE, State0); undefined -> State1 = State0 end, {noreply, State1}; @@ -401,6 +401,13 @@ new_gsups_ue(Imsi, State) end. -delete_gsups_ue(Imsi, State) -> - SetRemoved = sets:del_element(Imsi, State#gsups_state.ues), - State#gsups_state{ues = SetRemoved}. \ No newline at end of file +delete_gsups_ue(UE, State) -> + SetRemoved = sets:del_element(UE, State#gsups_state.ues), + lager:debug("Removed UE ~p from ~p~n", [UE, SetRemoved]), + State#gsups_state{ues = SetRemoved}. + +delete_gsups_ue_by_imsi(Imsi, State) -> + case find_gsups_ue_by_imsi(Imsi, State) of + undefined -> State; + UE-> delete_gsups_ue(UE, State) + end. \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35894?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: Iec9bce7494e3849c9e94158516f471f97182725b Gerrit-Change-Number: 35894 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm: Introduce public function to get pid from imsi

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35896?usp=email ) Change subject: epdg_ue_fsm: Introduce public function to get pid from imsi ...................................................................... epdg_ue_fsm: Introduce public function to get pid from imsi Change-Id: Ibc4478d8d48171c302daf8aaebd037227d3e3a98 --- M src/epdg_ue_fsm.erl 1 file changed, 20 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 94cf9c4..711f695 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -39,6 +39,7 @@ -export([start_link/1, stop/1]). -export([init/1,callback_mode/0,terminate/3]). +-export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). -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, received_gtpc_delete_bearer_request/1]). @@ -52,10 +53,18 @@ tear_down_gsup_cause = 0 :: integer() }). -start_link(Imsi) -> +get_server_name_by_imsi(Imsi) -> ServerName = lists:concat([?NAME, "_", binary_to_list(Imsi)]), + list_to_atom(ServerName). + +get_pid_by_imsi(Imsi) -> + ServerName = get_server_name_by_imsi(Imsi), + whereis(ServerName). + +start_link(Imsi) -> + ServerName = get_server_name_by_imsi(Imsi), lager:info("ue_fsm start_link(~p)~n", [ServerName]), - gen_statem:start_link({local, list_to_atom(ServerName)}, ?MODULE, Imsi, [{debug, [trace]}]). + gen_statem:start_link({local, ServerName}, ?MODULE, Imsi, [{debug, [trace]}]). stop(SrvRef) -> gen_statem:stop(SrvRef). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35896?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: Ibc4478d8d48171c302daf8aaebd037227d3e3a98 Gerrit-Change-Number: 35896 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm: Introduce public function to get pid from imsi

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35896?usp=email ) Change subject: epdg_ue_fsm: Introduce public function to get pid from imsi ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35896?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: Ibc4478d8d48171c302daf8aaebd037227d3e3a98 Gerrit-Change-Number: 35896 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Feb 2024 16:24:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg_diameter_swm: Update PID if session already exists

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35895?usp=email ) Change subject: epdg_diameter_swm: Update PID if session already exists ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35895?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: I5e4f0ff4292c364f47d61ba629df50e8e3d35017 Gerrit-Change-Number: 35895 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Feb 2024 16:24:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: gsup_server: Fix removal of session from set

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35894?usp=email ) Change subject: gsup_server: Fix removal of session from set ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35894?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: Iec9bce7494e3849c9e94158516f471f97182725b Gerrit-Change-Number: 35894 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Feb 2024 16:24:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: AAA-Server: s6b: Fetch UE FSM Pid without asking SWm module

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35893?usp=email ) Change subject: AAA-Server: s6b: Fetch UE FSM Pid without asking SWm module ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35893?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: I0e62f3715da61d2d8cfabaf89557aeb1cd95f89a Gerrit-Change-Number: 35893 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Feb 2024 16:24:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: gsup_server: Delete session if initial auth failed

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35892?usp=email ) Change subject: gsup_server: Delete session if initial auth failed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35892?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: Iebbab786e9647a026b2937115004747cd1883da0 Gerrit-Change-Number: 35892 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Feb 2024 16:24:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: gsup_server: Log error if epdg_ue_fsm:auth_request() fails

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35891?usp=email ) Change subject: gsup_server: Log error if epdg_ue_fsm:auth_request() fails ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35891?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: Iea5cc5736d8de9d652c15d9bc12ab16833c1ae7b Gerrit-Change-Number: 35891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Feb 2024 16:24:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024