December 2024 - gerrit-log - lists.osmocom.org

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: handle_ies(): pass IEI path to handle_ie()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39113?usp=email ) Change subject: s1ap_proxy: handle_ies(): pass IEI path to handle_ie() ...................................................................... s1ap_proxy: handle_ies(): pass IEI path to handle_ie() This patch prepares for a follow-up change adding E-RAB MODIFY REQ/RSP. We need to be able to match the IEs unambiguously, because the same IEI may be used in different contexts and thus have different meaning, sometimes within the same PDU. The E-RABItem IE is such an example: * 9.1.3.5 E-RAB RELEASE COMMAND ** contains an E-RABToBeReleasedList IE *** contains E-RABItem IEs * 9.1.3.7 E-RAB RELEASE INDICATION ** contains an E-RABReleasedList IE *** contains E-RABItem IEs So far we handled this duality by passing the release kind via the #proxy_state record ('rel_kind' field) and it worked. But soon in follow-up changes we'll have to deal with other PDUs: * 9.1.3.4 E-RAB MODIFY RESPONSE ** contains an E-RABModifyListBearerModRes IE ** may contain an E-RABFailedToModifyList IE *** contains E-RABItem IEs * 9.1.3.9 E-RAB MODIFICATION CONFIRM ** may contain an E-RABFailedToModifyList IE *** contains E-RABItem IEs ** may contain an E-RABToBeReleased IE *** contains E-RABItem IEs A universal approach allowing to match and handle IEs properly depending on the context is to maintain the full IEI path in handle_ies() and pass it to handle_ie(). Change-Id: I35528a91f7dbf321ad1a0811f1bbcdfb529d3530 --- M src/s1ap_proxy.erl 1 file changed, 59 insertions(+), 38 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index b0d174d..18b054b 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -71,7 +71,7 @@ -record(proxy_state, {erabs :: dict:dict(), mme_ue_id :: undefined | mme_ue_id(), enb_ue_id :: undefined | enb_ue_id(), - rel_kind :: undefined | cmd | ind + path :: [s1ap_ie_id()] }). -type proxy_state() :: #proxy_state{}. @@ -118,7 +118,8 @@ init([]) -> process_flag(trap_exit, true), - {ok, #proxy_state{erabs = dict:new()}}. + {ok, #proxy_state{erabs = dict:new(), + path = []}}. handle_call({process_pdu, OrigData}, _From, @@ -275,8 +276,7 @@ ?LOG_DEBUG("Processing E-RAB RELEASE COMMAND"), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_CMD), case handle_ies(?'id-E-RABToBeReleasedList', - C0#'E-RABReleaseCommand'.protocolIEs, - S0#proxy_state{rel_kind = cmd}) of + C0#'E-RABReleaseCommand'.protocolIEs, S0) of {{ok, IEs}, S1} -> C1 = C0#'E-RABReleaseCommand'{protocolIEs = IEs}, PDU = {Outcome, Msg#'InitiatingMessage'{value = C1}}, @@ -312,8 +312,7 @@ ?LOG_DEBUG("Processing E-RAB RELEASE INDICATION"), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_IND), case handle_ies(?'id-E-RABReleasedList', - C0#'E-RABReleaseIndication'.protocolIEs, - S0#proxy_state{rel_kind = ind}) of + C0#'E-RABReleaseIndication'.protocolIEs, S0) of {{ok, IEs}, S1} -> C1 = C0#'E-RABReleaseIndication'{protocolIEs = IEs}, PDU = {Outcome, Msg#'InitiatingMessage'{value = C1}}, @@ -392,19 +391,20 @@ %% Handle a single IE (Information Element) -type handle_ie_result() :: {ok, s1ap_ie_val()} | {error, term()}. --spec handle_ie(IEI, C, S) -> Result - when IEI :: s1ap_ie_id(), - C :: s1ap_ie_val(), - S :: proxy_state(), +-spec handle_ie(Path, Content, State) -> Result + when Path :: [s1ap_ie_id()], + Content :: s1ap_ie_val(), + State :: proxy_state(), Result :: {handle_ie_result(), proxy_state()}. %% E-RAB SETUP REQUEST related IEs -handle_ie(?'id-E-RABToBeSetupListBearerSUReq', C, S) -> +handle_ie([?'id-E-RABToBeSetupListBearerSUReq'], C, S) -> %% This IE contains a list of BearerSUReq, so patch inner IEs handle_ies(?'id-E-RABToBeSetupItemBearerSUReq', C, S); -handle_ie(?'id-E-RABToBeSetupItemBearerSUReq', +handle_ie([?'id-E-RABToBeSetupItemBearerSUReq', + ?'id-E-RABToBeSetupListBearerSUReq'], #'E-RABToBeSetupItemBearerSUReq'{'e-RAB-ID' = ERABId, 'transportLayerAddress' = TLA_In, 'gTP-TEID' = << TEID_In:32/big >>} = C0, S0) -> @@ -420,11 +420,12 @@ end; %% E-RAB SETUP RESPONSE related IEs -handle_ie(?'id-E-RABSetupListBearerSURes', C, S) -> +handle_ie([?'id-E-RABSetupListBearerSURes'], C, S) -> %% This IE contains a list of BearerSURes, so patch inner IEs handle_ies(?'id-E-RABSetupItemBearerSURes', C, S); -handle_ie(?'id-E-RABSetupItemBearerSURes', +handle_ie([?'id-E-RABSetupItemBearerSURes', + ?'id-E-RABSetupListBearerSURes'], #'E-RABSetupItemBearerSURes'{'e-RAB-ID' = ERABId, 'transportLayerAddress' = TLA_In, 'gTP-TEID' = << TEID_In:32/big >>} = C0, S) -> @@ -445,17 +446,17 @@ end; %% 9.1.3.5 E-RAB RELEASE COMMAND related IEs -handle_ie(?'id-E-RABToBeReleasedList', C, S) -> +handle_ie([?'id-E-RABToBeReleasedList'], C, S) -> %% This IE contains a list of E-RABItem handle_ies(?'id-E-RABItem', C, S); -handle_ie(?'id-E-RABItem', - #'E-RABItem'{'e-RAB-ID' = ERABId} = C, - #proxy_state{rel_kind = RelKind} = S) -> +handle_ie([?'id-E-RABItem', + ?'id-E-RABToBeReleasedList'], + #'E-RABItem'{'e-RAB-ID' = ERABId} = C, S) -> %% poke E-RAB FSM case erab_fsm_find(ERABId, S) of {ok, Pid} -> - ok = erab_fsm:erab_release(Pid, RelKind), + ok = erab_fsm:erab_release(Pid, cmd), {{ok, C}, S}; error -> ?LOG_ERROR("E-RAB ~p is not registered", [erab_uid(ERABId, S)]), @@ -463,11 +464,12 @@ end; %% 9.1.3.6 E-RAB RELEASE RESPONSE related IEs -handle_ie(?'id-E-RABReleaseListBearerRelComp', C, S) -> +handle_ie([?'id-E-RABReleaseListBearerRelComp'], C, S) -> %% This IE contains a list of E-RABReleaseItemBearerRelComp handle_ies(?'id-E-RABReleaseItemBearerRelComp', C, S); -handle_ie(?'id-E-RABReleaseItemBearerRelComp', +handle_ie([?'id-E-RABReleaseItemBearerRelComp', + ?'id-E-RABReleaseListBearerRelComp'], #'E-RABReleaseItemBearerRelComp'{'e-RAB-ID' = ERABId} = C, S) -> %% poke E-RAB FSM case erab_fsm_find(ERABId, S) of @@ -480,35 +482,51 @@ end; %% 9.1.3.7 E-RAB RELEASE INDICATION related IEs -handle_ie(?'id-E-RABReleasedList', C, S) -> +handle_ie([?'id-E-RABReleasedList'], C, S) -> %% This IE contains a list of E-RABItem handle_ies(?'id-E-RABItem', C, S); +handle_ie([?'id-E-RABItem', + ?'id-E-RABReleasedList'], + #'E-RABItem'{'e-RAB-ID' = ERABId} = C, S) -> + %% poke E-RAB FSM + case erab_fsm_find(ERABId, S) of + {ok, Pid} -> + ok = erab_fsm:erab_release(Pid, ind), + {{ok, C}, S}; + error -> + ?LOG_ERROR("E-RAB ~p is not registered", [erab_uid(ERABId, S)]), + {{error, erab_not_registered}, S} + end; + %% E-RAB MODIFICATION INDICATION related IEs -handle_ie(?'id-E-RABToBeModifiedListBearerModInd', C, S) -> +handle_ie([?'id-E-RABToBeModifiedListBearerModInd'], C, S) -> %% This IE contains a list of BearerModInd, so patch inner IEs handle_ies(?'id-E-RABToBeModifiedItemBearerModInd', C, S); -handle_ie(?'id-E-RABToBeModifiedItemBearerModInd', +handle_ie([?'id-E-RABToBeModifiedItemBearerModInd', + ?'id-E-RABToBeModifiedListBearerModInd'], #'E-RABToBeModifiedItemBearerModInd'{} = C, S) -> %% TODO: find and poke an E-RAB FSM associated with this E-RAB {{ok, C}, S}; -handle_ie(?'id-E-RABNotToBeModifiedListBearerModInd', C, S) -> +handle_ie([?'id-E-RABNotToBeModifiedListBearerModInd'], C, S) -> %% This IE contains a list of BearerModInd, so patch inner IEs handle_ies(?'id-E-RABNotToBeModifiedItemBearerModInd', C, S); -handle_ie(?'id-E-RABNotToBeModifiedItemBearerModInd', +handle_ie([?'id-E-RABNotToBeModifiedItemBearerModInd', + ?'id-E-RABNotToBeModifiedListBearerModInd'], #'E-RABNotToBeModifiedItemBearerModInd'{} = C, S) -> %% TODO: find and poke an E-RAB FSM associated with this E-RAB {{ok, C}, S}; %% INITIAL CONTEXT SETUP REQUEST related IEs -handle_ie(?'id-E-RABToBeSetupListCtxtSUReq', C, S) -> +handle_ie([?'id-E-RABToBeSetupListCtxtSUReq'], C, S) -> %% This IE contains a list of CtxtSUReq, so patch inner IEs handle_ies(?'id-E-RABToBeSetupItemCtxtSUReq', C, S); -handle_ie(?'id-E-RABToBeSetupItemCtxtSUReq', +handle_ie([?'id-E-RABToBeSetupItemCtxtSUReq', + ?'id-E-RABToBeSetupListCtxtSUReq'], #'E-RABToBeSetupItemCtxtSUReq'{'e-RAB-ID' = ERABId, 'transportLayerAddress' = TLA_In, 'gTP-TEID' = << TEID_In:32/big >>} = C0, S0) -> @@ -524,11 +542,12 @@ end; %% INITIAL CONTEXT SETUP RESPONSE related IEs -handle_ie(?'id-E-RABSetupListCtxtSURes', C, S) -> +handle_ie([?'id-E-RABSetupListCtxtSURes'], C, S) -> %% This IE contains a list of CtxtSURes, so patch inner IEs handle_ies(?'id-E-RABSetupItemCtxtSURes', C, S); -handle_ie(?'id-E-RABSetupItemCtxtSURes', +handle_ie([?'id-E-RABSetupItemCtxtSURes', + ?'id-E-RABSetupListCtxtSURes'], #'E-RABSetupItemCtxtSURes'{'e-RAB-ID' = ERABId, 'transportLayerAddress' = TLA_In, 'gTP-TEID' = << TEID_In:32/big >>} = C0, S) -> @@ -549,8 +568,8 @@ end; %% Catch-all variant, which should not be called normally -handle_ie(IEI, C, S) -> - ?LOG_ERROR("[BUG] Unhandled S1AP IE: ~p, ~p", [IEI, C]), +handle_ie(P, C, S) -> + ?LOG_ERROR("[BUG] Unhandled S1AP IE: ~p, ~p", [P, C]), {{error, unhandled_ie}, S}. @@ -559,13 +578,14 @@ %% Additionally look for {MME,eNB}-UE-S1AP-ID IEs and store their values. -type handle_ies_result() :: {ok, list()} | {error, term()}. -spec handle_ies(s1ap_ie_id(), list(), proxy_state()) -> {handle_ies_result(), proxy_state()}. -handle_ies(IEI, IEs, S) -> - handle_ies([], IEI, IEs, S). +handle_ies(IEI, IEs, #proxy_state{path = P} = S) -> + handle_ies([], IEI, IEs, S#proxy_state{path = [IEI | P]}). -handle_ies(Acc, IEI, [IE | IEs], S0) -> +handle_ies(Acc, IEI, [IE | IEs], + #proxy_state{path = P} = S0) -> case IE of #'ProtocolIE-Field'{id = IEI, value = C0} -> - case handle_ie(IEI, C0, S0) of + case handle_ie(P, C0, S0) of {{ok, C1}, S1} -> NewIE = IE#'ProtocolIE-Field'{value = C1}, handle_ies([NewIE | Acc], IEI, IEs, S1); @@ -582,9 +602,10 @@ handle_ies([IE | Acc], IEI, IEs, S0) end; -handle_ies(Acc, _IEI, [], S) -> +handle_ies(Acc, IEI, [], + #proxy_state{path = [IEI | P]} = S) -> IEs = lists:reverse(Acc), - {{ok, IEs}, S}. + {{ok, IEs}, S#proxy_state{path = P}}. build_erab_setup_response_failure(#proxy_state{erabs = ERABs, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39113?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: I35528a91f7dbf321ad1a0811f1bbcdfb529d3530 Gerrit-Change-Number: 39113 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>

