- gerrit-log - lists.osmocom.org

[S] Change in libosmo-abis[rel-1.4.2]: Bump version: 1.4.1.3-b8a4 → 1.4.2
by fixeria 15 Mar '24

15 Mar '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36279?usp=email ) Change subject: Bump version: 1.4.1.3-b8a4 → 1.4.2 ...................................................................... Bump version: 1.4.1.3-b8a4 → 1.4.2 Change-Id: I9072cd5c89d2deb0eb75f47c8fd04ad175549e41 --- M debian/changelog M src/Makefile.am 2 files changed, 19 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 01a7089..095c0b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libosmo-abis (1.4.2) unstable; urgency=medium + + [ Harald Welte ] + * [cosmetic] input/ipaccess.c: We use tab indent, not spaces [wtf] + * input/ipaccess: Make sure to say "TCP keepalive" + * Fix critical bug in default TCP keepalive user timeout + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Fri, 15 Mar 2024 00:53:26 +0700 + libosmo-abis (1.4.1) unstable; urgency=medium [ Oliver Smith ] diff --git a/src/Makefile.am b/src/Makefile.am index 2c99150..6f94c9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -ABIS_LIBVERSION=12:0:2 +ABIS_LIBVERSION=12:1:2 TRAU_LIBVERSION=8:0:6 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36279?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.4.2 Gerrit-Change-Id: I9072cd5c89d2deb0eb75f47c8fd04ad175549e41 Gerrit-Change-Number: 36279 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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

[L] Change in ...osmo-epdg[master]: Implement RTR Deregistration-Reason PERMANENT_TERMINATION
by pespin 14 Mar '24

