- gerrit-log - lists.osmocom.org

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: cache GlobalENBId string
by fixeria 16 Jul '25

16 Jul '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40716?usp=email ) Change subject: s1ap_proxy: cache GlobalENBId string ...................................................................... s1ap_proxy: cache GlobalENBId string Avoid calling genb_id_str/1 every time a counter is incremented. Generate the string once, cache, and use it in ctr_inc/2. Change-Id: I68d394213563c68757b7490e6af2321259feda4f Related: SYS#7065 --- M src/s1ap_proxy.erl 1 file changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/16/40716/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index f2fd722..fdcf98c 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -73,6 +73,7 @@ -record(proxy_state, {erabs :: dict:dict(), enb_id :: undefined | non_neg_integer(), plmn_id :: undefined | plmn_id(), + genb_id_str :: undefined | string(), mme_ue_id :: undefined | mme_ue_id(), enb_ue_id :: undefined | enb_ue_id(), erab_id :: undefined | erab_id(), @@ -233,12 +234,10 @@ parse_enb_id({'long-macroENB-ID', << ID:21 >>}) -> ID. --spec genb_id_str(proxy_state()) -> string() | none. +-spec genb_id_str(proxy_state()) -> string(). genb_id_str(#proxy_state{plmn_id = {MCC, MNC}, enb_id = ENBId}) -> - MCC ++ "-" ++ MNC ++ "-" ++ integer_to_list(ENBId); - -genb_id_str(#proxy_state{}) -> none. + MCC ++ "-" ++ MNC ++ "-" ++ integer_to_list(ENBId). %% register a single per-eNB counter @@ -266,8 +265,8 @@ when C0 :: [ctr | _], S :: proxy_state(). ctr_inc([ctr | _] = C0, S) -> - case genb_id_str(S) of - none -> + case S#proxy_state.genb_id_str of + undefined -> %% increment the global counter only s1gw_metrics:ctr_inc(C0); GlobalENBId -> @@ -643,7 +642,7 @@ set_logging_prefix("eNB " ++ GlobalENBId), %% register per-eNB metrics ctr_reg_all(GlobalENBId), - {{ok, C}, S1}; + {{ok, C}, S1#proxy_state{genb_id_str = GlobalENBId}}; %% E-RAB SETUP REQUEST related IEs handle_ie([?'id-E-RABToBeSetupListBearerSUReq'], C, S) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40716?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: I68d394213563c68757b7490e6af2321259feda4f Gerrit-Change-Number: 40716 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: fix per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL
by fixeria 16 Jul '25

16 Jul '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40717?usp=email ) Change subject: s1ap_proxy: fix per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL ...................................................................... s1ap_proxy: fix per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL The per-eNB variant of ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL was one-less, not counting the very first S1 Setup Req. The reason is that only the global variant is incremented before Global-eNB-ID is known. Change-Id: If57f0c43f41d5f38759f9746a4f6299d3233a450 Related: SYS#7065 --- M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 2 files changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/17/40717/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index fdcf98c..709ac87 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -642,7 +642,16 @@ set_logging_prefix("eNB " ++ GlobalENBId), %% register per-eNB metrics ctr_reg_all(GlobalENBId), - {{ok, C}, S1#proxy_state{genb_id_str = GlobalENBId}}; + %% increment per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, if needed + %% this is needed to count S1 Setup Req correctly + S2 = case S0#proxy_state.genb_id_str of + GlobalENBId -> S1; + _ -> + Ctr = s1gw_metrics:enb_metric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, GlobalENBId), + s1gw_metrics:ctr_inc(Ctr), + S1#proxy_state{genb_id_str = GlobalENBId} + end, + {{ok, C}, S2}; %% E-RAB SETUP REQUEST related IEs handle_ie([?'id-E-RABToBeSetupListBearerSUReq'], C, S) -> diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 59852bd..90d5a47 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -86,7 +86,7 @@ ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), %% per-eNB counters -%% ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2)]. @@ -111,7 +111,7 @@ ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), %% per-eNB counters -%% ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ, 1), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_RSP, 1), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), @@ -341,7 +341,7 @@ ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), %% per-eNB counters -%% ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_REQ, 1), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_RSP, 1), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40717?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: If57f0c43f41d5f38759f9746a4f6299d3233a450 Gerrit-Change-Number: 40717 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-gsm-tester[master]: ttcn3: BTS_Tests.cfg.tmpl: Use tolerance parameters
by pespin 16 Jul '25

16 Jul '25

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/11102?usp=email ) Change subject: ttcn3: BTS_Tests.cfg.tmpl: Use tolerance parameters ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/11102?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8e28d7c011f466d0eb2127f61032978c4e0bf16d Gerrit-Change-Number: 11102 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[S] Change in osmo-sysmon[master]: Introduce systemd service file and install with autotools
by pespin 16 Jul '25

