Osmocom Open Build Service

osmo-epdg_0.0.0.95.6f47.202402072026.dsc -> osmo-epdg_0.0.0.102.7656.202402082026.dsc Changed

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/.tarball-version -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/.tarball-version Changed

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/build_dep.tar.gz -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/build_dep.tar.gz Changed

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/config/sys.config -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/config/sys.config Changed

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/debian/changelog -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/debian/changelog Changed

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/debian/control -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/debian/control Changed

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/dia/diameter_3gpp_ts29_273_swx.dia -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/dia/diameter_3gpp_ts29_273_swx.dia Changed

osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/dia/diameter_rfc7155.dia Added

@@ -0,0 +1,44 @@
+
+;; Copyright 2017, Travelping GmbH <info@travelping.com>
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version
+;; 2 of the License, or (at your option) any later version.
+
+;;
+;; RFC 7155, Diameter Network Access Server Application
+;;
+;;
+;; Edits:
+;;
+;; - Framed-Appletalk-Link      -> Framed-AppleTalk-Link
+;; - Framed-Appletalk-Network   -> Framed-AppleTalk-Network
+;; - Framed-Appletalk-Zone      -> Framed-AppleTalk-Zone
+;;
+
+@id 1
+@name   diameter_rfc7155
+@prefix diameter
+@vendor 0 IETF
+
+@inherits diameter_gen_base_rfc6733
+
+@avp_types
+
+   Framed-AppleTalk-Link        37     Unsigned32       M
+   Framed-AppleTalk-Network     38     Unsigned32       M
+   Framed-AppleTalk-Zone        39     OctetString      M
+   Framed-Compression           13     Enumerated       M
+   Framed-IP-Address            8      OctetString      M
+   Framed-IP-Netmask            9      OctetString      M
+   Framed-IPX-Network           23     Unsigned32       M
+   Framed-IPv6-Pool             100    OctetString      M
+   Framed-IPv6-Prefix           97     OctetString      M
+   Framed-IPv6-Route            99     UTF8String       M
+   Framed-Interface-Id          96     Unsigned64       M
+   Framed-MTU                   12     Unsigned32       M
+   Framed-Pool                  88     OctetString      M
+   Framed-Protocol              7      Enumerated       M
+   Framed-Route                 22     UTF8String       M
+   Framed-Routing               10     Enumerated       M

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/dia/diameter_rfc7155_nasreq.dia -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/dia/diameter_rfc7155_nasreq.dia Changed

@@ -22,6 +22,7 @@
 @vendor 0 IETF
 
 @inherits diameter_gen_base_rfc6733
+@inherits diameter_rfc7155
 
 @avp_types
 
@@ -42,22 +43,6 @@
    Calling-Station-Id           31     UTF8String       M
    Connect-Info                 77     UTF8String       M
    Filter-Id                    11     UTF8String       M
-   Framed-AppleTalk-Link        37     Unsigned32       M
-   Framed-AppleTalk-Network     38     Unsigned32       M
-   Framed-AppleTalk-Zone        39     OctetString      M
-   Framed-Compression           13     Enumerated       M
-   Framed-IP-Address            8      OctetString      M
-   Framed-IP-Netmask            9      OctetString      M
-   Framed-IPX-Network           23     Unsigned32       M
-   Framed-IPv6-Pool             100    OctetString      M
-   Framed-IPv6-Prefix           97     OctetString      M
-   Framed-IPv6-Route            99     UTF8String       M
-   Framed-Interface-Id          96     Unsigned64       M
-   Framed-MTU                   12     Unsigned32       M
-   Framed-Pool                  88     OctetString      M
-   Framed-Protocol              7      Enumerated       M
-   Framed-Route                 22     UTF8String       M
-   Framed-Routing               10     Enumerated       M
    Idle-Timeout                 28     Unsigned32       M
    Login-IP-Host                14     OctetString      M
    Login-IPv6-Host              98     OctetString      M

osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/include/conv.hrl Added