14 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?usp=email ) Change subject: Implement RTR Deregistration-Reason PERMANENT_TERMINATION ...................................................................... Implement RTR Deregistration-Reason PERMANENT_TERMINATION rebar.lock is updated to get newer osmo_gsup containing several enum defines. Change-Id: I57f2e02dc4034b63c118e4a4139b2830e38a2138 --- M config/sys.config M rebar.lock M src/aaa_diameter_s6b.erl M src/aaa_diameter_s6b_cb.erl M src/aaa_diameter_swm.erl M src/aaa_diameter_swx_cb.erl M src/aaa_ue_fsm.erl M src/conv.erl M src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl M src/gsup_server.erl 11 files changed, 441 insertions(+), 62 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/config/sys.config b/config/sys.config index a40fd23..2677c3d 100755 --- a/config/sys.config +++ b/config/sys.config @@ -28,6 +28,7 @@ {dia_s6b_watchdog_config, [{okay, 3}, {suspect, 1}]}, + {dia_s6b_transmit_timer, 10000}, {dia_s6b_vendor_id, 0}, {dia_s6b_origin_host, "aaa.localdomain"}, {dia_s6b_origin_realm, "localdomain"}, diff --git a/rebar.lock b/rebar.lock index 6205bc4..ab13202 100644 --- a/rebar.lock +++ b/rebar.lock @@ -31,7 +31,7 @@ 0}, {<<"osmo_gsup">>, {git,"https://gerrit.osmocom.org/erlang/osmo_gsup", - {ref,"25ace76f98f7f931691fb02d86667062b4f2c8ad"}}, + {ref,"777296babb15617942296b0f51c1dfb247a35e43"}}, 0}, {<<"osmo_ss7">>, {git,"https://gerrit.osmocom.org/erlang/osmo_ss7", diff --git a/src/aaa_diameter_s6b.erl b/src/aaa_diameter_s6b.erl index baf251f..f8f9027 100644 --- a/src/aaa_diameter_s6b.erl +++ b/src/aaa_diameter_s6b.erl @@ -49,6 +49,7 @@ %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2, peer_down/3]). -export([code_change/3]). +-export([tx_as_request/1]). -export([tx_aa_answer/2, tx_st_answer/2]). %% Diameter Application Definitions @@ -68,6 +69,7 @@ -define(ENV_DEFAULT_DIAMETER_CONNECT_TIMER_MS, 30000). -define(ENV_DEFAULT_DIAMETER_WATCHDOG_TIMER_MS, 30000). -define(ENV_DEFAULT_DIAMETER_WATCHDOG_CFG, [{okay, 3}, {suspect, 1}]). +-define(ENV_DEFAULT_DIAMETER_TRANSMIT_TIMER_MS, 10000). -define(VENDOR_ID_3GPP, 10415). -define(VENDOR_ID_3GPP2, 5535). @@ -93,6 +95,10 @@ {module, ?CALLBACK_MOD}, {answer_errors, callback}]}]). +-record(s6b_state, { + tx_timeout :: non_neg_integer() +}). + %% @doc starts gen_server implementation process -spec start() -> ok | {error, term()}. start() -> @@ -111,17 +117,18 @@ gen_server:cast(?SERVER, {peer_down, SvcName, Peer}), ok. -init(State) -> +init([]) -> Proto = application:get_env(?ENV_APP_NAME, dia_s6b_proto, ?ENV_DEFAULT_DIAMETER_PROTO), Ip = application:get_env(?ENV_APP_NAME, dia_s6b_local_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP), Port = application:get_env(?ENV_APP_NAME, dia_s6b_local_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT), ConnectTimer = application:get_env(?ENV_APP_NAME, dia_s6b_connect_timer, ?ENV_DEFAULT_DIAMETER_CONNECT_TIMER_MS), WatchdogTimer = application:get_env(?ENV_APP_NAME, dia_s6b_watchdog_timer, ?ENV_DEFAULT_DIAMETER_WATCHDOG_TIMER_MS), WatchdogConfig = application:get_env(?ENV_APP_NAME, diameter_watchdog_config, ?ENV_DEFAULT_DIAMETER_WATCHDOG_CFG), + TxTimer = application:get_env(?ENV_APP_NAME, dia_s6b_transmit_timer, ?ENV_DEFAULT_DIAMETER_TRANSMIT_TIMER_MS), ok = diameter:start_service(?MODULE, ?SERVICE), % lager:info("DiaServices is ~p~n", [DiaServ]), {ok, _} = listen({address, Proto, Ip, Port}, {timer, ConnectTimer, WatchdogTimer, WatchdogConfig}), - {ok, State}. + {ok, #s6b_state{tx_timeout = TxTimer}}. tx_aa_answer(Pid, DiaRC) -> % handle_request(AAR) was spawned into its own process, and it's blocked waiting for AAA: @@ -131,6 +138,27 @@ % handle_request(STR) was spawned into its own process, and it's blocked waiting for STA: Pid ! {sta, DiaRC}. +tx_as_request(NAI) -> + gen_server:call(?SERVER, {asr, NAI}). + +handle_call({asr, NAI}, _From, State) -> + lager:debug("S6b Tx ASR NAI=~p~n", [NAI]), + SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, dia_s6b_origin_host, ?ENV_DEFAULT_ORIG_HOST)), + ASR = #'ASR'{'Session-Id' = SessionId, + 'Auth-Application-Id' = ?DIAMETER_APP_ID_S6b, + 'User-Name' = [NAI], + 'Auth-Session-State' = [?'AUTH-SESSION-STATE_NO_STATE_MAINTAINED'] + }, + lager:debug("S6b Tx ASR: ~p~n", [ASR]), + Ret = diameter_call(ASR, State), + case Ret of + ok -> + {reply, ok, State}; + {error, Err} -> + lager:error("Error: ~w~n", [Err]), + {reply, {error, Err}, State} + end; + handle_call(Info, _From, State) -> error_logger:error_report(["unknown handle_call", {module, ?MODULE}, {info, Info}, {state, State}]). @@ -189,4 +217,7 @@ tmod(sctp) -> diameter_sctp. +diameter_call(Msg, State) -> + diameter:call(?SVC_NAME, ?APP_ALIAS, Msg, [{timeout, State#s6b_state.tx_timeout}, + detach]). diff --git a/src/aaa_diameter_s6b_cb.erl b/src/aaa_diameter_s6b_cb.erl index a56a7ca..b3f8d5f 100644 --- a/src/aaa_diameter_s6b_cb.erl +++ b/src/aaa_diameter_s6b_cb.erl @@ -29,23 +29,31 @@ {ok, Peer}. %% prepare_request/3 -prepare_request(_Req, _SvcName, _Peer) -> - lager:error("Unexpected prepare_request(): ~p~n", [_Req]), - ?UNEXPECTED. +prepare_request(#diameter_packet{msg = [ T | Avps ]}, _, {_, Caps}) + when is_list(Avps) -> + #diameter_caps{origin_host = {OH, DH}, origin_realm = {OR, DR}} = Caps, + {send, + [T, + {'Origin-Host', OH}, + {'Origin-Realm', OR}, + {'Destination-Host', [DH]}, + {'Destination-Realm', DR} + | Avps]}; +% TODO: is there a simple way to capture all the following requests? +prepare_request(#diameter_packet{msg = Req}, _, {_, Caps}) + when is_record(Req, 'ASR') -> + #diameter_caps{origin_host = {OH, DH}, origin_realm = {OR, DR}} = Caps, + Msg = Req#'ASR'{'Origin-Host' = OH, + 'Origin-Realm' = OR, + 'Destination-Realm' = DR, + 'Destination-Host' = DH}, + lager:debug("S6b prepare_request: ~p~n", [Msg]), + {send, Msg}. %% prepare_retransmit/3 prepare_retransmit(Packet, SvcName, Peer) -> prepare_request(Packet, SvcName, Peer). -%% handle_answer/4 - -%% Since client.erl has detached the call when using the list -%% encoding and not otherwise, output to the terminal in the -%% the former case, return in the latter. - -handle_answer(_Packet, _Request, _SvcName, _Peer) -> - ?UNEXPECTED. - %% handle_error/4 handle_error(Reason, Request, _SvcName, _Peer) when is_list(Request) -> lager:error("Request error: ~p~n", [Reason]), @@ -59,14 +67,14 @@ #'AAR'{'Session-Id' = SessionId, 'Auth-Application-Id' = AuthAppId, 'Auth-Request-Type' = AuthReqType, - 'User-Name' = [UserName], + 'User-Name' = [NAI], 'Service-Selection' = [Apn], 'MIP6-Agent-Info' = AgentInfoOpt } = Req, - Imsi = conv:nai_to_imsi(UserName), + Imsi = conv:nai_to_imsi(NAI), PidRes = aaa_ue_fsm:get_pid_by_imsi(Imsi), case PidRes of PidRes when is_pid(PidRes) -> - ok = aaa_ue_fsm:ev_rx_s6b_aar(PidRes, {Apn, AgentInfoOpt}), + ok = aaa_ue_fsm:ev_rx_s6b_aar(PidRes, {NAI, Apn, AgentInfoOpt}), lager:debug("Waiting for S6b AAA~n", []), receive {aaa, DiaRC} -> lager:debug("Rx AAA with DiaRC=~p~n", [DiaRC]) @@ -123,4 +131,25 @@ handle_request(Packet, _SvcName, Peer) -> lager:error("S6b Rx unexpected msg from ~p: ~p~n", [Peer, Packet]), - erlang:error({unexpected, ?MODULE, ?LINE}). \ No newline at end of file + erlang:error({unexpected, ?MODULE, ?LINE}). + +%% handle_answer/4 +handle_answer(#diameter_packet{msg = Msg, errors = Errors}, Request, _SvcName, Peer) when is_record(Msg, 'ASA') -> + lager:info("S6b Rx ASA ~p: ~p/ Errors ~p ~n", [Peer, Msg, Errors]), + % Obtain Imsi from originating Request: + #'ASR'{'User-Name' = [NAI]} = Request, + Imsi = conv:nai_to_imsi(NAI), + PidRes = aaa_ue_fsm:get_pid_by_imsi(Imsi), + #'ASA'{'Result-Code' = ResultCode} = Msg, + DiaRC = #epdg_dia_rc{result_code = ResultCode}, + case conv:dia_rc_success(DiaRC) of + ok -> + aaa_ue_fsm:ev_rx_s6b_asa(PidRes, ok); + _ -> + aaa_ue_fsm:ev_rx_s6b_asa(PidRes, {error, DiaRC}) + end, + {ok, Msg}; + +handle_answer(#diameter_packet{msg = Msg, errors = []}, _Request, _SvcName, Peer) -> + lager:notice("S6b Rx unexpected ~p: ~p~n", [Peer, Msg]), + {ok, Msg}. \ No newline at end of file diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index 2e39048..db06e30 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -14,8 +14,8 @@ -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]). --export([auth_response/2, auth_compl_response/2, session_termination_answer/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]). -define(SERVER, ?MODULE). @@ -38,6 +38,9 @@ session_termination_answer(Imsi, Result) -> _Result = gen_server:call(?SERVER, {sta, Imsi, Result}). +tx_as_request(Imsi) -> + _result = gen_server:call(?SERVER, {asr, Imsi}). + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Rx from emulated SWm wire: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -50,6 +53,9 @@ session_termination_request(Imsi) -> gen_server:cast(?SERVER, {str, Imsi}). +abort_session_answer(Imsi) -> + gen_server:cast(?SERVER, {asa, Imsi}). + 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); @@ -85,6 +91,15 @@ end, {noreply, State}; +handle_cast({asa, Imsi}, State) -> + case aaa_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + aaa_ue_fsm:ev_rx_swm_asa(Pid); + undefined -> + ok + end, + {noreply, State}; + handle_cast(Info, S) -> error_logger:error_report(["unknown handle_cast", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. @@ -105,6 +120,10 @@ epdg_diameter_swm:session_termination_answer(Imsi, DiaRC), {reply, ok, State}; +handle_call({asr, Imsi}, _From, State) -> + epdg_diameter_swm:abort_session_request(Imsi), + {reply, ok, State}; + handle_call(Request, From, S) -> error_logger:error_report(["unknown handle_call", {module, ?MODULE}, {request, Request}, {from, From}, {state, S}]), {noreply, S}. diff --git a/src/aaa_diameter_swx_cb.erl b/src/aaa_diameter_swx_cb.erl index 4936c24..5f5b72f 100644 --- a/src/aaa_diameter_swx_cb.erl +++ b/src/aaa_diameter_swx_cb.erl @@ -78,16 +78,25 @@ 'Vendor-Specific-Application-Id' = VendorAppId, 'Auth-Session-State' = AuthSessState, 'User-Name' = Imsi, - 'Deregistration-Reason' = _DeregReason} = Req, + 'Deregistration-Reason' = DeregReason} = Req, case aaa_ue_fsm:get_pid_by_imsi(Imsi) of Pid when is_pid(Pid) -> - aaa_ue_fsm:stop(Pid), + case DeregReason of + #'Deregistration-Reason'{'Reason-Code' = ?'REASON-CODE_PERMANENT_TERMINATION'} -> + case aaa_ue_fsm:ev_rx_swx_rtr(Pid) of + {error, _} -> aaa_ue_fsm:stop(Pid); + _ -> ok + end; + _ -> + aaa_ue_fsm:stop(Pid) + end, Res = 2001, %% Success ERes = []; undefined -> Res = [], %% TS 29.229 6.2.2.1 DIAMETER_ERROR_USER_UNKNOWN - ERes = #'Experimental-Result'{'Vendor-Id' = ?VENDOR_ID_3GPP, 'Experimental-Result-Code' = 5001} + ERes = #'Experimental-Result'{'Vendor-Id' = ?VENDOR_ID_3GPP, + 'Experimental-Result-Code' = 5001} end, Resp = #'RTA'{'Session-Id' = SessionId, 'Vendor-Specific-Application-Id' = VendorAppId, @@ -109,7 +118,7 @@ #'MAA'{'Result-Code' = ResultCodeOpt, 'Experimental-Result' = ExperimentalResultOpt} = Msg, DiaRC = parse_epdg_dia_rc(ResultCodeOpt, ExperimentalResultOpt), - case dia_rc_success(DiaRC) of + case conv:dia_rc_success(DiaRC) of ok -> #'MAA'{'SIP-Auth-Data-Item' = SipAuthTuples} = Msg, AuthTuples = lists:map(fun dia_sip2epdg_auth_tuple/1, SipAuthTuples), @@ -127,7 +136,7 @@ #'SAA'{'Result-Code' = ResultCodeOpt, 'Experimental-Result' = ExperimentalResultOpt} = Msg, DiaRC = parse_epdg_dia_rc(ResultCodeOpt, ExperimentalResultOpt), - case dia_rc_success(DiaRC) of + case conv:dia_rc_success(DiaRC) of ok -> #'SAA'{'Non-3GPP-User-Data' = N3UA} = Msg, PGWAddresses = parse_pgw_addr_from_N3UA(N3UA), @@ -165,10 +174,6 @@ %% Internal Function Definitions %% ------------------------------------------------------------------ -dia_rc_success(#epdg_dia_rc{result_code = 2001}) -> ok; -dia_rc_success(#epdg_dia_rc{result_code = 2002}) -> ok; -dia_rc_success(_) -> invalid_result_code. - parse_epdg_dia_rc([], []) -> #epdg_dia_rc{vendor_id = undefined, result_code = 2001 }; parse_epdg_dia_rc([ResultCode], []) -> diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index 52057ba..907d8df 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -42,12 +42,23 @@ -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_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]). +-export([ev_swm_auth_req/2, ev_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, + state_wait_swx_maa/3, + state_wait_swx_saa/3, + state_authenticated/3, + state_authenticated_wait_swx_saa/3, + state_dereg_net_initiated_wait_s6b_asa/3, + state_dereg_net_initiated_wait_swm_asa/3]). + +-define(TIMEOUT_VAL_WAIT_S6b_ANSWER, 10000). +-define(TIMEOUT_VAL_WAIT_SWm_ANSWER, 10000). -record(ue_fsm_data, { - imsi = unknown :: string(), + imsi :: string(), + nai :: string(), apn :: string(), epdg_sess_active = false :: boolean(), pgw_sess_active = false :: boolean(), @@ -102,6 +113,15 @@ {error, Err} end. +ev_rx_swm_asa(Pid) -> + lager:info("ue_fsm ev_rx_swm_asa~n", []), + try + gen_statem:call(Pid, rx_swm_asa) + catch + exit:Err -> + {error, Err} + end. + ev_rx_swx_maa(Pid, Result) -> lager:info("ue_fsm ev_rx_swx_maa~n", []), try @@ -120,10 +140,28 @@ {error, Err} end. -ev_rx_s6b_aar(Pid, {Apn, AgentInfoOpt}) -> - lager:info("ue_fsm ev_rx_s6b_aar: ~p ~p~n", [Apn, AgentInfoOpt]), +ev_rx_swx_rtr(Pid) -> + lager:info("ue_fsm ev_rx_swx_rtr~n", []), try - gen_statem:call(Pid, {rx_s6b_aar, Apn, AgentInfoOpt}) + gen_statem:call(Pid, rx_swx_rtr) + catch + exit:Err -> + {error, Err} + end. + +ev_rx_s6b_aar(Pid, {NAI, Apn, AgentInfoOpt}) -> + lager:info("ue_fsm ev_rx_s6b_aar: ~p ~p ~p~n", [NAI, Apn, AgentInfoOpt]), + try + gen_statem:call(Pid, {rx_s6b_aar, NAI, Apn, AgentInfoOpt}) + catch + exit:Err -> + {error, Err} + end. + +ev_rx_s6b_asa(Pid, Result) -> + lager:info("ue_fsm ev_rx_s6b_asa: ~p~n", [Result]), + try + gen_statem:call(Pid, {rx_s6b_asa, Result}) catch exit:Err -> {error, Err} @@ -206,12 +244,12 @@ Data1 = Data#ue_fsm_data{epdg_sess_active = true}, {keep_state, Data1}; -state_authenticated({call, {Pid, _Tag} = From}, {rx_s6b_aar, Apn, AgentInfoOpt}, Data) -> - lager:info("ue_fsm state_authenticated event=rx_s6b_aar Apn=~p AgentInfo=~p, ~p~n", [Apn, AgentInfoOpt, Data]), +state_authenticated({call, {Pid, _Tag} = From}, {rx_s6b_aar, NAI, Apn, AgentInfoOpt}, Data) -> + lager:info("ue_fsm state_authenticated event=rx_s6b_aar NAI=~p Apn=~p AgentInfo=~p, ~p~n", [NAI, Apn, AgentInfoOpt, Data]), case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_PGW_UPDATE', Apn, AgentInfoOpt) of - ok -> Data1 = Data#ue_fsm_data{s6b_resp_pid = Pid, apn = Apn}, + ok -> Data1 = Data#ue_fsm_data{s6b_resp_pid = Pid, nai = NAI, apn = Apn}, {next_state, state_authenticated_wait_swx_saa, Data1, [{reply,From,ok}]}; {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} end; @@ -223,7 +261,7 @@ DiaRC = 5002, %% UNKNOWN_SESSION_ID {keep_state, Data, [{reply,From,{error, DiaRC}}]}; {true, true} -> %% The other session is still active, no need to send SAR Type=USER_DEREGISTRATION - lager:info("ue_fsm state_authenticated event=rx_swn_str: PGW session still active, skip updating the HSS~n", []), + lager:info("ue_fsm state_authenticated event=rx_swm_str: PGW session still active, skip updating the HSS~n", []), Data1 = Data#ue_fsm_data{epdg_sess_active = false}, {keep_state, Data1, [{reply,From,{ok, 2001}}]}; {true, false} -> %% All sessions will now be gone, trigger SAR Type=USER_DEREGISTRATION @@ -264,6 +302,13 @@ lager:info("ue_fsm state_authenticated event=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) -> + 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 + {true, _} -> {next_state, state_dereg_net_initiated_wait_s6b_asa, Data, [{reply,From,ok}]}; + {false, _} -> {next_state, state_dereg_net_initiated_wait_s6b_asa, Data, [{reply,From,ok}]} %% TODO: proper state for s6b + end; + state_authenticated({call, From}, Ev, Data) -> lager:info("ue_fsm state_authenticated: Unexpected call event ~p, ~p~n", [Ev, Data]), {keep_state, Data, [{reply,From,ok}]}. @@ -293,4 +338,36 @@ Data1 = Data#ue_fsm_data{pgw_sess_active = false, s6b_resp_pid = undefined}, {next_state, state_new, Data1, [{reply,From,ok}]} end - end. \ No newline at end of file + end. + +%% 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}}; + +state_dereg_net_initiated_wait_s6b_asa({call, From}, {rx_s6b_asa, _Result}, Data) -> + {next_state, state_dereg_net_initiated_wait_swm_asa, Data, [{reply,From,ok}]}; + +state_dereg_net_initiated_wait_s6b_asa({call, From}, Ev, Data) -> + lager:notice("ue_fsm state_dereg_net_initiated_wait_s6b_asa: Unexpected call event ~p, ~p~n", [Ev, Data]), + {keep_state, Data, [{reply,From,ok}]}; + +state_dereg_net_initiated_wait_s6b_asa(state_timeout, s6b_asa_timeout, Data) -> + {next_state, state_dereg_net_initiated_wait_swm_asa, Data}. + +%% 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}}; + +state_dereg_net_initiated_wait_swm_asa({call, From}, rx_swm_asa, Data) -> + {stop_and_reply, normal, [{reply,From,ok}], Data}; + +state_dereg_net_initiated_wait_swm_asa({call, From}, Ev, Data) -> + lager:notice("ue_fsm state_dereg_net_initiated_wait_swm_asa: Unexpected call event ~p, ~p~n", [Ev, Data]), + {keep_state, Data, [{reply,From,ok}]}; + +state_dereg_net_initiated_wait_swm_asa(state_timeout, swm_asa_timeout, _Data) -> + {stop, normal}. diff --git a/src/conv.erl b/src/conv.erl index 1a15a3c..0c08a4d 100644 --- a/src/conv.erl +++ b/src/conv.erl @@ -40,7 +40,7 @@ -export([ip_to_bin/1, bin_to_ip/1]). -export([cause_gtp2gsup/1]). --export([dia_rc_to_gsup_cause/1]). +-export([dia_rc_success/1, dia_rc_to_gsup_cause/1]). -export([gtp2_paa_to_epdg_eua/1, epdg_eua_to_gsup_pdp_address/1]). -export([nai_to_imsi/1]). @@ -92,6 +92,10 @@ -define(DIAMETER_ERROR_EQUIPMENT_UNKNOWN, 5422). -define(DIAMETER_ERROR_UNKOWN_SERVING_NODE, 5423). +dia_rc_success(#epdg_dia_rc{result_code = 2001}) -> ok; +dia_rc_success(#epdg_dia_rc{result_code = 2002}) -> ok; +dia_rc_success(_) -> invalid_result_code. + -spec dia_rc_to_gsup_cause(#epdg_dia_rc{}) -> non_neg_integer(). dia_rc_to_gsup_cause(#epdg_dia_rc{result_code = 2001}) -> 0; dia_rc_to_gsup_cause(#epdg_dia_rc{result_code = 2002}) -> 0; diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index c2babe3..ef70b9c 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -19,8 +19,10 @@ -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]). --export([auth_response/2, auth_compl_response/2, session_termination_answer/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]). -define(SERVER, ?MODULE). @@ -72,6 +74,17 @@ _ -> Result end. +% 3GPP TS 29.273 7.1.2.4 +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}), + case Result of + {ok, _Mar} -> + ok; + _ -> Result + end. + 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), @@ -98,6 +111,17 @@ undefined -> Reply = {error,unknown_imsi} end, + {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:abort_session_answer(Imsi); + undefined -> + Reply = {error,unknown_imsi} + end, {reply, Reply, State}. handle_cast({epdg_auth_resp, Imsi, Result}, State) -> @@ -130,6 +154,16 @@ 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); + undefined -> + error_logger:error_report(["unknown swm_session", {module, ?MODULE}, {imsi, Imsi}, {state, State}]) + end, + {noreply, State}; + handle_cast(Info, S) -> error_logger:error_report(["unknown handle_cast", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. @@ -160,6 +194,10 @@ session_termination_answer(Imsi, Result) -> ok = gen_server:cast(?SERVER, {sta, Imsi, Result}). +% Rx SWm Diameter ASR: +abort_session_request(Imsi) -> + ok = gen_server:cast(?SERVER, {asr, Imsi}). + %% ------------------------------------------------------------------ %% Internal Function Definitions %% ------------------------------------------------------------------ diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index a422bea..e49f9ab 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -42,14 +42,25 @@ -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([auth_request/2, lu_request/1, tunnel_request/2, purge_ms_request/1]). --export([received_swm_auth_response/2, received_swm_auth_compl_response/2, received_swm_session_termination_answer/2]). +-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, + 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, state_wait_auth_resp/3, state_authenticating/3, state_authenticated/3, - state_wait_create_session_resp/3, state_wait_delete_session_resp/3, - state_wait_swm_session_termination_answer/3, state_active/3]). +-export([state_new/3, + state_wait_auth_resp/3, + state_authenticating/3, + state_authenticated/3, + state_wait_create_session_resp/3, + state_active/3, + state_wait_swm_session_termination_answer/3, + state_wait_delete_session_resp/3, + state_dereg_pgw_initiated_wait_cancel_location_res/3, + state_dereg_net_initiated_wait_cancel_location_res/3, + state_dereg_net_initiated_wait_s2b_delete_session_resp/3]). -define(TIMEOUT_VAL_WAIT_GTP_ANSWER, 10000). +-define(TIMEOUT_VAL_WAIT_GSUP_ANSWER, 10000). -record(ue_fsm_data, { imsi, @@ -117,6 +128,15 @@ {error, Err} end. +cancel_location_result(Pid) -> + lager:info("ue_fsm cancel_location_result~n", []), + try + gen_statem:call(Pid, cancel_location_result) + catch + exit:Err -> + {error, Err} + end. + received_swm_auth_response(Pid, Result) -> lager:info("ue_fsm received_swm_auth_response ~p~n", [Result]), try @@ -144,6 +164,15 @@ {error, Err} end. +received_swm_abort_session_request(Pid) -> + lager:info("ue_fsm received_swm_abort_session_request~n", []), + try + gen_statem:call(Pid, received_swm_asr) + catch + exit:Err -> + {error, Err} + end. + received_gtpc_create_session_response(Pid, Result) -> lager:info("ue_fsm received_gtpc_create_session_response ~p~n", [Result]), try @@ -202,6 +231,10 @@ end, ok. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_new: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_new(enter, _OldState, Data) -> {keep_state, Data}; @@ -213,6 +246,10 @@ lager:info("ue_fsm state_new event=purge_ms_request, ~p~n", [Data]), {stop_and_reply, purge_ms_request, [{reply,From,ok}], Data}. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_wait_auth_resp: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_wait_auth_resp(enter, _OldState, Data) -> {keep_state, Data}; @@ -230,6 +267,10 @@ {next_state, state_new, Data, [{reply,From,{error,unknown}}]} end. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_authenticating: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_authenticating(enter, _OldState, Data) -> {keep_state, Data}; @@ -267,6 +308,10 @@ {next_state, state_new, Data, [{reply,From,ok}]} end. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_authenticated: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_authenticated(enter, _OldState, Data) -> {keep_state, Data}; @@ -289,9 +334,8 @@ state_authenticated({call, From}, received_gtpc_delete_bearer_request, Data) -> lager:info("ue_fsm state_authenticated event=received_gtpc_delete_bearer_request, ~p~n", [Data]), - gsup_server:cancel_location_request(Data#ue_fsm_data.imsi), Data1 = Data#ue_fsm_data{tear_down_gsup_needed = false}, - {next_state, state_wait_swm_session_termination_answer, Data1, [{reply,From,ok}]}; + {next_state, state_dereg_pgw_initiated_wait_cancel_location_res, Data1, [{reply,From,ok}]}; state_authenticated({call, From}, Event, Data) -> lager:error("ue_fsm state_authenticated: Unexpected call event ~p, ~p~n", [Event, Data]), @@ -301,6 +345,10 @@ lager:error("ue_fsm state_authenticated: Unexpected cast event ~p, ~p~n", [Event, Data]), {keep_state, Data}. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_wait_create_session_resp: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_wait_create_session_resp(enter, _OldState, Data) -> {keep_state, Data, [{state_timeout,?TIMEOUT_VAL_WAIT_GTP_ANSWER,create_session_timeout}]}; @@ -335,6 +383,10 @@ gsup_server:tunnel_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_CONGESTION}), {next_state, state_authenticated, Data}. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_active: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_active(enter, _OldState, Data) -> {keep_state, Data}; @@ -356,9 +408,15 @@ state_active({call, From}, received_gtpc_delete_bearer_request, Data) -> lager:info("ue_fsm state_active event=received_gtpc_delete_bearer_request, ~p~n", [Data]), gtp_u_tun:delete_pdp_context(Data#ue_fsm_data.tun_pdp_ctx), - gsup_server:cancel_location_request(Data#ue_fsm_data.imsi), Data1 = Data#ue_fsm_data{tun_pdp_ctx = undefined, tear_down_gsup_needed = false}, - {next_state, state_wait_swm_session_termination_answer, Data1, [{reply,From,ok}]}; + {next_state, state_dereg_pgw_initiated_wait_cancel_location_res, Data1, [{reply,From,ok}]}; + +%%% network (HSS/AAA) initiated de-registation requested: +state_active({call, From}, received_swm_asr, Data) -> + lager:info("ue_fsm state_active event=received_swm_asr, ~p~n", [Data]), + gtp_u_tun:delete_pdp_context(Data#ue_fsm_data.tun_pdp_ctx), + Data1 = Data#ue_fsm_data{tun_pdp_ctx = undefined, tear_down_gsup_needed = false}, + {next_state, state_dereg_net_initiated_wait_cancel_location_res, Data1, [{reply,From,ok}]}; state_active({call, From}, Event, Data) -> lager:error("ue_fsm state_active: Unexpected call event ~p, ~p~n", [Event, Data]), @@ -368,6 +426,10 @@ lager:error("ue_fsm state_active: Unexpected cast event ~p, ~p~n", [Event, Data]), {keep_state, Data}. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_wait_delete_session_resp: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_wait_delete_session_resp(enter, _OldState, Data) -> {keep_state, Data}; @@ -388,6 +450,36 @@ lager:error("ue_fsm state_wait_delete_session_resp: Unexpected call event ~p, ~p~n", [Event, Data]), {keep_state, Data, [{reply,From,{error,unexpected_event}}]}. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_dereg_pgw_initiated_wait_cancel_location_res: +%% Network (PGW) initiated de-registration: We trigger GSUP Cancel Location Req. +%% Wait for GSUP Cancel Location Result. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +state_dereg_pgw_initiated_wait_cancel_location_res(enter, _OldState, Data) -> + case gsup_server:cancel_location_request(Data#ue_fsm_data.imsi) of + ok -> + {keep_state, Data, {state_timeout,?TIMEOUT_VAL_WAIT_GSUP_ANSWER,gsup_cancel_location_timeout}}; + {error, _Err} -> + {next_state, state_wait_swm_session_termination_answer, Data} + end; + +state_dereg_pgw_initiated_wait_cancel_location_res({call, From}, cancel_location_result, Data) -> + lager:info("ue_fsm state_dereg_pgw_initiated_wait_cancel_location_res event=cancel_location_result, ~p~n", [Data]), + {next_state, state_wait_swm_session_termination_answer, Data, [{reply,From,ok}]}; + +state_dereg_pgw_initiated_wait_cancel_location_res({call, From}, Event, Data) -> + lager:error("ue_fsm state_dereg_pgw_initiated_wait_cancel_location_res: Unexpected call event ~p, ~p~n", [Event, Data]), + {keep_state, Data, [{reply,From,ok}]}; + + +state_dereg_pgw_initiated_wait_cancel_location_res(state_timeout, gsup_cancel_location_timeout, Data) -> + lager:error("ue_fsm state_dereg_pgw_initiated_wait_cancel_location_res: Timeout ~p, ~p~n", [s2b_delete_session_timeout, Data]), + {next_state, state_wait_swm_session_termination_answer, Data}. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_wait_swm_session_termination_answer: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_wait_swm_session_termination_answer(enter, _OldState, Data) -> % Send STR towards AAA-Server % % 3GPP TS 29.273 7.1.2.3 @@ -416,5 +508,64 @@ {stop_and_reply, normal, [{reply,From,ok}], Data}; state_wait_swm_session_termination_answer({call, From}, Event, Data) -> - lager:error("ue_fsm state_wait_delete_session_resp: Unexpected call event ~p, ~p~n", [Event, Data]), + lager:error("ue_fsm state_wait_swm_session_termination_answer: Unexpected call event ~p, ~p~n", [Event, Data]), {keep_state, Data, [{reply,From,{error,unexpected_event}}]}. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_dereg_net_initiated_wait_cancel_location_res: +%% Network (AAA/HSS) initiated de-registration: We trigger GSUP Cancel Location Req. +%% Wait for GSUP Cancel Location Result, then continue to tear down S2b session. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +state_dereg_net_initiated_wait_cancel_location_res(enter, _OldState, Data) -> + case gsup_server:cancel_location_request(Data#ue_fsm_data.imsi, ?GSUP_CANCELLATION_TYPE_WITHDRAW) of + ok -> + {keep_state, Data, {state_timeout,?TIMEOUT_VAL_WAIT_GSUP_ANSWER,gsup_cancel_location_timeout}}; + {error, _Err} -> + {next_state, state_dereg_net_initiated_wait_s2b_delete_session_resp, Data} + end; + +state_dereg_net_initiated_wait_cancel_location_res({call, From}, cancel_location_result, Data) -> + lager:info("ue_fsm state_dereg_net_initiated_wait_cancel_location_res event=cancel_location_result, ~p~n", [Data]), + {next_state, state_dereg_net_initiated_wait_s2b_delete_session_resp, Data, [{reply,From,ok}]}; + +state_dereg_net_initiated_wait_cancel_location_res({call, From}, Event, Data) -> + lager:error("ue_fsm state_dereg_net_initiated_wait_cancel_location_res: Unexpected call event ~p, ~p~n", [Event, Data]), + {keep_state, Data, [{reply,From,ok}]}; + + +state_dereg_net_initiated_wait_cancel_location_res(state_timeout, gsup_cancel_location_timeout, Data) -> + lager:error("ue_fsm state_dereg_net_initiated_wait_cancel_location_res: Timeout ~p, ~p~n", [s2b_delete_session_timeout, Data]), + {next_state, state_dereg_net_initiated_wait_s2b_delete_session_resp, Data}. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_dereg_net_initiated_wait_s2b_delete_session_resp: +%% Network (AAA/HSS) initiated de-registration: We have informed UE (GSUP), and +%% have triggered GTPCv1 Delete Session Req against PGW. +%% Wait for GTPCv1 Delete Session Response, ssend SWm ASA to AAAA and terminate FSM. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +state_dereg_net_initiated_wait_s2b_delete_session_resp(enter, _OldState, Data) -> + case epdg_gtpc_s2b:delete_session_req(Data#ue_fsm_data.imsi) of + 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), + {stop, {error,Err}} + end; + +state_dereg_net_initiated_wait_s2b_delete_session_resp({call, From}, {received_gtpc_delete_session_response, _Resp = #gtp{version = v2, type = delete_session_response, ie = IEs}}, Data) -> + lager:info("ue_fsm state_dereg_net_initiated_wait_s2b_delete_session_resp event=received_gtpc_delete_session_response, ~p~n", [Data]), + #{{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), + {stop_and_reply, normal, [{reply,From,ok}], Data}; + +state_dereg_net_initiated_wait_s2b_delete_session_resp({call, From}, Event, Data) -> + lager:error("ue_fsm state_dereg_net_initiated_wait_s2b_delete_session_resp: Unexpected call event ~p, ~p~n", [Event, Data]), + {keep_state, Data, [{reply,From,ok}]}; + + +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), + {stop, normal}. diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 8a62df6..1a2579c 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -56,7 +56,11 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). --export([auth_response/2, lu_response/2, tunnel_response/2, purge_ms_response/2, cancel_location_request/1]). +-export([auth_response/2, + lu_response/2, + tunnel_response/2, + purge_ms_response/2, + cancel_location_request/1, cancel_location_request/2]). % TODO: -spec dia_sip2gsup(#epdg_auth_tuple{}) -> map(). epdg_auth_tuple2gsup(#epdg_auth_tuple{rand = Rand, autn = Autn, res = Res, ck = Ck, ik = Ik}) -> @@ -196,12 +200,17 @@ {noreply, State}; % Our GSUP CEAI implementation for "IKEv2 Information Delete Request" -handle_cast({cancel_location_request, Imsi}, State) -> +handle_cast({cancel_location_request, Imsi, CancelType}, State) -> lager:info("cancel_location_request for ~p~n", [Imsi]), Socket = State#gsups_state.socket, - Resp = #{message_type => location_cancellation_req, - imsi => Imsi + Resp0 = #{message_type => location_cancellation_req, + imsi => Imsi, + cn_domain => ?GSUP_CN_DOMAIN_PS }, + case CancelType of + undefined -> Resp = Resp0; + _ -> Resp = maps:put(cancellation_type, CancelType, Resp0) + end, tx_gsup(Socket, Resp), {noreply, State}; @@ -260,8 +269,10 @@ % Our GSUP CEAI implementation for "IKEv2 Information Delete Request" cancel_location_request(Imsi) -> - lager:info("cancel_location_request(~p)~n", [Imsi]), - gen_server:cast(?SERVER, {cancel_location_request, Imsi}). + cancel_location_request(Imsi, undefined). +cancel_location_request(Imsi, CancelType) -> + lager:info("cancel_location_request(~p, ~p)~n", [Imsi, CancelType]), + gen_server:cast(?SERVER, {cancel_location_request, Imsi, CancelType}). %% ------------------------------------------------------------------ %% Internal Function Definitions @@ -388,7 +399,8 @@ % Our GSUP CEAI implementation for "IKEv2 Information Delete Response". rx_gsup(_Socket, _GsupMsgRx = #{message_type := location_cancellation_res, imsi := Imsi}, State) -> case epdg_ue_fsm:get_pid_by_imsi(Imsi) of - Pid when is_pid(Pid) -> epdg_ue_fsm:stop(Pid); + Pid when is_pid(Pid) -> + epdg_ue_fsm:cancel_location_result(Pid); undefined -> State end, {noreply, State}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?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: I57f2e02dc4034b63c118e4a4139b2830e38a2138 Gerrit-Change-Number: 36262 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[L] Change in ...osmo-epdg[master]: Implement RTR Deregistration-Reason PERMANENT_TERMINATION
by pespin 14 Mar '24

14 Mar '24

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?usp=email ) Change subject: Implement RTR Deregistration-Reason PERMANENT_TERMINATION ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?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: I57f2e02dc4034b63c118e4a4139b2830e38a2138 Gerrit-Change-Number: 36262 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 14 Mar 2024 22:31:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-gsm-manuals[master]: gsup: Document ePDG Tunnel Req/Res/Err
by pespin 14 Mar '24