16 Jul '25

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-sysmon/+/12286?usp=email ) Change subject: Introduce systemd service file and install with autotools ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-sysmon/+/12286?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-Change-Id: Ic4875b74bcf2b6232d915070b77fc202a03ef997 Gerrit-Change-Number: 12286 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max <suraev(a)alumni.ntnu.no> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-trx[master]: lms: Use define LOG_LEVEL_CRITICIAL instead of value
by pespin 16 Jul '25

16 Jul '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-trx/+/15257?usp=email ) Change subject: lms: Use define LOG_LEVEL_CRITICIAL instead of value ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15257?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie5bb99a76580c5780a24f190682700c5e69b3d85 Gerrit-Change-Number: 15257 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Jul 2025 17:15:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[S] Change in osmo-ttcn3-hacks[master]: WIP
by pespin 16 Jul '25

16 Jul '25

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15956?usp=email ) Change subject: WIP ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15956?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5e3cbcf3c915f62913bec3423e14ba9152c7ba2f Gerrit-Change-Number: 15956 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[M] Change in osmo-gsm-tester[master]: WIP: ttcn3: Add test to reproduce high channel load
by pespin 16 Jul '25

16 Jul '25

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17116?usp=email ) Change subject: WIP: ttcn3: Add test to reproduce high channel load ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17116?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I42d6bd0f8b3ce63e15cc186e53e04dad6f1bc5c2 Gerrit-Change-Number: 17116 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[S] Change in osmo-ggsn[master]: sgsnemu: Initial support IPv4v6 PDP context type
by pespin 16 Jul '25

16 Jul '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/17255?usp=email ) Change subject: sgsnemu: Initial support IPv4v6 PDP context type ...................................................................... Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/17255?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: If6eb2f1a5d0fb71da80e289112a67dd2faa30b4b Gerrit-Change-Number: 17255 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 16 Jul 2025 17:08:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[S] Change in osmo-ggsn[master]: cosmetic: sgsnemu: Fix trailing whitespace
by pespin 16 Jul '25

16 Jul '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/40713?usp=email ) Change subject: cosmetic: sgsnemu: Fix trailing whitespace ...................................................................... cosmetic: sgsnemu: Fix trailing whitespace Also make linter happy: sgsnemu/cmdline.c:4: WARNING:LEADING_SPACE: please, no spaces at the start of a line Change-Id: Ie89a9f9de64cd59d21341b6f381b32f56693840f --- M sgsnemu/cmdline.c M sgsnemu/cmdline.ggo 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/13/40713/1 diff --git a/sgsnemu/cmdline.c b/sgsnemu/cmdline.c index 604e76b..e287116 100644 --- a/sgsnemu/cmdline.c +++ b/sgsnemu/cmdline.c @@ -1,12 +1,12 @@ /* - File autogenerated by gengetopt version 2.22.6 - generated with the following command: - gengetopt --conf-parser - - The developers of gengetopt consider the fixed text that goes in all - gengetopt output files to be in the public domain: - we make no copyright claims on it. -*/ + * File autogenerated by gengetopt version 2.22.6 + * generated with the following command: + * gengetopt --conf-parser + * + * The developers of gengetopt consider the fixed text that goes in all + * gengetopt output files to be in the public domain: + * we make no copyright claims on it. + */ /* If we use autoconf. */ #ifdef HAVE_CONFIG_H diff --git a/sgsnemu/cmdline.ggo b/sgsnemu/cmdline.ggo index 0d074aa..54db05b 100644 --- a/sgsnemu/cmdline.ggo +++ b/sgsnemu/cmdline.ggo @@ -1,11 +1,11 @@ # OsmoGGSN - Gateway GPRS Support Node # Copyright (C) 2002, 2003, 2004 Mondru AB. -# +# # The contents of this file may be used under the terms of the GNU # General Public License Version 2, provided that the above copyright # notice and this permission notice is included in all copies or # substantial portions of the software. -# +# # Use # gengetopt --conf-parser < cmdline.ggo # linux-2.6/scripts/Lindent cmdline.c -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/40713?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie89a9f9de64cd59d21341b6f381b32f56693840f Gerrit-Change-Number: 40713 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ggsn[master]: sgsnemu: Refactor arg/cfg parser to use talloc
by pespin 16 Jul '25

16 Jul '25

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/17758?usp=email ) Change subject: sgsnemu: Refactor arg/cfg parser to use talloc ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/17758?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie0d48a12a8349be5a859a03191421cbd9cc324cc Gerrit-Change-Number: 17758 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log