- gerrit-log - lists.osmocom.org

[S] Change in osmo-msc[master]: gsm48_cc_tx_setup: remove extra bearer_cap var
by osmith 04 Sep '25

04 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/41042?usp=email ) Change subject: gsm48_cc_tx_setup: remove extra bearer_cap var ...................................................................... gsm48_cc_tx_setup: remove extra bearer_cap var Store the bearer capabilities directly in the transaction, instead of storing them in a separate variable first, then copying it to the transaction, then using both the separate variable and the copy in the transaction later on. The extra variable is not needed and only makes it more compilicated. Add an explicit '.transfer = GSM48_BCAP_ITCAP_SPEECH,' while at it in the speech case. This was already set implicitly because GSM48_BCAP_ITCAP_SPEECH is 0. Change-Id: I247ef10923c2875ca75e73046f4b8ed14190d4d2 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 11 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/41042/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index a429bc4..63a9018 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -915,18 +915,18 @@ * Versions) / CSD bearer services remaining after intersecting MS, BSS and * remote call leg restrictions. To store in trans for later use, and to * include in the outgoing CC Setup message. */ -static int gsm48_cc_tx_setup_set_bearer_cap(struct gsm_trans *trans, const struct gsm_mncc *setup, - struct gsm_mncc_bearer_cap *bearer_cap) +static int gsm48_cc_tx_setup_set_bearer_cap(struct gsm_trans *trans, const struct gsm_mncc *setup) { int rc; switch (trans->bearer_cap.transfer) { case GSM48_BCAP_ITCAP_SPEECH: - *bearer_cap = (struct gsm_mncc_bearer_cap){ + trans->bearer_cap = (struct gsm_mncc_bearer_cap){ + .transfer = GSM48_BCAP_ITCAP_SPEECH, .speech_ver = { -1 }, }; - sdp_audio_codecs_to_bearer_cap(bearer_cap, &trans->cc.local.audio_codecs); - rc = bearer_cap_set_radio(bearer_cap); + sdp_audio_codecs_to_bearer_cap(&trans->bearer_cap, &trans->cc.local.audio_codecs); + rc = bearer_cap_set_radio(&trans->bearer_cap); if (rc) { LOG_TRANS(trans, LOGL_ERROR, "Error composing Bearer Capability for CC Setup\n"); return -1; @@ -936,7 +936,7 @@ * transcode, we could use non-identical codecs on each conn of * the MGW endpoint, but we are aiming for finding a matching * codec. */ - if (bearer_cap->speech_ver[0] == -1) { + if (trans->bearer_cap.speech_ver[0] == -1) { LOG_TRANS(trans, LOGL_ERROR, "%s: no codec match possible: %s\n", get_mncc_name(setup->msg_type), codec_filter_to_str(&trans->cc.codecs, &trans->cc.local, &trans->cc.remote)); @@ -948,7 +948,7 @@ trans->callref = 0; return -1; } - rc = bearer_cap_filter_rev_lev(bearer_cap, trans->vsub->classmark.classmark1.rev_lev); + rc = bearer_cap_filter_rev_lev(&trans->bearer_cap, trans->vsub->classmark.classmark1.rev_lev); if (rc) { LOG_TRANS(trans, LOGL_ERROR, "No codec offered is supported by phase 1 mobile.\n"); return -1; @@ -957,14 +957,14 @@ case GSM48_BCAP_ITCAP_3k1_AUDIO: case GSM48_BCAP_ITCAP_FAX_G3: case GSM48_BCAP_ITCAP_UNR_DIG_INF: - *bearer_cap = (struct gsm_mncc_bearer_cap){ + trans->bearer_cap = (struct gsm_mncc_bearer_cap){ .transfer = trans->bearer_cap.transfer, .mode = GSM48_BCAP_TMOD_CIRCUIT, .coding = GSM48_BCAP_CODING_GSM_STD, .radio = GSM48_BCAP_RRQ_FR_ONLY, }; - if (csd_bs_list_to_bearer_cap(bearer_cap, &trans->cc.local.bearer_services) == 0) { + if (csd_bs_list_to_bearer_cap(&trans->bearer_cap, &trans->cc.local.bearer_services) == 0) { LOG_TRANS(trans, LOGL_ERROR, "Error composing Bearer Capability for CC Setup\n"); /* incompatible codecs */ @@ -977,10 +977,6 @@ break; } - /* Create a copy of the bearer capability in the transaction struct, so - * we can use this information later */ - trans->bearer_cap = *bearer_cap; - return 0; } @@ -1030,7 +1026,6 @@ struct msgb *msg; struct gsm_mncc *setup = arg; int rc; - struct gsm_mncc_bearer_cap bearer_cap; rc = gsm48_cc_tx_setup_set_transaction_id(trans); if (rc < 0) @@ -1045,11 +1040,11 @@ if (rc < 0) goto error; - rc = gsm48_cc_tx_setup_set_bearer_cap(trans, setup, &bearer_cap); + rc = gsm48_cc_tx_setup_set_bearer_cap(trans, setup); if (rc < 0) goto error; - msg = gsm48_cc_tx_setup_encode_msg(setup, &bearer_cap); + msg = gsm48_cc_tx_setup_encode_msg(setup, &trans->bearer_cap); new_cc_state(trans, GSM_CSTATE_CALL_PRESENT); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41042?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I247ef10923c2875ca75e73046f4b8ed14190d4d2 Gerrit-Change-Number: 41042 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: gsm48_cc_tx_setup: fix speech bearer capabilities
by osmith 04 Sep '25

04 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/41043?usp=email ) Change subject: gsm48_cc_tx_setup: fix speech bearer capabilities ...................................................................... gsm48_cc_tx_setup: fix speech bearer capabilities Send the bearer capability IE from 3GPP TS 24.008 § D.1.2 for speech instead of the result from gsm48_cc_tx_setup_set_bearer_cap() for the network to MS direction. This is needed, because: - We shall send spares for radio (which happens to be the same as GSM48_BCAP_RRQ_FR_ONLY in the MS to network direction, see 3GPP TS 24.008 § D.1.1 and Table 10.5.102). - We could send a speech version list in theory that MS are then supposed to ignore (end of Table 10.5.103), but this causes bugs in some MS so it is better to not send it (OS#6656). Related: OS#6657, OS#6655, OS#6656 Related: osmo-ttcn3-hacks I8fd33cf2f7fb8a1c34851ecf54fccddd2efd0536 Change-Id: I7046e9244fd9d4301ee2c4df1147a619f753739c --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 20 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/43/41043/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 63a9018..198d9d5 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -913,8 +913,7 @@ /* Compose Bearer Capability information that reflects only the codecs (Speech * Versions) / CSD bearer services remaining after intersecting MS, BSS and - * remote call leg restrictions. To store in trans for later use, and to - * include in the outgoing CC Setup message. */ + * remote call leg restrictions. To store in trans for later use. */ static int gsm48_cc_tx_setup_set_bearer_cap(struct gsm_trans *trans, const struct gsm_mncc *setup) { int rc; @@ -981,14 +980,31 @@ } static struct msgb *gsm48_cc_tx_setup_encode_msg(const struct gsm_mncc *setup, - const struct gsm_mncc_bearer_cap *bearer_cap) + const struct gsm_mncc_bearer_cap *bearer_cap_orig) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC SETUP"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); + struct gsm_mncc_bearer_cap bearer_cap = *bearer_cap_orig; gh->msg_type = GSM48_MT_CC_SETUP; - gsm48_encode_bearer_cap(msg, 0, bearer_cap); + /* Send the bearer capability IE from 3GPP TS 24.008 § D.1.2 for speech + * instead of the result from gsm48_cc_tx_setup_set_bearer_cap() for + * the network to MS direction. This is needed, because: + * - We shall send spares for radio (which happens to be the same as + * GSM48_BCAP_RRQ_FR_ONLY in the MS to network direction, see 3GPP + * TS 24.008 § D.1.1 and Table 10.5.102). + * - We could send a speech version list in theory that MS are then + * supposed to ignore (end of Table 10.5.103), but this causes bugs + * in some MS so it is better to not send it (OS#6656). */ + if (bearer_cap.transfer == GSM48_BCAP_ITCAP_SPEECH) + bearer_cap = (struct gsm_mncc_bearer_cap){ + .transfer = GSM48_BCAP_ITCAP_SPEECH, + .radio = GSM48_BCAP_RRQ_FR_ONLY, /* spare */ + .speech_ver = { -1 }, + }; + + gsm48_encode_bearer_cap(msg, 0, &bearer_cap); /* Facility */ if (setup->fields & MNCC_F_FACILITY) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41043?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7046e9244fd9d4301ee2c4df1147a619f753739c Gerrit-Change-Number: 41043 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: sctp_proxy: return handler Pid in fetch_info/0
by fixeria 04 Sep '25

04 Sep '25

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40904?usp=email ) Change subject: sctp_proxy: return handler Pid in fetch_info/0 ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > Fine, I'm just mentioning because afaics there are several patches adding functions, etc. […] I've updated the commit message. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40904?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: I3911bfc107fea3ca572cf44f1d93b768b3c82b4f Gerrit-Change-Number: 40904 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Sep 2025 12:04:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: s1gw_metrics: export metric types
by fixeria 04 Sep '25

04 Sep '25

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40907?usp=email ) Change subject: s1gw_metrics: export metric types ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40907?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: I57f0a8bbc83ec4732742ec16fe09abd2aea8127b Gerrit-Change-Number: 40907 Gerrit-PatchSet: 2 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> Gerrit-Comment-Date: Thu, 04 Sep 2025 12:03:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: add fetch_enb_info/1
by fixeria 04 Sep '25

04 Sep '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41030?usp=email ) Change subject: s1ap_proxy: add fetch_enb_info/1 ...................................................................... s1ap_proxy: add fetch_enb_info/1 This is useful for introspection and the upcoming REST interface. Change-Id: I79fcb599274c78d8f58e6c774a4f8c64c2fb08b5 --- M src/s1ap_proxy.erl 1 file changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/30/41030/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index a08f61d..a55746f 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -44,6 +44,7 @@ process_pdu/2, fetch_erab/2, fetch_erab_list/1, + fetch_enb_info/1, shutdown/1]). -include_lib("kernel/include/logger.hrl"). @@ -87,7 +88,13 @@ -type proxy_state() :: #proxy_state{}. -type proxy_action() :: forward | reply | drop. --export_type([proxy_action/0]). +-type enb_info() :: #{enb_id => non_neg_integer(), + plmn_id => plmn_id(), + genb_id_str => string() + }. + +-export_type([proxy_action/0, + enb_info/0]). %% ------------------------------------------------------------------ @@ -119,6 +126,12 @@ gen_server:call(Pid, ?FUNCTION_NAME). +%% Fetch information about the eNB +-spec fetch_enb_info(pid()) -> enb_info(). +fetch_enb_info(Pid) -> + gen_server:call(Pid, ?FUNCTION_NAME). + + -spec shutdown(pid()) -> ok. shutdown(Pid) -> gen_server:stop(Pid). @@ -149,6 +162,17 @@ #proxy_state{erabs = ERABs} = S) -> {reply, dict:to_list(ERABs), S}; +handle_call(fetch_enb_info, _From, + #proxy_state{enb_id = EnbId, + plmn_id = PLMNId, + genb_id_str = GlobalENBId} = S) -> + Info = #{enb_id => EnbId, + plmn_id => PLMNId, + genb_id_str => GlobalENBId}, + %% omit fields with Value =:= undefined + Reply = maps:filter(fun(_K, V) -> V =/= undefined end, Info), + {reply, Reply, S}; + handle_call(Info, From, #proxy_state{} = S) -> ?LOG_ERROR("unknown ~p() from ~p: ~p", [?FUNCTION_NAME, From, Info]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41030?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: I79fcb599274c78d8f58e6c774a4f8c64c2fb08b5 Gerrit-Change-Number: 41030 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: add type spec for the eNB-ID
by fixeria 04 Sep '25

04 Sep '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41031?usp=email ) Change subject: s1ap_proxy: add type spec for the eNB-ID ...................................................................... s1ap_proxy: add type spec for the eNB-ID Change-Id: Ieee55256f1b90a6cf498faedcf11f15da1423c4d --- M src/s1ap_proxy.erl 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/31/41031/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index a55746f..c60c45b 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -64,11 +64,11 @@ -type s1ap_ie_id() :: non_neg_integer(). -type s1ap_ie_val() :: tuple(). +-type enb_id() :: 0..16#fffffff. -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(), erab_id()}. - -type plmn_id() :: {MCC :: nonempty_string(), MNC :: nonempty_string()}. @@ -88,7 +88,7 @@ -type proxy_state() :: #proxy_state{}. -type proxy_action() :: forward | reply | drop. --type enb_info() :: #{enb_id => non_neg_integer(), +-type enb_info() :: #{enb_id => enb_id(), plmn_id => plmn_id(), genb_id_str => string() }. @@ -254,7 +254,7 @@ [?UNHEX(D1), ?UNHEX(D2), ?UNHEX(D3)]. --spec parse_enb_id(tuple()) -> non_neg_integer(). +-spec parse_enb_id(tuple()) -> enb_id(). parse_enb_id({'macroENB-ID', << ID:20 >>}) -> ID; parse_enb_id({'homeENB-ID', << ID:28 >>}) -> ID; parse_enb_id({'short-macroENB-ID', << ID:18 >>}) -> ID; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41031?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: Ieee55256f1b90a6cf498faedcf11f15da1423c4d Gerrit-Change-Number: 41031 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy_test: do more s1ap_proxy:fetch_erab/2
by fixeria 04 Sep '25

04 Sep '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41032?usp=email ) Change subject: s1ap_proxy_test: do more s1ap_proxy:fetch_erab/2 ...................................................................... s1ap_proxy_test: do more s1ap_proxy:fetch_erab/2 Just like we do in test_e_rab_setup[_dup], let's test fetching E-RAB info by UID in test_initial_context_setup[_dup] for the sake of completeness and consistency. Change-Id: I8e9ffc22be3bc352a8d3022b1c7b0c50699ff493 --- M test/s1ap_proxy_test.erl 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/32/41032/1 diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 60b09dc..9015934 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -375,6 +375,7 @@ ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), + ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {1, 5})), ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. @@ -388,6 +389,7 @@ ?_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({ok, _}, s1ap_proxy:fetch_erab(Pid, {1, 5})), ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41032?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: I8e9ffc22be3bc352a8d3022b1c7b0c50699ff493 Gerrit-Change-Number: 41032 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: {gtpu_kpi,pfcp_peer}: do not set trap_exit
by fixeria 04 Sep '25

04 Sep '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41033?usp=email ) Change subject: {gtpu_kpi,pfcp_peer}: do not set trap_exit ...................................................................... {gtpu_kpi,pfcp_peer}: do not set trap_exit We do not expect nor handle 'EXIT' messages in these modules, therefore we should not be setting trap_exit. Change-Id: I966f4a53b8eca6763ca30bae0bbb9e025e6a2c4f --- M src/gtpu_kpi.erl M src/pfcp_peer.erl 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/33/41033/1 diff --git a/src/gtpu_kpi.erl b/src/gtpu_kpi.erl index 5aeb749..9432626 100644 --- a/src/gtpu_kpi.erl +++ b/src/gtpu_kpi.erl @@ -146,7 +146,6 @@ %% ------------------------------------------------------------------ init([#{enable := true} = Cfg]) -> - process_flag(trap_exit, true), TName = maps:get(table_name, Cfg, "osmo-s1gw"), Interval = maps:get(interval, Cfg, 3000), %% flush the table, in case it remained diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index a7e9515..efcf0d0 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -156,7 +156,6 @@ init([LocAddr, RemAddr]); init([LocAddr, RemAddr]) -> - process_flag(trap_exit, true), s1gw_metrics:gauge_set(?S1GW_GAUGE_PFCP_ASSOCIATED, 0), {ok, Sock} = gen_udp:open(?PFCP_PORT, [binary, {ip, LocAddr}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41033?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: I966f4a53b8eca6763ca30bae0bbb9e025e6a2c4f Gerrit-Change-Number: 41033 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[L] Change in ...osmo-s1gw[master]: enb_registry: new module
by fixeria 04 Sep '25

04 Sep '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41034?usp=email ) Change subject: enb_registry: new module ...................................................................... enb_registry: new module The purpose of this new module is to maintain a centralized eNB registry, that can be easily queried via the upcoming REST interface. This avoids the need to fetch the eNB connection list from the sctp_server process and then query the individual processes handling each connection. Change-Id: I77a5a750ca6342da3a99926a44926b3973ab19c4 Related: SYS#7066 --- A src/enb_registry.erl M src/osmo_s1gw_sup.erl M src/s1ap_proxy.erl M src/sctp_proxy.erl M src/sctp_server.erl M test/s1ap_proxy_test.erl 6 files changed, 377 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/34/41034/1 diff --git a/src/enb_registry.erl b/src/enb_registry.erl new file mode 100644 index 0000000..edd9f3d --- /dev/null +++ b/src/enb_registry.erl @@ -0,0 +1,308 @@ +%% Copyright (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +%% Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> +%% +%% All Rights Reserved +%% +%% SPDX-License-Identifier: AGPL-3.0-or-later +%% +%% This program is free software; you can redistribute it and/or modify +%% it under the terms of the GNU Affero General Public License as +%% published by the Free Software Foundation; either version 3 of the +%% License, or (at your option) any later version. +%% +%% This program is distributed in the hope that it will be useful, +%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%% GNU General Public License for more details. +%% +%% You should have received a copy of the GNU Affero General Public License +%% along with this program. If not, see <https://www.gnu.org/licenses/>. +%% +%% Additional Permission under GNU AGPL version 3 section 7: +%% +%% If you modify this Program, or any covered work, by linking or +%% combining it with runtime libraries of Erlang/OTP as released by +%% Ericsson on https://www.erlang.org (or a modified version of these +%% libraries), containing parts covered by the terms of the Erlang Public +%% License (https://www.erlang.org/EPLICENSE), the licensors of this +%% Program grant you additional permission to convey the resulting work +%% without the need to license the runtime libraries of Erlang/OTP under +%% the GNU Affero General Public License. Corresponding Source for a +%% non-source form of such a combination shall include the source code +%% for the parts of the runtime libraries of Erlang/OTP used as well as +%% that of the covered work. + +-module(enb_registry). +-behaviour(gen_server). + +-export([init/1, + handle_info/2, + handle_call/3, + handle_cast/2, + terminate/2]). +-export([start_link/0, + enb_register/0, + enb_unregister/1, + enb_event/2, + fetch_enb_info/1, + fetch_enb_list/0, + fetch_enb_list/1, + shutdown/0]). + +-include_lib("kernel/include/logger.hrl"). + + +-type enb_handle() :: non_neg_integer(). + +-type enb_state() :: connecting %% S1GW -> MME connection in progress + | connected %% S1GW -> MME connection established + | s1setup. %% S1 SETUP procedure completed + +-type enb_event() :: {connecting, sctp_server:conn_info()} + | {connected, sctp_proxy:conn_info()} + | {s1setup, s1ap_proxy:enb_info()}. + +-type enb_filter() :: {genb_id_str, string()} + | {enb_sctp_aid, gen_sctp:assoc_id()} + | {mme_sctp_aid, gen_sctp:assoc_id()} + | {enb_addr_port, sctp_server:addr_port()} + | {mme_addr_port, sctp_server:addr_port()}. + +-type enb_info() :: #{pid := pid(), %% pid() of the registrant + mon_ref := reference(), %% monitor() reference + state := enb_state(), %% connection state + reg_time := integer(), %% registration time (monotonic) + genb_id_str => string(), %% Global-eNB-ID + enb_id => s1ap_proxy:enb_id(), %% eNB-ID + plmn_id => s1ap_proxy:plmn_id(), %% PLMN-ID + enb_conn_info => sctp_server:conn_info(), %% eNB -> S1GW connection info + mme_conn_info => sctp_proxy:conn_info() %% S1GW -> MME connection info + }. + +-record(state, {enbs :: #{enb_handle() => enb_info()}, + pids :: #{pid() => enb_handle()}, + next_handle :: enb_handle() + }). + +-export_type([enb_handle/0, + enb_state/0, + enb_info/0]). + + +%% ------------------------------------------------------------------ +%% public API +%% ------------------------------------------------------------------ + +-spec start_link() -> {ok, pid()} | term(). +start_link() -> + gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). + + +-spec enb_register() -> {ok, enb_handle()} | {error, term()}. +enb_register() -> + gen_server:call(?MODULE, ?FUNCTION_NAME). + + +-spec enb_unregister(enb_handle()) -> ok | {error, term()}. +enb_unregister(Handle) -> + gen_server:call(?MODULE, {?FUNCTION_NAME, Handle}). + + +-spec enb_event(enb_handle(), enb_event()) -> ok. +enb_event(Handle, Event) -> + gen_server:cast(?MODULE, {?FUNCTION_NAME, Handle, Event}). + + +-spec fetch_enb_info(enb_handle()) -> {ok, enb_info()} | error. +fetch_enb_info(Handle) -> + gen_server:call(?MODULE, {?FUNCTION_NAME, Handle}). + + +-spec fetch_enb_list() -> [{Handle, EnbInfo}] + when Handle :: enb_handle(), + EnbInfo :: enb_info(). +fetch_enb_list() -> + gen_server:call(?MODULE, ?FUNCTION_NAME). + +-spec fetch_enb_list(Filter) -> [{Handle, EnbInfo}] + when Filter :: enb_filter(), + Handle :: enb_handle(), + EnbInfo :: enb_info(). +fetch_enb_list(Filter) -> + gen_server:call(?MODULE, {?FUNCTION_NAME, Filter}). + + +-spec shutdown() -> ok. +shutdown() -> + gen_server:stop(?MODULE). + + +%% ------------------------------------------------------------------ +%% gen_server API +%% ------------------------------------------------------------------ + +init([]) -> + {ok, #state{enbs = maps:new(), + pids = maps:new(), + next_handle = 0}}. + + +handle_call(enb_register, + {Pid, _Tag}, + #state{enbs = ENBs, + pids = PIDs, + next_handle = Handle} = S) -> + case maps:find(Pid, PIDs) of + {ok, Handle} -> + ?LOG_ERROR("eNB (handle=~p, pid=~p) is *already* registered", [Handle, Pid]), + {reply, {error, enb_not_registered}, S}; + error -> + %% keep an eye on the process being registered + MonRef = erlang:monitor(process, Pid), + %% create and store an initial eNB state + EnbInfo = #{pid => Pid, + mon_ref => MonRef, + state => connecting, + reg_time => erlang:monotonic_time()}, + ?LOG_INFO("eNB (handle=~p) registered", [Handle]), + {reply, {ok, Handle}, S#state{enbs = ENBs#{Handle => EnbInfo}, + pids = PIDs#{Pid => Handle}, + next_handle = Handle + 1}} + end; + +handle_call({enb_unregister, Handle}, + _From, + #state{enbs = ENBs, + pids = PIDs} = S) -> + case maps:find(Handle, ENBs) of + {ok, #{pid := Pid, + mon_ref := MonRef}} -> + erlang:demonitor(MonRef, [flush]), + ?LOG_INFO("eNB (handle=~p) unregistered", [Handle]), + {reply, ok, S#state{enbs = maps:remove(Handle, ENBs), + pids = maps:remove(Pid, PIDs)}}; + error -> + ?LOG_ERROR("eNB (handle=~p) is *not* registered", [Handle]), + {reply, {error, enb_not_registered}, S} + end; + +handle_call({fetch_enb_info, Handle}, + _From, + #state{enbs = ENBs} = S) -> + Reply = maps:find(Handle, ENBs), + {reply, Reply, S}; + +handle_call(fetch_enb_list, + _From, + #state{enbs = ENBs} = S) -> + Reply = maps:to_list(ENBs), + {reply, Reply, S}; + +handle_call({fetch_enb_list, Filter}, + _From, + #state{enbs = ENBs} = S) -> + Filtered = maps:filter(enb_filter(Filter), ENBs), + Reply = maps:to_list(Filtered), + {reply, Reply, S}; + +handle_call(Info, From, S) -> + ?LOG_ERROR("unknown ~p() from ~p: ~p", [?FUNCTION_NAME, From, Info]), + {reply, {error, not_implemented}, S}. + + +handle_cast({enb_event, Handle, Event}, + #state{enbs = ENBs} = S) -> + case maps:find(Handle, ENBs) of + {ok, EnbInfo0} -> + ?LOG_INFO("eNB (handle=~p) event: ~p", [Handle, Event]), + EnbInfo1 = enb_handle_event(EnbInfo0, Event), + {noreply, S#state{enbs = maps:update(Handle, EnbInfo1, ENBs)}}; + error -> + ?LOG_ERROR("eNB (handle=~p) is *not* registered", [Handle]), + {noreply, S} + end; + +handle_cast(Info, S) -> + ?LOG_ERROR("unknown ~p(): ~p", [?FUNCTION_NAME, Info]), + {noreply, S}. + + +handle_info({'DOWN', _MonRef, process, Pid, Reason}, + #state{enbs = ENBs, + pids = PIDs} = S) -> + ?LOG_INFO("eNB process (pid=~p) terminated with reason ~p", [Pid, Reason]), + case maps:find(Pid, PIDs) of + {ok, Pid} -> + Handle = maps:get(Pid, PIDs), + ?LOG_INFO("eNB (handle=~p) has been unregistered", [Handle]), + {noreply, S#state{enbs = maps:remove(Handle, ENBs), + pids = maps:remove(Pid, PIDs)}}; + error -> + ?LOG_ERROR("eNB (pid=~p) is *not* registered", [Pid]), + {noreply, S} + end; + +handle_info(Info, S) -> + ?LOG_ERROR("unknown ~p(): ~p", [?FUNCTION_NAME, Info]), + {noreply, S}. + + +terminate(Reason, _S) -> + ?LOG_NOTICE("Terminating, reason ~p", [Reason]), + ok. + + +%% ------------------------------------------------------------------ +%% private API +%% ------------------------------------------------------------------ + +-spec enb_handle_event(enb_info(), enb_event()) -> enb_info(). +enb_handle_event(EnbInfo, {connecting, ConnInfo}) -> + EnbInfo#{state => connecting, + enb_conn_info => ConnInfo}; + +enb_handle_event(EnbInfo, {connected, ConnInfo}) -> + EnbInfo#{state => connected, + mme_conn_info => ConnInfo}; + +enb_handle_event(EnbInfo, {s1setup, Info}) -> + maps:merge(EnbInfo#{state => s1setup}, Info); + +enb_handle_event(EnbInfo, Event) -> + ?LOG_ERROR("Unhandled event: ~p", [Event]), + EnbInfo. + + +-spec enb_filter(enb_filter()) -> fun((enb_handle(), enb_info()) -> boolean()). +enb_filter({genb_id_str, GlobalENBId}) -> + fun(_, Item) -> enb_filter_by_field({genb_id_str, GlobalENBId}, Item) end; + +enb_filter({enb_sctp_aid, Aid}) -> + fun(_, Item) -> enb_filter_by_sub_field({enb_conn_info, aid, Aid}, Item) end; + +enb_filter({mme_sctp_aid, Aid}) -> + fun(_, Item) -> enb_filter_by_sub_field({mme_conn_info, mme_aid, Aid}, Item) end; + +enb_filter({enb_addr_port, {Addr, Port}}) -> + fun(_, Item) -> enb_filter_by_sub_field({enb_conn_info, addr, Addr}, Item), + enb_filter_by_sub_field({enb_conn_info, port, Port}, Item) end; + +enb_filter({mme_addr_port, {Addr, Port}}) -> + fun(_, Item) -> enb_filter_by_sub_field({mme_conn_info, mme_addr, Addr}, Item), + enb_filter_by_sub_field({mme_conn_info, mme_port, Port}, Item) end; + +enb_filter(Filter) -> + ?LOG_ERROR("Unknown eNB filter: ~p", [Filter]), + fun(_, _) -> false end. + + +enb_filter_by_field({Field, Value}, EnbInfo) -> + maps:get(Field, EnbInfo, undefined) =:= Value. + + +enb_filter_by_sub_field({Map, Field, Value}, EnbInfo) -> + M = maps:get(Map, EnbInfo, #{}), + maps:get(Field, M, undefined) =:= Value. + + +%% vim:set ts=4 sw=4 et: diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index 50bd682..934f040 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -66,6 +66,11 @@ PfcpLocAddr = osmo_s1gw:get_env(pfcp_loc_addr, ?ENV_DEFAULT_PFCP_LOC_ADDR), PfcpRemAddr = osmo_s1gw:get_env(pfcp_rem_addr, ?ENV_DEFAULT_PFCP_REM_ADDR), + EnbRegistry = {enb_registry, {enb_registry, start_link, []}, + permanent, + 5000, + worker, + [enb_registry]}, SctpServer = {sctp_server, {sctp_server, start_link, [server_cfg()]}, permanent, 5000, @@ -84,7 +89,7 @@ [gtpu_kpi]}, s1gw_metrics:init(), - {ok, {{one_for_one, 5, 10}, [SctpServer, PfcpPeer, GtpuKpi]}}. + {ok, {{one_for_one, 5, 10}, [EnbRegistry, SctpServer, PfcpPeer, GtpuKpi]}}. %% ------------------------------------------------------------------ diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index a80ce0e..e41d1aa 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -40,7 +40,7 @@ handle_call/3, handle_cast/2, terminate/2]). --export([start_link/1, +-export([start_link/2, process_pdu/2, fetch_erab/2, fetch_erab_list/1, @@ -73,6 +73,7 @@ MNC :: nonempty_string()}. -record(proxy_state, {conn_info :: sctp_server:conn_info(), + enb_handle :: enb_registry:enb_handle(), erabs :: dict:dict(K :: erab_uid(), V :: pid()), enb_id :: undefined | non_neg_integer(), @@ -94,18 +95,21 @@ }. -export_type([proxy_action/0, - enb_info/0]). + enb_info/0, + enb_id/0, + plmn_id/0]). %% ------------------------------------------------------------------ %% public API %% ------------------------------------------------------------------ --spec start_link(ConnInfo) -> Result - when ConnInfo :: sctp_server:conn_info(), +-spec start_link(EnbHandle, ConnInfo) -> Result + when EnbHandle :: enb_registry:enb_handle(), + ConnInfo :: sctp_server:conn_info(), Result :: gen_server:start_ret(). -start_link(ConnInfo) -> - gen_server:start_link(?MODULE, [ConnInfo], []). +start_link(EnbHandle, ConnInfo) -> + gen_server:start_link(?MODULE, [EnbHandle, ConnInfo], []). -type process_pdu_result() :: {proxy_action(), binary()}. @@ -141,9 +145,10 @@ %% gen_server API %% ------------------------------------------------------------------ -init([ConnInfo]) -> +init([EnbHandle, ConnInfo]) -> process_flag(trap_exit, true), {ok, #proxy_state{enb_uptime = enb_uptime:start_link(), + enb_handle = EnbHandle, conn_info = ConnInfo, erabs = dict:new(), path = []}}. @@ -163,15 +168,8 @@ {reply, dict:to_list(ERABs), S}; handle_call(fetch_enb_info, _From, - #proxy_state{enb_id = EnbId, - plmn_id = PLMNId, - genb_id_str = GlobalENBId} = S) -> - Info = #{enb_id => EnbId, - plmn_id => PLMNId, - genb_id_str => GlobalENBId}, - %% omit fields with Value =:= undefined - Reply = maps:filter(fun(_K, V) -> V =/= undefined end, Info), - {reply, Reply, S}; + #proxy_state{} = S) -> + {reply, enb_info(S), S}; handle_call(Info, From, #proxy_state{} = S) -> @@ -267,6 +265,15 @@ MCC ++ "-" ++ MNC ++ "-" ++ integer_to_list(ENBId). +-spec enb_info(proxy_state()) -> enb_info(). +enb_info(S) -> + Info = #{enb_id => S#proxy_state.enb_id, + plmn_id => S#proxy_state.plmn_id, + genb_id_str => S#proxy_state.genb_id_str}, + %% omit fields with Value =:= undefined + maps:filter(fun(_K, V) -> V =/= undefined end, Info). + + %% register a single per-eNB counter -spec ctr_reg(C, GlobalENBId) -> C when C :: [ctr | _], @@ -397,6 +404,8 @@ handle_pdu({successfulOutcome, #'SuccessfulOutcome'{procedureCode = ?'id-S1Setup'}}, S) -> ?LOG_DEBUG("Processing S1 SETUP RESPONSE"), + enb_registry:enb_event(S#proxy_state.enb_handle, + {s1setup, enb_info(S)}), gtpu_kpi_enb_register(S), enb_uptime:genb_id_ind(S#proxy_state.enb_uptime, S#proxy_state.genb_id_str), diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index 830fe91..4ed3cb8 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -96,12 +96,15 @@ %% gen_statem API %% ------------------------------------------------------------------ -init([ConnInfo, ConnCfg]) -> - {ok, Pid} = s1ap_proxy:start_link(ConnInfo), +init([EnbConnInfo, MmeConnCfg]) -> + {ok, EnbHandle} = enb_registry:enb_register(), + {ok, Pid} = s1ap_proxy:start_link(EnbHandle, EnbConnInfo), {ok, connecting, - #{enb_aid => maps:get(aid, ConnInfo), - conn_cfg => ConnCfg, + #{enb_aid => maps:get(aid, EnbConnInfo), + enb_conn_info => EnbConnInfo, + mme_conn_cfg => MmeConnCfg, tx_queue => [], + enb_handle => EnbHandle, handler => Pid}}. @@ -111,10 +114,13 @@ %% CONNECTING state connecting(enter, OldState, - #{conn_cfg := ConnCfg} = S) -> + #{enb_conn_info := EnbConnInfo, + mme_conn_cfg := MmeConnCfg, + enb_handle := Handle} = S) -> ?LOG_INFO("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), + ok = enb_registry:enb_event(Handle, {?FUNCTION_NAME, EnbConnInfo}), %% Initiate connection establishment with the MME - {ok, Sock} = sctp_client:connect(ConnCfg), + {ok, Sock} = sctp_client:connect(MmeConnCfg), {next_state, connecting, S#{sock => Sock}, [{state_timeout, 2_000, conn_est_timeout}]}; @@ -155,8 +161,11 @@ %% CONNECTED state -connected(enter, OldState, S0) -> +connected(enter, OldState, + #{enb_handle := Handle} = S0) -> ?LOG_INFO("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), + MmeConnInfo = conn_info(?FUNCTION_NAME, S0), + ok = enb_registry:enb_event(Handle, {?FUNCTION_NAME, MmeConnInfo}), %% Send pending eNB -> MME messages (if any) S1 = sctp_send_pending(S0), {keep_state, S1}; @@ -216,13 +225,8 @@ %% Event handler for all states -handle_event(State, {call, From}, fetch_info, - #{handler := Pid, conn_cfg := ConnCfg} = S0) -> - S1 = maps:with([enb_aid, mme_aid], S0), - Info = S1#{state => State, - handler => Pid, - mme_addr => maps:get(raddr, ConnCfg), - mme_port => maps:get(rport, ConnCfg)}, +handle_event(State, {call, From}, fetch_info, S) -> + Info = conn_info(State, S), {keep_state_and_data, {reply, From, Info}}; handle_event(State, {call, From}, EventData, _S) -> @@ -238,8 +242,11 @@ {ok, State, S}. -terminate(Reason, State, #{handler := Pid} = S) -> +terminate(Reason, State, + #{handler := Pid, + enb_handle := Handle} = S) -> ?LOG_NOTICE("Terminating in state ~p, reason ~p", [State, Reason]), + enb_registry:enb_unregister(Handle), s1ap_proxy:shutdown(Pid), case S of #{sock := Sock, @@ -284,4 +291,12 @@ sctp_send_pending([], S) -> S#{tx_queue := []}. + +conn_info(State, #{mme_conn_cfg := MmeConnCfg} = S0) -> + S1 = maps:with([enb_aid, mme_aid, handler], S0), + S1#{state => State, + mme_addr => maps:get(raddr, MmeConnCfg), + mme_port => maps:get(rport, MmeConnCfg)}. + + %% vim:set ts=4 sw=4 et: diff --git a/src/sctp_server.erl b/src/sctp_server.erl index 5530677..d194ce4 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -68,7 +68,8 @@ }. -export_type([cfg/0, - conn_info/0]). + conn_info/0, + addr_port/0]). -record(client_state, {addr_port :: addr_port(), diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 9015934..55e9c13 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -28,9 +28,13 @@ pfcp_mock:mock_all(), exometer:start(), s1gw_metrics:init(), + enb_registry:start_link(), gtpu_kpi:start_link(#{enable => false}), - {ok, Pid} = s1ap_proxy:start_link(#{addr => {127,0,0,0}, + {ok, EnbHandle} = enb_registry:enb_register(), + {ok, Pid} = s1ap_proxy:start_link(EnbHandle, + #{addr => {127,0,0,0}, port => 1337}), + ok = enb_registry:enb_unregister(EnbHandle), #{handler => Pid}. @@ -38,6 +42,7 @@ s1ap_proxy:shutdown(Pid), exometer:stop(), gtpu_kpi:shutdown(), + enb_registry:shutdown(), pfcp_mock:unmock_all(). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41034?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: I77a5a750ca6342da3a99926a44926b3973ab19c4 Gerrit-Change-Number: 41034 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: enb_registry: track eNB uptime
by fixeria 04 Sep '25

04 Sep '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41035?usp=email ) Change subject: enb_registry: track eNB uptime ...................................................................... enb_registry: track eNB uptime Now that we have the global eNB registry, it makes more sense to perform uptime tracking there instead of spawning a separate enb_uptime process for each eNB connection. Change-Id: I94fd06e559ae52d4d9c8b22e618e48dff718b53c Related: SYS#7594, SYS#7066 --- M src/enb_registry.erl D src/enb_uptime.erl M src/s1ap_proxy.erl 3 files changed, 59 insertions(+), 109 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/35/41035/1 diff --git a/src/enb_registry.erl b/src/enb_registry.erl index edd9f3d..9f9ac3f 100644 --- a/src/enb_registry.erl +++ b/src/enb_registry.erl @@ -51,6 +51,11 @@ -include_lib("kernel/include/logger.hrl"). +-include("s1gw_metrics.hrl"). + +%% Heartbeat interval +-define(HEARTBEAT_INTERVAL, 5_000). + -type enb_handle() :: non_neg_integer(). @@ -72,6 +77,7 @@ mon_ref := reference(), %% monitor() reference state := enb_state(), %% connection state reg_time := integer(), %% registration time (monotonic) + uptime := non_neg_integer(), %% seconds since reg_time genb_id_str => string(), %% Global-eNB-ID enb_id => s1ap_proxy:enb_id(), %% eNB-ID plmn_id => s1ap_proxy:plmn_id(), %% PLMN-ID @@ -142,6 +148,7 @@ %% ------------------------------------------------------------------ init([]) -> + spawn_link(fun() -> heartbeat(?HEARTBEAT_INTERVAL) end), {ok, #state{enbs = maps:new(), pids = maps:new(), next_handle = 0}}. @@ -163,7 +170,8 @@ EnbInfo = #{pid => Pid, mon_ref => MonRef, state => connecting, - reg_time => erlang:monotonic_time()}, + reg_time => erlang:monotonic_time(), + uptime => 0}, ?LOG_INFO("eNB (handle=~p) registered", [Handle]), {reply, {ok, Handle}, S#state{enbs = ENBs#{Handle => EnbInfo}, pids = PIDs#{Pid => Handle}, @@ -178,6 +186,7 @@ {ok, #{pid := Pid, mon_ref := MonRef}} -> erlang:demonitor(MonRef, [flush]), + enb_metrics_reset(maps:get(Handle, ENBs)), ?LOG_INFO("eNB (handle=~p) unregistered", [Handle]), {reply, ok, S#state{enbs = maps:remove(Handle, ENBs), pids = maps:remove(Pid, PIDs)}}; @@ -216,12 +225,19 @@ {ok, EnbInfo0} -> ?LOG_INFO("eNB (handle=~p) event: ~p", [Handle, Event]), EnbInfo1 = enb_handle_event(EnbInfo0, Event), + enb_metrics_register(EnbInfo1), {noreply, S#state{enbs = maps:update(Handle, EnbInfo1, ENBs)}}; error -> ?LOG_ERROR("eNB (handle=~p) is *not* registered", [Handle]), {noreply, S} end; +handle_cast(heartbeat, + #state{enbs = ENBs} = S) -> + T = erlang:monotonic_time(), + Fun = fun(Handle, EnbInfo) -> enb_report_uptime(Handle, EnbInfo, T) end, + {noreply, S#state{enbs = maps:map(Fun, ENBs)}}; + handle_cast(Info, S) -> ?LOG_ERROR("unknown ~p(): ~p", [?FUNCTION_NAME, Info]), {noreply, S}. @@ -234,6 +250,7 @@ case maps:find(Pid, PIDs) of {ok, Pid} -> Handle = maps:get(Pid, PIDs), + enb_metrics_reset(maps:get(Handle, ENBs)), ?LOG_INFO("eNB (handle=~p) has been unregistered", [Handle]), {noreply, S#state{enbs = maps:remove(Handle, ENBs), pids = maps:remove(Pid, PIDs)}}; @@ -256,6 +273,20 @@ %% private API %% ------------------------------------------------------------------ +-spec enb_metrics_register(enb_info()) -> term(). +enb_metrics_register(#{genb_id_str := GlobalENBId}) -> + catch exometer:new(?S1GW_CTR_ENB_UPTIME(GlobalENBId), counter); + +enb_metrics_register(_) -> ok. + + +-spec enb_metrics_reset(enb_info()) -> term(). +enb_metrics_reset(#{genb_id_str := GlobalENBId}) -> + s1gw_metrics:ctr_reset(?S1GW_CTR_ENB_UPTIME(GlobalENBId)); + +enb_metrics_reset(_) -> ok. + + -spec enb_handle_event(enb_info(), enb_event()) -> enb_info(). enb_handle_event(EnbInfo, {connecting, ConnInfo}) -> EnbInfo#{state => connecting, @@ -305,4 +336,28 @@ maps:get(Field, M, undefined) =:= Value. +-spec enb_report_uptime(Handle, EnbInfo, T1) -> enb_info() + when Handle :: enb_handle(), + EnbInfo :: enb_info(), + T1 :: integer(). +enb_report_uptime(Handle, #{reg_time := T0} = EnbInfo, T1) -> + Uptime = erlang:convert_time_unit(T1 - T0, native, second), + ?LOG_DEBUG("eNB (handle=~p) uptime ~p s", [Handle, Uptime]), + %% update ?S1GW_CTR_ENB_UPTIME + case EnbInfo of + #{genb_id_str := GlobalENBId} -> + Current = s1gw_metrics:get_current_value(?S1GW_CTR_ENB_UPTIME(GlobalENBId)), + s1gw_metrics:ctr_inc(?S1GW_CTR_ENB_UPTIME(GlobalENBId), Uptime - Current); + _ -> nop + end, + EnbInfo#{uptime => Uptime}. + + +-spec heartbeat(timeout()) -> no_return(). +heartbeat(Tval) -> + timer:sleep(Tval), + gen_server:cast(?MODULE, ?FUNCTION_NAME), + heartbeat(Tval). %% keep going + + %% vim:set ts=4 sw=4 et: diff --git a/src/enb_uptime.erl b/src/enb_uptime.erl deleted file mode 100644 index ac71ebd..0000000 --- a/src/enb_uptime.erl +++ /dev/null @@ -1,100 +0,0 @@ -%% Copyright (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> -%% Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> -%% -%% All Rights Reserved -%% -%% SPDX-License-Identifier: AGPL-3.0-or-later -%% -%% This program is free software; you can redistribute it and/or modify -%% it under the terms of the GNU Affero General Public License as -%% published by the Free Software Foundation; either version 3 of the -%% License, or (at your option) any later version. -%% -%% This program is distributed in the hope that it will be useful, -%% but WITHOUT ANY WARRANTY; without even the implied warranty of -%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%% GNU General Public License for more details. -%% -%% You should have received a copy of the GNU Affero General Public License -%% along with this program. If not, see <https://www.gnu.org/licenses/>. -%% -%% Additional Permission under GNU AGPL version 3 section 7: -%% -%% If you modify this Program, or any covered work, by linking or -%% combining it with runtime libraries of Erlang/OTP as released by -%% Ericsson on https://www.erlang.org (or a modified version of these -%% libraries), containing parts covered by the terms of the Erlang Public -%% License (https://www.erlang.org/EPLICENSE), the licensors of this -%% Program grant you additional permission to convey the resulting work -%% without the need to license the runtime libraries of Erlang/OTP under -%% the GNU Affero General Public License. Corresponding Source for a -%% non-source form of such a combination shall include the source code -%% for the parts of the runtime libraries of Erlang/OTP used as well as -%% that of the covered work. - --module(enb_uptime). - --export([start_link/0, - genb_id_ind/2, - shutdown/1]). - --include_lib("kernel/include/logger.hrl"). - --include("s1gw_metrics.hrl"). - --define(INTERVAL, 5_000). - - -%% ------------------------------------------------------------------ -%% public API -%% ------------------------------------------------------------------ - --spec start_link() -> pid(). -start_link() -> - T0 = erlang:monotonic_time(), - spawn_link(fun() -> loop(#{time => T0}) end). - - --spec genb_id_ind(pid(), string()) -> ok. -genb_id_ind(Pid, GlobalENBId) -> - Pid ! {?FUNCTION_NAME, GlobalENBId}, - ok. - - --spec shutdown(pid()) -> ok. -shutdown(Pid) -> - Pid ! stop, - ok. - - -%% ------------------------------------------------------------------ -%% private API -%% ------------------------------------------------------------------ - -loop(#{genb_id := GlobalENBId, time := T0} = S) -> - receive - stop -> - s1gw_metrics:ctr_reset(?S1GW_CTR_ENB_UPTIME(GlobalENBId)), - ok; - Event -> - ?LOG_ERROR("Rx unexpected event: ~p", [Event]) - after ?INTERVAL -> - T1 = erlang:monotonic_time(), - Diff = erlang:convert_time_unit(T1 - T0, native, second), - s1gw_metrics:ctr_inc(?S1GW_CTR_ENB_UPTIME(GlobalENBId), Diff), - loop(S#{time => T1}) - end; - -loop(#{} = S) -> - receive - {genb_id_ind, GlobalENBId} -> - catch exometer:new(?S1GW_CTR_ENB_UPTIME(GlobalENBId), counter), - loop(S#{genb_id => GlobalENBId}); - stop -> - ok; - Event -> - ?LOG_ERROR("Rx unexpected event: ~p", [Event]) - end. - - -%% vim:set ts=4 sw=4 et: diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index e41d1aa..d3aa65b 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -82,8 +82,7 @@ mme_ue_id :: undefined | mme_ue_id(), enb_ue_id :: undefined | enb_ue_id(), erab_id :: undefined | erab_id(), - path :: [s1ap_ie_id()], - enb_uptime :: pid() + path :: [s1ap_ie_id()] }). -type proxy_state() :: #proxy_state{}. @@ -147,8 +146,7 @@ init([EnbHandle, ConnInfo]) -> process_flag(trap_exit, true), - {ok, #proxy_state{enb_uptime = enb_uptime:start_link(), - enb_handle = EnbHandle, + {ok, #proxy_state{enb_handle = EnbHandle, conn_info = ConnInfo, erabs = dict:new(), path = []}}. @@ -193,8 +191,7 @@ {noreply, S}. -terminate(Reason, #proxy_state{} = S) -> - enb_uptime:shutdown(S#proxy_state.enb_uptime), +terminate(Reason, #proxy_state{}) -> ?LOG_NOTICE("Terminating, reason ~p", [Reason]), ok. @@ -407,8 +404,6 @@ enb_registry:enb_event(S#proxy_state.enb_handle, {s1setup, enb_info(S)}), gtpu_kpi_enb_register(S), - enb_uptime:genb_id_ind(S#proxy_state.enb_uptime, - S#proxy_state.genb_id_str), %% there's nothing to patch in this PDU, so we forward it as-is {forward, S}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41035?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: I94fd06e559ae52d4d9c8b22e618e48dff718b53c Gerrit-Change-Number: 41035 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log