- gerrit-log - lists.osmocom.org

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

13 Mar '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?usp=email ) Change subject: WIP: Implement RTR Deregistration-Reason PERMANENT_TERMINATION ...................................................................... WIP: Implement RTR Deregistration-Reason PERMANENT_TERMINATION Change-Id: I57f2e02dc4034b63c118e4a4139b2830e38a2138 --- M config/sys.config 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 9 files changed, 294 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/62/36262/1 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/src/aaa_diameter_s6b.erl b/src/aaa_diameter_s6b.erl index baf251f..c9afc37 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(Imsi) -> + gen_server:call(?SERVER, {asr, Imsi}). + +handle_call({asr, Imsi}, _From, State) -> + lager:debug("S6b Tx ASR Imsi=~p~n", [Imsi]), + 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' = Imsi, + '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..ad50e74 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]), @@ -123,4 +131,21 @@ 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]), + #'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(ok); + _ -> + aaa_ue_fsm:ev_rx_s6b_asa({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..c6fe51f 100644 --- a/src/aaa_diameter_swx_cb.erl +++ b/src/aaa_diameter_swx_cb.erl @@ -78,10 +78,18 @@ '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 -> @@ -109,7 +117,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 +135,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 +173,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..0788985 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -42,9 +42,19 @@ -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(), @@ -102,6 +112,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,6 +139,15 @@ {error, Err} end. +ev_rx_swx_rtr(Pid) -> + lager:info("ue_fsm ev_rx_swx_rtr~n", []), + try + gen_statem:call(Pid, rx_swx_rtr) + catch + exit:Err -> + {error, Err} + end. + ev_rx_s6b_aar(Pid, {Apn, AgentInfoOpt}) -> lager:info("ue_fsm ev_rx_s6b_aar: ~p ~p~n", [Apn, AgentInfoOpt]), try @@ -129,6 +157,15 @@ {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} + end. + ev_rx_s6b_str(Pid) -> lager:info("ue_fsm ev_rx_s6b_str~n", []), try @@ -223,7 +260,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 +301,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 +337,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.imsi), + {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:info("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, _Result}, Data) -> + {stop_and_reply, normal, [{reply,From,ok}], Data}; + +state_dereg_net_initiated_wait_swm_asa({call, From}, Ev, Data) -> + lager:info("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..7b565b3 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -43,11 +43,13 @@ -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([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]). + state_wait_swm_session_termination_answer/3, state_active/3, + state_dereg_net_initiated_wait_s2b_delete_session_resp/3]). -define(TIMEOUT_VAL_WAIT_GTP_ANSWER, 10000). @@ -144,6 +146,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 @@ -360,6 +371,14 @@ 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}]}; +%%% 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]), + gsup_server:cancel_location_request(Data#ue_fsm_data.imsi), + 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_s2b_delete_session_resp, Data1, [{reply,From,ok}]}; + state_active({call, From}, Event, Data) -> lager:error("ue_fsm state_active: Unexpected call event ~p, ~p~n", [Event, Data]), {keep_state, Data, [{reply,From,ok}]}; @@ -418,3 +437,36 @@ 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]), {keep_state, Data, [{reply,From,{error,unexpected_event}}]}. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% 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_wait_delete_session_resp event=state_dereg_net_initiated_wait_s2b_delete_session_resp, ~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}. -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: dequeue L1CTL {DATA,TRAFFIC}.cnf in as_l1_{sacch,dcch,tcp}_loop()
by fixeria 13 Mar '24

13 Mar '24

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36256?usp=email ) Change subject: bts: dequeue L1CTL {DATA,TRAFFIC}.cnf in as_l1_{sacch,dcch,tcp}_loop() ...................................................................... Patch Set 1: (1 comment) File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36256/comment/7553e5e4_be64… PS1, Line 2194: [] L1CTL.receive(tr_L1CTL_DATA_CONF(g_chan_nr, tr_RslLinkID_SACCH(0))) { repeat; } > Ah I see now, it's IND vs CONF. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36256?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3538d40ff1a585ccbe37f3a90f3c374c5f0b5767 Gerrit-Change-Number: 36256 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 18:18:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: library: add templates for L1CTL_{DATA,TRAFFIC}_CONF
by fixeria 13 Mar '24

13 Mar '24

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254?usp=email ) Change subject: library: add templates for L1CTL_{DATA,TRAFFIC}_CONF ...................................................................... Patch Set 1: (1 comment) File library/L1CTL_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254/comment/906940f3_5886… PS1, Line 859: template L1ctlMessage > Just adding those would have been far quicker Yes, but I would still want to understand how would this affect the validation/compilation/execution, rather than quickly (and blindly) doing what you suggested. My current understanding is that adding `(present)` to receive templates does not bring noticeable improvements. I am not convinced by your arguments, sorry. > It's a discussion like adding "static" or "const" to a variable in C In the case of `static` or `const` in C, I do see the benefits of using those keywords. And many of us could provide enough examples how `static` and/or `const` improved readability or prevented them from shooting their own legs. But here it feels more like a theoretical improvement. Out of curiosity, I even compared the resulting C++ code with and without the `(present)` in the `tr_FooBar` definition: no changes, except the `module_checksum[]`. So I am assuming that TITAN implicitly defaults to `(present)`. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I914555ac8bf2784c14e1b5564b116221ecc7b539 Gerrit-Change-Number: 36254 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 18:02:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: gsup_server: Fix format error in log line
by pespin 13 Mar '24