14 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/36276?usp=email ) Change subject: gsup: Document ePDG Tunnel Req/Res/Err ...................................................................... gsup: Document ePDG Tunnel Req/Res/Err Related: OS#6091 Change-Id: I9d98d0fbb2d4d006bc980b40828ea38f358d7108 --- M common/chapters/gsup.adoc 1 file changed, 60 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index d88c579..f5cce14 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -1088,6 +1088,53 @@ |31|Session State|<<gsup-ie-session-state>>|O|TLV|3 |=== +[[gsup-msg-epdg-tunnel-req]] +==== ePDG Tunnel Request + +Direction: GSUP Client (strongswan) => GSUP Server (ePDG) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<<gsup-ie-msgtype>>|M|V|1 +|01|IMSI|<<gsup-ie-imsi>>|M|TLV|2-10 +|0a|Message Class|<<gsup-ie-message-class>>|M|TLV|3 +|15|PCO|<<gsup-ie-pco>>|O|TLV|1-... +|28|CN Domain|<<gsup-ie-cndomain>>|O|TLV|3 +|60|Source Name|<<gsup-ie-source-name>>|O|TLV|2-... +|=== + +[[gsup-msg-epdg-tunnel-err]] +==== ePDG Tunnel Error + +Direction: GSUP Server (ePDG) => GSUP Client (strongswan) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<<gsup-ie-msgtype>>|M|V|1 +|01|IMSI|<<gsup-ie-imsi>>|M|TLV|2-10 +|0a|Message Class|<<gsup-ie-message-class>>|M|TLV|3 +|02|Cause|<<gsup-ie-cause>>|M|TLV|3 +|=== + +[[gsup-msg-epdg-tunnel-res]] +==== ePDG Tunnel Result + +Direction: GSUP Server (ePDG) => GSUP Client (strongswan) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<<gsup-ie-msgtype>>|M|V|1 +|01|IMSI|<<gsup-ie-imsi>>|M|TLV|2-10 +|0a|Message Class|<<gsup-ie-message-class>>|M|TLV|3 +|04|PDP info complete|<<gsup-ie-empty>>|M|TLV|2 +|05|PDP info|<<gsup-ie-pdpinfo>>|M|TLV|2-N +|15|PCO|<<gsup-ie-pco>>|O|TLV|1-... +|28|CN Domain|<<gsup-ie-cndomain>>|O|TLV|3 +|60|Source Name|<<gsup-ie-source-name>>|O|TLV|2-... +|=== === Information Elements @@ -1145,6 +1192,9 @@ |0x47|E Close|<<gsup-msg-e-close>> |0x4B|E Abort|<<gsup-msg-e-abort>> |0x4E|E Routing Error|<<gsup-msg-e-routing-err>> +|0x50|ePDG Tunnel Request|<<gsup-msg-epdg-tunnel-req>> +|0x51|ePDG Tunnel Error|<<gsup-msg-epdg-tunnel-err>> +|0x52|ePDG Tunnel Result|<<gsup-msg-epdg-tunnel-res>> |=== The category of the message is indicated by the last two bits of the type. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/36276?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I9d98d0fbb2d4d006bc980b40828ea38f358d7108 Gerrit-Change-Number: 36276 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-abis[rel-1.5.2]: Bump version: 1.5.1.3-0eed → 1.5.2
by laforge 14 Mar '24

