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

[M] Change in libosmo-sigtran[master]: asp: Support setting TCP_USER_TIMEOUT over VTY

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40535?usp=email ) Change subject: asp: Support setting TCP_USER_TIMEOUT over VTY ...................................................................... asp: Support setting TCP_USER_TIMEOUT over VTY Change-Id: If3cbc05a304857be7030c684ffd94d929bc8dc23 --- M src/ss7_asp.c M src/ss7_asp.h M src/ss7_asp_vty.c M src/ss7_xua_srv.c M tests/vty/osmo_stp_test.vty 5 files changed, 74 insertions(+), 6 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/src/ss7_asp.c b/src/ss7_asp.c index ca4a4c6..0fea556 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -227,7 +227,7 @@ }; static unsigned int g_ss7_asp_rcg_idx; -int ss7_asp_apply_tcp_keepalive(const struct osmo_ss7_asp *asp) +static int ss7_asp_apply_tcp_keepalive(const struct osmo_ss7_asp *asp) { uint8_t byte = 1; int val; @@ -301,6 +301,38 @@ return 0; } +static int ss7_asp_apply_tcp_user_timeout(const struct osmo_ss7_asp *asp) +{ + int rc = 0; + unsigned int val; + + if (!asp->cfg.tcp.user_timeout_present) + return 0; + + LOGPASP(asp, DLSS7, LOGL_DEBUG, "Setting TCP user-timeout %u ms\n", + asp->cfg.tcp.user_timeout_value); + + val = asp->cfg.tcp.user_timeout_value; + if (asp->server) { + rc = osmo_stream_srv_set_param(asp->server, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_USER_TIMEOUT, + &val, sizeof(val)); + } else if (asp->client) { + rc = osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_USER_TIMEOUT, + &val, sizeof(val)); + } + + return rc; +} + +int ss7_asp_apply_tcp_pars(const struct osmo_ss7_asp *asp) +{ + int rc; + rc = ss7_asp_apply_tcp_keepalive(asp); + if (rc < 0) + return rc; + return ss7_asp_apply_tcp_user_timeout(asp); +} + int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx) { const char *new_loc_addr; @@ -797,7 +829,7 @@ switch (asp->cfg.trans_proto) { case IPPROTO_TCP: - (void)ss7_asp_apply_tcp_keepalive(asp); + (void)ss7_asp_apply_tcp_pars(asp); break; case IPPROTO_SCTP: (void)asp_client_apply_sctp_init_pars(asp); diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 00c6825..6bc0201 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -135,9 +135,11 @@ bool keepalive_time_present; bool keepalive_intvl_present; bool keepalive_probes_present; + bool user_timeout_present; int keepalive_time_value; /* seconds */ int keepalive_intvl_value; /* seconds */ int keepalive_probes_value; + unsigned int user_timeout_value; /* milliseconds */ } tcp; /*! The underlaying transport protocol (one of IPPROTO_*) */ @@ -153,7 +155,7 @@ int ss7_asp_get_fd(const struct osmo_ss7_asp *asp); int ss7_asp_disconnect_stream(struct osmo_ss7_asp *asp); -int ss7_asp_apply_tcp_keepalive(const struct osmo_ss7_asp *asp); +int ss7_asp_apply_tcp_pars(const struct osmo_ss7_asp *asp); int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp); int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp); int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx); diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index 534c1d9..0c79b0f 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -445,9 +445,10 @@ return CMD_SUCCESS; } +#define ASP_TCP_PARAM_DESC "Configure TCP parameters\n" #define ASP_TCP_PARAM_KEEPALIVE_DESC \ - "Configure TCP parameters\n" \ - "Configure TCP keep-alive related parameters\n" \ + ASP_TCP_PARAM_DESC \ + "Configure TCP keep-alive related parameters\n" DEFUN_ATTR(asp_tcp_param_keepalive_enabled, asp_tcp_param_keepalive_enabled_cmd, "tcp-param keepalive enabled", @@ -520,6 +521,33 @@ return CMD_SUCCESS; } +#define ASP_TCP_PARAM_USER_TIMEOUT_DESC \ + ASP_TCP_PARAM_DESC \ + "Configure TCP User Timeout socket option (TCP_USER_TIMEOUT)\n" +DEFUN_ATTR(asp_tcp_param_user_timeout, asp_tcp_param_user_timeout_cmd, + "tcp-param user-timeout <0-65535>", + ASP_TCP_PARAM_USER_TIMEOUT_DESC + "Value of the parameter\n", + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + + asp->cfg.tcp.user_timeout_present = true; + asp->cfg.tcp.user_timeout_value = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN_ATTR(asp_no_tcp_param_user_timeout, asp_no_tcp_param_user_timeout_cmd, + "no tcp-param user-timeout", + NO_STR ASP_TCP_PARAM_USER_TIMEOUT_DESC, + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + asp->cfg.tcp.user_timeout_present = false; + asp->cfg.tcp.user_timeout_value = 0; + return CMD_SUCCESS; +} + DEFUN_ATTR(asp_block, asp_block_cmd, "block", "Allows a SCTP Association with ASP, but doesn't let it become active\n", @@ -1228,6 +1256,8 @@ } else if (asp->cfg.trans_proto == IPPROTO_TCP) { vty_out(vty, " no tcp-param keepalive%s", VTY_NEWLINE); } + if (asp->cfg.tcp.user_timeout_present) + vty_out(vty, " tcp-param user-timeout %u%s", asp->cfg.tcp.user_timeout_value, VTY_NEWLINE); for (i = 0; i < sizeof(uint32_t) * 8; i++) { if (!(asp->cfg.quirks & ((uint32_t) 1 << i))) @@ -1318,6 +1348,8 @@ install_lib_element(L_CS7_ASP_NODE, &asp_tcp_param_keepalive_cfg_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_tcp_param_keepalive_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_tcp_param_keepalive_cfg_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_tcp_param_user_timeout_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_no_tcp_param_user_timeout_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_quirk_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_quirk_cmd); gen_asp_timer_xua_cmd_strs(&asp_timer_xua_cmd); diff --git a/src/ss7_xua_srv.c b/src/ss7_xua_srv.c index b60acf6..077eea0 100644 --- a/src/ss7_xua_srv.c +++ b/src/ss7_xua_srv.c @@ -193,7 +193,7 @@ switch (asp->cfg.trans_proto) { case IPPROTO_TCP: - rc = ss7_asp_apply_tcp_keepalive(asp); + rc = ss7_asp_apply_tcp_pars(asp); break; case IPPROTO_SCTP: rc = ss7_asp_apply_peer_primary_address(asp); diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index b89bb30..2c5b5d8 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -287,6 +287,8 @@ tcp-param keepalive (time|intvl|probes) <0-65535> no tcp-param keepalive no tcp-param keepalive (time|intvl|probes) + tcp-param user-timeout <0-65535> + no tcp-param user-timeout quirk (no_notify|daud_in_asp|snm_inactive) no quirk (no_notify|daud_in_asp|snm_inactive) timer xua (ack|beat) <1-999999> -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40535?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: If3cbc05a304857be7030c684ffd94d929bc8dc23 Gerrit-Change-Number: 40535 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: support using NFT KPI UL/DL address from SCTP

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40547?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: s1ap_proxy: support using NFT KPI UL/DL address from SCTP ...................................................................... s1ap_proxy: support using NFT KPI UL/DL address from SCTP In some deployments the source address of UL GTP-U packets may be different from the bind address indicated by an eNB during E-RAB establishment. Allow the operator to configure the source, from where UL/DL addresses are to be learned: * s1ap - learn from S1AP PDUs (default), * sctp - learn from SCTP address of the eNB. Change-Id: Iae92a42b0ccb1a4bc34f06d969f5270a304b1d3a Related: SYS#7307 --- M config/sys.config M src/s1ap_proxy.erl M src/sctp_proxy.erl M test/s1ap_proxy_test.erl 4 files changed, 54 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/47/40547/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40547?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Iae92a42b0ccb1a4bc34f06d969f5270a304b1d3a Gerrit-Change-Number: 40547 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

