- gerrit-log - lists.osmocom.org

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: handle UE CONTEXT RELEASE PDUs
by fixeria 07 Feb '25

07 Feb '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39463?usp=email ) Change subject: s1ap_proxy: handle UE CONTEXT RELEASE PDUs ...................................................................... s1ap_proxy: handle UE CONTEXT RELEASE PDUs On receipt of UE CONTEXT RELEASE PDUs, signal the release of all affected E-RAB FSMs with the matching {MME,eNB}-UE-S1AP-ID. Change-Id: Ic94489e3d3052221b49431da3a95e5c1eb0e0ba0 Related: osmo-ttcn3-hacks.git I065692f311e9d03630ab3ca2f6a03465418f0e71 Related: SYS#7310 --- M include/s1gw_metrics.hrl M src/s1ap_proxy.erl M src/s1gw_metrics.erl M test/s1ap_proxy_test.erl 4 files changed, 149 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/s1gw_metrics.hrl b/include/s1gw_metrics.hrl index 77d6a8e..c416b1b 100644 --- a/include/s1gw_metrics.hrl +++ b/include/s1gw_metrics.hrl @@ -24,6 +24,9 @@ -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_IND, [ctr, s1ap, proxy, in_pkt, erab_mod_ind]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_REQ, [ctr, s1ap, proxy, in_pkt, init_ctx_req]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_RSP, [ctr, s1ap, proxy, in_pkt, init_ctx_rsp]). +-define(S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_REQ, [ctr, s1ap, proxy, in_pkt, release_ctx_req]). +-define(S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_CMD, [ctr, s1ap, proxy, in_pkt, release_ctx_cmd]). +-define(S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_COMPL, [ctr, s1ap, proxy, in_pkt, release_ctx_compl]). -define(S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, [ctr, s1ap, proxy, out_pkt, forward, all]). -define(S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, [ctr, s1ap, proxy, out_pkt, forward, proc]). -define(S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, [ctr, s1ap, proxy, out_pkt, forward, unmodified]). diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index f04fb61..56e5dee 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -172,6 +172,28 @@ {MmeUeId, EnbUeId, ERABId}. +-spec erab_for_each(UID, Fun, ERABs) -> ok + when UID :: {mme_ue_id(), enb_ue_id()} | {mme_ue_id()}, + Fun :: fun((pid()) -> term()), + ERABs :: [{erab_uid(), pid()}]. +erab_for_each({MMEUEId, ENBUEId} = UID, Fun, + [{{MMEUEId, ENBUEId, _}, Pid} | ERABs]) -> + Fun(Pid), %% matched by a pair of {MME,eNB}-UE-S1AP-ID + erab_for_each(UID, Fun, ERABs); + +erab_for_each({MMEUEId} = UID, Fun, + [{{MMEUEId, _, _}, Pid} | ERABs]) -> + Fun(Pid), %% matched by an MME-UE-S1AP-ID + erab_for_each(UID, Fun, ERABs); + +erab_for_each(UID, Fun, + [_ERAB | ERABs]) -> + erab_for_each(UID, Fun, ERABs); + +erab_for_each(_UID, _Fun, []) -> + ok. + + %% Encode an S1AP PDU -spec encode_pdu(s1ap_pdu()) -> {ok, binary()} | {error, {asn1, tuple()}}. @@ -377,6 +399,66 @@ {forward, S1} %% XXX: forward as-is or drop? end; +%% 9.1.4.5 UE CONTEXT RELEASE REQUEST +handle_pdu({initiatingMessage, + #'InitiatingMessage'{procedureCode = ?'id-UEContextReleaseRequest', + value = #'UEContextReleaseRequest'{protocolIEs = IEs}}}, + #proxy_state{erabs = ERABs} = S) -> + ?LOG_DEBUG("Processing UE CONTEXT RELEASE REQUEST"), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_REQ), + %% fetch {MME,eNB}-UE-S1AP-ID values (mandatory IEs) + #'ProtocolIE-Field'{id = ?'id-MME-UE-S1AP-ID', + value = MMEUEId} = lists:nth(1, IEs), + #'ProtocolIE-Field'{id = ?'id-eNB-UE-S1AP-ID', + value = ENBUEId} = lists:nth(2, IEs), + %% poke E-RAB FSMs with the matching {MME,eNB}-UE-S1AP-ID + erab_for_each({MMEUEId, ENBUEId}, + fun erab_fsm:erab_release_ind/1, + dict:to_list(ERABs)), + {forward, S}; %% forward as-is, there's nothing to patch + +%% 9.1.4.6 UE CONTEXT RELEASE COMMAND +handle_pdu({initiatingMessage, + #'InitiatingMessage'{procedureCode = ?'id-UEContextRelease', + value = #'UEContextReleaseCommand'{protocolIEs = IEs}}}, + #proxy_state{erabs = ERABs} = S) -> + ?LOG_DEBUG("Processing UE CONTEXT RELEASE COMMAND"), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_CMD), + #'ProtocolIE-Field'{id = ?'id-UE-S1AP-IDs', + value = S1APIDs} = lists:nth(1, IEs), + case S1APIDs of + {'uE-S1AP-ID-pair', #'UE-S1AP-ID-pair'{'mME-UE-S1AP-ID' = MMEUEId, + 'eNB-UE-S1AP-ID' = ENBUEId}} -> + %% poke E-RAB FSMs with the matching {MME,eNB}-UE-S1AP-ID + erab_for_each({MMEUEId, ENBUEId}, + fun erab_fsm:erab_release_cmd/1, + dict:to_list(ERABs)); + {'mME-UE-S1AP-ID', MMEUEId} -> + %% poke E-RAB FSMs with the matching MME-UE-S1AP-ID + erab_for_each({MMEUEId}, + fun erab_fsm:erab_release_cmd/1, + dict:to_list(ERABs)) + end, + {forward, S}; %% forward as-is, there's nothing to patch + +%% 9.1.4.7 UE CONTEXT RELEASE COMPLETE +handle_pdu({successfulOutcome, + #'SuccessfulOutcome'{procedureCode = ?'id-UEContextRelease', + value = #'UEContextReleaseComplete'{protocolIEs = IEs}}}, + #proxy_state{erabs = ERABs} = S) -> + ?LOG_DEBUG("Processing UE CONTEXT RELEASE COMPLETE"), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_COMPL), + %% fetch {MME,eNB}-UE-S1AP-ID values (mandatory IEs) + #'ProtocolIE-Field'{id = ?'id-MME-UE-S1AP-ID', + value = MMEUEId} = lists:nth(1, IEs), + #'ProtocolIE-Field'{id = ?'id-eNB-UE-S1AP-ID', + value = ENBUEId} = lists:nth(2, IEs), + %% poke E-RAB FSMs with the matching {MME,eNB}-UE-S1AP-ID + erab_for_each({MMEUEId, ENBUEId}, + fun erab_fsm:erab_release_rsp/1, + dict:to_list(ERABs)), + {forward, S}; %% forward as-is, there's nothing to patch + %% TODO: 9.1.5.2 HANDOVER COMMAND :: (O) UL/DL Transport Layer Address %% TODO: 9.1.5.4 HANDOVER REQUEST :: (M) Transport Layer Address %% TODO: 9.1.5.5 HANDOVER REQUEST ACKNOWLEDGE :: (M) Transport Layer Address, diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index 55421e7..50cab10 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -75,6 +75,9 @@ ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_IND, %% E-RAB MODIFY.ind PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_REQ, %% INITIAL CONTEXT SETUP.req PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_RSP, %% INITIAL CONTEXT SETUP.rsp PDUs + ?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_REQ, %% UE CONTEXT RELEASE.req PDUs + ?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_CMD, %% UE CONTEXT RELEASE.cmd PDUs + ?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_COMPL, %% UE CONTEXT RELEASE.compl PDUs %% s1ap_proxy: OUTgoing PDU counters ?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, %% forwarded: total ?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, %% forwarded: processed diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 917b63e..ce9032e 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -45,7 +45,11 @@ {"E-RAB MODIFICATION INDICATION", ?TC(fun test_e_rab_modify_ind/1)}, {"INITIAL CONTEXT SETUP REQUEST/RESPONSE", - ?TC(fun test_initial_context_setup/1)}]. + ?TC(fun test_initial_context_setup/1)}, + {"UE CONTEXT RELEASE REQUEST", + ?TC(fun test_ue_ctx_release_req/1)}, + {"UE CONTEXT RELEASE COMMAND/COMPLETE", + ?TC(fun test_ue_ctx_release_cmd/1)}]. %% ------------------------------------------------------------------ @@ -139,6 +143,37 @@ ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. +test_ue_ctx_release_req(#{handler := Pid}) -> + %% [eNB <- MME] INITIAL CONTEXT SETUP REQUEST + InitCtxSetupReq = initial_context_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + %% [eNB -> MME] INITIAL CONTEXT SETUP RESPONSE + InitCtxSetupRsp = initial_context_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + %% [eNB -> MME] UE CONTEXT RELEASE REQUEST + UeCtxReleaseReq = ue_ctx_release_req_pdu(), + + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReq)), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupRsp)), + ?_assertEqual({forward, UeCtxReleaseReq}, s1ap_proxy:process_pdu(Pid, UeCtxReleaseReq)), + ?_assertMatch([], s1ap_proxy:fetch_erab_list(Pid))]. + + +test_ue_ctx_release_cmd(#{handler := Pid}) -> + %% [eNB <- MME] INITIAL CONTEXT SETUP REQUEST + InitCtxSetupReq = initial_context_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + %% [eNB -> MME] INITIAL CONTEXT SETUP RESPONSE + InitCtxSetupRsp = initial_context_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + %% [eNB <- MME] UE CONTEXT RELEASE COMMAND + UeCtxReleaseCmd = ue_ctx_release_cmd_pdu(), + %% [eNB -> MME] UE CONTEXT RELEASE COMPLETE + UeCtxReleaseCompl = ue_ctx_release_compl_pdu(), + + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReq)), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupRsp)), + ?_assertEqual({forward, UeCtxReleaseCmd}, s1ap_proxy:process_pdu(Pid, UeCtxReleaseCmd)), + ?_assertEqual({forward, UeCtxReleaseCompl}, s1ap_proxy:process_pdu(Pid, UeCtxReleaseCompl)), + ?_assertMatch([], s1ap_proxy:fetch_erab_list(Pid))]. + + %% ------------------------------------------------------------------ %% S1AP PDU templates %% ------------------------------------------------------------------ @@ -298,4 +333,29 @@ TEID:32/big %% GTP-TEID >>. + +%% [eNB -> MME] UE CONTEXT RELEASE REQUEST +ue_ctx_release_req_pdu() -> + << 16#00, 16#12, 16#40, 16#14, 16#00, 16#00, 16#03, 16#00, + 16#00, 16#00, 16#02, 16#00, 16#01, 16#00, 16#08, 16#00, + 16#02, 16#00, 16#01, 16#00, 16#02, 16#40, 16#01, 16#20 + >>. + + +%% [eNB <- MME] UE CONTEXT RELEASE COMMAND +ue_ctx_release_cmd_pdu() -> + << 16#00, 16#17, 16#00, 16#10, 16#00, 16#00, 16#02, 16#00, + 16#63, 16#00, 16#04, 16#00, 16#01, 16#00, 16#01, 16#00, + 16#02, 16#40, 16#01, 16#20 + >>. + + +%% [eNB -> MME] UE CONTEXT RELEASE COMPLETE +ue_ctx_release_compl_pdu() -> + << 16#20, 16#17, 16#00, 16#0f, 16#00, 16#00, 16#02, 16#00, + 16#00, 16#40, 16#02, 16#00, 16#01, 16#00, 16#08, 16#40, + 16#02, 16#00, 16#01 + >>. + + %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39463?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: Ic94489e3d3052221b49431da3a95e5c1eb0e0ba0 Gerrit-Change-Number: 39463 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: handle UE CONTEXT RELEASE PDUs
by fixeria 07 Feb '25

07 Feb '25

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39463?usp=email ) Change subject: s1ap_proxy: handle UE CONTEXT RELEASE PDUs ...................................................................... Patch Set 1: (1 comment) File include/s1gw_metrics.hrl: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39463/comment/048c1b47_2347… : PS1, Line 29: -define(S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_COMPL, [ctr, s1ap, proxy, in_pkt, release_ctx_cnf]). > RELEASE_CTX_COMPL vs release_ctx_cnf in the same line? Good catch, it should indeed be `release_ctx_compl`. Thanks! -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39463?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: Ic94489e3d3052221b49431da3a95e5c1eb0e0ba0 Gerrit-Change-Number: 39463 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Feb 2025 12:38:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: handle UE CONTEXT RELEASE PDUs
by pespin 07 Feb '25

07 Feb '25

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39463?usp=email ) Change subject: s1ap_proxy: handle UE CONTEXT RELEASE PDUs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39463?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: Ic94489e3d3052221b49431da3a95e5c1eb0e0ba0 Gerrit-Change-Number: 39463 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Feb 2025 12:38:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: handle UE CONTEXT RELEASE PDUs
by fixeria 07 Feb '25

