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

[S] Change in osmo-ttcn3-hacks[master]: sgsn: TC_stat_bsc_sctp_disconnected: validate using StatsD

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40992?usp=email ) Change subject: sgsn: TC_stat_bsc_sctp_disconnected: validate using StatsD ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: This specific patch shouldn't be merged until https://gerrit.osmocom.org/c/osmo-sgsn/+/40990/ is merged first. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40992?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: I1ff8c51a73556357c5a5e97bc2a0edec30f1cf03 Gerrit-Change-Number: 40992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Sep 2025 12:10:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

2 weeks, 5 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn: Add suport to obtain statsd output

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40991?usp=email ) Change subject: sgsn: Add suport to obtain statsd output ...................................................................... sgsn: Add suport to obtain statsd output It will be used in a follow-up commit in TC_stat_rnc_sctp_disconnected. This new test infrastructure can still be used with osmo-sgsn latest since it already initialized the statsd VTY commands despite having no osmo_stats in use. Change-Id: Ic86ce75ea700d05fc65fcea3cdab7b7eaac12069 --- M sgsn/README.md M sgsn/SGSN_Tests.cfg M sgsn/SGSN_Tests.default M sgsn/SGSN_Tests.ttcn M sgsn/gen_links.sh M sgsn/osmo-sgsn.cfg M sgsn/regen_makefile.sh 7 files changed, 41 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved diff --git a/sgsn/README.md b/sgsn/README.md index c6ee447..c161aff 100644 --- a/sgsn/README.md +++ b/sgsn/README.md @@ -6,6 +6,7 @@ * Gp: GTP (emulates GGSN) * GSUP (emulates HLR) * VTY + * StatsD {% dot sgsn_tests.svg digraph G { @@ -20,5 +21,6 @@ ATS -> STP [label="Iu (IuPS)"]; SGSN -> ATS [label="GSUP"]; ATS -> SGSN [label="VTY"]; + SGSN -> ATS [label="StatsD"]; } %} diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg index 365d4cd..edda944 100644 --- a/sgsn/SGSN_Tests.cfg +++ b/sgsn/SGSN_Tests.cfg @@ -10,6 +10,7 @@ [TESTPORT_PARAMETERS] *.SGSNVTY.CTRL_HOSTNAME := "127.0.0.10" +*.STATSVTY.CTRL_HOSTNAME := "127.0.0.10" [MODULE_PARAMETERS] SGSN_Tests.mp_nsconfig := { diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default index f8d3e46..5a7b8c6 100644 --- a/sgsn/SGSN_Tests.default +++ b/sgsn/SGSN_Tests.default @@ -17,6 +17,15 @@ *.SGSNVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.SGSNVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.SGSNVTY.PROMPT1 := "OsmoSGSN> " +*.STATSVTY.CTRL_MODE := "client" +*.STATSVTY.CTRL_HOSTNAME := "127.0.0.1" +*.STATSVTY.CTRL_PORTNUM := "4245" +*.STATSVTY.CTRL_LOGIN_SKIPPED := "yes" +*.STATSVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" +*.STATSVTY.CTRL_READMODE := "buffered" +*.STATSVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.STATSVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" +*.STATSVTY.PROMPT1 := "OsmoSGSN> " *.STPVTY.CTRL_MODE := "client" *.STPVTY.CTRL_HOSTNAME := "127.0.0.1" *.STPVTY.CTRL_PORTNUM := "4239" diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 3e5ed5b..1b339cf 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -26,6 +26,11 @@ import from Osmocom_Gb_Types all; import from SCCPasp_Types all; +import from StatsD_Types all; +import from StatsD_CodecPort all; +import from StatsD_CodecPort_CtrlFunct all; +import from StatsD_Checker all; + import from MobileL3_CommonIE_Types all; import from MobileL3_GMM_SM_Types all; import from MobileL3_Types all; @@ -72,6 +77,12 @@ integer mp_echo_interval := 5; /* in seconds. Only used in test enabling g_use_echo */ charstring mp_sgsn_gtp_ip := "127.0.0.10"; + /* Address where we listen for STATSD metrics */ + charstring mp_local_statsd_ip := "127.0.0.1"; + /* port number to which to listen for STATSD metrics */ + integer mp_msc_statsd_port := 8125; + charstring mp_statsd_prefix := "TTCN3."; + NSConfigurations mp_nsconfig := { { nsei := 96, @@ -174,7 +185,7 @@ type record length(NUM_RNC) of IuInstance IuInstances; type record of RAN_Configuration RAN_Configurations; -type component test_CT extends GTP_ConnHdlr { +type component test_CT extends GTP_ConnHdlr, StatsD_ConnHdlr { var GbInstances g_gb; var IuInstances g_iu; var boolean g_iu_enable := false; @@ -196,6 +207,10 @@ port TELNETasp_PT SGSNVTY; port TELNETasp_PT STPVTY; + /* StatsD */ + var StatsD_Checker_CT vc_STATSD; + var float g_statd_timeout := 5.0; + var boolean g_initialized := false; var boolean g_use_echo := false; }; @@ -437,6 +452,7 @@ } f_init_gsup("SGSN_Test"); f_init_ggsn_gtp("SGSN_Test"); + f_init_statsd("SGSN_Test", vc_STATSD, mp_local_statsd_ip, mp_msc_statsd_port, g_statd_timeout); f_vty_enable_echo_interval(g_use_echo); } diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index fe1bf08..e991fd5 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -88,6 +88,7 @@ FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " +FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " FILES+="ITU_X213_Types.ttcn " FILES+="RAN_Emulation.ttcnpp RAN_Adapter.ttcnpp SCCP_Templates.ttcn " diff --git a/sgsn/osmo-sgsn.cfg b/sgsn/osmo-sgsn.cfg index ae01923..e9f56c0 100644 --- a/sgsn/osmo-sgsn.cfg +++ b/sgsn/osmo-sgsn.cfg @@ -46,7 +46,15 @@ logging level lm3ua notice logging level lmgcp notice ! -stats interval 5 +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 127.0.0.1 + remote-port 8125 + flush-period 1 + mtu 1024 + enable ! line vty no login diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index c116d94..7034243 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -19,6 +19,7 @@ RANAP_EncDec.cc SCCP_EncDec.cc SCTPasp_PT.cc + StatsD_CodecPort_CtrlFunctdef.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc @@ -30,6 +31,7 @@ -DIPA_EMULATION_GSUP -DRAN_EMULATION_RANAP -DUSE_MTP3_DISTRIBUTOR + -DSTATSD_HAVE_VTY " . ../_buildsystem/regen_makefile.inc.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40991?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: Ic86ce75ea700d05fc65fcea3cdab7b7eaac12069 Gerrit-Change-Number: 40991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 5 days

1
0
0 0

[L] Change in osmo-sgsn[master]: Introduce iu_rnc FSM

by pespin

Attention is currently required from: fixeria, lynxis lazus, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40988?usp=email ) Change subject: Introduce iu_rnc FSM ...................................................................... Patch Set 3: (1 comment) File src/sgsn/iu_rnc_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/40988/comment/866c1370_8489c384?us… : PS3, Line 126: #define LEGACY_BEHAVIOR > Is there a plan for removing the legacy behavior, maybe write an issue about it and point to it here […] This is basically the same ifdef we already have in osmo-msc ran_peer_fsm. I preferred keeping it in sync with what we do in osmo-msc, specially since changing to the other behavior would mean more behavioral changes I'm tyring to avoid now. so my opinion is leave it like I presented and let everything stabilize, and we can look at this later once we find something unoptimal or problematic when running it and get some specific report. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40988?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I18b7803500163e78ff6a684095194174b0fb6ee1 Gerrit-Change-Number: 40988 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 02 Sep 2025 12:09:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

2 weeks, 5 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: erab_fsm_start_reg/2: check if already registered

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40993?usp=email ) Change subject: s1ap_proxy: erab_fsm_start_reg/2: check if already registered ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40993?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: I8e93492219100496fd8dc69e031310858ba9c7fb Gerrit-Change-Number: 40993 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Sep 2025 12:05:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn: Add suport to obtain statsd output

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40991?usp=email ) Change subject: sgsn: Add suport to obtain statsd output ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40991?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: Ic86ce75ea700d05fc65fcea3cdab7b7eaac12069 Gerrit-Change-Number: 40991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Sep 2025 11:58:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn: TC_stat_bsc_sctp_disconnected: validate using StatsD

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40992?usp=email ) Change subject: sgsn: TC_stat_bsc_sctp_disconnected: validate using StatsD ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40992?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: I1ff8c51a73556357c5a5e97bc2a0edec30f1cf03 Gerrit-Change-Number: 40992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Sep 2025 11:57:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[M] Change in osmo-sgsn[master]: stats: Introduce stats sgsn.iu_peers.{total,active}

