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

January 2026

  • 1 participants
  • 1508 discussions
[XS] Change in pysim[master]: saip: templates: IsimOptional: add missing pe_name=ef-pcscf
by laforge 07 Jan '26

07 Jan '26
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/41688?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: saip: templates: IsimOptional: add missing pe_name=ef-pcscf ...................................................................... saip: templates: IsimOptional: add missing pe_name=ef-pcscf The file EF.P-CSCF is named ef-pcscf in the asn1 (tested with version 2.3) Change-Id: I0cfba8f4e97fd6e2d8e21edf0439692b58a78ded --- M pySim/esim/saip/templates.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/esim/saip/templates.py b/pySim/esim/saip/templates.py index 2c0a8f0..4fe4377 100644 --- a/pySim/esim/saip/templates.py +++ b/pySim/esim/saip/templates.py @@ -818,7 +818,7 @@ base_path = Path('ADF.ISIM') extends = FilesIsimMandatory files = [ - FileTemplate(0x6f09, 'EF.P-CSCF', 'LF', 1, None, 2, None, None, True, ['size'], ass_serv=[1,5]), + FileTemplate(0x6f09, 'EF.P-CSCF', 'LF', 1, None, 2, None, None, True, ['size'], ass_serv=[1,5], pe_name='ef-pcscf'), FileTemplate(0x6f3c, 'EF.SMS', 'LF', 10, 176, 5, None, '00FF...FF', False, ass_serv=[6,8]), FileTemplate(0x6f42, 'EF.SMSP', 'LF', 1, 38, 5, None, 'FF...FF', False, ass_serv=[8]), FileTemplate(0x6f43, 'EF.SMSS', 'TR', None, 2, 5, None, 'FFFF', False, ass_serv=[6,8]), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0cfba8f4e97fd6e2d8e21edf0439692b58a78ded Gerrit-Change-Number: 41688 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
1 0
0 0
[XS] Change in pysim[master]: RFC: saip: templates: fix naming of EF.SUPI_NAI
by laforge 07 Jan '26

07 Jan '26
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/41689?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: RFC: saip: templates: fix naming of EF.SUPI_NAI ...................................................................... RFC: saip: templates: fix naming of EF.SUPI_NAI Fixes parsing of a 2.3 UICC profile. This might be the wrong end as the spec says this is NSI, but somehow it's working Change-Id: I3cde1093156db274458d76e2c1c2e304d55a8466 --- M pySim/esim/saip/templates.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/esim/saip/templates.py b/pySim/esim/saip/templates.py index 4fe4377..5103219 100644 --- a/pySim/esim/saip/templates.py +++ b/pySim/esim/saip/templates.py @@ -673,7 +673,7 @@ FileTemplate(0x4f06, 'EF.UAC_AIC', 'TR', None, 4, 2, 0x06, None, True, ass_serv=[126]), FileTemplate(0x4f07, 'EF.SUCI_Calc_Info', 'TR', None, None, 2, 0x07, 'FF...FF', False, ass_serv=[124]), FileTemplate(0x4f08, 'EF.OPL5G', 'LF', None, 10, 10, 0x08, 'FF...FF', False, ['nb_rec'], ass_serv=[129]), - FileTemplate(0x4f09, 'EF.SUPI_NAI', 'TR', None, None, 2, 0x09, None, True, ['size'], ass_serv=[130]), + FileTemplate(0x4f09, 'EF.SUPI_NAI', 'TR', None, None, 2, 0x09, None, True, ['size'], ass_serv=[130], pe_name='ef-supinai'), FileTemplate(0x4f0a, 'EF.Routing_Indicator', 'TR', None, 4, 2, 0x0a, 'F0FFFFFF', False, ass_serv=[124]), ] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41689?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3cde1093156db274458d76e2c1c2e304d55a8466 Gerrit-Change-Number: 41689 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
1 0
0 0
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: Add missing BTS_Tests_OML entries
by pespin 07 Jan '26

07 Jan '26
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41775?usp=email ) Change subject: bts: expected-results.xml: Add missing BTS_Tests_OML entries ...................................................................... bts: expected-results.xml: Add missing BTS_Tests_OML entries Change-Id: Ie72350a313743e0b65d14fc75be9139e513111b4 --- M bts/expected-results.xml 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/41775/1 diff --git a/bts/expected-results.xml b/bts/expected-results.xml index ca5ad2f..88afda9 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -268,4 +268,20 @@ <testcase classname='BTS_Tests_ASCI' name='TC_vgcs_talker_fail' time='MASKED'/> <testcase classname='BTS_Tests_ASCI' name='TC_vgcs_talker_est_rel' time='MASKED'/> <testcase classname='BTS_Tests_ASCI' name='TC_vgcs_listener_det' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_wrong_mdisc' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_short_length' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_long_length' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_wrong_placement' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_wrong_seq' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_wrong_obj_class' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_wrong_bts_nr' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_wrong_trx_nr' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_radio_carrier_opstart_noattr' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_bts_opstart' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_bts_opstart_noattr' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_ts_opstart' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_ts_opstart_noattr' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_initial_state_reports' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_ipa_osmo_pcu_anr_fwd' time='MASKED'/> + <testcase classname='BTS_Tests_OML' name='TC_ipa_rsl_connect_nack' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41775?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie72350a313743e0b65d14fc75be9139e513111b4 Gerrit-Change-Number: 41775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>
1 0
0 0
[M] Change in ...osmo-s1gw[master]: enb_proxy: add inital MME pooling support
by pespin 07 Jan '26

