- gerrit-log - lists.osmocom.org

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: handle E-RAB RELEASE CMD/RSP
by fixeria 13 Aug '24

13 Aug '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37805?usp=email ) Change subject: s1ap_proxy: handle E-RAB RELEASE CMD/RSP ...................................................................... s1ap_proxy: handle E-RAB RELEASE CMD/RSP Change-Id: I9c5f279886b548c539211e1e709ae0c6e1cd2788 --- M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 2 files changed, 106 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/05/37805/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index d251cdd..50cc067 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -47,6 +47,7 @@ -include("S1AP-PDU-Contents.hrl"). -include("S1AP-Containers.hrl"). -include("S1AP-Constants.hrl"). +-include("S1AP-IEs.hrl"). -record(proxy_state, {erabs :: dict:dict()}). @@ -142,6 +143,26 @@ %% TODO: 9.1.3.3 E-RAB MODIFY REQUEST / (Optional) Transport Information +%% 9.1.3.5 E-RAB RELEASE COMMAND +handle_pdu(Data, {Outcome = initiatingMessage, + #'InitiatingMessage'{procedureCode = ?'id-E-RABRelease', + value = Content} = Pdu}, S0) -> + ?LOG_DEBUG("Processing E-RAB RELEASE COMMAND"), + {IEs, S1} = handle_ies(Content#'E-RABReleaseCommand'.protocolIEs, + ?'id-E-RABToBeReleasedList', S0), + NewContent = Content#'E-RABReleaseCommand'{protocolIEs = IEs}, + handle_pdu_new(Data, {Outcome, Pdu#'InitiatingMessage'{value = NewContent}}, S1); + +%% 9.1.3.6 E-RAB RELEASE RESPONSE +handle_pdu(Data, {Outcome = successfulOutcome, + #'SuccessfulOutcome'{procedureCode = ?'id-E-RABRelease', + value = Content} = Pdu}, S0) -> + ?LOG_DEBUG("Processing E-RAB RELEASE RESPONSE"), + {IEs, S1} = handle_ies(Content#'E-RABReleaseResponse'.protocolIEs, + ?'id-E-RABReleaseListBearerRelComp', S0), + NewContent = Content#'E-RABReleaseResponse'{protocolIEs = IEs}, + handle_pdu_new(Data, {Outcome, Pdu#'SuccessfulOutcome'{value = NewContent}}, S1); + %% 9.1.3.8 E-RAB MODIFICATION INDICATION handle_pdu(Data, {Outcome = initiatingMessage, #'InitiatingMessage'{procedureCode = ?'id-E-RABModificationIndication', @@ -231,6 +252,42 @@ end, {C1, S}; +%% 9.1.3.5 E-RAB RELEASE COMMAND related IEs +handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeReleasedList', + value = Content}, S) -> + %% This IE contains a list of E-RABItem + handle_ies(Content, ?'id-E-RABItem', S); + +handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABItem', + value = Content}, S) -> + %% poke E-RAB FSM + #'E-RABItem'{'e-RAB-ID' = ERABId} = Content, + case dict:find(ERABId, S#proxy_state.erabs) of + {ok, Pid} -> + ok = erab_fsm:erab_release_req(Pid); + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [ERABId]) + end, + {Content, S}; + +%% 9.1.3.6 E-RAB RELEASE RESPONSE related IEs +handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABReleaseListBearerRelComp', + value = Content}, S) -> + %% This IE contains a list of E-RABReleaseItemBearerRelComp + handle_ies(Content, ?'id-E-RABReleaseItemBearerRelComp', S); + +handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABReleaseItemBearerRelComp', + value = Content}, S) -> + %% poke E-RAB FSM + #'E-RABReleaseItemBearerRelComp'{'e-RAB-ID' = ERABId} = Content, + case dict:find(ERABId, S#proxy_state.erabs) of + {ok, Pid} -> + ok = erab_fsm:erab_release_rsp(Pid); + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [ERABId]) + end, + {Content, S}; + %% E-RAB MODIFICATION INDICATION related IEs handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeModifiedListBearerModInd', value = Content}, S) -> diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 9426119..9534980 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -32,6 +32,8 @@ ?TC(fun test_s1_setup_req/1)}, {"E-RAB SETUP REQUEST/RESPONSE", ?TC(fun test_e_rab_setup/1)}, + {"E-RAB RELEASE COMMAND/RESPONSE", + ?TC(fun test_e_rab_release/1)}, {"E-RAB MODIFICATION INDICATION", ?TC(fun test_e_rab_modify_ind/1)}, {"INITIAL CONTEXT SETUP REQUEST/RESPONSE", @@ -63,6 +65,29 @@ ?_assertEqual(SetupRspExp, SetupRspOut)]. +test_e_rab_release(S0) -> + %% [eNB <- MME] E-RAB SETUP REQUEST + SetupReqIn = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + {_, S1} = s1ap_proxy:handle_pdu(SetupReqIn, S0), + + %% [eNB -> MME] E-RAB SETUP RESPONSE + SetupRspIn = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + {_, S2} = s1ap_proxy:handle_pdu(SetupRspIn, S1), + + %% [eNB <- MME] E-RAB RELEASE COMMAND + ReleaseCmd = e_rab_release_cmd_pdu(), + {ReleaseCmdOut, S3} = s1ap_proxy:handle_pdu(ReleaseCmd, S2), + + %% [eNB -> MME] E-RAB RELEASE RESPONSE + ReleaseRsp = e_rab_release_rsp_pdu(), + {ReleaseRspOut, _S4} = s1ap_proxy:handle_pdu(ReleaseRsp, S3), + + %% TODO: make sure that the E-RAB FSM has been terminated + + [?_assertEqual(ReleaseCmd, ReleaseCmdOut), + ?_assertEqual(ReleaseRsp, ReleaseRspOut)]. + + test_e_rab_modify_ind(S0) -> %% [eNB -> MME] E-RAB MODIFICATION INDICATION ModifyIndIn = e_rab_modify_ind_pdu(?ADDR_U2A, ?TEID_U2A), @@ -140,6 +165,30 @@ >>. +%% [eNB <- MME] E-RAB RELEASE COMMAND +%% TODO: make E-RAB IDs configurable +e_rab_release_cmd_pdu() -> + << 16#00, 16#07, 16#00, 16#37, 16#00, 16#00, 16#05, 16#00, + 16#00, 16#00, 16#02, 16#00, 16#01, 16#00, 16#08, 16#00, + 16#02, 16#00, 16#00, 16#00, 16#42, 16#00, 16#0a, 16#18, + 16#3e, 16#80, 16#00, 16#00, 16#60, 16#3e, 16#80, 16#00, + 16#00, 16#00, 16#21, 16#40, 16#07, 16#00, 16#00, 16#23, + 16#40, 16#02, 16#0c, 16#40, 16#00, 16#1a, 16#40, 16#0b, + 16#0a, 16#27, 16#d3, 16#76, 16#43, 16#e7, 16#07, 16#72, + 16#47, 16#cd, 16#24 + >>. + + +%% [eNB -> MME] E-RAB RELEASE RESPONSE +%% TODO: make E-RAB IDs configurable +e_rab_release_rsp_pdu() -> + << 16#20, 16#07, 16#00, 16#19, 16#00, 16#00, 16#03, 16#00, + 16#00, 16#40, 16#02, 16#00, 16#02, 16#00, 16#08, 16#40, + 16#02, 16#00, 16#01, 16#00, 16#45, 16#40, 16#06, 16#00, + 16#00, 16#0f, 16#40, 16#01, 16#0c + >>. + + %% [eNB -> MME] E-RAB MODIFICATION INDICATION e_rab_modify_ind_pdu(TLA, TEID) when is_binary(TLA), is_integer(TEID) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37805?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: I9c5f279886b548c539211e1e709ae0c6e1cd2788 Gerrit-Change-Number: 37805 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: include Network Instance IE in PDRs and FARs
by fixeria 12 Aug '24

