- gerrit-log - lists.osmocom.org

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

12 Sep '25

laforge has submitted this change. ( 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(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve 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: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I966f4a53b8eca6763ca30bae0bbb9e025e6a2c4f Gerrit-Change-Number: 41033 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>

1 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: make fetch_info/1 return a map
by laforge 12 Sep '25

12 Sep '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40906?usp=email ) Change subject: erab_fsm: make fetch_info/1 return a map ...................................................................... erab_fsm: make fetch_info/1 return a map Maps are a lot easier to work with and have better type hints. Change-Id: I83999fa9346d19260cb44e0bb6a36b7ee1c12ce1 --- M src/erab_fsm.erl M src/s1ap_proxy.erl M test/erab_fsm_test.erl 3 files changed, 26 insertions(+), 15 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index cd4fa27..f5d8efe 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -103,6 +103,17 @@ -type iface() :: 'Core' | 'Access'. -type pfcp_ie() :: map(). +-type erab_info() :: #{uid := term(), + state := atom(), + f_teid_u2c => teid_addr(), + f_teid_c2u => teid_addr(), + f_teid_a2u => teid_addr(), + f_teid_u2a => teid_addr(), + seid_loc := pfcp_peer:pfcp_seid(), + seid_rem => pfcp_peer:pfcp_seid()}. + +-export_type([erab_info/0]). + %% ------------------------------------------------------------------ %% public API @@ -205,7 +216,7 @@ gen_statem:cast(Pid, ?FUNCTION_NAME). --spec fetch_info(pid()) -> proplists:proplist(). +-spec fetch_info(pid()) -> erab_info(). fetch_info(Pid) -> gen_statem:call(Pid, ?FUNCTION_NAME). @@ -542,16 +553,16 @@ %% Event handler for all states handle_event(State, {call, From}, fetch_info, #erab_state{} = S) -> - Info = [{state, State}, - {uid, S#erab_state.uid}, - {f_teid_u2c, S#erab_state.u2c}, - {f_teid_c2u, S#erab_state.c2u}, - {f_teid_a2u, S#erab_state.a2u}, - {f_teid_u2a, S#erab_state.u2a}, - {seid_loc, S#erab_state.seid_loc}, - {seid_rem, S#erab_state.seid_rem}], - %% omit props with Value =:= undefined - Reply = lists:filter(fun({_, V}) -> V =/= undefined end, Info), + Info = #{state => State, + uid => S#erab_state.uid, + f_teid_u2c => S#erab_state.u2c, + f_teid_c2u => S#erab_state.c2u, + f_teid_a2u => S#erab_state.a2u, + f_teid_u2a => S#erab_state.u2a, + seid_loc => S#erab_state.seid_loc, + seid_rem => S#erab_state.seid_rem}, + %% omit fields with Value =:= undefined + Reply = maps:filter(fun(_K, V) -> V =/= undefined end, Info), {keep_state_and_data, {reply, From, Reply}}; handle_event(State, {call, From}, EventData, _S) -> diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index fd51b2c..658f08c 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -967,12 +967,12 @@ {ok, Pid} -> %% Ignore F-TEID in the original message, just replace it with C2U F-TEID Info = erab_fsm:fetch_info(Pid), - case proplists:get_value(f_teid_c2u, Info) of - {TEID, TLA} -> + case maps:find(f_teid_c2u, Info) of + {ok, {TEID, TLA}} -> C1 = C0#'E-RABNotToBeModifiedItemBearerModInd'{'transportLayerAddress' = TLA, 'dL-GTP-TEID' = << TEID:32/big >>}, {{ok, C1}, S}; - undefined -> + error -> ?LOG_ERROR("E-RAB-ID ~p :: missing C2U F-TEID", [erab_uid(ERABId, S)]), {{error, missing_f_teid}, S} end; diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index a3dfb4d..e49d5cc 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -35,7 +35,7 @@ erab_fsm_info(Pid, Key) -> Info = erab_fsm:fetch_info(Pid), - proplists:get_value(Key, Info). + maps:get(Key, Info). %% ------------------------------------------------------------------ -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40906?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: I83999fa9346d19260cb44e0bb6a36b7ee1c12ce1 Gerrit-Change-Number: 40906 Gerrit-PatchSet: 3 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>

1 0

[S] Change in ...osmo-s1gw[master]: pfcp_peer: add fetch_info/0
by laforge 12 Sep '25

12 Sep '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40902?usp=email ) Change subject: pfcp_peer: add fetch_info/0 ...................................................................... pfcp_peer: add fetch_info/0 This is useful for introspection and the upcoming REST interface. Change-Id: I3fdcf7f6daac09a8c523826995a610c04f5a327b --- M src/pfcp_peer.erl 1 file changed, 26 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index efcf0d0..f6e9c7d 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -48,6 +48,7 @@ session_establish_req/3, session_modify_req/3, session_delete_req/1, + fetch_info/0, shutdown/0]). -include_lib("kernel/include/logger.hrl"). @@ -69,7 +70,14 @@ -type pfcp_msg() :: {pfcp_msg_type(), pfcp_ies()}. -type pfcp_pdu() :: #pfcp{}. --export_type([pfcp_session_rsp/0, +-type peer_info() :: #{state := atom(), + laddr := inet:ip_address(), + raddr := inet:ip_address(), + lrts := pos_integer(), + rrts => pos_integer()}. + +-export_type([peer_info/0, + pfcp_session_rsp/0, pfcp_msg_type/0, pfcp_seq_nr/0, pfcp_seid/0, @@ -139,6 +147,11 @@ gen_statem:call(?MODULE, {?FUNCTION_NAME, SEID}). +-spec fetch_info() -> peer_info(). +fetch_info() -> + gen_statem:call(?MODULE, ?FUNCTION_NAME). + + shutdown() -> gen_statem:stop(?MODULE). @@ -338,6 +351,18 @@ S1 = registry_del({Pid, Ref}, S0), {keep_state, S1}; +handle_event(State, + {call, From}, fetch_info, + #peer_state{} = S) -> + Info = #{state => State, + laddr => S#peer_state.loc_addr, + raddr => S#peer_state.rem_addr, + lrts => S#peer_state.loc_rts, + rrts => S#peer_state.rem_rts}, + %% omit props with Value =:= undefined + Reply = maps:filter(fun(_K, V) -> V =/= undefined end, Info), + {keep_state_and_data, {reply, From, Reply}}; + handle_event(State, Event, EventData, S) -> ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), {keep_state, S}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40902?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: I3fdcf7f6daac09a8c523826995a610c04f5a327b Gerrit-Change-Number: 40902 Gerrit-PatchSet: 3 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>

1 0

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

12 Sep '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40907?usp=email ) Change subject: s1gw_metrics: export metric types ...................................................................... s1gw_metrics: export metric types Change-Id: I57f0a8bbc83ec4732742ec16fe09abd2aea8127b --- M src/s1gw_metrics.erl 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: 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 Jenkins Builder: Verified diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index 8a74774..7ca3352 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -108,6 +108,10 @@ -type gauge() :: [gauge | _]. -type metric() :: counter() | gauge(). +-export_type([metric/0, + counter/0, + gauge/0]). + -spec register_all(Type, List) -> Result when Type :: exometer:type(), -- 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: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I57f0a8bbc83ec4732742ec16fe09abd2aea8127b Gerrit-Change-Number: 40907 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 type spec for the eNB-ID
by laforge 12 Sep '25

12 Sep '25

laforge has submitted this change. ( 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(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 23e8c1d..fd51b2c 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: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ieee55256f1b90a6cf498faedcf11f15da1423c4d Gerrit-Change-Number: 41031 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>

1 0

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

12 Sep '25

laforge has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index c0ada57..97e01b6 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -379,6 +379,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))]. @@ -392,6 +393,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: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8e9ffc22be3bc352a8d3022b1c7b0c50699ff493 Gerrit-Change-Number: 41032 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>

1 0

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

12 Sep '25

laforge has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 0046167..23e8c1d 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: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I79fcb599274c78d8f58e6c774a4f8c64c2fb08b5 Gerrit-Change-Number: 41030 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>

1 0

[S] Change in ...osmo-s1gw[master]: sctp_proxy: fix non-existent fields in fetch_info/0
by laforge 12 Sep '25

12 Sep '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40903?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: sctp_proxy: fix non-existent fields in fetch_info/0 ...................................................................... sctp_proxy: fix non-existent fields in fetch_info/0 The mme_addr and mme_port have been moved into the conn_cfg sub-map. Change-Id: I386a0268d5e465cbd5ad7ee02ed768425e6ec17f Fixes: 1221b6d ("sctp_{client,server}: accept arguments in form of a map") --- M src/sctp_proxy.erl 1 file changed, 7 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index e8460a4..badadcd 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -205,10 +205,13 @@ %% Event handler for all states handle_event(State, {call, From}, fetch_info, - #{handler := Pid} = S0) -> - ERABs = s1ap_proxy:fetch_erab_list(Pid), - S1 = maps:with([enb_aid, mme_aid, mme_addr, mme_port], S0), - S2 = S1#{state => State, erab_list => ERABs}, + #{handler := Pid, conn_cfg := ConnCfg} = S0) -> + ERABs = s1ap_proxy:fetch_erab_list(Pid), %% TODO: separate API + S1 = maps:with([enb_aid, mme_aid], S0), + S2 = S1#{state => State, + erab_list => ERABs, + mme_addr => maps:get(raddr, ConnCfg), + mme_port => maps:get(rport, ConnCfg)}, Reply = proplists:from_map(S2), {keep_state_and_data, {reply, From, Reply}}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40903?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: I386a0268d5e465cbd5ad7ee02ed768425e6ec17f Gerrit-Change-Number: 40903 Gerrit-PatchSet: 3 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>

1 0

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

12 Sep '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40904?usp=email ) Change subject: sctp_proxy: return handler Pid in fetch_info/0 ...................................................................... sctp_proxy: return handler Pid in fetch_info/0 Instead of returning the E-RAB list, give the caller access to the associated s1ap_proxy process by returning its Pid. This allows the caller to use API provided by the s1ap_proxy directly. Change-Id: I3911bfc107fea3ca572cf44f1d93b768b3c82b4f --- M src/sctp_proxy.erl 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index badadcd..b9258c3 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -206,10 +206,9 @@ %% Event handler for all states handle_event(State, {call, From}, fetch_info, #{handler := Pid, conn_cfg := ConnCfg} = S0) -> - ERABs = s1ap_proxy:fetch_erab_list(Pid), %% TODO: separate API S1 = maps:with([enb_aid, mme_aid], S0), S2 = S1#{state => State, - erab_list => ERABs, + handler => Pid, mme_addr => maps:get(raddr, ConnCfg), mme_port => maps:get(rport, ConnCfg)}, Reply = proplists:from_map(S2), -- 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: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I3911bfc107fea3ca572cf44f1d93b768b3c82b4f Gerrit-Change-Number: 40904 Gerrit-PatchSet: 3 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>

1 0

[S] Change in ...osmo-s1gw[master]: pfcp_peer: add fetch_info/0
by laforge 12 Sep '25

12 Sep '25

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40902?usp=email ) Change subject: pfcp_peer: add fetch_info/0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40902?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: I3fdcf7f6daac09a8c523826995a610c04f5a327b Gerrit-Change-Number: 40902 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 12 Sep 2025 11:57:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log