@@ -0,0 +1,39 @@
+% (C) 2023 by sysmocom
+%
+% All Rights Reserved
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU Affero General Public License as
+% published by the Free Software Foundation; either version 3 of the
+% License, or (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU Affero General Public License
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%
+% Additional Permission under GNU AGPL version 3 section 7:
+%
+% If you modify this Program, or any covered work, by linking or
+% combining it with runtime libraries of Erlang/OTP as released by
+% Ericsson on http://www.erlang.org (or a modified version of these
+% libraries), containing parts covered by the terms of the Erlang Public
+% License (http://www.erlang.org/EPLICENSE), the licensors of this
+% Program grant you additional permission to convey the resulting work
+% without the need to license the runtime libraries of Erlang/OTP under
+% the GNU Affero General Public License. Corresponding Source for a
+% non-source form of such a combination shall include the source code
+% for the parts of the runtime libraries of Erlang/OTP used as well as
+% that of the covered work.
+%
+-hrl_name('conv.hrl').
+
+-record(epdg_eua, {
+        type_nr :: non_neg_integer(),
+        ipv4    :: binary(),
+        ipv6    :: binary()
+}).
+

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/include/gtp_utils.hrl -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/include/gtp_utils.hrl Changed

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/aaa_diameter_swm.erl -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/src/aaa_diameter_swm.erl Changed

@@ -20,7 +20,7 @@
 -export(init/1, handle_call/3, handle_cast/2, handle_info/2).
 -export(code_change/3, terminate/2).
 
--export(auth_request/1, auth_compl_request/2, session_termination_request/1).
+-export(auth_request/3, auth_compl_request/2, session_termination_request/1).
 -export(auth_response/2, auth_compl_response/2, session_termination_answer/2).
 
 -define(SERVER, ?MODULE).
@@ -47,8 +47,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Rx from emulated SWm wire:
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-auth_request(Imsi) ->
-	gen_server:cast(?SERVER, {epdg_auth_req, Imsi}).
+auth_request(Imsi, PdpTypeNr, Apn) ->
+	gen_server:cast(?SERVER, {epdg_auth_req, Imsi, PdpTypeNr, Apn}).
 
 auth_compl_request(Imsi, Apn) ->
 	gen_server:cast(?SERVER, {epdg_auth_compl_req, Imsi, Apn}).
@@ -56,9 +56,9 @@
 session_termination_request(Imsi) ->
 	gen_server:cast(?SERVER, {str, Imsi}).
 
-handle_cast({epdg_auth_req, Imsi}, State0) ->
+handle_cast({epdg_auth_req, Imsi, PdpTypeNr, Apn}, State0) ->
 	{Sess, State1} = find_or_new_swm_session(Imsi, State0),
-	aaa_ue_fsm:ev_swm_auth_req(Sess#swm_session.pid),
+	aaa_ue_fsm:ev_swm_auth_req(Sess#swm_session.pid, {PdpTypeNr, Apn}),
 	{noreply, State1};
 
 handle_cast({epdg_auth_compl_req, Imsi, Apn}, State) ->

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/aaa_diameter_swx.erl -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/src/aaa_diameter_swx.erl Changed

@@ -42,6 +42,7 @@
 
 -include_lib("diameter_3gpp_ts29_273_swx.hrl").
 -include_lib("diameter/include/diameter_gen_base_rfc6733.hrl").
+-include("gtp_utils.hrl").
 
 %% API Function Exports
 -export(start_link/0).
@@ -49,7 +50,7 @@
 %% gen_server Function Exports
 -export(init/1, handle_call/3, handle_cast/2, handle_info/2).
 -export(code_change/3).
--export(multimedia_auth_request/6).
+-export(multimedia_auth_request/7).
 -export(server_assignment_request/3).
 -export(test/0, test/1).
 
@@ -136,11 +137,11 @@
     test("001011234567890").
 
 test(IMSI) ->
-    multimedia_auth_request(IMSI, 3, "EAP-AKA", 1, , ).
+    multimedia_auth_request(IMSI, 3, "EAP-AKA", 1, , , 33).
 
-multimedia_auth_request(IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey) ->
+multimedia_auth_request(IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey, PdpTypeNr) ->
     gen_server:call(?SERVER,
-                          {mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey}}).
+                          {mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey, PdpTypeNr}}).
 % APN is optional and should be 
 server_assignment_request(IMSI, Type, APN) ->
     gen_server:call(?SERVER,
@@ -181,8 +182,30 @@
 parse_saa(Saa) ->
     {unknown_err, }.
 
-handle_call({mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey}}, {Pid, _Tag} = _From, State) ->
+handle_call({mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey, PdpTypeNr}}, {Pid, _Tag} = _From, State) ->
     SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)),