07 Jan '26
Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41624?usp=email ) Change subject: enb_proxy: add inital MME pooling support ...................................................................... Patch Set 5: (1 comment) File src/enb_proxy.erl: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41624/comment/913fab3f_c895… : PS5, Line 198: close_sock(S), > Here we're closing the socket that was created during previous connection attempt (if any) before cr […] Done -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41624?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: I83dc4a78c78a7b87e87f5ca9a941a168d6c1dc36 Gerrit-Change-Number: 41624 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Jan 2026 12:15:28 +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>
1 0
0 0
[M] Change in ...osmo-s1gw[master]: enb_proxy: add inital MME pooling support
by fixeria 07 Jan '26

07 Jan '26
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41624?usp=email ) Change subject: enb_proxy: add inital MME pooling support ...................................................................... Patch Set 5: (2 comments) File src/enb_proxy.erl: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41624/comment/bcc3acc7_7d29… : PS5, Line 198: close_sock(S), > I wonder why do we close and reconnect here... […] Here we're closing the socket that was created during previous connection attempt (if any) before creating a new one via `sctp_client:connect/1`. https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41624/comment/5e8909a4_0efa… : PS5, Line 299: %% XXX: sctp_send_from_mme(Data, S), > what about this? I think we can remove this line. We don't need to forward the S1 SETUP FAILURE anymore, because we may still have other MMEs to try in the pool. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41624?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: I83dc4a78c78a7b87e87f5ca9a941a168d6c1dc36 Gerrit-Change-Number: 41624 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Jan 2026 12:11:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
1 0
0 0
[XS] Change in osmo-dev[master]: sanitize.opts: Add osmocom-bb_{layer23,trxcon,virtphy}
by pespin 07 Jan '26