12 Aug '24

Attention is currently required from: laforge. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37795?usp=email ) Change subject: erab_fsm: include Network Instance IE in PDRs and FARs ...................................................................... Patch Set 3: (1 comment) Patchset: PS1: > i would consider this WIP until the values are configurable. Done -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37795?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: I4dbe8e0b1d14eed5fdb3f9f3f2543c44fd543d22 Gerrit-Change-Number: 37795 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 12 Aug 2024 21:03:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: include Network Instance IE in PDRs and FARs
by fixeria 12 Aug '24

12 Aug '24

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37795?usp=email ) Change subject: erab_fsm: include Network Instance IE in PDRs and FARs ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37795?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: I4dbe8e0b1d14eed5fdb3f9f3f2543c44fd543d22 Gerrit-Change-Number: 37795 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 12 Aug 2024 21:03:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: implement handling of GTP-U address
by fixeria 12 Aug '24

12 Aug '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37804?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: erab_fsm: implement handling of GTP-U address ...................................................................... erab_fsm: implement handling of GTP-U address Change-Id: Ifdc492c41266d07d0e951dcdcc1e4ba74da0b13b --- M src/erab_fsm.erl M test/erab_fsm_test.erl M test/pfcp_mock.erl M test/pfcp_mock.hrl 4 files changed, 87 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/04/37804/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37804?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: Ifdc492c41266d07d0e951dcdcc1e4ba74da0b13b Gerrit-Change-Number: 37804 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[S] Change in ...osmo-s1gw[master]: config: rename upf_{loc,rem}_addr to pfcp_{loc,rem}_addr
by fixeria 12 Aug '24

12 Aug '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37800?usp=email ) Change subject: config: rename upf_{loc,rem}_addr to pfcp_{loc,rem}_addr ...................................................................... config: rename upf_{loc,rem}_addr to pfcp_{loc,rem}_addr Clarify that the existing parameters are related to PFCP. Change-Id: I8447bac3a0a61537f9327121f28266a8e5af7f9c --- M config/sys.config M src/osmo_s1gw_sup.erl 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/00/37800/1 diff --git a/config/sys.config b/config/sys.config index 99930cc..993176b 100644 --- a/config/sys.config +++ b/config/sys.config @@ -14,8 +14,8 @@ [{s1gw_bind_addr, "127.0.1.1"}, %% S1GW bind address for incoming eNB connections {mme_loc_addr, "127.0.2.1"}, %% local address for outgoing connections to the MME {mme_rem_addr, "127.0.2.10"}, %% remote address for outgoing connections to the MME - {upf_loc_addr, "127.0.1.1"}, %% local address for outgoing connections to the UPF - {upf_rem_addr, "127.0.1.2"} %% remote address for outgoing connections to the UPF + {pfcp_loc_addr, "127.0.1.1"}, %% local address for incoming PFCP PDUs from UPF + {pfcp_rem_addr, "127.0.1.2"} %% remote address for outgoing PFCP PDUs to UPF ]}, %% ================================================================================ %% kernel config diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index 7bfd53f..c6adb55 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -47,8 +47,8 @@ -define(ENV_DEFAULT_MME_LOC_ADDR, "127.0.2.1"). -define(ENV_DEFAULT_MME_REM_ADDR, "127.0.2.10"). -define(ENV_DEFAULT_MME_REM_PORT, ?S1AP_PORT). --define(ENV_DEFAULT_UPF_LOC_ADDR, "127.0.1.1"). --define(ENV_DEFAULT_UPF_REM_ADDR, "127.0.1.2"). +-define(ENV_DEFAULT_PFCP_LOC_ADDR, "127.0.1.1"). +-define(ENV_DEFAULT_PFCP_REM_ADDR, "127.0.1.2"). %% ------------------------------------------------------------------ %% supervisor API @@ -64,8 +64,8 @@ MmeLocAddr = get_env(mme_loc_addr, ?ENV_DEFAULT_MME_LOC_ADDR), MmeRemAddr = get_env(mme_rem_addr, ?ENV_DEFAULT_MME_REM_ADDR), MmeRemPort = get_env(mme_rem_port, ?ENV_DEFAULT_MME_REM_PORT), - UpfLocAddr = get_env(upf_loc_addr, ?ENV_DEFAULT_UPF_LOC_ADDR), - UpfRemAddr = get_env(upf_rem_addr, ?ENV_DEFAULT_UPF_REM_ADDR), + PfcpLocAddr = get_env(pfcp_loc_addr, ?ENV_DEFAULT_PFCP_LOC_ADDR), + PfcpRemAddr = get_env(pfcp_rem_addr, ?ENV_DEFAULT_PFCP_REM_ADDR), SctpServer = {sctp_server, {sctp_server, start_link, [S1GWBindAddr, S1GWBindPort, @@ -75,7 +75,7 @@ worker, [sctp_server]}, PfcpPeer = {pfcp_peer, {pfcp_peer, start_link, - [UpfLocAddr, UpfRemAddr]}, + [PfcpLocAddr, PfcpRemAddr]}, permanent, 5000, worker, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37800?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: I8447bac3a0a61537f9327121f28266a8e5af7f9c Gerrit-Change-Number: 37800 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: fix misconceptions about E-RAB establishment
by fixeria 12 Aug '24

