lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

April 2025

  • 1 participants
  • 1186 discussions
[S] Change in pysim[master]: saip-tool: add commandline option to edit mandatory services list
by dexter 14 Apr '25

14 Apr '25
Attention is currently required from: fixeria, laforge. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/39863?usp=email ) Change subject: saip-tool: add commandline option to edit mandatory services list ...................................................................... Patch Set 4: (2 comments) File contrib/saip-tool.py: https://gerrit.osmocom.org/c/pysim/+/39863/comment/a7705847_4ac04ce2?usp=em… : PS3, Line 104: set > "set" sounds like it is setting (overwriting) the list. […] Done https://gerrit.osmocom.org/c/pysim/+/39863/comment/a1a3ba19_6318b1fe?usp=em… : PS3, Line 106: action > there is a way (I forgot how exactly, maybet he "choices" argument?) to tell the parser which string […] I am sure we can configure a fixed set of available options. However, at the moment I have now idea how to pull that information out of the ASN.1 parser. I would have to look that up and read some more documentation about that, unless someone has a good hint. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39863?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I120b98d4b0942c26674bc1365c5711101ec95235 Gerrit-Change-Number: 39863 Gerrit-PatchSet: 4 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Apr 2025 12:41:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
1 0
0 0
[XS] Change in osmo-ttcn3-hacks[master]: testenv: clean: fix cleaning git dir
by osmith 14 Apr '25

14 Apr '25
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40025?usp=email ) Change subject: testenv: clean: fix cleaning git dir ...................................................................... testenv: clean: fix cleaning git dir Don't try to build a PATH that contains the testsuite dir if running the "clean" action, because then no testsuite is defined. Fix for: $ ./testenv.py clean [testenv] + ['rm', '-rf', '/home/user/.cache/osmo-ttcn3-testenv/git'] Traceback (most recent call last): File "/home/user/code/osmo-dev/src/osmo-ttcn3-hacks/./testenv.py", line 137, in <module> main() File "/home/user/code/osmo-dev/src/osmo-ttcn3-hacks/./testenv.py", line 133, in main clean() File "/home/user/code/osmo-dev/src/osmo-ttcn3-hacks/./testenv.py", line 117, in clean testenv.cmd.run(["rm", "-rf", path]) File "/home/user/code/osmo-dev/src/osmo-ttcn3-hacks/_testenv/testenv/cmd.py", line 106, in run env=generate_env(env), ^^^^^^^^^^^^^^^^^ File "/home/user/code/osmo-dev/src/osmo-ttcn3-hacks/_testenv/testenv/cmd.py", line 72, in generate_env path += f":{os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite)}" ^^^^^^^^^^^^^^^^^^^^^^ AttributeError: 'Namespace' object has no attribute 'testsuite' Change-Id: I65da89581260fc60b3d8da0a93ee04c0c22c7f2c --- M _testenv/testenv/cmd.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index df57b79..f84769d 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -68,7 +68,7 @@ ret = dict(env_extra) path = os.path.join(testenv.data_dir, "scripts") path += f":{os.path.join(testenv.data_dir, 'scripts/qemu')}" - if testenv.testsuite.ttcn3_hacks_dir: + if testenv.args.action == "run" and testenv.testsuite.ttcn3_hacks_dir: path += f":{os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite)}" if usr_dir: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40025?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: I65da89581260fc60b3d8da0a93ee04c0c22c7f2c Gerrit-Change-Number: 40025 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 0
0 0
[XS] Change in ...osmo-s1gw[master]: sctp_{client,server}: set sndbuf/recbuf explicitly
by fixeria 14 Apr '25

14 Apr '25
Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40019?usp=email ) Change subject: sctp_{client,server}: set sndbuf/recbuf explicitly ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > I'm wondering why we use 64k if the kernel default (at least on my system) would be > 200k. […] As stated in the commit message, 65536 is what Erlang/OTP is setting by default for the `SNDBUF`. I am fine with using a higher value, I can also implement reading the default from procfs. Is my understanding correct that there exist no SCTP specific but global defaults in Linux? If so, I could just use `212992`, which is the default for 64-bit Linux as explained in https://unix.stackexchange.com/questions/424380/what-values-may-linux-use-f…. -- 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: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I66f4a0f6a2441a3c8a4dbd266da8e44a3860b993 Gerrit-Change-Number: 40019 Gerrit-PatchSet: 2 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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Apr 2025 11:43:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
1 0
0 0
[XS] Change in osmo-ttcn3-hacks[master]: testenv: clean: fix cleaning git dir
by fixeria 14 Apr '25

