March 2026 - gerrit-log - lists.osmocom.org

[XS] Change in pysim[master]: global_platform: fix store_data() returning last chunk only
by laforge 21 Mar '26

21 Mar '26

Attention is currently required from: fixeria. laforge has uploaded a new patch set (#4) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/pysim/+/42375?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: global_platform: fix store_data() returning last chunk only ...................................................................... global_platform: fix store_data() returning last chunk only The loop builds up `response` across multiple STORE DATA blocks, but the function returns only `data` - the response from the *last* block. It should return the accumulated response instead. Change-Id: I3e15c8004d1e366e8c3896e559656622f48bb1a2 --- M pySim/global_platform/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/75/42375/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42375?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3e15c8004d1e366e8c3896e559656622f48bb1a2 Gerrit-Change-Number: 42375 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[L] Change in pysim[master]: docs/put_key: add tutorial that explains how to manage global platfor...
by laforge 21 Mar '26

21 Mar '26

Attention is currently required from: daniel, dexter, lynxis lazus, neels. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/42353?usp=email ) Change subject: docs/put_key: add tutorial that explains how to manage global platform keys ...................................................................... Patch Set 5: (2 comments) File docs/put_key-tutorial.rst: https://gerrit.osmocom.org/c/pysim/+/42353/comment/677d853a_aa55c651?usp=em… : PS5, Line 38: an ISD-P (Issuer : Security Domain - Profile) exist. (see also: https://euicc-manual.osmocom.org/docs/lpa/applet-id/) : : On top of this, an eSIM profile may establish its own `securityDomain`. This `securityDomain` is comparable to the : Issuer Security Domain (ISD) we also find on UICCs. The ISD-P is identical with the [first/main] "securityDomain establised by the eSIM profile". The two separate paragraphs read as if those are separate things https://gerrit.osmocom.org/c/pysim/+/42353/comment/ecdc10e0_7a3146a0?usp=em… : PS5, Line 78: `SCP02` is slightly : older and commonly used on UICCs. The more modern `SCP03` is commonly used on eUICCs. I would remove the "commonly used" sections here. Simply stating one is the older than the other and the two algorithms should be sufficient and we know is factually true. I would argue neither SCP02 nor SCP03 are particularly common with UICCs nor eUICCS as what is common there is SCP80 and SCP81. No normal phone has any code to perform SCP02/SCP03. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42353?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I163dfedca3df572cb8442e9a4a280e6c5b00327e Gerrit-Change-Number: 42353 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Mar 2026 21:30:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in ...osmo-s1gw[master]: rest_server: fix TOC/TOU race when listing/fetching E-RABs
by fixeria 21 Mar '26

21 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42450?usp=email ) Change subject: rest_server: fix TOC/TOU race when listing/fetching E-RABs ...................................................................... rest_server: fix TOC/TOU race when listing/fetching E-RABs The list of E-RAB FSM pids is a snapshot taken at one point in time. By the time we interrogate each erab_fsm process individually, any of them may have already terminated (e.g. bearer released mid-request). The current code fails to generate a response if this happens. * fetch_erab_info/1: add a pid() clause that wraps erab_list_item/1 in a try/catch, returning 'error' if the process is gone. * fetch_erab_info/1: catch both exit forms ** `{noproc, _}` raised by gen_statem:call/2 on a monitored pid, and ** the bare noproc atom for other code paths. * fetch_erab_list/1: switch from lists:map to lists:filtermap and call fetch_erab_info/1 per E-RAB, silently dropping any that died between the snapshot and the per-process interrogation. Change-Id: I160b413aa535f2379ad4e40a3ae8f37c5bce2067 Related: SYS#7066 --- M src/rest_server.erl 1 file changed, 14 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/rest_server.erl b/src/rest_server.erl index 315c66e..19554ac 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -523,14 +523,17 @@ error. --spec fetch_erab_info(binary()) -> {ok, erab_fsm:erab_info()} | error. +-spec fetch_erab_info(binary() | pid()) -> {ok, erab_fsm:erab_info()} | error. fetch_erab_info(<< "pid:", Val/bytes >>) -> - Pid = parse_pid(Val), - %% guard against non-existent process IDs - %% TODO: check if the given Pid is actually an erab_fsm + fetch_erab_info(parse_pid(Val)); + +fetch_erab_info(Pid) when is_pid(Pid) -> + %% erab_fsm process may have already terminated + %% guard against that by catching noproc try erab_list_item({pid, Pid}) of ErabInfo -> {ok, ErabInfo} catch + exit:noproc -> error; exit:{noproc, _} -> error end; @@ -542,12 +545,17 @@ -spec fetch_erab_list(enb_registry:enb_info()) -> [map()]. fetch_erab_list(#{pid := EnbPid}) -> ERABs = enb_proxy:fetch_erab_list(EnbPid), - lists:map(fun erab_list_item/1, ERABs). + lists:filtermap( + fun({_, Pid}) -> + case fetch_erab_info(Pid) of + {ok, ErabInfo} -> {true, ErabInfo}; + error -> false + end + end, ERABs). -spec erab_list_item({term(), pid()}) -> map(). erab_list_item({_, Pid}) -> - %% XXX: E-RAB FSM process might be dead here Info = erab_fsm:fetch_info(Pid), {MmeUeId, ErabId} = maps:get(uid, Info), M0 = #{mme_ue_id => MmeUeId, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42450?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: I160b413aa535f2379ad4e40a3ae8f37c5bce2067 Gerrit-Change-Number: 42450 Gerrit-PatchSet: 3 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

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: add public erab_list() type
by fixeria 21 Mar '26