07 Jan '26
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/41774?usp=email ) Change subject: sanitize.opts: Add osmocom-bb_{layer23,trxcon,virtphy} ...................................................................... sanitize.opts: Add osmocom-bb_{layer23,trxcon,virtphy} Change-Id: I89dc9c7da4d560162a77414412fb5edfb9d594ed --- M sanitize.opts 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/sanitize.opts b/sanitize.opts index 1936e44..d9c4bf6 100644 --- a/sanitize.opts +++ b/sanitize.opts @@ -24,4 +24,7 @@ osmo-hnbgw --enable-sanitize osmo-gsm-shark --enable-sanitize osmo-uecups --enable-sanitize +osmocom-bb_layer23 --enable-sanitize +osmocom-bb_trxcon --enable-sanitize +osmocom-bb_virtphy --enable-sanitize upf-benchmark --enable-sanitize -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41774?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I89dc9c7da4d560162a77414412fb5edfb9d594ed Gerrit-Change-Number: 41774 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>
1 0
0 0
[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: improve per-eNB counter reg/inc API
by fixeria 07 Jan '26

07 Jan '26
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41759?usp=email ) Change subject: s1ap_proxy: improve per-eNB counter reg/inc API ...................................................................... s1ap_proxy: improve per-eNB counter reg/inc API Change-Id: I2244190d0640209f8a2d4d78e5b64db580aa863d --- M src/s1ap_proxy.erl 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 0903906..a29a817 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -212,7 +212,7 @@ %% register a single per-eNB counter -spec ctr_reg(C, GlobalENBId) -> C - when C :: [ctr | _], + when C :: s1gw_metrics:counter(), GlobalENBId :: string(). ctr_reg([ctr, s1ap, proxy | _] = C0, GlobalENBId) -> C1 = s1gw_metrics:enb_metric(C0, GlobalENBId), @@ -232,9 +232,9 @@ %% increment the global and/or per-eNB counters -spec ctr_inc(C0, S) -> term() - when C0 :: [ctr | _], + when C0 :: s1gw_metrics:counter(), S :: proxy_state(). -ctr_inc([ctr | _] = C0, S) -> +ctr_inc([ctr, s1ap, proxy | _] = C0, S) -> case S#proxy_state.genb_id_str of undefined -> %% increment the global counter only -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41759?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: I2244190d0640209f8a2d4d78e5b64db580aa863d Gerrit-Change-Number: 41759 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: pespin <pespin(a)sysmocom.de>
1 0
0 0
[XS] Change in ...osmo-s1gw[master]: s1gw_metrics: remove ?S1GW_{CTR,GAUGE}_S1AP_PROXY_UPLINK_PACKETS_QUEUED
by fixeria 07 Jan '26

07 Jan '26
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41758?usp=email ) Change subject: s1gw_metrics: remove ?S1GW_{CTR,GAUGE}_S1AP_PROXY_UPLINK_PACKETS_QUEUED ...................................................................... s1gw_metrics: remove ?S1GW_{CTR,GAUGE}_S1AP_PROXY_UPLINK_PACKETS_QUEUED We no longer queue any packets, so these metrics are not relevant. Change-Id: I6c4c4a751dbe5a245f16515a1a1d65acf33468e9 Related: 4614fc3 ("s1ap_proxy: move S1 SETUP handling to sctp_proxy") Related: SYS#7052 --- M include/s1gw_metrics.hrl M src/s1gw_metrics.erl 2 files changed, 1 insertion(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/s1gw_metrics.hrl b/include/s1gw_metrics.hrl index 385b5fa..8f78821 100644 --- a/include/s1gw_metrics.hrl +++ b/include/s1gw_metrics.hrl @@ -11,7 +11,6 @@ -define(S1GW_CTR_PFCP_UNEXPECTED_PDU, [ctr, pfcp, unexpected_pdu]). -define(S1GW_CTR_S1AP_ENB_ALL_RX, [ctr, s1ap, enb, all, rx]). -define(S1GW_CTR_S1AP_ENB_ALL_RX_UNKNOWN_ENB, [ctr, s1ap, enb, all, rx_unknown_enb]). --define(S1GW_CTR_S1AP_PROXY_UPLINK_PACKETS_QUEUED, [ctr, s1ap, proxy, uplink_packets_queued]). -define(S1GW_CTR_S1AP_PROXY_EXCEPTION, [ctr, s1ap, proxy, exception]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, [ctr, s1ap, proxy, in_pkt, all]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_DROP_ALL, [ctr, s1ap, proxy, in_pkt, drop, all]). @@ -56,7 +55,6 @@ -define(S1GW_GAUGE_PFCP_ASSOCIATED, [gauge, pfcp, associated]). -define(S1GW_GAUGE_S1AP_ENB_NUM_SCTP_CONNECTIONS, [gauge, s1ap, enb, num_sctp_connections]). --define(S1GW_GAUGE_S1AP_PROXY_UPLINK_PACKETS_QUEUED, [gauge, s1ap, proxy, uplink_packets_queued]). %% NOTE: Remember to add new entries to s1gw_metric:init()! diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index bb4bd97..1368c5b 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -65,7 +65,6 @@ ?S1GW_CTR_PFCP_UNEXPECTED_PDU, ?S1GW_CTR_S1AP_ENB_ALL_RX, ?S1GW_CTR_S1AP_ENB_ALL_RX_UNKNOWN_ENB, - ?S1GW_CTR_S1AP_PROXY_UPLINK_PACKETS_QUEUED, ?S1GW_CTR_S1AP_PROXY_EXCEPTION, %% exception(s) occurred %% s1ap_proxy: INcoming PDU counters ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, %% received total @@ -106,8 +105,7 @@ -define(S1GW_GAUGES, [ ?S1GW_GAUGE_PFCP_ASSOCIATED, - ?S1GW_GAUGE_S1AP_ENB_NUM_SCTP_CONNECTIONS, - ?S1GW_GAUGE_S1AP_PROXY_UPLINK_PACKETS_QUEUED + ?S1GW_GAUGE_S1AP_ENB_NUM_SCTP_CONNECTIONS ]). -type counter() :: [ctr | _]. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41758?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: I6c4c4a751dbe5a245f16515a1a1d65acf33468e9 Gerrit-Change-Number: 41758 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: pespin <pespin(a)sysmocom.de>
1 0
0 0
[M] Change in ...osmo-s1gw[master]: enb_proxy: add per-eNB and global counters
by fixeria 07 Jan '26