2 months, 1 week

1
0
0 0

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

by fixeria

fixeria has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/46/40546/1 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: newchange 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>

2 months, 1 week

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: support using NFT KPI UL/DL address from SCTP

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40547?usp=email ) Change subject: s1ap_proxy: support using NFT KPI UL/DL address from SCTP ...................................................................... s1ap_proxy: support using NFT KPI UL/DL address from SCTP In some deployments the source address of UL GTP-U packets may be different from the bind address indicated by an eNB during E-RAB establishment. Allow the operator to configure the source, from where UL/DL addresses are to be learned: * s1ap - learn from S1AP PDUs (default), * sctp - learn from SCTP address of the eNB. Change-Id: Iae92a42b0ccb1a4bc34f06d969f5270a304b1d3a Related: SYS#7307 --- M config/sys.config M src/s1ap_proxy.erl M src/sctp_proxy.erl 3 files changed, 52 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/47/40547/1 diff --git a/config/sys.config b/config/sys.config index 57cb61c..ef5a7d7 100644 --- a/config/sys.config +++ b/config/sys.config @@ -23,6 +23,8 @@ %% Optional NFT KPI configuration %% {enft_kpi_enable, true}, %% whether to enable the NFT KPI module (default: false) %% {enft_kpi_table_name, "osmo-s1gw"}, %% the NFT table name to be used by this process +%% {enft_kpi_ul_addr, s1ap}, %% GTP-U UL address: s1ap | sctp (default: learn from S1AP) +%% {enft_kpi_dl_addr, s1ap}, %% GTP-U DL address: s1ap | sctp (default: learn from S1AP) %% {enft_kpi_interval, 3000} %% counter reporting interval (ms) ]}, %% ================================================================================ diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 6f63e4c..2e2f464 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -40,7 +40,7 @@ handle_call/3, handle_cast/2, terminate/2]). --export([start_link/0, +-export([start_link/1, process_pdu/2, fetch_erab/2, fetch_erab_list/1, @@ -70,7 +70,8 @@ -type plmn_id() :: {MCC :: nonempty_string(), MNC :: nonempty_string()}. --record(proxy_state, {erabs :: dict:dict(), +-record(proxy_state, {conn_info :: sctp_server:conn_info(), + erabs :: dict:dict(), enb_id :: undefined | non_neg_integer(), plmn_id :: undefined | plmn_id(), mme_ue_id :: undefined | mme_ue_id(), @@ -89,9 +90,11 @@ %% public API %% ------------------------------------------------------------------ --spec start_link() -> gen_server:start_ret(). -start_link() -> - gen_server:start_link(?MODULE, [], []). +-spec start_link(ConnInfo) -> Result + when ConnInfo :: sctp_server:conn_info(), + Result :: gen_server:start_ret(). +start_link(ConnInfo) -> + gen_server:start_link(?MODULE, [ConnInfo], []). -type process_pdu_result() :: {proxy_action(), binary()}. @@ -121,9 +124,10 @@ %% gen_server API %% ------------------------------------------------------------------ -init([]) -> +init([ConnInfo]) -> process_flag(trap_exit, true), - {ok, #proxy_state{erabs = dict:new(), + {ok, #proxy_state{conn_info = ConnInfo, + erabs = dict:new(), path = []}}. @@ -325,10 +329,11 @@ handle_pdu({successfulOutcome, #'SuccessfulOutcome'{procedureCode = ?'id-S1Setup'}}, S) -> ?LOG_DEBUG("Processing S1 SETUP RESPONSE"), - ok = enft_kpi:enb_register(genb_id_str(S)), + enft_kpi_enb_register(S), %% there's nothing to patch in this PDU, so we forward it as-is {forward, S}; + %% 9.1.3.1 E-RAB SETUP REQUEST handle_pdu({Outcome = initiatingMessage, #'InitiatingMessage'{procedureCode = ?'id-E-RABSetup', @@ -652,8 +657,7 @@ 'transportLayerAddress' = TLA_In, 'gTP-TEID' = << TEID_In:32/big >>} = C0, S) -> %% indicate eNB's address to the enft_kpi module - enft_kpi:enb_set_addr({ul, tla_str(TLA_In)}), - enft_kpi:enb_set_addr({dl, tla_str(TLA_In)}), + enft_kpi_enb_set_addr({s1ap, tla_str(TLA_In)}), %% poke E-RAB FSM case erab_fsm_find(ERABId, S) of {ok, Pid} -> @@ -942,8 +946,7 @@ 'transportLayerAddress' = TLA_In, 'gTP-TEID' = << TEID_In:32/big >>} = C0, S) -> %% indicate eNB's address to the enft_kpi module - enft_kpi:enb_set_addr({ul, tla_str(TLA_In)}), - enft_kpi:enb_set_addr({dl, tla_str(TLA_In)}), + enft_kpi_enb_set_addr({s1ap, tla_str(TLA_In)}), %% poke E-RAB FSM case erab_fsm_find(ERABId, S) of {ok, Pid} -> @@ -1051,4 +1054,38 @@ UID = erab_uid(RABId, S), dict:find(UID, ERABs). + +-spec enft_kpi_enb_register(proxy_state()) -> ok. +enft_kpi_enb_register(#proxy_state{conn_info = ConnInfo} = S) -> + %% register eNB using its Global-eNB-ID + ok = enft_kpi:enb_register(genb_id_str(S)), + %% indicate UL/DL addresses + EnbAddr = inet:ntoa(maps:get(addr, ConnInfo)), + enft_kpi_enb_set_addr({sctp, EnbAddr}). + + +-spec enft_kpi_enb_set_addr({Source, EnbAddr}) -> ok + when Source :: s1ap | sctp, + EnbAddr :: string(). +enft_kpi_enb_set_addr({Source, EnbAddr}) -> + enft_kpi_enb_set_addr(enft_kpi_ul_addr, {Source, ul, EnbAddr}), + enft_kpi_enb_set_addr(enft_kpi_dl_addr, {Source, dl, EnbAddr}), + ok. + + +-spec enft_kpi_enb_set_addr(EnvParam, {Source, ULDL, EnbAddr}) -> ok + when EnvParam :: atom(), + Source :: s1ap | sctp, + ULDL :: ul | dl, + EnbAddr :: string(). +enft_kpi_enb_set_addr(EnvParam, {Source, ULDL, EnbAddr}) -> + case osmo_s1gw:get_env(EnvParam, s1ap) of + Source -> + ?LOG_DEBUG("NFT KPI ~p address ~p learned from ~p", + [ULDL, EnbAddr, Source]), + enft_kpi:enb_set_addr({ULDL, EnbAddr}); + Mode -> + ?LOG_DEBUG("NFT KPI ~p address mode ~p != ~p", [ULDL, Mode, Source]) + end. + %% vim:set ts=4 sw=4 et: diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index 14c3a03..d475b20 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -85,7 +85,7 @@ %% ------------------------------------------------------------------ init([ConnInfo, ConnCfg]) -> - {ok, Pid} = s1ap_proxy:start_link(), + {ok, Pid} = s1ap_proxy:start_link(ConnInfo), {ok, connecting, #{enb_aid => maps:get(aid, ConnInfo), conn_cfg => ConnCfg, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40547?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Iae92a42b0ccb1a4bc34f06d969f5270a304b1d3a Gerrit-Change-Number: 40547 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 months, 1 week