12 Aug '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37801?usp=email ) Change subject: fix misconceptions about E-RAB establishment ...................................................................... fix misconceptions about E-RAB establishment Change-Id: I8d777699cf71cb5ba2609ab5f3587e4cc88ceaea --- M test/s1ap_proxy_test.erl 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/01/37801/1 diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 9830af8..cb0a4ca 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -60,7 +60,7 @@ [?_assertEqual({OrigData, S}, s1ap_proxy:handle_pdu(OrigData, S))]. -%% [eNB -> MME] E-RAB SETUP REQUEST +%% [eNB <- MME] E-RAB SETUP REQUEST e_rab_setup_req_pdu(TLA, TEID) when is_binary(TLA), is_binary(TEID) -> << 16#00, 16#05, 16#00, 16#80, 16#9b, 16#00, 16#00, 16#03, @@ -100,7 +100,7 @@ [?_assertMatch({ExpData, _}, s1ap_proxy:handle_pdu(OrigData, S))]. -%% [MME -> eNB] E-RAB SETUP RESPONSE +%% [eNB -> MME] E-RAB SETUP RESPONSE e_rab_setup_rsp_pdu(TLA, TEID) when is_binary(TLA), is_binary(TEID) -> << 16#20, 16#05, 16#00, 16#22, 16#00, 16#00, 16#03, 16#00, @@ -148,7 +148,7 @@ [?_assertMatch({ExpData, _}, s1ap_proxy:handle_pdu(OrigData, S))]. -%% [eNB -> MME] INITIAL CONTEXT SETUP REQUEST +%% [eNB <- MME] INITIAL CONTEXT SETUP REQUEST initial_context_setup_req_pdu(TLA, TEID) when is_binary(TLA), is_binary(TEID) -> << 16#00, 16#09, 16#00, 16#81, 16#10, 16#00, 16#00, 16#07, @@ -203,7 +203,7 @@ [?_assertMatch({ExpData, _}, s1ap_proxy:handle_pdu(OrigData, S))]. -%% [MME -> eNB] INITIAL CONTEXT SETUP RESPONSE +%% [eNB -> MME] INITIAL CONTEXT SETUP RESPONSE initial_context_setup_rsp_pdu(TLA, TEID) when is_binary(TLA), is_binary(TEID) -> << 16#20, 16#09, 16#00, 16#22, 16#00, 16#00, 16#03, 16#00, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37801?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: I8d777699cf71cb5ba2609ab5f3587e4cc88ceaea Gerrit-Change-Number: 37801 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: erab_fsm: fix API docs: UID was moved to start_link()
by fixeria 12 Aug '24

12 Aug '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37802?usp=email ) Change subject: erab_fsm: fix API docs: UID was moved to start_link() ...................................................................... erab_fsm: fix API docs: UID was moved to start_link() Change-Id: I4987baac8f2da30a6d285275eaba2cac0528ac93 --- M src/erab_fsm.erl 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/02/37802/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 5635086..8a9d0ec 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -80,6 +80,10 @@ %% public API %% ------------------------------------------------------------------ +%% @doc Allocate and start an E-RAB FSM process +%% @param UID *unique* E-RAB identifier. +%% @returns process ID on success; an error otherwise. +%% @end -spec start_link(term()) -> gen_statem:start_ret(). start_link(UID) -> gen_statem:start_link(?MODULE, [UID], []). @@ -87,7 +91,6 @@ %% @doc Indicate reception of E-RAB setup request (from the eNB). %% @param Pid PID of an erab_fsm. -%% @param UID *unique* E-RAB identifier. %% @param TEID TEID chosen by the eNB. %% @returns TEID to be sent to the core; an error otherwise. %% @end -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37802?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: I4987baac8f2da30a6d285275eaba2cac0528ac93 Gerrit-Change-Number: 37802 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: implement handling of GTP-U address
by fixeria 12 Aug '24