21 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42448?usp=email ) Change subject: s1ap_proxy: add public erab_list() type ...................................................................... s1ap_proxy: add public erab_list() type Change-Id: I21a674537d1d9f16fdb319aaf2d758ba0906b407 --- M src/enb_proxy.erl M src/s1ap_proxy.erl 2 files changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/src/enb_proxy.erl b/src/enb_proxy.erl index 40d446a..5dfa0ff 100644 --- a/src/enb_proxy.erl +++ b/src/enb_proxy.erl @@ -112,7 +112,7 @@ gen_statem:call(Pid, ?FUNCTION_NAME). --spec fetch_erab_list(pid()) -> [{term(), pid()}]. +-spec fetch_erab_list(pid()) -> s1ap_proxy:erab_list(). fetch_erab_list(Pid) -> gen_statem:call(Pid, ?FUNCTION_NAME). diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index ef7665e..dcd053e 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -65,6 +65,7 @@ -type enb_ue_id() :: 0..16#ffffff. -type erab_id() :: 0..16#ff. -type erab_uid() :: {mme_ue_id(), erab_id()}. +-type erab_list() :: [{erab_uid(), pid()}]. -record(proxy_state, {owner :: pid(), erabs :: dict:dict(K :: erab_uid(), @@ -79,7 +80,8 @@ -type proxy_state() :: #proxy_state{}. -type proxy_action() :: forward | reply | drop. --export_type([proxy_action/0]). +-export_type([proxy_action/0, + erab_list/0]). %% ------------------------------------------------------------------ @@ -109,7 +111,7 @@ %% Fetch all E-RABs from the registry in form of a list --spec fetch_erab_list(pid()) -> [{erab_uid(), pid()}]. +-spec fetch_erab_list(pid()) -> erab_list(). fetch_erab_list(Pid) -> gen_server:call(Pid, ?FUNCTION_NAME). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42448?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: I21a674537d1d9f16fdb319aaf2d758ba0906b407 Gerrit-Change-Number: 42448 Gerrit-PatchSet: 4 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

[S] Change in ...osmo-s1gw[master]: rest_server: log received requests (as debug)
by fixeria 21 Mar '26

21 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42451?usp=email ) Change subject: rest_server: log received requests (as debug) ...................................................................... rest_server: log received requests (as debug) Change-Id: I25da9662fb98a0eafcedfde21b12a937225f5fb9 Related: SYS#7066 --- M src/osmo_s1gw_sup.erl M src/rest_server.erl 2 files changed, 27 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index 06174b2..fd89b3c 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -163,7 +163,8 @@ #{callback => rest_server, spec_path => list_to_binary(osmo_s1gw:get_priv("openapi.json")), port => osmo_s1gw:get_env(rest_srv_port, ?ENV_DEFAULT_REST_SRV_PORT), - swagger_ui => osmo_s1gw:get_env(rest_srv_swagger_ui, ?ENV_DEFAULT_REST_SRV_SWAGGER_UI)}. + swagger_ui => osmo_s1gw:get_env(rest_srv_swagger_ui, ?ENV_DEFAULT_REST_SRV_SWAGGER_UI), + preprocess_middlewares => [rest_server]}. %% vim:set ts=4 sw=4 et: diff --git a/src/rest_server.erl b/src/rest_server.erl index 19554ac..f9176cb 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -34,6 +34,8 @@ -module(rest_server). +-behaviour(erf_preprocess_middleware). + -export([config_read/1, metrics_list/1, pfcp_assoc_state/1, @@ -53,6 +55,8 @@ erab_delete/1 ]). +-export([preprocess/1]). + -include_lib("kernel/include/logger.hrl"). -include("osmo_s1gw.hrl"). @@ -629,4 +633,25 @@ bval(V) -> V. +%% ------------------------------------------------------------------ +%% erf_preprocess_middleware API +%% ------------------------------------------------------------------ + +-spec preprocess(erf:request()) -> erf:request(). +preprocess(#{peer := Peer, + method := Method, + path := Path, + query_parameters := QP} = Request) -> + %% We're not really pre-processing anything here, just logging requests + MethodStr = string:uppercase(atom_to_list(Method)), + PathStr = lists:join("/", [binary_to_list(P) || P <- Path]), + QPStr = case QP of + [] -> ""; + _ -> [$? | lists:join($&, [<<K/bytes, $=, V/bytes>> || {K, V} <- QP])] + end, + ?LOG_DEBUG("[REST] ~s - \"~s /~s~s\"", + [Peer, MethodStr, PathStr, QPStr]), + Request. + + %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42451?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: I25da9662fb98a0eafcedfde21b12a937225f5fb9 Gerrit-Change-Number: 42451 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>

1 0

[M] Change in ...osmo-s1gw[master]: enb_proxy: split conn_info() into mme_conn_info() and proxy_info()
by fixeria 21 Mar '26

