- gerrit-log - lists.osmocom.org

[S] Change in ...osmo-epdg[master]: aaa_diameter_swx: Make tx timeout configurable and increase default t...
by pespin 28 Feb '24

28 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36118?usp=email ) Change subject: aaa_diameter_swx: Make tx timeout configurable and increase default to 10 seconds ...................................................................... aaa_diameter_swx: Make tx timeout configurable and increase default to 10 seconds Change-Id: I52c993b92da9979761b0c1526b5f253dff9d2e2f --- M src/aaa_diameter_swx.erl 1 file changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/18/36118/1 diff --git a/src/aaa_diameter_swx.erl b/src/aaa_diameter_swx.erl index c623b3e..be301f2 100644 --- a/src/aaa_diameter_swx.erl +++ b/src/aaa_diameter_swx.erl @@ -71,6 +71,7 @@ -define(ENV_DEFAULT_DIAMETER_CONNECT_TIMER_MS, 30000). -define(ENV_DEFAULT_DIAMETER_WATCHDOG_TIMER_MS, 30000). -define(ENV_DEFAULT_DIAMETER_WATCHDOG_CFG, [{okay, 3}, {suspect, 1}]). +-define(ENV_DEFAULT_DIAMETER_TRANSMIT_TIMER_MS, 10000). -define(VENDOR_ID_3GPP, 10415). -define(VENDOR_ID_3GPP2, 5535). @@ -96,7 +97,8 @@ {module, ?CALLBACK_MOD}, {answer_errors, callback}]}]). --record(state, { +-record(swx_state, { + tx_timeout :: non_neg_integer(), handlers, peers = #{} }). @@ -121,17 +123,18 @@ gen_server:cast(?SERVER, {peer_down, SvcName, Peer}), ok. -init(State) -> +init([]) -> Proto = application:get_env(?ENV_APP_NAME, dia_swx_proto, ?ENV_DEFAULT_DIAMETER_PROTO), Ip = application:get_env(?ENV_APP_NAME, dia_swx_remote_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP), Port = application:get_env(?ENV_APP_NAME, dia_swx_remote_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT), ConnectTimer = application:get_env(?ENV_APP_NAME, dia_swx_connect_timer, ?ENV_DEFAULT_DIAMETER_CONNECT_TIMER_MS), WatchdogTimer = application:get_env(?ENV_APP_NAME, dia_swx_watchdog_timer, ?ENV_DEFAULT_DIAMETER_WATCHDOG_TIMER_MS), WatchdogConfig = application:get_env(?ENV_APP_NAME, dia_swx_watchdog_config, ?ENV_DEFAULT_DIAMETER_WATCHDOG_CFG), + TxTimer = application:get_env(?ENV_APP_NAME, dia_swx_transmit_timer, ?ENV_DEFAULT_DIAMETER_TRANSMIT_TIMER_MS), ok = diameter:start_service(?MODULE, ?SERVICE), % lager:info("DiaServices is ~p~n", [DiaServ]), {ok, _} = connect({address, Proto, Ip, Port}, {timer, ConnectTimer, WatchdogTimer, WatchdogConfig}), - {ok, State}. + {ok, #swx_state{tx_timeout = TxTimer}}. test() -> test("001011234567890"). @@ -223,7 +226,7 @@ 'RAT-Type' = RAT }, lager:debug("Swx Tx MAR: ~p~n", [MAR]), - Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, MAR, [{extra, [Pid]}, detach]), + Ret = diameter_call(MAR, Pid, State), case Ret of ok -> {reply, ok, State}; @@ -244,7 +247,7 @@ 'Server-Assignment-Type' = Type, 'Service-Selection' = [APN] }, - Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, SAR, [{extra, [Pid]}, detach]), + Ret = diameter_call(SAR, Pid, State), case Ret of ok -> {reply, ok, State}; @@ -306,4 +309,9 @@ tmod(sctp) -> diameter_sctp. +diameter_call(Msg, Pid, State) -> + diameter:call(?SVC_NAME, ?APP_ALIAS, Msg, [{extra, [Pid]}, + {timeout, State#swx_state.tx_timeout}, + detach]). + -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36118?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: I52c993b92da9979761b0c1526b5f253dff9d2e2f Gerrit-Change-Number: 36118 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: aaa_diameter_swx_cb.erl: Fix undef handle_error/5
by pespin 28 Feb '24

28 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36117?usp=email ) Change subject: aaa_diameter_swx_cb.erl: Fix undef handle_error/5 ...................................................................... aaa_diameter_swx_cb.erl: Fix undef handle_error/5 We are passing extra parameters, so this function also needs to be adapted to the extra parameter, like handle_answer. Change-Id: Id66b849f62a98c4ae69ccd4106bc04b51712c589 --- M src/aaa_diameter_swx_cb.erl 1 file changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/17/36117/1 diff --git a/src/aaa_diameter_swx_cb.erl b/src/aaa_diameter_swx_cb.erl index 472f1d4..bf4a79e 100644 --- a/src/aaa_diameter_swx_cb.erl +++ b/src/aaa_diameter_swx_cb.erl @@ -9,7 +9,7 @@ %% diameter callbacks -export([peer_up/3, peer_down/3, pick_peer/4, pick_peer/5, prepare_request/3, prepare_request/4, prepare_retransmit/3, prepare_retransmit/4, - handle_answer/4, handle_answer/5, handle_error/4, handle_request/3]). + handle_answer/4, handle_answer/5, handle_error/4, handle_error/5, handle_request/3]). %% peer_up/3 peer_up(_SvcName, Peer, State) -> @@ -88,10 +88,14 @@ %% handle_error/4 handle_error(Reason, Request, _SvcName, _Peer) when is_list(Request) -> - lager:error("error: ~p~n", [Reason]), + lager:error("SWx error: ~p~n", [Reason]), {error, Reason}; handle_error(Reason, _Request, _SvcName, _Peer) -> - lager:error("error: ~p~n", [Reason]), + lager:error("SWx error: ~p~n", [Reason]), + {error, Reason}. +%% handle_error/5 +handle_error(Reason, _Request, _SvcName, _Peer, ExtraPars) -> + lager:error("SWx error: ~p, ExtraPars: ~p~n", [Reason, ExtraPars]), {error, Reason}. %% handle_request/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36117?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: Id66b849f62a98c4ae69ccd4106bc04b51712c589 Gerrit-Change-Number: 36117 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm: Increase timeout waiting for gtp response
by pespin 28 Feb '24

28 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36116?usp=email ) Change subject: epdg_ue_fsm: Increase timeout waiting for gtp response ...................................................................... epdg_ue_fsm: Increase timeout waiting for gtp response Answers can take a while specially during CreateSession, where several nodes are involved, like PGW, AAA, HSS, PCRF, etc. Change-Id: I3c8e7c7551bb3d48c46c0195c02cb44ce222a17f --- M src/epdg_ue_fsm.erl 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/16/36116/1 diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 439cb3f..94f2a39 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -49,6 +49,8 @@ state_wait_create_session_resp/3, state_wait_delete_session_resp/3, state_wait_swm_session_termination_answer/3, state_active/3]). +-define(TIMEOUT_VAL_WAIT_GTP_ANSWER, 10000). + -record(ue_fsm_data, { imsi, apn = "internet" :: string(), @@ -274,7 +276,7 @@ {keep_state, Data}. state_wait_create_session_resp(enter, _OldState, Data) -> - {keep_state, Data, [{state_timeout,5000,create_session_timeout}]}; + {keep_state, Data, [{state_timeout,?TIMEOUT_VAL_WAIT_GTP_ANSWER,create_session_timeout}]}; state_wait_create_session_resp({call, From}, {received_gtpc_create_session_response, Result}, Data) -> lager:info("ue_fsm state_authenticated event=received_gtpc_create_session_response, ~p~n", [Data]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36116?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: I3c8e7c7551bb3d48c46c0195c02cb44ce222a17f Gerrit-Change-Number: 36116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in ...osmo-epdg[master]: s2b: Handle CreateSession with failed Cause
by pespin 28 Feb '24

28 Feb '24

Attention is currently required from: fixeria, laforge, lynxis lazus. Hello Jenkins Builder, fixeria, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36112?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: s2b: Handle CreateSession with failed Cause ...................................................................... s2b: Handle CreateSession with failed Cause Related: OS#6371 Change-Id: I7bc840e863c0a1eff3b1df2c42f6b1868dec8dae --- M src/epdg_gtpc_s2b.erl M src/epdg_ue_fsm.erl M src/gsup_server.erl M src/gtp_utils.erl 4 files changed, 89 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/12/36112/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36112?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: I7bc840e863c0a1eff3b1df2c42f6b1868dec8dae Gerrit-Change-Number: 36112 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Add tests to validate concurrent connections
by pespin 28 Feb '24

28 Feb '24

Attention is currently required from: fixeria, laforge, lynxis lazus, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?usp=email ) Change subject: epdg: Add tests to validate concurrent connections ...................................................................... Patch Set 3: (1 comment) File epdg/EPDG_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093/comment/ef1d2859_c585… PS2, Line 797: -> sender vc_conn > > Definetly we don't want vc_conn_list[i] there, since in "sender X", X is an output param. […] AH I see what you mean. I now tried it but then since CreateSessions are even more synchronized, osmo-epdg + ttcn3 is struggling to serve all those under 5 seconds. I'm doing several fixes and increasing some timeouts now. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?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: I842dacda56abe47afb19e951eaae746b5e8d9fe7 Gerrit-Change-Number: 36093 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 28 Feb 2024 19:38:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: cosmetic: epdg: Drop extra whitelines
by pespin 28 Feb '24

28 Feb '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36113?usp=email ) Change subject: cosmetic: epdg: Drop extra whitelines ...................................................................... cosmetic: epdg: Drop extra whitelines Change-Id: I20cde98340efb41a13d430f8692b3242eb5824be --- M epdg/EPDG_Tests.ttcn 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 44dc80f..6358d96 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -93,7 +93,6 @@ f_diameter_expect_imsi(imsi); - while (true) { alt { [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg { @@ -711,7 +710,6 @@ f_initial_attach(); f_GSUP_PurgeMS_success(); } - testcase TC_authinfo_normal() runs on MTC_CT { var EPDG_ConnHdlrPars pars := f_init_pars(); var EPDG_ConnHdlr vc_conn; @@ -728,7 +726,6 @@ f_GTP2C_CreateBearer_success(); f_GSUP_PurgeMS_success(); } - testcase TC_ho_lte_to_wifi() runs on MTC_CT { var EPDG_ConnHdlrPars pars := f_init_pars(); var EPDG_ConnHdlr vc_conn; @@ -744,7 +741,6 @@ * cause="Access changed from non-3gpp to 3gpp" */ f_GTP2C_DeleteBearer_success(); } - testcase TC_ho_wifi_to_lte() runs on MTC_CT { var EPDG_ConnHdlrPars pars := f_init_pars(); var EPDG_ConnHdlr vc_conn; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36113?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: I20cde98340efb41a13d430f8692b3242eb5824be Gerrit-Change-Number: 36113 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Add tests to validate concurrent connections
by fixeria 28 Feb '24

28 Feb '24

Attention is currently required from: laforge, lynxis lazus, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?usp=email ) Change subject: epdg: Add tests to validate concurrent connections ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?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: I842dacda56abe47afb19e951eaae746b5e8d9fe7 Gerrit-Change-Number: 36093 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 28 Feb 2024 18:59:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: cosmetic: epdg: Drop extra whitelines
by fixeria 28 Feb '24

28 Feb '24

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36113?usp=email ) Change subject: cosmetic: epdg: Drop extra whitelines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36113?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: I20cde98340efb41a13d430f8692b3242eb5824be Gerrit-Change-Number: 36113 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 18:58:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: fix regression in sctp-proto / transport-proto
by fixeria 28 Feb '24

28 Feb '24

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?usp=email ) Change subject: fix regression in sctp-proto / transport-proto ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: FYI: I reported https://osmocom.org/issues/6380. V-1: The VTY transcript needs to be updated, shall I do this? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic666b62948880445e030c637298d4e369b4c7e8e Gerrit-Change-Number: 36114 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 28 Feb 2024 18:53:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
by pespin 28 Feb '24

28 Feb '24

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36115?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction ...................................................................... Patch Set 2: (1 comment) File src/osmo_ss7_asp.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/36115/comment/d7b7aaab_2899dd33 PS2, Line 990: asp->asp_id = rand() & 0xf; asp_id is not used in the SCTP/M3UA case? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36115?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733 Gerrit-Change-Number: 36115 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 28 Feb 2024 18:49:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log