14 Apr '25
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40025?usp=email ) Change subject: testenv: clean: fix cleaning git dir ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40025?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I65da89581260fc60b3d8da0a93ee04c0c22c7f2c Gerrit-Change-Number: 40025 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Apr 2025 11:38:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes
1 0
0 0
[XS] Change in ...osmo-s1gw[master]: sctp_{client,server}: make sctp_nodelay configurable
by fixeria 14 Apr '25

14 Apr '25
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40018?usp=email ) Change subject: sctp_{client,server}: make sctp_nodelay configurable ...................................................................... sctp_{client,server}: make sctp_nodelay configurable Keep the Nagle's algorithm disabled by default, but allow the user to re-enable it via the environment variables {mme,s1gw}_nodelay. Change-Id: Ida5418f8590f40414215fc9667fb4ea70e2b1614 Related: SYS#7288 --- M src/osmo_s1gw_sup.erl M src/sctp_client.erl M src/sctp_server.erl 3 files changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index 22a0298..67b6f47 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_NODELAY, true). -define(ENV_DEFAULT_S1GW_BIND_ADDR, "127.0.1.1"). -define(ENV_DEFAULT_S1GW_BIND_PORT, ?S1AP_PORT). -define(ENV_DEFAULT_MME_LOC_ADDR, "127.0.2.1"). @@ -88,15 +89,19 @@ -spec client_cfg() -> sctp_client:cfg(). client_cfg() -> + SockOpts = #{sctp_nodelay => get_env(mme_nodelay, ?ENV_DEFAULT_SCTP_NODELAY)}, #{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)}. + rport => 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)}, #{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), handler => sctp_proxy, priv => client_cfg()}. diff --git a/src/sctp_client.erl b/src/sctp_client.erl index 0396109..bea3c16 100644 --- a/src/sctp_client.erl +++ b/src/sctp_client.erl @@ -86,7 +86,6 @@ RPort = maps:get(rport, Cfg), {ok, Sock} = gen_sctp:open([{ip, LAddr}, {type, seqpacket}, - {sctp_nodelay, 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 7f12878..34b2381 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -121,7 +121,6 @@ {port, LPort}, {type, seqpacket}, {reuseaddr, true}, - {sctp_nodelay, true}, {active, true}] ++ SockOpts), ?LOG_INFO("SCTP server listening on ~p:~p", [LAddr, LPort]), ok = gen_sctp:listen(Sock, true), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40018?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: Ida5418f8590f40414215fc9667fb4ea70e2b1614 Gerrit-Change-Number: 40018 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: osmith <osmith(a)sysmocom.de>
1 0
0 0
[S] Change in ...osmo-s1gw[master]: sctp_{client,server}: add and use sctp_common:parse_addr/1
by fixeria 14 Apr '25

14 Apr '25
fixeria has submitted this change. ( 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(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved 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: merged 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> 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 0
0 0
[M] Change in ...osmo-s1gw[master]: sctp_{client,server}: accept arguments in form of a map
by fixeria 14 Apr '25

14 Apr '25
fixeria has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve 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: merged 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> 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 0
0 0
[S] Change in ...osmo-s1gw[master]: sctp_{client,server}: allow passing additional sockopts
by fixeria 14 Apr '25

14 Apr '25
fixeria has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve 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: merged 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> 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 0
0 0
[XS] Change in ...osmo-s1gw[master]: sctp_{client,server}: make sctp_nodelay configurable
by fixeria 14 Apr '25

14 Apr '25
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40018?usp=email ) Change subject: sctp_{client,server}: make sctp_nodelay configurable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40018?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: Ida5418f8590f40414215fc9667fb4ea70e2b1614 Gerrit-Change-Number: 40018 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: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Apr 2025 11:27:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes
1 0
0 0
[S] Change in ...osmo-s1gw[master]: sctp_{client,server}: allow passing additional sockopts
by fixeria 14 Apr '25

14 Apr '25
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40017?usp=email ) Change subject: sctp_{client,server}: allow passing additional sockopts ...................................................................... Patch Set 1: Code-Review+2 -- 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: comment 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> 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> Gerrit-Comment-Date: Mon, 14 Apr 2025 11:27:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 54
  • 55
  • 56
  • 57
  • 58
  • 59
  • 60
  • ...
  • 119
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.