21 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42446?usp=email ) Change subject: enb_proxy: split conn_info() into mme_conn_info() and proxy_info() ...................................................................... enb_proxy: split conn_info() into mme_conn_info() and proxy_info() The old conn_info() conflated two distinct concerns: the MME SCTP connection info stored in enb_registry (aid, saddr, sport) and the broader operational state used for introspection (handler pid, enb connection info, etc.). Mixing them forced enb_registry to hold a handler pid it has no business knowing about, and required rest_server to extract that pid just to reach s1ap_proxy for E-RAB listing. Split into two distinct types: * mme_conn_info() - pure MME SCTP connection info (aid, saddr, sport), stored in the enb_registry and signalled via notify_mme_comm_up/2. The `mme_` prefix is dropped from field names as the type name provides the context. * proxy_info() - richer operational snapshot (handler, enb_handle, enb_conn_info, mme_conn_info, genb_id_str, mme_info), returned by fetch_info/1 for introspection/debugging purposes. Additionally: * Add fetch_erab_list/1 to enb_proxy, delegating internally to s1ap_proxy:fetch_erab_list/1 via the cached handler pid. This allows the rest_server to obtain a list of E-RAB without having to obtain pid of the s1ap_proxy and interact with it. * Remove separate enb_aid/mme_aid/mme_saddr/mme_sport state fields; enb_aid is now read directly from enb_conn_info, and the MME fields are grouped in mme_conn_info. Change-Id: Ia428ceb4762f972211e9b790688dc89fb5b8a274 Related: SYS#7066 --- M src/enb_proxy.erl M src/enb_registry.erl M src/rest_server.erl 3 files changed, 66 insertions(+), 68 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/enb_proxy.erl b/src/enb_proxy.erl index 6a7254e..c281b33 100644 --- a/src/enb_proxy.erl +++ b/src/enb_proxy.erl @@ -47,6 +47,7 @@ -export([start_link/2, send_data/2, fetch_info/1, + fetch_erab_list/1, shutdown/1]). -include_lib("kernel/include/logger.hrl"). @@ -58,18 +59,21 @@ -include("S1AP-Constants.hrl"). --type conn_info() :: #{handler := pid(), - enb_aid := gen_sctp:assoc_id(), - mme_aid => gen_sctp:assoc_id(), - mme_saddr => inet:ip_address(), - mme_sport => inet:port_number() - }. +-type mme_conn_info() :: #{aid := gen_sctp:assoc_id(), + saddr := inet:ip_address(), + sport := inet:port_number() + }. --record(state, {enb_aid :: gen_sctp:assoc_id(), - mme_aid :: undefined | gen_sctp:assoc_id(), - mme_saddr :: undefined | inet:ip_address(), - mme_sport :: undefined | inet:port_number(), - enb_conn_info :: sctp_server:conn_info(), +-type proxy_info() :: #{handler := pid(), + enb_handle := enb_registry:enb_handle(), + enb_conn_info := sctp_server:conn_info(), + mme_conn_info => mme_conn_info(), + mme_info => mme_registry:mme_info(), + genb_id_str => string() + }. + +-record(state, {enb_conn_info :: sctp_server:conn_info(), + mme_conn_info :: undefined | mme_conn_info(), s1setup_req :: undefined | binary(), tried_mmes :: [mme_registry:mme_name()], enb_tacs :: undefined | [s1ap_utils:tac()], @@ -81,7 +85,8 @@ -type state() :: #state{}. --export_type([conn_info/0]). +-export_type([mme_conn_info/0, + proxy_info/0]). %% ------------------------------------------------------------------ @@ -101,11 +106,16 @@ gen_statem:cast(Pid, {send_data, Data}). --spec fetch_info(pid()) -> conn_info(). +-spec fetch_info(pid()) -> proxy_info(). fetch_info(Pid) -> gen_statem:call(Pid, ?FUNCTION_NAME). +-spec fetch_erab_list(pid()) -> [{term(), pid()}]. +fetch_erab_list(Pid) -> + gen_statem:call(Pid, ?FUNCTION_NAME). + + -spec shutdown(pid()) -> ok. shutdown(Pid) -> gen_statem:stop(Pid). @@ -119,10 +129,7 @@ {ok, EnbHandle} = enb_registry:enb_register(), {ok, Pid} = s1ap_proxy:start_link(self()), {ok, wait_s1setup_req, - #state{enb_aid = maps:get(aid, EnbConnInfo), - mme_saddr = undefined, - mme_sport = undefined, - enb_conn_info = EnbConnInfo, + #state{enb_conn_info = EnbConnInfo, enb_handle = EnbHandle, tried_mmes = [], handler = Pid}}. @@ -210,9 +217,7 @@ enb_registry:notify_mme_connecting(S#state.enb_handle, MmeInfo), {next_state, ?FUNCTION_NAME, %% loop transition to enable state_timeout S#state{sock = Sock, - mme_aid = undefined, - mme_saddr = undefined, - mme_sport = undefined, + mme_conn_info = undefined, tried_mmes = [MmeName | TriedMMEs]}, [{state_timeout, 2_000, conn_est_timeout}]}; error -> @@ -251,14 +256,15 @@ {ok, {MmeLAddr, MmeLPort}} = inet:sockname(Socket), ?LOG_NOTICE("MME ~p: connection (id=~p, ~p:~p) established", [MmeName, Aid, MmeAddr, MmePort]), - NewS = S#state{mme_aid = Aid, - mme_saddr = MmeLAddr, - mme_sport = MmeLPort}, + MmeConnInfo = #{aid => Aid, + saddr => MmeLAddr, + sport => MmeLPort}, %% send the S1 SETUP REQUEST PDU to the MME - sctp_send_from_enb(S#state.s1setup_req, NewS), + sctp_send_from_enb(S#state.s1setup_req, + S#state{mme_conn_info = MmeConnInfo}), %% surface MME connection details before S1 Setup completes - enb_registry:notify_mme_comm_up(S#state.enb_handle, conn_info(NewS)), - {next_state, wait_s1setup_rsp, NewS}; + enb_registry:notify_mme_comm_up(S#state.enb_handle, MmeConnInfo), + {next_state, wait_s1setup_rsp, S#state{mme_conn_info = MmeConnInfo}}; _ -> ?LOG_NOTICE("MME ~p: connection establishment failed: ~p", [MmeName, ConnState]), @@ -299,7 +305,7 @@ stream = SID, ssn = SSN, tsn = TSN}], Data}}, - #state{mme_aid = MmeAid} = S) -> + #state{mme_conn_info = #{aid := MmeAid}} = S) -> ?LOG_DEBUG("MME connection (id=~p, ~p:~p) -> eNB: ~p", [MmeAid, MmeAddr, MmePort, #{tsn => TSN, sid => SID, ssn => SSN, @@ -382,7 +388,7 @@ stream = SID, ssn = SSN, tsn = TSN}], Data}}, - #state{mme_aid = MmeAid} = S) -> + #state{mme_conn_info = #{aid := MmeAid}} = S) -> ?LOG_DEBUG("MME connection (id=~p, ~p:~p) -> eNB: ~p", [MmeAid, MmeAddr, MmePort, #{tsn => TSN, sid => SID, ssn => SSN, @@ -401,7 +407,19 @@ %% Event handler for all states handle_event(_State, {call, From}, fetch_info, S) -> - {keep_state_and_data, {reply, From, conn_info(S)}}; + Info = #{handler => S#state.handler, + enb_handle => S#state.enb_handle, + enb_conn_info => S#state.enb_conn_info, + mme_conn_info => S#state.mme_conn_info, + %% TODO: mme_info => S#state.mme_info, + genb_id_str => S#state.genb_id_str + }, + Reply = maps:filter(fun(_K, V) -> V =/= undefined end, Info), + {keep_state_and_data, {reply, From, Reply}}; + +handle_event(_State, {call, From}, fetch_erab_list, S) -> + ERABs = s1ap_proxy:fetch_erab_list(S#state.handler), + {keep_state_and_data, {reply, From, ERABs}}; handle_event(State, {call, From}, EventData, _S) -> ?LOG_ERROR("Unexpected call in state ~p: ~p", [State, EventData]), @@ -445,8 +463,8 @@ -spec sctp_send_from_enb(binary(), state()) -> ok | {error, term()}. sctp_send_from_enb(Data, #state{sock = Sock, - enb_aid = EnbAid, - mme_aid = MmeAid, + enb_conn_info = #{aid := EnbAid}, + mme_conn_info = #{aid := MmeAid}, handler = Pid}) -> case s1ap_proxy:process_pdu(Pid, Data) of {forward, FwdData} -> @@ -462,8 +480,8 @@ -spec sctp_send_from_mme(binary(), state()) -> ok | {error, term()}. sctp_send_from_mme(Data, #state{sock = Sock, - enb_aid = EnbAid, - mme_aid = MmeAid, + enb_conn_info = #{aid := EnbAid}, + mme_conn_info = #{aid := MmeAid}, handler = Pid}) -> case s1ap_proxy:process_pdu(Pid, Data) of {forward, FwdData} -> @@ -475,16 +493,6 @@ end. --spec conn_info(state()) -> conn_info(). -conn_info(S) -> - Info = #{handler => S#state.handler, - enb_aid => S#state.enb_aid, - mme_aid => S#state.mme_aid, - mme_saddr => S#state.mme_saddr, - mme_sport => S#state.mme_sport}, - maps:filter(fun(_K, V) -> V =/= undefined end, Info). - - -spec gtpu_kpi_enb_register(state()) -> ok. gtpu_kpi_enb_register(#state{genb_id_str = GlobalENBId, enb_conn_info = EnbConnInfo}) -> @@ -566,9 +574,9 @@ -spec close_conn(state()) -> ok | {error, term()}. -close_conn(#state{mme_aid = undefined}) -> ok; +close_conn(#state{mme_conn_info = undefined}) -> ok; -close_conn(#state{sock = Sock, mme_aid = MmeAid}) -> +close_conn(#state{sock = Sock, mme_conn_info = #{aid := MmeAid}}) -> sctp_common:shutdown({Sock, MmeAid}). diff --git a/src/enb_registry.erl b/src/enb_registry.erl index 2bf6e47..a65ecbf 100644 --- a/src/enb_registry.erl +++ b/src/enb_registry.erl @@ -66,7 +66,7 @@ -type enb_prop() :: {state, atom()} | {enb_conn_info, sctp_server:conn_info()} - | {mme_conn_info, undefined | enb_proxy:conn_info()} + | {mme_conn_info, undefined | enb_proxy:mme_conn_info()} | {mme_info, mme_registry:mme_info()} | {genb_id, s1ap_utils:genb_id()}. -type enb_proplist() :: [enb_prop()]. @@ -86,7 +86,7 @@ genb_id => s1ap_utils:genb_id(), %% Global-eNB-ID genb_id_str => string(), %% Global-eNB-ID string enb_conn_info => sctp_server:conn_info(), %% eNB -> S1GW connection info - mme_conn_info => enb_proxy:conn_info(), %% S1GW -> MME connection info + mme_conn_info => enb_proxy:mme_conn_info(), %% S1GW -> MME connection info mme_info => mme_registry:mme_info() %% selected MME configuration }. @@ -139,7 +139,7 @@ %% MME SCTP comm_up; connection details (aid, saddr, sport) are now known --spec notify_mme_comm_up(enb_handle(), enb_proxy:conn_info()) -> ok. +-spec notify_mme_comm_up(enb_handle(), enb_proxy:mme_conn_info()) -> ok. notify_mme_comm_up(Handle, ConnInfo) -> enb_update(Handle, [{mme_conn_info, ConnInfo}]). @@ -381,7 +381,7 @@ 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; + fun(_, Item) -> enb_filter_by_sub_field({mme_conn_info, aid, Aid}, Item) end; enb_filter({enb_addr_port, {Addr, Port}}) -> fun(_, Item) -> enb_filter_by_sub_field({enb_conn_info, addr, Addr}, Item) andalso diff --git a/src/rest_server.erl b/src/rest_server.erl index 5913b3b..315c66e 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -427,11 +427,12 @@ -spec enb_item(enb_registry:enb_info()) -> map(). enb_item(EnbInfo) -> + ERABs = enb_proxy:fetch_erab_list(maps:get(pid, EnbInfo)), M0 = #{handle => maps:get(handle, EnbInfo), pid => pid_to_list(maps:get(pid, EnbInfo)), state => maps:get(state, EnbInfo), uptime => maps:get(uptime, EnbInfo), - erab_count => 0}, + erab_count => length(ERABs)}, M1 = enb_item_add_enb_info(M0, EnbInfo), M2 = enb_item_add_enb_conn_info(M1, EnbInfo), M3 = enb_item_add_mme_conn_info(M2, EnbInfo), @@ -463,18 +464,10 @@ -spec enb_item_add_mme_conn_info(map(), enb_registry:enb_info()) -> map(). enb_item_add_mme_conn_info(M0, #{mme_conn_info := ConnInfo}) -> - Pid = maps:get(handler, ConnInfo), - ERABs = s1ap_proxy:fetch_erab_list(Pid), - M1 = M0#{erab_count => length(ERABs)}, - %% mme_aid/mme_saddr/mme_sport are only present once the MME SCTP - %% connection is fully established (comm_up); handle them together. - case maps:find(mme_aid, ConnInfo) of - {ok, Aid} -> - M1#{mme_sctp_aid => Aid, - mme_saddr => inet:ntoa(maps:get(mme_saddr, ConnInfo)), - mme_sport => maps:get(mme_sport, ConnInfo)}; - error -> M1 - end; + M0#{mme_saddr => inet:ntoa(maps:get(saddr, ConnInfo)), + mme_sport => maps:get(sport, ConnInfo), + mme_sctp_aid => maps:get(aid, ConnInfo) + }; enb_item_add_mme_conn_info(M0, _) -> M0. @@ -547,12 +540,9 @@ -spec fetch_erab_list(enb_registry:enb_info()) -> [map()]. -fetch_erab_list(#{mme_conn_info := ConnInfo}) -> - Pid = maps:get(handler, ConnInfo), %% s1ap_proxy process pid - ERABs = s1ap_proxy:fetch_erab_list(Pid), - lists:map(fun erab_list_item/1, ERABs); - -fetch_erab_list(_) -> []. +fetch_erab_list(#{pid := EnbPid}) -> + ERABs = enb_proxy:fetch_erab_list(EnbPid), + lists:map(fun erab_list_item/1, ERABs). -spec erab_list_item({term(), pid()}) -> map(). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42446?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: Ia428ceb4762f972211e9b790688dc89fb5b8a274 Gerrit-Change-Number: 42446 Gerrit-PatchSet: 4 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

