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

[S] Change in ...osmo-epdg[master]: diameter: Make diameter_watchdog_config configurable
by pespin 16 Jan '24

16 Jan '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35591?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: diameter: Make diameter_watchdog_config configurable ...................................................................... diameter: Make diameter_watchdog_config configurable This allows tweaking values in config file of TTCN3 tests to speed up test setup. Change-Id: I99b5e02264c2c35a3fbfcd2d6083a07e2cfea566 --- M config/sys.config M src/aaa_diameter_s6b.erl M src/epdg_diameter_swx.erl 3 files changed, 30 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/91/35591/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35591?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I99b5e02264c2c35a3fbfcd2d6083a07e2cfea566 Gerrit-Change-Number: 35591 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[M] Change in ...osmo-epdg[master]: diameter: Allow configuring (re)connect timer in s6b and swx
by pespin 16 Jan '24

16 Jan '24

Attention is currently required from: lynxis lazus. Hello Jenkins Builder, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35588?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: diameter: Allow configuring (re)connect timer in s6b and swx ...................................................................... diameter: Allow configuring (re)connect timer in s6b and swx TTCN3 tests will require lower values to avoid timing out. Change-Id: I7d280f83f4f375eaf34ea3b69a421372af54ffdb --- M config/sys.config M src/aaa_diameter_s6b.erl M src/epdg_diameter_swx.erl 3 files changed, 40 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/88/35588/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35588?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I7d280f83f4f375eaf34ea3b69a421372af54ffdb Gerrit-Change-Number: 35588 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Remove unneeded register by message
by pespin 16 Jan '24

16 Jan '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35593?usp=email to look at the new patch set (#2). Change subject: epdg: Remove unneeded register by message ...................................................................... epdg: Remove unneeded register by message Since recently GTP2 Emulation got improved routing, and it should simply match by the already registered imsi. Change-Id: I410242d6597db10b97edf72b92e749db28520c39 --- M epdg/EPDG_Tests.ttcn 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/35593/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35593?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I410242d6597db10b97edf72b92e749db28520c39 Gerrit-Change-Number: 35593 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Remove unneded register by message
by pespin 16 Jan '24

16 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35593?usp=email ) Change subject: epdg: Remove unneded register by message ...................................................................... epdg: Remove unneded register by message Since recently GTP2 Emulation got improved routing, and it should simply match by the already registered imsi. Change-Id: I410242d6597db10b97edf72b92e749db28520c39 --- M epdg/EPDG_Tests.ttcn 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/35593/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 60e0d1c..353c738 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -440,7 +440,6 @@ } } private function f_GTP2C_CreateSession_success() runs on EPDG_ConnHdlr { - f_gtp2_register_udmsg('20'O); as_GTP2C_CreateSession_success(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35593?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I410242d6597db10b97edf72b92e749db28520c39 Gerrit-Change-Number: 35593 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Add module param to configure initial diameter watchdog time
by pespin 16 Jan '24

16 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35592?usp=email ) Change subject: epdg: Add module param to configure initial diameter watchdog time ...................................................................... epdg: Add module param to configure initial diameter watchdog time Change-Id: I9eb42d7664d8e607b913e23c87477388f70662b9 --- M epdg/EPDG_Tests.ttcn 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/35592/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index f58cf96..60e0d1c 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -43,6 +43,7 @@ integer mp_s2b_remote_port := GTP2C_PORT; charstring mp_diam_realm := "localdomain"; + integer mp_diam_watchdog_initial_wait_sec := 6*3; } @@ -250,7 +251,7 @@ * RFC3539 sec 3.4.1 [5] * https://github.com/freeDiameter/freeDiameter/blob/master/libfdcore/p_psm.c#… */ - f_sleep(1.0); + f_sleep(int2float(mp_diam_watchdog_initial_wait_sec)); } private function f_init_gtp(charstring id) runs on MTC_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35592?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9eb42d7664d8e607b913e23c87477388f70662b9 Gerrit-Change-Number: 35592 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: swx: Make diameter_watchdog_config configurable
by pespin 16 Jan '24