14 Mar '24

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36283?usp=email ) Change subject: Bump version: 1.5.1.3-0eed → 1.5.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36283?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.5.2 Gerrit-Change-Id: I307eac0e6d5f68e356250b1bea289645693073e4 Gerrit-Change-Number: 36283 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 22:18:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-abis[rel-1.5.2]: Fix critical bug in default TCP keepalive user timeout
by laforge 14 Mar '24

14 Mar '24

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36282?usp=email ) Change subject: Fix critical bug in default TCP keepalive user timeout ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36282?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.5.2 Gerrit-Change-Id: Idca24d3e676a45d860d9eec60dc2097d8d87f3bf Gerrit-Change-Number: 36282 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 22:18:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-abis[rel-1.5.2]: input/ipaccess: Make sure to say "TCP keepalive"
by laforge 14 Mar '24

14 Mar '24

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36281?usp=email ) Change subject: input/ipaccess: Make sure to say "TCP keepalive" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.5.2 Gerrit-Change-Id: I01cbda27eb7826eb11f44e034d746b7c39b399a4 Gerrit-Change-Number: 36281 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 22:18:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-abis[rel-1.5.2]: [cosmetic] input/ipaccess.c: We use tab indent, not spaces [wtf]
by laforge 14 Mar '24

14 Mar '24

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36280?usp=email ) Change subject: [cosmetic] input/ipaccess.c: We use tab indent, not spaces [wtf] ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.5.2 Gerrit-Change-Id: I6ba728ccf7f6d81dc42d1ff82a29b557752e80ba Gerrit-Change-Number: 36280 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 22:18:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-abis[rel-1.4.2]: Bump version: 1.4.1.3-b8a4 → 1.4.2
by laforge 14 Mar '24

14 Mar '24

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36279?usp=email ) Change subject: Bump version: 1.4.1.3-b8a4 → 1.4.2 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36279?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.4.2 Gerrit-Change-Id: I9072cd5c89d2deb0eb75f47c8fd04ad175549e41 Gerrit-Change-Number: 36279 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 22:18:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-abis[rel-1.4.2]: Fix critical bug in default TCP keepalive user timeout
by laforge 14 Mar '24

14 Mar '24

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36278?usp=email ) Change subject: Fix critical bug in default TCP keepalive user timeout ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36278?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.4.2 Gerrit-Change-Id: Idca24d3e676a45d860d9eec60dc2097d8d87f3bf Gerrit-Change-Number: 36278 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 22:18:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log