[S] Change in ...osmo-s1gw[master]: enb_proxy: add missing mme_info() to proxy_info()
by fixeria 21 Mar '26

21 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42447?usp=email ) Change subject: enb_proxy: add missing mme_info() to proxy_info() ...................................................................... enb_proxy: add missing mme_info() to proxy_info() As a bonus, `tried_mmes` now only serves its actual purpose - tracking which MMEs have already been tried for selection filtering - rather than being abused as a way to retrieve the current MME name. Change-Id: Ibbb293d9e68b7c3a8c3ca7ee73132dbda3f2bf97 Related: SYS#7066 --- M src/enb_proxy.erl 1 file changed, 9 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/enb_proxy.erl b/src/enb_proxy.erl index c281b33..40d446a 100644 --- a/src/enb_proxy.erl +++ b/src/enb_proxy.erl @@ -74,6 +74,7 @@ -record(state, {enb_conn_info :: sctp_server:conn_info(), mme_conn_info :: undefined | mme_conn_info(), + mme_info :: undefined | mme_registry:mme_info(), s1setup_req :: undefined | binary(), tried_mmes :: [mme_registry:mme_name()], enb_tacs :: undefined | [s1ap_utils:tac()], @@ -217,6 +218,7 @@ enb_registry:notify_mme_connecting(S#state.enb_handle, MmeInfo), {next_state, ?FUNCTION_NAME, %% loop transition to enable state_timeout S#state{sock = Sock, + mme_info = MmeInfo, mme_conn_info = undefined, tried_mmes = [MmeName | TriedMMEs]}, [{state_timeout, 2_000, conn_est_timeout}]}; @@ -232,9 +234,9 @@ %% Handle connection establishment timeout connecting(state_timeout, conn_est_timeout, S) -> ?LOG_ERROR("MME ~p: timeout establishing connection", - [hd(S#state.tried_mmes)]), + [maps:get(name, S#state.mme_info)]), ctr_inc(?S1GW_CTR_ENB_PROXY_CONN_EST_TIMEOUT, S), - s1gw_metrics:ctr_inc(?S1GW_CTR_MME_CONN_EST_TIMEOUT(hd(S#state.tried_mmes))), + s1gw_metrics:ctr_inc(?S1GW_CTR_MME_CONN_EST_TIMEOUT(maps:get(name, S#state.mme_info))), %% re-enter the state to try again (or another MME) repeat_state_and_data; @@ -250,7 +252,7 @@ {[], #sctp_assoc_change{state = ConnState, assoc_id = Aid}}}, #state{sock = Socket} = S) -> - MmeName = hd(S#state.tried_mmes), + MmeName = maps:get(name, S#state.mme_info), case ConnState of comm_up -> {ok, {MmeLAddr, MmeLPort}} = inet:sockname(Socket), @@ -289,7 +291,7 @@ 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), - s1gw_metrics:ctr_inc(?S1GW_CTR_MME_S1_SETUP_RSP_TIMEOUT(hd(S#state.tried_mmes))), + s1gw_metrics:ctr_inc(?S1GW_CTR_MME_S1_SETUP_RSP_TIMEOUT(maps:get(name, S#state.mme_info))), %% re-enter state 'connecting' to try again (or another MME) {next_state, connecting, S}; @@ -314,13 +316,13 @@ {{?'id-S1Setup', successfulOutcome}, _IEs} -> ?LOG_INFO("Rx S1 SETUP RESPONSE from MME"), ctr_inc(?S1GW_CTR_ENB_PROXY_S1_SETUP_RSP, S), - s1gw_metrics:ctr_inc(?S1GW_CTR_MME_S1_SETUP_RSP(hd(S#state.tried_mmes))), + s1gw_metrics:ctr_inc(?S1GW_CTR_MME_S1_SETUP_RSP(maps:get(name, S#state.mme_info))), 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), - s1gw_metrics:ctr_inc(?S1GW_CTR_MME_S1_SETUP_FAILURE(hd(S#state.tried_mmes))), + s1gw_metrics:ctr_inc(?S1GW_CTR_MME_S1_SETUP_FAILURE(maps:get(name, S#state.mme_info))), %% do *not* forward the FAILURE to the eNB %% re-enter state 'connecting' to try again (or another MME) {next_state, connecting, S}; @@ -411,7 +413,7 @@ enb_handle => S#state.enb_handle, enb_conn_info => S#state.enb_conn_info, mme_conn_info => S#state.mme_conn_info, - %% TODO: mme_info => S#state.mme_info, + mme_info => S#state.mme_info, genb_id_str => S#state.genb_id_str }, Reply = maps:filter(fun(_K, V) -> V =/= undefined end, Info), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42447?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: Ibbb293d9e68b7c3a8c3ca7ee73132dbda3f2bf97 Gerrit-Change-Number: 42447 Gerrit-PatchSet: 4 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