16 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35591?usp=email ) Change subject: swx: Make diameter_watchdog_config configurable ...................................................................... swx: Make diameter_watchdog_config configurable This allows tweaking values in config file of TTCN3 tests to speed up test setup. Change-Id: I99b5e02264c2c35a3fbfcd2d6083a07e2cfea566 --- M config/sys.config M src/epdg_diameter_swx.erl 2 files changed, 20 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/91/35591/1 diff --git a/config/sys.config b/config/sys.config index 699df4f..8b8a847 100755 --- a/config/sys.config +++ b/config/sys.config @@ -11,6 +11,9 @@ {diameter_proto, sctp}, {diameter_connect_timer, 30000}, {diameter_watchdog_timer, 30000}, + {diameter_watchdog_config, + [{okay, 3}, + {suspect, 1}]}, {vendor_id, 0}, {origin_host, "epdg.localdomain"}, {origin_realm, "localdomain"}, diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl index d7bea93..1d6c262 100644 --- a/src/epdg_diameter_swx.erl +++ b/src/epdg_diameter_swx.erl @@ -123,9 +123,10 @@ Port = application:get_env(?ENV_APP_NAME, diameter_remote_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT), ConnectTimer = application:get_env(?ENV_APP_NAME, diameter_connect_timer, 30000), WatchdogTimer = application:get_env(?ENV_APP_NAME, diameter_watchdog_timer, 30000), + WatchdogConfig = application:get_env(?ENV_APP_NAME, diameter_watchdog_config, [{okay, 3}, {suspect, 1}]), ok = diameter:start_service(?MODULE, ?SERVICE), % lager:info("DiaServices is ~p~n", [DiaServ]), - {ok, _} = connect({address, Proto, Ip, Port}, {timer, ConnectTimer, WatchdogTimer}), + {ok, _} = connect({address, Proto, Ip, Port}, {timer, ConnectTimer, WatchdogTimer, WatchdogConfig}), {ok, State}. test() -> @@ -259,7 +260,7 @@ %% ------------------------------------------------------------------ %% connect/3 -connect(Name, {address, Protocol, IPAddr, Port}, {timer, ConnectTimer, WatchdogTimer}) -> +connect(Name, {address, Protocol, IPAddr, Port}, {timer, ConnectTimer, WatchdogTimer, WatchdogConfig}) -> lager:notice("~s connecting to IP ~s port ~p~n", [Name, IPAddr, Port]), {ok, IP} = inet_parse:address(IPAddr), TransportOpts = @@ -269,7 +270,8 @@ {raddr, IP}, {rport, Port}]}, {connect_timer, ConnectTimer}, - {watchdog_timer, WatchdogTimer}], + {watchdog_timer, WatchdogTimer}, + {watchdog_config, WatchdogConfig}], diameter:add_transport(Name, {connect, TransportOpts}). connect(Address, Timers) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35591?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I99b5e02264c2c35a3fbfcd2d6083a07e2cfea566 Gerrit-Change-Number: 35591 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: gsup_server: Improve log line when listening on gsup
by pespin 16 Jan '24

16 Jan '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35590?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: gsup_server: Improve log line when listening on gsup ...................................................................... gsup_server: Improve log line when listening on gsup Change-Id: I7dccc20b6c2c0f58cdd3a43469053624927c9acd --- M src/gsup_server.erl 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/90/35590/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35590?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I7dccc20b6c2c0f58cdd3a43469053624927c9acd Gerrit-Change-Number: 35590 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in ...osmo-epdg[master]: gsup_server: Improve log line where gsup client connects to us
by pespin 16 Jan '24

16 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35590?usp=email ) Change subject: gsup_server: Improve log line where gsup client connects to us ...................................................................... gsup_server: Improve log line where gsup client connects to us Change-Id: I7dccc20b6c2c0f58cdd3a43469053624927c9acd --- M src/gsup_server.erl 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/90/35590/1 diff --git a/src/gsup_server.erl b/src/gsup_server.erl index fcb19a0..77d6915 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -92,7 +92,7 @@ }, case ipa_proto:start_listen(Port, 1, Options) of {ok, LSocket, Port} -> - lager:info("connected!~n", []), + lager:info("GSUP client connected to us~n", []), {ok, #gsups_state{lsocket = LSocket, lport = Port, ccm_options = CcmOptions}}; {error, econnrefused} -> timer:sleep(5000), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35590?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I7dccc20b6c2c0f58cdd3a43469053624927c9acd Gerrit-Change-Number: 35590 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: gsup_server: Remove incorrect log about reconnecting
by pespin 16 Jan '24

16 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35589?usp=email ) Change subject: gsup_server: Remove incorrect log about reconnecting ...................................................................... gsup_server: Remove incorrect log about reconnecting osmo-epdg is a GSUP server, so if conn goes down it won't reconnect. That's the duty of the client. Change-Id: Ib5a8f1eb6d873f85d526222f76768d2b81f08d90 --- M src/gsup_server.erl 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/89/35589/1 diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 14d2364..fcb19a0 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -124,7 +124,7 @@ % When the IPA connection is closed. handle_info({ipa_closed, _}, S) -> - lager:error("GSUP connection has been closed, supervisor should reconnect us"), + lager:error("GSUP connection has been closed"), {noreply, S}; % FIXME: handle multiple concurrent connection well -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35589?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ib5a8f1eb6d873f85d526222f76768d2b81f08d90 Gerrit-Change-Number: 35589 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: diameter: Allow configuring (re)connect timer in s6b and swx
by pespin 16 Jan '24

