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

[M] Change in ...osmo-epdg[master]: epdg_diameter_swm: Look up epdg_ue_fsm process each time it needs to ...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36332?usp=email ) Change subject: epdg_diameter_swm: Look up epdg_ue_fsm process each time it needs to be accessed ...................................................................... epdg_diameter_swm: Look up epdg_ue_fsm process each time it needs to be accessed This allows simplifying a lot the module state, similar to what was already done in other modules. Change-Id: Iacdba6570bfa286d03542733911b01e3a16e9706 --- M src/epdg_diameter_swm.erl 1 file changed, 45 insertions(+), 92 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/32/36332/1 diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index c479b44..5d7ffe2 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -8,14 +8,8 @@ -include("conv.hrl"). -record(swm_state, { - sessions = sets:new() }). --record(swm_session, { - imsi :: string(), - pid :: pid() - }). - -export([start_link/0]). -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). @@ -97,11 +91,10 @@ _ -> Result end. -handle_call({epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}, {Pid, _Tag} = _From, State0) -> +handle_call({epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}, _From, State) -> % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: - {_Sess, State1} = find_or_new_swm_session(Imsi, Pid, State0), ok = aaa_diameter_swm:rx_auth_request(Imsi, PdpTypeNr, Apn, EAP), - {reply, ok, State1}; + {reply, ok, State}; handle_call({raa, Imsi, DiaRC}, _From, State) -> % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: @@ -110,91 +103,73 @@ handle_call({epdg_auth_compl_req, Imsi, Apn}, _From, State) -> % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: - Sess = find_swm_session_by_imsi(Imsi, State), - case Sess of - #swm_session{imsi = Imsi} -> - Reply = aaa_diameter_swm:rx_auth_compl_request(Imsi, Apn); - undefined -> - Reply = {error,unknown_imsi} - end, + Reply = aaa_diameter_swm:rx_auth_compl_request(Imsi, Apn), {reply, Reply, State}; handle_call({str, Imsi}, _From, State) -> % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: - Sess = find_swm_session_by_imsi(Imsi, State), - case Sess of - #swm_session{imsi = Imsi} -> - Reply = aaa_diameter_swm:rx_session_termination_request(Imsi); - undefined -> - Reply = {error,unknown_imsi} - end, + Reply = aaa_diameter_swm:rx_session_termination_request(Imsi), {reply, Reply, State}; handle_call({asa, Imsi}, _From, State) -> % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: - Sess = find_swm_session_by_imsi(Imsi, State), - case Sess of - #swm_session{imsi = Imsi} -> - Reply = aaa_diameter_swm:rx_abort_session_answer(Imsi); - undefined -> - Reply = {error,unknown_imsi} - end, + Reply = aaa_diameter_swm:rx_abort_session_answer(Imsi), {reply, Reply, State}. -handle_cast({epdg_auth_resp, Imsi, Result}, State) -> - Sess = find_swm_session_by_imsi(Imsi, State), - case Sess of - #swm_session{imsi = Imsi} -> - epdg_ue_fsm:received_swm_auth_response(Sess#swm_session.pid, Result); +handle_cast({epdg_auth_resp, ImsiStr, Result}, State) -> + Imsi = list_to_binary(ImsiStr), + case epdg_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + epdg_ue_fsm:received_swm_auth_response(Pid, Result); undefined -> error_logger:error_report(["unknown swm_session", {module, ?MODULE}, {imsi, Imsi}, {state, State}]) end, {noreply, State}; -handle_cast({epdg_auth_compl_resp, Imsi, Result}, State) -> - Sess = find_swm_session_by_imsi(Imsi, State), - case Sess of - #swm_session{imsi = Imsi} -> - epdg_ue_fsm:received_swm_auth_compl_response(Sess#swm_session.pid, Result); +handle_cast({epdg_auth_compl_resp, ImsiStr, Result}, State) -> + Imsi = list_to_binary(ImsiStr), + case epdg_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + epdg_ue_fsm:received_swm_auth_compl_response(Pid, Result); undefined -> error_logger:error_report(["unknown swm_session", {module, ?MODULE}, {imsi, Imsi}, {state, State}]) end, {noreply, State}; -handle_cast({rar, Imsi}, State) -> - Sess = find_swm_session_by_imsi(Imsi, State), - case Sess of - #swm_session{imsi = Imsi} -> - case epdg_ue_fsm:received_swm_reauth_request(Sess#swm_session.pid) of +handle_cast({rar, ImsiStr}, State) -> + Imsi = list_to_binary(ImsiStr), + case epdg_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + case epdg_ue_fsm:received_swm_reauth_request(Pid) of ok -> DiaResultCode = 2001, %% SUCCESS - aaa_diameter_swm:rx_reauth_answer(Imsi, DiaResultCode); + aaa_diameter_swm:rx_reauth_answer(ImsiStr, DiaResultCode); _ -> DiaResultCode = 5012, %% UNABLE_TO_COMPLY - aaa_diameter_swm:rx_reauth_answer(Imsi, DiaResultCode) + aaa_diameter_swm:rx_reauth_answer(ImsiStr, DiaResultCode) end; undefined -> lager:notice("SWm Rx RAR: unknown swm-session ~p", [Imsi]), DiaResultCode = 5002, %% UNKNOWN_SESSION_ID - aaa_diameter_swm:rx_reauth_answer(Imsi, DiaResultCode) + aaa_diameter_swm:rx_reauth_answer(ImsiStr, DiaResultCode) end, {noreply, State}; -handle_cast({sta, Imsi, Result}, State) -> - Sess = find_swm_session_by_imsi(Imsi, State), - case Sess of - #swm_session{imsi = Imsi} -> - epdg_ue_fsm:received_swm_session_termination_answer(Sess#swm_session.pid, Result); +handle_cast({sta, ImsiStr, Result}, State) -> + Imsi = list_to_binary(ImsiStr), + case epdg_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + epdg_ue_fsm:received_swm_session_termination_answer(Pid, Result); undefined -> error_logger:error_report(["unknown swm_session", {module, ?MODULE}, {imsi, Imsi}, {state, State}]) end, {noreply, State}; -handle_cast({asr, Imsi}, State) -> - Sess = find_swm_session_by_imsi(Imsi, State), - case Sess of - #swm_session{imsi = Imsi} -> - epdg_ue_fsm:received_swm_abort_session_request(Sess#swm_session.pid); +handle_cast({asr, ImsiStr}, State) -> + Imsi = list_to_binary(ImsiStr), + case epdg_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + epdg_ue_fsm:received_swm_abort_session_request(Pid); undefined -> error_logger:error_report(["unknown swm_session", {module, ?MODULE}, {imsi, Imsi}, {state, State}]) end, @@ -241,37 +216,3 @@ %% ------------------------------------------------------------------ %% Internal Function Definitions %% ------------------------------------------------------------------ - -new_swm_session(Imsi, Pid, State) -> - Sess = #swm_session{imsi = Imsi, - pid = Pid - }, - NewSt = State#swm_state{sessions = sets:add_element(Sess, State#swm_state.sessions)}, - {Sess, NewSt}. - -% returns Sess if found, undefined it not -find_swm_session_by_imsi(Imsi, State) -> - {Imsi, Res} = sets:fold( - fun(SessIt = #swm_session{imsi = LookupImsi}, {LookupImsi, _AccIn}) -> {LookupImsi, SessIt}; - (_, AccIn) -> AccIn - end, - {Imsi, undefined}, - State#swm_state.sessions), - Res. - -find_or_new_swm_session(Imsi, Pid, State) -> - Sess = find_swm_session_by_imsi(Imsi, State), - case Sess of - #swm_session{imsi = Imsi} -> - % 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. - -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/+/36332?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: Iacdba6570bfa286d03542733911b01e3a16e9706 Gerrit-Change-Number: 36332 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]: Rename code paths Tx/Rx of Diameter Swm DER/DEA

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36333?usp=email ) Change subject: Rename code paths Tx/Rx of Diameter Swm DER/DEA ...................................................................... Rename code paths Tx/Rx of Diameter Swm DER/DEA Rename all related code paths related to Tx/Rx of DER and DEA messages, so that it becomes easier to match code to spec references. Change-Id: I4f4219ab04dce4ca7aac3a0410ac94a41080949f --- M src/aaa_diameter_swm.erl M src/aaa_ue_fsm.erl M src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl 4 files changed, 84 insertions(+), 71 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/33/36333/1 diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index c7c87a5..fadff7e 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -14,13 +14,13 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). --export([rx_auth_request/4, - rx_auth_compl_request/2, +-export([rx_der_auth_request/4, + rx_der_auth_compl_request/2, rx_reauth_answer/2, rx_session_termination_request/1, rx_abort_session_answer/1]). --export([tx_auth_response/2, - tx_auth_compl_response/2, +-export([tx_dea_auth_response/2, + tx_dea_auth_compl_response/2, tx_reauth_request/1, tx_session_termination_answer/2, tx_as_request/1]). @@ -38,11 +38,11 @@ % Tx over emulated SWm wire: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -tx_auth_response(Imsi, Result) -> - _Result = gen_server:call(?SERVER, {epdg_auth_resp, Imsi, Result}). +tx_dea_auth_response(Imsi, Result) -> + _Result = gen_server:call(?SERVER, {dea_auth_resp, Imsi, Result}). -tx_auth_compl_response(Imsi, Result) -> - _Result = gen_server:call(?SERVER, {epdg_auth_compl_resp, Imsi, Result}). +tx_dea_auth_compl_response(Imsi, Result) -> + _Result = gen_server:call(?SERVER, {dea_auth_compl_resp, Imsi, Result}). tx_reauth_request(Imsi) -> _Result = gen_server:call(?SERVER, {rar, Imsi}). @@ -56,11 +56,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Rx from emulated SWm wire: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -rx_auth_request(Imsi, PdpTypeNr, Apn, EAP) -> - gen_server:cast(?SERVER, {epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}). +rx_der_auth_request(Imsi, PdpTypeNr, Apn, EAP) -> + gen_server:cast(?SERVER, {der_auth_req, Imsi, PdpTypeNr, Apn, EAP}). -rx_auth_compl_request(Imsi, Apn) -> - gen_server:cast(?SERVER, {epdg_auth_compl_req, Imsi, Apn}). +rx_der_auth_compl_request(Imsi, Apn) -> + gen_server:cast(?SERVER, {der_auth_compl_req, Imsi, Apn}). rx_reauth_answer(Imsi, Result) -> gen_server:cast(?SERVER, {raa, Imsi, Result}). @@ -73,21 +73,21 @@ %% handle_cast: Rx side -handle_cast({epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}, State) -> +handle_cast({der_auth_req, Imsi, PdpTypeNr, Apn, EAP}, State) -> case aaa_ue_fsm:get_pid_by_imsi(Imsi) of undefined -> {ok, Pid} = aaa_ue_fsm:start(Imsi); Pid -> Pid end, - aaa_ue_fsm:ev_rx_swm_auth_req(Pid, {PdpTypeNr, Apn, EAP}), + aaa_ue_fsm:ev_rx_swm_der_auth_req(Pid, {PdpTypeNr, Apn, EAP}), {noreply, State}; -handle_cast({epdg_auth_compl_req, Imsi, Apn}, State) -> +handle_cast({der_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_rx_swm_auth_compl(Pid, Apn); + aaa_ue_fsm:ev_rx_swm_der_auth_compl(Pid, Apn); undefined -> RC_USER_UNKNOWN=5030, - epdg_diameter_swm:rx_auth_compl_response(Imsi, {error, RC_USER_UNKNOWN}) + epdg_diameter_swm:rx_dea_auth_compl_response(Imsi, {error, RC_USER_UNKNOWN}) end, {noreply, State}; @@ -133,12 +133,12 @@ {noreply, S}. %% handle_call: Tx side -handle_call({epdg_auth_resp, Imsi, Result}, _From, State) -> - epdg_diameter_swm:rx_auth_response(Imsi, Result), +handle_call({dea_auth_resp, Imsi, Result}, _From, State) -> + epdg_diameter_swm:rx_dea_auth_response(Imsi, Result), {reply, ok, State}; -handle_call({epdg_auth_compl_resp, Imsi, Result}, _From, State) -> - epdg_diameter_swm:rx_auth_compl_response(Imsi, Result), +handle_call({dea_auth_compl_resp, Imsi, Result}, _From, State) -> + epdg_diameter_swm:rx_dea_auth_compl_response(Imsi, Result), {reply, ok, State}; handle_call({rar, Imsi}, _From, State) -> diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index d2e4aad..abbe40e 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -42,7 +42,8 @@ -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_rx_swm_auth_req/2, ev_rx_swm_reauth_answer/2, ev_rx_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swm_asa/1, +-export([ev_rx_swm_der_auth_req/2, ev_rx_swm_der_auth_compl/2, + ev_rx_swm_reauth_answer/2, ev_rx_swm_str/1, ev_rx_swm_asa/1, ev_rx_swx_maa/2, ev_rx_swx_saa/2, ev_rx_swx_ppr/2, ev_rx_swx_rtr/1, ev_rx_s6b_aar/2, ev_rx_s6b_str/1, ev_rx_s6b_raa/2, ev_rx_s6b_asa/2]). -export([state_new/3, @@ -86,10 +87,10 @@ {error, Err} end. -ev_rx_swm_auth_req(Pid, {PdpTypeNr, Apn, EAP}) -> - lager:info("ue_fsm ev_rx_swm_auth_req~n", []), +ev_rx_swm_der_auth_req(Pid, {PdpTypeNr, Apn, EAP}) -> + lager:info("ue_fsm ev_rx_swm_der_auth_req~n", []), try - gen_statem:call(Pid, {rx_swm_auth_req, PdpTypeNr, Apn, EAP}) + gen_statem:call(Pid, {rx_swm_der_auth_req, PdpTypeNr, Apn, EAP}) catch exit:Err -> {error, Err} @@ -103,10 +104,10 @@ {error, Err} end. -ev_rx_swm_auth_compl(Pid, Apn) -> - lager:info("ue_fsm ev_rx_swm_auth_compl~n", []), +ev_rx_swm_der_auth_compl(Pid, Apn) -> + lager:info("ue_fsm ev_rx_swm_der_auth_compl~n", []), try - gen_statem:call(Pid, {rx_swm_auth_compl, Apn}) + gen_statem:call(Pid, {rx_swm_der_auth_compl, Apn}) catch exit:Err -> {error, Err} @@ -229,8 +230,8 @@ state_new(enter, _OldState, Data) -> {keep_state, 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]), +state_new({call, From}, {rx_swm_der_auth_req, PdpTypeNr, Apn, EAP}, Data) -> + lager:info("ue_fsm state_new event=rx_swm_der_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 = [] @@ -240,8 +241,8 @@ {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} end; -state_new({call, From}, {rx_swm_auth_compl, Apn}, Data) -> - lager:info("ue_fsm state_new event=rx_swm_auth_compl, ~p~n", [Data]), +state_new({call, From}, {rx_swm_der_auth_compl, Apn}, Data) -> + lager:info("ue_fsm state_new event=rx_swm_der_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}}]} @@ -256,7 +257,7 @@ state_wait_swx_maa({call, From}, {rx_swx_maa, Result}, Data) -> lager:info("ue_fsm state_wait_swx_maa event=rx_swx_maa, ~p~n", [Data]), - aaa_diameter_swm:tx_auth_response(Data#ue_fsm_data.imsi, Result), + aaa_diameter_swm:tx_dea_auth_response(Data#ue_fsm_data.imsi, Result), {next_state, state_new, Data, [{reply,From,ok}]}. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -270,10 +271,10 @@ lager:info("ue_fsm state_wait_swx_saa event=rx_swx_saa ~p, ~p~n", [Result, Data]), case Result of {error, _SAType, DiaRC} -> - aaa_diameter_swm:tx_auth_compl_response(Data#ue_fsm_data.imsi, {error, DiaRC}), + aaa_diameter_swm:tx_dea_auth_compl_response(Data#ue_fsm_data.imsi, {error, DiaRC}), {next_state, state_new, Data, [{reply,From,ok}]}; {ok, _SAType, ResInfo} -> - aaa_diameter_swm:tx_auth_compl_response(Data#ue_fsm_data.imsi, {ok, ResInfo}), + aaa_diameter_swm:tx_dea_auth_compl_response(Data#ue_fsm_data.imsi, {ok, ResInfo}), {next_state, state_authenticated, Data, [{reply,From,ok}]} end. @@ -350,8 +351,8 @@ end end; -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]), +state_authenticated({call, _From}, {rx_swm_der_auth_req, PdpTypeNr, Apn, EAP}, Data) -> + lager:info("ue_fsm state_authenticated event=rx_swm_der_auth_req {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), {next_state, state_new, Data, [postpone]}; state_authenticated({call, From}, {rx_swx_ppr, _PGWAddresses}, Data) -> diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index 5d7ffe2..05fb87b 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -14,13 +14,13 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). --export([tx_auth_request/4, +-export([tx_der_auth_request/4, tx_reauth_answer/2, - tx_auth_compl_request/2, + tx_der_auth_compl_request/2, tx_session_termination_request/1, tx_abort_session_answer/1]). --export([rx_auth_response/2, - rx_auth_compl_response/2, +-export([rx_dea_auth_response/2, + rx_dea_auth_compl_response/2, rx_reauth_request/1, rx_session_termination_answer/2, rx_abort_session_request/1]). @@ -37,16 +37,16 @@ %% Swm Diameter message Diameter-EAP-Request, 3GPP TS 29.273 Table 7.1.2.1.1 -tx_auth_request(Imsi, PdpTypeNr, Apn, EAP) -> +tx_der_auth_request(Imsi, PdpTypeNr, Apn, EAP) -> % In Diameter we use Imsi as strings, as done by diameter module. ImsiStr = binary_to_list(Imsi), % PdpTypeNr: SWm Diameter AVP "UE-Local-IP-Address" % Apn: SWm Diameter AVP "Service-Selection" % EAP: SWm Diameter AVP EAP-Payload - Result = gen_server:call(?SERVER, {epdg_auth_req, ImsiStr, PdpTypeNr, Apn, EAP}), + Result = gen_server:call(?SERVER, {der_auth_req, ImsiStr, PdpTypeNr, Apn, EAP}), case Result of {ok, _AuthTuples} -> - epdg_ue_fsm:received_swm_auth_response(self(), Result), + epdg_ue_fsm:received_swm_dea_auth_response(self(), Result), ok; _ -> Result end. @@ -57,13 +57,13 @@ _Result = gen_server:call(?SERVER, {raa, ImsiStr, DiaRC}). % Rx "GSUP CEAI LU Req" is our way of saying Rx "Swm Diameter-EAP REQ (DER) with EAP AVP containing successuful auth": -tx_auth_compl_request(Imsi, Apn) -> +tx_der_auth_compl_request(Imsi, Apn) -> % In Diameter we use Imsi as strings, as done by diameter module. ImsiStr = binary_to_list(Imsi), - Result = gen_server:call(?SERVER, {epdg_auth_compl_req, ImsiStr, Apn}), + Result = gen_server:call(?SERVER, {der_auth_compl_req, ImsiStr, Apn}), case Result of {ok, _Mar} -> - epdg_ue_fsm:received_swm_auth_compl_response(self(), Result), + epdg_ue_fsm:received_swm_dea_auth_compl_response(self(), Result), ok; _ -> Result end. @@ -91,9 +91,9 @@ _ -> Result end. -handle_call({epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}, _From, State) -> +handle_call({der_auth_req, Imsi, PdpTypeNr, Apn, EAP}, _From, State) -> % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: - ok = aaa_diameter_swm:rx_auth_request(Imsi, PdpTypeNr, Apn, EAP), + ok = aaa_diameter_swm:rx_der_auth_request(Imsi, PdpTypeNr, Apn, EAP), {reply, ok, State}; handle_call({raa, Imsi, DiaRC}, _From, State) -> @@ -101,9 +101,9 @@ aaa_diameter_swm:rx_reauth_answer(Imsi, DiaRC#epdg_dia_rc.result_code), {reply, ok, State}; -handle_call({epdg_auth_compl_req, Imsi, Apn}, _From, State) -> +handle_call({der_auth_compl_req, Imsi, Apn}, _From, State) -> % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: - Reply = aaa_diameter_swm:rx_auth_compl_request(Imsi, Apn), + Reply = aaa_diameter_swm:rx_der_auth_compl_request(Imsi, Apn), {reply, Reply, State}; handle_call({str, Imsi}, _From, State) -> @@ -116,21 +116,21 @@ Reply = aaa_diameter_swm:rx_abort_session_answer(Imsi), {reply, Reply, State}. -handle_cast({epdg_auth_resp, ImsiStr, Result}, State) -> +handle_cast({dea_auth_resp, ImsiStr, Result}, State) -> Imsi = list_to_binary(ImsiStr), case epdg_ue_fsm:get_pid_by_imsi(Imsi) of Pid when is_pid(Pid) -> - epdg_ue_fsm:received_swm_auth_response(Pid, Result); + epdg_ue_fsm:received_swm_dea_auth_response(Pid, Result); undefined -> error_logger:error_report(["unknown swm_session", {module, ?MODULE}, {imsi, Imsi}, {state, State}]) end, {noreply, State}; -handle_cast({epdg_auth_compl_resp, ImsiStr, Result}, State) -> +handle_cast({dea_auth_compl_resp, ImsiStr, Result}, State) -> Imsi = list_to_binary(ImsiStr), case epdg_ue_fsm:get_pid_by_imsi(Imsi) of Pid when is_pid(Pid) -> - epdg_ue_fsm:received_swm_auth_compl_response(Pid, Result); + epdg_ue_fsm:received_swm_dea_auth_compl_response(Pid, Result); undefined -> error_logger:error_report(["unknown swm_session", {module, ?MODULE}, {imsi, Imsi}, {state, State}]) end, @@ -197,13 +197,13 @@ ok = gen_server:cast(?SERVER, {rar, Imsi}). %% Emulation from the wire (DIAMETER SWm), called from internal AAA Server: -rx_auth_response(Imsi, Result) -> - ok = gen_server:cast(?SERVER, {epdg_auth_resp, Imsi, Result}). +rx_dea_auth_response(Imsi, Result) -> + ok = gen_server:cast(?SERVER, {dea_auth_resp, Imsi, Result}). %Rx Swm Diameter-EAP Answer (DEA) containing APN-Configuration, triggered by %earlier Tx DER EAP AVP containing successuful auth": -rx_auth_compl_response(Imsi, Result) -> - ok = gen_server:cast(?SERVER, {epdg_auth_compl_resp, Imsi, Result}). +rx_dea_auth_compl_response(Imsi, Result) -> + ok = gen_server:cast(?SERVER, {dea_auth_compl_resp, Imsi, Result}). % Rx SWm Diameter STA: rx_session_termination_answer(Imsi, Result) -> diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index b75a865..660323b 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -44,7 +44,7 @@ -export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). -export([auth_request/2, lu_request/1, tunnel_request/2, purge_ms_request/1, cancel_location_result/1]). --export([received_swm_reauth_request/1, received_swm_auth_response/2, received_swm_auth_compl_response/2, +-export([received_swm_reauth_request/1, received_swm_dea_auth_response/2, received_swm_dea_auth_compl_response/2, received_swm_session_termination_answer/2, received_swm_abort_session_request/1]). -export([received_gtpc_create_session_response/2, received_gtpc_delete_session_response/2, received_gtpc_delete_bearer_request/1]). -export([state_new/3, @@ -146,19 +146,19 @@ {error, Err} end. -received_swm_auth_response(Pid, Result) -> - lager:info("ue_fsm received_swm_auth_response ~p~n", [Result]), +received_swm_dea_auth_response(Pid, Result) -> + lager:info("ue_fsm received_swm_dea_auth_response ~p~n", [Result]), try - gen_statem:call(Pid, {received_swm_auth_response, Result}) + gen_statem:call(Pid, {received_swm_dea_auth_response, Result}) catch exit:Err -> {error, Err} end. -received_swm_auth_compl_response(Pid, Result) -> - lager:info("ue_fsm received_swm_auth_compl_response ~p~n", [Result]), +received_swm_dea_auth_compl_response(Pid, Result) -> + lager:info("ue_fsm received_swm_dea_auth_compl_response ~p~n", [Result]), try - gen_statem:call(Pid, {received_swm_auth_compl_response, Result}) + gen_statem:call(Pid, {received_swm_dea_auth_compl_response, Result}) catch exit:Err -> {error, Err} @@ -215,7 +215,7 @@ %% ------------------------------------------------------------------ ev_handle({call, From}, {auth_request, PdpTypeNr, Apn, EAP}, Data) -> - case epdg_diameter_swm:tx_auth_request(Data#ue_fsm_data.imsi, PdpTypeNr, Apn, EAP) of + case epdg_diameter_swm:tx_der_auth_request(Data#ue_fsm_data.imsi, PdpTypeNr, Apn, EAP) of ok -> {next_state, state_wait_auth_resp, Data, [{reply,From,ok}]}; {error, Err} -> {stop_and_reply, Err, [{reply,From,{error,Err}}], Data} end. @@ -262,8 +262,8 @@ state_wait_auth_resp(enter, _OldState, Data) -> {keep_state, Data}; -state_wait_auth_resp({call, From}, {received_swm_auth_response, Result}, Data) -> - lager:info("ue_fsm state_wait_auth_resp event=received_swm_auth_response Result=~p, ~p~n", [Result, Data]), +state_wait_auth_resp({call, From}, {received_swm_dea_auth_response, Result}, Data) -> + lager:info("ue_fsm state_wait_auth_resp event=received_swm_dea_auth_response Result=~p, ~p~n", [Result, Data]), case Result of {ok, _AuthTuples} -> gsup_server:auth_response(Data#ue_fsm_data.imsi, Result), @@ -290,14 +290,14 @@ state_authenticating({call, From}, lu_request, Data) -> lager:info("ue_fsm state_authenticating event=lu_request, ~p~n", [Data]), % Rx "GSUP CEAI LU Req" is our way of saying Rx "Swm Diameter-EAP REQ (DER) with EAP AVP containing successuful auth": - case epdg_diameter_swm:tx_auth_compl_request(Data#ue_fsm_data.imsi, Data#ue_fsm_data.apn) of + case epdg_diameter_swm:tx_der_auth_compl_request(Data#ue_fsm_data.imsi, Data#ue_fsm_data.apn) of ok -> {keep_state, Data, [{reply,From,ok}]}; {error, Err} -> {stop_and_reply, Err, [{reply,From,{error,Err}}], Data} end; % Rx Swm Diameter-EAP Answer (DEA) containing APN-Configuration, triggered by % earlier Tx DER EAP AVP containing successuful auth", when we received GSUP LU Req: -state_authenticating({call, From}, {received_swm_auth_compl_response, Result}, Data) -> +state_authenticating({call, From}, {received_swm_dea_auth_compl_response, Result}, Data) -> lager:info("ue_fsm state_authenticating event=lu_request, ~p, ~p~n", [Result, Data]), % Rx "GSUP CEAI LU Req" is our way of saying Rx "Swm Diameter-EAP REQ (DER) with EAP AVP containing successuful auth": case Result of -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36333?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: I4f4219ab04dce4ca7aac3a0410ac94a41080949f Gerrit-Change-Number: 36333 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-trx[master]: debian/rules: make configure args diff friendly

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/36328?usp=email ) Change subject: debian/rules: make configure args diff friendly ...................................................................... debian/rules: make configure args diff friendly Have one arg per line, and order alphabetically while at it. Change-Id: I354affacb38958efe70baedc6175aeab525190a6 --- M debian/rules 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/28/36328/1 diff --git a/debian/rules b/debian/rules index 5795643..f2dadcc 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,14 @@ dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info override_dh_auto_configure: - dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-ipc --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals + dh_auto_configure -- \ + --enable-manuals \ + --with-ipc \ + --with-lms \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --with-uhd \ + --with-usrp1 \ + $(NULL) override_dh_strip: dh_strip --dbg-package=osmo-trx-dbg -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36328?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I354affacb38958efe70baedc6175aeab525190a6 Gerrit-Change-Number: 36328 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-trx[master]: debian: add osmo-trx-ms-blade

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/36329?usp=email ) Change subject: debian: add osmo-trx-ms-blade ...................................................................... debian: add osmo-trx-ms-blade Related: OS#6409 Change-Id: I85d24355975f292610bcde61a8917aec852043ca --- M debian/control A debian/osmo-trx-ms-blade.install M debian/rules 3 files changed, 34 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/29/36329/1 diff --git a/debian/control b/debian/control index b1bb6c0..338e89a 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,8 @@ libusrp-dev, liblimesuite-dev, libosmocore-dev (>= 1.9.0), - osmo-gsm-manuals-dev (>= 1.5.0) + osmo-gsm-manuals-dev (>= 1.5.0), + libbladerf-dev Standards-Version: 3.9.6 Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-trx Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-trx @@ -110,6 +111,25 @@ between different telecommunication associations for developing new generations of mobile phone networks. (post-2G/GSM) +Package: osmo-trx-ms-blade +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: MS side transceiver (bladeRF) + OsmoTRX is a software-defined radio transceiver that implements the Layer 1 + physical layer of a BTS comprising the following 3GPP specifications: + . + TS 05.01 "Physical layer on the radio path" + TS 05.02 "Multiplexing and Multiple Access on the Radio Path" + TS 05.04 "Modulation" + TS 05.10 "Radio subsystem synchronization" + . + In this context, BTS is "Base transceiver station". It's the stations that + connect mobile phones to the mobile network. + . + 3GPP is the "3rd Generation Partnership Project" which is the collaboration + between different telecommunication associations for developing new + generations of mobile phone networks. (post-2G/GSM) + Package: osmo-trx-doc Architecture: all Section: doc diff --git a/debian/osmo-trx-ms-blade.install b/debian/osmo-trx-ms-blade.install new file mode 100644 index 0000000..0a3f163 --- /dev/null +++ b/debian/osmo-trx-ms-blade.install @@ -0,0 +1 @@ +/usr/bin/osmo-trx-ms-blade diff --git a/debian/rules b/debian/rules index f2dadcc..d9e4949 100755 --- a/debian/rules +++ b/debian/rules @@ -11,8 +11,10 @@ override_dh_auto_configure: dh_auto_configure -- \ --enable-manuals \ + --with-bladerf \ --with-ipc \ --with-lms \ + --with-mstrx \ --with-systemdsystemunitdir=/lib/systemd/system \ --with-uhd \ --with-usrp1 \ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36329?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I85d24355975f292610bcde61a8917aec852043ca Gerrit-Change-Number: 36329 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-trx[master]: gitignore: add .version

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/36327?usp=email ) Change subject: gitignore: add .version ...................................................................... gitignore: add .version Change-Id: Ib75781b5d473921b42936e4d3c441e6a520b9108 --- M .gitignore 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/27/36327/1 diff --git a/.gitignore b/.gitignore index 581b08f..fc567db 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ .deps .libs .dirstamp +.version *~ Makefile config.log -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36327?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib75781b5d473921b42936e4d3c441e6a520b9108 Gerrit-Change-Number: 36327 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-trx[master]: contrib/jenkins: add --with-bladerf

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/36331?usp=email ) Change subject: contrib/jenkins: add --with-bladerf ...................................................................... contrib/jenkins: add --with-bladerf Related: OS#6409 Depends: docker-playground I3c3fe95d8ebb21f7691a491144885c7deb8049a5 Change-Id: I1300aa107fd1031cf921fafc3566f0f64f9cdd72 --- M contrib/jenkins.sh 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/31/36331/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 8adf9ff..0f762c8 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -88,6 +88,7 @@ CONFIG=" --enable-sanitize --enable-werror + --with-bladerf --with-ipc --with-lms --with-mstrx -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36331?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1300aa107fd1031cf921fafc3566f0f64f9cdd72 Gerrit-Change-Number: 36331 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-trx[master]: contrib/jenkins: make configure args diff friendly

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/36330?usp=email ) Change subject: contrib/jenkins: make configure args diff friendly ...................................................................... contrib/jenkins: make configure args diff friendly Change-Id: I049af384eccdb6f8e5b305ca35de106eeaca3fa8 --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/30/36330/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 990e6f4..8adf9ff 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -85,7 +85,16 @@ export LD_LIBRARY_PATH="$inst/lib" export PATH="$inst/bin:$PATH" -CONFIG="--enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms --with-ipc --with-mstrx $INSTR" +CONFIG=" + --enable-sanitize + --enable-werror + --with-ipc + --with-lms + --with-mstrx + --with-uhd + --with-usrp1 + $INSTR +" # Additional configure options and depends if [ "$WITH_MANUALS" = "1" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36330?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I049af384eccdb6f8e5b305ca35de106eeaca3fa8 Gerrit-Change-Number: 36330 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg_diameter_swm: Fix typo in log line

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36325?usp=email ) Change subject: epdg_diameter_swm: Fix typo in log line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36325?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: I62087791ef947ada48da3592193c4c5cd4159147 Gerrit-Change-Number: 36325 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Mar 2024 12:12:36 +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]: Propagate SWx PPR as S6b Re-Auth-Request

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36308?usp=email ) Change subject: Propagate SWx PPR as S6b Re-Auth-Request ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36308?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: I0e263dae37d5b8b3cdce2014787eb82910ed686a Gerrit-Change-Number: 36308 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Mar 2024 12:12:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in docker-playground[master]: debian-bookworm-build: add libbladerf-dev

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36326?usp=email ) Change subject: debian-bookworm-build: add libbladerf-dev ...................................................................... debian-bookworm-build: add libbladerf-dev Related: OS#6409 Change-Id: I3c3fe95d8ebb21f7691a491144885c7deb8049a5 --- M debian-bookworm-build-arm/Dockerfile M debian-bookworm-build/Dockerfile 2 files changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved diff --git a/debian-bookworm-build-arm/Dockerfile b/debian-bookworm-build-arm/Dockerfile index ac07ae7..d7e963b 100644 --- a/debian-bookworm-build-arm/Dockerfile +++ b/debian-bookworm-build-arm/Dockerfile @@ -37,6 +37,7 @@ g++ \ gcc \ git \ + libbladerf-dev \ libboost-dev \ libboost-filesystem-dev \ libboost-program-options-dev \ diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile index b0effe1..80794e7 100644 --- a/debian-bookworm-build/Dockerfile +++ b/debian-bookworm-build/Dockerfile @@ -90,6 +90,7 @@ lcov \ libaio-dev \ libasound2-dev \ + libbladerf-dev \ libboost-all-dev \ libc-ares-dev \ libcdk5-dev \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36326?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3c3fe95d8ebb21f7691a491144885c7deb8049a5 Gerrit-Change-Number: 36326 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024