07 Feb '25

Attention is currently required from: fixeria, laforge, osmith, pespin. Hello Jenkins Builder, laforge, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39463?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: s1ap_proxy: handle UE CONTEXT RELEASE PDUs ...................................................................... s1ap_proxy: handle UE CONTEXT RELEASE PDUs On receipt of UE CONTEXT RELEASE PDUs, signal the release of all affected E-RAB FSMs with the matching {MME,eNB}-UE-S1AP-ID. Change-Id: Ic94489e3d3052221b49431da3a95e5c1eb0e0ba0 Related: osmo-ttcn3-hacks.git I065692f311e9d03630ab3ca2f6a03465418f0e71 Related: SYS#7310 --- M include/s1gw_metrics.hrl M src/s1ap_proxy.erl M src/s1gw_metrics.erl M test/s1ap_proxy_test.erl 4 files changed, 149 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/63/39463/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39463?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic94489e3d3052221b49431da3a95e5c1eb0e0ba0 Gerrit-Change-Number: 39463 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: rebar.config: remove unneeded parse_transform
by fixeria 07 Feb '25

07 Feb '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39426?usp=email ) Change subject: rebar.config: remove unneeded parse_transform ...................................................................... rebar.config: remove unneeded parse_transform We don't use parse_transform, so let's remove it from the erl_opts. It was most likely copy-pasted from another project (see d3982ba). Change-Id: I87e1f6c3ed2b79201a67a0727ff3b80e42194d91 --- M rebar.config 1 file changed, 1 insertion(+), 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/rebar.config b/rebar.config index 86315ce..e124ac4 100644 --- a/rebar.config +++ b/rebar.config @@ -1,6 +1,6 @@ %% -*- erlang -*- -{erl_opts, [debug_info, {parse_transform}]}. +{erl_opts, [debug_info]}. {minimum_otp_vsn, "25.2.3"}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39426?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: I87e1f6c3ed2b79201a67a0727ff3b80e42194d91 Gerrit-Change-Number: 39426 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: add pretty printer for F-TEID
by fixeria 07 Feb '25