12 Aug '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37804?usp=email ) Change subject: erab_fsm: implement handling of GTP-U address ...................................................................... erab_fsm: implement handling of GTP-U address Change-Id: Ifdc492c41266d07d0e951dcdcc1e4ba74da0b13b --- M src/erab_fsm.erl M test/erab_fsm_test.erl M test/pfcp_mock.erl M test/pfcp_mock.hrl 4 files changed, 87 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/04/37804/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index abc25b1..d2aa065 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -64,12 +64,17 @@ -define(ERAB_T_SESSION_DELETE, 2_000). -type teid() :: 0..16#ffffffff. +-type addr() :: << _:32 >> | << _:128 >>. + +-type teid_addr() :: {teid(), %% GTP-U TEID + addr() %% GTP-U Transport Layer Address + }. -record(erab_state, {from :: undefined | gen_statem:from(), %% destination to use when replying - teid_upf2core :: undefined | teid(), %% TEID to be used in UPF -> Core - teid_core2upf :: undefined | teid(), %% TEID to be used in UPF <- Core - teid_acc2upf :: undefined | teid(), %% TEID to be used in UPF <- Access - teid_upf2acc :: undefined | teid(), %% TEID to be used in UPF -> Access + 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 + u2a :: undefined | teid_addr(), %% GTP-U params for UPF -> Access 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 }). @@ -91,24 +96,24 @@ %% @doc Indicate reception of E-RAB setup request (from core). %% @param Pid PID of an erab_fsm. -%% @param TEID TEID indicated by the MME. -%% @returns TEID to be sent to the eNB; an error otherwise. +%% @param TA TEID and bind address indicated by the MME. +%% @returns TEID and Addr to be sent to the eNB; an error otherwise. %% @end --spec erab_setup_req(pid(), teid()) -> {ok, teid()} | - {error, term()}. -erab_setup_req(Pid, TEID) -> - gen_statem:call(Pid, {?FUNCTION_NAME, TEID}). +-spec erab_setup_req(pid(), teid_addr()) -> {ok, teid_addr()} | + {error, term()}. +erab_setup_req(Pid, TA) -> + gen_statem:call(Pid, {?FUNCTION_NAME, TA}). %% @doc Indicate reception of E-RAB setup response (from access). %% @param Pid PID of an erab_fsm. -%% @param TEID TEID indicated by the eNB. -%% @returns TEID to be sent to the MME; an error otherwise. +%% @param TA TEID and bind address indicated by the eNB. +%% @returns TEID and Addr to be sent to the MME; an error otherwise. %% @end --spec erab_setup_rsp(pid(), teid()) -> {ok, teid()} | - {error, term()}. -erab_setup_rsp(Pid, TEID) -> - gen_statem:call(Pid, {?FUNCTION_NAME, TEID}). +-spec erab_setup_rsp(pid(), teid_addr()) -> {ok, teid_addr()} | + {error, term()}. +erab_setup_rsp(Pid, TA) -> + gen_statem:call(Pid, {?FUNCTION_NAME, TA}). -spec erab_release_req(pid()) -> ok. @@ -148,12 +153,12 @@ {keep_state, S}; erab_wait_setup_req({call, From}, - {erab_setup_req, TEID_U2C}, + {erab_setup_req, U2C}, #erab_state{} = S) -> - ?LOG_DEBUG("Rx E-RAB SETUP Req (TEID UPF -> Core ~p)", [TEID_U2C]), + ?LOG_DEBUG("Rx E-RAB SETUP Req (U2C ~p)", [U2C]), {next_state, session_establish, S#erab_state{from = From, - teid_upf2core = TEID_U2C}}; + u2c = U2C}}; erab_wait_setup_req(Event, EventData, S) -> ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), @@ -182,15 +187,16 @@ seid = SEID_Rsp, %% matches F-SEID we sent in the ESTABLISH Req ie = #{pfcp_cause := 'Request accepted', f_seid := #f_seid{seid = F_SEID}, - created_pdr := [#{f_teid := #f_teid{teid = TEID_C2U}}, - #{f_teid := #f_teid{teid = TEID_A2U}}]}} -> - ?LOG_DEBUG("PFCP session established"), + created_pdr := [#{f_teid := F_TEID_C2U}, + #{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]), {next_state, erab_wait_setup_rsp, S#erab_state{from = undefined, seid_rem = F_SEID, %% SEID to be used in further requests from us - teid_core2upf = TEID_C2U, - teid_acc2upf = TEID_A2U}, - [{reply, From, {ok, TEID_A2U}}]}; + c2u = C2U, a2u = A2U}, + [{reply, From, {ok, A2U}}]}; _ -> ?LOG_ERROR("Rx unexpected PFCP PDU: ~p", [PDU]), {stop_and_reply, @@ -213,12 +219,12 @@ {stop, {shutdown, timeout}}; erab_wait_setup_rsp({call, From}, - {erab_setup_rsp, TEID_U2A}, + {erab_setup_rsp, U2A}, #erab_state{} = S) -> - ?LOG_DEBUG("Rx E-RAB SETUP Rsp (TEID UPF -> Access ~p)", [TEID_U2A]), + ?LOG_DEBUG("Rx E-RAB SETUP Rsp (U2A ~p)", [U2A]), {next_state, session_modify, S#erab_state{from = From, - teid_upf2acc = TEID_U2A}}; + u2a = U2A}}; %% Catch-all handler for this state erab_wait_setup_rsp(Event, EventData, S) -> @@ -243,7 +249,7 @@ session_modify(info, #pfcp{} = PDU, #erab_state{from = From, seid_loc = SEID_Rsp, - teid_core2upf = TEID_C2U} = S) -> + c2u = C2U} = S) -> case PDU of #pfcp{type = session_modification_response, seid = SEID_Rsp, %% matches F-SEID we sent in the ESTABLISH Req @@ -251,7 +257,7 @@ ?LOG_DEBUG("PFCP session modified"), {next_state, erab_setup, S#erab_state{from = undefined}, - [{reply, From, {ok, TEID_C2U}}]}; + [{reply, From, {ok, C2U}}]}; _ -> ?LOG_ERROR("Rx unexpected PFCP PDU: ~p", [PDU]), {stop_and_reply, @@ -371,7 +377,7 @@ -spec session_establish_req(erab_state()) -> pfcp_peer:pfcp_session_rsp(). session_establish_req(#erab_state{seid_loc = F_SEID, %% used as F-SEID - teid_upf2core = TEID_U2C}) -> + u2c = U2C}) -> %% Packet Detection Rules OHR = #outer_header_removal{header = 'GTP-U/UDP/IPv4'}, PDRs = [#{pdr_id => {pdr_id, 1}, %% -- for Core -> Access @@ -389,11 +395,6 @@ ipv4 = choose}, source_interface => {source_interface, 'Access'}}}], %% Forwarding Action Rules - OHC = #outer_header_creation{n6 = false, - n19 = false, - type = 'GTP-U', - teid = TEID_U2C, - ipv4 = <<127,0,0,1>>}, %% XXX: Core facing addr of the UPF FARs = [#{far_id => {far_id, 1}, %% -- for Core -> Access %% We don't know the Access side TEID / GTP-U address yet, so we set %% this FAR to DROP and modify it when we get E-RAB SETUP RESPONSE. @@ -401,27 +402,44 @@ #{far_id => {far_id, 2}, %% -- for Access -> Core apply_action => #{'FORW' => []}, forwarding_parameters => - #{outer_header_creation => OHC, + #{outer_header_creation => ohc(U2C), destination_interface => {destination_interface, 'Core'}}}], pfcp_peer:session_establish_req(F_SEID, PDRs, FARs). -spec session_modify_req(erab_state()) -> pfcp_peer:pfcp_session_rsp(). session_modify_req(#erab_state{seid_rem = SEID, %% SEID allocated to us - teid_upf2acc = TEID_U2A}) -> + u2a = U2A}) -> %% Forwarding Action Rules - OHC = #outer_header_creation{n6 = false, - n19 = false, - type = 'GTP-U', - teid = TEID_U2A, - ipv4 = <<127,0,0,1>>}, %% XXX: Access facing addr of the UPF FARs = [#{far_id => {far_id, 1}, %% -- for Core -> Access %% Now we know the Core side TEID / GTP-U address, so we modify %% this FAR (which was previously set to DROP) to FORW. apply_action => #{'FORW' => []}, forwarding_parameters => - #{outer_header_creation => OHC, + #{outer_header_creation => ohc(U2A), destination_interface => {destination_interface, 'Access'}}}], pfcp_peer:session_modify_req(SEID, [], FARs). + +ohc({TEID, Addr}) -> + OHC = #outer_header_creation{n6 = false, + n19 = false, + type = 'GTP-U', + teid = TEID}, + case Addr of + << _:32 >> -> + OHC#outer_header_creation{ipv4 = Addr}; + << _:128 >> -> + OHC#outer_header_creation{ipv6 = Addr} + end. + + +%% select an address from F-SEID (prefer IPv6 over IPv4) +f_teid_addr(#f_teid{ipv6 = IPv6}) when is_binary(IPv6) -> + IPv6; +f_teid_addr(#f_teid{ipv4 = IPv4}) when is_binary(IPv4) -> + IPv4; +f_teid_addr(#f_teid{}) -> + undefined. %% TODO: erlang:error()? + %% vim:set ts=4 sw=4 et: diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index 5c42f61..1722b3c 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -3,6 +3,11 @@ -include_lib("eunit/include/eunit.hrl"). -include("pfcp_mock.hrl"). +-define(U2C, {?TEID_U2C, ?ADDR_U2C}). +-define(C2U, {?TEID_C2U, ?ADDR_C2U}). +-define(A2U, {?TEID_A2U, ?ADDR_A2U}). +-define(U2A, {?TEID_U2A, ?ADDR_U2A}). + %% ------------------------------------------------------------------ %% setup functions %% ------------------------------------------------------------------ @@ -57,8 +62,8 @@ %% ------------------------------------------------------------------ test_erab_setup_success(Pid) -> - [?_assertEqual({ok, ?TEID_A2U}, erab_fsm:erab_setup_req(Pid, ?TEID_U2C)), - ?_assertEqual({ok, ?TEID_C2U}, erab_fsm:erab_setup_rsp(Pid, ?TEID_U2A)), + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), ?_assertEqual(ok, erab_fsm:shutdown(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. @@ -71,7 +76,7 @@ pfcp_mock:mock_req(session_establish_req, PDU), unlink(Pid), %% we expect the FSM to terminate abnormally Error = {unexp_pdu, session_establish}, - [?_assertEqual({error, Error}, erab_fsm:erab_setup_req(Pid, ?TEID_U2C)), + [?_assertEqual({error, Error}, erab_fsm:erab_setup_req(Pid, ?U2C)), ?_assertNot(erlang:is_process_alive(Pid))]. @@ -81,14 +86,14 @@ pfcp_mock:mock_req(session_modify_req, PDU), unlink(Pid), %% we expect the FSM to terminate abnormally Error = {unexp_pdu, session_modify}, - [?_assertEqual({ok, ?TEID_A2U}, erab_fsm:erab_setup_req(Pid, ?TEID_U2C)), - ?_assertEqual({error, Error}, erab_fsm:erab_setup_rsp(Pid, ?TEID_U2A)), + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual({error, Error}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), ?_assertNot(erlang:is_process_alive(Pid))]. test_erab_release_success(Pid) -> - [?_assertEqual({ok, ?TEID_A2U}, erab_fsm:erab_setup_req(Pid, ?TEID_U2C)), - ?_assertEqual({ok, ?TEID_C2U}, erab_fsm:erab_setup_rsp(Pid, ?TEID_U2A)), + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), ?_assertEqual(ok, erab_fsm:erab_release_req(Pid)), ?_assertEqual(ok, erab_fsm:erab_release_rsp(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. @@ -100,8 +105,8 @@ pfcp_mock:mock_req(session_delete_req, PDU), unlink(Pid), %% we expect the FSM to terminate abnormally Error = {unexp_pdu, session_delete}, - [?_assertEqual({ok, ?TEID_A2U}, erab_fsm:erab_setup_req(Pid, ?TEID_U2C)), - ?_assertEqual({ok, ?TEID_C2U}, erab_fsm:erab_setup_rsp(Pid, ?TEID_U2A)), + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), ?_assertEqual({error, Error}, erab_fsm:erab_release_req(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. @@ -114,8 +119,8 @@ test_erab_shutdown_session_del(Pid) -> - [?_assertEqual({ok, ?TEID_A2U}, erab_fsm:erab_setup_req(Pid, ?TEID_U2C)), - ?_assertEqual({ok, ?TEID_C2U}, erab_fsm:erab_setup_rsp(Pid, ?TEID_U2A)), + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), ?_assertEqual(ok, erab_fsm:shutdown(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. diff --git a/test/pfcp_mock.erl b/test/pfcp_mock.erl index 635223a..0df8c0b 100644 --- a/test/pfcp_mock.erl +++ b/test/pfcp_mock.erl @@ -89,8 +89,10 @@ pdu_session_establish_rsp() -> IEs = #{pfcp_cause => 'Request accepted', f_seid => #f_seid{seid = ?SEID_Rem}, - created_pdr => [#{f_teid => #f_teid{teid = ?TEID_C2U}}, - #{f_teid => #f_teid{teid = ?TEID_A2U}}]}, + created_pdr => [#{f_teid => #f_teid{teid = ?TEID_C2U, + ipv4 = ?ADDR_C2U}}, + #{f_teid => #f_teid{teid = ?TEID_A2U, + ipv4 = ?ADDR_A2U}}]}, pdu_rsp(session_establishment_response, ?SEID_Loc, IEs). diff --git a/test/pfcp_mock.hrl b/test/pfcp_mock.hrl index 3a54ade..c044939 100644 --- a/test/pfcp_mock.hrl +++ b/test/pfcp_mock.hrl @@ -6,4 +6,9 @@ -define(TEID_A2U, 16#0202). %% UPF <- Access -define(TEID_U2A, 16#0002). %% UPF -> Access +-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 + %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37804?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: Ifdc492c41266d07d0e951dcdcc1e4ba74da0b13b Gerrit-Change-Number: 37804 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: fix message flow misconceptions
by fixeria 12 Aug '24