13 Mar '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36261?usp=email ) Change subject: gsup_server: Fix format error in log line ...................................................................... gsup_server: Fix format error in log line Change-Id: I4c724a65e49fc8bcaad7598fc07f3ddcbc9fa35f --- M src/gsup_server.erl 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/61/36261/1 diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 1e11c3e..8a62df6 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -260,7 +260,7 @@ % Our GSUP CEAI implementation for "IKEv2 Information Delete Request" cancel_location_request(Imsi) -> - lager:info("cancel_location_request(~p): ~p~n", [Imsi]), + lager:info("cancel_location_request(~p)~n", [Imsi]), gen_server:cast(?SERVER, {cancel_location_request, Imsi}). %% ------------------------------------------------------------------ -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36261?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: I4c724a65e49fc8bcaad7598fc07f3ddcbc9fa35f Gerrit-Change-Number: 36261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm: Fix order of params in stop_and_reply
by pespin 13 Mar '24

13 Mar '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36260?usp=email ) Change subject: epdg_ue_fsm: Fix order of params in stop_and_reply ...................................................................... epdg_ue_fsm: Fix order of params in stop_and_reply Change-Id: Icd058466463d215f4028d302cd45041e5627b459 --- M src/epdg_ue_fsm.erl 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/60/36260/1 diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index dbee78a..a422bea 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -179,7 +179,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 ok -> {next_state, state_wait_auth_resp, Data, [{reply,From,ok}]}; - {error, Err} -> {stop_and_reply, Err, Data, [{reply,From,{error,Err}}]} + {error, Err} -> {stop_and_reply, Err, [{reply,From,{error,Err}}], Data} end. %% ------------------------------------------------------------------ @@ -211,7 +211,7 @@ state_new({call, From}, purge_ms_request, Data) -> lager:info("ue_fsm state_new event=purge_ms_request, ~p~n", [Data]), - {stop_and_reply, purge_ms_request, Data, [{reply,From,ok}]}. + {stop_and_reply, purge_ms_request, [{reply,From,ok}], Data}. state_wait_auth_resp(enter, _OldState, Data) -> {keep_state, Data}; @@ -242,7 +242,7 @@ % 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 ok -> {keep_state, Data, [{reply,From,ok}]}; - {error, Err} -> {stop_and_reply, Err, Data, [{reply,From,{error,Err}}]} + {error, Err} -> {stop_and_reply, Err, [{reply,From,{error,Err}}], Data} end; % Rx Swm Diameter-EAP Answer (DEA) containing APN-Configuration, triggered by -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36260?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: Icd058466463d215f4028d302cd45041e5627b459 Gerrit-Change-Number: 36260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_hss_initiated_deregister_new_server_assigned
by pespin 13 Mar '24

13 Mar '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36230?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: epdg: Introduce test TC_hss_initiated_deregister_new_server_assigned ...................................................................... epdg: Introduce test TC_hss_initiated_deregister_new_server_assigned Related: OS#6042 Change-Id: Ia5bf7708d11421710f3a88669d94c4f01060cdd6 --- M epdg/EPDG_Tests.ttcn M epdg/expected-results.xml M epdg/gen_links.sh M library/DIAMETER_Templates.ttcn A library/DIAMETER_ts29_229_Templates.ttcn M library/DIAMETER_ts29_273_Templates.ttcn M pgw/gen_links.sh 7 files changed, 195 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/36230/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36230?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia5bf7708d11421710f3a88669d94c4f01060cdd6 Gerrit-Change-Number: 36230 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_hss_initiated_deregister_permanent_termination
by pespin 13 Mar '24

13 Mar '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36233?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: epdg: Introduce test TC_hss_initiated_deregister_permanent_termination ...................................................................... epdg: Introduce test TC_hss_initiated_deregister_permanent_termination Change-Id: I50daa7a04e0f19dbf987a8baba7a979a353089a3 --- M epdg/EPDG_Tests.ttcn M epdg/expected-results.xml M library/DIAMETER_Templates.ttcn M library/DIAMETER_ts29_273_Templates.ttcn 4 files changed, 146 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/36233/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36233?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I50daa7a04e0f19dbf987a8baba7a979a353089a3 Gerrit-Change-Number: 36233 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-ttcn3-hacks[master]: library: add templates for L1CTL_{DATA,TRAFFIC}_CONF
by pespin 13 Mar '24

13 Mar '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254?usp=email ) Change subject: library: add templates for L1CTL_{DATA,TRAFFIC}_CONF ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File library/L1CTL_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254/comment/a138a37e_2ecb… PS1, Line 859: template L1ctlMessage > > 1- It really is a "template (present)", it cannot be omit. […] Just adding those would have been far quicker. It's a discussion like adding "static" or "const" to a variable in C. Do as you wish. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I914555ac8bf2784c14e1b5564b116221ecc7b539 Gerrit-Change-Number: 36254 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 16:18:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-hnodeb[master]: llsk: Add APIs to interact with llsk->link
by pespin 13 Mar '24