07 Feb '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39427?usp=email ) Change subject: erab_fsm: add pretty printer for F-TEID ...................................................................... erab_fsm: add pretty printer for F-TEID This patch makes log messages like this one: Rx E-RAB SETUP Req (U2C {1454164620,<<"\n?-?">>}) a lot more readable: Rx E-RAB SETUP Req (U2C 0x56acca8c(a)10.199.45.249) Change-Id: I8c47abffd554a23e22ae8fd768c390c549334fd3 --- M src/erab_fsm.erl 1 file changed, 25 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index ea1c11b..e2f86c5 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -184,7 +184,7 @@ erab_wait_setup_req({call, From}, {erab_setup_req, U2C}, #erab_state{} = S) -> - ?LOG_DEBUG("Rx E-RAB SETUP Req (U2C ~p)", [U2C]), + ?LOG_DEBUG("Rx E-RAB SETUP Req (U2C ~s)", [pp(U2C)]), {next_state, session_establish, S#erab_state{from = From, u2c = U2C}}; @@ -225,7 +225,7 @@ #{f_teid := F_TEID_A2U}]}} -> C2U = {F_TEID_C2U#f_teid.teid, f_teid_addr(F_TEID_C2U)}, A2U = {F_TEID_A2U#f_teid.teid, f_teid_addr(F_TEID_A2U)}, - ?LOG_DEBUG("PFCP session established (C2U ~p, A2U ~p)", [C2U, A2U]), + ?LOG_DEBUG("PFCP session established (C2U ~s, A2U ~s)", [pp(C2U), pp(A2U)]), {next_state, erab_wait_setup_rsp, S#erab_state{from = undefined, seid_rem = F_SEID, %% SEID to be used in further requests from us @@ -255,7 +255,7 @@ erab_wait_setup_rsp({call, From}, {erab_setup_rsp, U2A}, #erab_state{} = S) -> - ?LOG_DEBUG("Rx E-RAB SETUP Rsp (U2A ~p)", [U2A]), + ?LOG_DEBUG("Rx E-RAB SETUP Rsp (U2A ~s)", [pp(U2A)]), {next_state, session_modify, S#erab_state{from = From, u2a = U2A}}; @@ -530,4 +530,26 @@ f_teid_addr(#f_teid{}) -> erlang:error("F-TEID IE contains no IPv4/IPv6"). + +%% universal pretty printer +-spec pp(teid_addr() | any()) -> string(). +pp({TEID, << IPv4:4/bytes >>}) -> + pp_f_teid({TEID, IPv4}); + +pp({TEID, << IPv6:16/bytes >>}) -> + pp_f_teid({TEID, IPv6}); + +pp(Arg) -> + Str = io_lib:format("~p", [Arg]), + lists:flatten(Str). + + +%% pretty printer for F-TEID (example: 0x00000001(a)127.0.0.1) +-spec pp_f_teid(teid_addr()) -> string(). +pp_f_teid({TEID, AddrBin}) -> + Addr = list_to_tuple(binary_to_list(AddrBin)), + Str = io_lib:format("0x~8.16.0b@~s", [TEID, inet:ntoa(Addr)]), + lists:flatten(Str). + + %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39427?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: I8c47abffd554a23e22ae8fd768c390c549334fd3 Gerrit-Change-Number: 39427 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