[S] Change in ...osmo-s1gw[master]: enb_{proxy,registry}: signal MME conn info on SCTP comm_up
by fixeria 21 Mar '26

21 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42445?usp=email ) Change subject: enb_{proxy,registry}: signal MME conn info on SCTP comm_up ...................................................................... enb_{proxy,registry}: signal MME conn info on SCTP comm_up Previously, mme_aid/mme_saddr/mme_sport were only signalled to the enb_registry once the S1 Setup procedure completed. This meant the REST API could not show MME connection details for eNBs stuck in wait_s1setup_rsp state (e.g. due to a slow or retrying MME). Add notify_mme_comm_up/2, called at SCTP comm_up, which stores the full conn_info (including mme_aid, mme_saddr, mme_sport) in the registry as soon as the SCTP connection is established. notify_mme_connected/2 is simplified to notify_mme_connected/1: it now only flips the state to 'connected', since conn_info is already stored. Change-Id: Iea9ba4fdf961e6cd262edc154884a2eee3d95355 Related: SYS#7066 --- M src/enb_proxy.erl M src/enb_registry.erl 2 files changed, 22 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/enb_proxy.erl b/src/enb_proxy.erl index 17296bd..6a7254e 100644 --- a/src/enb_proxy.erl +++ b/src/enb_proxy.erl @@ -251,12 +251,14 @@ {ok, {MmeLAddr, MmeLPort}} = inet:sockname(Socket), ?LOG_NOTICE("MME ~p: connection (id=~p, ~p:~p) established", [MmeName, Aid, MmeAddr, MmePort]), + NewS = S#state{mme_aid = Aid, + mme_saddr = MmeLAddr, + mme_sport = MmeLPort}, %% send the S1 SETUP REQUEST PDU to the MME - sctp_send_from_enb(S#state.s1setup_req, - S#state{mme_aid = Aid}), - {next_state, wait_s1setup_rsp, S#state{mme_aid = Aid, - mme_saddr = MmeLAddr, - mme_sport = MmeLPort}}; + sctp_send_from_enb(S#state.s1setup_req, NewS), + %% surface MME connection details before S1 Setup completes + enb_registry:notify_mme_comm_up(S#state.enb_handle, conn_info(NewS)), + {next_state, wait_s1setup_rsp, NewS}; _ -> ?LOG_NOTICE("MME ~p: connection establishment failed: ~p", [MmeName, ConnState]), @@ -352,7 +354,7 @@ %% CONNECTED state connected(enter, OldState, S) -> ?LOG_INFO("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), - enb_registry:notify_mme_connected(S#state.enb_handle, conn_info(S)), + enb_registry:notify_mme_connected(S#state.enb_handle), {keep_state, S}; %% Handle an eNB -> MME data forwarding request (forward) diff --git a/src/enb_registry.erl b/src/enb_registry.erl index 0ad20ba..2bf6e47 100644 --- a/src/enb_registry.erl +++ b/src/enb_registry.erl @@ -46,8 +46,9 @@ notify_enb_connected/2, notify_genb_id/2, notify_mme_connecting/2, + notify_mme_comm_up/2, notify_mme_wait_rsp/1, - notify_mme_connected/2, + notify_mme_connected/1, fetch_enb_info/1, fetch_enb_list/0, fetch_enb_list/1, @@ -132,7 +133,15 @@ %% MME connection attempt in progress; stores selected MME info, clears any stale mme_conn_info -spec notify_mme_connecting(enb_handle(), mme_registry:mme_info()) -> ok. notify_mme_connecting(Handle, MmeInfo) -> - enb_update(Handle, [{state, connecting}, {mme_info, MmeInfo}, {mme_conn_info, undefined}]). + enb_update(Handle, [{state, connecting}, + {mme_info, MmeInfo}, + {mme_conn_info, undefined}]). + + +%% MME SCTP comm_up; connection details (aid, saddr, sport) are now known +-spec notify_mme_comm_up(enb_handle(), enb_proxy:conn_info()) -> ok. +notify_mme_comm_up(Handle, ConnInfo) -> + enb_update(Handle, [{mme_conn_info, ConnInfo}]). %% MME SCTP link established; S1 SETUP REQUEST forwarded, awaiting response @@ -142,9 +151,9 @@ %% S1 SETUP complete; eNB is fully operational --spec notify_mme_connected(enb_handle(), enb_proxy:conn_info()) -> ok. -notify_mme_connected(Handle, ConnInfo) -> - enb_update(Handle, [{state, connected}, {mme_conn_info, ConnInfo}]). +-spec notify_mme_connected(enb_handle()) -> ok. +notify_mme_connected(Handle) -> + enb_update(Handle, [{state, connected}]). -spec fetch_enb_info(enb_handle() | pid()) -> {ok, enb_info()} | error. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42445?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: Iea9ba4fdf961e6cd262edc154884a2eee3d95355 Gerrit-Change-Number: 42445 Gerrit-PatchSet: 4 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