16 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35588?usp=email ) Change subject: diameter: Allow configuring (re)connect timer in s6b and swx ...................................................................... diameter: Allow configuring (re)connect timer in s6b and swx TTCN3 tests will require lower values to avoid timing out. Change-Id: I7d280f83f4f375eaf34ea3b69a421372af54ffdb --- M config/sys.config M src/aaa_diameter_s6b.erl M src/epdg_diameter_swx.erl 3 files changed, 33 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/88/35588/1 diff --git a/config/sys.config b/config/sys.config index 630a057..699df4f 100755 --- a/config/sys.config +++ b/config/sys.config @@ -9,6 +9,8 @@ {diameter_remote_ip, "127.0.0.1"}, {diameter_remote_port, 3868}, {diameter_proto, sctp}, + {diameter_connect_timer, 30000}, + {diameter_watchdog_timer, 30000}, {vendor_id, 0}, {origin_host, "epdg.localdomain"}, {origin_realm, "localdomain"}, @@ -17,6 +19,7 @@ {dia_s6b_local_ip, "127.0.0.10"}, {dia_s6b_local_port, 3868}, {dia_s6b_proto, sctp}, + {dia_s6b_connect_timer, 30000}, {dia_s6b_vendor_id, 0}, {dia_s6b_origin_host, "aaa.localdomain"}, {dia_s6b_origin_realm, "localdomain"}, diff --git a/src/aaa_diameter_s6b.erl b/src/aaa_diameter_s6b.erl index 4ee0219..fd83bde 100644 --- a/src/aaa_diameter_s6b.erl +++ b/src/aaa_diameter_s6b.erl @@ -121,9 +121,10 @@ Proto = application:get_env(?ENV_APP_NAME, dia_s6b_proto, ?ENV_DEFAULT_DIAMETER_PROTO), Ip = application:get_env(?ENV_APP_NAME, dia_s6b_local_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP), Port = application:get_env(?ENV_APP_NAME, dia_s6b_local_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT), + ConnectTimer = application:get_env(osmo_dia2gsup, dia_s6b_connect_timer, 30000), ok = diameter:start_service(?MODULE, ?SERVICE), % lager:info("DiaServices is ~p~n", [DiaServ]), - {ok, _} = listen({address, Proto, Ip, Port}), + {ok, _} = listen({address, Proto, Ip, Port}, {timer, ConnectTimer}), {ok, State}. test() -> @@ -176,8 +177,7 @@ %% Internal Function Definitions %% ------------------------------------------------------------------ -%% connect/2 -listen(Name, {address, Protocol, IPAddr, Port}) -> +listen(Name, {address, Protocol, IPAddr, Port}, {timer, ConnectTimer}) -> lager:notice("~s Listening on IP ~s port ~p~n", [Name, IPAddr, Port]), {ok, IP} = inet_parse:address(IPAddr), TransportOpts = @@ -188,11 +188,12 @@ {port, Port} %%{raddr, IP}, %%{rport, Port} - ]}], - diameter:add_transport(Name, {listen, [{reconnect_timer, 1000} | TransportOpts]}). + ]}, + {connect_timer, ConnectTimer}], + diameter:add_transport(Name, {listen, TransportOpts}). -listen(Address) -> - listen(?SVC_NAME, Address). +listen(Address, {timer, ConnectTimer}) -> + listen(?SVC_NAME, Address, {timer, ConnectTimer}). %% Convert connection type tmod(tcp) -> diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl index c278206..d7bea93 100644 --- a/src/epdg_diameter_swx.erl +++ b/src/epdg_diameter_swx.erl @@ -121,9 +121,11 @@ Proto = application:get_env(?ENV_APP_NAME, diameter_proto, ?ENV_DEFAULT_DIAMETER_PROTO), Ip = application:get_env(?ENV_APP_NAME, diameter_remote_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP), Port = application:get_env(?ENV_APP_NAME, diameter_remote_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT), + ConnectTimer = application:get_env(?ENV_APP_NAME, diameter_connect_timer, 30000), + WatchdogTimer = application:get_env(?ENV_APP_NAME, diameter_watchdog_timer, 30000), ok = diameter:start_service(?MODULE, ?SERVICE), % lager:info("DiaServices is ~p~n", [DiaServ]), - {ok, _} = connect({address, Proto, Ip, Port}), + {ok, _} = connect({address, Proto, Ip, Port}, {timer, ConnectTimer, WatchdogTimer}), {ok, State}. test() -> @@ -256,8 +258,8 @@ %% Internal Function Definitions %% ------------------------------------------------------------------ -%% connect/2 -connect(Name, {address, Protocol, IPAddr, Port}) -> +%% connect/3 +connect(Name, {address, Protocol, IPAddr, Port}, {timer, ConnectTimer, WatchdogTimer}) -> lager:notice("~s connecting to IP ~s port ~p~n", [Name, IPAddr, Port]), {ok, IP} = inet_parse:address(IPAddr), TransportOpts = @@ -265,11 +267,13 @@ {transport_config, [{reuseaddr, true}, {raddr, IP}, - {rport, Port}]}], - diameter:add_transport(Name, {connect, [{reconnect_timer, 1000} | TransportOpts]}). + {rport, Port}]}, + {connect_timer, ConnectTimer}, + {watchdog_timer, WatchdogTimer}], + diameter:add_transport(Name, {connect, TransportOpts}). -connect(Address) -> - connect(?SVC_NAME, Address). +connect(Address, Timers) -> + connect(?SVC_NAME, Address, Timers). %% Convert connection type tmod(tcp) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35588?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I7d280f83f4f375eaf34ea3b69a421372af54ffdb Gerrit-Change-Number: 35588 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0