Osmocom Open Build Service

osmo-epdg_0.0.0.133.d8b0.202403052026.dsc -> osmo-epdg_0.0.0.139.8506.202403062026.dsc Changed

@@ -2,15 +2,15 @@
 Source: osmo-epdg
 Binary: osmo-epdg
 Architecture: any
-Version: 0.0.0.133.d8b0.202403052026
+Version: 0.0.0.139.8506.202403062026
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Standards-Version: 4.5.0
 Build-Depends: erlang-nox, libpcap-dev, rebar3, debhelper (>= 10)
 Package-List:
  osmo-epdg deb net optional arch=any
 Checksums-Sha1:
- e6a480360f177da0a76c304b49b16aa73a1aea2c 9809004 osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz
+ 923ea15c472686b19be9a74c7f70ad296df9423e 9813484 osmo-epdg_0.0.0.139.8506.202403062026.tar.xz
 Checksums-Sha256:
- e00502d6fade2339821cc5a40fb1498ee6a701b8fb809fa2cd135be96e7752cc 9809004 osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz
+ 73be2c2fdc8d19fbc39ebb016241e85cacafe463fc2c2d0ca81952b079792080 9813484 osmo-epdg_0.0.0.139.8506.202403062026.tar.xz
 Files:
- b6d304cff3272645b7e4460dc17a58b3 9809004 osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz
+ b04f502cde6876aad69e995d047a8a83 9813484 osmo-epdg_0.0.0.139.8506.202403062026.tar.xz

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/.tarball-version -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/.tarball-version Changed

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/build_dep.tar.gz -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/build_dep.tar.gz Changed

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/debian/changelog -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/debian/changelog Changed

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/debian/control -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/debian/control Changed

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/dia/diameter_3gpp_ts29_273_swx.dia -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/dia/diameter_3gpp_ts29_273_swx.dia Changed

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/include/conv.hrl -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/include/conv.hrl Changed

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/src/aaa_diameter_s6b_cb.erl -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/src/aaa_diameter_s6b_cb.erl Changed

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/src/aaa_diameter_swm.erl -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/src/aaa_diameter_swm.erl Changed

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/src/aaa_diameter_swx.erl -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/src/aaa_diameter_swx.erl Changed

@@ -51,7 +51,7 @@
 -export(init/1, handle_call/3, handle_cast/2, handle_info/2).
 -export(code_change/3).
 -export(multimedia_auth_request/7).
--export(server_assignment_request/3).
+-export(server_assignment_request/4).
 -export(test/0, test/1).
 
 %% Diameter Application Definitions
@@ -146,9 +146,9 @@
     gen_server:call(?SERVER,
                           {mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey, PdpTypeNr}}).
 % APN is optional and should be 
-server_assignment_request(IMSI, Type, APN) ->
+server_assignment_request(IMSI, Type, APN, AgentInfoOpt) ->
     gen_server:call(?SERVER,
-                          {sar, {IMSI, Type, APN}}).
+                          {sar, {IMSI, Type, APN, AgentInfoOpt}}).
 
 result_code_success(2001) -> ok;
 result_code_success(2002) -> ok;
@@ -235,8 +235,8 @@
             {reply, {error, Err}, State}
     end;
 
-handle_call({sar, {IMSI, Type, APN}}, {Pid, _Tag} = _From, State) ->
-    lager:debug("SWx Tx SAR Imsi=~p Type=~p APN=~p~n", IMSI, Type, APN),
+handle_call({sar, {IMSI, Type, APN, AgentInfoOpt}}, {Pid, _Tag} = _From, State) ->
+    lager:debug("SWx Tx SAR Imsi=~p Type=~p APN=~p AgentInfoOpt=~p ~n", IMSI, Type, APN, AgentInfoOpt),
     SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)),
     SAR = #'SAR'{'Vendor-Specific-Application-Id' = #'Vendor-Specific-Application-Id'{
                     'Vendor-Id'           = ?VENDOR_ID_3GPP,
@@ -245,7 +245,8 @@
                  'User-Name' = IMSI,
                  'Auth-Session-State' = 1,
                  'Server-Assignment-Type' = Type,
-                 'Service-Selection' = APN
+                 'Service-Selection' = APN,
+                 'MIP6-Agent-Info' = AgentInfoOpt
                 },
     Ret = diameter_call(SAR, Pid, State),
     case Ret of

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/src/aaa_diameter_swx_cb.erl -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/src/aaa_diameter_swx_cb.erl Changed