[S] Change in ...osmo-s1gw[master]: Add GSMTAP logging handler
by pespin 07 Feb '25

07 Feb '25

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39415?usp=email ) Change subject: Add GSMTAP logging handler ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39415?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: Iea884e2ca146b852c64bd9f135d8c71f4c925f09 Gerrit-Change-Number: 39415 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Feb 2025 12:35:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: rebar.config: relx: generate the version automatically
by pespin 07 Feb '25

07 Feb '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39493?usp=email ) Change subject: rebar.config: relx: generate the version automatically ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39493?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: I7a4ed74416d4eef3c3befc0605d1857e147324e7 Gerrit-Change-Number: 39493 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Feb 2025 12:35:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: rebar.config: relx: fix release name (must be an atom)
by pespin 07 Feb '25

07 Feb '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39492?usp=email ) Change subject: rebar.config: relx: fix release name (must be an atom) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39492?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: Ic788ebb1c78c890939bd8dfd9bc34b06fe5c26fd Gerrit-Change-Number: 39492 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Feb 2025 12:35:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: rebar.config: cosmetic: use spaces, not tabs
by pespin 07 Feb '25

07 Feb '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39491?usp=email ) Change subject: rebar.config: cosmetic: use spaces, not tabs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39491?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: Ia6a026b51a0219353b1e898d9fc643381e985dc7 Gerrit-Change-Number: 39491 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Feb 2025 12:35:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log