+    % RFC 4005 6.11.1 Framed-IP-Address AVP:
+    % "0xFFFFFFFE indicates that the NAS should select an address for the user
+    % (e.g., assigned from a pool of addresses kept by the NAS)."
+    Ipv4Dyn = <<16#FFFFFFFE:32>>,
+    % 3GPP TS 29.229 6.3.54, RFC4005 6.11.6 2.3, RFC3162 2.3 allow empty prefix.
+    % Set only the Reserved=0 byte and Prefix-Length=0
+    IPv6Dyn = <<16#00:8,16#00:8>>,
+    case PdpTypeNr of
+    ?GTP_PDP_ADDR_TYPE_NR_IPv4 ->
+        IPv4Opt = Ipv4Dyn,
+        IPv6Opt = ;
+    ?GTP_PDP_ADDR_TYPE_NR_IPv6 ->
+        IPv4Opt = ,
+        IPv6Opt = IPv6Dyn;
+    ?GTP_PDP_ADDR_TYPE_NR_IPv4v6 ->
+        IPv4Opt = Ipv4Dyn,
+        IPv6Opt = IPv6Dyn;
+    _ ->
+        IPv4Opt = ,
+        IPv6Opt = 
+    end,
+    lager:debug("Swx MAR: IPv4Opt=~p IPv6Opt=~p~n", IPv4Opt, IPv6Opt),
     MAR = #'MAR'{'Vendor-Specific-Application-Id' = #'Vendor-Specific-Application-Id'{
                     'Vendor-Id'           = ?VENDOR_ID_3GPP,
                     'Auth-Application-Id' = ?DIAMETER_APP_ID_SWX},
@@ -192,10 +215,14 @@
                  'SIP-Auth-Data-Item' = #'SIP-Auth-Data-Item'{
                     'SIP-Authentication-Scheme' = AuthScheme,
                     'Confidentiality-Key' = CKey,
-                    'Integrity-Key' = IntegrityKey},
+                    'Integrity-Key' = IntegrityKey,
+                    'Framed-IP-Address' = IPv4Opt,
+                    'Framed-IPv6-Prefix' = IPv6Opt
+                 },
                  'SIP-Number-Auth-Items' = NumAuthItems,
                  'RAT-Type' = RAT
                 },
+    lager:debug("Swx Tx MAR: ~p~n", MAR),
     Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, MAR, {extra, Pid}, detach),
     case Ret of
         ok ->

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/aaa_ue_fsm.erl -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/src/aaa_ue_fsm.erl Changed

@@ -41,7 +41,7 @@
 -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,
+-export(ev_swm_auth_req/2, ev_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swx_maa/2, ev_rx_swx_saa/2,
          ev_rx_s6b_aar/2, ev_rx_s6b_str/1).
 -export(state_new/3, state_wait_swx_maa/3, state_wait_swx_saa/3, state_authenticated/3, state_authenticated_wait_swx_saa/3).
 
@@ -66,10 +66,10 @@
         lager:info("ue_fsm start_link(~p)~n", ServerName),
         gen_statem:start_link({local, ServerName}, ?MODULE, Imsi, {debug, trace}).
 
-ev_swm_auth_req(Pid) ->
+ev_swm_auth_req(Pid, {PdpTypeNr, Apn}) ->
         lager:info("ue_fsm ev_swm_auth_req~n", ),
         try
-                gen_statem:call(Pid, swm_auth_req)
+                gen_statem:call(Pid, {swm_auth_req, PdpTypeNr, Apn})
         catch
         exit:Err ->
                 {error, Err}
@@ -152,12 +152,12 @@
 state_new(enter, _OldState, Data) ->
         {keep_state, Data};
 
-state_new({call, From}, swm_auth_req, Data) ->
-        lager:info("ue_fsm state_new event=swm_auth_req, ~p~n", Data),
+state_new({call, From}, {swm_auth_req, PdpTypeNr, Apn}, Data) ->
+        lager:info("ue_fsm state_new event=swm_auth_req {~p, ~p}, ~p~n", PdpTypeNr, Apn, Data),
 	% request the diameter code for a tuple
 	CKey = ,
 	IntegrityKey = ,
-	case aaa_diameter_swx:multimedia_auth_request(Data#ue_fsm_data.imsi, 1, "EAP-AKA", 1, CKey, IntegrityKey) of
+	case aaa_diameter_swx:multimedia_auth_request(Data#ue_fsm_data.imsi, 1, "EAP-AKA", 1, CKey, IntegrityKey, PdpTypeNr) of
 	ok -> {next_state, state_wait_swx_maa, Data, {reply,From,ok}};
 	{error, Err} -> {keep_state, Data, {reply,From,{error, Err}}}
 	end;

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/conv.erl -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/src/conv.erl Changed

@@ -34,9 +34,31 @@
 -author('Pau Espin Pedrol <pespin@sysmocom.de>').
 
 -include_lib("osmo_gsup/include/gsup_protocol.hrl").
+-include_lib("gtplib/include/gtp_packet.hrl").
 -include_lib("gtp_utils.hrl").
+-include_lib("conv.hrl").
 
+-export(ip_to_bin/1, bin_to_ip/1).
 -export(cause_gtp2gsup/1).
+-export(gtp2_paa_to_epdg_eua/1, epdg_eua_to_gsup_pdp_address/1).
+
+% ergw_aaa/src/ergw_aaa_3gpp_dict.erl
+% under GPLv2+
+ip_to_bin(IP) when is_binary(IP) ->
+        IP;
+    ip_to_bin({A, B, C, D}) ->
+        <<A, B, C, D>>;
+    ip_to_bin({A, B, C, D, E, F, G, H}) ->
+        <<A:16, B:16, C:16, D:16, E:16, F:16, G:16, H:16>>.
+
+    bin_to_ip(<<A:8, B:8, C:8, D:8>> = IP) when is_binary(IP) ->
+        {A, B, C, D};
+    bin_to_ip(<<A:16, B:16, C:16, D:16, E:16, F:16, G:16, H:16>> = IP) when is_binary(IP) ->
+        {A, B, C, D, E, F, G, H};
+    bin_to_ip({_, _, _, _} = IP) ->
+        IP;
+    bin_to_ip({_, _, _, _, _, _, _, _} = IP) ->
+        IP.
 
 -spec cause_gtp2gsup(integer()) -> integer().
 
@@ -51,3 +73,23 @@
 cause_gtp2gsup(?GTP2_CAUSE_MANDATORY_IE_INCORRECT) -> ?GSUP_CAUSE_INV_MAND_INFO;
 cause_gtp2gsup(?GTP2_CAUSE_MANDATORY_IE_MISSING) -> ?GSUP_CAUSE_INV_MAND_INFO;
 cause_gtp2gsup(_) -> ?GSUP_CAUSE_PROTO_ERR_UNSPEC.
+
+
+gtp2_paa_to_epdg_eua(#v2_pdn_address_allocation{type = ipv4, address = Addr}) ->
+        #epdg_eua{type_nr = ?GTP_PDP_ADDR_TYPE_NR_IPv4,
+                  ipv4 = Addr};
+gtp2_paa_to_epdg_eua(#v2_pdn_address_allocation{type = ipv6, address = Addr}) ->
+        #epdg_eua{type_nr = ?GTP_PDP_ADDR_TYPE_NR_IPv6,
+                  ipv6 = Addr}.
+%TODO: IPv4v6
+
+epdg_eua_to_gsup_pdp_address(#epdg_eua{type_nr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, ipv4 = Addr}) ->
+        #{pdp_type_org => 1,
+	  pdp_type_nr => ?GTP_PDP_ADDR_TYPE_NR_IPv4,
+	  address => #{ ipv4 => Addr}};
+
+epdg_eua_to_gsup_pdp_address(#epdg_eua{type_nr = ?GTP_PDP_ADDR_TYPE_NR_IPv6, ipv6 = Addr}) ->
+#{pdp_type_org => 1,
+        pdp_type_nr => ?GTP_PDP_ADDR_TYPE_NR_IPv6,
+        address => #{ ipv6 => Addr}}.
+%TODO: IPv4v6

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/epdg_diameter_swm.erl -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/src/epdg_diameter_swm.erl Changed

@@ -19,7 +19,7 @@
 -export(init/1, handle_call/3, handle_cast/2, handle_info/2).
 -export(code_change/3, terminate/2).
 
--export(auth_request/1, auth_compl_request/2, session_termination_request/1).
+-export(auth_request/3, auth_compl_request/2, session_termination_request/1).
 -export(auth_response/2, auth_compl_response/2, session_termination_answer/2).
 
 -define(SERVER, ?MODULE).
@@ -33,10 +33,13 @@
 	{ok, #swm_state{}}.
 
 
-auth_request(Imsi) ->
+auth_request(Imsi, PdpTypeNr, 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_req, ImsiStr}),
+	% epdg_auth_req: Swm Diameter message Diameter-EAP-Request 3GPP TS 29.273 7.2.2.1.1
+	% PdpTypeNr: SWm Diameter AVP "UE-Local-IP-Address"
+	% Apn: SWm Diameter AVP "Service-Selection"
+	Result = gen_server:call(?SERVER, {epdg_auth_req, ImsiStr, PdpTypeNr, Apn}),
 	case Result of
 		{ok, _Mar} ->
 			epdg_ue_fsm:received_swm_auth_response(self(), Result),
@@ -68,10 +71,10 @@
 		_ -> Result
 	end.
 
-handle_call({epdg_auth_req, Imsi}, {Pid, _Tag} = _From, State0) ->
+handle_call({epdg_auth_req, Imsi, PdpTypeNr, Apn}, {Pid, _Tag} = _From, State0) ->
 	% we yet don't implement the Diameter SWm interface on the wire, we process the call internally:
 	{_Sess, State1} = find_or_new_swm_session(Imsi, Pid, State0),
-	ok = aaa_diameter_swm:auth_request(Imsi),
+	ok = aaa_diameter_swm:auth_request(Imsi, PdpTypeNr, Apn),
 	{reply, ok, State1};
 
 handle_call({epdg_auth_compl_req, Imsi, Apn}, _From, State) ->

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/epdg_gtpc_s2b.erl -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/src/epdg_gtpc_s2b.erl Changed

@@ -258,6 +258,11 @@
     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_update_bearer(Sess, OldBearer, NewBearer) ->
+    SetRemoved = sets:del_element(OldBearer, Sess#gtp_session.bearers),
+    SetUpdated = sets:add_element(NewBearer, SetRemoved),
+    Sess#gtp_session{bearers = SetUpdated}.
+
 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)},
@@ -269,25 +274,6 @@
 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({_,
-                                                    #v2_fully_qualified_tunnel_endpoint_identifier{
-                                                        interface_type = _Interface,
-                                                        key = TEI, ipv4 = _IP4, ipv6 = _IP6},
-                                                    Next}, Sess) ->
-    update_gtp_session_from_create_session_response_ie(maps:next(Next), Sess#gtp_session{remote_control_tei = TEI});
-update_gtp_session_from_create_session_response_ie({_, _, Next},
-                                                   Sess) ->
-    update_gtp_session_from_create_session_response_ie(maps:next(Next), Sess).
-
-update_gtp_session_from_create_session_response_ies(#gtp{ie = IEs}, Sess) ->
-    update_gtp_session_from_create_session_response_ie(maps:next(maps:iterator(IEs)), Sess).
-
-update_gtp_session_from_create_session_response(Resp = #gtp{version = v2, type = create_session_response}, Sess) ->
-    update_gtp_session_from_create_session_response_ies(#gtp{ie = Resp#gtp.ie}, Sess).
-
 % returns Sess if found, undefined it not
 find_gtp_session_by_local_teic(LocalControlTei, State) ->
     {LocalControlTei, Res} = sets:fold(
@@ -313,10 +299,33 @@
             lager:error("Rx unknown TEI ~p: ~p~n", Resp#gtp.tei, Resp),
             {noreply, State0};
         Sess0 ->
-            Sess1 = update_gtp_session_from_create_session_response(Resp, Sess0),
-            lager:info("s2b: Updated Session after create_session_response: ~p~n", Sess1),
-            State1 = update_gtp_session(Sess0, Sess1, State0),
-            epdg_ue_fsm:received_gtpc_create_session_response(Sess0#gtp_session.pid, {ok, Resp}),
+            % Do GTP specific msg parsing here, pass only relevant fields:
+            #{{v2_fully_qualified_tunnel_endpoint_identifier,1} :=
+                #v2_fully_qualified_tunnel_endpoint_identifier{
+                    interface_type = 30, %% "S2b ePDG GTP-C"
+                    key = RemoteTEIC, ipv4 = _IPc4, ipv6 = _IPc6},
+              {v2_pdn_address_allocation,0} := Paa,
+              {v2_bearer_context,0} := #v2_bearer_context{instance = 0, group = BearerIE}} = Resp#gtp.ie,
+            % Parse BearerContext:
+            #{{v2_eps_bearer_id,0} := #v2_eps_bearer_id{instance = 0, eps_bearer_id = Ebi},
+              {v2_fully_qualified_tunnel_endpoint_identifier,4} :=
+                #v2_fully_qualified_tunnel_endpoint_identifier{
+                    interface_type = 31, %% "S2b-U ePDG GTP-U"
+                    key = RemoteTEID, ipv4 = IPu4, ipv6 = IPu6}
+             } = BearerIE,
+            Bearer = gtp_session_find_bearer_by_ebi(Sess0, Ebi),
+            Sess1 = gtp_session_update_bearer(Sess0, Bearer, Bearer#gtp_bearer{remote_data_tei = RemoteTEID}),
+            Sess2 = Sess1#gtp_session{remote_control_tei = RemoteTEIC},
+            lager:info("s2b: Updated Session after create_session_response: ~p~n", Sess2),
+            State1 = update_gtp_session(Sess0, Sess2, State0),
+            ResInfo = #{
+                eua => conv:gtp2_paa_to_epdg_eua(Paa),
+                local_teid => Bearer#gtp_bearer.local_data_tei,
+                remote_teid => RemoteTEID,
+                remote_ipv4 => IPu4,
+                remote_ipv6 => IPu6
+            },
+            epdg_ue_fsm:received_gtpc_create_session_response(Sess0#gtp_session.pid, {ok, ResInfo}),
             {noreply, State1}
         end;
 
@@ -398,20 +407,20 @@
                   },
                   #v2_eps_bearer_id{eps_bearer_id = Bearer#gtp_bearer.ebi},
                   #v2_fully_qualified_tunnel_endpoint_identifier{
-                    instance = 0,
+                    instance = Bearer#gtp_bearer.ebi,
                     interface_type = 31, %% "S2b-U ePDG GTP-U"
                     key = Bearer#gtp_bearer.local_data_tei,
-                    ipv4 = gtp_utils:ip_to_bin(LocalAddr)
+                    ipv4 = conv:ip_to_bin(LocalAddr)
                   }
                 ,
     IEs = #v2_recovery{restart_counter = RCnt},
            #v2_international_mobile_subscriber_identity{imsi = Imsi},
            #v2_rat_type{rat_type = 3}, %% 3 = WLAN
            #v2_fully_qualified_tunnel_endpoint_identifier{
-                instance = Bearer#gtp_bearer.ebi,
+                instance = 0,
                 interface_type = 30, %% "S2b ePDG GTP-C"
                 key = LocalCtlTEI,
-                ipv4 = gtp_utils:ip_to_bin(LocalAddr)
+                ipv4 = conv:ip_to_bin(LocalAddr)
             },
             #v2_access_point_name{instance = 0, apn = Apn},
             #v2_selection_mode{mode = 0},
@@ -430,10 +439,10 @@
     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,
+               instance = 0,
                interface_type = 30, %% "S2b ePDG GTP-C"
                key = Bearer#gtp_bearer.local_data_tei,
-               ipv4 = gtp_utils:ip_to_bin(LocalAddr)
+               ipv4 = conv:ip_to_bin(LocalAddr)
            }
     ,
     #gtp{version = v2, type = delete_session_request, tei = RemoteCtlTEI, seq_no = SeqNo, ie = IEs}.
@@ -456,7 +465,7 @@
         instance = 0,
         interface_type = 31, %% "S2b-U ePDG GTP-U"
         key = Bearer#gtp_bearer.local_data_tei,
-        ipv4 = gtp_utils:ip_to_bin(LocalAddr)
+        ipv4 = conv:ip_to_bin(LocalAddr)
         }
     ,
     IEs = #v2_cause{v2_cause = GtpCause},

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/epdg_ue_fsm.erl -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/src/epdg_ue_fsm.erl Changed

@@ -40,7 +40,7 @@
 -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(auth_request/2, 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, received_gtpc_delete_bearer_request/1).
 -export(state_new/3, state_wait_auth_resp/3, state_authenticating/3, state_authenticated/3,
@@ -69,10 +69,10 @@
 stop(SrvRef) ->
         gen_statem:stop(SrvRef).
 
-auth_request(Pid) ->
+auth_request(Pid, {PdpTypeNr, Apn}) ->
         lager:info("ue_fsm auth_request~n", ),
         try
-                gen_statem:call(Pid, auth_request)
+                gen_statem:call(Pid, {auth_request, PdpTypeNr, Apn})
         catch
         exit:Err ->
                 {error, Err}
@@ -132,10 +132,10 @@
                 {error, Err}
         end.
 
-received_gtpc_create_session_response(Pid, Msg) ->
-        lager:info("ue_fsm received_gtpc_create_session_response ~p~n", Msg),
+received_gtpc_create_session_response(Pid, Result) ->
+        lager:info("ue_fsm received_gtpc_create_session_response ~p~n", Result),
         try
-        gen_statem:call(Pid, {received_gtpc_create_session_response, Msg})
+        gen_statem:call(Pid, {received_gtpc_create_session_response, Result})
         catch
         exit:Err ->
                 {error, Err}
@@ -183,9 +183,9 @@
 state_new(enter, _OldState, Data) ->
         {keep_state, Data};
 
-state_new({call, From}, auth_request, Data) ->
-        lager:info("ue_fsm state_new event=auth_request, ~p~n", Data),
-        case epdg_diameter_swm:auth_request(Data#ue_fsm_data.imsi) of
+state_new({call, From}, {auth_request, PdpTypeNr, Apn}, 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;
@@ -244,6 +244,16 @@
 
 state_authenticated({call, From}, {received_gtpc_create_session_response, Result}, Data) ->
         lager:info("ue_fsm state_authenticated event=received_gtpc_create_session_response, ~p~n", Data),
+        case Result of
+        {ok, ResInfo} ->
+                #{eua := EUA,
+                  local_teid := LocalTEID,
+                  remote_teid := RemoteTEID,
+                  remote_ipv4 := RemoteIPv4 % TODO: remote_ipv6
+                 } = ResInfo,
+                gtp_u_tun:create_pdp_context(RemoteIPv4, EUA, LocalTEID, RemoteTEID);
+        _ -> ok
+        end,
         gsup_server:tunnel_response(Data#ue_fsm_data.imsi, Result),
         {keep_state, Data, {reply,From,ok}};

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/gsup_server.erl -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/src/gsup_server.erl Changed

@@ -39,7 +39,8 @@
 -include_lib("diameter_3gpp_ts29_273_swx.hrl").
 -include_lib("osmo_ss7/include/ipa.hrl").
 -include_lib("osmo_gsup/include/gsup_protocol.hrl").
--include_lib("gtplib/include/gtp_packet.hrl").
+-include("gtp_utils.hrl").
+-include("conv.hrl").
 
 -define(SERVER, ?MODULE).
 
@@ -155,14 +156,9 @@
 	lager:info("tunnel_response for ~p: ~p~n", Imsi, Result),
 	Socket = State#gsups_state.socket,
 	case Result of
-		{ok, #gtp{version = v2, type = create_session_response}} ->
-			{ok, CreateSessResp} = Result,
-			IEs = CreateSessResp#gtp.ie,
-			%%#{{v2_bearer_context,0} := BearerMap} = IEs,
-			#{{v2_pdn_address_allocation,0} := Paa} = IEs,
-			PdpAddress = #{pdp_type_org => 1, pdp_type_nr => 16#21, address => #{ ipv4 => Paa#v2_pdn_address_allocation.address}},
+		{ok, #{eua := Eua}} ->
 			PdpInfo = #{pdp_context_id => 0,
-				pdp_address => PdpAddress,
+				pdp_address => conv:epdg_eua_to_gsup_pdp_address(Eua),
 				access_point_name => "foobar.apn",
 				quality_of_service => <<0, 0, 0>>,
 				pdp_charging => 0},
@@ -231,9 +227,16 @@
 	{noreply, S#gsups_state{socket=Socket}};
 
 % send auth info / requesting authentication tuples
-handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, _GsupMsgRx = #{message_type := send_auth_info_req, imsi := Imsi}}, State0) ->
+handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := send_auth_info_req, imsi := Imsi}}, State0) ->
+	#{pdp_info_list := PdpInfo} = GsupMsgRx,
+	#{pdp_context_id := _PDPCtxId,
+	  pdp_address := #{address := #{},
+	                   pdp_type_nr := PdpTypeNr,
+	                   pdp_type_org := 241},
+	  access_point_name := Apn
+	 } = PdpInfo,
 	{UE, State1} = find_or_new_gsups_ue(Imsi, State0),
-	case epdg_ue_fsm:auth_request(UE#gsups_ue.pid) of
+	case epdg_ue_fsm:auth_request(UE#gsups_ue.pid, {PdpTypeNr, Apn}) of
 	ok -> State2 = State1;
 	{error, Err} ->
 		lager:error("Auth Req for Imsi ~p failed: ~p~n", Imsi, Err),

osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/src/gtp_u_tun.erl Added

@@ -0,0 +1,70 @@
+% GTP-U tun related functionalities
+%
+% (C) 2024 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+% Author: Pau Espin Pedrol <pespin@sysmocom.de>
+%
+% All Rights Reserved
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU Affero General Public License as
+% published by the Free Software Foundation; either version 3 of the
+% License, or (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU Affero General Public License
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%
+% Additional Permission under GNU AGPL version 3 section 7:
+%
+% If you modify this Program, or any covered work, by linking or
+% combining it with runtime libraries of Erlang/OTP as released by
+% Ericsson on http://www.erlang.org (or a modified version of these
+% libraries), containing parts covered by the terms of the Erlang Public
+% License (http://www.erlang.org/EPLICENSE), the licensors of this
+% Program grant you additional permission to convey the resulting work
+% without the need to license the runtime libraries of Erlang/OTP under
+% the GNU Affero General Public License. Corresponding Source for a
+% non-source form of such a combination shall include the source code
+% for the parts of the runtime libraries of Erlang/OTP used as well as
+% that of the covered work.
+
+-module(gtp_u_tun).
+-author('Pau Espin Pedrol <pespin@sysmocom.de>').
+-include("conv.hrl").
+
+-export(create_pdp_context/4).
+
+%%%%%%%%%%%%%%%%%%%%%%
+%%% Internal API
+%%%%%%%%%%%%%%%%%%%%%%
+
+% Obtain ServerRef of the gtp_u_kmod_port process spawned during startup based on
+% gtp_u_kmod config:
+get_env_gtp_u_kmod_server_ref() ->
+        GtpuKmodSockets = application:get_env(gtp_u_kmod, sockets, ),
+        GtpuKmodSocket | _ = GtpuKmodSockets,
+        {GtpuKmodName, _GtpuKmodSockOpts} = GtpuKmodSocket,
+        GtpuKmodServRef = gtp_u_kmod_port:port_reg_name(GtpuKmodName),
+        GtpuKmodServRef.
+
+
+%%%%%%%%%%%%%%%%%%%%%%
+%%% Internal API
+%%%%%%%%%%%%%%%%%%%%%%
+
+% Create a PDP Context on the GTP tundev
+create_pdp_context(PeerAddr, EUA, LocalTEID, RemoteTEID) ->
+        %SGSNaddr = {127,0,0,1}, % TODO: This should be set to the GTP-U IP address provided by the PGW
+        %EUA = {127,0,0,1}, % TODO: This should be set to the EUA IP address provided by the PGW
+        %LocalTEID = 1234, % TODO: this should be set to our locally generated TEID.
+        %RemoteTEID = 56768, % TODO: this should be set to TEID obtained from CreateSessionResponse
+        PeerIP = conv:bin_to_ip(PeerAddr), % TODO: IPv6
+        UEIP = conv:bin_to_ip(EUA#epdg_eua.ipv4), % TODO: IPv6.
+        ok.
+        % TODO: This will be enabled once we depend on the gtp_u_kmod module:
+        %ServRef = get_env_gtp_u_kmod_server_ref(),
+        %gen_server:call(ServRef, {PeerIP, UEIP, LocalTEID, RemoteTEID}).
\ No newline at end of file

osmo-epdg_0.0.0.95.6f47.202402072026.tar.xz/src/gtp_utils.erl -> osmo-epdg_0.0.0.102.7656.202402082026.tar.xz/src/gtp_utils.erl Changed

Changes of Revision 126