12 Aug '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37803?usp=email ) Change subject: erab_fsm: fix message flow misconceptions ...................................................................... erab_fsm: fix message flow misconceptions Change-Id: Ie6f65516fd5621acf002de97eeeb2b9b0b4fae4a Fixes: 9f2a172 "erab_fsm: E-RAB FSM implementation" --- M src/erab_fsm.erl M test/erab_fsm_test.erl M test/pfcp_mock.erl M test/pfcp_mock.hrl 4 files changed, 48 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/03/37803/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 8a9d0ec..abc25b1 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -66,10 +66,10 @@ -type teid() :: 0..16#ffffffff. -record(erab_state, {from :: undefined | gen_statem:from(), %% destination to use when replying - teid_from_access :: undefined | teid(), %% TEID to be used in eNB -> UPF - teid_to_access :: undefined | teid(), %% TEID to be used in UPF -> eNB - teid_from_core :: undefined | teid(), %% TEID to be used in PGW -> UPF - teid_to_core :: undefined | teid(), %% TEID to be used in UPF -> PGW + teid_upf2core :: undefined | teid(), %% TEID to be used in UPF -> Core + teid_core2upf :: undefined | teid(), %% TEID to be used in UPF <- Core + teid_acc2upf :: undefined | teid(), %% TEID to be used in UPF <- Access + teid_upf2acc :: undefined | teid(), %% TEID to be used in UPF -> Access 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 }). @@ -89,10 +89,10 @@ gen_statem:start_link(?MODULE, [UID], []). -%% @doc Indicate reception of E-RAB setup request (from the eNB). +%% @doc Indicate reception of E-RAB setup request (from core). %% @param Pid PID of an erab_fsm. -%% @param TEID TEID chosen by the eNB. -%% @returns TEID to be sent to the core; an error otherwise. +%% @param TEID TEID indicated by the MME. +%% @returns TEID to be sent to the eNB; an error otherwise. %% @end -spec erab_setup_req(pid(), teid()) -> {ok, teid()} | {error, term()}. @@ -100,10 +100,10 @@ gen_statem:call(Pid, {?FUNCTION_NAME, TEID}). -%% @doc Indicate reception of E-RAB setup response (from the core). +%% @doc Indicate reception of E-RAB setup response (from access). %% @param Pid PID of an erab_fsm. -%% @param TEID TEID chosen by the core. -%% @returns TEID to be sent to the eNB; an error otherwise. +%% @param TEID TEID indicated by the eNB. +%% @returns TEID to be sent to the MME; an error otherwise. %% @end -spec erab_setup_rsp(pid(), teid()) -> {ok, teid()} | {error, term()}. @@ -142,18 +142,18 @@ [state_functions, state_enter]. -%% state WAIT_SETUP_REQ :: wait E-RAB SETUP Req from the Access +%% state WAIT_SETUP_REQ :: wait E-RAB SETUP Req from core erab_wait_setup_req(enter, ?FUNCTION_NAME, S) -> ?LOG_DEBUG("State enter: ~p", [?FUNCTION_NAME]), {keep_state, S}; erab_wait_setup_req({call, From}, - {erab_setup_req, TEID_FromAcc}, + {erab_setup_req, TEID_U2C}, #erab_state{} = S) -> - ?LOG_DEBUG("Rx E-RAB SETUP Req (Access TEID ~p)", [TEID_FromAcc]), + ?LOG_DEBUG("Rx E-RAB SETUP Req (TEID UPF -> Core ~p)", [TEID_U2C]), {next_state, session_establish, S#erab_state{from = From, - teid_from_access = TEID_FromAcc}}; + teid_upf2core = TEID_U2C}}; erab_wait_setup_req(Event, EventData, S) -> ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), @@ -182,15 +182,15 @@ seid = SEID_Rsp, %% matches F-SEID we sent in the ESTABLISH Req ie = #{pfcp_cause := 'Request accepted', f_seid := #f_seid{seid = F_SEID}, - created_pdr := [#{f_teid := #f_teid{teid = TEID_ToCore}}, - #{f_teid := #f_teid{teid = TEID_ToAcc}}]}} -> + created_pdr := [#{f_teid := #f_teid{teid = TEID_C2U}}, + #{f_teid := #f_teid{teid = TEID_A2U}}]}} -> ?LOG_DEBUG("PFCP session established"), {next_state, erab_wait_setup_rsp, S#erab_state{from = undefined, seid_rem = F_SEID, %% SEID to be used in further requests from us - teid_to_core = TEID_ToCore, - teid_to_access = TEID_ToAcc}, - [{reply, From, {ok, TEID_ToCore}}]}; + teid_core2upf = TEID_C2U, + teid_acc2upf = TEID_A2U}, + [{reply, From, {ok, TEID_A2U}}]}; _ -> ?LOG_ERROR("Rx unexpected PFCP PDU: ~p", [PDU]), {stop_and_reply, @@ -203,7 +203,7 @@ {keep_state, S}. -%% state WAIT_SETUP_RSP :: wait E-RAB SETUP Rsp from the Core +%% state WAIT_SETUP_RSP :: wait E-RAB SETUP Rsp from access erab_wait_setup_rsp(enter, OldState, S) -> ?LOG_DEBUG("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), {next_state, ?FUNCTION_NAME, S, %% loop transition to enable state_timeout @@ -213,12 +213,12 @@ {stop, {shutdown, timeout}}; erab_wait_setup_rsp({call, From}, - {erab_setup_rsp, TEID_FromCore}, + {erab_setup_rsp, TEID_U2A}, #erab_state{} = S) -> - ?LOG_DEBUG("Rx E-RAB SETUP Rsp (Core TEID ~p)", [TEID_FromCore]), + ?LOG_DEBUG("Rx E-RAB SETUP Rsp (TEID UPF -> Access ~p)", [TEID_U2A]), {next_state, session_modify, S#erab_state{from = From, - teid_from_core = TEID_FromCore}}; + teid_upf2acc = TEID_U2A}}; %% Catch-all handler for this state erab_wait_setup_rsp(Event, EventData, S) -> @@ -243,7 +243,7 @@ session_modify(info, #pfcp{} = PDU, #erab_state{from = From, seid_loc = SEID_Rsp, - teid_to_access = TEID_ToAcc} = S) -> + teid_core2upf = TEID_C2U} = S) -> case PDU of #pfcp{type = session_modification_response, seid = SEID_Rsp, %% matches F-SEID we sent in the ESTABLISH Req @@ -251,7 +251,7 @@ ?LOG_DEBUG("PFCP session modified"), {next_state, erab_setup, S#erab_state{from = undefined}, - [{reply, From, {ok, TEID_ToAcc}}]}; + [{reply, From, {ok, TEID_C2U}}]}; _ -> ?LOG_ERROR("Rx unexpected PFCP PDU: ~p", [PDU]), {stop_and_reply, @@ -322,7 +322,7 @@ {keep_state, S}. -%% state WAIT_RELEASE_RSP :: wait E-RAB RELEASE Rsp from the Core +%% state WAIT_RELEASE_RSP :: wait E-RAB RELEASE Rsp erab_wait_release_rsp(enter, OldState, S) -> ?LOG_DEBUG("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), {next_state, ?FUNCTION_NAME, S, %% loop transition to enable state_timeout @@ -371,7 +371,7 @@ -spec session_establish_req(erab_state()) -> pfcp_peer:pfcp_session_rsp(). session_establish_req(#erab_state{seid_loc = F_SEID, %% used as F-SEID - teid_from_access = TEID_FromAcc}) -> + teid_upf2core = TEID_U2C}) -> %% Packet Detection Rules OHR = #outer_header_removal{header = 'GTP-U/UDP/IPv4'}, PDRs = [#{pdr_id => {pdr_id, 1}, %% -- for Core -> Access @@ -392,10 +392,10 @@ OHC = #outer_header_creation{n6 = false, n19 = false, type = 'GTP-U', - teid = TEID_FromAcc, + teid = TEID_U2C, ipv4 = <<127,0,0,1>>}, %% XXX: Core facing addr of the UPF FARs = [#{far_id => {far_id, 1}, %% -- for Core -> Access - %% We don't know the Core side TEID / GTP-U address yet, so we set + %% We don't know the Access side TEID / GTP-U address yet, so we set %% this FAR to DROP and modify it when we get E-RAB SETUP RESPONSE. apply_action => #{'DROP' => []}}, #{far_id => {far_id, 2}, %% -- for Access -> Core @@ -408,12 +408,12 @@ -spec session_modify_req(erab_state()) -> pfcp_peer:pfcp_session_rsp(). session_modify_req(#erab_state{seid_rem = SEID, %% SEID allocated to us - teid_from_core = TEID_FromCore}) -> + teid_upf2acc = TEID_U2A}) -> %% Forwarding Action Rules OHC = #outer_header_creation{n6 = false, n19 = false, type = 'GTP-U', - teid = TEID_FromCore, + teid = TEID_U2A, ipv4 = <<127,0,0,1>>}, %% XXX: Access facing addr of the UPF FARs = [#{far_id => {far_id, 1}, %% -- for Core -> Access %% Now we know the Core side TEID / GTP-U address, so we modify diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index fce03fd..5c42f61 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -57,8 +57,8 @@ %% ------------------------------------------------------------------ test_erab_setup_success(Pid) -> - [?_assertEqual({ok, ?TEID_ToCore}, erab_fsm:erab_setup_req(Pid, ?TEID_FromAcc)), - ?_assertEqual({ok, ?TEID_ToAcc}, erab_fsm:erab_setup_rsp(Pid, ?TEID_FromCore)), + [?_assertEqual({ok, ?TEID_A2U}, erab_fsm:erab_setup_req(Pid, ?TEID_U2C)), + ?_assertEqual({ok, ?TEID_C2U}, erab_fsm:erab_setup_rsp(Pid, ?TEID_U2A)), ?_assertEqual(ok, erab_fsm:shutdown(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. @@ -71,7 +71,7 @@ pfcp_mock:mock_req(session_establish_req, PDU), unlink(Pid), %% we expect the FSM to terminate abnormally Error = {unexp_pdu, session_establish}, - [?_assertEqual({error, Error}, erab_fsm:erab_setup_req(Pid, ?TEID_FromAcc)), + [?_assertEqual({error, Error}, erab_fsm:erab_setup_req(Pid, ?TEID_U2C)), ?_assertNot(erlang:is_process_alive(Pid))]. @@ -81,14 +81,14 @@ pfcp_mock:mock_req(session_modify_req, PDU), unlink(Pid), %% we expect the FSM to terminate abnormally Error = {unexp_pdu, session_modify}, - [?_assertEqual({ok, ?TEID_ToCore}, erab_fsm:erab_setup_req(Pid, ?TEID_FromAcc)), - ?_assertEqual({error, Error}, erab_fsm:erab_setup_rsp(Pid, ?TEID_FromCore)), + [?_assertEqual({ok, ?TEID_A2U}, erab_fsm:erab_setup_req(Pid, ?TEID_U2C)), + ?_assertEqual({error, Error}, erab_fsm:erab_setup_rsp(Pid, ?TEID_U2A)), ?_assertNot(erlang:is_process_alive(Pid))]. test_erab_release_success(Pid) -> - [?_assertEqual({ok, ?TEID_ToCore}, erab_fsm:erab_setup_req(Pid, ?TEID_FromAcc)), - ?_assertEqual({ok, ?TEID_ToAcc}, erab_fsm:erab_setup_rsp(Pid, ?TEID_FromCore)), + [?_assertEqual({ok, ?TEID_A2U}, erab_fsm:erab_setup_req(Pid, ?TEID_U2C)), + ?_assertEqual({ok, ?TEID_C2U}, erab_fsm:erab_setup_rsp(Pid, ?TEID_U2A)), ?_assertEqual(ok, erab_fsm:erab_release_req(Pid)), ?_assertEqual(ok, erab_fsm:erab_release_rsp(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. @@ -100,8 +100,8 @@ pfcp_mock:mock_req(session_delete_req, PDU), unlink(Pid), %% we expect the FSM to terminate abnormally Error = {unexp_pdu, session_delete}, - [?_assertEqual({ok, ?TEID_ToCore}, erab_fsm:erab_setup_req(Pid, ?TEID_FromAcc)), - ?_assertEqual({ok, ?TEID_ToAcc}, erab_fsm:erab_setup_rsp(Pid, ?TEID_FromCore)), + [?_assertEqual({ok, ?TEID_A2U}, erab_fsm:erab_setup_req(Pid, ?TEID_U2C)), + ?_assertEqual({ok, ?TEID_C2U}, erab_fsm:erab_setup_rsp(Pid, ?TEID_U2A)), ?_assertEqual({error, Error}, erab_fsm:erab_release_req(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. @@ -114,8 +114,8 @@ test_erab_shutdown_session_del(Pid) -> - [?_assertEqual({ok, ?TEID_ToCore}, erab_fsm:erab_setup_req(Pid, ?TEID_FromAcc)), - ?_assertEqual({ok, ?TEID_ToAcc}, erab_fsm:erab_setup_rsp(Pid, ?TEID_FromCore)), + [?_assertEqual({ok, ?TEID_A2U}, erab_fsm:erab_setup_req(Pid, ?TEID_U2C)), + ?_assertEqual({ok, ?TEID_C2U}, erab_fsm:erab_setup_rsp(Pid, ?TEID_U2A)), ?_assertEqual(ok, erab_fsm:shutdown(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. diff --git a/test/pfcp_mock.erl b/test/pfcp_mock.erl index c9f8297..635223a 100644 --- a/test/pfcp_mock.erl +++ b/test/pfcp_mock.erl @@ -89,8 +89,8 @@ pdu_session_establish_rsp() -> IEs = #{pfcp_cause => 'Request accepted', f_seid => #f_seid{seid = ?SEID_Rem}, - created_pdr => [#{f_teid => #f_teid{teid = ?TEID_ToCore}}, - #{f_teid => #f_teid{teid = ?TEID_ToAcc}}]}, + created_pdr => [#{f_teid => #f_teid{teid = ?TEID_C2U}}, + #{f_teid => #f_teid{teid = ?TEID_A2U}}]}, pdu_rsp(session_establishment_response, ?SEID_Loc, IEs). diff --git a/test/pfcp_mock.hrl b/test/pfcp_mock.hrl index 06b5c5a..3a54ade 100644 --- a/test/pfcp_mock.hrl +++ b/test/pfcp_mock.hrl @@ -1,9 +1,9 @@ -define(SEID_Loc, 16#dead). -define(SEID_Rem, 16#beef). --define(TEID_FromAcc, 16#0001). --define(TEID_FromCore, 16#0002). --define(TEID_ToAcc, 16#0003). --define(TEID_ToCore, 16#0004). +-define(TEID_U2C, 16#0001). %% UPF -> Core +-define(TEID_C2U, 16#0101). %% UPF <- Core +-define(TEID_A2U, 16#0202). %% UPF <- Access +-define(TEID_U2A, 16#0002). %% UPF -> Access %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37803?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: Ie6f65516fd5621acf002de97eeeb2b9b0b4fae4a Gerrit-Change-Number: 37803 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in libosmocore[master]: After writing VTY config, run sync() in a different thread
by laforge 12 Aug '24

12 Aug '24

Attention is currently required from: fixeria, jolly. laforge has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/libosmocore/+/37798?usp=email ) Change subject: After writing VTY config, run sync() in a different thread ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Not saying there can't be a better way, though ;) […] I am quite sure the reason is "because it was easy to do". We don't care about whatever operations happen on the old file. We really only care that the newly written file has been written. So IMHO what is needed is fsync() on the [new] file itself, as well as fsync to the directory cotnaining the file. The "link" call (working with path names) might need to change to "linkat" (work with directory file descriptors)? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37798?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3cb2ee68b2e4c730f96522208c4abf00d0f49a44 Gerrit-Change-Number: 37798 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 Aug 2024 19:04:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log