07 Jan '26
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41760?usp=email ) Change subject: enb_proxy: add per-eNB and global counters ...................................................................... enb_proxy: add per-eNB and global counters Change-Id: I3670db6a519ec8070ada6aecd471c4630ad53c86 Related: SYS#7052 --- M include/s1gw_metrics.hrl M src/enb_proxy.erl M src/s1gw_metrics.erl 3 files changed, 80 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/include/s1gw_metrics.hrl b/include/s1gw_metrics.hrl index 8f78821..ecdf315 100644 --- a/include/s1gw_metrics.hrl +++ b/include/s1gw_metrics.hrl @@ -39,6 +39,17 @@ -define(S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ALL, [ctr, s1ap, proxy, out_pkt, reply, all]). -define(S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ERAB_SETUP_RSP, [ctr, s1ap, proxy, out_pkt, reply, erab_setup_rsp]). +%% enb_proxy related metrics +-define(S1GW_CTR_ENB_PROXY_S1_SETUP_REQ, [ctr, enb_proxy, s1setup, req]). +-define(S1GW_CTR_ENB_PROXY_S1_SETUP_RSP, [ctr, enb_proxy, s1setup, rsp]). +-define(S1GW_CTR_ENB_PROXY_S1_SETUP_FAILURE, [ctr, enb_proxy, s1setup, failure]). +-define(S1GW_CTR_ENB_PROXY_S1_SETUP_REQ_TIMEOUT, [ctr, enb_proxy, s1setup, req, timeout]). +-define(S1GW_CTR_ENB_PROXY_S1_SETUP_RSP_TIMEOUT, [ctr, enb_proxy, s1setup, rsp, timeout]). +-define(S1GW_CTR_ENB_PROXY_CONN_EST_TIMEOUT, [ctr, enb_proxy, conn_est, timeout]). +-define(S1GW_CTR_ENB_PROXY_CONN_EST_FAILURE, [ctr, enb_proxy, conn_est, failure]). +-define(S1GW_CTR_ENB_PROXY_UNEXPECTED_PDU, [ctr, enb_proxy, unexpected_pdu]). +-define(S1GW_CTR_ENB_PROXY_MALFORMED_PDU, [ctr, enb_proxy, malformed_pdu]). + %% SCTP related metrics -define(S1GW_CTR_SCTP_ERROR_ALL, [ctr, sctp, error, all]). -define(S1GW_CTR_SCTP_ERROR_SEND_FAILED, [ctr, sctp, error, send_failed]). diff --git a/src/enb_proxy.erl b/src/enb_proxy.erl index 7a51221..4495e31 100644 --- a/src/enb_proxy.erl +++ b/src/enb_proxy.erl @@ -136,8 +136,9 @@ [{state_timeout, 5_000, s1setup_req_timeout}]}; %% Handle S1 SETUP REQUEST timeout -wait_s1setup_req(state_timeout, s1setup_req_timeout, _S) -> +wait_s1setup_req(state_timeout, s1setup_req_timeout, S) -> ?LOG_ERROR("Timeout waiting for S1 SETUP REQUEST from eNB"), + ctr_inc(?S1GW_CTR_ENB_PROXY_S1_SETUP_REQ_TIMEOUT, S), {stop, {shutdown, s1setup_req_timeout}}; %% Handle PDUs coming from the eNB @@ -151,6 +152,10 @@ %% use it as the logging prefix osmo_s1gw:set_log_prefix("eNB " ++ GlobalENBId), ?LOG_INFO("Rx S1 SETUP REQUEST from eNB"), + %% register per-eNB metrics + ctr_reg_all(GlobalENBId), + ctr_inc(?S1GW_CTR_ENB_PROXY_S1_SETUP_REQ, + S#state{genb_id_str = GlobalENBId}), %% signal the Global-eNB-ID to other modules s1ap_proxy:set_genb_id(S#state.handler, GlobalENBId), enb_registry:enb_event(S#state.enb_handle, {s1setup, GENBId}), @@ -160,8 +165,10 @@ genb_id_str = GlobalENBId}}; {{Proc, Type}, IEs} -> ?LOG_ERROR("Rx unexpected S1AP PDU from eNB: ~p/~p, ~p", [Proc, Type, IEs]), + ctr_inc(?S1GW_CTR_ENB_PROXY_UNEXPECTED_PDU, S), {stop, {shutdown, s1setup_error}}; {error, _Error} -> + ctr_inc(?S1GW_CTR_ENB_PROXY_MALFORMED_PDU, S), {stop, {shutdown, s1setup_error}} end; @@ -180,12 +187,14 @@ [{state_timeout, 2_000, conn_est_timeout}]}; %% Handle connection establishment timeout -connecting(state_timeout, conn_est_timeout, _S) -> +connecting(state_timeout, conn_est_timeout, S) -> + ctr_inc(?S1GW_CTR_ENB_PROXY_CONN_EST_TIMEOUT, S), {stop, {shutdown, conn_est_timeout}}; %% Handle PDUs coming from the eNB -connecting(cast, {send_data, Data}, _S) -> +connecting(cast, {send_data, Data}, S) -> ?LOG_ERROR("Rx unexpected S1AP PDU from eNB: ~p", [Data]), + ctr_inc(?S1GW_CTR_ENB_PROXY_UNEXPECTED_PDU, S), keep_state_and_data; %% Handle an #sctp_assoc_change event (connection state) @@ -202,6 +211,7 @@ {next_state, wait_s1setup_rsp, S#state{mme_aid = Aid}}; _ -> ?LOG_NOTICE("MME connection establishment failed: ~p", [ConnState]), + ctr_inc(?S1GW_CTR_ENB_PROXY_CONN_EST_FAILURE, S), {stop, {shutdown, conn_est_fail}} end; @@ -216,13 +226,15 @@ [{state_timeout, 5_000, s1setup_rsp_timeout}]}; %% Handle S1 SETUP RESPONSE timeout -wait_s1setup_rsp(state_timeout, s1setup_rsp_timeout, _S) -> +wait_s1setup_rsp(state_timeout, s1setup_rsp_timeout, S) -> ?LOG_ERROR("Timeout waiting for S1 SETUP RESPONSE from MME"), + ctr_inc(?S1GW_CTR_ENB_PROXY_S1_SETUP_RSP_TIMEOUT, S), {stop, {shutdown, s1setup_rsp_timeout}}; %% Handle PDUs coming from the eNB -wait_s1setup_rsp(cast, {send_data, Data}, _S) -> +wait_s1setup_rsp(cast, {send_data, Data}, S) -> ?LOG_ERROR("Rx unexpected S1AP PDU from eNB: ~p", [Data]), + ctr_inc(?S1GW_CTR_ENB_PROXY_UNEXPECTED_PDU, S), keep_state_and_data; %% Handle PDUs coming from the MME @@ -239,16 +251,20 @@ case s1ap_utils:parse_pdu(Data) of {{?'id-S1Setup', successfulOutcome}, _IEs} -> ?LOG_INFO("Rx S1 SETUP RESPONSE from MME"), + ctr_inc(?S1GW_CTR_ENB_PROXY_S1_SETUP_RSP, S), sctp_send_from_mme(Data, S), {next_state, connected, S}; {{?'id-S1Setup', unsuccessfulOutcome}, _IEs} -> ?LOG_NOTICE("Rx S1 SETUP FAILURE from MME"), + ctr_inc(?S1GW_CTR_ENB_PROXY_S1_SETUP_FAILURE, S), sctp_send_from_mme(Data, S), {stop, {shutdown, s1setup_error}}; {{Proc, Type}, IEs} -> ?LOG_ERROR("Rx unexpected S1AP PDU from MME: ~p/~p, ~p", [Proc, Type, IEs]), + ctr_inc(?S1GW_CTR_ENB_PROXY_UNEXPECTED_PDU, S), {stop, {shutdown, s1setup_error}}; {error, _Error} -> + ctr_inc(?S1GW_CTR_ENB_PROXY_MALFORMED_PDU, S), {stop, {shutdown, s1setup_error}} end; @@ -455,4 +471,41 @@ end. +%% register a single per-eNB counter +-spec ctr_reg(C, GlobalENBId) -> C + when C :: s1gw_metrics:counter(), + GlobalENBId :: string(). +ctr_reg([ctr, ?MODULE | _] = C0, GlobalENBId) -> + C1 = s1gw_metrics:enb_metric(C0, GlobalENBId), + %% counter may already exist, so catch exceptions here + catch exometer:new(C1, counter), + C0; + +ctr_reg(C0, _GlobalENBId) -> C0. + + +%% register all per-eNB counters +-spec ctr_reg_all(string()) -> list(). +ctr_reg_all(GlobalENBId) -> + Ctrs = s1gw_metrics:ctr_list(), + lists:map(fun(Name) -> ctr_reg(Name, GlobalENBId) end, Ctrs). + + +%% increment the global and/or per-eNB counters +-spec ctr_inc(C0, S) -> term() + when C0 :: s1gw_metrics:counter(), + S :: state(). +ctr_inc([ctr, ?MODULE | _] = C0, + #state{genb_id_str = undefined}) -> + %% increment the global counter only + s1gw_metrics:ctr_inc(C0); + +ctr_inc([ctr, ?MODULE | _] = C0, + #state{genb_id_str = GlobalENBId}) -> + %% increment both the global and per-eNB counters + C1 = s1gw_metrics:enb_metric(C0, GlobalENBId), + s1gw_metrics:ctr_inc(C0), + s1gw_metrics:ctr_inc(C1). + + %% vim:set ts=4 sw=4 et: diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index 1368c5b..52a5a10 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -96,6 +96,17 @@ ?S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ALL, %% replied: total ?S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ERAB_SETUP_RSP, %% replied: E-RAB SETUP.rsp + %% enb_proxy related metrics + ?S1GW_CTR_ENB_PROXY_S1_SETUP_REQ, %% S1 SETUP REQUEST PDUs + ?S1GW_CTR_ENB_PROXY_S1_SETUP_RSP, %% S1 SETUP RESPONSE PDUs + ?S1GW_CTR_ENB_PROXY_S1_SETUP_FAILURE, %% S1 SETUP FAILURE PDUs + ?S1GW_CTR_ENB_PROXY_S1_SETUP_REQ_TIMEOUT, %% S1 SETUP REQUEST timeout + ?S1GW_CTR_ENB_PROXY_S1_SETUP_RSP_TIMEOUT, %% S1 SETUP RESPONSE timeout + ?S1GW_CTR_ENB_PROXY_CONN_EST_TIMEOUT, %% MME connection establishment timeout + ?S1GW_CTR_ENB_PROXY_CONN_EST_FAILURE, %% MME connection establishment failure + ?S1GW_CTR_ENB_PROXY_UNEXPECTED_PDU, %% unexpected PDUs received from eNB/MME + ?S1GW_CTR_ENB_PROXY_MALFORMED_PDU, %% malformed PDUs received from eNB/MME + %% SCTP related counters ?S1GW_CTR_SCTP_ERROR_ALL, %% total number of SCTP errors ?S1GW_CTR_SCTP_ERROR_SEND_FAILED, %% send operation failed -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41760?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: I3670db6a519ec8070ada6aecd471c4630ad53c86 Gerrit-Change-Number: 41760 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: pespin <pespin(a)sysmocom.de>
1 0
0 0
[XS] Change in osmo-dev[master]: sanitize.opts: Add osmocom-bb_{layer23,trxcon,virtphy}
by fixeria 07 Jan '26

07 Jan '26
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-dev/+/41774?usp=email ) Change subject: sanitize.opts: Add osmocom-bb_{layer23,trxcon,virtphy} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41774?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I89dc9c7da4d560162a77414412fb5edfb9d594ed Gerrit-Change-Number: 41774 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, 07 Jan 2026 12:04:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 136
  • 137
  • 138
  • 139
  • 140
  • 141
  • 142
  • ...
  • 151
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.