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

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

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39109?usp=email ) Change subject: s1ap_proxy: use erab_uid() to log unique E-RAB ID ...................................................................... Patch Set 1: Code-Review+1 -- 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: comment 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 20:49:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

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 pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39111?usp=email ) Change subject: s1ap_proxy: rework handle_ie/2 into handle_ie/3 ...................................................................... Patch Set 1: Code-Review+1 -- 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: comment 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 20:49:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: handle_ies(): reorder arguments

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39112?usp=email ) Change subject: s1ap_proxy: handle_ies(): reorder arguments ...................................................................... s1ap_proxy: handle_ies(): reorder arguments This patch prepares for a follow-up change adding E-RAB MODIFY REQ/RSP. It's common for many Erlang's built-in functions to have the Key argument first (e.g. dict:store/3, dict:take/2, proplists:lookup/2, proplists:delete/2), and also makes handle_ies() consistent with handle_ie(). Change-Id: Ic9c7257bef290a7f0c2546d4c1ca3b9d4aed20d2 --- M src/s1ap_proxy.erl 1 file changed, 34 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/12/39112/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 4d78b29..b0d174d 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -234,8 +234,8 @@ value = C0} = Msg}, S0) -> ?LOG_DEBUG("Processing E-RAB SETUP REQUEST"), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ), - case handle_ies(C0#'E-RABSetupRequest'.protocolIEs, - ?'id-E-RABToBeSetupListBearerSUReq', S0) of + case handle_ies(?'id-E-RABToBeSetupListBearerSUReq', + C0#'E-RABSetupRequest'.protocolIEs, S0) of {{ok, IEs}, S1} -> C1 = C0#'E-RABSetupRequest'{protocolIEs = IEs}, PDU = {Outcome, Msg#'InitiatingMessage'{value = C1}}, @@ -254,8 +254,8 @@ value = C0} = Msg}, S0) -> ?LOG_DEBUG("Processing E-RAB SETUP RESPONSE"), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_RSP), - case handle_ies(C0#'E-RABSetupResponse'.protocolIEs, - ?'id-E-RABSetupListBearerSURes', S0) of + case handle_ies(?'id-E-RABSetupListBearerSURes', + C0#'E-RABSetupResponse'.protocolIEs, S0) of {{ok, IEs}, S1} -> C1 = C0#'E-RABSetupResponse'{protocolIEs = IEs}, PDU = {Outcome, Msg#'SuccessfulOutcome'{value = C1}}, @@ -274,8 +274,8 @@ value = C0} = Msg}, S0) -> ?LOG_DEBUG("Processing E-RAB RELEASE COMMAND"), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_CMD), - case handle_ies(C0#'E-RABReleaseCommand'.protocolIEs, - ?'id-E-RABToBeReleasedList', + case handle_ies(?'id-E-RABToBeReleasedList', + C0#'E-RABReleaseCommand'.protocolIEs, S0#proxy_state{rel_kind = cmd}) of {{ok, IEs}, S1} -> C1 = C0#'E-RABReleaseCommand'{protocolIEs = IEs}, @@ -293,8 +293,8 @@ value = C0} = Msg}, S0) -> ?LOG_DEBUG("Processing E-RAB RELEASE RESPONSE"), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_RSP), - case handle_ies(C0#'E-RABReleaseResponse'.protocolIEs, - ?'id-E-RABReleaseListBearerRelComp', S0) of + case handle_ies(?'id-E-RABReleaseListBearerRelComp', + C0#'E-RABReleaseResponse'.protocolIEs, S0) of {{ok, IEs}, S1} -> C1 = C0#'E-RABReleaseResponse'{protocolIEs = IEs}, PDU = {Outcome, Msg#'SuccessfulOutcome'{value = C1}}, @@ -311,8 +311,8 @@ value = C0} = Msg}, S0) -> ?LOG_DEBUG("Processing E-RAB RELEASE INDICATION"), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_IND), - case handle_ies(C0#'E-RABReleaseIndication'.protocolIEs, - ?'id-E-RABReleasedList', + case handle_ies(?'id-E-RABReleasedList', + C0#'E-RABReleaseIndication'.protocolIEs, S0#proxy_state{rel_kind = ind}) of {{ok, IEs}, S1} -> C1 = C0#'E-RABReleaseIndication'{protocolIEs = IEs}, @@ -333,10 +333,10 @@ IEs0 = C0#'E-RABModificationIndication'.protocolIEs, %% E-RAB to be Modified List %% TODO: handle {error, Reason} - {{ok, IEs1}, S1} = handle_ies(IEs0, ?'id-E-RABToBeModifiedListBearerModInd', S0), + {{ok, IEs1}, S1} = handle_ies(?'id-E-RABToBeModifiedListBearerModInd', IEs0, S0), %% E-RAB not to be Modified List %% TODO: handle {error, Reason} - {{ok, IEs2}, S2} = handle_ies(IEs1, ?'id-E-RABNotToBeModifiedListBearerModInd', S1), + {{ok, IEs2}, S2} = handle_ies(?'id-E-RABNotToBeModifiedListBearerModInd', IEs1, S1), C1 = C0#'E-RABModificationIndication'{protocolIEs = IEs2}, PDU = {Outcome, Msg#'InitiatingMessage'{value = C1}}, {{forward, PDU}, S2}; @@ -347,8 +347,8 @@ value = C0} = Msg}, S0) -> ?LOG_DEBUG("Processing INITIAL CONTEXT SETUP REQUEST"), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_REQ), - case handle_ies(C0#'InitialContextSetupRequest'.protocolIEs, - ?'id-E-RABToBeSetupListCtxtSUReq', S0) of + case handle_ies(?'id-E-RABToBeSetupListCtxtSUReq', + C0#'InitialContextSetupRequest'.protocolIEs, S0) of {{ok, IEs}, S1} -> C1 = C0#'InitialContextSetupRequest'{protocolIEs = IEs}, PDU = {Outcome, Msg#'InitiatingMessage'{value = C1}}, @@ -366,8 +366,8 @@ ?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 + case handle_ies(?'id-E-RABSetupListCtxtSURes', + C0#'InitialContextSetupResponse'.protocolIEs, S0) of {{ok, IEs}, S1} -> C1 = C0#'InitialContextSetupResponse'{protocolIEs = IEs}, PDU = {Outcome, Msg#'SuccessfulOutcome'{value = C1}}, @@ -402,7 +402,7 @@ %% E-RAB SETUP REQUEST related IEs handle_ie(?'id-E-RABToBeSetupListBearerSUReq', C, S) -> %% This IE contains a list of BearerSUReq, so patch inner IEs - handle_ies(C, ?'id-E-RABToBeSetupItemBearerSUReq', S); + handle_ies(?'id-E-RABToBeSetupItemBearerSUReq', C, S); handle_ie(?'id-E-RABToBeSetupItemBearerSUReq', #'E-RABToBeSetupItemBearerSUReq'{'e-RAB-ID' = ERABId, @@ -422,7 +422,7 @@ %% E-RAB SETUP RESPONSE related IEs handle_ie(?'id-E-RABSetupListBearerSURes', C, S) -> %% This IE contains a list of BearerSURes, so patch inner IEs - handle_ies(C, ?'id-E-RABSetupItemBearerSURes', S); + handle_ies(?'id-E-RABSetupItemBearerSURes', C, S); handle_ie(?'id-E-RABSetupItemBearerSURes', #'E-RABSetupItemBearerSURes'{'e-RAB-ID' = ERABId, @@ -447,7 +447,7 @@ %% 9.1.3.5 E-RAB RELEASE COMMAND related IEs handle_ie(?'id-E-RABToBeReleasedList', C, S) -> %% This IE contains a list of E-RABItem - handle_ies(C, ?'id-E-RABItem', S); + handle_ies(?'id-E-RABItem', C, S); handle_ie(?'id-E-RABItem', #'E-RABItem'{'e-RAB-ID' = ERABId} = C, @@ -465,7 +465,7 @@ %% 9.1.3.6 E-RAB RELEASE RESPONSE related IEs handle_ie(?'id-E-RABReleaseListBearerRelComp', C, S) -> %% This IE contains a list of E-RABReleaseItemBearerRelComp - handle_ies(C, ?'id-E-RABReleaseItemBearerRelComp', S); + handle_ies(?'id-E-RABReleaseItemBearerRelComp', C, S); handle_ie(?'id-E-RABReleaseItemBearerRelComp', #'E-RABReleaseItemBearerRelComp'{'e-RAB-ID' = ERABId} = C, S) -> @@ -482,12 +482,12 @@ %% 9.1.3.7 E-RAB RELEASE INDICATION related IEs handle_ie(?'id-E-RABReleasedList', C, S) -> %% This IE contains a list of E-RABItem - handle_ies(C, ?'id-E-RABItem', S); + handle_ies(?'id-E-RABItem', C, S); %% E-RAB MODIFICATION INDICATION related IEs handle_ie(?'id-E-RABToBeModifiedListBearerModInd', C, S) -> %% This IE contains a list of BearerModInd, so patch inner IEs - handle_ies(C, ?'id-E-RABToBeModifiedItemBearerModInd', S); + handle_ies(?'id-E-RABToBeModifiedItemBearerModInd', C, S); handle_ie(?'id-E-RABToBeModifiedItemBearerModInd', #'E-RABToBeModifiedItemBearerModInd'{} = C, S) -> @@ -496,7 +496,7 @@ handle_ie(?'id-E-RABNotToBeModifiedListBearerModInd', C, S) -> %% This IE contains a list of BearerModInd, so patch inner IEs - handle_ies(C, ?'id-E-RABNotToBeModifiedItemBearerModInd', S); + handle_ies(?'id-E-RABNotToBeModifiedItemBearerModInd', C, S); handle_ie(?'id-E-RABNotToBeModifiedItemBearerModInd', #'E-RABNotToBeModifiedItemBearerModInd'{} = C, S) -> @@ -506,7 +506,7 @@ %% INITIAL CONTEXT SETUP REQUEST related IEs handle_ie(?'id-E-RABToBeSetupListCtxtSUReq', C, S) -> %% This IE contains a list of CtxtSUReq, so patch inner IEs - handle_ies(C, ?'id-E-RABToBeSetupItemCtxtSUReq', S); + handle_ies(?'id-E-RABToBeSetupItemCtxtSUReq', C, S); handle_ie(?'id-E-RABToBeSetupItemCtxtSUReq', #'E-RABToBeSetupItemCtxtSUReq'{'e-RAB-ID' = ERABId, @@ -526,7 +526,7 @@ %% INITIAL CONTEXT SETUP RESPONSE related IEs handle_ie(?'id-E-RABSetupListCtxtSURes', C, S) -> %% This IE contains a list of CtxtSURes, so patch inner IEs - handle_ies(C, ?'id-E-RABSetupItemCtxtSURes', S); + handle_ies(?'id-E-RABSetupItemCtxtSURes', C, S); handle_ie(?'id-E-RABSetupItemCtxtSURes', #'E-RABSetupItemCtxtSURes'{'e-RAB-ID' = ERABId, @@ -558,31 +558,31 @@ %% 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(), s1ap_ie_id(), proxy_state()) -> {handle_ies_result(), proxy_state()}. -handle_ies(IEs, IEI, S) -> - handle_ies([], IEs, IEI, S). +-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(Acc, [IE | IEs], IEI, S0) -> +handle_ies(Acc, IEI, [IE | IEs], S0) -> case IE of #'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); + 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], IEs, IEI, S1); + handle_ies([IE | Acc], IEI, IEs, S1); #'ProtocolIE-Field'{id = ?'id-eNB-UE-S1AP-ID', value = Id} -> S1 = S0#proxy_state{enb_ue_id = Id}, - handle_ies([IE | Acc], IEs, IEI, S1); + handle_ies([IE | Acc], IEI, IEs, S1); _ -> - handle_ies([IE | Acc], IEs, IEI, S0) + handle_ies([IE | Acc], IEI, IEs, S0) end; -handle_ies(Acc, [], _IEI, S) -> +handle_ies(Acc, _IEI, [], S) -> IEs = lists:reverse(Acc), {{ok, IEs}, S}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39112?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic9c7257bef290a7f0c2546d4c1ca3b9d4aed20d2 Gerrit-Change-Number: 39112 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/14/39114/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index e1ad576..f4cc9a5 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: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic1ed2c4662e82bd739c35f9179eaaec20c3cad98 Gerrit-Change-Number: 39114 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/15/39115/1 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: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I63fbd1d3d3531a74b35c09345cec094c30d19356 Gerrit-Change-Number: 39115 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

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

by fixeria

fixeria has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/13/39113/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index b0d174d..e1ad576 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(P, C, S) -> Result + when P :: [s1ap_ie_id()], %% Path + C :: s1ap_ie_val(), %% Content + S :: proxy_state(), %% 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: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I35528a91f7dbf321ad1a0811f1bbcdfb529d3530 Gerrit-Change-Number: 39113 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: handle E-RAB MODIFY REQ/RSP

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39117?usp=email ) Change subject: s1ap_proxy: handle E-RAB MODIFY REQ/RSP ...................................................................... s1ap_proxy: handle E-RAB MODIFY REQ/RSP Change-Id: I057a1c58d0c6ad04c00ad3ea4c68230d8632a07e --- M include/s1gw_metrics.hrl M src/s1ap_proxy.erl M src/s1gw_metrics.erl 3 files changed, 118 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/17/39117/1 diff --git a/include/s1gw_metrics.hrl b/include/s1gw_metrics.hrl index 77d6a8e..1b402d4 100644 --- a/include/s1gw_metrics.hrl +++ b/include/s1gw_metrics.hrl @@ -18,6 +18,8 @@ -define(S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, [ctr, s1ap, proxy, in_pkt, proc_error]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ, [ctr, s1ap, proxy, in_pkt, erab_setup_req]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_RSP, [ctr, s1ap, proxy, in_pkt, erab_setup_rsp]). +-define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_REQ, [ctr, s1ap, proxy, in_pkt, erab_modify_req]). +-define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_RSP, [ctr, s1ap, proxy, in_pkt, erab_modify_rsp]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_CMD, [ctr, s1ap, proxy, in_pkt, erab_release_cmd]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_RSP, [ctr, s1ap, proxy, in_pkt, erab_release_rsp]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_IND, [ctr, s1ap, proxy, in_pkt, erab_release_ind]). diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index f4cc9a5..83225b1 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -71,6 +71,7 @@ -record(proxy_state, {erabs :: dict:dict(), mme_ue_id :: undefined | mme_ue_id(), enb_ue_id :: undefined | enb_ue_id(), + erab_id :: undefined | erab_id(), path :: [s1ap_ie_id()] }). @@ -267,7 +268,37 @@ {forward, S1} %% XXX: forward as-is or drop? end; -%% TODO: 9.1.3.3 E-RAB MODIFY REQUEST / (Optional) Transport Information +%% 9.1.3.3 E-RAB MODIFY REQUEST +handle_pdu({Outcome = initiatingMessage, + #'InitiatingMessage'{procedureCode = ?'id-E-RABModify', + value = C0} = Msg}, S0) -> + ?LOG_DEBUG("Processing E-RAB MODIFY REQUEST"), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_REQ), + case handle_ies(?'id-E-RABToBeModifiedListBearerModReq', + C0#'E-RABModifyRequest'.protocolIEs, S0) of + {{ok, IEs}, S1} -> + C1 = C0#'E-RABModifyRequest'{protocolIEs = IEs}, + PDU = {Outcome, Msg#'InitiatingMessage'{value = C1}}, + {{forward, PDU}, S1}; %% forward patched PDU + {{error, Reason}, S1} -> + ?LOG_NOTICE("Failed to process E-RAB MODIFY REQUEST: ~p", [Reason]), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR), + {forward, S1} %% XXX: forward as-is or drop? + end; + +%% 9.1.3.4 E-RAB MODIFY RESPONSE +handle_pdu({successfulOutcome, + #'SuccessfulOutcome'{procedureCode = ?'id-E-RABModify', + value = C0}}, S0) -> + ?LOG_DEBUG("Processing E-RAB MODIFY RESPONSE"), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_RSP), + %% there's nothing to patch in this PDU, so we forward it as-is + %% TODO: check result of handle_ies(), inc. ?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR + {_, S1} = handle_ies(?'id-E-RABModifyListBearerModRes', + C0#'E-RABModifyResponse'.protocolIEs, S0), + {_, S2} = handle_ies(?'id-E-RABFailedToModifyList', + C0#'E-RABModifyResponse'.protocolIEs, S1), + {forward, S2}; %% 9.1.3.5 E-RAB RELEASE COMMAND handle_pdu({Outcome = initiatingMessage, @@ -445,6 +476,88 @@ {{error, erab_not_registered}, S} end; +%% 9.1.3.3 E-RAB MODIFY REQUEST related IEs +handle_ie([?'id-E-RABToBeModifiedListBearerModReq'], C, S) -> + %% This IE contains a list of BearerModReq, so patch inner IEs + handle_ies(?'id-E-RABToBeModifiedItemBearerModReq', C, S); + +handle_ie([?'id-E-RABToBeModifiedItemBearerModReq', + ?'id-E-RABToBeModifiedListBearerModReq'], + #'E-RABToBeModifiedItemBearerModReq'{'e-RAB-ID' = ERABId, + 'iE-Extensions' = E0} = C0, S0) -> + %% The IE-Extensions may optionally contain F-TEID, so patch inner IEs + case E0 of + %% no extensions means no F-TEID, so nothing to patch + asn1_NOVALUE -> + {{ok, C0}, S0}; + _ -> + case handle_ies(?'id-TransportInformation', + E0, S0#proxy_state{erab_id = ERABId}) of + {{ok, E1}, S1} -> + C1 = C0#'E-RABToBeModifiedItemBearerModReq'{'iE-Extensions' = E1}, + {{ok, C1}, S1}; + Error -> + Error + end + end; + +handle_ie([?'id-TransportInformation', + ?'id-E-RABToBeModifiedItemBearerModReq', + ?'id-E-RABToBeModifiedListBearerModReq'], + #'TransportInformation'{'transportLayerAddress' = TLA_In, + 'uL-GTP-TEID' = << TEID_In:32/big >>} = C0, S) -> + %% poke E-RAB FSM + case erab_fsm_find(S#proxy_state.erab_id, S) of + {ok, Pid} -> + case erab_fsm:erab_modify_req(Pid, {TEID_In, TLA_In}) of + {ok, {TEID_Out, TLA_Out}} -> + C1 = C0#'TransportInformation'{'transportLayerAddress' = TLA_Out, + 'uL-GTP-TEID' = << TEID_Out:32/big >>}, + {{ok, C1}, S}; + {error, Reason} -> + {{error, Reason}, S} + end; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", + [erab_uid(S#proxy_state.erab_id, S)]), + {{error, erab_not_registered}, S} + end; + +%% 9.1.3.4 E-RAB MODIFY RESPONSE related IEs +handle_ie([?'id-E-RABModifyListBearerModRes'], C, S) -> + %% This IE contains a list of BearerModRes, so patch inner IEs + handle_ies(?'id-E-RABModifyItemBearerModRes', C, S); + +handle_ie([?'id-E-RABModifyItemBearerModRes', + ?'id-E-RABModifyListBearerModRes'], + #'E-RABModifyItemBearerModRes'{'e-RAB-ID' = ERABId} = C, S) -> + %% poke E-RAB FSM + case erab_fsm_find(ERABId, S) of + {ok, Pid} -> + erab_fsm:erab_modify_rsp(Pid, ack), + {{ok, C}, S}; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [erab_uid(ERABId, S)]), + {{error, erab_not_registered}, S} + end; + +handle_ie([?'id-E-RABFailedToModifyList'], C, S) -> + %% This IE contains a list of E-RABItem, so patch inner IEs + handle_ies(?'id-E-RABItem', C, S); + +handle_ie([?'id-E-RABItem', + ?'id-E-RABFailedToModifyList'], + #'E-RABItem'{'e-RAB-ID' = ERABId} = C, S) -> + %% poke E-RAB FSM + case erab_fsm_find(ERABId, S) of + {ok, Pid} -> + erab_fsm:erab_modify_rsp(Pid, nack), + {{ok, C}, S}; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [erab_uid(ERABId, S)]), + {{error, erab_not_registered}, S} + end; + %% 9.1.3.5 E-RAB RELEASE COMMAND related IEs handle_ie([?'id-E-RABToBeReleasedList'], C, S) -> %% This IE contains a list of E-RABItem diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index 55421e7..79b1ffd 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -69,6 +69,8 @@ ?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, %% failed to process ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ, %% E-RAB SETUP.req PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_RSP, %% E-RAB SETUP.rsp PDUs + ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_REQ, %% E-RAB MODIFY.req PDUs + ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_RSP, %% E-RAB MODIFY.rsp PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_CMD, %% E-RAB RELEASE.cmd PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_RSP, %% E-RAB RELEASE.rsp PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_IND, %% E-RAB RELEASE.ind PDUs -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39117?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I057a1c58d0c6ad04c00ad3ea4c68230d8632a07e Gerrit-Change-Number: 39117 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: implement E-RAB MODIFY Req/Rsp procedures

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39116?usp=email ) Change subject: erab_fsm: implement E-RAB MODIFY Req/Rsp procedures ...................................................................... erab_fsm: implement E-RAB MODIFY Req/Rsp procedures Change-Id: I24d57ea390d71b640cb42046a8658e9d30670682 --- M src/erab_fsm.erl M test/erab_fsm_test.erl M test/pfcp_mock.hrl 3 files changed, 162 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/16/39116/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index a479cea..35df15f 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -49,6 +49,8 @@ -export([start_link/1, erab_setup_req/2, erab_setup_rsp/2, + erab_modify_req/2, + erab_modify_rsp/2, erab_release/2, erab_release_cmd/1, erab_release_rsp/1, @@ -73,6 +75,9 @@ addr() %% GTP-U Transport Layer Address }. +-type mod_kind() :: setup_rsp | + modify_req | + modify_rsp_nack. -type rel_kind() :: cmd | ind. -record(erab_state, {uid :: term(), %% unique E-RAB identifier @@ -81,8 +86,10 @@ c2u :: undefined | teid_addr(), %% GTP-U params for UPF <- Core a2u :: undefined | teid_addr(), %% GTP-U params for UPF <- Access u2a :: undefined | teid_addr(), %% GTP-U params for UPF -> Access + u2cm :: undefined | teid_addr(), %% GTP-U params for UPF -> Core (modified) seid_loc :: undefined | pfcp_peer:pfcp_seid(), %% local SEID, chosen by us seid_rem :: undefined | pfcp_peer:pfcp_seid(), %% remote SEID, chosen by the UPF + mod_kind :: undefined | mod_kind(), %% E-RAB MODIFY kind rel_kind :: undefined | rel_kind() %% E-RAB RELEASE kind }). @@ -127,6 +134,28 @@ gen_statem:call(Pid, {?FUNCTION_NAME, F_TEID}). +%% @doc Indicate reception of E-RAB modify request (from core). +%% @param Pid PID of an erab_fsm. +%% @param F_TEID TEID and bind address indicated by the MME. +%% @returns TEID and Addr to be sent to the eNB; an error otherwise. +%% @end +-spec erab_modify_req(pid(), teid_addr()) -> {ok, teid_addr()} | + {error, term()}. +erab_modify_req(Pid, F_TEID) -> + gen_statem:call(Pid, {?FUNCTION_NAME, F_TEID}). + + +%% @doc Indicate reception of E-RAB modify response (from access). +%% @param Pid PID of an erab_fsm. +%% @param Res ack if eNB indicates successful modification; +%% nack if eNB indicates unsuccessful modification. +%% @returns ok or an error. +%% @end +-spec erab_modify_rsp(pid(), ack | nack) -> ok | {error, term()}. +erab_modify_rsp(Pid, Res) -> + gen_statem:call(Pid, {?FUNCTION_NAME, Res}). + + -spec erab_release(pid(), rel_kind()) -> ok. erab_release(Pid, cmd) -> erab_release_cmd(Pid); @@ -256,7 +285,8 @@ #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB SETUP Rsp (U2A ~p)", [U2A]), {next_state, session_modify, - S#erab_state{from = From, + S#erab_state{mod_kind = setup_rsp, + from = From, u2a = U2A}}; erab_wait_setup_rsp(Event, EventData, S) -> @@ -264,7 +294,8 @@ %% state SESSION_MODIFY :: PFCP session modification -session_modify(enter, OldState, S) -> +session_modify(enter, OldState, + #erab_state{} = S) -> ?LOG_DEBUG("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), ok = session_modify_req(S), {next_state, ?FUNCTION_NAME, S, %% loop transition to enable state_timeout @@ -277,24 +308,32 @@ {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; + mod_kind = ModKind} = S) -> + ?LOG_DEBUG("PFCP session modified"), + Reply = case ModKind of + setup_rsp -> + {ok, S#erab_state.c2u}; + modify_req -> + {ok, S#erab_state.a2u}; + modify_rsp_nack -> + ok + end, + {next_state, erab_setup, + S#erab_state{mod_kind = undefined, + from = undefined}, + [{reply, From, Reply}]}; + +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). @@ -306,6 +345,33 @@ {keep_state, S}; erab_setup({call, From}, + {erab_modify_req, U2CM}, + #erab_state{} = S) -> + ?LOG_DEBUG("Rx E-RAB MODIFY Req (U2CM ~p)", [U2CM]), + {next_state, session_modify, + S#erab_state{mod_kind = modify_req, + from = From, + u2cm = U2CM}}; + +erab_setup({call, From}, + {erab_modify_rsp, Res}, + #erab_state{u2cm = U2CM} = S0) -> + ?LOG_DEBUG("Rx E-RAB MODIFY Rsp (~p)", [Res]), + case Res of + ack -> + {keep_state, + S0#erab_state{u2c = U2CM, + u2cm = undefined}, + {reply, From, ok}}; + nack -> + %% revert PFCP session params + {next_state, session_modify, + S0#erab_state{mod_kind = modify_rsp_nack, + u2cm = undefined, + from = From}} + end; + +erab_setup({call, From}, erab_release_cmd, #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB RELEASE Cmd"), @@ -466,19 +532,49 @@ -spec session_modify_req(erab_state()) -> pfcp_peer:pfcp_session_rsp(). -session_modify_req(#erab_state{seid_rem = SEID, %% SEID allocated to us +session_modify_req(#erab_state{mod_kind = setup_rsp, + seid_rem = SEID, u2a = U2A}) -> + %% Now we know the Access side TEID / GTP-U address, so we modify + %% the FAR1 (which was previously set to DROP) to FORW. + session_modify_req(SEID, 1, U2A); + +session_modify_req(#erab_state{mod_kind = modify_req, + seid_rem = SEID, + u2cm = U2CM}) -> + %% E-RAB MODIFY Req - MME orders modification of U2C F-TEID, + %% so we modify the respective FAR (id=2) + session_modify_req(SEID, 2, U2CM); + +session_modify_req(#erab_state{mod_kind = modify_rsp_nack, + seid_rem = SEID, + u2c = U2C}) -> + %% E-RAB MODIFY Rsp (NACK) - eNB NACK's E-RAB modification + %% so we modify the respective FAR (id=2) + session_modify_req(SEID, 2, U2C). + + +-spec session_modify_req(SEID, FAR_ID, F_TEID) -> Result + when SEID :: pfcp_peer:pfcp_seid(), + FAR_ID :: integer(), + F_TEID :: teid_addr(), + Result :: pfcp_peer:pfcp_session_rsp(). +session_modify_req(SEID, FAR_ID, F_TEID) -> %% Forwarding Action Rules - FPars = #{outer_header_creation => ohc(U2A)}, - FParsNI = add_net_inst(FPars, 'Access'), %% optional Network Instance IE - FARs = [#{far_id => {far_id, 1}, %% -- for Core -> Access - %% Now we know the Access side TEID / GTP-U address, so we modify - %% this FAR (which was previously set to DROP) to FORW. + Iface = far_id2iface(FAR_ID), + FPars = #{outer_header_creation => ohc(F_TEID)}, + FParsNI = add_net_inst(FPars, Iface), %% optional Network Instance IE + FARs = [#{far_id => {far_id, FAR_ID}, apply_action => #{'FORW' => []}, update_forwarding_parameters => FParsNI}], pfcp_peer:session_modify_req(SEID, [], FARs). +-spec far_id2iface(integer()) -> iface(). +far_id2iface(1) -> 'Access'; +far_id2iface(2) -> 'Core'. + + %% Network Instance IE env parameter name -spec net_inst_param(iface()) -> atom(). net_inst_param('Core') -> pfcp_net_inst_core; diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index e406e88..5563d02 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -8,6 +8,8 @@ -define(A2U, {?TEID_A2U, ?ADDR_A2U}). -define(U2A, {?TEID_U2A, ?ADDR_U2A}). +-define(U2CM, {?TEID_U2CM, ?ADDR_U2CM}). + %% ------------------------------------------------------------------ %% setup/misc functions %% ------------------------------------------------------------------ @@ -48,6 +50,13 @@ ?TC(fun test_erab_setup_pfcp_modify_error/1)}]. +erab_modify_test_() -> + [{"E-RAB MODIFY REQ :: ACK", + ?TC(fun test_erab_modify_req_ack/1)}, + {"E-RAB MODIFY REQ :: NACK", + ?TC(fun test_erab_modify_req_nack/1)}]. + + erab_release_test_() -> [{"E-RAB RELEASE CMD :: success", ?TC(fun test_erab_release_cmd_success/1)}, @@ -105,6 +114,35 @@ ?_assertNot(erlang:is_process_alive(Pid))]. +test_erab_modify_req(Pid, Res) -> + U2C = case Res of + ack -> ?U2CM; + nack -> ?U2C + end, + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), + %% E-RAB MODIFY Req indicates the new (modified) F-TEID to be used + %% in the UPF -> Core direction. The FSM logic indicates the old + %% (unmodified) F-TEID to be used in the UPF <- Access direction. + ?_assertEqual({ok, ?A2U}, erab_fsm:erab_modify_req(Pid, ?U2CM)), + %% Before getting the Rsp, the U2C F-TEID remains unchanged + ?_assertEqual(?U2C, erab_fsm_info(Pid, f_teid_u2c)), + %% After getting the Rsp (ACK), the new (modified) U2C F-TEID is used + %% After getting the Rsp (NACK), the U2C F-TEID remains unchanged + ?_assertEqual(ok, erab_fsm:erab_modify_rsp(Pid, Res)), + ?_assertEqual(U2C, erab_fsm_info(Pid, f_teid_u2c)), + ?_assertEqual(ok, erab_fsm:shutdown(Pid)), + ?_assertNot(erlang:is_process_alive(Pid))]. + + +test_erab_modify_req_ack(Pid) -> + test_erab_modify_req(Pid, ack). + + +test_erab_modify_req_nack(Pid) -> + test_erab_modify_req(Pid, nack). + + test_erab_release_cmd_success(Pid) -> [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), diff --git a/test/pfcp_mock.hrl b/test/pfcp_mock.hrl index c044939..9a0232a 100644 --- a/test/pfcp_mock.hrl +++ b/test/pfcp_mock.hrl @@ -6,9 +6,13 @@ -define(TEID_A2U, 16#0202). %% UPF <- Access -define(TEID_U2A, 16#0002). %% UPF -> Access +-define(TEID_U2CM, 16#0f0001). %% UPF -> Core (modified) + -define(ADDR_U2C, << 16#7f, 16#00, 16#00, 16#01 >>). %% UPF -> Core -define(ADDR_C2U, << 16#7f, 16#00, 16#01, 16#01 >>). %% UPF <- Core -define(ADDR_A2U, << 16#7f, 16#00, 16#02, 16#02 >>). %% UPF <- Access -define(ADDR_U2A, << 16#7f, 16#00, 16#00, 16#02 >>). %% UPF -> Access +-define(ADDR_U2CM, << 16#7f, 16#0f, 16#00, 16#01 >>). %% UPF -> Core (modified) + %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39116?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I24d57ea390d71b640cb42046a8658e9d30670682 Gerrit-Change-Number: 39116 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: [WIP] s1gw_metrics: complete E-RAB MODIFICATION CNF/IND

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39118?usp=email ) Change subject: [WIP] s1gw_metrics: complete E-RAB MODIFICATION CNF/IND ...................................................................... [WIP] s1gw_metrics: complete E-RAB MODIFICATION CNF/IND Change-Id: Icc16a57d40b68bd17c5d207b643927d58176e088 --- M include/s1gw_metrics.hrl M src/s1ap_proxy.erl M src/s1gw_metrics.erl 3 files changed, 54 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/18/39118/1 diff --git a/include/s1gw_metrics.hrl b/include/s1gw_metrics.hrl index 1b402d4..5b3c484 100644 --- a/include/s1gw_metrics.hrl +++ b/include/s1gw_metrics.hrl @@ -24,6 +24,7 @@ -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_RSP, [ctr, s1ap, proxy, in_pkt, erab_release_rsp]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_IND, [ctr, s1ap, proxy, in_pkt, erab_release_ind]). -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_ERAB_MOD_CNF, [ctr, s1ap, proxy, in_pkt, erab_mod_cnf]). -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_OUT_PKT_FWD_ALL, [ctr, s1ap, proxy, out_pkt, forward, all]). diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 83225b1..c6f5c54 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -371,6 +371,26 @@ PDU = {Outcome, Msg#'InitiatingMessage'{value = C1}}, {{forward, PDU}, S2}; +%% 9.1.3.9 E-RAB MODIFICATION CONFIRM +handle_pdu({Outcome = successfulOutcome, + #'SuccessfulOutcome'{procedureCode = ?'id-E-RABModificationIndication', + value = C0} = Msg}, S0) -> + ?LOG_DEBUG("Processing E-RAB MODIFICATION CONFIRM"), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_CNF), + IEs0 = C0#'E-RABModificationConfirm'.protocolIEs, + %% E-RAB Modify List + %% TODO: handle {error, Reason} + {{ok, IEs1}, S1} = handle_ies(?'id-E-RABModifyListBearerModConf', IEs0, S0), + %% E-RAB Failed to Modify List + %% TODO: handle {error, Reason} + {{ok, IEs2}, S2} = handle_ies(?'id-E-RABFailedToModifyListBearerModConf', IEs1, S1), + %% E-RAB To Be Released List + %% TODO: handle {error, Reason} + {{ok, IEs3}, S3} = handle_ies(?'id-E-RABToBeReleasedListBearerModConf', IEs2, S2), + C1 = C0#'E-RABModificationConfirm'{protocolIEs = IEs3}, + PDU = {Outcome, Msg#'SuccessfulOutcome'{value = C1}}, + {{forward, PDU}, S3}; + %% 9.1.4.1 INITIAL CONTEXT SETUP REQUEST handle_pdu({Outcome = initiatingMessage, #'InitiatingMessage'{procedureCode = ?'id-InitialContextSetup', @@ -612,7 +632,7 @@ {{error, erab_not_registered}, S} end; -%% E-RAB MODIFICATION INDICATION related IEs +%% 9.1.3.8 E-RAB MODIFICATION INDICATION related IEs 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); @@ -633,6 +653,37 @@ %% TODO: find and poke an E-RAB FSM associated with this E-RAB {{ok, C}, S}; +%% 9.1.3.9 E-RAB MODIFICATION CONFIRM related IEs +handle_ie([?'id-E-RABModifyListBearerModConf'], C, S) -> + %% This IE contains a list of BearerModConf, so patch inner IEs + handle_ies(?'id-E-RABModifyItemBearerModConf', C, S); + +handle_ie([?'id-E-RABModifyItemBearerModConf', + ?'id-E-RABModifyListBearerModConf'], + #'E-RABModifyItemBearerModConf'{} = C, S) -> + %% TODO: find and poke an E-RAB FSM associated with this E-RAB + {{ok, C}, S}; + +handle_ie([?'id-E-RABFailedToModifyListBearerModConf'], C, S) -> + %% This IE contains a list of E-RABItem, so patch inner IEs + handle_ies(?'id-E-RABItem', C, S); + +handle_ie([?'id-E-RABItem', + ?'id-E-RABFailedToModifyListBearerModConf'], + #'E-RABItem'{} = C, S) -> + %% TODO: find and poke an E-RAB FSM associated with this E-RAB + {{ok, C}, S}; + +handle_ie([?'id-E-RABToBeReleasedListBearerModConf'], C, S) -> + %% This IE contains a list of E-RABItem, so patch inner IEs + handle_ies(?'id-E-RABItem', C, S); + +handle_ie([?'id-E-RABItem', + ?'id-E-RABToBeReleasedListBearerModConf'], + #'E-RABItem'{} = 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) -> %% This IE contains a list of CtxtSUReq, so patch inner IEs diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index 79b1ffd..a716578 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -75,6 +75,7 @@ ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_RSP, %% E-RAB RELEASE.rsp PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_IND, %% E-RAB RELEASE.ind PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_IND, %% E-RAB MODIFY.ind PDUs + ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_CNF, %% E-RAB MODIFY.cnf 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 %% s1ap_proxy: OUTgoing PDU counters -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39118?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Icc16a57d40b68bd17c5d207b643927d58176e088 Gerrit-Change-Number: 39118 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/10/39110/1 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: newchange 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>

6 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024