Osmocom Open Build Service

Changes of Revision 125

osmo-epdg_0.0.0.81.f2db.202402062026.dsc -> osmo-epdg_0.0.0.95.6f47.202402072026.dsc Changed

osmo-epdg_0.0.0.81.f2db.202402062026.tar.xz/.tarball-version -> osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/.tarball-version Changed

osmo-epdg_0.0.0.81.f2db.202402062026.tar.xz/build_dep.tar.gz -> osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/build_dep.tar.gz Changed

osmo-epdg_0.0.0.81.f2db.202402062026.tar.xz/debian/changelog -> osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/debian/changelog Changed

osmo-epdg_0.0.0.81.f2db.202402062026.tar.xz/debian/control -> osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/debian/control Changed

osmo-epdg_0.0.0.81.f2db.202402062026.tar.xz/src/aaa_diameter_s6b_cb.erl -> osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/aaa_diameter_s6b_cb.erl Changed

@@ -59,15 +59,15 @@
            'Auth-Request-Type' = AuthReqType,
            'User-Name' = UserName,
            'Service-Selection' = Apn} = Req,
-    Result = aaa_diameter_swm:get_ue_fsm_by_imsi(UserName),
-    case Result of
-    {ok, Pid} ->
-        ok = aaa_ue_fsm:ev_rx_s6b_aar(Pid, Apn),
+    PidRes = aaa_ue_fsm:get_pid_by_imsi(UserName),
+    case PidRes of
+    PidRes when is_pid(PidRes) ->
+        ok = aaa_ue_fsm:ev_rx_s6b_aar(PidRes, Apn),
         lager:debug("Waiting for S6b AAA~n", ),
         receive
             {aaa, ResultCode} -> lager:debug("Rx AAA with ResultCode=~p~n", ResultCode)
         end;
-    _ -> lager:error("Error looking up FSM for IMSI~n", UserName),
+    undefined -> lager:error("Error looking up FSM for IMSI~n", UserName),
          ResultCode = ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED'
     end,
     Resp = #'AAA'{'Session-Id'= SessionId,
@@ -88,10 +88,10 @@
            'Auth-Application-Id' = _AuthAppId,
            'Termination-Cause' = _TermCause,
            'User-Name' = UserName} = Req,
-    Result = aaa_diameter_swm:get_ue_fsm_by_imsi(UserName),
-    case Result of
-    {ok, Pid} ->
-        case aaa_ue_fsm:ev_rx_s6b_str(Pid) of
+    PidRes = aaa_ue_fsm:get_pid_by_imsi(UserName),
+    case PidRes of
+    PidRes when is_pid(PidRes) ->
+        case aaa_ue_fsm:ev_rx_s6b_str(PidRes) of
         ok ->
             lager:debug("Waiting for S6b STA~n", ),
             receive
@@ -104,7 +104,7 @@
         {error, _} ->
             ResultCode = ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED'
         end;
-    _ -> lager:error("Error looking up FSM for IMSI~n", UserName),
+    undefined -> lager:error("Error looking up FSM for IMSI~n", UserName),
         ResultCode = ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED'
     end,
     % 3GPP TS 29.273 9.2.2.3.2 Session-Termination-Answer (STA) Command:

osmo-epdg_0.0.0.81.f2db.202402062026.tar.xz/src/aaa_diameter_swm.erl -> osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/aaa_diameter_swm.erl Changed

@@ -12,14 +12,13 @@
 }).
 
 -record(swm_session, {
-	imsi       :: binary(),
+	imsi       :: string(),
 	pid        :: pid()
 	}).
 
 -export(start_link/0).
 -export(init/1, handle_call/3, handle_cast/2, handle_info/2).
 -export(code_change/3, terminate/2).
--export(get_ue_fsm_by_imsi/1).
 
 -export(auth_request/1, auth_compl_request/2, session_termination_request/1).
 -export(auth_response/2, auth_compl_response/2, session_termination_answer/2).