13 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/36246?usp=email ) Change subject: llsk: Add APIs to interact with llsk->link ...................................................................... llsk: Add APIs to interact with llsk->link This also clarifies the type of available uses/features. Change-Id: I7723467d34670f89710f55c0c6731e2e38560f35 --- M include/osmocom/hnodeb/llsk.h M src/osmo-hnodeb/hnb.c M src/osmo-hnodeb/llsk.c M src/osmo-hnodeb/main.c 4 files changed, 27 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/include/osmocom/hnodeb/llsk.h b/include/osmocom/hnodeb/llsk.h index bde531a..6a2686a 100644 --- a/include/osmocom/hnodeb/llsk.h +++ b/include/osmocom/hnodeb/llsk.h @@ -30,6 +30,8 @@ struct rtp_conn; int hnb_llsk_alloc(struct hnb *hnb); +void hnb_llsk_free(struct hnb *hnb); +int hnb_llsk_start_listen(struct hnb *hnb); bool hnb_llsk_connected(const struct hnb *hnb); bool hnb_llsk_can_be_configured(struct hnb *hnb); diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c index 1d03826..ad56dcc 100644 --- a/src/osmo-hnodeb/hnb.c +++ b/src/osmo-hnodeb/hnb.c @@ -88,9 +88,7 @@ } hnb_iuh_free(hnb); - osmo_timer_del(&hnb->llsk.defer_configure_ind_timer); - osmo_prim_srv_link_free(hnb->llsk.link); - hnb->llsk.link = NULL; + hnb_llsk_free(hnb); hnb_gtp_unbind(hnb); diff --git a/src/osmo-hnodeb/llsk.c b/src/osmo-hnodeb/llsk.c index b76b595..7e25176 100644 --- a/src/osmo-hnodeb/llsk.c +++ b/src/osmo-hnodeb/llsk.c @@ -219,3 +219,15 @@ osmo_timer_setup(&hnb->llsk.defer_configure_ind_timer, llsk_defer_configure_ind_timer_cb, hnb); return 0; } + +void hnb_llsk_free(struct hnb *hnb) +{ + osmo_timer_del(&hnb->llsk.defer_configure_ind_timer); + osmo_prim_srv_link_free(hnb->llsk.link); + hnb->llsk.link = NULL; +} + +int hnb_llsk_start_listen(struct hnb *hnb) +{ + return osmo_prim_srv_link_open(g_hnb->llsk.link); +} diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index e724791..d542c06 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -275,7 +275,7 @@ } /* Start listening on lower layer unix domain socket: */ - rc = osmo_prim_srv_link_open(g_hnb->llsk.link); + rc = hnb_llsk_start_listen(g_hnb); if (rc < 0) { perror("Error opening lower layer socket"); exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/36246?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I7723467d34670f89710f55c0c6731e2e38560f35 Gerrit-Change-Number: 36246 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-hnodeb[master]: Free UE contexts when starting shutdown procedure
by pespin 13 Mar '24

13 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/36247?usp=email ) Change subject: Free UE contexts when starting shutdown procedure ...................................................................... Free UE contexts when starting shutdown procedure They are not valid anymore since the Iuh conn is closed. If kept alive, then if GTP/RTP traffic comes from CN while shutting down the payloads may be forwarded to LLSK which may have been closed (eg. because shutdown procedure was started precisely due to death LLSK because other end closed it). Related: OS#6826 Change-Id: I51aa449e7fd5b1049fcaaeef3f1378423a838c05 --- M src/osmo-hnodeb/hnb_shutdown_fsm.c 1 file changed, 23 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-hnodeb/hnb_shutdown_fsm.c b/src/osmo-hnodeb/hnb_shutdown_fsm.c index 9d7e186..c97a124 100644 --- a/src/osmo-hnodeb/hnb_shutdown_fsm.c +++ b/src/osmo-hnodeb/hnb_shutdown_fsm.c @@ -45,12 +45,18 @@ static void st_none(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct hnb *hnb = (struct hnb *)fi->priv; + struct hnb_ue *ue, *ue_tmp; + switch (event) { case HNB_SHUTDOWN_EV_START: /* TODO: here we may want to communicate to lower layers over UDsocket that we are shutting down... * TODO: Also, if Iuh link is still up, maybe send a Hnb deregister req towards HNBGW - * TODO: also signal the hnb object somehow that we are starting to shut down? */ + + /* Drop active UE contexts, together with their GTP/AUDIO sessions: */ + llist_for_each_entry_safe(ue, ue_tmp, &hnb->ue_list, list) + hnb_ue_free(ue); + if (osmo_stream_cli_is_connected(hnb->iuh.client)) osmo_stream_cli_close(hnb->iuh.client); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/36247?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I51aa449e7fd5b1049fcaaeef3f1378423a838c05 Gerrit-Change-Number: 36247 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log