@@ -5,6 +5,7 @@
 
 -include_lib("diameter/include/diameter.hrl").
 -include_lib("diameter_3gpp_ts29_273_swx.hrl").
+-include("conv.hrl").
 
 %% diameter callbacks
 -export(peer_up/3, peer_down/3, pick_peer/4, pick_peer/5, prepare_request/3, prepare_request/4,
@@ -69,7 +70,10 @@
 %% handle_answer/4
 handle_answer(#diameter_packet{msg = Msg, errors = Errors}, _Request, _SvcName, Peer, ReqPid) when is_record(Msg, 'MAA')  ->
     lager:info("SWx Rx MAA ~p: ~p/ Errors ~p ~n", Peer, Msg, Errors),
-    aaa_ue_fsm:ev_rx_swx_maa(ReqPid, Msg),
+    #'MAA'{'SIP-Auth-Data-Item' = SipAuthTuples} = Msg,
+    AuthTuples = lists:map(fun dia_sip2epdg_auth_tuple/1, SipAuthTuples),
+    % TODO: handle error case....
+    aaa_ue_fsm:ev_rx_swx_maa(ReqPid, {ok, AuthTuples}),
     {ok, Msg};
 handle_answer(#diameter_packet{msg = Msg, errors = Errors}, Request, _SvcName, Peer, ReqPid) when is_record(Msg, 'SAA')  ->
     lager:info("SWx Rx SAA ~p: ~p/ Errors ~p ~n", Peer, Msg, Errors),
@@ -77,7 +81,18 @@
     #'SAR'{'Server-Assignment-Type' = SAType} = Request,
     % Retrieve fields from answer:
     #'SAA'{'Result-Code' = ResultCode} = Msg,
-    aaa_ue_fsm:ev_rx_swx_saa(ReqPid, {SAType, ResultCode}),
+    case result_code_success(ResultCode) of
+    ok ->
+        #'SAA'{'Non-3GPP-User-Data' = N3UA} = Msg,
+        PGWAddresses = parse_pgw_addr_from_N3UA(N3UA),
+        case PGWAddresses of
+        undefined -> ResInfo = #{};
+        _ -> ResInfo = maps:put(pgw_address_list, PGWAddresses, #{})
+        end,
+        aaa_ue_fsm:ev_rx_swx_saa(ReqPid, {ok, SAType, ResInfo});
+    _ ->
+        aaa_ue_fsm:ev_rx_swx_saa(ReqPid, {error, SAType, ResultCode})
+    end,
     {ok, Msg}.
 handle_answer(#diameter_packet{msg = Msg, errors = }, _Request, _SvcName, Peer) ->
     lager:info("SWx Rx ~p: ~p~n", Peer, Msg),
@@ -101,3 +116,47 @@
 %% handle_request/3
 handle_request(_Packet, _SvcName, _Peer) ->
     erlang:error({unexpected, ?MODULE, ?LINE}).
+
+%% ------------------------------------------------------------------
+%% Internal Function Definitions
+%% ------------------------------------------------------------------
+
+result_code_success(2001) -> ok;
+result_code_success(2002) -> ok;
+result_code_success(_) -> invalid_result_code.
+
+dia_sip2epdg_auth_tuple(#'SIP-Auth-Data-Item'{'SIP-Authenticate' = Authenticate,
+                                              'SIP-Authorization' = Authorization,
+                                              'Confidentiality-Key' = CKey,
+                                              'Integrity-Key' = IKey}) ->
+    lager:info("dia_sip2gsup: auth ~p authz ~p ~n", Authenticate, Authorization),
+    lager:info("  rand ~p autn ~p ~n", lists:sublist(Authenticate, 1, 16), lists:sublist(Authenticate, 17, 16)),
+    #epdg_auth_tuple{
+        rand = list_to_binary(lists:sublist(Authenticate, 1, 16)),
+        autn = list_to_binary(lists:sublist(Authenticate, 17, 16)),
+        res = list_to_binary(Authorization),
+        ik = list_to_binary(IKey),
+        ck =list_to_binary(CKey)
+    }.
+
+parse_pgw_addr_from_MIP6_Agent_Info() ->
+    undefined;
+parse_pgw_addr_from_MIP6_Agent_Info(AgentInfo) ->
+    #'MIP6-Agent-Info'{'MIP-Home-Agent-Address' = AgentAddrOpt} = AgentInfo,
+    case AgentAddrOpt of
+     -> undefined;
+    Res -> Res
+    end.
+parse_pgw_addr_from_APN_Configuration() ->
+    undefined;
+parse_pgw_addr_from_APN_Configuration(Head | Tail = _ApnConfigs) ->
+    #'APN-Configuration'{'MIP6-Agent-Info' = AgentInfoOpt} = Head,
+    case parse_pgw_addr_from_MIP6_Agent_Info(AgentInfoOpt) of
+    undefined -> parse_pgw_addr_from_APN_Configuration(Tail);
+    Res -> Res
+    end.
+parse_pgw_addr_from_N3UA() ->
+    undefined;
+parse_pgw_addr_from_N3UA(N3UA) ->
+    #'Non-3GPP-User-Data'{'APN-Configuration' = ApnConfigs} = N3UA,
+    parse_pgw_addr_from_APN_Configuration(ApnConfigs).
\ No newline at end of file

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/src/aaa_ue_fsm.erl -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/src/aaa_ue_fsm.erl Changed

@@ -93,28 +93,28 @@
                 {error, Err}
         end.
 
-ev_rx_swx_maa(Pid, MAA) ->
+ev_rx_swx_maa(Pid, Result) ->
         lager:info("ue_fsm ev_rx_swx_maa~n", ),
         try
-                gen_statem:call(Pid, {rx_swx_maa, MAA})
+                gen_statem:call(Pid, {rx_swx_maa, Result})
         catch
         exit:Err ->
                 {error, Err}
         end.
 
-ev_rx_swx_saa(Pid, {SAType, ResultCode}) ->
+ev_rx_swx_saa(Pid, Result) ->
         lager:info("ue_fsm ev_rx_swx_saa~n", ),
         try
-                gen_statem:call(Pid, {rx_swx_saa, SAType, ResultCode})
+                gen_statem:call(Pid, {rx_swx_saa, Result})
         catch
         exit:Err ->
                 {error, Err}
         end.
 
-ev_rx_s6b_aar(Pid, Apn) ->
-        lager:info("ue_fsm ev_rx_s6b_aar: ~p~n", Apn),
+ev_rx_s6b_aar(Pid, {Apn, AgentInfoOpt}) ->
+        lager:info("ue_fsm ev_rx_s6b_aar: ~p ~p~n", Apn, AgentInfoOpt),
         try
-                gen_statem:call(Pid, {rx_s6b_aar, Apn})
+                gen_statem:call(Pid, {rx_s6b_aar, Apn, AgentInfoOpt})
         catch
         exit:Err ->
                 {error, Err}
@@ -164,7 +164,7 @@
 
 state_new({call, From}, {swm_auth_compl, Apn}, Data) ->
         lager:info("ue_fsm state_new event=swm_auth_compl, ~p~n", Data),
-        case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, 1, Apn) of
+        case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, 1, Apn, ) of
         ok -> {next_state, state_wait_swx_saa, Data, {reply,From,ok}};
         {error, Err} -> {keep_state, Data, {reply,From,{error, Err}}}
         end.
@@ -172,31 +172,36 @@
 state_wait_swx_maa(enter, _OldState, Data) ->
         {keep_state, Data};
 
-state_wait_swx_maa({call, From}, {rx_swx_maa, MAA}, Data) ->
+state_wait_swx_maa({call, From}, {rx_swx_maa, Result}, Data) ->
         lager:info("ue_fsm state_wait_swx_maa event=rx_swx_maa, ~p~n", Data),
-        aaa_diameter_swm:auth_response(Data#ue_fsm_data.imsi, {ok, MAA}),
+        aaa_diameter_swm:auth_response(Data#ue_fsm_data.imsi, Result),
         % TODO: don't transit if SAS returned error code.
         {next_state, state_new, Data, {reply,From,ok}}.
 
 state_wait_swx_saa(enter, _OldState, Data) ->
         {keep_state, Data};
 
-state_wait_swx_saa({call, From}, {rx_swx_saa, _SAType, ResultCode}, Data) ->
-        lager:info("ue_fsm state_wait_swx_saa event=rx_swx_saa, ~p~n", Data),
-        aaa_diameter_swm:auth_compl_response(Data#ue_fsm_data.imsi, {ok, ResultCode}),
-        % TODO: don't transit if SAS returned error code.
-        {next_state, state_authenticated, Data, {reply,From,ok}}.
+state_wait_swx_saa({call, From}, {rx_swx_saa, Result}, Data) ->
+        lager:info("ue_fsm state_wait_swx_saa event=rx_swx_saa ~p, ~p~n", Result, Data),
+        case Result of
+        {error, _SAType, ResultCode} ->
+                aaa_diameter_swm:auth_compl_response(Data#ue_fsm_data.imsi, {error, ResultCode}),
+                {next_state, state_new, Data, {reply,From,ok}};
+        {ok, _SAType, ResInfo} ->
+                aaa_diameter_swm:auth_compl_response(Data#ue_fsm_data.imsi, {ok, ResInfo}),
+                {next_state, state_authenticated, Data, {reply,From,ok}}
+        end.
 
 state_authenticated(enter, _OldState, Data) ->
         % Mark ePDG session as active:
         Data1 = Data#ue_fsm_data{epdg_sess_active = true},
         {keep_state, Data1};
 
-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),
+state_authenticated({call, {Pid, _Tag} = From}, {rx_s6b_aar, Apn, AgentInfoOpt}, Data) ->
+        lager:info("ue_fsm state_authenticated event=rx_s6b_aar Apn=~p AgentInfo=~p, ~p~n", Apn, AgentInfoOpt, Data),
         case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi,
                                                         ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_PGW_UPDATE',
-                                                        Apn) of
+                                                        Apn, AgentInfoOpt) of
         ok ->   Data1 = Data#ue_fsm_data{s6b_resp_pid = Pid, apn = Apn},
                 {next_state, state_authenticated_wait_swx_saa, Data1, {reply,From,ok}};
         {error, Err} -> {keep_state, Data, {reply,From,{error, Err}}}
@@ -215,7 +220,7 @@
         {true, false} -> %% All sessions will now be gone, trigger SAR Type=USER_DEREGISTRATION
                 case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi,
                                                                 ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_USER_DEREGISTRATION',
-                                                                Data#ue_fsm_data.apn) of
+                                                                Data#ue_fsm_data.apn, ) of
                 ok ->   {next_state, state_authenticated_wait_swx_saa, Data, {reply,From,ok}};
                 {error, _Err} ->
                         DiaRC = 5002, %% UNKNOWN_SESSION_ID
@@ -236,7 +241,7 @@
         {true, false} -> %% All sessions will now be gone, trigger SAR Type=USER_DEREGISTRATION
                 case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi,
                                                                 ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_USER_DEREGISTRATION',
-                                                                Data#ue_fsm_data.apn) of
+                                                                Data#ue_fsm_data.apn, ) of
                 ok ->   Data1 = Data#ue_fsm_data{s6b_resp_pid = Pid},
                         {next_state, state_authenticated_wait_swx_saa, Data1, {reply,From,ok}};
                 {error, _Err} ->
@@ -256,7 +261,11 @@
 state_authenticated_wait_swx_saa(enter, _OldState, Data) ->
         {keep_state, Data};
 
-state_authenticated_wait_swx_saa({call, From}, {rx_swx_saa, SAType, ResultCode}, Data) ->
+state_authenticated_wait_swx_saa({call, From}, {rx_swx_saa, Result}, Data) ->
+        case Result of
+        {error, SAType, ResultCode} -> ResultCode;
+        {ok, SAType, _ResInfo} -> ResultCode = 2001
+        end,
         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_PGW_UPDATE' ->

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/src/epdg_diameter_swm.erl -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/src/epdg_diameter_swm.erl Changed

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/src/epdg_gtpc_s2b.erl -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/src/epdg_gtpc_s2b.erl Changed

@@ -48,7 +48,7 @@
 %% gen_server Function Exports
 -export(init/1, handle_call/3, handle_cast/2, handle_info/2).
 -export(code_change/3).
--export(create_session_req/3, delete_session_req/1).
+-export(create_session_req/4, delete_session_req/1).
 
 %% Application Definitions
 -define(SERVER, ?MODULE).
@@ -88,6 +88,8 @@
     imsi                   :: binary(),
     pid                    :: pid(),
     apn                    :: binary(),
+    raddr_str              :: string(),
+    raddr                  :: inet:ip_address(),
     ue_ip                  :: inet:ip_address(),
     local_control_tei = 0  :: non_neg_integer(),
     remote_control_tei = 0 :: non_neg_integer(),
@@ -142,15 +144,21 @@
             lager:error("GTPv2C UDP socket open error: ~w~n", Reason)
     end.
 
-create_session_req(Imsi, Apn, APCO) ->
-    gen_server:call(?SERVER, {gtpc_create_session_req, {Imsi, Apn, APCO}}).
+create_session_req(Imsi, Apn, APCO, PGWAddrCandidateList) ->
+    gen_server:call(?SERVER, {gtpc_create_session_req, {Imsi, Apn, APCO, PGWAddrCandidateList}}).
 
 delete_session_req(Imsi) ->
     gen_server:call(?SERVER, {gtpc_delete_session_req, {Imsi}}).
 
-handle_call({gtpc_create_session_req, {Imsi, Apn, APCO}}, {Pid, _Tag} = _From, State0) ->
+handle_call({gtpc_create_session_req, {Imsi, Apn, APCO, PGWAddrCandidateList}}, {Pid, _Tag} = _From, State0) ->
+    RemoteAddrStr = pick_gtpc_remote_address(PGWAddrCandidateList, State0),
+    lager:debug("Selected PGW Remote Address ~p~n", RemoteAddrStr),
+    {ok, RemoteAddrInet} = inet_parse:address(RemoteAddrStr),
     {Sess0, State1} = find_or_new_gtp_session(Imsi,
-                        #gtp_session{pid = Pid, apn = list_to_binary(Apn)},
+                        #gtp_session{pid = Pid,
+                                     apn = list_to_binary(Apn),
+                                     raddr_str = RemoteAddrInet,
+                                     raddr = RemoteAddrInet},
                         State0),
     Req = gen_create_session_request(Sess0, APCO, State1),
     tx_gtp(Req, State1),
@@ -352,6 +360,16 @@
     find_unused_local_teid(State, State#gtp_state.next_local_data_tei,
                            dec_tei(State#gtp_state.next_local_data_tei)).
 
+pick_gtpc_remote_address(PGWAddrCandidateList, State) ->
+    case PGWAddrCandidateList of
+     ->
+        %% Pick default address from configuration:
+        State#gtp_state .raddr_str;
+    Head|_Tail ->
+        % TODO: pick a compatible address with .laddr from PGWAddrCandidateList is exists.
+        Head
+    end.
+
 %% connect/2
 connect(Name, {Socket, RemoteAddr, RemotePort}) ->
     lager:info("~s connecting to IP ~s port ~p~n", Name, RemoteAddr, RemotePort),

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/src/epdg_ue_fsm.erl -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/src/epdg_ue_fsm.erl Changed

@@ -39,7 +39,7 @@
 -include_lib("gtp_utils.hrl").
 -include("conv.hrl").
 
--export(start_link/1, stop/1).
+-export(start_monitor/1, stop/1).
 -export(init/1,callback_mode/0,terminate/3).
 -export(get_server_name_by_imsi/1, get_pid_by_imsi/1).
 -export(auth_request/2, lu_request/1, tunnel_request/2, purge_ms_request/1).
@@ -53,10 +53,11 @@
 
 -record(ue_fsm_data, {
         imsi,
-        apn = "internet" :: string(),
-        tun_pdp_ctx :: epdg_tun_pdp_ctx,
-        tear_down_gsup_needed = false :: boolean(), %% need to send GSUP PurgeMSResp after STR+STA?
-        tear_down_gsup_cause = 0 :: integer()
+        apn                     = "internet"    :: string(),
+        pgw_rem_addr_list       =             :: list(),
+        tun_pdp_ctx                             :: epdg_tun_pdp_ctx,
+        tear_down_gsup_needed   = false         :: boolean(), %% need to send GSUP PurgeMSResp after STR+STA?
+        tear_down_gsup_cause    = 0             :: integer()
         }).
 
 get_server_name_by_imsi(Imsi) ->
@@ -67,13 +68,18 @@
         ServerName = get_server_name_by_imsi(Imsi),
         whereis(ServerName).
 
-start_link(Imsi) ->
+start_monitor(Imsi) ->
         ServerName = get_server_name_by_imsi(Imsi),
-        lager:info("ue_fsm start_link(~p)~n", ServerName),
-        gen_statem:start_link({local, ServerName}, ?MODULE, Imsi, {debug, trace}).
+        lager:info("ue_fsm start_monitor(~p)~n", ServerName),
+        gen_statem:start_monitor({local, ServerName}, ?MODULE, Imsi, {debug, trace}).
 
 stop(SrvRef) ->
-        gen_statem:stop(SrvRef).
+        try
+                gen_statem:stop(SrvRef)
+        catch
+        exit:Err ->
+                {error, Err}
+        end.
 
 auth_request(Pid, {PdpTypeNr, Apn}) ->
         lager:info("ue_fsm auth_request~n", ),
@@ -170,6 +176,12 @@
 %% Internal helpers
 %% ------------------------------------------------------------------
 
+ev_handle({call, From}, {auth_request, PdpTypeNr, Apn}, Data) ->
+        case epdg_diameter_swm:auth_request(Data#ue_fsm_data.imsi, PdpTypeNr, Apn) of
+        ok -> {next_state, state_wait_auth_resp, Data, {reply,From,ok}};
+        {error, Err} -> {stop_and_reply, Err, Data, {reply,From,{error,Err}}}
+	end.
+
 %% ------------------------------------------------------------------
 %% gen_statem Function Definitions
 %% ------------------------------------------------------------------
@@ -193,12 +205,9 @@
 state_new(enter, _OldState, Data) ->
         {keep_state, Data};
 
-state_new({call, From}, {auth_request, PdpTypeNr, Apn}, Data) ->
+state_new({call, _From} = EvType, {auth_request, PdpTypeNr, Apn} = EvContent, Data) ->
         lager:info("ue_fsm state_new event=auth_request {~p, ~p}, ~p~n", PdpTypeNr, Apn, Data),
-        case epdg_diameter_swm:auth_request(Data#ue_fsm_data.imsi, PdpTypeNr, Apn) of
-        ok -> {next_state, state_wait_auth_resp, Data, {reply,From,ok}};
-        {error, Err} -> {stop_and_reply, Err, Data, {reply,From,{error,Err}}}
-	end;
+        ev_handle(EvType, EvContent, Data);
 
 state_new({call, From}, purge_ms_request, Data) ->
         lager:info("ue_fsm state_new event=purge_ms_request, ~p~n", Data),
@@ -207,10 +216,10 @@
 state_wait_auth_resp(enter, _OldState, Data) ->
         {keep_state, Data};
 
-state_wait_auth_resp({call, From}, {received_swm_auth_response, Auth}, Data) ->
-        lager:info("ue_fsm state_wait_auth_resp event=received_swm_auth_response, ~p~n", Data),
-        gsup_server:auth_response(Data#ue_fsm_data.imsi, Auth),
-        case Auth of
+state_wait_auth_resp({call, From}, {received_swm_auth_response, Result}, Data) ->
+        lager:info("ue_fsm state_wait_auth_resp event=received_swm_auth_response Result=~p, ~p~n", Result, Data),
+        gsup_server:auth_response(Data#ue_fsm_data.imsi, Result),
+        case Result of
                 {ok, _} ->
                         {next_state, state_authenticating, Data, {reply,From,ok}};
                 {error, Err} ->
@@ -222,6 +231,10 @@
 state_authenticating(enter, _OldState, Data) ->
         {keep_state, Data};
 
+state_authenticating({call, _From} = EvType, {auth_request, PdpTypeNr, Apn} = EvContent, Data) ->
+        lager:info("ue_fsm state_authenticating event=auth_request {~p, ~p}, ~p~n", PdpTypeNr, Apn, Data),
+        ev_handle(EvType, EvContent, Data);
+
 state_authenticating({call, From}, lu_request, Data) ->
         lager:info("ue_fsm state_authenticating event=lu_request, ~p~n", Data),
         % Rx "GSUP CEAI LU Req" is our way of saying Rx "Swm Diameter-EAP REQ (DER) with EAP AVP containing successuful auth":
@@ -236,13 +249,22 @@
         lager:info("ue_fsm state_authenticating event=lu_request, ~p, ~p~n", Result, Data),
         % Rx "GSUP CEAI LU Req" is our way of saying Rx "Swm Diameter-EAP REQ (DER) with EAP AVP containing successuful auth":
         case Result of
-                {ok, _} ->
-                        Ret = ok;
-                {error, Err} ->
-                        Ret = {error, Err}
-        end,
-        gsup_server:lu_response(Data#ue_fsm_data.imsi, Ret),
-        {next_state, state_authenticated, Data, {reply,From,Ret}}.
+        {ok, ResInfo} ->
+                % Store PGW Remote address if AAA/HSS signalled them to us:
+                case maps:find(pdp_info_list, ResInfo) of
+                error ->
+                        Data1 = Data;
+                PGWAddrCandidateList ->
+                        Data1 = Data#ue_fsm_data{pgw_rem_addr_list = PGWAddrCandidateList}
+                end,
+                Ret = ok,
+                gsup_server:lu_response(Data1#ue_fsm_data.imsi, Ret),
+                {next_state, state_authenticated, Data1, {reply,From,Ret}};
+        {error, Err} ->
+                Ret = {error, Err},
+                gsup_server:lu_response(Data#ue_fsm_data.imsi, Ret),
+                {next_state, state_new, Data, {reply,From,Ret}}
+        end.
 
 state_authenticated(enter, _OldState, Data) ->
         {keep_state, Data};
@@ -253,7 +275,10 @@
 
 state_authenticated({call, From}, {tunnel_request, PCO}, Data) ->
         lager:info("ue_fsm state_authenticated event=tunnel_request, ~p~n", Data),
-        epdg_gtpc_s2b:create_session_req(Data#ue_fsm_data.imsi, Data#ue_fsm_data.apn, PCO),
+        epdg_gtpc_s2b:create_session_req(Data#ue_fsm_data.imsi,
+                                         Data#ue_fsm_data.apn,
+                                         PCO,
+                                         Data#ue_fsm_data.pgw_rem_addr_list),
         {next_state, state_wait_create_session_resp, Data, {reply,From,ok}};
 
 state_authenticated({call, From}, purge_ms_request, Data) ->

osmo-epdg_0.0.0.133.d8b0.202403052026.tar.xz/src/gsup_server.erl -> osmo-epdg_0.0.0.139.8506.202403062026.tar.xz/src/gsup_server.erl Changed

@@ -36,7 +36,6 @@
 
 -behaviour(gen_server).
 
--include_lib("diameter_3gpp_ts29_273_swx.hrl").
 -include_lib("osmo_ss7/include/ipa.hrl").
 -include_lib("osmo_gsup/include/gsup_protocol.hrl").
 -include("gtp_utils.hrl").
@@ -56,7 +55,8 @@
 
 -record(gsups_ue, {
 	imsi                   :: binary(),
-	pid                    :: pid()
+	pid                    :: pid(),
+	mref                   :: reference()
 	}).
 
 -export(start_link/3).
@@ -65,16 +65,9 @@
 -export(code_change/3, terminate/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,
-				   'Confidentiality-Key' = CKey, 'Integrity-Key' = IKey}) ->
-	lager:info("dia_sip2gsup: auth ~p authz ~p ~n", Authenticate, Authorization),
-	lager:info("  rand ~p autn ~p ~n", lists:sublist(Authenticate, 1, 16), lists:sublist(Authenticate, 17, 16)),
-	#{rand => list_to_binary(lists:sublist(Authenticate, 1, 16)),
-	  autn=> list_to_binary(lists:sublist(Authenticate, 17, 16)),
-	  res=> list_to_binary(Authorization),
-	  ik=> list_to_binary(IKey),
-	  ck=> list_to_binary(CKey)}.
+% TODO: -spec dia_sip2gsup(#epdg_auth_tuple{}) -> map().
+epdg_auth_tuple2gsup(#epdg_auth_tuple{rand = Rand, autn = Autn, res = Res, ck = Ck, ik = Ik}) ->
+	#{rand => Rand, autn => Autn, res => Res, ik => Ik, ck => Ck}.
 
 %% ------------------------------------------------------------------
 %% our exported API
@@ -119,16 +112,15 @@
 	error_logger:error_report("unknown handle_call", {module, ?MODULE}, {info, Info}, {state, State}),
 	{reply, error, not_implemented}.
 
-handle_cast({auth_response, {Imsi, Auth}}, State) ->
-	lager:info("auth_response for ~p: ~p~n", Imsi, Auth),
+handle_cast({auth_response, {Imsi, Result}}, State) ->
+	lager:info("auth_response for ~p: ~p~n", Imsi, Result),
 	Socket = State#gsups_state.socket,
-	case Auth of
-		{ok, Mar} ->	SipAuthTuples = Mar#'MAA'.'SIP-Auth-Data-Item',
-				% AuthTuples = dia_sip2gsup(SipAuthTuples),
+	case Result of
+		{ok, AuthTuples} ->
 				Resp = #{message_type => send_auth_info_res,
 					message_class => 5,
-					imsi => list_to_binary(Mar#'MAA'.'User-Name'),
-					auth_tuples => lists:map(fun dia_sip2gsup/1, SipAuthTuples)
+					imsi => Imsi,
+					auth_tuples => lists:map(fun epdg_auth_tuple2gsup/1, AuthTuples)
 					};
 		{error, _} ->	Resp = #{message_type => send_auth_info_err, imsi => Imsi, message_class => 5, cause => ?GSUP_CAUSE_NET_FAIL}
 	end,
@@ -255,8 +247,8 @@
 			 cause => ?GSUP_CAUSE_NET_FAIL
 		},
 		tx_gsup(Socket, Resp),
-		epdg_ue_fsm:stop(UE#gsups_ue.pid),
-		State2 = delete_gsups_ue(UE, State1)
+		State2 = delete_gsups_ue(UE, State1),
+		epdg_ue_fsm:stop(UE#gsups_ue.pid)
 	end,
 	{noreply, State2};
 
@@ -349,6 +341,11 @@
 	end,
 	{noreply, State1};
 
+handle_info({'DOWN', MRef, process, Pid, Reason}, State0) ->
+	lager:notice("GSUP: epdg_ue_fsm ~p exited, reason: ~p~n", Pid, Reason),
+	State1 = delete_gsups_ue_by_mref(MRef, State0),
+	{noreply, State1};
+
 handle_info(Info, S) ->
 	error_logger:error_report("unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}),
 	{noreply, S}.
@@ -359,9 +356,9 @@
 code_change(_OldVsn, State, _Extra) ->
 	{ok, State}.
 
-auth_response(Imsi, Auth) ->
-	lager:info("auth_response(~p): ~p~n", Imsi, Auth),
-	gen_server:cast(?SERVER, {auth_response, {Imsi, Auth}}).
+auth_response(Imsi, Result) ->
+	lager:info("auth_response(~p): ~p~n", Imsi, Result),
+	gen_server:cast(?SERVER, {auth_response, {Imsi, Result}}).
 
 lu_response(Imsi, Result) ->
 	lager:info("lu_response(~p): ~p~n", Imsi, Result),
@@ -390,8 +387,14 @@
 
 
 new_gsups_ue(Imsi, State) ->
-	{ok, Pid} = epdg_ue_fsm:start_link(Imsi),
-	UE = #gsups_ue{imsi = Imsi, pid = Pid},
+	case epdg_ue_fsm:start_monitor(Imsi) of
+	{ok, {Pid, MRef}} -> ok;
+	{error,{already_started,PrevPid}} ->
+		lager:notice("epdg_ue_fsm for Imsi ~p already existed, reusing!: ~p~n", Imsi, PrevPid),
+		Pid = PrevPid,
+		MRef = erlang:monitor(process, Pid)
+	end,
+	UE = #gsups_ue{imsi = Imsi, pid = Pid, mref = MRef},
 	NewSt = State#gsups_state{ues = sets:add_element(UE, State#gsups_state.ues)},
 	{UE, NewSt}.
 
@@ -405,6 +408,15 @@
 			State#gsups_state.ues),
 	Res.
 
+find_gsups_ue_by_mref(MRef, State) ->
+	{MRef, Res} = sets:fold(
+			fun(SessIt = #gsups_ue{imsi = LookupMRef}, {LookupMRef, _AccIn}) -> {LookupMRef, SessIt};
+				(_, AccIn) -> AccIn
+			end,
+			{MRef, undefined},
+			State#gsups_state.ues),
+	Res.
+
 find_or_new_gsups_ue(Imsi, State) ->
 	UE = find_gsups_ue_by_imsi(Imsi, State),
 	case UE of
@@ -415,6 +427,7 @@
 	end.
 
 delete_gsups_ue(UE, State) ->
+	erlang:demonitor(UE#gsups_ue.mref, flush),
 	SetRemoved = sets:del_element(UE, State#gsups_state.ues),
 	lager:debug("Removed UE ~p from ~p~n", UE, SetRemoved),
 	State#gsups_state{ues = SetRemoved}.
@@ -423,4 +436,10 @@
 	case find_gsups_ue_by_imsi(Imsi, State) of
 	undefined -> State;
 	UE-> delete_gsups_ue(UE, State)
+	end.
+
+delete_gsups_ue_by_mref(MRef, State) ->
+	case find_gsups_ue_by_mref(MRef, State) of
+	undefined -> State;
+	UE-> delete_gsups_ue(UE, State)
 	end.
\ No newline at end of file

Changes of Revision 155