- gerrit-log - lists.osmocom.org

[M] Change in ...osmo-epdg[master]: Propagate SWx PPR as SWm Authorization Update towards ePDG
by pespin 15 Mar '24

15 Mar '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?usp=email ) Change subject: Propagate SWx PPR as SWm Authorization Update towards ePDG ...................................................................... Propagate SWx PPR as SWm Authorization Update towards ePDG With this commit ePDG is still not invoking the authorization procedure specified in 3GPP TS 29.273 7.1.2.2, but only ACKing the message. Related: OS#6404, OS#6400. Change-Id: I4fe309ac54c61f134dbd471486c7d1a70731c9bb --- M src/aaa_diameter_swm.erl M src/aaa_diameter_swx_cb.erl M src/aaa_ue_fsm.erl M src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl 5 files changed, 131 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/05/36305/1 diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index 9fa656e..e084cb4 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -15,10 +15,15 @@ -export([code_change/3, terminate/2]). -export([rx_auth_request/4, + rx_auth_answer/2, rx_auth_compl_request/2, rx_session_termination_request/1, rx_abort_session_answer/1]). --export([tx_auth_response/2, tx_auth_compl_response/2, tx_session_termination_answer/2, tx_as_request/1]). +-export([tx_auth_request/1, + tx_auth_response/2, + tx_auth_compl_response/2, + tx_session_termination_answer/2, + tx_as_request/1]). -define(SERVER, ?MODULE). @@ -32,6 +37,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Tx over emulated SWm wire: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +tx_auth_request(Imsi) -> + _Result = gen_server:call(?SERVER, {aar, Imsi}). + tx_auth_response(Imsi, Result) -> _Result = gen_server:call(?SERVER, {epdg_auth_resp, Imsi, Result}). @@ -50,6 +59,9 @@ rx_auth_request(Imsi, PdpTypeNr, Apn, EAP) -> gen_server:cast(?SERVER, {epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}). +rx_auth_answer(Imsi, Result) -> + gen_server:cast(?SERVER, {aaa, Imsi, Result}). + rx_auth_compl_request(Imsi, Apn) -> gen_server:cast(?SERVER, {epdg_auth_compl_req, Imsi, Apn}). @@ -59,6 +71,8 @@ rx_abort_session_answer(Imsi) -> gen_server:cast(?SERVER, {asa, Imsi}). +%% handle_cast: Rx side + handle_cast({epdg_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); @@ -77,6 +91,13 @@ end, {noreply, State}; +handle_cast({aaa, Imsi, Result}, State) -> + case aaa_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> aaa_ue_fsm:ev_rx_swm_auth_answer(Pid, Result); + undefined -> ok + end, + {noreply, State}; + handle_cast({str, Imsi}, State) -> case aaa_ue_fsm:get_pid_by_imsi(Imsi) of Pid when is_pid(Pid) -> @@ -111,6 +132,7 @@ error_logger:error_report(["unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. +%% handle_call: Tx side handle_call({epdg_auth_resp, Imsi, Result}, _From, State) -> epdg_diameter_swm:rx_auth_response(Imsi, Result), {reply, ok, State}; @@ -119,6 +141,10 @@ epdg_diameter_swm:rx_auth_compl_response(Imsi, Result), {reply, ok, State}; +handle_call({aar, Imsi}, _From, State) -> + epdg_diameter_swm:rx_auth_request(Imsi), + {reply, ok, State}; + handle_call({sta, Imsi, DiaRC}, _From, State) -> epdg_diameter_swm:rx_session_termination_answer(Imsi, DiaRC), {reply, ok, State}; diff --git a/src/aaa_diameter_swx_cb.erl b/src/aaa_diameter_swx_cb.erl index 93335a2..99d2ba3 100644 --- a/src/aaa_diameter_swx_cb.erl +++ b/src/aaa_diameter_swx_cb.erl @@ -81,14 +81,8 @@ 'Non-3GPP-User-Data' = N3UAopt} = Req, case aaa_ue_fsm:get_pid_by_imsi(Imsi) of Pid when is_pid(Pid) -> - _PGWAddresses = parse_pgw_addr_from_N3UA(N3UAopt), - %% TODO: in successful case, we want to validate how this prcoedure extends to other interfaces: - %% """ 3GPP TS 29.273 8.1.2.3.3: - %% After a successful user profile download, the 3GPP AAA Server shall - %% initiate re-authentication procedure as described - %% in clause 7.2.2.4 if the subscriber has previously been authenticated - %% and authorized to untrusted non-3GPP access. - %% """ + PGWAddresses = parse_pgw_addr_from_N3UA(N3UAopt), + aaa_ue_fsm:ev_rx_swx_ppr(Pid, {PGWAddresses}), Res = 2001, %% Success ERes = []; undefined -> diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index 9ec6a00..4c7e7cc 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -42,8 +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_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, +-export([ev_rx_swm_auth_req/2, ev_rx_swm_auth_answer/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_ppr/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, state_wait_swx_maa/3, @@ -94,6 +94,14 @@ exit:Err -> {error, Err} end. +ev_rx_swm_auth_answer(Pid, Result) -> + lager:info("ue_fsm ev_rx_swm_auth_answer~n", []), + try + gen_statem:call(Pid, {rx_swm_auth_answer, Result}) + catch + exit:Err -> + {error, Err} + end. ev_rx_swm_auth_compl(Pid, Apn) -> lager:info("ue_fsm ev_rx_swm_auth_compl~n", []), @@ -140,6 +148,15 @@ {error, Err} end. +ev_rx_swx_ppr(Pid, PGWAddresses) -> + lager:info("ue_fsm ev_rx_swx_ppr~n", []), + try + gen_statem:call(Pid, {rx_swx_ppr, PGWAddresses}) + catch + exit:Err -> + {error, Err} + end. + ev_rx_swx_rtr(Pid) -> lager:info("ue_fsm ev_rx_swx_rtr~n", []), try @@ -318,6 +335,17 @@ 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_ppr, _PGWAddresses}, Data) -> + case aaa_diameter_swm:tx_auth_request(Data#ue_fsm_data.imsi) of + ok -> {keep_state, Data, [{reply,From,ok}]}; + {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} + end; + +state_authenticated({call, From}, {rx_swm_auth_answer, Result}, Data) -> + lager:info("ue_fsm state_authenticated event=rx_swm_auth_answer ~p, ~p~n", [Result, Data]), + %% SWx PPA was already answered immediatelly when PPR was received, nothing to do here. + {keep_state, Data, [{reply,From,ok}]}; + state_authenticated({call, From}, rx_swx_rtr, Data) -> lager:info("ue_fsm state_authenticated event=rx_swx_rtr ~p~n", [Data]), case {Data#ue_fsm_data.pgw_sess_active, Data#ue_fsm_data.epdg_sess_active} of diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index c060d17..c85724a 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -5,6 +5,7 @@ -behaviour(gen_server). -include_lib("diameter_3gpp_ts29_273_swx.hrl"). +-include("conv.hrl"). -record(swm_state, { sessions = sets:new() @@ -20,10 +21,12 @@ -export([code_change/3, terminate/2]). -export([tx_auth_request/4, + tx_auth_answer/2, tx_auth_compl_request/2, tx_session_termination_request/1, tx_abort_session_answer/1]). --export([rx_auth_response/2, +-export([rx_auth_request/1, + rx_auth_response/2, rx_auth_compl_response/2, rx_session_termination_answer/2, rx_abort_session_request/1]). @@ -54,6 +57,11 @@ _ -> Result end. +tx_auth_answer(Imsi, DiaRC) -> + % In Diameter we use Imsi as strings, as done by diameter module. + ImsiStr = binary_to_list(Imsi), + _Result = gen_server:call(?SERVER, {aaa, 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) -> % In Diameter we use Imsi as strings, as done by diameter module. @@ -95,6 +103,11 @@ ok = aaa_diameter_swm:rx_auth_request(Imsi, PdpTypeNr, Apn, EAP), {reply, ok, State1}; +handle_call({aaa, Imsi, DiaRC}, {Pid, _Tag} = _From, State) -> + % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: + aaa_diameter_swm:rx_auth_answer(Imsi, DiaRC#epdg_dia_rc.result_code), + {reply, ok, State}; + 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), @@ -128,6 +141,25 @@ end, {reply, Reply, State}. +handle_cast({aar, Imsi}, State) -> + Sess = find_swm_session_by_imsi(Imsi, State), + case Sess of + #swm_session{imsi = Imsi} -> + case epdg_ue_fsm:received_swm_auth_request(Sess#swm_session.pid) of + ok -> + DiaResultCode = 2001, %% SUCCESS + aaa_diameter_swm:rx_auth_answer(Imsi, DiaResultCode); + _ -> + DiaResultCode = 5012, %% UNABLE_TO_COMPLY + aaa_diameter_swm:rx_auth_answer(Imsi, DiaResultCode) + end; + undefined -> + lager:notice("SWm Rx AAR: unknown swm-session ~p", [Imsi]), + DiaResultCode = 5002, %% UNKNOWN_SESSION_ID + aaa_diameter_swm:rx_auth_answer(Imsi, DiaResultCode) + end, + {noreply, State}; + handle_cast({epdg_auth_resp, Imsi, Result}, State) -> Sess = find_swm_session_by_imsi(Imsi, State), case Sess of @@ -186,6 +218,10 @@ lager:info("terminating ~p with reason ~p~n", [?MODULE, Reason]). %% Emulation from the wire (DIAMETER SWm), called from internal AAA Server: +rx_auth_request(Imsi) -> + ok = gen_server:cast(?SERVER, {aar, 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}). diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 6b6f756..8046d1a 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_auth_response/2, received_swm_auth_compl_response/2, +-export([received_swm_auth_request/1, received_swm_auth_response/2, received_swm_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, @@ -137,6 +137,15 @@ {error, Err} end. +received_swm_auth_request(Pid) -> + lager:info("ue_fsm received_swm_auth_request~n", []), + try + gen_statem:call(Pid, received_swm_auth_request) + catch + exit:Err -> + {error, Err} + end. + received_swm_auth_response(Pid, Result) -> lager:info("ue_fsm received_swm_auth_response ~p~n", [Result]), try @@ -327,6 +336,18 @@ Data#ue_fsm_data.pgw_rem_addr_list), {next_state, state_wait_create_session_resp, Data, [{reply,From,ok}]}; +state_authenticated({call, From}, received_swm_auth_request, Data) -> + lager:info("ue_fsm state_authenticated event=received_swm_auth_request, ~p~n", [Data]), + % TODO: 3GPP TS 29.273 7.1.2.5.1: + % Upon receiving the re-authorization request, the ePDG shall immediately invoke the authorization procedure + % specified in 7.1.2.2 for the session indicated in the request. This procedure is based on the Diameter + % commands AA-Request (AAR) and AA-Answer (AAA) specified in IETF RFC 4005 [4]. Information + % element contents for these messages are shown in tables 7.1.2.2.1/1 and 7.1.2.2.1/2. + % + % This is done synchrnously for now when returning from call: + %%epdg_diameter_swm:tx_auth_answer(Data#ue_fsm_data.imsi, #epdg_dia_rc{result_code = 2001}), + {keep_state, Data, [{reply,From,ok}]}; + state_authenticated({call, From}, purge_ms_request, Data) -> lager:info("ue_fsm state_authenticated event=purge_ms_request, ~p~n", [Data]), Data1 = Data#ue_fsm_data{tear_down_gsup_needed = true}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?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: I4fe309ac54c61f134dbd471486c7d1a70731c9bb Gerrit-Change-Number: 36305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: osmo-smdpp: fix generation of transactionId
by laforge 15 Mar '24

