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
pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35895?usp=email )
Change subject: epdg_diameter_swm: Update PID if session already exists
......................................................................
epdg_diameter_swm: Update PID if session already exists
If the FSM was recreated, during the first step it may have a different
PID. Update it so that we send the answer back to the proper PID.
Change-Id: I5e4f0ff4292c364f47d61ba629df50e8e3d35017
---
M src/epdg_diameter_swm.erl
1 file changed, 22 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl
index 57c0921..800df44 100644
--- a/src/epdg_diameter_swm.erl
+++ b/src/epdg_diameter_swm.erl
@@ -181,7 +181,15 @@
Sess = find_swm_session_by_imsi(Imsi, State),
case Sess of
#swm_session{imsi = Imsi} ->
- {Sess, State};
+ % Update Pid since it may have changed:
+ Sess1 = Sess#swm_session{pid = Pid},
+ State1 = update_swm_session(Sess, Sess1, State),
+ {Sess1, State1};
undefined ->
new_swm_session(Imsi, Pid, State)
- end.
\ No newline at end of file
+ end.
+
+update_swm_session(OldSess, NewSess, State) ->
+ SetRemoved = sets:del_element(OldSess, State#swm_state.sessions),
+ SetUpdated = sets:add_element(NewSess, SetRemoved),
+ State#swm_state{sessions = SetUpdated}.
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35895?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: I5e4f0ff4292c364f47d61ba629df50e8e3d35017
Gerrit-Change-Number: 35895
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35896?usp=email )
Change subject: epdg_ue_fsm: Introduce public function to get pid from imsi
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35896?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: Ibc4478d8d48171c302daf8aaebd037227d3e3a98
Gerrit-Change-Number: 35896
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 07 Feb 2024 16:24:37 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35894?usp=email )
Change subject: gsup_server: Fix removal of session from set
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35894?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: Iec9bce7494e3849c9e94158516f471f97182725b
Gerrit-Change-Number: 35894
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 07 Feb 2024 16:24:34 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment