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

[M] Change in osmo-hlr[master]: subscriber-create-on-demand: rework configuration

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-hlr/+/37779?usp=email ) Change subject: subscriber-create-on-demand: rework configuration ...................................................................... Patch Set 1: (1 comment) File src/hlr_vty.c: https://gerrit.osmocom.org/c/osmo-hlr/+/37779/comment/b998d013_4fa65ecf?usp… : PS1, Line 300: vty_out(vty, " no subscriber-create-on-demand%s", VTY_NEWLINE); > This is the default, I thought we omit these. […] Well, I believe printing a setting explicitly is better than omitting values. I expected to get some questions here, let's see what others think. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/37779?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib553172655f83dad1ac0e0254615c8c207d79ca9 Gerrit-Change-Number: 37779 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Aug 2024 12:35:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 year, 1 month

1
0
0 0

[S] Change in osmo-upf[master]: move pfcp_tool.h to include/osmocom/pfcptool/

by laforge

Attention is currently required from: neels. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-upf/+/37763?usp=email ) Change subject: move pfcp_tool.h to include/osmocom/pfcptool/ ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37763?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: If3e7cc4df3defd08df9e75965715a1be0388ed01 Gerrit-Change-Number: 37763 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Aug 2024 12:35:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 year, 1 month

1
0
0 0

[XS] Change in ...osmo_dia2gsup[master]: osmo_dia2gsup.service: use /etc/osmocom/osmo-dia2gsup.config

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/37718?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: osmo_dia2gsup.service: use /etc/osmocom/osmo-dia2gsup.config ...................................................................... osmo_dia2gsup.service: use /etc/osmocom/osmo-dia2gsup.config Related: OS#6148 Change-Id: I5ff07341597b2838bce0750a576e463addd2964f --- M contrib/systemd/osmo_dia2gsup.service 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/osmo_dia2gsup.service b/contrib/systemd/osmo_dia2gsup.service index e3d092e..e8359b8 100644 --- a/contrib/systemd/osmo_dia2gsup.service +++ b/contrib/systemd/osmo_dia2gsup.service @@ -12,6 +12,7 @@ User=osmocom Group=osmocom Environment="HOME=/var/lib/osmo_dia2gsup" +Environment="ERL_FLAGS=-config /etc/osmocom/osmo-dia2gsup.config" ExecStart=/usr/bin/osmo-dia2gsup foreground RestartSec=2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/37718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I5ff07341597b2838bce0750a576e463addd2964f Gerrit-Change-Number: 37718 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 year, 1 month

1
0
0 0

[XS] Change in osmo-sgsn[master]: includes: sgsn.h: use full path include for gtp.h

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37752?usp=email ) Change subject: includes: sgsn.h: use full path include for gtp.h ...................................................................... includes: sgsn.h: use full path include for gtp.h The gtp header of ggsn have been moved to osmocom/gtp/gtp.h for a while. Use the full path to prevent clashs with older versions Change-Id: I764644110c0f332b18117e1e8311ddc55eafd5fa --- M include/osmocom/sgsn/sgsn.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 6e93178..9e09184 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -21,7 +21,7 @@ #endif #include <ares.h> -#include <gtp.h> +#include <osmocom/gtp/gtp.h> struct hostent; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37752?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I764644110c0f332b18117e1e8311ddc55eafd5fa Gerrit-Change-Number: 37752 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 year, 1 month

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: hnodeb: initial testenv.cfg

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37703?usp=email ) Change subject: hnodeb: initial testenv.cfg ...................................................................... hnodeb: initial testenv.cfg Change-Id: I13422e5cef3013992949029f847c90043ab4a4fc --- A hnodeb/testenv.cfg 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnodeb/testenv.cfg b/hnodeb/testenv.cfg new file mode 100644 index 0000000..9505146 --- /dev/null +++ b/hnodeb/testenv.cfg @@ -0,0 +1,9 @@ +[testsuite] +program=HNB_Tests +config=HNB_Tests.cfg + +[hnodeb] +program=osmo-hnodeb +make=osmo-hnodeb +package=osmo-hnodeb +copy=osmo-hnodeb.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37703?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I13422e5cef3013992949029f847c90043ab4a4fc Gerrit-Change-Number: 37703 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 year, 1 month

1
0
0 0

[S] Change in ...osmo-s1gw[master]: Makefile: add 'install' target

by fixeria

Attention is currently required from: laforge, osmith. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37728?usp=email ) Change subject: Makefile: add 'install' target ...................................................................... Patch Set 3: (1 comment) File Makefile: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37728/comment/fb2217c9_64e2… : PS2, Line 36: install -m 0644 -T config/sys.config $(DESTDIR)$(CONFDIR)/osmo-s1gw.config > As in the other patch, I suggest using install -Dm644 etc. […] Done -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If4901adb648c98d52dbc0abd97413c20503fb278 Gerrit-Change-Number: 37728 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 05 Aug 2024 17:00:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 year, 1 month

1
0
0 0

[M] Change in pysim[master]: ara_m: add export support for the ARA-M application

by dexter

Attention is currently required from: fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/37643?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by fixeria, Verified+1 by Jenkins Builder Change subject: ara_m: add export support for the ARA-M application ...................................................................... ara_m: add export support for the ARA-M application This patch adds an export method to the CardApplicationARAM class. This method reads the ARA-M configuration and transforms it into executeable command lines, which can be executed as a script later to restore an ARA-M configuration. Related: OS#6092 Change-Id: I811cb9d25cb8ee194b4ead5fb2cabf1fdc0c1c43 --- M pySim/ara_m.py 1 file changed, 81 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/37643/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37643?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I811cb9d25cb8ee194b4ead5fb2cabf1fdc0c1c43 Gerrit-Change-Number: 37643 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 year, 1 month

1
0
0 0

[XS] Change in osmo-mgw[master]: mgcp_network: use an uint16_t to store the port number

by dexter

Attention is currently required from: fixeria, laforge, neels. Hello Jenkins Builder, fixeria, laforge, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/37776?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge Change subject: mgcp_network: use an uint16_t to store the port number ...................................................................... mgcp_network: use an uint16_t to store the port number The comment in struct mgcp_rtp_end says that the RTCP port number has to be stored in network byte order. Such a port number is 16 bit long, so let's use an uint16_t instead of an int here. Related: OS#6527 Change-Id: I392b07b243389a78d4ad1d784cdfdc28ec59b487 --- M include/osmocom/mgcp/mgcp_network.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/76/37776/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/37776?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I392b07b243389a78d4ad1d784cdfdc28ec59b487 Gerrit-Change-Number: 37776 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 year, 1 month

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/osmocom-depcheck: update default project

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/37769?usp=email ) Change subject: jobs/osmocom-depcheck: update default project ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37769?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I47d56f599e1b404412998334ab54c474cebe8b04 Gerrit-Change-Number: 37769 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Aug 2024 11:34:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 year, 1 month

1
0
0 0

[L] Change in ...osmo-s1gw[master]: pfcp_peer: PFCP peer implementation

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37268?usp=email ) Change subject: pfcp_peer: PFCP peer implementation ...................................................................... pfcp_peer: PFCP peer implementation Change-Id: I7bad0069dca2111006039d12e744a2bd6d2cb86e --- M config/sys.config M src/osmo_s1gw.app.src M src/osmo_s1gw_sup.erl A src/pfcp_peer.erl 4 files changed, 416 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/config/sys.config b/config/sys.config index cf8ff34..99930cc 100644 --- a/config/sys.config +++ b/config/sys.config @@ -13,7 +13,9 @@ {osmo_s1gw, [{s1gw_bind_addr, "127.0.1.1"}, %% S1GW bind address for incoming eNB connections {mme_loc_addr, "127.0.2.1"}, %% local address for outgoing connections to the MME - {mme_rem_addr, "127.0.2.10"} %% remote address for outgoing connections to the MME + {mme_rem_addr, "127.0.2.10"}, %% remote address for outgoing connections to the MME + {upf_loc_addr, "127.0.1.1"}, %% local address for outgoing connections to the UPF + {upf_rem_addr, "127.0.1.2"} %% remote address for outgoing connections to the UPF ]}, %% ================================================================================ %% kernel config diff --git a/src/osmo_s1gw.app.src b/src/osmo_s1gw.app.src index 6fd8174..8bb89de 100644 --- a/src/osmo_s1gw.app.src +++ b/src/osmo_s1gw.app.src @@ -7,7 +7,8 @@ {applications, [ kernel, stdlib, - logger_color_formatter + logger_color_formatter, + pfcplib ]}, {modules, []}, {mod, {osmo_s1gw_app, []}}, diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index e13cd1a..7bfd53f 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -47,6 +47,8 @@ -define(ENV_DEFAULT_MME_LOC_ADDR, "127.0.2.1"). -define(ENV_DEFAULT_MME_REM_ADDR, "127.0.2.10"). -define(ENV_DEFAULT_MME_REM_PORT, ?S1AP_PORT). +-define(ENV_DEFAULT_UPF_LOC_ADDR, "127.0.1.1"). +-define(ENV_DEFAULT_UPF_REM_ADDR, "127.0.1.2"). %% ------------------------------------------------------------------ %% supervisor API @@ -62,6 +64,9 @@ MmeLocAddr = get_env(mme_loc_addr, ?ENV_DEFAULT_MME_LOC_ADDR), MmeRemAddr = get_env(mme_rem_addr, ?ENV_DEFAULT_MME_REM_ADDR), MmeRemPort = get_env(mme_rem_port, ?ENV_DEFAULT_MME_REM_PORT), + UpfLocAddr = get_env(upf_loc_addr, ?ENV_DEFAULT_UPF_LOC_ADDR), + UpfRemAddr = get_env(upf_rem_addr, ?ENV_DEFAULT_UPF_REM_ADDR), + SctpServer = {sctp_server, {sctp_server, start_link, [S1GWBindAddr, S1GWBindPort, {{MmeLocAddr, MmeRemAddr}, MmeRemPort}]}, @@ -69,7 +74,14 @@ 5000, worker, [sctp_server]}, - {ok, {{one_for_all, 5, 10}, [SctpServer]}}. + PfcpPeer = {pfcp_peer, {pfcp_peer, start_link, + [UpfLocAddr, UpfRemAddr]}, + permanent, + 5000, + worker, + [pfcp_peer]}, + + {ok, {{one_for_one, 5, 10}, [SctpServer, PfcpPeer]}}. %% ------------------------------------------------------------------ diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl new file mode 100644 index 0000000..dc36c1f --- /dev/null +++ b/src/pfcp_peer.erl @@ -0,0 +1,398 @@ +%% Copyright (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +%% Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> +%% +%% All Rights Reserved +%% +%% SPDX-License-Identifier: AGPL-3.0-or-later +%% +%% 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 <https://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 https://www.erlang.org (or a modified version of these +%% libraries), containing parts covered by the terms of the Erlang Public +%% License (https://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(pfcp_peer). +-behaviour(gen_statem). + +-export([init/1, + callback_mode/0, + connecting/3, + connected/3, + code_change/4, + terminate/3]). +-export([start_link/2, + seid_alloc/0, + session_establish_req/3, + session_modify_req/3, + session_delete_req/1, + shutdown/0]). + +-include_lib("kernel/include/logger.hrl"). +-include_lib("pfcplib/include/pfcp_packet.hrl"). + +%% 3GPP TS 29.244, section 4.2 "UDP Header and Port Numbers" +-define(PFCP_PORT, 8805). + +-type pfcp_session_rsp() :: ok | {error, term()}. + +-type pfcp_msg_type() :: atom(). +-type pfcp_seq_nr() :: 0..16#ffffff. +-type pfcp_seid() :: 0..16#ffffffffffffffff. +-type pfcp_f_seid() :: #f_seid{}. +-type pfcp_ies() :: [term()] | map() | binary(). +-type pfcp_msg() :: {pfcp_msg_type(), pfcp_ies()}. +-type pfcp_pdu() :: #pfcp{}. + +-export_type([pfcp_session_rsp/0, + pfcp_msg_type/0, + pfcp_seq_nr/0, + pfcp_seid/0, + pfcp_ies/0, + pfcp_msg/0, + pfcp_pdu/0]). + +-record(peer_state, {seid :: pfcp_seid(), + sock :: gen_udp:socket(), + loc_addr :: inet:ip_address(), + rem_addr :: inet:ip_address(), + seq_nr :: pfcp_seq_nr(), + registry :: dict:dict() + }). + +-type peer_state() :: #peer_state{}. + +%% ------------------------------------------------------------------ +%% public API +%% ------------------------------------------------------------------ + +start_link(LocAddr, RemAddr) -> + gen_statem:start_link({local, ?MODULE}, ?MODULE, + [LocAddr, RemAddr], + []). + + +%% Request to allocate a unique SEID +-spec seid_alloc() -> {ok, pfcp_seid()} | + {error, term()}. +seid_alloc() -> + gen_statem:call(?MODULE, ?FUNCTION_NAME). + + +-spec session_establish_req(pfcp_seid(), list(), list()) -> pfcp_session_rsp(). +session_establish_req(SEID, PDRs, FARs) -> + gen_statem:call(?MODULE, {?FUNCTION_NAME, SEID, PDRs, FARs}). + + +-spec session_modify_req(pfcp_seid(), list(), list()) -> pfcp_session_rsp(). +session_modify_req(SEID, PDRs, FARs) -> + gen_statem:call(?MODULE, {?FUNCTION_NAME, SEID, PDRs, FARs}). + + +-spec session_delete_req(pfcp_seid()) -> pfcp_session_rsp(). +session_delete_req(SEID) -> + gen_statem:call(?MODULE, {?FUNCTION_NAME, SEID}). + + +shutdown() -> + gen_statem:stop(?MODULE). + + +%% ------------------------------------------------------------------ +%% gen_server API +%% ------------------------------------------------------------------ + +init([LocAddrStr, RemAddr]) when is_list(LocAddrStr) -> + {ok, LocAddr} = inet:parse_address(LocAddrStr), + init([LocAddr, RemAddr]); + +init([LocAddr, RemAddrStr]) when is_list(RemAddrStr) -> + {ok, RemAddr} = inet:parse_address(RemAddrStr), + init([LocAddr, RemAddr]); + +init([LocAddr, RemAddr]) -> + process_flag(trap_exit, true), + {ok, Sock} = gen_udp:open(?PFCP_PORT, [binary, + {ip, LocAddr}, + {reuseaddr, true}, + {active, true}]), + ?LOG_INFO("PFCP peer @ ~p will talk to UPF @ ~p", [LocAddr, RemAddr]), + {ok, connecting, #peer_state{seid = 0, + sock = Sock, + loc_addr = LocAddr, + rem_addr = RemAddr, + seq_nr = 0, + registry = dict:new()}}. + + +callback_mode() -> + [state_functions, state_enter]. + + +%% CONNECTING state +connecting(enter, OldState, + #peer_state{} = S0) -> + ?LOG_INFO("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), + %% Tx PFCP Association Setup + {ok, S1} = send_assoc_setup(S0), + {next_state, connecting, S1, + [{state_timeout, 2_000, assoc_setup_timeout}]}; + +%% Handle Association Setup timeout +connecting(state_timeout, assoc_setup_timeout, _S) -> + {stop, {shutdown, assoc_setup_timeout}}; + +%% Handle incoming PFCP PDU(s) +connecting(info, {udp, Sock, _FromIp, _FromPort, Data}, + #peer_state{sock = Sock} = S) -> + case decode_pdu(Data, S) of + #pfcp{type = association_setup_response, + ie = #{pfcp_cause := 'Request accepted'}} -> + ?LOG_INFO("Rx Association Setup Response (Request accepted)"), + {next_state, connected, S}; + #pfcp{type = association_setup_response, + ie = #{pfcp_cause := Cause}} -> + ?LOG_ERROR("Rx Association Setup Response (~p)", [Cause]), + {stop, {shutdown, assoc_setup_nack}}; + PDU -> + ?LOG_NOTICE("Rx unexpected PFCP PDU: ~p", [PDU]), + {keep_state, S} + end; + +connecting(Event, EventData, S) -> + handle_event(?FUNCTION_NAME, Event, EventData, S). + + +%% CONNECTED state +connected(enter, OldState, S) -> + ?LOG_INFO("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), + {keep_state, S}; + +connected({call, From}, + {session_establish_req, SEID, PDRs, FARs}, + #peer_state{} = S0) -> + {Result, S1} = send_session_establish_req(SEID, PDRs, FARs, S0), + {keep_state, S1, [{reply, From, Result}]}; + +connected({call, From}, + {session_modify_req, SEID, PDRs, FARs}, + #peer_state{} = S0) -> + {Result, S1} = send_session_modify_req(SEID, PDRs, FARs, S0), + {keep_state, S1, [{reply, From, Result}]}; + +connected({call, From}, + {session_delete_req, SEID}, + #peer_state{} = S0) -> + {Result, S1} = send_session_delete_req(SEID, S0), + {keep_state, S1, [{reply, From, Result}]}; + +%% Handle incoming PFCP PDU(s) +connected(info, {udp, Sock, _FromIp, _FromPort, Data}, + #peer_state{sock = Sock} = S) -> + PDU = decode_pdu(Data, S), + route_pdu(PDU, S), + {keep_state, S}; + +%% Catch-all handler for this state +connected(Event, EventData, S) -> + handle_event(?FUNCTION_NAME, Event, EventData, S). + + +%% Event handler for all states +handle_event(_State, + {call, From}, seid_alloc, + #peer_state{seid = SEID} = S0) -> + {Pid, _Ref} = From, + S1 = registry_add(Pid, S0), + {keep_state, S1, + [{reply, From, {ok, SEID}}]}; + +handle_event(_State, + info, {'DOWN', Ref, process, Pid, _Reason}, + #peer_state{} = S0) -> + S1 = registry_del({Pid, Ref}, S0), + {keep_state, S1}; + +handle_event(State, Event, EventData, S) -> + ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), + {keep_state, S}. + + +code_change(_Vsn, State, S, _Extra) -> + {ok, State, S}. + + +terminate(Reason, State, S) -> + ?LOG_NOTICE("Terminating in state ~p, reason ~p", [State, Reason]), + case State of + connected -> + send_assoc_release(S); + _ -> + nop + end, + gen_udp:close(S#peer_state.sock), + ok. + + +%% ------------------------------------------------------------------ +%% private API +%% ------------------------------------------------------------------ + +-spec registry_add(pid(), peer_state()) -> peer_state(). +registry_add(Pid, #peer_state{registry = Reg, + seid = SEID} = S) -> + Ref = erlang:monitor(process, Pid), + NReg = dict:store(SEID, {Pid, Ref}, Reg), + ?LOG_DEBUG("Allocated SEID ~p to process ~p", [SEID, Pid]), + S#peer_state{registry = NReg, + seid = SEID + 1}. + + +-spec registry_del({pid(), reference()}, peer_state()) -> peer_state(). +registry_del({Pid, Ref}, #peer_state{registry = Reg} = S) -> + ?LOG_DEBUG("Unregister process ~p", [Pid]), + Fun = fun(_Key, Val) -> Val =/= {Pid, Ref} end, + NReg = dict:filter(Fun, Reg), + S#peer_state{registry = NReg}. + + +-spec decode_pdu(binary(), peer_state()) -> pfcp_pdu(). +decode_pdu(Data, _S) -> + ?LOG_DEBUG("Rx encoded PFCP PDU: ~p", [Data]), + PDU = pfcp_packet:decode(Data), + ?LOG_DEBUG("Rx PFCP PDU: ~p", [PDU]), + %% TODO: check PDU#pfcp.seq_no + %% TODO: there can be batched PDUs + PDU. + + +-spec route_pdu(pfcp_pdu(), peer_state()) -> term(). +route_pdu(#pfcp{seid = SEID} = PDU, + #peer_state{registry = Reg}) -> + case dict:find(SEID, Reg) of + {ok, {Pid, _Ref}} -> + ?LOG_DEBUG("PFCP PDU routed to ~p", [Pid]), + Pid ! PDU; %% XXX: we may crash here + error -> + ?LOG_NOTICE("PFCP PDU cannot be routed: ~p", [PDU]) + end. + + +-spec send_data(binary(), peer_state()) -> ok | {error, term()}. +send_data(Data, #peer_state{sock = Sock, + rem_addr = RemAddr}) -> + ?LOG_DEBUG("Tx encoded PFCP PDU: ~p", [Data]), + gen_udp:send(Sock, RemAddr, ?PFCP_PORT, Data). + + +-spec send_pdu(pfcp_msg(), peer_state()) -> {ok, peer_state()} | + {{error, term()}, peer_state()}. +send_pdu({MsgType, IEs}, S) -> + send_pdu(undefined, {MsgType, IEs}, S). + +-spec send_pdu(pfcp_seid() | undefined, + pfcp_msg(), peer_state()) -> {ok, peer_state()} | + {{error, term()}, peer_state()}. +send_pdu(SEID, {MsgType, IEs}, + #peer_state{seq_nr = SeqNr} = S) -> + PDU = #pfcp{version = v1, + type = MsgType, + seid = SEID, + seq_no = SeqNr, + ie = IEs}, + ?LOG_DEBUG("Tx PFCP PDU: ~p", [PDU]), + Data = pfcp_packet:encode(PDU), + case send_data(Data, S) of + ok -> + {ok, S#peer_state{seq_nr = SeqNr + 1}}; + {error, Error} -> + {{error, Error}, S} + end. + + +-spec get_node_id(peer_state()) -> binary(). +get_node_id(#peer_state{loc_addr = LocAddr}) -> + list_to_binary(tuple_to_list(LocAddr)). + + +-spec get_recovery_timestamp() -> pos_integer(). +get_recovery_timestamp() -> + {NowMS, NowS, _NowUS} = erlang:timestamp(), + %% erlang:timestamp() returns time relative to the UNIX epoch (1970), + %% but for PFCP we need time relative to the NTP era 0 (1900). + %% 2208988800 is the diff between 1900 and 1970. + NowMS * 1_000_000 + NowS + 2208988800. + + +-spec get_f_seid(pfcp_seid(), peer_state()) -> pfcp_f_seid(). +get_f_seid(SEID, S) -> + IE = #f_seid{seid = SEID, + ipv4 = undefined, + ipv6 = undefined}, + NodeId = get_node_id(S), + case byte_size(NodeId) of + 4 -> IE#f_seid{ipv4 = NodeId}; + 6 -> IE#f_seid{ipv6 = NodeId}; + _ -> IE %% shall not happen + end. + + +%% 6.2.6 PFCP Association Setup Procedure +%% 7.4.4.1 PFCP Association Setup Request +send_assoc_setup(S) -> + IEs = #{node_id => #node_id{id = get_node_id(S)}, + recovery_time_stamp => #recovery_time_stamp{time = get_recovery_timestamp()}}, + send_pdu({association_setup_request, IEs}, S). + + +%% 6.2.8 PFCP Association Release Procedure +%% 7.4.4.5 PFCP Association Release Request +send_assoc_release(S) -> + IEs = #{node_id => #node_id{id = get_node_id(S)}}, + send_pdu({association_release_request, IEs}, S). + + +%% 6.3.2 PFCP Session Establishment Procedure +%% 7.5.2 PFCP Session Establishment Request +send_session_establish_req(F_SEID, PDRs, FARs, S) -> + IEs = #{node_id => #node_id{id = get_node_id(S)}, + f_seid => get_f_seid(F_SEID, S), + create_pdr => PDRs, + create_far => FARs}, + send_pdu(16#00, {session_establishment_request, IEs}, S). + + +%% 6.3.3 PFCP Session Modification Procedure +%% 7.5.4 PFCP Session Modification Request +send_session_modify_req(SEID, PDRs, FARs, S) -> + IEs = #{update_pdr => PDRs, + update_far => FARs}, + send_pdu(SEID, {session_modification_request, IEs}, S). + + +%% 6.3.4 PFCP Session Deletion Procedure +%% 7.5.6 PFCP Session Deletion Request +send_session_delete_req(SEID, S) -> + send_pdu(SEID, {session_deletion_request, []}, S). + +%% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37268?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I7bad0069dca2111006039d12e744a2bd6d2cb86e Gerrit-Change-Number: 37268 Gerrit-PatchSet: 11 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2024