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

[XS] Change in ...osmo-s1gw[master]: sctp_{client,server}: set sndbuf/recbuf explicitly

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40019?usp=email ) Change subject: sctp_{client,server}: set sndbuf/recbuf explicitly ...................................................................... sctp_{client,server}: set sndbuf/recbuf explicitly For some reason, Erlang/OTP does overwrite the OS-default SO_SNDBUF/SO_RCVBUF values even if the respective socket options are not given to gen_sctp:open/N explicitly. Even worse, the receive buffer size is set to a very low value (1024), resulting in major performance issues when dealing with large packets. Set both sndbuf/recbuf to 65536 explicitly - this value is used for the sndbuf by default. Allow tuning sndbuf/recbuf via the environment variables. Change-Id: I66f4a0f6a2441a3c8a4dbd266da8e44a3860b993 Related: SYS#7288 --- M src/osmo_s1gw_sup.erl 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/19/40019/1 diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index 67b6f47..92f908b 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -42,6 +42,7 @@ -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"). -define(ENV_DEFAULT_S1GW_BIND_PORT, ?S1AP_PORT). @@ -89,7 +90,9 @@ -spec client_cfg() -> sctp_client:cfg(). client_cfg() -> - SockOpts = #{sctp_nodelay => get_env(mme_nodelay, ?ENV_DEFAULT_SCTP_NODELAY)}, + 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), @@ -98,7 +101,9 @@ -spec server_cfg() -> sctp_server:cfg(). server_cfg() -> - SockOpts = #{sctp_nodelay => get_env(s1gw_nodelay, ?ENV_DEFAULT_SCTP_NODELAY)}, + 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 => maps:to_list(SockOpts), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40019?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: I66f4a0f6a2441a3c8a4dbd266da8e44a3860b993 Gerrit-Change-Number: 40019 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_{client,server}: allow passing additional sockopts

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40017?usp=email ) Change subject: sctp_{client,server}: allow passing additional sockopts ...................................................................... sctp_{client,server}: allow passing additional sockopts Follow-up patches will be setting sctp_nodelay/recbuf/sndbuf. Change-Id: I34f12be80c8844333f54a193ed078bb65771e246 Related: SYS#7288 --- M src/sctp_client.erl M src/sctp_server.erl 2 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/17/40017/1 diff --git a/src/sctp_client.erl b/src/sctp_client.erl index 7860446..0396109 100644 --- a/src/sctp_client.erl +++ b/src/sctp_client.erl @@ -43,7 +43,8 @@ -type cfg() :: #{laddr => any | string() | inet:ip_address(), raddr => loopback | string() | inet:ip_address(), - rport => inet:port_number() + rport => inet:port_number(), + sockopts => [gen_sctp:option()] }. -type connect_result() :: {ok, gen_sctp:sctp_socket()}. @@ -79,13 +80,14 @@ -spec connect(cfg()) -> connect_result(). connect(Cfg) -> + SockOpts = maps:get(sockopts, Cfg, []), %% additional sockopts LAddr = sctp_common:parse_addr(maps:get(laddr, Cfg, any)), RAddr = sctp_common:parse_addr(maps:get(raddr, Cfg, localhost)), RPort = maps:get(rport, Cfg), {ok, Sock} = gen_sctp:open([{ip, LAddr}, {type, seqpacket}, {sctp_nodelay, true}, - {active, true}]), + {active, true}] ++ SockOpts), gen_sctp:connect_init(Sock, RAddr, RPort, []), {ok, Sock}. diff --git a/src/sctp_server.erl b/src/sctp_server.erl index 06a9888..7f12878 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -63,6 +63,7 @@ -type cfg() :: #{laddr => any | string() | inet:ip_address(), lport => inet:port_number(), + sockopts => [gen_sctp:option()], handler => module(), priv => term() }. @@ -114,13 +115,14 @@ handler := Handler, priv := Priv} = Cfg]) -> process_flag(trap_exit, true), + SockOpts = maps:get(sockopts, Cfg, []), %% additional sockopts LAddr = sctp_common:parse_addr(maps:get(laddr, Cfg, any)), {ok, Sock} = gen_sctp:open([{ip, LAddr}, {port, LPort}, {type, seqpacket}, {reuseaddr, true}, {sctp_nodelay, true}, - {active, true}]), + {active, true}] ++ SockOpts), ?LOG_INFO("SCTP server listening on ~p:~p", [LAddr, LPort]), ok = gen_sctp:listen(Sock, true), {ok, #server_state{sock = Sock, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40017?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: I34f12be80c8844333f54a193ed078bb65771e246 Gerrit-Change-Number: 40017 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_{client,server}: add and use sctp_common:parse_addr/1

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40015?usp=email ) Change subject: sctp_{client,server}: add and use sctp_common:parse_addr/1 ...................................................................... sctp_{client,server}: add and use sctp_common:parse_addr/1 Change-Id: Ibc7b3e519e4b94499bf8a2c45b64fa62b2d08d1e --- M src/sctp_client.erl M src/sctp_common.erl M src/sctp_server.erl 3 files changed, 27 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/15/40015/1 diff --git a/src/sctp_client.erl b/src/sctp_client.erl index de3fefb..731174f 100644 --- a/src/sctp_client.erl +++ b/src/sctp_client.erl @@ -86,24 +86,16 @@ connect({any, localhost}). -spec connect(loc_rem_addr()) -> connect_result(). -connect(LocRemAddr) -> - connect(LocRemAddr, ?S1AP_PORT). +connect({LAddr, RAddr}) -> + connect({LAddr, RAddr}, ?S1AP_PORT). -spec connect(loc_rem_addr(), inet:port_number()) -> connect_result(). -connect({LocAddrStr, RemAddr}, Port) when is_list(LocAddrStr) -> - {ok, LocAddr} = inet:parse_address(LocAddrStr), - connect({LocAddr, RemAddr}, Port); - -connect({LocAddr, RemAddrStr}, Port) when is_list(RemAddrStr) -> - {ok, RemAddr} = inet:parse_address(RemAddrStr), - connect({LocAddr, RemAddr}, Port); - -connect({LocAddr, RemAddr}, Port) -> - {ok, Sock} = gen_sctp:open([{ip, LocAddr}, +connect({LAddr, RAddr}, RPort) -> + {ok, Sock} = gen_sctp:open([{ip, sctp_common:parse_addr(LAddr)}, {type, seqpacket}, {sctp_nodelay, true}, {active, true}]), - gen_sctp:connect_init(Sock, RemAddr, Port, []), + gen_sctp:connect_init(Sock, sctp_common:parse_addr(RAddr), RPort, []), {ok, Sock}. diff --git a/src/sctp_common.erl b/src/sctp_common.erl index 0d28f81..296dbff 100644 --- a/src/sctp_common.erl +++ b/src/sctp_common.erl @@ -34,7 +34,8 @@ -module(sctp_common). --export([send_data/2, +-export([parse_addr/1, + send_data/2, shutdown/1]). -include_lib("kernel/include/logger.hrl"). @@ -51,6 +52,22 @@ %% public API %% ------------------------------------------------------------------ +-spec parse_addr(AddrStr :: string()) -> Addr :: inet:ip_address(); + (Addr) -> Addr when Addr :: any | localhost | inet:ip_address(). +parse_addr(AddrStr) when is_list(AddrStr) -> + {ok, Addr} = inet:parse_address(AddrStr), + Addr; + +parse_addr(Addr) -> + case Addr of + any -> any; + localhost -> localhost; + _ -> + true = inet:is_ip_address(Addr), + Addr + end. + + -spec send_data(sock_aid(), binary()) -> ok | {error, term()}. send_data({Sock, Aid}, Data) -> gen_sctp:send(Sock, #sctp_sndrcvinfo{stream = ?S1AP_SCTP_STREAM, diff --git a/src/sctp_server.erl b/src/sctp_server.erl index e9066ac..898882d 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -101,19 +101,15 @@ %% gen_server API %% ------------------------------------------------------------------ -init([BindAddrStr, BindPort, Handler, Priv]) when is_list(BindAddrStr) -> - {ok, BindAddr} = inet:parse_address(BindAddrStr), - init([BindAddr, BindPort, Handler, Priv]); - -init([BindAddr, BindPort, Handler, Priv]) -> +init([LAddr, LPort, Handler, Priv]) -> process_flag(trap_exit, true), - {ok, Sock} = gen_sctp:open([{ip, BindAddr}, - {port, BindPort}, + {ok, Sock} = gen_sctp:open([{ip, sctp_common:parse_addr(LAddr)}, + {port, LPort}, {type, seqpacket}, {reuseaddr, true}, {sctp_nodelay, true}, {active, true}]), - ?LOG_INFO("SCTP server listening on ~w:~w", [BindAddr, BindPort]), + ?LOG_INFO("SCTP server listening on ~p:~p", [LAddr, LPort]), ok = gen_sctp:listen(Sock, true), {ok, #server_state{sock = Sock, clients = dict:new(), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40015?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: Ibc7b3e519e4b94499bf8a2c45b64fa62b2d08d1e Gerrit-Change-Number: 40015 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[M] Change in ...osmo-s1gw[master]: sctp_{client,server}: accept arguments in form of a map

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40016?usp=email ) Change subject: sctp_{client,server}: accept arguments in form of a map ...................................................................... sctp_{client,server}: accept arguments in form of a map This prepares for a follow-up patch adding even more arguments. Maps are more convenient/readable to organize multiple arguments. Change-Id: I07c7365181037ee36c1bce73e91f7bafa7f7f0cf Related: SYS#7288 --- M src/osmo_s1gw_sup.erl M src/sctp_client.erl M src/sctp_proxy.erl M src/sctp_server.erl 4 files changed, 59 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/16/40016/1 diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index 5f332ed..22a0298 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -59,17 +59,10 @@ init([]) -> - S1GWBindAddr = get_env(s1gw_bind_addr, ?ENV_DEFAULT_S1GW_BIND_ADDR), - S1GWBindPort = get_env(s1gw_bind_port, ?ENV_DEFAULT_S1GW_BIND_PORT), - 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), PfcpLocAddr = get_env(pfcp_loc_addr, ?ENV_DEFAULT_PFCP_LOC_ADDR), PfcpRemAddr = get_env(pfcp_rem_addr, ?ENV_DEFAULT_PFCP_REM_ADDR), - SctpServer = {sctp_server, {sctp_server, start_link, - [S1GWBindAddr, S1GWBindPort, sctp_proxy, - {{MmeLocAddr, MmeRemAddr}, MmeRemPort}]}, + SctpServer = {sctp_server, {sctp_server, start_link, [server_cfg()]}, permanent, 5000, worker, @@ -92,4 +85,19 @@ get_env(Param, Default) -> application:get_env(?ENV_APP_NAME, Param, Default). + +-spec client_cfg() -> sctp_client:cfg(). +client_cfg() -> + #{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)}. + + +-spec server_cfg() -> sctp_server:cfg(). +server_cfg() -> + #{laddr => get_env(s1gw_bind_addr, ?ENV_DEFAULT_S1GW_BIND_ADDR), + lport => get_env(s1gw_bind_port, ?ENV_DEFAULT_S1GW_BIND_PORT), + handler => sctp_proxy, + priv => client_cfg()}. + %% vim:set ts=4 sw=4 et: diff --git a/src/sctp_client.erl b/src/sctp_client.erl index 731174f..7860446 100644 --- a/src/sctp_client.erl +++ b/src/sctp_client.erl @@ -34,25 +34,21 @@ -module(sctp_client). --export([connect/0, - connect/1, - connect/2]). +-export([connect/1]). -include_lib("kernel/include/logger.hrl"). -include_lib("kernel/include/inet.hrl"). -include_lib("kernel/include/inet_sctp.hrl"). --include("s1ap.hrl"). +-type cfg() :: #{laddr => any | string() | inet:ip_address(), + raddr => loopback | string() | inet:ip_address(), + rport => inet:port_number() + }. --type loc_addr() :: any | list() | inet:ip_address(). --type rem_addr() :: localhost | list() | inet:ip_address(). --type loc_rem_addr() :: {loc_addr(), rem_addr()}. -type connect_result() :: {ok, gen_sctp:sctp_socket()}. --export_type([loc_addr/0, - rem_addr/0, - loc_rem_addr/0, +-export_type([cfg/0, connect_result/0]). @@ -60,8 +56,8 @@ %% behavior callbacks %% ------------------------------------------------------------------ --callback start_link(AID, Priv) -> Result - when AID :: gen_sctp:assoc_id(), +-callback start_link(Aid, Priv) -> Result + when Aid :: gen_sctp:assoc_id(), Priv :: term(), Result :: {ok, pid()} | term(). @@ -81,22 +77,16 @@ %% public API %% ------------------------------------------------------------------ --spec connect() -> connect_result(). -connect() -> - connect({any, localhost}). - --spec connect(loc_rem_addr()) -> connect_result(). -connect({LAddr, RAddr}) -> - connect({LAddr, RAddr}, ?S1AP_PORT). - --spec connect(loc_rem_addr(), inet:port_number()) -> connect_result(). -connect({LAddr, RAddr}, RPort) -> - {ok, Sock} = gen_sctp:open([{ip, sctp_common:parse_addr(LAddr)}, +-spec connect(cfg()) -> connect_result(). +connect(Cfg) -> + LAddr = sctp_common:parse_addr(maps:get(laddr, Cfg, any)), + RAddr = sctp_common:parse_addr(maps:get(raddr, Cfg, localhost)), + RPort = maps:get(rport, Cfg), + {ok, Sock} = gen_sctp:open([{ip, LAddr}, {type, seqpacket}, {sctp_nodelay, true}, {active, true}]), - gen_sctp:connect_init(Sock, sctp_common:parse_addr(RAddr), RPort, []), + gen_sctp:connect_init(Sock, RAddr, RPort, []), {ok, Sock}. - %% vim:set ts=4 sw=4 et: diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index 94ff36a..e208d95 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -43,7 +43,6 @@ code_change/4, terminate/3]). -export([start_link/2, - start_link/3, send_data/2, fetch_info/1, shutdown/1]). @@ -58,21 +57,12 @@ %% public API %% ------------------------------------------------------------------ --spec start_link(Aid, {MmeAddr, MmePort}) -> Result +-spec start_link(Aid, ConnCfg) -> Result when Aid :: gen_sctp:assoc_id(), - MmeAddr :: sctp_client:loc_rem_addr(), - MmePort :: inet:port_number(), + ConnCfg :: sctp_client:cfg(), Result :: gen_statem:start_ret(). -start_link(Aid, {MmeAddr, MmePort}) -> - start_link(Aid, MmeAddr, MmePort). - --spec start_link(Aid, MmeAddr, MmePort) -> Result - when Aid :: gen_sctp:assoc_id(), - MmeAddr :: sctp_client:loc_rem_addr(), - MmePort :: inet:port_number(), - Result :: gen_statem:start_ret(). -start_link(Aid, MmeAddr, MmePort) -> - gen_statem:start_link(?MODULE, [Aid, MmeAddr, MmePort], []). +start_link(Aid, ConnCfg) -> + gen_statem:start_link(?MODULE, [Aid, ConnCfg], []). -spec send_data(pid(), binary()) -> ok. @@ -94,12 +84,11 @@ %% gen_statem API %% ------------------------------------------------------------------ -init([Aid, MmeAddr, MmePort]) -> +init([Aid, ConnCfg]) -> {ok, Pid} = s1ap_proxy:start_link(), {ok, connecting, #{enb_aid => Aid, - mme_addr => MmeAddr, - mme_port => MmePort, + conn_cfg => ConnCfg, tx_queue => [], handler => Pid}}. @@ -110,10 +99,10 @@ %% CONNECTING state connecting(enter, OldState, - #{mme_addr := MmeAddr, mme_port := MmePort} = S) -> + #{conn_cfg := ConnCfg} = S) -> ?LOG_INFO("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), %% Initiate connection establishment with the MME - {ok, Sock} = sctp_client:connect(MmeAddr, MmePort), + {ok, Sock} = sctp_client:connect(ConnCfg), {next_state, connecting, S#{sock => Sock}, [{state_timeout, 2_000, conn_est_timeout}]}; diff --git a/src/sctp_server.erl b/src/sctp_server.erl index 898882d..06a9888 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -40,7 +40,7 @@ handle_call/3, handle_cast/2, terminate/2]). --export([start_link/4, +-export([start_link/1, send_data/2, fetch_conn_list/0, shutdown/0]). @@ -61,6 +61,14 @@ port => inet:port_number() }. +-type cfg() :: #{laddr => any | string() | inet:ip_address(), + lport => inet:port_number(), + handler => module(), + priv => term() + }. + +-export_type([cfg/0]). + -record(server_state, {sock :: gen_sctp:sctp_socket(), clients :: dict:dict(), @@ -77,13 +85,14 @@ %% public API %% ------------------------------------------------------------------ -start_link(BindAddr, BindPort, Handler, Priv) -> - gen_server:start_link({local, ?MODULE}, ?MODULE, - [BindAddr, BindPort, - Handler, Priv], - []). +-spec start_link(cfg()) -> {ok, pid()} | term(). +start_link(Cfg) -> + gen_server:start_link({local, ?MODULE}, ?MODULE, [Cfg], []). +-spec send_data(Aid, Data) -> ok + when Aid :: gen_sctp:assoc_id(), + Data :: binary(). send_data(Aid, Data) -> gen_server:cast(?MODULE, {?FUNCTION_NAME, Aid, Data}). @@ -101,9 +110,12 @@ %% gen_server API %% ------------------------------------------------------------------ -init([LAddr, LPort, Handler, Priv]) -> +init([#{lport := LPort, + handler := Handler, + priv := Priv} = Cfg]) -> process_flag(trap_exit, true), - {ok, Sock} = gen_sctp:open([{ip, sctp_common:parse_addr(LAddr)}, + LAddr = sctp_common:parse_addr(maps:get(laddr, Cfg, any)), + {ok, Sock} = gen_sctp:open([{ip, LAddr}, {port, LPort}, {type, seqpacket}, {reuseaddr, true}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40016?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: I07c7365181037ee36c1bce73e91f7bafa7f7f0cf Gerrit-Change-Number: 40016 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: ipa: Try picking unused asp_id in AS to use as SLS

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40003?usp=email ) Change subject: ipa: Try picking unused asp_id in AS to use as SLS ...................................................................... ipa: Try picking unused asp_id in AS to use as SLS Initially (b93e1d01205cdd7bd7a65e15945f664f31fb4bcb), incoming traffic from IPA sockets was tagged with SLS using the LSB of the socket file descriptor. that did however not achieve sufficient entropy in real world use cases. Later on (2c9ba16c2c0210a189c72064eafad5ef336254cd), SLS tagging was changed to pseudo-random generation. Still it has been found too that it may create bad entropy under certain condtions, with eg. havig only 2 incoming ASPs and both ending up with the same asp_id/SLS, which won't allow for proper load sharing towards other peers. This commit changes the previous method by delaying SLS assignment decision of the socket until the ASP becomes assigned to an AS (basically during IPA handshake, when we receive IPA IDENTITY RESPONSE with the Unit-Name, or when we receive the IPA IDENTITY ACK for it). It is fine delaying SLS assignment to that point, since it's impossible to receive any userplane data before that handhsake ocurrs. Once the ASP is assigned to the AS (IPA ASPs can only be part of one AS), we lookup the other ASPs in the AS to try to allocate an unused 4-bit asp_id which will end up being used as SLS. Related: SYS#6543 Related: SYS#6802 Change-Id: I723eac25e59002630dca87a738c8eb7c62edec75 --- M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c M src/xua_asp_fsm.c 3 files changed, 40 insertions(+), 12 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index f785264..7e444b4 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -979,12 +979,6 @@ if (asp->cfg.trans_proto == IPPROTO_SCTP) { rc = ss7_asp_apply_peer_primary_address(asp); rc = ss7_asp_apply_primary_address(asp); - } else { - if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) { - /* we use the lower 4 bits of the asp_id field as SLS; - * let's initialize it here from a pseudo-random value */ - asp->asp_id = rand() & 0xf; - } } if (asp->lm && asp->lm->prim_cb) { diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index 35e360f..52a3508 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -180,12 +180,6 @@ if (asp->cfg.trans_proto == IPPROTO_SCTP) { rc = ss7_asp_apply_peer_primary_address(asp); rc = ss7_asp_apply_primary_address(asp); - } else { - if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) { - /* we use the lower 4 bits of the asp_id field as SLS; - * let's initialize it here from a pseudo-random value */ - asp->asp_id = rand() & 0xf; - } } /* send M-SCTP_ESTABLISH.ind to Layer Manager */ diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index cd60df2..93c6d4d 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -1104,6 +1104,36 @@ } } +/* Assign a 4 bit asp_id (as unqiue as possible) which will be used as SLS for incoming IPA PDUs.*/ +static void _ipa_asp_pick_unused_asp_id_as_sls(struct osmo_ss7_asp *asp, const struct osmo_ss7_as *as) +{ + for (unsigned int asp_id = 0; asp_id <= 0x0f; asp_id++) { + bool used = false; + for (unsigned i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { + if (!as->cfg.asps[i]) + continue; + if (as->cfg.asps[i] == asp) + continue; + if (!as->cfg.asps[i]->asp_id_present) + continue; + if (as->cfg.asps[i]->asp_id == asp_id) { + used = true; + break; + } + } + if (used) + continue; + /* Found an unused asp_id, use it: */ + asp->asp_id = asp_id; + asp->asp_id_present = true; + LOGPASP(asp, DLSS7, LOGL_DEBUG, "Assigned unsued asp_id = %u to be used as SLS\n", asp_id); + return; + } + LOGPASP(asp, DLSS7, LOGL_INFO, "All asp_ids in IPA AS picked, unique SLS not possible, picking random one\n"); + asp->asp_id = rand() & 0x0f; + asp->asp_id_present = true; +} + static void ipa_asp_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct ipa_asp_fsm_priv *iafp = fi->priv; @@ -1130,6 +1160,12 @@ case XUA_ASP_E_AS_ASSIGNED: as = data; osmo_talloc_replace_string(iafp->ipa_unit, &iafp->ipa_unit->unit_name, as->cfg.name); + /* In IPA, asp_id is not really used on the wire, and we + * actually use internally the lower 4 bits of the field to + * fill in a potentailly unique SLS to apply to PDUs received from the IPA socket. + * Now that AS is known, try picking an unused asp_id inside the AS. + * we use the lower 4 bits of the asp_id field as SLS; */ + _ipa_asp_pick_unused_asp_id_as_sls(iafp->asp, as); /* Now that the AS is known, start the client side: */ if (iafp->role == OSMO_SS7_ASP_ROLE_ASP && fi->state == IPA_ASP_S_DOWN) { LOGPFSML(fi, LOGL_NOTICE, "Bringing up ASP now once it has been assigned to an AS\n"); @@ -1274,10 +1310,13 @@ if (as) { unit_name = as->cfg.name; + /* Allocacate potentially unique asp_id within AS since AS is already known: */ + _ipa_asp_pick_unused_asp_id_as_sls(asp, as); } else if (asp->dyn_allocated) { LOGPFSML(fi, LOGL_INFO, "Dynamic ASP is not assigned to any AS, " "using ASP name instead of AS name as ipa_unit_name\n"); unit_name = asp->cfg.name; + /* asp->asp_id will be assigned together with AS unit_name during XUA_ASP_E_AS_ASSIGNED. */ } else { /* ASP in client mode will be brought up when this ASP is added * to an AS, see XUA_ASP_E_AS_ASSIGNED. */ @@ -1286,6 +1325,7 @@ can_start = false; } unit_name = asp->cfg.name; + /* asp->asp_id will be assigned together with AS unit_name during XUA_ASP_E_AS_ASSIGNED. */ } iafp->role = role; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40003?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: I723eac25e59002630dca87a738c8eb7c62edec75 Gerrit-Change-Number: 40003 Gerrit-PatchSet: 3 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>

4 months, 1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: ipa: Try picking unused asp_id in AS to use as SLS

by pespin

Attention is currently required from: daniel, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40003?usp=email ) Change subject: ipa: Try picking unused asp_id in AS to use as SLS ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40003?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: I723eac25e59002630dca87a738c8eb7c62edec75 Gerrit-Change-Number: 40003 Gerrit-PatchSet: 3 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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 12 Apr 2025 22:01:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[XS] Change in libosmocore[master]: Abort configure run on big endian hosts

by ahuemer

ahuemer has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40014?usp=email ) Change subject: Abort configure run on big endian hosts ...................................................................... Abort configure run on big endian hosts Change-Id: I9bf16113acbbc1e100fd928446a91b927d3c6cbc --- M configure.ac 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/40014/1 diff --git a/configure.ac b/configure.ac index 7863624..4647770 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,11 @@ AC_SUBST(LTLDFLAGS_OSMOCORE) AC_SUBST(LTLDFLAGS_OSMOCTRL) +AC_C_BIGENDIAN( + [AC_MSG_ERROR([Unfortunately, big endian hosts are currently not supported. Not due to dev policy but lack of maintainer bandwidth. Contributions welcome.])], + [], + [AC_MSG_WARN([Byte order could not be determined. Strange.])]) + dnl checks for header files AC_HEADER_STDC AC_CHECK_HEADERS(execinfo.h poll.h sys/select.h sys/socket.h sys/signalfd.h sys/eventfd.h sys/timerfd.h syslog.h ctype.h netinet/tcp.h netinet/in.h) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40014?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bf16113acbbc1e100fd928446a91b927d3c6cbc Gerrit-Change-Number: 40014 Gerrit-PatchSet: 1 Gerrit-Owner: ahuemer <alexander.huemer(a)xx.vu>

4 months, 1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: Tx multiple Routing Contexts in NOTIFY on ASPs serving multiple AS

by pespin

Attention is currently required from: laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40011?usp=email to look at the new patch set (#4). Change subject: Tx multiple Routing Contexts in NOTIFY on ASPs serving multiple AS ...................................................................... Tx multiple Routing Contexts in NOTIFY on ASPs serving multiple AS Routing Context IE in NOTIFY msg should contain n X 32-bit integers, one for each Routing Context (AS) this ASP is serving. This fixes only 1 AS being announced during NOTIFY if the ASP was configured to server more than one AS. Change-Id: I646301ec3d08ef98f227cf4d19da1039e40cedd2 --- M include/osmocom/sigtran/sigtran_sap.h M src/m3ua.c M src/osmo_ss7_asp.c M src/ss7_asp.h M src/xua_as_fsm.c M src/xua_msg.c M src/xua_msg.h 7 files changed, 87 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/11/40011/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40011?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: I646301ec3d08ef98f227cf4d19da1039e40cedd2 Gerrit-Change-Number: 40011 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org>

4 months, 1 week

1
0
0 0

[S] Change in libosmo-sigtran[master]: Unify amount of supported rctx items in IE to 128

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40012?usp=email ) Change subject: Unify amount of supported rctx items in IE to 128 ...................................................................... Unify amount of supported rctx items in IE to 128 Change-Id: I703c9e62ed909dc1cd9c3e943612205856edbf2c --- M include/osmocom/sigtran/osmo_ss7.h M src/xua_asp_fsm.c M src/xua_snm.c 3 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/12/40012/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 264507b..0bde3d9 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -11,6 +11,9 @@ #include <osmocom/core/socket.h> #include <osmocom/core/rate_ctr.h> +/* Maximum number of supported RCTXs present in RFC4666 Routing Context IE. */ +#define OSMO_SS7_MAX_RCTX_COUNT 128 + struct osmo_ss7_instance; extern struct llist_head osmo_ss7_instances; diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 3834ece..4603734 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -174,7 +174,7 @@ static int xua_msg_add_asp_rctx(struct xua_msg *xua, struct osmo_ss7_asp *asp) { struct osmo_ss7_as *as; - uint32_t rctx[128]; + uint32_t rctx[OSMO_SS7_MAX_RCTX_COUNT]; unsigned int i = 0; /* iterate over all ASs and build array of routing contexts */ diff --git a/src/xua_snm.c b/src/xua_snm.c index 1481178..edb1210 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -175,7 +175,7 @@ { struct osmo_ss7_instance *s7i = as->inst; struct osmo_ss7_asp *asp; - uint32_t rctx[32]; + uint32_t rctx[OSMO_SS7_MAX_RCTX_COUNT]; unsigned int num_rctx; /* inform local users via a MTP-{PAUSE, RESUME} primitive */ @@ -217,7 +217,7 @@ { struct osmo_ss7_instance *s7i = as->inst; struct osmo_ss7_asp *asp; - uint32_t rctx[32]; + uint32_t rctx[OSMO_SS7_MAX_RCTX_COUNT]; unsigned int num_rctx; uint32_t _smi = smi ? *smi : 0; /* 0 == reserved/unknown in SUA */ @@ -252,7 +252,7 @@ { struct osmo_ss7_instance *s7i = as->inst; struct osmo_ss7_asp *asp; - uint32_t rctx[32]; + uint32_t rctx[OSMO_SS7_MAX_RCTX_COUNT]; unsigned int num_rctx; /* Translate to MTP-STATUS.ind towards SCCP (will create N-PCSTATE.ind to SCU) */ @@ -284,7 +284,7 @@ { struct osmo_ss7_instance *s7i = as->inst; struct osmo_ss7_asp *asp; - uint32_t rctx[32]; + uint32_t rctx[OSMO_SS7_MAX_RCTX_COUNT]; unsigned int num_rctx; /* TODO: How to translate to MTP and towards SCCP (create N-PCSTATE.ind to SCU) */ @@ -318,7 +318,7 @@ unsigned int num_aff_pc; unsigned int num_rctx; const uint32_t *aff_pc; - uint32_t rctx[32]; + uint32_t rctx[OSMO_SS7_MAX_RCTX_COUNT]; int log_ss = osmo_ss7_asp_get_log_subsys(asp); int i; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40012?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I703c9e62ed909dc1cd9c3e943612205856edbf2c Gerrit-Change-Number: 40012 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp: Rework s/get_all_rctx_for_asp/ss7_asp_get_all_rctx_be/g

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40013?usp=email ) Change subject: asp: Rework s/get_all_rctx_for_asp/ss7_asp_get_all_rctx_be/g ...................................................................... asp: Rework s/get_all_rctx_for_asp/ss7_asp_get_all_rctx_be/g This function will gain other users in other files in follow-up patches. While at it, constify and reorder params. Change-Id: Ic3a1c0bd663fe33ab14828e30e057a8beaa84c3f --- M src/osmo_ss7_asp.c M src/ss7_asp.h M src/xua_snm.c 3 files changed, 30 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/13/40013/1 diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index bb3c2dd..c054369 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -1300,3 +1300,25 @@ osmo_ss7_asp_restart(asp); } + +/* Obtain all routing contexts (in network byte order) that exist within the given ASP */ +unsigned int ss7_asp_get_all_rctx_be(const struct osmo_ss7_asp *asp, uint32_t *rctx, unsigned int rctx_size, + const struct osmo_ss7_as *excl_as) +{ + unsigned int count = 0; + struct osmo_ss7_as *as; + + llist_for_each_entry(as, &asp->inst->as_list, list) { + if (as == excl_as) + continue; + if (!osmo_ss7_as_has_asp(as, asp)) + continue; + if (as->cfg.routing_key.context == 0) + continue; + if (count >= rctx_size) + break; + rctx[count] = htonl(as->cfg.routing_key.context); + count++; + } + return count; +} diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 7a001e0..bdde5bd 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -128,5 +128,8 @@ void ss7_asp_restart_after_reconfigure(struct osmo_ss7_asp *asp); void osmo_ss7_asp_remove_default_lm(struct osmo_ss7_asp *asp); +unsigned int ss7_asp_get_all_rctx_be(const struct osmo_ss7_asp *asp, uint32_t *rctx, unsigned int rctx_size, + const struct osmo_ss7_as *excl_as); + #define LOGPASP(asp, subsys, level, fmt, args ...) \ _LOGSS7((asp)->inst, subsys, level, "ASP(%s) " fmt, (asp)->cfg.name, ## args) diff --git a/src/xua_snm.c b/src/xua_snm.c index edb1210..3dd988f 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -66,28 +66,6 @@ return out; } -/* obtain all routing contexts (in network byte order) that exist within the given ASP */ -static unsigned int get_all_rctx_for_asp(uint32_t *rctx, unsigned int rctx_size, - struct osmo_ss7_asp *asp, struct osmo_ss7_as *excl_as) -{ - unsigned int count = 0; - struct osmo_ss7_as *as; - - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (as == excl_as) - continue; - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - if (as->cfg.routing_key.context == 0) - continue; - if (count >= rctx_size) - break; - rctx[count] = htonl(as->cfg.routing_key.context); - count++; - } - return count; -} - static void xua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_str, bool available) @@ -192,7 +170,7 @@ if (asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) continue; - num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, as); + num_rctx = ss7_asp_get_all_rctx_be(asp, rctx, ARRAY_SIZE(rctx), as); /* this can happen if the given ASP is only in the AS that reports the change, * which shall be excluded */ if (num_rctx == 0) @@ -238,7 +216,7 @@ if (asp->cfg.proto != OSMO_SS7_ASP_PROT_SUA) continue; - num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, as); + num_rctx = ss7_asp_get_all_rctx_be(asp, rctx, ARRAY_SIZE(rctx), as); /* this can happen if the given ASP is only in the AS that reports the change, * which shall be excluded */ if (num_rctx == 0) @@ -269,7 +247,7 @@ if (asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) continue; - num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, as); + num_rctx = ss7_asp_get_all_rctx_be(asp, rctx, ARRAY_SIZE(rctx), as); /* this can happen if the given ASP is only in the AS that reports the change, * which shall be excluded */ if (num_rctx == 0) @@ -299,7 +277,7 @@ if (asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) continue; - num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, as); + num_rctx = ss7_asp_get_all_rctx_be(asp, rctx, ARRAY_SIZE(rctx), as); /* this can happen if the given ASP is only in the AS that reports the change, * which shall be excluded */ if (num_rctx == 0) @@ -326,7 +304,7 @@ aff_pc = (const uint32_t *) ie_aff_pc->dat; num_aff_pc = ie_aff_pc->len / sizeof(uint32_t); - num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, NULL); + num_rctx = ss7_asp_get_all_rctx_be(asp, rctx, ARRAY_SIZE(rctx), NULL); LOGPASP(asp, log_ss, LOGL_INFO, "Rx DAUD(%s) for %s\n", info_str ? info_str : "", format_affected_pcs_c(xua, asp->inst, ie_aff_pc)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40013?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ic3a1c0bd663fe33ab14828e30e057a8beaa84c3f Gerrit-Change-Number: 40013 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2025