[M] Change in ...osmo-s1gw[master]: [REST] Add MME source address/port to EnbItem
by fixeria 21 Mar '26

21 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42433?usp=email ) Change subject: [REST] Add MME source address/port to EnbItem ...................................................................... [REST] Add MME source address/port to EnbItem The enb_proxy now captures the local address and port of the S1GW-MME SCTP connection (mme_saddr/mme_sport) at comm_up and includes them in conn_info(). Expose this info through the REST API (EnbItem schema), show it as a new column/row in the CLI (enb_list/enb_info). Change-Id: I15bbddf96ac7d5b6f9962a8d745db58fdec334e7 Related: SYS#7066 --- M contrib/openapi.yaml M contrib/osmo-s1gw-cli.py M doc/manuals/chapters/cli.adoc M doc/manuals/chapters/rest.adoc M priv/openapi.json M src/enb_proxy.erl M src/rest_server.erl 7 files changed, 76 insertions(+), 38 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/contrib/openapi.yaml b/contrib/openapi.yaml index 55448f4..d1aaba9 100644 --- a/contrib/openapi.yaml +++ b/contrib/openapi.yaml @@ -420,15 +420,18 @@ enb_saddr: type: string description: Source (remote) address of the eNB - mme_daddr: - type: string - description: Destination (remote) address of the MME enb_sport: type: integer description: Source (remote) port of the eNB-S1GW connection + mme_saddr: + type: string + description: Source (local) address of the S1GW-MME connection mme_sport: type: integer description: Source (local) port of the S1GW-MME connection + mme_daddr: + type: string + description: Destination (remote) address of the MME mme_dport: type: integer description: Destination (remote) port of the S1GW-MME connection diff --git a/contrib/osmo-s1gw-cli.py b/contrib/osmo-s1gw-cli.py index 3878708..12079be 100755 --- a/contrib/osmo-s1gw-cli.py +++ b/contrib/osmo-s1gw-cli.py @@ -395,17 +395,28 @@ self.iface.mme_delete(self.gen_mme_id(opts)) @staticmethod - def enb_list_item(item: dict) -> dict: + def enb_list_item_addr_port(item: dict, enb_mme: str, sd: str) -> str: + ''' Generate an 'addr:port (aid)' string for the given EnbItem ''' + addr = item.get(f'{enb_mme}_{sd}addr') + port = item.get(f'{enb_mme}_{sd}port') + if (addr is None) or (port is None): + return '' + aid = item.get(f'{enb_mme}_sctp_aid') + if aid is None: + return f'{addr}:{port}' + return f'{addr}:{port} ({aid})' + + @classmethod + def enb_list_item(cls, item: dict) -> dict: ''' Generate a table row for the given eNB ''' - enb_addr = lambda item: '{enb_saddr}:{enb_sport} ({enb_sctp_aid})'.format(**item) - mme_addr = lambda item: '{mme_daddr}:{mme_dport} ({mme_sctp_aid})'.format(**item) return { 'eNB handle': item.get('handle'), 'PID': item.get('pid'), 'Global-eNB-ID': item.get('genb_id', '(unknown)'), 'State': item.get('state'), - 'eNB addr:port (aid)': enb_addr(item) if 'enb_saddr' in item else None, - 'MME addr:port (aid)': mme_addr(item) if 'mme_daddr' in item else None, + 'eNB saddr:sport (aid)': cls.enb_list_item_addr_port(item, 'enb', 's'), + 'MME saddr:sport (aid)': cls.enb_list_item_addr_port(item, 'mme', 's'), + 'MME daddr:dport (aid)': cls.enb_list_item_addr_port(item, 'mme', 'd'), 'MME name': item.get('mme_name'), 'Uptime (s)': item.get('uptime'), '# E-RABs': item.get('erab_count'), diff --git a/doc/manuals/chapters/cli.adoc b/doc/manuals/chapters/cli.adoc index f24016b..2daf0b4 100644 --- a/doc/manuals/chapters/cli.adoc +++ b/doc/manuals/chapters/cli.adoc @@ -285,11 +285,11 @@ ---- OsmoS1GW# enb_list -| handle | PID | Global-eNB-ID | State | eNB addr:port (aid) | MME addr:port (aid) | MME name | Uptime | E-RABs | -|----------|-----------|---------------|-----------|-------------------------|-------------------------|----------|----------|----------| -| 0 | <0.699.0> | 001-01-0 | connected | 127.0.1.10:56767 (5706) | 127.0.2.10:36412 (5707) | mme0 | 418 | 0 | -| 1 | <0.701.0> | 001-01-1 | connected | 127.0.1.10:54140 (5710) | 127.0.2.10:36412 (5711) | mme0 | 33 | 3 | -| 2 | <0.703.0> | 001-01-2 | connected | 127.0.1.10:34076 (5714) | 127.0.2.10:36412 (5715) | mme0 | 3600 | 20 | +| handle | PID | Global-eNB-ID | State | eNB saddr:sport (aid) | MME saddr:sport (aid) | MME daddr:dport (aid) | MME name | Uptime | E-RABs | +|----------|-----------|---------------|-----------|-------------------------|------------------------|-------------------------|----------|----------|----------| +| 0 | <0.699.0> | 001-01-0 | connected | 127.0.1.10:56767 (5706) | 127.0.2.1:34650 (5707) | 127.0.2.10:36412 (5707) | mme0 | 418 | 0 | +| 1 | <0.701.0> | 001-01-1 | connected | 127.0.1.10:54140 (5710) | 127.0.2.1:34651 (5711) | 127.0.2.10:36412 (5711) | mme0 | 33 | 3 | +| 2 | <0.703.0> | 001-01-2 | connected | 127.0.1.10:34076 (5714) | 127.0.2.1:34652 (5715) | 127.0.2.10:36412 (5715) | mme0 | 3600 | 20 | ---- ==== `enb_info` @@ -315,17 +315,18 @@ ---- OsmoS1GW# enb_info -H 8 -| Parameter | Value | -|---------------------|-------------------------| -| eNB handle | 8 | -| PID | <0.715.0> | -| Global-eNB-ID | 001-01-8 | -| State | connected | -| eNB addr:port (aid) | 127.0.1.10:57362 (5734) | -| MME addr:port (aid) | 127.0.2.10:36412 (5745) | -| MME name | mme0 | -| Uptime (s) | 521 | -| # E-RABs | 99 | +| Parameter | Value | +|-----------------------|-------------------------| +| eNB handle | 8 | +| PID | <0.715.0> | +| Global-eNB-ID | 001-01-8 | +| State | connected | +| eNB saddr:sport (aid) | 127.0.1.10:57362 (5734) | +| MME saddr:sport (aid) | 127.0.2.1:73421 (5745) | +| MME daddr:dport (aid) | 127.0.2.10:36412 (5745) | +| MME name | mme0 | +| Uptime (s) | 521 | +| # E-RABs | 99 | ---- ==== `enb_delete` diff --git a/doc/manuals/chapters/rest.adoc b/doc/manuals/chapters/rest.adoc index 7c1383b..cc74ba1 100644 --- a/doc/manuals/chapters/rest.adoc +++ b/doc/manuals/chapters/rest.adoc @@ -259,9 +259,10 @@ "enb_sport": 56767, "enb_sctp_aid": 5706, "mme_name": "mme0", + "mme_saddr": "192.168.2.1", + "mme_sport": 34500, "mme_daddr": "192.168.2.10", "mme_dport": 36412, - "mme_sport": 34500, "mme_sctp_aid": 5707, "uptime": 418, "erab_count": 3 @@ -278,8 +279,8 @@ `enb_saddr` / `enb_sport`:: Source address and port of the eNB's SCTP connection. `enb_sctp_aid`:: SCTP association ID of the eNB-S1GW connection. `mme_name`:: Name of the selected MME (from the MME pool). +`mme_saddr` / `mme_sport`:: Local address and port of the S1GW-MME SCTP connection. `mme_daddr` / `mme_dport`:: Destination address and port of the MME. -`mme_sport`:: Local source port of the S1GW-MME SCTP connection. `mme_sctp_aid`:: SCTP association ID of the S1GW-MME connection. `uptime`:: Seconds since the eNB connected. `erab_count`:: Number of currently active E-RABs for this eNB. diff --git a/priv/openapi.json b/priv/openapi.json index 59c9676..bcec82b 100644 --- a/priv/openapi.json +++ b/priv/openapi.json @@ -622,18 +622,22 @@ "type": "string", "description": "Source (remote) address of the eNB" }, - "mme_daddr": { - "type": "string", - "description": "Destination (remote) address of the MME" - }, "enb_sport": { "type": "integer", "description": "Source (remote) port of the eNB-S1GW connection" }, + "mme_saddr": { + "type": "string", + "description": "Source (local) address of the S1GW-MME connection" + }, "mme_sport": { "type": "integer", "description": "Source (local) port of the S1GW-MME connection" }, + "mme_daddr": { + "type": "string", + "description": "Destination (remote) address of the MME" + }, "mme_dport": { "type": "integer", "description": "Destination (remote) port of the S1GW-MME connection" diff --git a/src/enb_proxy.erl b/src/enb_proxy.erl index c76ac42..17296bd 100644 --- a/src/enb_proxy.erl +++ b/src/enb_proxy.erl @@ -60,12 +60,15 @@ -type conn_info() :: #{handler := pid(), enb_aid := gen_sctp:assoc_id(), - mme_aid => gen_sctp:assoc_id() - %% TODO: add mme_saddr / mme_sport + mme_aid => gen_sctp:assoc_id(), + mme_saddr => inet:ip_address(), + mme_sport => inet:port_number() }. -record(state, {enb_aid :: gen_sctp:assoc_id(), mme_aid :: undefined | gen_sctp:assoc_id(), + mme_saddr :: undefined | inet:ip_address(), + mme_sport :: undefined | inet:port_number(), enb_conn_info :: sctp_server:conn_info(), s1setup_req :: undefined | binary(), tried_mmes :: [mme_registry:mme_name()], @@ -117,6 +120,8 @@ {ok, Pid} = s1ap_proxy:start_link(self()), {ok, wait_s1setup_req, #state{enb_aid = maps:get(aid, EnbConnInfo), + mme_saddr = undefined, + mme_sport = undefined, enb_conn_info = EnbConnInfo, enb_handle = EnbHandle, tried_mmes = [], @@ -206,6 +211,8 @@ {next_state, ?FUNCTION_NAME, %% loop transition to enable state_timeout S#state{sock = Sock, mme_aid = undefined, + mme_saddr = undefined, + mme_sport = undefined, tried_mmes = [MmeName | TriedMMEs]}, [{state_timeout, 2_000, conn_est_timeout}]}; error -> @@ -241,12 +248,15 @@ MmeName = hd(S#state.tried_mmes), case ConnState of comm_up -> + {ok, {MmeLAddr, MmeLPort}} = inet:sockname(Socket), ?LOG_NOTICE("MME ~p: connection (id=~p, ~p:~p) established", [MmeName, Aid, MmeAddr, MmePort]), %% send the S1 SETUP REQUEST PDU to the MME sctp_send_from_enb(S#state.s1setup_req, S#state{mme_aid = Aid}), - {next_state, wait_s1setup_rsp, S#state{mme_aid = Aid}}; + {next_state, wait_s1setup_rsp, S#state{mme_aid = Aid, + mme_saddr = MmeLAddr, + mme_sport = MmeLPort}}; _ -> ?LOG_NOTICE("MME ~p: connection establishment failed: ~p", [MmeName, ConnState]), @@ -467,7 +477,9 @@ conn_info(S) -> Info = #{handler => S#state.handler, enb_aid => S#state.enb_aid, - mme_aid => S#state.mme_aid}, + mme_aid => S#state.mme_aid, + mme_saddr => S#state.mme_saddr, + mme_sport => S#state.mme_sport}, maps:filter(fun(_K, V) -> V =/= undefined end, Info). diff --git a/src/rest_server.erl b/src/rest_server.erl index 3b14b86..0107427 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -461,10 +461,16 @@ enb_item_add_mme_conn_info(M0, #{mme_conn_info := ConnInfo}) -> Pid = maps:get(handler, ConnInfo), ERABs = s1ap_proxy:fetch_erab_list(Pid), - %% TODO: mme_sport (source port) is not yet available in conn_info() - M0#{mme_sctp_aid => maps:get(mme_aid, ConnInfo), - erab_count => length(ERABs) - }; + M1 = M0#{erab_count => length(ERABs)}, + %% mme_aid/mme_saddr/mme_sport are only present once the MME SCTP + %% connection is fully established (comm_up); handle them together. + case maps:find(mme_aid, ConnInfo) of + {ok, Aid} -> + M1#{mme_sctp_aid => Aid, + mme_saddr => inet:ntoa(maps:get(mme_saddr, ConnInfo)), + mme_sport => maps:get(mme_sport, ConnInfo)}; + error -> M1 + end; enb_item_add_mme_conn_info(M0, _) -> M0. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42433?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: I15bbddf96ac7d5b6f9962a8d745db58fdec334e7 Gerrit-Change-Number: 42433 Gerrit-PatchSet: 5 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