@@ -33,9 +32,6 @@
 	TableId = ets:new(auth_req, bag, named_table),
 	{ok, #swm_state{table_id = TableId}}.
 
-get_ue_fsm_by_imsi(Imsi) ->
-	_Result = gen_server:call(?SERVER, {get_ue_fsm_by_imsi, Imsi}).
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Tx over emulated SWm wire:
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -101,16 +97,6 @@
 	error_logger:error_report("unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}),
 	{noreply, S}.
 
-handle_call({get_ue_fsm_by_imsi, Imsi}, _From, State) ->
-	Sess = find_swm_session_by_imsi(Imsi, State),
-	lager:debug("find_swm_session_by_imsi(~p) returned ~p~n", Imsi, Sess),
-	case Sess of
-	#swm_session{} ->
-		{reply, {ok ,Sess#swm_session.pid}, State};
-	undefined ->
-		{reply, {error, imsi_unknown}, State}
-	end;
-
 handle_call({epdg_auth_resp, Imsi, Result}, _From, State) ->
 	epdg_diameter_swm:auth_response(Imsi, Result),
 	{reply, ok, State};
@@ -148,12 +134,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),

osmo-epdg_0.0.0.81.f2db.202402062026.tar.xz/src/aaa_ue_fsm.erl -> osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/aaa_ue_fsm.erl Changed

@@ -40,22 +40,31 @@
 
 -export(start_link/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/1, 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).
 
 -record(ue_fsm_data, {
-        imsi             = unknown :: binary(),
+        imsi             = unknown :: string(),
         apn                        :: string(),
         epdg_sess_active = false   :: boolean(),
         pgw_sess_active  = false   :: boolean(),
         s6b_resp_pid               :: pid()
         }).
 
+get_server_name_by_imsi(Imsi) ->
+        ServerName = lists:concat(?NAME, "_", Imsi),
+        list_to_atom(ServerName).
+
+get_pid_by_imsi(Imsi) ->
+        ServerName = get_server_name_by_imsi(Imsi),
+        whereis(ServerName).
+
 start_link(Imsi) ->
-        ServerName = lists:concat(?NAME, "_", binary_to_list(Imsi)),
+        ServerName = get_server_name_by_imsi(Imsi),
         lager:info("ue_fsm start_link(~p)~n", ServerName),
-        gen_statem:start_link({local, list_to_atom(ServerName)}, ?MODULE, Imsi, {debug, trace}).
+        gen_statem:start_link({local, ServerName}, ?MODULE, Imsi, {debug, trace}).
 
 ev_swm_auth_req(Pid) ->
         lager:info("ue_fsm ev_swm_auth_req~n", ),
@@ -186,7 +195,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 +255,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}};

osmo-epdg_0.0.0.81.f2db.202402062026.tar.xz/src/epdg_diameter_swm.erl -> osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/epdg_diameter_swm.erl Changed

@@ -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),
@@ -163,18 +169,27 @@
 
 % 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),
 	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}.

osmo-epdg_0.0.0.81.f2db.202402062026.tar.xz/src/epdg_gtpc_s2b.erl -> osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/epdg_gtpc_s2b.erl Changed

@@ -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,
@@ -217,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),
@@ -242,6 +245,31 @@
     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_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).
+
+
 update_gtp_session_from_create_session_response_ie(none, Sess) ->
     Sess;
 update_gtp_session_from_create_session_response_ie({_,
@@ -262,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}) ->
@@ -303,16 +332,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),
-            State1 = delete_gtp_session(Sess, State),
+            epdg_ue_fsm:received_gtpc_delete_bearer_request(Sess#gtp_session.pid),
+            Sess1 = gtp_session_del_bearer(Sess, Bearer),
+            State1 = update_gtp_session(Sess, Sess1, State),
             {noreply, State1}
         end;
 
@@ -328,11 +384,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,
@@ -368,10 +424,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,
@@ -382,6 +438,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},

osmo-epdg_0.0.0.81.f2db.202402062026.tar.xz/src/epdg_ue_fsm.erl -> osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/epdg_ue_fsm.erl Changed

@@ -37,24 +37,37 @@
 -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(get_server_name_by_imsi/1, get_pid_by_imsi/1).
 -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()
         }).
 
-start_link(Imsi) ->
+get_server_name_by_imsi(Imsi) ->
         ServerName = lists:concat(?NAME, "_", binary_to_list(Imsi)),
+        list_to_atom(ServerName).
+
+get_pid_by_imsi(Imsi) ->
+        ServerName = get_server_name_by_imsi(Imsi),
+        whereis(ServerName).
+
+start_link(Imsi) ->
+        ServerName = get_server_name_by_imsi(Imsi),
         lager:info("ue_fsm start_link(~p)~n", ServerName),
-        gen_statem:start_link({local, list_to_atom(ServerName)}, ?MODULE, Imsi, {debug, trace}).
+        gen_statem:start_link({local, ServerName}, ?MODULE, Imsi, {debug, trace}).
+
+stop(SrvRef) ->
+        gen_statem:stop(SrvRef).
 
 auth_request(Pid) ->
         lager:info("ue_fsm auth_request~n", ),
@@ -137,6 +150,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 +254,12 @@
         {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),
+        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}};
+
 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,35 +277,43 @@
         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),
         {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
         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}};
+        {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),

osmo-epdg_0.0.0.81.f2db.202402062026.tar.xz/src/gsup_server.erl -> osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/gsup_server.erl Changed

@@ -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,
@@ -198,9 +198,19 @@
 				}
 	end,
 	tx_gsup(Socket, Resp),
-	State1 = delete_gsups_ue(Imsi, State0),
+	State1 = delete_gsups_ue_by_imsi(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}.
@@ -224,16 +234,19 @@
 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;
-	{error, _} ->
+	ok -> State2 = State1;
+	{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,
 			 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(UE, 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
@@ -313,6 +326,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(UE, 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 +362,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
 %% ------------------------------------------------------------------
@@ -356,12 +384,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),
@@ -372,6 +401,13 @@
 		new_gsups_ue(Imsi, State)
 	end.
 
-delete_gsups_ue(Imsi, State) ->
-	SetRemoved = sets:del_element(Imsi, State#gsups_state.ues),
-	State#gsups_state{ues = SetRemoved}.
\ No newline at end of file
+delete_gsups_ue(UE, State) ->
+	SetRemoved = sets:del_element(UE, State#gsups_state.ues),
+	lager:debug("Removed UE ~p from ~p~n", UE, SetRemoved),
+	State#gsups_state{ues = SetRemoved}.
+
+delete_gsups_ue_by_imsi(Imsi, State) ->
+	case find_gsups_ue_by_imsi(Imsi, State) of
+	undefined -> State;
+	UE-> delete_gsups_ue(UE, State)
+	end.
\ No newline at end of file