15 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/36295?usp=email ) Change subject: osmo-smdpp: fix generation of transactionId ...................................................................... osmo-smdpp: fix generation of transactionId The hex string of the generated transactionId contains lowercase hex digits. However SGP.22 explicitly spcifies to use uppercase hex digits when using JSON fromatted messages. See section 6.5.2.6 for example. Related: SYS#6720 Change-Id: I8439aa9d70f6fe798fa88b623bac13debdc19ca1 --- M osmo-smdpp.py 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmo-smdpp.py b/osmo-smdpp.py index 582b222..1f4311d 100755 --- a/osmo-smdpp.py +++ b/osmo-smdpp.py @@ -239,7 +239,7 @@ # Generate a TransactionID which is used to identify the ongoing RSP session. The TransactionID # SHALL be unique within the scope and lifetime of each SM-DP+. - transactionId = uuid.uuid4().hex + transactionId = uuid.uuid4().hex.upper() assert not transactionId in self.rss # Generate a serverChallenge for eUICC authentication attached to the ongoing RSP session. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8439aa9d70f6fe798fa88b623bac13debdc19ca1 Gerrit-Change-Number: 36295 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: osmo-smdpp: fix generation of transactionId
by laforge 15 Mar '24

15 Mar '24

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36295?usp=email ) Change subject: osmo-smdpp: fix generation of transactionId ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8439aa9d70f6fe798fa88b623bac13debdc19ca1 Gerrit-Change-Number: 36295 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Mar 2024 15:10:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: osmo_ss7_asp: fix uninitialized return value in xua_cli_read_cb()
by pespin 15 Mar '24