6 months, 2 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: handle_ies(): also handle #'ProtocolExtensionField'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39114?usp=email ) Change subject: s1ap_proxy: handle_ies(): also handle #'ProtocolExtensionField' ...................................................................... s1ap_proxy: handle_ies(): also handle #'ProtocolExtensionField' This patch prepares for a follow-up change adding E-RAB MODIFY REQ/RSP, allowing to execute handle_ies() on a list of #'ProtocolExtensionField'. * 9.1.3.3 E-RAB MODIFY REQUEST ** contains an E-RABToBeModifiedListBearerModReq IE *** contains E-RABToBeModifiedItemBearerModReq IEs **** each may optionally contain TransportInformation IE ^^^^^^^^^^^^^^^^^^^^^^^ #'ProtocolExtensionField' Change-Id: Ic1ed2c4662e82bd739c35f9179eaaec20c3cad98 --- M src/s1ap_proxy.erl 1 file changed, 8 insertions(+), 0 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/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 18b054b..3414e79 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -592,6 +592,14 @@ {{error, Reason}, S1} -> {{error, Reason}, S1} end; + #'ProtocolExtensionField'{id = IEI, extensionValue = C0} -> + case handle_ie(P, C0, S0) of + {{ok, C1}, S1} -> + NewIE = IE#'ProtocolExtensionField'{extensionValue = C1}, + handle_ies([NewIE | Acc], IEI, IEs, S1); + {{error, Reason}, S1} -> + {{error, Reason}, S1} + end; #'ProtocolIE-Field'{id = ?'id-MME-UE-S1AP-ID', value = Id} -> S1 = S0#proxy_state{mme_ue_id = Id}, handle_ies([IE | Acc], IEI, IEs, S1); -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39114?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: Ic1ed2c4662e82bd739c35f9179eaaec20c3cad98 Gerrit-Change-Number: 39114 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>