1
0
0 0

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

by fixeria

fixeria has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/45/40545/1 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: newchange 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>

2 months, 1 week

1
0
0 0

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

by fixeria

fixeria has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/44/40544/1 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: newchange 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>

2 months, 1 week

1
0
0 0

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

by fixeria

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40281?usp=email to look at the new patch set (#11). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: enft_kpi: retrieve per-eNB traffic counters ...................................................................... enft_kpi: retrieve per-eNB traffic counters Change-Id: I498d2854447a2d53d2abddd38652f3e2bbb1fbdd Related: SYS#7307 --- M config/sys.config M debian/control M include/s1gw_metrics.hrl M rebar.config M rebar.lock A src/enft_kpi.erl M src/osmo_s1gw.app.src M src/osmo_s1gw_sup.erl M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 10 files changed, 684 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/81/40281/11 -- 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: newpatchset 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[XS] Change in libosmo-sigtran[master]: as_vty: Fix 'traffic-mode loadshare' output in 'show running-config'

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40542?usp=email ) Change subject: as_vty: Fix 'traffic-mode loadshare' output in 'show running-config' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40542?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I09ca977885cc4af5caf58f8036285ab321d00b05 Gerrit-Change-Number: 40542 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jun 2025 08:29:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[S] Change in libosmo-sigtran[master]: osmo_ss7_route_print(): Use osmo_ss7_pointcode_print_buf()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40541?usp=email ) Change subject: osmo_ss7_route_print(): Use osmo_ss7_pointcode_print_buf() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40541?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I6a6104e2cc759e79afa6da57d512e6f8436bbb33 Gerrit-Change-Number: 40541 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jun 2025 08:29:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[XS] Change in libosmo-sigtran[master]: as_vty: Remove old TODO in comment

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40540?usp=email ) Change subject: as_vty: Remove old TODO in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40540?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ie9c642709c18593c37ce02e1222f9ae11a3d02cc Gerrit-Change-Number: 40540 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jun 2025 08:24:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2025