15 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36301?usp=email ) Change subject: osmo_ss7_asp: fix uninitialized return value in xua_cli_read_cb() ...................................................................... osmo_ss7_asp: fix uninitialized return value in xua_cli_read_cb() libosmo-sccp/src/osmo_ss7_asp.c:1019:16: error: 'rc' may be used uninitialized [-Werror=maybe-uninitialized] 1019 | return rc; Change-Id: I3b1ace12eb5bb6d6b37f3374bf9986026796e166 --- M src/osmo_ss7_asp.c 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 034f60d..92b3a5b 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -980,7 +980,7 @@ struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); unsigned int ppid; int flags; - int rc; + int rc = 0; flags = msgb_sctp_msg_flags(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36301?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3b1ace12eb5bb6d6b37f3374bf9986026796e166 Gerrit-Change-Number: 36301 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: aaa_ue_fsm: Separate states using comment blocks
by pespin 15 Mar '24

15 Mar '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36302?usp=email ) Change subject: aaa_ue_fsm: Separate states using comment blocks ...................................................................... aaa_ue_fsm: Separate states using comment blocks As we add more and more states, it becomes difficult to visualize each state, its logic and why is it use. Add a comment block at the start of each one to clearly see the functions forming it, and allow writing some state description in it. Change-Id: Iae7cb9f2047f8265f52337452af51f8f86fadd65 --- M src/aaa_ue_fsm.erl 1 file changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/02/36302/1 diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index 907d8df..e87579f 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -196,6 +196,10 @@ lager:info("terminating ~p with reason ~p state=~p, ~p~n", [?MODULE, Reason, State, Data]), ok. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_new: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_new(enter, _OldState, Data) -> {keep_state, Data}; @@ -217,6 +221,10 @@ {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} end. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_wait_swx_maa: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_wait_swx_maa(enter, _OldState, Data) -> {keep_state, Data}; @@ -225,6 +233,10 @@ aaa_diameter_swm:auth_response(Data#ue_fsm_data.imsi, Result), {next_state, state_new, Data, [{reply,From,ok}]}. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_wait_swx_saa: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_wait_swx_saa(enter, _OldState, Data) -> {keep_state, Data}; @@ -239,6 +251,10 @@ {next_state, state_authenticated, Data, [{reply,From,ok}]} end. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_authenticated: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_authenticated(enter, _OldState, Data) -> % Mark ePDG session as active: Data1 = Data#ue_fsm_data{epdg_sess_active = true}, @@ -313,6 +329,10 @@ lager:info("ue_fsm state_authenticated: Unexpected call event ~p, ~p~n", [Ev, Data]), {keep_state, Data, [{reply,From,ok}]}. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_authenticated_wait_swx_saa: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_authenticated_wait_swx_saa(enter, _OldState, Data) -> {keep_state, Data}; @@ -340,8 +360,12 @@ end end. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_dereg_net_initiated_wait_s6b_asa: %% HSS asked us to do deregistration towards the user. %% Transmit S6b ASR towards PGW and wait for ASA back. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_dereg_net_initiated_wait_s6b_asa(enter, _OldState, Data) -> aaa_diameter_s6b:tx_as_request(Data#ue_fsm_data.nai), {keep_state, Data, {state_timeout,?TIMEOUT_VAL_WAIT_S6b_ANSWER,s6b_asa_timeout}}; @@ -356,8 +380,12 @@ state_dereg_net_initiated_wait_s6b_asa(state_timeout, s6b_asa_timeout, Data) -> {next_state, state_dereg_net_initiated_wait_swm_asa, Data}. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_dereg_net_initiated_wait_s6b_asa: %% HSS asked us to do deregistration towards the user. %% S6b (PGW) was already torn down. Now transmit SWm ASR towards ePDG and wait for ASA back. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_dereg_net_initiated_wait_swm_asa(enter, _OldState, Data) -> aaa_diameter_swm:tx_as_request(Data#ue_fsm_data.imsi), {keep_state, Data, {state_timeout,?TIMEOUT_VAL_WAIT_SWm_ANSWER,swm_asa_timeout}}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36302?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: Iae7cb9f2047f8265f52337452af51f8f86fadd65 Gerrit-Change-Number: 36302 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in ...osmo-epdg[master]: {aaa,epdg}_diameter_swm: Prepend tx/rx to identify direction
by pespin 15 Mar '24

15 Mar '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36303?usp=email ) Change subject: {aaa,epdg}_diameter_swm: Prepend tx/rx to identify direction ...................................................................... {aaa,epdg}_diameter_swm: Prepend tx/rx to identify direction Otherwise it becomes difficult to identify the direction of the message, specially for messages like AAR and AAA which can go both directions. Change-Id: Id47447d2f2be7389e4598443f3a38b07aaec79a0 --- 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, 63 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/03/36303/1 diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index db06e30..e424ba8 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -14,8 +14,11 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). --export([auth_request/4, auth_compl_request/2, session_termination_request/1, abort_session_answer/1]). --export([auth_response/2, auth_compl_response/2, session_termination_answer/2, tx_as_request/1]). +-export([rx_auth_request/4, + rx_auth_compl_request/2, + rx_session_termination_request/1, + rx_abort_session_answer/1]). +-export([tx_auth_response/2, tx_auth_compl_response/2, tx_session_termination_answer/2, tx_as_request/1]). -define(SERVER, ?MODULE). @@ -29,13 +32,13 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Tx over emulated SWm wire: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -auth_response(Imsi, Result) -> +tx_auth_response(Imsi, Result) -> _Result = gen_server:call(?SERVER, {epdg_auth_resp, Imsi, Result}). -auth_compl_response(Imsi, Result) -> +tx_auth_compl_response(Imsi, Result) -> _Result = gen_server:call(?SERVER, {epdg_auth_compl_resp, Imsi, Result}). -session_termination_answer(Imsi, Result) -> +tx_session_termination_answer(Imsi, Result) -> _Result = gen_server:call(?SERVER, {sta, Imsi, Result}). tx_as_request(Imsi) -> @@ -44,16 +47,16 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Rx from emulated SWm wire: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -auth_request(Imsi, PdpTypeNr, Apn, EAP) -> +rx_auth_request(Imsi, PdpTypeNr, Apn, EAP) -> gen_server:cast(?SERVER, {epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}). -auth_compl_request(Imsi, Apn) -> +rx_auth_compl_request(Imsi, Apn) -> gen_server:cast(?SERVER, {epdg_auth_compl_req, Imsi, Apn}). -session_termination_request(Imsi) -> +rx_session_termination_request(Imsi) -> gen_server:cast(?SERVER, {str, Imsi}). -abort_session_answer(Imsi) -> +rx_abort_session_answer(Imsi) -> gen_server:cast(?SERVER, {asa, Imsi}). handle_cast({epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}, State) -> @@ -70,7 +73,7 @@ aaa_ue_fsm:ev_swm_auth_compl(Pid, Apn); undefined -> RC_USER_UNKNOWN=5030, - epdg_diameter_swm:auth_compl_response(Imsi, {error, RC_USER_UNKNOWN}) + epdg_diameter_swm:rx_auth_compl_response(Imsi, {error, RC_USER_UNKNOWN}) end, {noreply, State}; @@ -80,14 +83,14 @@ case aaa_ue_fsm:ev_rx_swm_str(Pid) of ok -> ok; % Answering delayed due to SAR+SAA towards HSS. {ok, DiaRC} when is_integer(DiaRC) -> - ok = epdg_diameter_swm:session_termination_answer(Imsi, DiaRC); + ok = epdg_diameter_swm:rx_session_termination_answer(Imsi, DiaRC); {error, Err} when is_integer(Err) -> - ok = epdg_diameter_swm:session_termination_answer(Imsi, Err); + ok = epdg_diameter_swm:rx_session_termination_answer(Imsi, Err); {error, _} -> - ok = epdg_diameter_swm:session_termination_answer(Imsi, ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED') + ok = epdg_diameter_swm:rx_session_termination_answer(Imsi, ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED') end; undefined -> - ok = epdg_diameter_swm:session_termination_answer(Imsi, ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED') + ok = epdg_diameter_swm:rx_session_termination_answer(Imsi, ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED') end, {noreply, State}; @@ -109,19 +112,19 @@ {noreply, S}. handle_call({epdg_auth_resp, Imsi, Result}, _From, State) -> - epdg_diameter_swm:auth_response(Imsi, Result), + epdg_diameter_swm:rx_auth_response(Imsi, Result), {reply, ok, State}; handle_call({epdg_auth_compl_resp, Imsi, Result}, _From, State) -> - epdg_diameter_swm:auth_compl_response(Imsi, Result), + epdg_diameter_swm:rx_auth_compl_response(Imsi, Result), {reply, ok, State}; handle_call({sta, Imsi, DiaRC}, _From, State) -> - epdg_diameter_swm:session_termination_answer(Imsi, DiaRC), + epdg_diameter_swm:rx_session_termination_answer(Imsi, DiaRC), {reply, ok, State}; handle_call({asr, Imsi}, _From, State) -> - epdg_diameter_swm:abort_session_request(Imsi), + epdg_diameter_swm:rx_abort_session_request(Imsi), {reply, ok, State}; handle_call(Request, From, S) -> diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index e87579f..c61a4bf 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -230,7 +230,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:auth_response(Data#ue_fsm_data.imsi, Result), + aaa_diameter_swm:tx_auth_response(Data#ue_fsm_data.imsi, Result), {next_state, state_new, Data, [{reply,From,ok}]}. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -244,10 +244,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:auth_compl_response(Data#ue_fsm_data.imsi, {error, DiaRC}), + aaa_diameter_swm:tx_auth_compl_response(Data#ue_fsm_data.imsi, {error, DiaRC}), {next_state, state_new, Data, [{reply,From,ok}]}; {ok, _SAType, ResInfo} -> - aaa_diameter_swm:auth_compl_response(Data#ue_fsm_data.imsi, {ok, ResInfo}), + aaa_diameter_swm:tx_auth_compl_response(Data#ue_fsm_data.imsi, {ok, ResInfo}), {next_state, state_authenticated, Data, [{reply,From,ok}]} end. @@ -350,7 +350,7 @@ ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_USER_DEREGISTRATION' -> case Data#ue_fsm_data.s6b_resp_pid of undefined -> %% SWm initiated - aaa_diameter_swm:session_termination_answer(Data#ue_fsm_data.imsi, DiaRC), + aaa_diameter_swm:tx_session_termination_answer(Data#ue_fsm_data.imsi, DiaRC), Data1 = Data#ue_fsm_data{epdg_sess_active = false}, {next_state, state_new, Data1, [{reply,From,ok}]}; _ -> %% S6b initiated diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index ef70b9c..c060d17 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -19,10 +19,14 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). --export([auth_request/4, auth_compl_request/2, - session_termination_request/1, abort_session_answer/1]). --export([auth_response/2, auth_compl_response/2, - session_termination_answer/2, abort_session_request/1]). +-export([tx_auth_request/4, + tx_auth_compl_request/2, + tx_session_termination_request/1, + tx_abort_session_answer/1]). +-export([rx_auth_response/2, + rx_auth_compl_response/2, + rx_session_termination_answer/2, + rx_abort_session_request/1]). -define(SERVER, ?MODULE). @@ -36,7 +40,7 @@ %% Swm Diameter message Diameter-EAP-Request, 3GPP TS 29.273 Table 7.1.2.1.1 -auth_request(Imsi, PdpTypeNr, Apn, EAP) -> +tx_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" @@ -51,7 +55,7 @@ end. % Rx "GSUP CEAI LU Req" is our way of saying Rx "Swm Diameter-EAP REQ (DER) with EAP AVP containing successuful auth": -auth_compl_request(Imsi, Apn) -> +tx_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}), @@ -63,7 +67,7 @@ end. % 3GPP TS 29.273 7.1.2.3 -session_termination_request(Imsi) -> +tx_session_termination_request(Imsi) -> % In Diameter we use Imsi as strings, as done by diameter module. ImsiStr = binary_to_list(Imsi), Result = gen_server:call(?SERVER, {str, ImsiStr}), @@ -75,7 +79,7 @@ end. % 3GPP TS 29.273 7.1.2.4 -abort_session_answer(Imsi) -> +tx_abort_session_answer(Imsi) -> % In Diameter we use Imsi as strings, as done by diameter module. ImsiStr = binary_to_list(Imsi), Result = gen_server:call(?SERVER, {asa, ImsiStr}), @@ -88,7 +92,7 @@ handle_call({epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}, {Pid, _Tag} = _From, State0) -> % 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:auth_request(Imsi, PdpTypeNr, Apn, EAP), + ok = aaa_diameter_swm:rx_auth_request(Imsi, PdpTypeNr, Apn, EAP), {reply, ok, State1}; handle_call({epdg_auth_compl_req, Imsi, Apn}, _From, State) -> @@ -96,7 +100,7 @@ Sess = find_swm_session_by_imsi(Imsi, State), case Sess of #swm_session{imsi = Imsi} -> - Reply = aaa_diameter_swm:auth_compl_request(Imsi, Apn); + Reply = aaa_diameter_swm:rx_auth_compl_request(Imsi, Apn); undefined -> Reply = {error,unknown_imsi} end, @@ -107,7 +111,7 @@ Sess = find_swm_session_by_imsi(Imsi, State), case Sess of #swm_session{imsi = Imsi} -> - Reply = aaa_diameter_swm:session_termination_request(Imsi); + Reply = aaa_diameter_swm:rx_session_termination_request(Imsi); undefined -> Reply = {error,unknown_imsi} end, @@ -118,7 +122,7 @@ Sess = find_swm_session_by_imsi(Imsi, State), case Sess of #swm_session{imsi = Imsi} -> - Reply = aaa_diameter_swm:abort_session_answer(Imsi); + Reply = aaa_diameter_swm:rx_abort_session_answer(Imsi); undefined -> Reply = {error,unknown_imsi} end, @@ -182,20 +186,20 @@ lager:info("terminating ~p with reason ~p~n", [?MODULE, Reason]). %% Emulation from the wire (DIAMETER SWm), called from internal AAA Server: -auth_response(Imsi, Result) -> +rx_auth_response(Imsi, Result) -> ok = gen_server:cast(?SERVER, {epdg_auth_resp, Imsi, Result}). %Rx Swm Diameter-EAP Answer (DEA) containing APN-Configuration, triggered by %earlier Tx DER EAP AVP containing successuful auth": -auth_compl_response(Imsi, Result) -> +rx_auth_compl_response(Imsi, Result) -> ok = gen_server:cast(?SERVER, {epdg_auth_compl_resp, Imsi, Result}). % Rx SWm Diameter STA: -session_termination_answer(Imsi, Result) -> +rx_session_termination_answer(Imsi, Result) -> ok = gen_server:cast(?SERVER, {sta, Imsi, Result}). % Rx SWm Diameter ASR: -abort_session_request(Imsi) -> +rx_abort_session_request(Imsi) -> ok = gen_server:cast(?SERVER, {asr, Imsi}). %% ------------------------------------------------------------------ diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index e49f9ab..6b6f756 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -206,7 +206,7 @@ %% ------------------------------------------------------------------ ev_handle({call, From}, {auth_request, PdpTypeNr, Apn, EAP}, Data) -> - case epdg_diameter_swm:auth_request(Data#ue_fsm_data.imsi, PdpTypeNr, Apn, EAP) of + case epdg_diameter_swm:tx_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. @@ -281,7 +281,7 @@ 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:auth_compl_request(Data#ue_fsm_data.imsi, Data#ue_fsm_data.apn) of + case epdg_diameter_swm:tx_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; @@ -484,7 +484,7 @@ % Send STR towards AAA-Server % % 3GPP TS 29.273 7.1.2.3 lager:info("ue_fsm state_wait_swm_session_termination_answer event=enter, ~p~n", [Data]), - case epdg_diameter_swm:session_termination_request(Data#ue_fsm_data.imsi) of + case epdg_diameter_swm:tx_session_termination_request(Data#ue_fsm_data.imsi) of ok -> {keep_state, Data}; {error, _Err} -> case Data#ue_fsm_data.tear_down_gsup_needed of @@ -548,7 +548,7 @@ ok -> {keep_state, Data, {state_timeout,?TIMEOUT_VAL_WAIT_GTP_ANSWER,s2b_delete_session_timeout}}; {error, Err} -> - epdg_diameter_swm:abort_session_answer(Data#ue_fsm_data.imsi), + epdg_diameter_swm:tx_abort_session_answer(Data#ue_fsm_data.imsi), {stop, {error,Err}} end; @@ -557,7 +557,7 @@ #{{v2_cause,0} := CauseIE} = IEs, GtpCause = gtp_utils:enum_v2_cause(CauseIE#v2_cause.v2_cause), lager:debug("Cause: GTP_atom=~p -> GTP_int=~p~n", [CauseIE#v2_cause.v2_cause, GtpCause]), - epdg_diameter_swm:abort_session_answer(Data#ue_fsm_data.imsi), + epdg_diameter_swm:tx_abort_session_answer(Data#ue_fsm_data.imsi), {stop_and_reply, normal, [{reply,From,ok}], Data}; state_dereg_net_initiated_wait_s2b_delete_session_resp({call, From}, Event, Data) -> @@ -567,5 +567,5 @@ state_dereg_net_initiated_wait_s2b_delete_session_resp(state_timeout, s2b_delete_session_timeout, Data) -> lager:error("ue_fsm state_dereg_net_initiated_wait_s2b_delete_session_resp: Timeout ~p, ~p~n", [s2b_delete_session_timeout, Data]), - epdg_diameter_swm:abort_session_answer(Data#ue_fsm_data.imsi), + epdg_diameter_swm:tx_abort_session_answer(Data#ue_fsm_data.imsi), {stop, normal}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36303?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: Id47447d2f2be7389e4598443f3a38b07aaec79a0 Gerrit-Change-Number: 36303 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: aaa_ue_fsm: Prepend rx_ prefix to SWm events missing it
by pespin 15 Mar '24

15 Mar '24

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/04/36304/1 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-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: Ensure osmo_stream_{cli,srv}_recv() is used only in osmo_fd mode
by fixeria 15 Mar '24

15 Mar '24

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36293?usp=email ) Change subject: Ensure osmo_stream_{cli,srv}_recv() is used only in osmo_fd mode ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36293?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie96cf1241b2ba4e0a7dda584182d18cad2b4f061 Gerrit-Change-Number: 36293 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 15 Mar 2024 15:01:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: Makefile.am: Fix dependency: rebuild doxygen on src/include changes
by pespin 15 Mar '24

15 Mar '24

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36289?usp=email ) Change subject: Makefile.am: Fix dependency: rebuild doxygen on src/include changes ...................................................................... Patch Set 2: (1 comment) File Makefile.am: https://gerrit.osmocom.org/c/libosmo-netif/+/36289/comment/f7baa4e4_00118305 PS2, Line 33: $(SOURCES) > This variable is not defined anywhere, I think it should be removed? Ack -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36289?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Id28f0927d01f82ceb969fb7c758cb391b86631c1 Gerrit-Change-Number: 36289 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Mar 2024 14:59:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: docs: Don't export documentation about static (internal) functions
by fixeria 15 Mar '24

15 Mar '24

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36292?usp=email ) Change subject: docs: Don't export documentation about static (internal) functions ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36292?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6fee052ad22877db85fe3207c7eac950d875873b Gerrit-Change-Number: 36292 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 15 Mar 2024 14:55:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log