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

[M] Change in ...osmo-epdg[master]: epdg: Do SWm STR+STA upon rx of Delete Bearer Req

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35864?usp=email ) Change subject: epdg: Do SWm STR+STA upon rx of Delete Bearer Req ...................................................................... epdg: Do SWm STR+STA upon rx of Delete Bearer Req Change-Id: I795d973dc472f55d18048025ef4ffe1552dfdf26 --- M src/epdg_gtpc_s2b.erl M src/epdg_ue_fsm.erl 2 files changed, 43 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index ca05d9b..349aac6 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -312,6 +312,7 @@ Sess -> Resp = gen_delete_bearer_response(Req, Sess, request_accepted, State), tx_gtp(Resp, State), + epdg_ue_fsm:received_gtpc_delete_bearer_request(Sess#gtp_session.pid), State1 = delete_gtp_session(Sess, State), {noreply, State1} end; diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 3e9d1be..350a991 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -41,13 +41,14 @@ -export([init/1,callback_mode/0,terminate/3]). -export([auth_request/1, lu_request/1, tunnel_request/1, purge_ms_request/1]). -export([received_swm_auth_response/2, received_swm_auth_compl_response/2, received_swm_session_termination_answer/2]). --export([received_gtpc_create_session_response/2, received_gtpc_delete_session_response/2]). +-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_delete_session_resp/3, state_wait_swm_session_termination_answer/3]). -record(ue_fsm_data, { imsi, apn = "internet" :: string(), + tear_down_gsup_needed = false :: boolean(), %% need to send GSUP PurgeMSResp after STR+STA? tear_down_gsup_cause = 0 :: integer() }). @@ -137,6 +138,16 @@ {error, Err} end. +received_gtpc_delete_bearer_request(Pid) -> + lager:info("ue_fsm received_gtpc_delete_bearer_request~n", []), + try + gen_statem:call(Pid, received_gtpc_delete_bearer_request) + catch + exit:Err -> + {error, Err} + end. + + %% ------------------------------------------------------------------ %% Internal helpers %% ------------------------------------------------------------------ @@ -231,6 +242,11 @@ {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} end; +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]), + Data1 = Data#ue_fsm_data{tear_down_gsup_needed = false}, + {next_state, state_wait_swm_session_termination_answer, Data1, [{reply,From,ok}]}; + state_authenticated({call, From}, _Whatever, Data) -> lager:error("ue_fsm state_authenticated: Unexpected call event, ~p~n", [Data]), {keep_state, Data, [{reply,From,ok}]}; @@ -248,11 +264,12 @@ GtpCause = gtp_utils:enum_v2_cause(CauseIE#v2_cause.v2_cause), GsupCause = conv:cause_gtp2gsup(GtpCause), lager:debug("Cause: GTP_atom=~p -> GTP_int=~p -> GSUP_int=~p~n", [CauseIE#v2_cause.v2_cause, GtpCause, GsupCause]), + Data1 = Data#ue_fsm_data{tear_down_gsup_needed = true}, case GsupCause of - 0 -> Data1 = Data; - _ -> Data1 = Data#ue_fsm_data{tear_down_gsup_cause = GsupCause} + 0 -> Data2 = Data1; + _ -> Data2 = Data1#ue_fsm_data{tear_down_gsup_cause = GsupCause} end, - {next_state, state_wait_swm_session_termination_answer, Data1, [{reply,From,ok}]}; + {next_state, state_wait_swm_session_termination_answer, Data2, [{reply,From,ok}]}; state_wait_delete_session_resp({call, From}, Event, Data) -> lager:error("ue_fsm state_wait_delete_session_resp: Unexpected call event ~p, ~p~n", [Event, Data]), @@ -265,16 +282,23 @@ case epdg_diameter_swm:session_termination_request(Data#ue_fsm_data.imsi) of ok -> {keep_state, Data}; {error, _Err} -> - gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_NET_FAIL}), + case Data#ue_fsm_data.tear_down_gsup_needed of + true -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_NET_FAIL}); + false -> ok + end, {keep_state, Data} end; state_wait_swm_session_termination_answer({call, From}, {received_swm_sta, DiaResultCode}, Data) -> lager:info("ue_fsm state_wait_swm_session_termination_answer event=received_swm_sta, ~p~n", [Data]), - case {DiaResultCode, Data#ue_fsm_data.tear_down_gsup_cause} of - {2001, 0} -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, ok); - {2001, _} -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, Data#ue_fsm_data.tear_down_gsup_cause}); - _ -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_NET_FAIL}) + case Data#ue_fsm_data.tear_down_gsup_needed of + true -> + case {DiaResultCode, Data#ue_fsm_data.tear_down_gsup_cause} of + {2001, 0} -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, ok); + {2001, _} -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, Data#ue_fsm_data.tear_down_gsup_cause}); + _ -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_NET_FAIL}) + end; + false -> ok end, {keep_state, Data, [{reply,From,ok}]}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35864?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: I795d973dc472f55d18048025ef4ffe1552dfdf26 Gerrit-Change-Number: 35864 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg: Do CEAI CancelLocationReq upon rx of S2B Delete Bearer Req

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35865?usp=email ) Change subject: epdg: Do CEAI CancelLocationReq upon rx of S2B Delete Bearer Req ...................................................................... epdg: Do CEAI CancelLocationReq upon rx of S2B Delete Bearer Req Change-Id: Iee20619902db74da4b8cec5ba767f7c5c9bb3907 --- M src/epdg_ue_fsm.erl M src/gsup_server.erl 2 files changed, 36 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 350a991..3d325a0 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -244,6 +244,7 @@ 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}]}; diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 4d50fba..8659c95 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -62,7 +62,7 @@ -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]). +-export([auth_response/2, lu_response/2, tunnel_response/2, purge_ms_response/2, cancel_location_request/1]). % TODO: -spec dia_sip2gsup('SIP-Auth-Data-Item'()) -> #'GSUPAuthTuple'{}. dia_sip2gsup(#'SIP-Auth-Data-Item'{'SIP-Authenticate' = [Authenticate], 'SIP-Authorization' = [Authorization], @@ -201,6 +201,16 @@ State1 = delete_gsups_ue(Imsi, State0), {noreply, State1}; +% Our GSUP CEAI implementation for "IKEv2 Information Delete Request" +handle_cast({cancel_location_request, Imsi}, State) -> + lager:info("cancel_location_request for ~p~n", [Imsi]), + Socket = State#gsups_state.socket, + Resp = #{message_type => location_cancellation_req, + imsi => Imsi + }, + tx_gsup(Socket, Resp), + {noreply, State}; + handle_cast(Info, S) -> error_logger:error_report(["unknown handle_cast", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. @@ -313,6 +323,16 @@ end, {noreply, State}; +% Our GSUP CEAI implementation for "IKEv2 Information Delete Response". +handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := location_cancellation_res, imsi := Imsi}}, State0) -> + lager:info("GSUP: Rx ~p~n", [GsupMsgRx]), + UE = find_gsups_ue_by_imsi(Imsi, State0), + case UE of + #gsups_ue{imsi = Imsi} -> State1 = delete_gsups_ue(Imsi, State0); + undefined -> State1 = State0 + end, + {noreply, State1}; + handle_info(Info, S) -> error_logger:error_report(["unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. @@ -339,6 +359,11 @@ lager:info("purge_ms_response(~p): ~p~n", [Imsi, Result]), gen_server:cast(?SERVER, {purge_ms_response, {Imsi, Result}}). +% Our GSUP CEAI implementation for "IKEv2 Information Delete Request" +cancel_location_request(Imsi) -> + lager:info("cancel_location_request(~p): ~p~n", [Imsi]), + gen_server:cast(?SERVER, {cancel_location_request, Imsi}). + %% ------------------------------------------------------------------ %% Internal Function Definitions %% ------------------------------------------------------------------ -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35865?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: Iee20619902db74da4b8cec5ba767f7c5c9bb3907 Gerrit-Change-Number: 35865 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: aaa_ue_fsm: S6b AAR should trigger SWx SAR with type=PGW_UPDATE

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35863?usp=email ) Change subject: aaa_ue_fsm: S6b AAR should trigger SWx SAR with type=PGW_UPDATE ...................................................................... aaa_ue_fsm: S6b AAR should trigger SWx SAR with type=PGW_UPDATE Change-Id: If0f0bfa21117c65c0ef7c831746b50eb83908778 --- M src/aaa_ue_fsm.erl 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index c043cdb..e395d58 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -186,7 +186,7 @@ state_authenticated({call, {Pid, _Tag} = From}, {rx_s6b_aar, Apn}, Data) -> lager:info("ue_fsm state_authenticated event=rx_s6b_aar Apn=~p, ~p~n", [Apn, Data]), case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, - ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_REGISTRATION', + ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_PGW_UPDATE', Apn) of ok -> Data1 = Data#ue_fsm_data{s6b_resp_pid = Pid, apn = Apn}, {next_state, state_authenticated_wait_swx_saa, Data1, [{reply,From,ok}]}; @@ -246,7 +246,7 @@ state_authenticated_wait_swx_saa({call, From}, {rx_swx_saa, SAType, ResultCode}, Data) -> lager:info("ue_fsm state_authenticated_wait_swx_saa event=rx_swx_saa SAType=~p ResulCode=~p, ~p~n", [SAType, ResultCode, Data]), case SAType of - ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_REGISTRATION' -> + ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_PGW_UPDATE' -> aaa_diameter_s6b:tx_aa_answer(Data#ue_fsm_data.s6b_resp_pid, ResultCode), Data1 = Data#ue_fsm_data{pgw_sess_active = true, s6b_resp_pid = undefined}, {next_state, state_authenticated, Data1, [{reply,From,ok}]}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35863?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: If0f0bfa21117c65c0ef7c831746b50eb83908778 Gerrit-Change-Number: 35863 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: s2b: Session can contain several bearers

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35885?usp=email ) Change subject: s2b: Session can contain several bearers ...................................................................... s2b: Session can contain several bearers Change-Id: I0ccb05a03e808122db085df73c6f0c56cec1b523 --- M src/epdg_gtpc_s2b.erl 1 file changed, 32 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 349aac6..3762ec3 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -75,7 +75,7 @@ seq_no :: 0..16#ffffffff, next_local_control_tei = 1 :: 0..16#ffffffff, next_local_data_tei = 1 :: 0..16#ffffffff, - sessions = sets:new() + sessions = sets:new() :: sets:set() }). -record(gtp_bearer, { @@ -91,7 +91,8 @@ ue_ip :: inet:ip_address(), local_control_tei = 0 :: non_neg_integer(), remote_control_tei = 0 :: non_neg_integer(), - bearer :: gtp_bearer %% FIXME: only one bearer for now + default_bearer_id :: non_neg_integer(), + bearers = sets:new() :: sets:set() }). start_link(LocalAddr, LocalPort, RemoteAddr, RemotePort, Options) -> @@ -200,7 +201,7 @@ new_gtp_session(Imsi, Pid, State) -> % TODO: find non-used local TEI inside State - Bearer = #gtp_bearer{ + DefaultBearer = #gtp_bearer{ ebi = 5, local_data_tei = State#gtp_state.next_local_data_tei }, @@ -208,7 +209,8 @@ pid = Pid, apn = ?APN, local_control_tei = State#gtp_state.next_local_control_tei, - bearer = Bearer + default_bearer_id = DefaultBearer#gtp_bearer.ebi, + bearers = sets:add_element(DefaultBearer, sets:new()) }, NewSt = State#gtp_state{next_local_control_tei = State#gtp_state.next_local_control_tei + 1, next_local_data_tei = State#gtp_state.next_local_data_tei + 1, @@ -242,6 +244,19 @@ SetRemoved = sets:del_element(Sess, State#gtp_state.sessions), State#gtp_state{sessions = SetRemoved}. +gtp_session_find_bearer_by_ebi(Sess, Ebi) -> + {Ebi, Res} = sets:fold( + fun(BearerIt = #gtp_bearer{ebi = LookupEbi}, {LookupEbi, _AccIn}) -> {LookupEbi, BearerIt}; + (_, AccIn) -> AccIn + end, + {Ebi, undefined}, + Sess#gtp_session.bearers), + Res. + +gtp_session_default_bearer(Sess) -> + gtp_session_find_bearer_by_ebi(Sess, Sess#gtp_session.default_bearer_id). + + update_gtp_session_from_create_session_response_ie(none, Sess) -> Sess; update_gtp_session_from_create_session_response_ie({_, @@ -329,11 +344,11 @@ %% 7.2.1 Create Session Request gen_create_session_request(#gtp_session{imsi = Imsi, apn = Apn, - local_control_tei = LocalCtlTEI, - bearer = Bearer}, + local_control_tei = LocalCtlTEI} = Sess, #gtp_state{laddr = LocalAddr, restart_counter = RCnt, seq_no = SeqNo}) -> + Bearer = gtp_session_default_bearer(Sess), BearersIE = [#v2_bearer_level_quality_of_service{ pci = 1, pl = 10, pvi = 0, label = 8, maximum_bit_rate_for_uplink = 0, @@ -369,10 +384,10 @@ #gtp{version = v2, type = create_session_request, tei = 0, seq_no = SeqNo, ie = IEs}. %% 7.2.9 Delete Session Request -gen_delete_session_request(#gtp_session{remote_control_tei = RemoteCtlTEI, - bearer = Bearer}, +gen_delete_session_request(#gtp_session{remote_control_tei = RemoteCtlTEI} = Sess, #gtp_state{laddr = LocalAddr, seq_no = SeqNo}) -> + Bearer = gtp_session_default_bearer(Sess), IEs = [#v2_eps_bearer_id{eps_bearer_id = Bearer#gtp_bearer.ebi}, #v2_fully_qualified_tunnel_endpoint_identifier{ instance = Bearer#gtp_bearer.ebi, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35885?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: I0ccb05a03e808122db085df73c6f0c56cec1b523 Gerrit-Change-Number: 35885 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: s2b: Answer CreateBearerReq with CreateBearerResp

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35886?usp=email ) Change subject: s2b: Answer CreateBearerReq with CreateBearerResp ...................................................................... s2b: Answer CreateBearerReq with CreateBearerResp Change-Id: I230e71661b289735c11bc7c576f7ff87bc41620d --- M src/epdg_gtpc_s2b.erl 1 file changed, 79 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 3762ec3..712e484 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -253,6 +253,18 @@ Sess#gtp_session.bearers), Res. +gtp_session_add_bearer(Sess, Bearer) -> + lager:debug("Add bearer ~p to session ~p~n", [Bearer, Sess]), + Sess#gtp_session{bearers = sets:add_element(Bearer, Sess#gtp_session.bearers)}. + +gtp_session_del_bearer(Sess, Bearer) -> + lager:debug("Remove bearer ~p from session ~p~n", [Bearer, Sess]), + Sess1 = Sess#gtp_session{bearers = sets:del_element(Bearer, Sess#gtp_session.bearers)}, + case Sess1#gtp_session.default_bearer_id of + Ebi when Ebi == Bearer#gtp_bearer.ebi -> Sess1#gtp_session{default_bearer_id = undefined}; + _ -> Sess1 + end. + gtp_session_default_bearer(Sess) -> gtp_session_find_bearer_by_ebi(Sess, Sess#gtp_session.default_bearer_id). @@ -318,17 +330,43 @@ {noreply, State1} end; -rx_gtp(Req = #gtp{version = v2, type = delete_bearer_request}, State) -> +rx_gtp(Req = #gtp{version = v2, type = create_bearer_request, ie = IEs}, State) -> + Sess = find_gtp_session_by_local_teic(Req#gtp.tei, State), + case Sess of + undefined -> + lager:error("Rx unknown TEI ~p: ~p~n", [Req#gtp.tei, Req]), + {noreply, State}; + Sess -> + #{{v2_bearer_context,0} := #v2_bearer_context{instance = 0, group = BearerIE}} = IEs, + #{{v2_eps_bearer_id,0} := #v2_eps_bearer_id{instance = 0, eps_bearer_id = Ebi}} = BearerIE, + #{{v2_fully_qualified_tunnel_endpoint_identifier,Ebi} := + #v2_fully_qualified_tunnel_endpoint_identifier{ + instance = Ebi, + interface_type = _Interface, + key = RemoteDataTei, ipv4 = _IP4, ipv6 = _IP6}} = BearerIE, + Sess1 = gtp_session_add_bearer(Sess, #gtp_bearer{ebi = Ebi, remote_data_tei = RemoteDataTei}), % TODO: teid + State1 = update_gtp_session(Sess, Sess1, State), + Resp = gen_create_bearer_response(Req, Sess1, request_accepted, State1), + tx_gtp(Resp, State1), + {noreply, State} + end; + +rx_gtp(Req = #gtp{version = v2, type = delete_bearer_request, ie = IEs}, State) -> Sess = find_gtp_session_by_local_teic(Req#gtp.tei, State), case Sess of undefined -> lager:error("Rx unknown TEI ~p: ~p~n", [Req#gtp.tei, Req]), {noreply, State}; Sess -> + #{{v2_cause,0} := _CauseIE, + {v2_eps_bearer_id,0} := #v2_eps_bearer_id{instance = 0, eps_bearer_id = Ebi}} = IEs, + % GtpCause = gtp_utils:enum_v2_cause(CauseIE#v2_cause.v2_cause) + Bearer = gtp_session_find_bearer_by_ebi(Sess, Ebi), Resp = gen_delete_bearer_response(Req, Sess, request_accepted, State), tx_gtp(Resp, State), epdg_ue_fsm:received_gtpc_delete_bearer_request(Sess#gtp_session.pid), - State1 = delete_gtp_session(Sess, State), + Sess1 = gtp_session_del_bearer(Sess, Bearer), + State1 = update_gtp_session(Sess, Sess1, State), {noreply, State1} end; @@ -398,6 +436,36 @@ ], #gtp{version = v2, type = delete_session_request, tei = RemoteCtlTEI, seq_no = SeqNo, ie = IEs}. +gen_create_bearer_response(Req = #gtp{version = v2, type = create_bearer_request}, + Sess = #gtp_session{remote_control_tei = RemoteCtlTEI}, + GtpCause, + #gtp_state{laddr = LocalAddr, + restart_counter = RCnt}) -> + Bearer = gtp_session_default_bearer(Sess), + BearersIE = [#v2_bearer_level_quality_of_service{ + pci = 1, pl = 10, pvi = 0, label = 8, + maximum_bit_rate_for_uplink = 0, + maximum_bit_rate_for_downlink = 0, + guaranteed_bit_rate_for_uplink = 0, + guaranteed_bit_rate_for_downlink = 0 + }, + #v2_eps_bearer_id{eps_bearer_id = Bearer#gtp_bearer.ebi}, + #v2_fully_qualified_tunnel_endpoint_identifier{ + instance = 0, + interface_type = 31, %% "S2b-U ePDG GTP-U" + key = Bearer#gtp_bearer.local_data_tei, + ipv4 = gtp_utils:ip_to_bin(LocalAddr) + } + ], + IEs = [#v2_cause{v2_cause = GtpCause}, + #v2_bearer_context{group = BearersIE}, + #v2_recovery{restart_counter = RCnt} + ], + #gtp{version = v2, + type = create_bearer_response, + tei = RemoteCtlTEI, + seq_no = Req#gtp.seq_no, + ie = IEs}. gen_delete_bearer_response(Req = #gtp{version = v2, type = delete_bearer_request}, Sess = #gtp_session{remote_control_tei = RemoteCtlTEI}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35886?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: I230e71661b289735c11bc7c576f7ff87bc41620d Gerrit-Change-Number: 35886 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Fix all sets() lookup functions

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35887?usp=email ) Change subject: Fix all sets() lookup functions ...................................................................... Fix all sets() lookup functions Previous logic was wrong, since the accumulator function was not really matching properly as the parameter was shadowed and didn't include the value from the outer function. The lookup is fixed here by passing the input lookup key (eg Imsi) as part of the default/initial value of the fold() function. Change-Id: I3a4a473b45fa54e857c2092d8d2b1e68ff9535e1 --- M src/aaa_diameter_swm.erl M src/epdg_diameter_swm.erl M src/epdg_gtpc_s2b.erl M src/gsup_server.erl 4 files changed, 47 insertions(+), 27 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index 9458383..d425ed6 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -148,12 +148,13 @@ % returns swm_session if found, undefined if not find_swm_session_by_imsi(Imsi, State) -> - sets:fold( - fun(UEsIt = #swm_session{imsi = Imsi}, _AccIn) -> UEsIt; - (_, AccIn) -> AccIn - end, - undefined, - State#swm_state.ues). + {Imsi, Res} = sets:fold( + fun(UEsIt = #swm_session{imsi = LookupImsi}, {LookupImsi, _AccIn}) -> {LookupImsi, UEsIt}; + (_, AccIn) -> AccIn + end, + {Imsi, undefined}, + State#swm_state.ues), + Res. find_or_new_swm_session(Imsi, State) -> UE = find_swm_session_by_imsi(Imsi, State), diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index bfb8f2d..2e4d738 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -163,12 +163,13 @@ % returns Sess if found, undefined it not find_swm_session_by_imsi(Imsi, State) -> - sets:fold( - fun(SessIt = #swm_session{imsi = Imsi}, _AccIn) -> SessIt; + {Imsi, Res} = sets:fold( + fun(SessIt = #swm_session{imsi = LookupImsi}, {LookupImsi, _AccIn}) -> {LookupImsi, SessIt}; (_, AccIn) -> AccIn end, - undefined, - State#swm_state.sessions). + {Imsi, undefined}, + State#swm_state.sessions), + Res. find_or_new_swm_session(Imsi, Pid, State) -> Sess = find_swm_session_by_imsi(Imsi, State), diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 712e484..bc1a076 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -219,12 +219,13 @@ % returns Sess if found, undefined it not find_gtp_session_by_imsi(Imsi, State) -> - sets:fold( - fun(SessIt = #gtp_session{imsi = Imsi}, _AccIn) -> SessIt; - (_, AccIn) -> AccIn - end, - undefined, - State#gtp_state.sessions). + {Imsi, Res} = sets:fold( + fun(SessIt = #gtp_session{imsi = LookupImsi}, {LookupImsi, _AccIn}) -> {LookupImsi, SessIt}; + (_, AccIn) -> AccIn + end, + {Imsi, undefined}, + State#gtp_state.sessions), + Res. find_or_new_gtp_session(Imsi, Pid, State) -> Sess = find_gtp_session_by_imsi(Imsi, State), @@ -289,12 +290,13 @@ % returns Sess if found, undefined it not find_gtp_session_by_local_teic(LocalControlTei, State) -> - sets:fold( - fun(SessIt = #gtp_session{local_control_tei = LocalControlTei}, _AccIn) -> SessIt; - (_, AccIn) -> AccIn + {LocalControlTei, Res} = sets:fold( + fun(SessIt = #gtp_session{local_control_tei = LookupLTEIC}, {LookupLTEIC, _AccIn}) -> {LookupLTEIC, SessIt}; + (_, AccIn) -> AccIn end, - undefined, - State#gtp_state.sessions). + {LocalControlTei, undefined}, + State#gtp_state.sessions), + Res. %% connect/2 connect(Name, {Socket, RemoteAddr, RemotePort}) -> diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 8659c95..5c536fc 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -381,12 +381,13 @@ % returns gsups_ue if found, undefined it not find_gsups_ue_by_imsi(Imsi, State) -> - sets:fold( - fun(UEsIt = #gsups_ue{imsi = Imsi}, _AccIn) -> UEsIt; - (_, AccIn) -> AccIn - end, - undefined, - State#gsups_state.ues). + {Imsi, Res} = sets:fold( + fun(SessIt = #gsups_ue{imsi = LookupImsi}, {LookupImsi, _AccIn}) -> {LookupImsi, SessIt}; + (_, AccIn) -> AccIn + end, + {Imsi, undefined}, + State#gsups_state.ues), + Res. find_or_new_gsups_ue(Imsi, State) -> UE = find_gsups_ue_by_imsi(Imsi, State), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35887?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: I3a4a473b45fa54e857c2092d8d2b1e68ff9535e1 Gerrit-Change-Number: 35887 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm: Terminate UE FSM when reciving STA from AAA-Server

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35888?usp=email ) Change subject: epdg_ue_fsm: Terminate UE FSM when reciving STA from AAA-Server ...................................................................... epdg_ue_fsm: Terminate UE FSM when reciving STA from AAA-Server Change-Id: Ib79af9f965ef2c6aa878b3bfe692e3b139bdffc3 --- M src/epdg_ue_fsm.erl 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 3d325a0..21f59da 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -277,7 +277,7 @@ {keep_state, Data, [{reply,From,{error,unexpected_event}}]}. state_wait_swm_session_termination_answer(enter, _OldState, Data) -> - % TODO: Send STR towards AAA-Server + % Send STR towards AAA-Server % % 3GPP TS 29.273 7.1.2.3 lager:info("ue_fsm state_wait_swm_session_termination_answer event=enter, ~p~n", [Data]), case epdg_diameter_swm:session_termination_request(Data#ue_fsm_data.imsi) of @@ -301,7 +301,7 @@ end; false -> ok end, - {keep_state, Data, [{reply,From,ok}]}; + {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]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35888?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: Ib79af9f965ef2c6aa878b3bfe692e3b139bdffc3 Gerrit-Change-Number: 35888 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: gsup_server: Log error if epdg_ue_fsm:auth_request() fails

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35891?usp=email ) Change subject: gsup_server: Log error if epdg_ue_fsm:auth_request() fails ...................................................................... gsup_server: Log error if epdg_ue_fsm:auth_request() fails Change-Id: Iea5cc5736d8de9d652c15d9bc12ab16833c1ae7b --- M src/gsup_server.erl 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 5c536fc..0c7a723 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -235,7 +235,8 @@ {UE, State1} = find_or_new_gsups_ue(Imsi, State0), case epdg_ue_fsm:auth_request(UE#gsups_ue.pid) of ok -> ok; - {error, _} -> + {error, Err} -> + lager:error("Auth Req for Imsi ~p failed: ~p~n", [Imsi, Err]), Resp = #{message_type => send_auth_info_err, imsi => Imsi, message_class => 5, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35891?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: Iea5cc5736d8de9d652c15d9bc12ab16833c1ae7b Gerrit-Change-Number: 35891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: AAA-Server: Convert binary Imsi coming from internal SWm to string

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35889?usp=email ) Change subject: AAA-Server: Convert binary Imsi coming from internal SWm to string ...................................................................... AAA-Server: Convert binary Imsi coming from internal SWm to string ePDG handles Imsi as binary, but since all diameter uses strings, better keep it as a string everywhere inside AAA-Server. This fixes matching and finding sessions by Imsi. Change-Id: Iba07ca02d9ca2bd6227d92b1d9c727107f37d9cd --- M src/aaa_diameter_swm.erl M src/aaa_ue_fsm.erl M src/epdg_diameter_swm.erl 3 files changed, 26 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index d425ed6..bcedcac 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -12,7 +12,7 @@ }). -record(swm_session, { - imsi :: binary(), + imsi :: string(), pid :: pid() }). diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index e395d58..52918d2 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -45,7 +45,7 @@ -export([state_new/3, state_wait_swx_maa/3, state_wait_swx_saa/3, state_authenticated/3, state_authenticated_wait_swx_saa/3]). -record(ue_fsm_data, { - imsi = unknown :: binary(), + imsi = unknown :: string(), apn :: string(), epdg_sess_active = false :: boolean(), pgw_sess_active = false :: boolean(), @@ -53,7 +53,7 @@ }). start_link(Imsi) -> - ServerName = lists:concat([?NAME, "_", binary_to_list(Imsi)]), + ServerName = lists:concat([?NAME, "_", Imsi]), lager:info("ue_fsm start_link(~p)~n", [ServerName]), gen_statem:start_link({local, list_to_atom(ServerName)}, ?MODULE, Imsi, [{debug, [trace]}]). diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index 2e4d738..57c0921 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -11,7 +11,7 @@ }). -record(swm_session, { - imsi :: binary(), + imsi :: string(), pid :: pid() }). @@ -34,7 +34,9 @@ auth_request(Imsi) -> - Result = gen_server:call(?SERVER, {epdg_auth_req, Imsi}), + % In Diameter we use Imsi as strings, as done by diameter module. + ImsiStr = binary_to_list(Imsi), + Result = gen_server:call(?SERVER, {epdg_auth_req, ImsiStr}), case Result of {ok, _Mar} -> epdg_ue_fsm:received_swm_auth_response(self(), Result), @@ -44,7 +46,9 @@ % Rx "GSUP CEAI LU Req" is our way of saying Rx "Swm Diameter-EAP REQ (DER) with EAP AVP containing successuful auth": auth_compl_request(Imsi, Apn) -> - Result = gen_server:call(?SERVER, {epdg_auth_compl_req, Imsi, Apn}), + % In Diameter we use Imsi as strings, as done by diameter module. + ImsiStr = binary_to_list(Imsi), + Result = gen_server:call(?SERVER, {epdg_auth_compl_req, ImsiStr, Apn}), case Result of {ok, _Mar} -> epdg_ue_fsm:received_swm_auth_compl_response(self(), Result), @@ -54,7 +58,9 @@ % 3GPP TS 29.273 7.1.2.3 session_termination_request(Imsi) -> - Result = gen_server:call(?SERVER, {str, Imsi}), + % In Diameter we use Imsi as strings, as done by diameter module. + ImsiStr = binary_to_list(Imsi), + Result = gen_server:call(?SERVER, {str, ImsiStr}), case Result of {ok, _Mar} -> epdg_ue_fsm:received_swm_session_terminate_answer(self(), Result), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35889?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: Iba07ca02d9ca2bd6227d92b1d9c727107f37d9cd Gerrit-Change-Number: 35889 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: gsup_server: Delete session if initial auth failed

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35892?usp=email ) Change subject: gsup_server: Delete session if initial auth failed ...................................................................... gsup_server: Delete session if initial auth failed It may be that due to a bug the previous session was kept alive and the related epdg_ue_fsm has actually already terminated. In any case, there's no use in keeping the session at this initial transaction after having created it, so simply delete it if it fails. Change-Id: Iebbab786e9647a026b2937115004747cd1883da0 --- M src/epdg_ue_fsm.erl M src/gsup_server.erl 2 files changed, 23 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 21f59da..94cf9c4 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -37,7 +37,7 @@ -include_lib("osmo_gsup/include/gsup_protocol.hrl"). -include_lib("gtplib/include/gtp_packet.hrl"). --export([start_link/1]). +-export([start_link/1, stop/1]). -export([init/1,callback_mode/0,terminate/3]). -export([auth_request/1, lu_request/1, tunnel_request/1, purge_ms_request/1]). -export([received_swm_auth_response/2, received_swm_auth_compl_response/2, received_swm_session_termination_answer/2]). @@ -57,6 +57,9 @@ lager:info("ue_fsm start_link(~p)~n", [ServerName]), gen_statem:start_link({local, list_to_atom(ServerName)}, ?MODULE, Imsi, [{debug, [trace]}]). +stop(SrvRef) -> + gen_statem:stop(SrvRef). + auth_request(Pid) -> lager:info("ue_fsm auth_request~n", []), try diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 0c7a723..fd2a8b5 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -234,7 +234,7 @@ handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, _GsupMsgRx = #{message_type := send_auth_info_req, imsi := Imsi}}, State0) -> {UE, State1} = find_or_new_gsups_ue(Imsi, State0), case epdg_ue_fsm:auth_request(UE#gsups_ue.pid) of - ok -> ok; + ok -> State2 = State1; {error, Err} -> lager:error("Auth Req for Imsi ~p failed: ~p~n", [Imsi, Err]), Resp = #{message_type => send_auth_info_err, @@ -242,9 +242,11 @@ message_class => 5, cause => ?GSUP_CAUSE_NET_FAIL }, - tx_gsup(Socket, Resp) + tx_gsup(Socket, Resp), + epdg_ue_fsm:stop(UE#gsups_ue.pid), + State2 = delete_gsups_ue(Imsi, State1) end, - {noreply, State1}; + {noreply, State2}; % location update request / when a UE wants to connect to a specific APN. This will trigger a AAA->HLR Request Server Assignment Request % FIXME: add APN instead of hardcoded internet -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35892?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: Iebbab786e9647a026b2937115004747cd1883da0 Gerrit-Change-Number: 35892 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024