6 months, 2 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: erab_fsm: store UID, expose it via fetch_info/1

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39115?usp=email ) Change subject: erab_fsm: store UID, expose it via fetch_info/1 ...................................................................... erab_fsm: store UID, expose it via fetch_info/1 Change-Id: I63fbd1d3d3531a74b35c09345cec094c30d19356 --- M src/erab_fsm.erl 1 file changed, 5 insertions(+), 2 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/erab_fsm.erl b/src/erab_fsm.erl index 2998c53..a479cea 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -75,7 +75,8 @@ -type rel_kind() :: cmd | ind. --record(erab_state, {from :: undefined | gen_statem:from(), %% destination to use when replying +-record(erab_state, {uid :: term(), %% unique E-RAB identifier + from :: undefined | gen_statem:from(), %% destination to use when replying u2c :: undefined | teid_addr(), %% GTP-U params for UPF -> Core c2u :: undefined | teid_addr(), %% GTP-U params for UPF <- Core a2u :: undefined | teid_addr(), %% GTP-U params for UPF <- Access @@ -167,7 +168,8 @@ %% request a unieue SEID for this E-RAB FSM {ok, SEID} = pfcp_peer:seid_alloc(), {ok, erab_wait_setup_req, - #erab_state{seid_loc = SEID}}. + #erab_state{uid = UID, + seid_loc = SEID}}. callback_mode() -> @@ -391,6 +393,7 @@ 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}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39115?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: I63fbd1d3d3531a74b35c09345cec094c30d19356 Gerrit-Change-Number: 39115 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>

6 months, 2 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: session_modify(): split PFCP PDU handling

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39124?usp=email ) Change subject: erab_fsm: session_modify(): split PFCP PDU handling ...................................................................... erab_fsm: session_modify(): split PFCP PDU handling This patch prepares for a follow-up change adding the MME-initiated E-RAB modification logic. Handle the successful modification scenario in a separate function, which will be extended further soon. Change-Id: I04fec627300fa9240e6b2bf22ff9ae08dd4c0f0d --- M src/erab_fsm.erl 1 file changed, 14 insertions(+), 15 deletions(-) Approvals: 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 Jenkins Builder: Verified diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index a479cea..b249cd4 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -277,24 +277,23 @@ {shutdown, timeout}, {reply, From, {error, {timeout, ?FUNCTION_NAME}}}}; -session_modify(info, #pfcp{} = PDU, +session_modify(info, #pfcp{type = session_modification_response, + seid = SEID_Rsp, %% matches F-SEID we sent in the ESTABLISH Req + ie = #{pfcp_cause := 'Request accepted'}}, #erab_state{from = From, seid_loc = SEID_Rsp, c2u = C2U} = S) -> - case PDU of - #pfcp{type = session_modification_response, - seid = SEID_Rsp, %% matches F-SEID we sent in the ESTABLISH Req - ie = #{pfcp_cause := 'Request accepted'}} -> - ?LOG_DEBUG("PFCP session modified"), - {next_state, erab_setup, - S#erab_state{from = undefined}, - [{reply, From, {ok, C2U}}]}; - _ -> - ?LOG_ERROR("Rx unexpected PFCP PDU: ~p", [PDU]), - {stop_and_reply, - {shutdown, unexp_pdu}, - {reply, From, {error, {unexp_pdu, ?FUNCTION_NAME}}}} - end; + ?LOG_DEBUG("PFCP session modified"), + {next_state, erab_setup, + S#erab_state{from = undefined}, + [{reply, From, {ok, C2U}}]}; + +session_modify(info, #pfcp{} = PDU, + #erab_state{from = From}) -> + ?LOG_ERROR("Rx unexpected PFCP PDU: ~p", [PDU]), + {stop_and_reply, + {shutdown, unexp_pdu}, + {reply, From, {error, {unexp_pdu, ?FUNCTION_NAME}}}}; session_modify(Event, EventData, S) -> handle_event(?FUNCTION_NAME, Event, EventData, S). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39124?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: I04fec627300fa9240e6b2bf22ff9ae08dd4c0f0d Gerrit-Change-Number: 39124 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>

6 months, 2 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: use erab_uid() to log unique E-RAB ID

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39109?usp=email ) Change subject: s1ap_proxy: use erab_uid() to log unique E-RAB ID ...................................................................... s1ap_proxy: use erab_uid() to log unique E-RAB ID Change-Id: I89d8bedcd6acc1d8cdd6f56bf36ffa3001f2c8c2 --- M src/s1ap_proxy.erl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index ec729d0..86c2bed 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -438,7 +438,7 @@ {{error, Reason}, S} end; error -> - ?LOG_ERROR("E-RAB-ID ~p is not registered", [ERABId]), + ?LOG_ERROR("E-RAB-ID ~p is not registered", [erab_uid(ERABId, S)]), {{error, erab_not_registered}, S} end; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39109?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: I89d8bedcd6acc1d8cdd6f56bf36ffa3001f2c8c2 Gerrit-Change-Number: 39109 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>

6 months, 2 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: add a TODO about an optional IE

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39110?usp=email ) Change subject: s1ap_proxy: add a TODO about an optional IE ...................................................................... s1ap_proxy: add a TODO about an optional IE Change-Id: I3980ae86a61e59af5cec8e7138062cc72a6cd130 --- M src/s1ap_proxy.erl 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 86c2bed..5cacb59 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -365,6 +365,7 @@ value = C0} = Msg}, S0) -> ?LOG_DEBUG("Processing INITIAL CONTEXT SETUP RESPONSE"), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_RSP), + %% TODO: handle optional E-RAB Failed to Setup List IE case handle_ies(C0#'InitialContextSetupResponse'.protocolIEs, ?'id-E-RABSetupListCtxtSURes', S0) of {{ok, IEs}, S1} -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39110?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: I3980ae86a61e59af5cec8e7138062cc72a6cd130 Gerrit-Change-Number: 39110 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>

6 months, 2 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: rework handle_ie/2 into handle_ie/3

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39111?usp=email ) Change subject: s1ap_proxy: rework handle_ie/2 into handle_ie/3 ...................................................................... s1ap_proxy: rework handle_ie/2 into handle_ie/3 This patch prepares for a follow-up change adding E-RAB MODIFY REQ/RSP. Instead of passing the whole record #'ProtocolIE-Field' to handle_ie(), pass the IEI ('id' field) and IE content ('value' field) as separate arguments. This split-up allows to pass the full IEI path to handle_ie() in a follow-up change, and also allows to expand some fields of the IE content right in the function header. Change-Id: Ic71c8c07739b0e354ca9c9b03c000a366d8c2c43 --- M src/s1ap_proxy.erl 1 file changed, 58 insertions(+), 67 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 5cacb59..4d78b29 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -60,7 +60,7 @@ -type s1ap_pdu() :: {initiatingMessage, #'InitiatingMessage'{}} | {successfulOutcome, #'SuccessfulOutcome'{}} | {unsuccessfulOutcome, #'UnsuccessfulOutcome'{}}. --type s1ap_ie() :: #'ProtocolIE-Field'{}. +-type s1ap_ie_id() :: non_neg_integer(). -type s1ap_ie_val() :: tuple(). -type mme_ue_id() :: 0..16#ffffffff. @@ -392,20 +392,23 @@ %% Handle a single IE (Information Element) -type handle_ie_result() :: {ok, s1ap_ie_val()} | {error, term()}. --spec handle_ie(s1ap_ie(), proxy_state()) -> {handle_ie_result(), proxy_state()}. +-spec handle_ie(IEI, C, S) -> Result + when IEI :: s1ap_ie_id(), + C :: s1ap_ie_val(), + S :: proxy_state(), + Result :: {handle_ie_result(), + proxy_state()}. %% E-RAB SETUP REQUEST related IEs -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupListBearerSUReq', - value = Content}, S) -> +handle_ie(?'id-E-RABToBeSetupListBearerSUReq', C, S) -> %% This IE contains a list of BearerSUReq, so patch inner IEs - handle_ies(Content, ?'id-E-RABToBeSetupItemBearerSUReq', S); + handle_ies(C, ?'id-E-RABToBeSetupItemBearerSUReq', S); -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupItemBearerSUReq', - value = C0}, S0) -> +handle_ie(?'id-E-RABToBeSetupItemBearerSUReq', + #'E-RABToBeSetupItemBearerSUReq'{'e-RAB-ID' = ERABId, + 'transportLayerAddress' = TLA_In, + 'gTP-TEID' = << TEID_In:32/big >>} = C0, S0) -> %% start and register an E-RAB FSM - #'E-RABToBeSetupItemBearerSUReq'{'e-RAB-ID' = ERABId, - 'transportLayerAddress' = TLA_In, - 'gTP-TEID' = << TEID_In:32/big >>} = C0, {Pid, S1} = erab_fsm_start_reg(ERABId, S0), case erab_fsm:erab_setup_req(Pid, {TEID_In, TLA_In}) of {ok, {TEID_Out, TLA_Out}} -> @@ -417,17 +420,15 @@ end; %% E-RAB SETUP RESPONSE related IEs -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupListBearerSURes', - value = Content}, S) -> +handle_ie(?'id-E-RABSetupListBearerSURes', C, S) -> %% This IE contains a list of BearerSURes, so patch inner IEs - handle_ies(Content, ?'id-E-RABSetupItemBearerSURes', S); + handle_ies(C, ?'id-E-RABSetupItemBearerSURes', S); -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupItemBearerSURes', - value = C0}, S) -> +handle_ie(?'id-E-RABSetupItemBearerSURes', + #'E-RABSetupItemBearerSURes'{'e-RAB-ID' = ERABId, + 'transportLayerAddress' = TLA_In, + 'gTP-TEID' = << TEID_In:32/big >>} = C0, S) -> %% poke E-RAB FSM - #'E-RABSetupItemBearerSURes'{'e-RAB-ID' = ERABId, - 'transportLayerAddress' = TLA_In, - 'gTP-TEID' = << TEID_In:32/big >>} = C0, case erab_fsm_find(ERABId, S) of {ok, Pid} -> case erab_fsm:erab_setup_rsp(Pid, {TEID_In, TLA_In}) of @@ -444,18 +445,17 @@ end; %% 9.1.3.5 E-RAB RELEASE COMMAND related IEs -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeReleasedList', - value = Content}, S) -> +handle_ie(?'id-E-RABToBeReleasedList', C, S) -> %% This IE contains a list of E-RABItem - handle_ies(Content, ?'id-E-RABItem', S); + handle_ies(C, ?'id-E-RABItem', S); -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABItem', - value = C}, S) -> +handle_ie(?'id-E-RABItem', + #'E-RABItem'{'e-RAB-ID' = ERABId} = C, + #proxy_state{rel_kind = RelKind} = S) -> %% poke E-RAB FSM - #'E-RABItem'{'e-RAB-ID' = ERABId} = C, case erab_fsm_find(ERABId, S) of {ok, Pid} -> - ok = erab_fsm:erab_release(Pid, S#proxy_state.rel_kind), + ok = erab_fsm:erab_release(Pid, RelKind), {{ok, C}, S}; error -> ?LOG_ERROR("E-RAB ~p is not registered", [erab_uid(ERABId, S)]), @@ -463,15 +463,13 @@ end; %% 9.1.3.6 E-RAB RELEASE RESPONSE related IEs -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABReleaseListBearerRelComp', - value = Content}, S) -> +handle_ie(?'id-E-RABReleaseListBearerRelComp', C, S) -> %% This IE contains a list of E-RABReleaseItemBearerRelComp - handle_ies(Content, ?'id-E-RABReleaseItemBearerRelComp', S); + handle_ies(C, ?'id-E-RABReleaseItemBearerRelComp', S); -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABReleaseItemBearerRelComp', - value = C}, S) -> +handle_ie(?'id-E-RABReleaseItemBearerRelComp', + #'E-RABReleaseItemBearerRelComp'{'e-RAB-ID' = ERABId} = C, S) -> %% poke E-RAB FSM - #'E-RABReleaseItemBearerRelComp'{'e-RAB-ID' = ERABId} = C, case erab_fsm_find(ERABId, S) of {ok, Pid} -> ok = erab_fsm:erab_release_rsp(Pid), @@ -482,44 +480,39 @@ end; %% 9.1.3.7 E-RAB RELEASE INDICATION related IEs -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABReleasedList', - value = Content}, S) -> +handle_ie(?'id-E-RABReleasedList', C, S) -> %% This IE contains a list of E-RABItem - handle_ies(Content, ?'id-E-RABItem', S); + handle_ies(C, ?'id-E-RABItem', S); %% E-RAB MODIFICATION INDICATION related IEs -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeModifiedListBearerModInd', - value = Content}, S) -> +handle_ie(?'id-E-RABToBeModifiedListBearerModInd', C, S) -> %% This IE contains a list of BearerModInd, so patch inner IEs - handle_ies(Content, ?'id-E-RABToBeModifiedItemBearerModInd', S); + handle_ies(C, ?'id-E-RABToBeModifiedItemBearerModInd', S); -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeModifiedItemBearerModInd', - value = C}, S) -> +handle_ie(?'id-E-RABToBeModifiedItemBearerModInd', + #'E-RABToBeModifiedItemBearerModInd'{} = C, S) -> %% TODO: find and poke an E-RAB FSM associated with this E-RAB {{ok, C}, S}; -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABNotToBeModifiedListBearerModInd', - value = Content}, S) -> +handle_ie(?'id-E-RABNotToBeModifiedListBearerModInd', C, S) -> %% This IE contains a list of BearerModInd, so patch inner IEs - handle_ies(Content, ?'id-E-RABNotToBeModifiedItemBearerModInd', S); + handle_ies(C, ?'id-E-RABNotToBeModifiedItemBearerModInd', S); -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABNotToBeModifiedItemBearerModInd', - value = C}, S) -> +handle_ie(?'id-E-RABNotToBeModifiedItemBearerModInd', + #'E-RABNotToBeModifiedItemBearerModInd'{} = C, S) -> %% TODO: find and poke an E-RAB FSM associated with this E-RAB {{ok, C}, S}; %% INITIAL CONTEXT SETUP REQUEST related IEs -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupListCtxtSUReq', - value = Content}, S) -> +handle_ie(?'id-E-RABToBeSetupListCtxtSUReq', C, S) -> %% This IE contains a list of CtxtSUReq, so patch inner IEs - handle_ies(Content, ?'id-E-RABToBeSetupItemCtxtSUReq', S); + handle_ies(C, ?'id-E-RABToBeSetupItemCtxtSUReq', S); -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupItemCtxtSUReq', - value = C0}, S0) -> +handle_ie(?'id-E-RABToBeSetupItemCtxtSUReq', + #'E-RABToBeSetupItemCtxtSUReq'{'e-RAB-ID' = ERABId, + 'transportLayerAddress' = TLA_In, + 'gTP-TEID' = << TEID_In:32/big >>} = C0, S0) -> %% start and register an E-RAB FSM - #'E-RABToBeSetupItemCtxtSUReq'{'e-RAB-ID' = ERABId, - 'transportLayerAddress' = TLA_In, - 'gTP-TEID' = << TEID_In:32/big >>} = C0, {Pid, S1} = erab_fsm_start_reg(ERABId, S0), case erab_fsm:erab_setup_req(Pid, {TEID_In, TLA_In}) of {ok, {TEID_Out, TLA_Out}} -> @@ -531,17 +524,15 @@ end; %% INITIAL CONTEXT SETUP RESPONSE related IEs -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupListCtxtSURes', - value = Content}, S) -> +handle_ie(?'id-E-RABSetupListCtxtSURes', C, S) -> %% This IE contains a list of CtxtSURes, so patch inner IEs - handle_ies(Content, ?'id-E-RABSetupItemCtxtSURes', S); + handle_ies(C, ?'id-E-RABSetupItemCtxtSURes', S); -handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupItemCtxtSURes', - value = C0}, S) -> +handle_ie(?'id-E-RABSetupItemCtxtSURes', + #'E-RABSetupItemCtxtSURes'{'e-RAB-ID' = ERABId, + 'transportLayerAddress' = TLA_In, + 'gTP-TEID' = << TEID_In:32/big >>} = C0, S) -> %% poke E-RAB FSM - #'E-RABSetupItemCtxtSURes'{'e-RAB-ID' = ERABId, - 'transportLayerAddress' = TLA_In, - 'gTP-TEID' = << TEID_In:32/big >>} = C0, case erab_fsm_find(ERABId, S) of {ok, Pid} -> case erab_fsm:erab_setup_rsp(Pid, {TEID_In, TLA_In}) of @@ -558,8 +549,8 @@ end; %% Catch-all variant, which should not be called normally -handle_ie(#'ProtocolIE-Field'{} = IE, S) -> - ?LOG_ERROR("[BUG] Unhandled S1AP IE: ~p", [IE]), +handle_ie(IEI, C, S) -> + ?LOG_ERROR("[BUG] Unhandled S1AP IE: ~p, ~p", [IEI, C]), {{error, unhandled_ie}, S}. @@ -567,16 +558,16 @@ %% calling function handle_ie/1 for IEs matching the given IEI. %% Additionally look for {MME,eNB}-UE-S1AP-ID IEs and store their values. -type handle_ies_result() :: {ok, list()} | {error, term()}. --spec handle_ies(list(), integer(), proxy_state()) -> {handle_ies_result(), proxy_state()}. +-spec handle_ies(list(), s1ap_ie_id(), proxy_state()) -> {handle_ies_result(), proxy_state()}. handle_ies(IEs, IEI, S) -> handle_ies([], IEs, IEI, S). handle_ies(Acc, [IE | IEs], IEI, S0) -> case IE of - #'ProtocolIE-Field'{id = IEI} -> - case handle_ie(IE, S0) of - {{ok, C}, S1} -> - NewIE = IE#'ProtocolIE-Field'{value = C}, + #'ProtocolIE-Field'{id = IEI, value = C0} -> + case handle_ie(IEI, C0, S0) of + {{ok, C1}, S1} -> + NewIE = IE#'ProtocolIE-Field'{value = C1}, handle_ies([NewIE | Acc], IEs, IEI, S1); {{error, Reason}, S1} -> {{error, Reason}, S1} -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39111?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: Ic71c8c07739b0e354ca9c9b03c000a366d8c2c43 Gerrit-Change-Number: 39111 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>

6 months, 2 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: session_modify(): split PFCP PDU handling

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39124?usp=email ) Change subject: erab_fsm: session_modify(): split PFCP PDU handling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39124?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: I04fec627300fa9240e6b2bf22ff9ae08dd4c0f0d Gerrit-Change-Number: 39124 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> Gerrit-Comment-Date: Fri, 13 Dec 2024 07:25:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: erab_fsm: store UID, expose it via fetch_info/1

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39115?usp=email ) Change subject: erab_fsm: store UID, expose it via fetch_info/1 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39115?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: I63fbd1d3d3531a74b35c09345cec094c30d19356 Gerrit-Change-Number: 39115 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Dec 2024 07:25:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: handle_ies(): also handle #'ProtocolExtensionField'

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39114?usp=email ) Change subject: s1ap_proxy: handle_ies(): also handle #'ProtocolExtensionField' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39114?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: Ic1ed2c4662e82bd739c35f9179eaaec20c3cad98 Gerrit-Change-Number: 39114 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Dec 2024 07:25:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024