[S] Change in ...osmo-s1gw[master]: doc/manuals: cli: shorten enb_list example table
by fixeria 21 Mar '26

21 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42439?usp=email ) Change subject: doc/manuals: cli: shorten enb_list example table ...................................................................... doc/manuals: cli: shorten enb_list example table The full enb_list table with all address columns is too wide to fit on a page and does not render well in PDF. Collapse the address columns with '...'; add a note that they are omitted for readability. Change-Id: I4e25233a3e77358060f1098e97907c93deab334b Related: OS#6671 --- M doc/manuals/chapters/cli.adoc 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/doc/manuals/chapters/cli.adoc b/doc/manuals/chapters/cli.adoc index 2daf0b4..cdf50a3 100644 --- a/doc/manuals/chapters/cli.adoc +++ b/doc/manuals/chapters/cli.adoc @@ -281,15 +281,15 @@ --reverse Reverse sort order ---- -Example: +Example (address columns omitted for readability): ---- OsmoS1GW# enb_list -| handle | PID | Global-eNB-ID | State | eNB saddr:sport (aid) | MME saddr:sport (aid) | MME daddr:dport (aid) | MME name | Uptime | E-RABs | -|----------|-----------|---------------|-----------|-------------------------|------------------------|-------------------------|----------|----------|----------| -| 0 | <0.699.0> | 001-01-0 | connected | 127.0.1.10:56767 (5706) | 127.0.2.1:34650 (5707) | 127.0.2.10:36412 (5707) | mme0 | 418 | 0 | -| 1 | <0.701.0> | 001-01-1 | connected | 127.0.1.10:54140 (5710) | 127.0.2.1:34651 (5711) | 127.0.2.10:36412 (5711) | mme0 | 33 | 3 | -| 2 | <0.703.0> | 001-01-2 | connected | 127.0.1.10:34076 (5714) | 127.0.2.1:34652 (5715) | 127.0.2.10:36412 (5715) | mme0 | 3600 | 20 | +| handle | PID | Global-eNB-ID | State | ... | MME name | Uptime | E-RABs | +|----------|-----------|---------------|-----------|~~~~~|----------|----------|----------| +| 0 | <0.699.0> | 001-01-0 | connected | ... | mme0 | 418 | 0 | +| 1 | <0.701.0> | 001-01-1 | connected | ... | mme0 | 33 | 3 | +| 2 | <0.703.0> | 001-01-2 | connected | ... | mme0 | 3600 | 20 | ---- ==== `enb_info` -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42439?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: I4e25233a3e77358060f1098e97907c93deab334b Gerrit-Change-Number: 42439 Gerrit-PatchSet: 5 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

2026

2025

2024

2023

2022

gerrit-log March 2026