by osmith

Attention is currently required from: fixeria, lynxis lazus, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40990?usp=email ) Change subject: stats: Introduce stats sgsn.iu_peers.{total,active} ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40990?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I51b5227d92027f1251dc4debbbf59737e7c1a9ba Gerrit-Change-Number: 40990 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 02 Sep 2025 11:37:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[L] Change in osmo-sgsn[master]: Introduce iu_rnc FSM

by osmith

Attention is currently required from: fixeria, lynxis lazus, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40988?usp=email ) Change subject: Introduce iu_rnc FSM ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/sgsn/iu_rnc_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/40988/comment/b5716596_e141371f?us… : PS3, Line 126: #define LEGACY_BEHAVIOR Is there a plan for removing the legacy behavior, maybe write an issue about it and point to it here? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40988?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I18b7803500163e78ff6a684095194174b0fb6ee1 Gerrit-Change-Number: 40988 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 02 Sep 2025 11:36:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: remove eNB-ID from erab_uid()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40994?usp=email ) Change subject: s1ap_proxy: remove eNB-ID from erab_uid() ...................................................................... s1ap_proxy: remove eNB-ID from erab_uid() XXX: commit description XXX: fix unit tests Change-Id: I7277d19080795600252306dbfa0c733f996e026e --- M src/s1ap_proxy.erl 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/94/40994/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 0195e39..6c14807 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -66,7 +66,8 @@ -type mme_ue_id() :: 0..16#ffffffff. -type enb_ue_id() :: 0..16#ffffff. -type erab_id() :: 0..16#ff. --type erab_uid() :: {mme_ue_id(), enb_ue_id(), erab_id()}. +-type erab_uid() :: {mme_ue_id(), erab_id()}. + -type plmn_id() :: {MCC :: nonempty_string(), MNC :: nonempty_string()}. @@ -185,9 +186,8 @@ -spec erab_uid(erab_id(), proxy_state()) -> erab_uid(). -erab_uid(ERABId, #proxy_state{mme_ue_id = MmeUeId, - enb_ue_id = EnbUeId}) -> - {MmeUeId, EnbUeId, ERABId}. +erab_uid(ERABId, #proxy_state{mme_ue_id = MmeUeId}) -> + {MmeUeId, ERABId}. -spec erab_for_each(UID, Fun, ERABs) -> ok @@ -1102,14 +1102,16 @@ -spec erab_fsm_start_reg(erab_id(), proxy_state()) -> {pid(), proxy_state()}. -erab_fsm_start_reg(RABId, #proxy_state{erabs = ERABs} = S) -> +erab_fsm_start_reg(RABId, #proxy_state{erabs = ERABs, + mme_ue_id = MmeUeId, + enb_ue_id = ENBUEId} = S) -> UID = erab_uid(RABId, S), case dict:find(UID, ERABs) of {ok, Pid} -> ?LOG_ERROR("E-RAB ~p is already registered?!?", [UID]), {Pid, S}; %% return Pid of the existing erab_fsm process error -> - {ok, Pid} = erab_fsm:start_link(UID), + {ok, Pid} = erab_fsm:start_link({MmeUeId, ENBUEId, RABId}), {Pid, S#proxy_state{erabs = dict:store(UID, Pid, ERABs)}} end. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40994?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: I7277d19080795600252306dbfa0c733f996e026e Gerrit-Change-Number: 40994 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 5 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: erab_fsm_start_reg/2: check if already registered

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40993?usp=email ) Change subject: s1ap_proxy: erab_fsm_start_reg/2: check if already registered ...................................................................... s1ap_proxy: erab_fsm_start_reg/2: check if already registered Before this patch, s1ap_proxy would spawn a new erab_fsm process with a duplicate UID and simply replace the old process in the rigistry. This would result in stale erab_fsm process, still linked but not present in the registry, and thus not reachable. If there's already an E-RAB process for the given UID, simply return Pid of that existing process. The FSM will most likely reject an unexpected event, resulting in a negative verdict: * 'reply' for duplicate E-RAB SETUP REQUEST * 'drop' for duplicate INITIAL CONTEXT SETUP REQUEST Change-Id: I8e93492219100496fd8dc69e031310858ba9c7fb --- M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 2 files changed, 42 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/93/40993/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 8111ad6..0195e39 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -1104,8 +1104,14 @@ -spec erab_fsm_start_reg(erab_id(), proxy_state()) -> {pid(), proxy_state()}. erab_fsm_start_reg(RABId, #proxy_state{erabs = ERABs} = S) -> UID = erab_uid(RABId, S), - {ok, Pid} = erab_fsm:start_link(UID), - {Pid, S#proxy_state{erabs = dict:store(UID, Pid, ERABs)}}. + case dict:find(UID, ERABs) of + {ok, Pid} -> + ?LOG_ERROR("E-RAB ~p is already registered?!?", [UID]), + {Pid, S}; %% return Pid of the existing erab_fsm process + error -> + {ok, Pid} = erab_fsm:start_link(UID), + {Pid, S#proxy_state{erabs = dict:store(UID, Pid, ERABs)}} + end. -spec erab_fsm_find(erab_id(), proxy_state()) -> {ok, pid()} | error. diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 1145bc5..8f338c9 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -52,6 +52,8 @@ ?TC(fun test_e_rab_setup/1)}, {"E-RAB SETUP REQUEST (failure)", ?TC(fun test_e_rab_setup_req_fail/1)}, + {"E-RAB SETUP REQUEST (duplicate)", + ?TC(fun test_e_rab_setup_dup/1)}, {"E-RAB RELEASE COMMAND/RESPONSE", ?TC(fun test_e_rab_release_cmd/1)}, {"E-RAB RELEASE INDICATION", @@ -68,6 +70,8 @@ ?TC(fun test_e_rab_modify_ind_cnf_release/1)}, {"INITIAL CONTEXT SETUP REQUEST/RESPONSE", ?TC(fun test_initial_context_setup/1)}, + {"INITIAL CONTEXT SETUP REQUEST/RESPONSE (duplicate)", + ?TC(fun test_initial_context_setup_dup/1)}, {"UE CONTEXT RELEASE REQUEST", ?TC(fun test_ue_ctx_release_req/1)}, {"UE CONTEXT RELEASE COMMAND/COMPLETE", @@ -147,6 +151,23 @@ ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. +test_e_rab_setup_dup(#{handler := Pid}) -> + %% [eNB <- MME] E-RAB SETUP REQUEST + SetupReqIn = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + %% [eNB -> MME] E-RAB SETUP RESPONSE + SetupRspIn = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + %% eNB <- [S1GW <- MME] E-RAB SETUP REQUEST (duplicate) + %% eNB -- [S1GW -> MME] E-RAB SETUP RESPONSE (failure) + SetupRspExp = e_rab_setup_rsp_fail_pdu(), + + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupReqIn)), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRspIn)), + %% duplicate E-RAB SETUP REQUEST triggers a reply + ?_assertEqual({reply, SetupRspExp}, s1ap_proxy:process_pdu(Pid, SetupReqIn)), + ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {7, 9, 6})), + ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. + + test_e_rab_release_cmd(#{handler := Pid}) -> %% [eNB <- MME] E-RAB SETUP REQUEST SetupReq = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), @@ -357,6 +378,19 @@ ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. +test_initial_context_setup_dup(#{handler := Pid}) -> + %% [eNB <- MME] INITIAL CONTEXT SETUP REQUEST + InitCtxSetupReqIn = initial_context_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + %% [eNB -> MME] INITIAL CONTEXT SETUP RESPONSE + InitCtxSetupRspIn = initial_context_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReqIn)), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupRspIn)), + %% duplicate INITIAL CONTEXT SETUP REQUEST results in the PDU being dropped + ?_assertEqual({drop, InitCtxSetupReqIn}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReqIn)), + ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. + + test_ue_ctx_release_req(#{handler := Pid}) -> %% [eNB <- MME] INITIAL CONTEXT SETUP REQUEST InitCtxSetupReq = initial_context_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40993?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: I8e93492219100496fd8dc69e031310858ba9c7fb Gerrit-Change-Number: 40993 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 5 days

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2025