September 2025 - gerrit-log - lists.osmocom.org

[S] Change in ...osmo-s1gw[master]: sctp_proxy: fix non-existent fields in fetch_info/0

by laforge

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 week, 3 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: add fetch_enb_info/1

by laforge

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 week, 3 days

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy_test: do more s1ap_proxy:fetch_erab/2

by laforge

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 week, 3 days

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: add type spec for the eNB-ID

by laforge

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 week, 3 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: pfcp_peer: add fetch_info/0

by laforge

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 week, 3 days

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: {gtpu_kpi,pfcp_peer}: do not set trap_exit

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41033?usp=email ) Change subject: {gtpu_kpi,pfcp_peer}: do not set trap_exit ...................................................................... Patch Set 1: Code-Review+2 -- 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: comment 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> 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:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 3 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: make fetch_info/1 return a map

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40906?usp=email ) Change subject: erab_fsm: make fetch_info/1 return a map ...................................................................... Patch Set 2: Code-Review+2 -- 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: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I83999fa9346d19260cb44e0bb6a36b7ee1c12ce1 Gerrit-Change-Number: 40906 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:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 3 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_proxy: make fetch_info/1 return a map

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40905?usp=email ) Change subject: sctp_proxy: make fetch_info/1 return a map ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40905?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: I24029faa7e44efe34599b46fae731c801ff6191d Gerrit-Change-Number: 40905 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:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 3 days

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: sctp_proxy: return handler Pid in fetch_info/0

by laforge

Attention is currently required from: fixeria. laforge 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: Code-Review+2 -- 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 12 Sep 2025 11:57:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 3 days

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy_test: do more s1ap_proxy:fetch_erab/2

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41032?usp=email ) Change subject: s1ap_proxy_test: do more s1ap_proxy:fetch_erab/2 ...................................................................... Patch Set 1: Code-Review+2 -- 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: comment 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> 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:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 3 days

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2025