pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36304?usp=email ) Change subject: aaa_ue_fsm: Prepend rx_ prefix to SWm events missing it ...................................................................... aaa_ue_fsm: Prepend rx_ prefix to SWm events missing it Change-Id: I38f755c23d8b998adbb591e1178fa31245ae0ab4 --- M src/aaa_diameter_swm.erl M src/aaa_ue_fsm.erl 2 files changed, 24 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index e424ba8..9fa656e 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -64,13 +64,13 @@ undefined -> {ok, Pid} = aaa_ue_fsm:start(Imsi); Pid -> Pid end, - aaa_ue_fsm:ev_swm_auth_req(Pid, {PdpTypeNr, Apn, EAP}), + aaa_ue_fsm:ev_rx_swm_auth_req(Pid, {PdpTypeNr, Apn, EAP}), {noreply, State}; handle_cast({epdg_auth_compl_req, Imsi, Apn}, State) -> case aaa_ue_fsm:get_pid_by_imsi(Imsi) of Pid when is_pid(Pid) -> - aaa_ue_fsm:ev_swm_auth_compl(Pid, Apn); + aaa_ue_fsm:ev_rx_swm_auth_compl(Pid, Apn); undefined -> RC_USER_UNKNOWN=5030, epdg_diameter_swm:rx_auth_compl_response(Imsi, {error, RC_USER_UNKNOWN}) diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index c61a4bf..9ec6a00 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -42,7 +42,7 @@ -export([start/1, stop/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/2, ev_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swm_asa/1, +-export([ev_rx_swm_auth_req/2, ev_rx_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swm_asa/1, ev_rx_swx_maa/2, ev_rx_swx_saa/2, ev_rx_swx_rtr/1, ev_rx_s6b_aar/2, ev_rx_s6b_str/1, ev_rx_s6b_asa/2]). -export([state_new/3, @@ -86,19 +86,19 @@ {error, Err} end. -ev_swm_auth_req(Pid, {PdpTypeNr, Apn, EAP}) -> - lager:info("ue_fsm ev_swm_auth_req~n", []), +ev_rx_swm_auth_req(Pid, {PdpTypeNr, Apn, EAP}) -> + lager:info("ue_fsm ev_rx_swm_auth_req~n", []), try - gen_statem:call(Pid, {swm_auth_req, PdpTypeNr, Apn, EAP}) + gen_statem:call(Pid, {rx_swm_auth_req, PdpTypeNr, Apn, EAP}) catch exit:Err -> {error, Err} end. -ev_swm_auth_compl(Pid, Apn) -> - lager:info("ue_fsm ev_swm_auth_compl~n", []), +ev_rx_swm_auth_compl(Pid, Apn) -> + lager:info("ue_fsm ev_rx_swm_auth_compl~n", []), try - gen_statem:call(Pid, {swm_auth_compl, Apn}) + gen_statem:call(Pid, {rx_swm_auth_compl, Apn}) catch exit:Err -> {error, Err} @@ -203,8 +203,8 @@ state_new(enter, _OldState, Data) -> {keep_state, Data}; -state_new({call, From}, {swm_auth_req, PdpTypeNr, Apn, EAP}, Data) -> - lager:info("ue_fsm state_new event=swm_auth_req {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_new({call, From}, {rx_swm_auth_req, PdpTypeNr, Apn, EAP}, Data) -> + lager:info("ue_fsm state_new event=rx_swm_auth_req {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), case maps:find(authorization, EAP) of {ok, Authorization} when is_binary(Authorization) -> Authorization; error -> Authorization = [] @@ -214,8 +214,8 @@ {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} end; -state_new({call, From}, {swm_auth_compl, Apn}, Data) -> - lager:info("ue_fsm state_new event=swm_auth_compl, ~p~n", [Data]), +state_new({call, From}, {rx_swm_auth_compl, Apn}, Data) -> + lager:info("ue_fsm state_new event=rx_swm_auth_compl, ~p~n", [Data]), case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, 1, Apn, []) of ok -> {next_state, state_wait_swx_saa, Data, [{reply,From,ok}]}; {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} @@ -314,8 +314,8 @@ end end; -state_authenticated({call, _From}, {swm_auth_req, PdpTypeNr, Apn, EAP}, Data) -> - lager:info("ue_fsm state_authenticated event=swm_auth_req {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_authenticated({call, _From}, {rx_swm_auth_req, PdpTypeNr, Apn, EAP}, Data) -> + lager:info("ue_fsm state_authenticated event=rx_swm_auth_req {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), {next_state, state_new, Data, [postpone]}; state_authenticated({call, From}, rx_swx_rtr, Data) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36304?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: I38f755c23d8b998adbb591e1178fa31245ae0ab4 Gerrit-Change-Number: 36304 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged