July 2025 - gerrit-log - lists.osmocom.org

[S] Change in ...osmo-s1gw[master]: sctp_server: pass conn_info() to the handler

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40546?usp=email ) Change subject: sctp_server: pass conn_info() to the handler ...................................................................... sctp_server: pass conn_info() to the handler Pass more information about the SCTP connection to the handler. This will be used in a follow-up patch to obtain the eNB's address. Change-Id: I959cfb2b8eeb93d8c53e0a84fcc4c917ed4aac51 Related: SYS#7307 --- M src/sctp_client.erl M src/sctp_proxy.erl M src/sctp_server.erl 3 files changed, 15 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/sctp_client.erl b/src/sctp_client.erl index bea3c16..30152d2 100644 --- a/src/sctp_client.erl +++ b/src/sctp_client.erl @@ -57,8 +57,8 @@ %% behavior callbacks %% ------------------------------------------------------------------ --callback start_link(Aid, Priv) -> Result - when Aid :: gen_sctp:assoc_id(), +-callback start_link(ConnInfo, Priv) -> Result + when ConnInfo :: sctp_server:conn_info(), Priv :: term(), Result :: {ok, pid()} | term(). diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index e208d95..14c3a03 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -57,12 +57,12 @@ %% public API %% ------------------------------------------------------------------ --spec start_link(Aid, ConnCfg) -> Result - when Aid :: gen_sctp:assoc_id(), - ConnCfg :: sctp_client:cfg(), +-spec start_link(ConnInfo, Priv) -> Result + when ConnInfo :: sctp_server:conn_info(), + Priv :: sctp_client:cfg(), Result :: gen_statem:start_ret(). -start_link(Aid, ConnCfg) -> - gen_statem:start_link(?MODULE, [Aid, ConnCfg], []). +start_link(ConnInfo, Priv) -> + gen_statem:start_link(?MODULE, [ConnInfo, Priv], []). -spec send_data(pid(), binary()) -> ok. @@ -84,10 +84,10 @@ %% gen_statem API %% ------------------------------------------------------------------ -init([Aid, ConnCfg]) -> +init([ConnInfo, ConnCfg]) -> {ok, Pid} = s1ap_proxy:start_link(), {ok, connecting, - #{enb_aid => Aid, + #{enb_aid => maps:get(aid, ConnInfo), conn_cfg => ConnCfg, tx_queue => [], handler => Pid}}. diff --git a/src/sctp_server.erl b/src/sctp_server.erl index 7456d78..1eeb075 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -68,7 +68,8 @@ priv => term() }. --export_type([cfg/0]). +-export_type([cfg/0, + conn_info/0]). -record(client_state, {addr_port :: addr_port(), @@ -249,7 +250,10 @@ #server_state{clients = Clients, handler = Handler, priv = Priv} = S) -> - {ok, Pid} = Handler:start_link(Aid, Priv), + ConnInfo = #{aid => Aid, + addr => FromAddr, + port => FromPort}, + {ok, Pid} = Handler:start_link(ConnInfo, Priv), s1gw_metrics:gauge_inc(?S1GW_GAUGE_S1AP_ENB_NUM_SCTP_CONNECTIONS), NewClient = #client_state{addr_port = {FromAddr, FromPort}, pid = Pid}, S#server_state{clients = dict:store(Aid, NewClient, Clients)}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40546?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: I959cfb2b8eeb93d8c53e0a84fcc4c917ed4aac51 Gerrit-Change-Number: 40546 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de>

4 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: osmo_s1gw: move get_env/2 here and export it

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40544?usp=email ) Change subject: osmo_s1gw: move get_env/2 here and export it ...................................................................... osmo_s1gw: move get_env/2 here and export it This allows using osmo_s1gw:get_env/2 from other modules too. Change-Id: Ie7f29210e759be1a8a3f97533ab724049e70abae --- M src/osmo_s1gw.erl M src/osmo_s1gw_sup.erl 2 files changed, 30 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo_s1gw.erl b/src/osmo_s1gw.erl index 71ac34c..d5f9efd 100644 --- a/src/osmo_s1gw.erl +++ b/src/osmo_s1gw.erl @@ -34,7 +34,23 @@ -module(osmo_s1gw). --export([main/1]). +-export([get_env/2, + main/1]). + +-define(ENV_APP_NAME, osmo_s1gw). + + +%% ------------------------------------------------------------------ +%% public API +%% ------------------------------------------------------------------ + +-spec get_env(Param, Default) -> Value + when Param :: atom(), + Default :: term(), + Value :: term(). +get_env(Param, Default) -> + application:get_env(?ENV_APP_NAME, Param, Default). + main(_Args) -> application:ensure_all_started(?MODULE), diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index 92f908b..279ad02 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -41,7 +41,6 @@ -include("s1ap.hrl"). -define(SERVER, ?MODULE). --define(ENV_APP_NAME, osmo_s1gw). -define(ENV_DEFAULT_SCTP_BUFSZ, 65536). -define(ENV_DEFAULT_SCTP_NODELAY, true). -define(ENV_DEFAULT_S1GW_BIND_ADDR, "127.0.1.1"). @@ -61,8 +60,8 @@ init([]) -> - PfcpLocAddr = get_env(pfcp_loc_addr, ?ENV_DEFAULT_PFCP_LOC_ADDR), - PfcpRemAddr = get_env(pfcp_rem_addr, ?ENV_DEFAULT_PFCP_REM_ADDR), + PfcpLocAddr = osmo_s1gw:get_env(pfcp_loc_addr, ?ENV_DEFAULT_PFCP_LOC_ADDR), + PfcpRemAddr = osmo_s1gw:get_env(pfcp_rem_addr, ?ENV_DEFAULT_PFCP_REM_ADDR), SctpServer = {sctp_server, {sctp_server, start_link, [server_cfg()]}, permanent, @@ -84,28 +83,25 @@ %% private API %% ------------------------------------------------------------------ -get_env(Param, Default) -> - application:get_env(?ENV_APP_NAME, Param, Default). - -spec client_cfg() -> sctp_client:cfg(). client_cfg() -> - SockOpts = #{sctp_nodelay => get_env(mme_nodelay, ?ENV_DEFAULT_SCTP_NODELAY), - recbuf => get_env(mme_recbuf, ?ENV_DEFAULT_SCTP_BUFSZ), - sndbuf => get_env(mme_sndbuf, ?ENV_DEFAULT_SCTP_BUFSZ)}, - #{laddr => get_env(mme_loc_addr, ?ENV_DEFAULT_MME_LOC_ADDR), - raddr => get_env(mme_rem_addr, ?ENV_DEFAULT_MME_REM_ADDR), - rport => get_env(mme_rem_port, ?ENV_DEFAULT_MME_REM_PORT), + SockOpts = #{sctp_nodelay => osmo_s1gw:get_env(mme_nodelay, ?ENV_DEFAULT_SCTP_NODELAY), + recbuf => osmo_s1gw:get_env(mme_recbuf, ?ENV_DEFAULT_SCTP_BUFSZ), + sndbuf => osmo_s1gw:get_env(mme_sndbuf, ?ENV_DEFAULT_SCTP_BUFSZ)}, + #{laddr => osmo_s1gw:get_env(mme_loc_addr, ?ENV_DEFAULT_MME_LOC_ADDR), + raddr => osmo_s1gw:get_env(mme_rem_addr, ?ENV_DEFAULT_MME_REM_ADDR), + rport => osmo_s1gw:get_env(mme_rem_port, ?ENV_DEFAULT_MME_REM_PORT), sockopts => maps:to_list(SockOpts)}. -spec server_cfg() -> sctp_server:cfg(). server_cfg() -> - SockOpts = #{sctp_nodelay => get_env(s1gw_nodelay, ?ENV_DEFAULT_SCTP_NODELAY), - recbuf => get_env(s1gw_recbuf, ?ENV_DEFAULT_SCTP_BUFSZ), - sndbuf => get_env(s1gw_sndbuf, ?ENV_DEFAULT_SCTP_BUFSZ)}, - #{laddr => get_env(s1gw_bind_addr, ?ENV_DEFAULT_S1GW_BIND_ADDR), - lport => get_env(s1gw_bind_port, ?ENV_DEFAULT_S1GW_BIND_PORT), + SockOpts = #{sctp_nodelay => osmo_s1gw:get_env(s1gw_nodelay, ?ENV_DEFAULT_SCTP_NODELAY), + recbuf => osmo_s1gw:get_env(s1gw_recbuf, ?ENV_DEFAULT_SCTP_BUFSZ), + sndbuf => osmo_s1gw:get_env(s1gw_sndbuf, ?ENV_DEFAULT_SCTP_BUFSZ)}, + #{laddr => osmo_s1gw:get_env(s1gw_bind_addr, ?ENV_DEFAULT_S1GW_BIND_ADDR), + lport => osmo_s1gw:get_env(s1gw_bind_port, ?ENV_DEFAULT_S1GW_BIND_PORT), sockopts => maps:to_list(SockOpts), handler => sctp_proxy, priv => client_cfg()}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40544?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: Ie7f29210e759be1a8a3f97533ab724049e70abae Gerrit-Change-Number: 40544 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de>

4 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_server: add type spec for clients dict

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40545?usp=email ) Change subject: sctp_server: add type spec for clients dict ...................................................................... sctp_server: add type spec for clients dict Change-Id: Ic7c3eac18e31cc047d4aa6ce80930723395dd066 --- M src/sctp_server.erl 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sctp_server.erl b/src/sctp_server.erl index 34b2381..7456d78 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -71,16 +71,17 @@ -export_type([cfg/0]). --record(server_state, {sock :: gen_sctp:sctp_socket(), - clients :: dict:dict(), - handler :: module(), - priv :: term() - }). - -record(client_state, {addr_port :: addr_port(), pid :: pid() | undefined }). +-record(server_state, {sock :: gen_sctp:sctp_socket(), + clients :: dict:dict(K :: gen_sctp:assoc_id(), + V :: #client_state{}), + handler :: module(), + priv :: term() + }). + %% ------------------------------------------------------------------ %% public API -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40545?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: Ic7c3eac18e31cc047d4aa6ce80930723395dd066 Gerrit-Change-Number: 40545 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de>

4 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: enft_kpi: flush the table on init

by laforge

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532?usp=email ) Change subject: enft_kpi: flush the table on init ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532?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: I96bf4f7b6d5c9104fad0d6f98eda56e7a4e4fa7d Gerrit-Change-Number: 40532 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Jul 2025 17:57:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: enft_kpi: enb_set_addr/1: restrict ULDL values

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40531?usp=email ) Change subject: enft_kpi: enb_set_addr/1: restrict ULDL values ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40531?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: I4e6bc5b392db334f5c79f30076e5e864af1db27d Gerrit-Change-Number: 40531 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Jul 2025 17:57:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 weeks

1
0
0 0

[L] Change in ...osmo-s1gw[master]: enft_kpi: retrieve per-eNB traffic counters

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40281?usp=email ) Change subject: enft_kpi: retrieve per-eNB traffic counters ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40281?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: I498d2854447a2d53d2abddd38652f3e2bbb1fbdd Gerrit-Change-Number: 40281 Gerrit-PatchSet: 11 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Jul 2025 17:56:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_server: pass conn_info() to the handler

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40546?usp=email ) Change subject: sctp_server: pass conn_info() to the handler ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40546?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: I959cfb2b8eeb93d8c53e0a84fcc4c917ed4aac51 Gerrit-Change-Number: 40546 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Jul 2025 17:56:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_server: add type spec for clients dict

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40545?usp=email ) Change subject: sctp_server: add type spec for clients dict ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40545?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: Ic7c3eac18e31cc047d4aa6ce80930723395dd066 Gerrit-Change-Number: 40545 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Jul 2025 17:55:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: osmo_s1gw: move get_env/2 here and export it

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40544?usp=email ) Change subject: osmo_s1gw: move get_env/2 here and export it ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40544?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: Ie7f29210e759be1a8a3f97533ab724049e70abae Gerrit-Change-Number: 40544 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Jul 2025 16:47:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: Indicate PC (un)availability from address-book when AS goes up/down

by pespin

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40563?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Indicate PC (un)availability from address-book when AS goes up/down ...................................................................... Indicate PC (un)availability from address-book when AS goes up/down These are generally PCs the user wants to get information about, and they may have no fully-qualified route because: - user may not have configured such fully qualified route, but a summary route (eg. 0.0.0/0 default route). - peer SG may have not announced them (DAVA/DUNA) Change-Id: I8b15b2ce46ced1be8fb6467cb3239337731b1090 --- M src/ss7_route_table.c M src/ss7_route_table.h M src/xua_as_fsm.c 3 files changed, 96 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/63/40563/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40563?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I8b15b2ce46ced1be8fb6467cb3239337731b1090 Gerrit-Change-Number: 40563 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org>

4 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2025