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

[S] Change in osmo-ttcn3-hacks[master]: mme: expect authentication during 2g->4G TAU procedure

by pespin

Attention is currently required from: daniel, fixeria, lynxis lazus. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37892?usp=email ) Change subject: mme: expect authentication during 2g->4G TAU procedure ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5ebcaf23a643b6cb97534328737257d26d3981fe Gerrit-Change-Number: 37892 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 22 Aug 2024 11:27:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 year

1
0
0 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: properly omit Network Instance IE

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37857?usp=email ) Change subject: erab_fsm: properly omit Network Instance IE ...................................................................... erab_fsm: properly omit Network Instance IE If the access/core Network Instance IE value is not configured, the 'network_instance' field shall not be added to PDRs and FARs. Otherwise we hit a function_clause exception in pfcplib. Change-Id: I643a23eeb1cfb699cda44f973cb8098edb0a9a83 Fixes: 3d8119c "erab_fsm: include Network Instance IE in PDRs and FARs" --- M src/erab_fsm.erl 1 file changed, 42 insertions(+), 28 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 931b47f..544f5ab 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -81,6 +81,10 @@ -type erab_state() :: #erab_state{}. +-type iface() :: 'Core' | 'Access'. +-type pfcp_ie() :: map(). + + %% ------------------------------------------------------------------ %% public API %% ------------------------------------------------------------------ @@ -375,68 +379,78 @@ logger:set_process_metadata(#{prefix => Prefix}). --spec net_inst(atom()) -> undefined | binary(). -net_inst(Param) -> - case application:get_env(osmo_s1gw, Param) of - {ok, Val} -> Val; - undefined -> undefined - end. - - -spec session_establish_req(erab_state()) -> pfcp_peer:pfcp_session_rsp(). session_establish_req(#erab_state{seid_loc = F_SEID, %% used as F-SEID u2c = U2C}) -> - %% Network Instance IE values for core/access - NI_Core = net_inst(pfcp_net_inst_core), - NI_Access = net_inst(pfcp_net_inst_access), %% Packet Detection Rules OHR = #outer_header_removal{header = 'GTP-U/UDP/IPv4'}, PDRs = [#{pdr_id => {pdr_id, 1}, %% -- for Core -> Access far_id => {far_id, 1}, %% see FARs below precedence => {precedence, 255}, outer_header_removal => OHR, - pdi => #{f_teid => #f_teid{teid = choose, - ipv4 = choose}, - network_instance => NI_Core, - source_interface => {source_interface, 'Core'}}}, + pdi => pdi('Core')}, #{pdr_id => {pdr_id, 2}, %% -- for Access -> Core far_id => {far_id, 2}, %% see FARs below precedence => {precedence, 255}, outer_header_removal => OHR, - pdi => #{f_teid => #f_teid{teid = choose, - ipv4 = choose}, - network_instance => NI_Access, - source_interface => {source_interface, 'Access'}}}], + pdi => pdi('Access')}], %% Forwarding Action Rules + FPars = #{outer_header_creation => ohc(U2C), + destination_interface => {destination_interface, 'Core'}}, + FParsNI = add_net_inst(FPars, 'Core'), %% optional Network Instance IE 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. apply_action => #{'DROP' => []}}, #{far_id => {far_id, 2}, %% -- for Access -> Core apply_action => #{'FORW' => []}, - forwarding_parameters => - #{outer_header_creation => ohc(U2C), - network_instance => NI_Core, - destination_interface => {destination_interface, 'Core'}}}], + forwarding_parameters => FParsNI}], 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 u2a = U2A}) -> - %% Network Instance IE value for access - NI_Access = net_inst(pfcp_net_inst_access), %% 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. apply_action => #{'FORW' => []}, - update_forwarding_parameters => - #{outer_header_creation => ohc(U2A), - network_instance => NI_Access}}], + update_forwarding_parameters => FParsNI}], pfcp_peer:session_modify_req(SEID, [], FARs). +%% Network Instance IE env parameter name +-spec net_inst_param(iface()) -> atom(). +net_inst_param('Core') -> pfcp_net_inst_core; +net_inst_param('Access') -> pfcp_net_inst_access. + + +%% if configured, add Network Instance IE (optional) +-spec add_net_inst(pfcp_ie(), iface()) -> pfcp_ie(). +add_net_inst(IE, Iface) -> + Param = net_inst_param(Iface), + case application:get_env(osmo_s1gw, Param) of + {ok, NI} -> + IE#{network_instance => NI}; + undefined -> + IE + end. + + +%% Packet Detection Information IE generator +-spec pdi(iface()) -> pfcp_ie(). +pdi(SrcIface) -> + IE = #{f_teid => #f_teid{teid = choose, + ipv4 = choose}, + source_interface => {source_interface, SrcIface}}, + %% if configured, add Network Instance IE (optional) + add_net_inst(IE, SrcIface). + + +%% Outer Header Creation IE generator ohc({TEID, Addr}) -> OHC = #outer_header_creation{n6 = false, n19 = false, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37857?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I643a23eeb1cfb699cda44f973cb8098edb0a9a83 Gerrit-Change-Number: 37857 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 year

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: handle E-RAB RELEASE COMMAND/RESPONSE

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37805?usp=email ) Change subject: s1ap_proxy: handle E-RAB RELEASE COMMAND/RESPONSE ...................................................................... s1ap_proxy: handle E-RAB RELEASE COMMAND/RESPONSE Change-Id: I9c5f279886b548c539211e1e709ae0c6e1cd2788 --- M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 2 files changed, 106 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 048b91d..f28ff56 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"). -type mme_ue_id() :: 0..16#ffffffff. @@ -149,6 +150,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', @@ -238,6 +259,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: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I9c5f279886b548c539211e1e709ae0c6e1cd2788 Gerrit-Change-Number: 37805 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 year

1
0
0 0

[L] Change in ...osmo-s1gw[master]: {sctp,s1ap}_proxy: employ E-RAB FSMs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37463?usp=email ) Change subject: {sctp,s1ap}_proxy: employ E-RAB FSMs ...................................................................... {sctp,s1ap}_proxy: employ E-RAB FSMs Change-Id: Ibb7e25ab3adbadd7fd85e9cb22e0136c6ca133cf --- M src/s1ap_proxy.erl M src/sctp_proxy.erl M test/s1ap_proxy_test.erl 3 files changed, 166 insertions(+), 117 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index eaa7dfd..048b91d 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -37,6 +37,7 @@ -export([init/0, deinit/1, handle_pdu/2, + handle_exit/2, encode_pdu/1, decode_pdu/1]). @@ -48,7 +49,14 @@ -include("S1AP-Constants.hrl"). --record(proxy_state, { }). +-type mme_ue_id() :: 0..16#ffffffff. +-type enb_ue_id() :: 0..16#ffffff. +-type erab_id() :: 0..16#ff. + +-record(proxy_state, {erabs :: dict:dict(), + mme_ue_id :: undefined | mme_ue_id(), + enb_ue_id :: undefined | enb_ue_id() + }). -type proxy_state() :: #proxy_state{}. @@ -59,7 +67,7 @@ %% Initialize per-connection data -spec init() -> proxy_state(). init() -> - #proxy_state{}. + #proxy_state{erabs = dict:new()}. %% De-initialize per-connection data @@ -81,6 +89,13 @@ end. +%% Handle an exit event +-spec handle_exit(pid(), proxy_state()) -> proxy_state(). +handle_exit(Pid, #proxy_state{erabs = ERABs} = S) -> + Fun = fun(_Key, Val) -> Val =/= Pid end, + S#proxy_state{erabs = dict:filter(Fun, ERABs)}. + + %% ------------------------------------------------------------------ %% private API %% ------------------------------------------------------------------ @@ -189,10 +204,16 @@ handle_ies(Content, ?'id-E-RABToBeSetupItemBearerSUReq', S); handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupItemBearerSUReq', - value = Content}, S) -> - %% eNB -> MME direction: we pass our MME facing local address - TLA = transp_layer_addr(mme_loc_addr), - {Content#'E-RABToBeSetupItemBearerSUReq'{transportLayerAddress = TLA}, S}; + value = C0}, S0) -> + %% start and register an E-RAB FSM + #'E-RABToBeSetupItemBearerSUReq'{'e-RAB-ID' = ERABId, + 'transportLayerAddress' = TLA_In, + 'gTP-TEID' = << TEID_In:32/big >>} = C0, + {Pid, S1} = erab_fsm_start_reg(ERABId, S0), + {ok, {TEID_Out, TLA_Out}} = erab_fsm:erab_setup_req(Pid, {TEID_In, TLA_In}), + C1 = C0#'E-RABToBeSetupItemBearerSUReq'{'transportLayerAddress' = TLA_Out, + 'gTP-TEID' = << TEID_Out:32/big >>}, + {C1, S1}; %% E-RAB SETUP RESPONSE related IEs handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupListBearerSURes', @@ -201,10 +222,21 @@ handle_ies(Content, ?'id-E-RABSetupItemBearerSURes', S); handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupItemBearerSURes', - value = Content}, S) -> - %% MME -> eNB direction: we pass our eNB facing local address - TLA = transp_layer_addr(s1gw_bind_addr), - {Content#'E-RABSetupItemBearerSURes'{transportLayerAddress = TLA}, S}; + value = C0}, S) -> + %% poke E-RAB FSM + #'E-RABSetupItemBearerSURes'{'e-RAB-ID' = ERABId, + 'transportLayerAddress' = TLA_In, + 'gTP-TEID' = << TEID_In:32/big >>} = C0, + C1 = case erab_fsm_find(ERABId, S) of + {ok, Pid} -> + {ok, {TEID_Out, TLA_Out}} = erab_fsm:erab_setup_rsp(Pid, {TEID_In, TLA_In}), + C0#'E-RABSetupItemBearerSURes'{'transportLayerAddress' = TLA_Out, + 'gTP-TEID' = << TEID_Out:32/big >>}; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [ERABId]), + C0 %% XXX: proxy as-is or drop? + end, + {C1, S}; %% E-RAB MODIFICATION INDICATION related IEs handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeModifiedListBearerModInd', @@ -214,9 +246,8 @@ handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeModifiedItemBearerModInd', value = Content}, S) -> - %% eNB -> MME direction: we pass our MME facing local address - TLA = transp_layer_addr(mme_loc_addr), - {Content#'E-RABToBeModifiedItemBearerModInd'{transportLayerAddress = TLA}, S}; + %% TODO: find and poke an E-RAB FSM associated with this E-RAB + {Content#'E-RABToBeModifiedItemBearerModInd'{}, S}; handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABNotToBeModifiedListBearerModInd', value = Content}, S) -> @@ -225,9 +256,8 @@ handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABNotToBeModifiedItemBearerModInd', value = Content}, S) -> - %% eNB -> MME direction: we pass our MME facing local address - TLA = transp_layer_addr(mme_loc_addr), - {Content#'E-RABNotToBeModifiedItemBearerModInd'{transportLayerAddress = TLA}, S}; + %% TODO: find and poke an E-RAB FSM associated with this E-RAB + {Content#'E-RABNotToBeModifiedItemBearerModInd'{}, S}; %% INITIAL CONTEXT SETUP REQUEST related IEs handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupListCtxtSUReq', @@ -236,10 +266,16 @@ handle_ies(Content, ?'id-E-RABToBeSetupItemCtxtSUReq', S); handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupItemCtxtSUReq', - value = Content}, S) -> - %% eNB -> MME direction: we pass our MME facing local address - TLA = transp_layer_addr(mme_loc_addr), - {Content#'E-RABToBeSetupItemCtxtSUReq'{transportLayerAddress = TLA}, S}; + value = C0}, S0) -> + %% start and register an E-RAB FSM + #'E-RABToBeSetupItemCtxtSUReq'{'e-RAB-ID' = ERABId, + 'transportLayerAddress' = TLA_In, + 'gTP-TEID' = << TEID_In:32/big >>} = C0, + {Pid, S1} = erab_fsm_start_reg(ERABId, S0), + {ok, {TEID_Out, TLA_Out}} = erab_fsm:erab_setup_req(Pid, {TEID_In, TLA_In}), + C1 = C0#'E-RABToBeSetupItemCtxtSUReq'{'transportLayerAddress' = TLA_Out, + 'gTP-TEID' = << TEID_Out:32/big >>}, + {C1, S1}; %% INITIAL CONTEXT SETUP RESPONSE related IEs handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupListCtxtSURes', @@ -248,10 +284,21 @@ handle_ies(Content, ?'id-E-RABSetupItemCtxtSURes', S); handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupItemCtxtSURes', - value = Content}, S) -> - %% MME -> eNB direction: we pass our eNB facing local address - TLA = transp_layer_addr(s1gw_bind_addr), - {Content#'E-RABSetupItemCtxtSURes'{transportLayerAddress = TLA}, S}; + value = C0}, S) -> + %% poke E-RAB FSM + #'E-RABSetupItemCtxtSURes'{'e-RAB-ID' = ERABId, + 'transportLayerAddress' = TLA_In, + 'gTP-TEID' = << TEID_In:32/big >>} = C0, + C1 = case erab_fsm_find(ERABId, S) of + {ok, Pid} -> + {ok, {TEID_Out, TLA_Out}} = erab_fsm:erab_setup_rsp(Pid, {TEID_In, TLA_In}), + C0#'E-RABSetupItemCtxtSURes'{'transportLayerAddress' = TLA_Out, + 'gTP-TEID' = << TEID_Out:32/big >>}; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [ERABId]), + C0 %% XXX: proxy as-is or drop? + end, + {C1, S}; %% Catch-all variant, which should not be called normally handle_ie(#'ProtocolIE-Field'{value = Content} = IE, S) -> @@ -261,6 +308,7 @@ %% Iterate over the given list of 'ProtocolIE-Field' IEs, %% calling function handle_ie/1 for IEs matching the given IEI. +%% Additionally look for {MME,eNB}-UE-S1AP-ID IEs and store their values. -spec handle_ies(list(), integer(), proxy_state()) -> {list(), proxy_state()}. handle_ies(IEs, IEI, S) -> handle_ies([], IEs, IEI, S). @@ -271,6 +319,12 @@ {Content, S1} = handle_ie(IE, S0), NewIE = IE#'ProtocolIE-Field'{value = Content}, handle_ies([NewIE | Acc], IEs, IEI, S1); + #'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); + #'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], IEs, IEI, S0) end; @@ -279,12 +333,20 @@ {lists:reverse(Acc), S}. -%% GTP-U IP address (TransportLayerAddress) to be used while patching --spec transp_layer_addr(atom()) -> binary(). -transp_layer_addr(EnvParam) -> - {ok, AddrStr} = application:get_env(osmo_s1gw, EnvParam), - {ok, Addr} = inet:parse_address(AddrStr), - %% sadly, there exists inet:ntoa/1, but not inet:aton/1 - list_to_binary(tuple_to_list(Addr)). +-spec erab_fsm_start_reg(erab_id(), proxy_state()) -> {pid(), proxy_state()}. +erab_fsm_start_reg(RABId, #proxy_state{erabs = ERABs, + mme_ue_id = MmeUeId, + enb_ue_id = EnbUeId} = S) -> + UID = {MmeUeId, EnbUeId, RABId}, + {ok, Pid} = erab_fsm:start_link(UID), + {Pid, S#proxy_state{erabs = dict:store(UID, Pid, ERABs)}}. + + +-spec erab_fsm_find(erab_id(), proxy_state()) -> {ok, pid()} | error. +erab_fsm_find(RABId, #proxy_state{erabs = ERABs, + mme_ue_id = MmeUeId, + enb_ue_id = EnbUeId}) -> + UID = {MmeUeId, EnbUeId, RABId}, + dict:find(UID, ERABs). %% vim:set ts=4 sw=4 et: diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index 148e00a..1d8d305 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -167,6 +167,13 @@ sctp_server:send_data(EnbAid, NewData), {keep_state, S#{priv := NewPriv}}; +%% Handle termination events of the child processes +connected(info, {'EXIT', Pid, Reason}, + #{priv := Priv} = S) -> + ?LOG_DEBUG("Child process ~p terminated with reason ~p", [Pid, Reason]), + NewPriv = s1ap_proxy:handle_exit(Pid, Priv), + {keep_state, S#{priv := NewPriv}}; + %% Catch-all for other kinds of SCTP events connected(info, {sctp, _Socket, MmeAddr, MmePort, {AncData, Data}}, S) -> diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index cb0a4ca..9426119 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -1,9 +1,7 @@ -module(s1ap_proxy_test). -include_lib("eunit/include/eunit.hrl"). - --define(EXP_ADDR_STR, "127.0.0.1"). --define(EXP_ADDR_BIN, << 16#7f, 16#00, 16#00, 16#01 >>). +-include("pfcp_mock.hrl"). %% ------------------------------------------------------------------ %% setup functions @@ -16,10 +14,12 @@ start() -> + pfcp_mock:mock_all(), s1ap_proxy:init(). stop(S) -> + pfcp_mock:unmock_all(), s1ap_proxy:deinit(S). @@ -30,22 +30,67 @@ s1ap_proxy_test_() -> [{"S1 SETUP REQUEST (unmodified)", ?TC(fun test_s1_setup_req/1)}, - {"E-RAB SETUP REQUEST", - ?TC(fun test_e_rab_setup_req/1)}, - {"E-RAB SETUP RESPONSE", - ?TC(fun test_e_rab_setup_rsp/1)}, + {"E-RAB SETUP REQUEST/RESPONSE", + ?TC(fun test_e_rab_setup/1)}, {"E-RAB MODIFICATION INDICATION", ?TC(fun test_e_rab_modify_ind/1)}, - {"INITIAL CONTEXT SETUP REQUEST", - ?TC(fun test_initial_context_setup_req/1)}, - {"INITIAL CONTEXT SETUP RESPONSE", - ?TC(fun test_initial_context_setup_rsp/1)}]. + {"INITIAL CONTEXT SETUP REQUEST/RESPONSE", + ?TC(fun test_initial_context_setup/1)}]. %% ------------------------------------------------------------------ %% actual testcases %% ------------------------------------------------------------------ +test_s1_setup_req(S0) -> + SetupReq = s1_setup_req_pdu(), + %% Expect the PDU to be proxied unmodified + [?_assertEqual({SetupReq, S0}, s1ap_proxy:handle_pdu(SetupReq, S0))]. + + +test_e_rab_setup(S0) -> + %% [eNB <- MME] E-RAB SETUP REQUEST + SetupReqIn = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + SetupReqExp = e_rab_setup_req_pdu(?ADDR_A2U, ?TEID_A2U), + {SetupReqOut, S1} = s1ap_proxy:handle_pdu(SetupReqIn, S0), + + %% [eNB -> MME] E-RAB SETUP RESPONSE + SetupRspIn = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + SetupRspExp = e_rab_setup_rsp_pdu(?ADDR_C2U, ?TEID_C2U), + {SetupRspOut, _S2} = s1ap_proxy:handle_pdu(SetupRspIn, S1), + + [?_assertEqual(SetupReqExp, SetupReqOut), + ?_assertEqual(SetupRspExp, SetupRspOut)]. + + +test_e_rab_modify_ind(S0) -> + %% [eNB -> MME] E-RAB MODIFICATION INDICATION + ModifyIndIn = e_rab_modify_ind_pdu(?ADDR_U2A, ?TEID_U2A), + %% XXX: not implemented, we should actually expect ?ADDR_C2U, ?TEID_C2U + ModifyIndExp = e_rab_modify_ind_pdu(?ADDR_U2A, ?TEID_U2A), + {ModifyIndOut, _S1} = s1ap_proxy:handle_pdu(ModifyIndIn, S0), + + [?_assertEqual(ModifyIndExp, ModifyIndOut)]. + +test_initial_context_setup(S0) -> + %% [eNB <- MME] INITIAL CONTEXT SETUP REQUEST + InitCtxSetupReqIn = initial_context_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + InitCtxSetupReqExp = initial_context_setup_req_pdu(?ADDR_A2U, ?TEID_A2U), + {InitCtxSetupReqOut, S1} = s1ap_proxy:handle_pdu(InitCtxSetupReqIn, S0), + + %% [eNB -> MME] INITIAL CONTEXT SETUP RESPONSE + InitCtxSetupRspIn = initial_context_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + InitCtxSetupRspExp = initial_context_setup_rsp_pdu(?ADDR_C2U, ?TEID_C2U), + {InitCtxSetupRspOut, _S2} = s1ap_proxy:handle_pdu(InitCtxSetupRspIn, S1), + + [?_assertEqual(InitCtxSetupReqExp, InitCtxSetupReqOut), + ?_assertEqual(InitCtxSetupRspExp, InitCtxSetupRspOut)]. + + +%% ------------------------------------------------------------------ +%% S1AP PDU templates +%% ------------------------------------------------------------------ + %% S1 SETUP REQUEST s1_setup_req_pdu() -> << 16#00, 16#11, 16#00, 16#1a, 16#00, 16#00, 16#02, 16#00, @@ -54,22 +99,17 @@ 16#0c, 16#0e, 16#40, 16#00, 16#f1, 16#10 >>. -test_s1_setup_req(S) -> - OrigData = s1_setup_req_pdu(), - %% Expect the PDU to be proxied unmodified - [?_assertEqual({OrigData, S}, s1ap_proxy:handle_pdu(OrigData, S))]. - %% [eNB <- MME] E-RAB SETUP REQUEST e_rab_setup_req_pdu(TLA, TEID) when is_binary(TLA), - is_binary(TEID) -> + is_integer(TEID) -> << 16#00, 16#05, 16#00, 16#80, 16#9b, 16#00, 16#00, 16#03, 16#00, 16#00, 16#00, 16#02, 16#00, 16#07, 16#00, 16#08, 16#00, 16#02, 16#00, 16#09, 16#00, 16#10, 16#00, 16#80, 16#87, 16#00, 16#00, 16#11, 16#00, 16#80, 16#81, 16#0c, 16#00, 16#05, 16#04, 16#0f, 16#80, TLA/bytes, %% transportLayerAddress (IPv4) - TEID/bytes, %% GTP-TEID + TEID:32/big, %% GTP-TEID 16#72, 16#27, 16#c8, 16#1a, 16#bc, 16#ec, 16#11, 16#62, 16#54, 16#c1, 16#01, 16#05, 16#04, 16#03, 16#69, 16#6d, 16#73, 16#05, 16#01, @@ -87,70 +127,34 @@ 16#16, 16#00, 16#15, 16#00, 16#10, 16#02, 16#05, 16#78 >>. -test_e_rab_setup_req(S) -> - %% Original input data - TEID = << 16#00, 16#00, 16#00, 16#18 >>, - OrigTLA = << 16#ac, 16#16, 16#00, 16#06 >>, - OrigData = e_rab_setup_req_pdu(OrigTLA, TEID), - - %% Expected output data - ExpData = e_rab_setup_req_pdu(?EXP_ADDR_BIN, TEID), - - application:set_env(osmo_s1gw, mme_loc_addr, ?EXP_ADDR_STR), - [?_assertMatch({ExpData, _}, s1ap_proxy:handle_pdu(OrigData, S))]. - %% [eNB -> MME] E-RAB SETUP RESPONSE e_rab_setup_rsp_pdu(TLA, TEID) when is_binary(TLA), - is_binary(TEID) -> + is_integer(TEID) -> << 16#20, 16#05, 16#00, 16#22, 16#00, 16#00, 16#03, 16#00, 16#00, 16#40, 16#02, 16#00, 16#07, 16#00, 16#08, 16#40, 16#02, 16#00, 16#09, 16#00, 16#1c, 16#40, 16#0f, 16#00, 16#00, 16#27, 16#40, 16#0a, 16#0c, 16#1f, TLA/bytes, %% transportLayerAddress (IPv4) - TEID/bytes %% GTP-TEID + TEID:32/big %% GTP-TEID >>. -test_e_rab_setup_rsp(S) -> - %% Original input data - TEID = << 16#6c, 16#05, 16#bf, 16#56 >>, - OrigTLA = << 16#c0, 16#a8, 16#68, 16#a7 >>, - OrigData = e_rab_setup_rsp_pdu(OrigTLA, TEID), - - %% Expected output data - ExpData = e_rab_setup_rsp_pdu(?EXP_ADDR_BIN, TEID), - - application:set_env(osmo_s1gw, s1gw_bind_addr, ?EXP_ADDR_STR), - [?_assertMatch({ExpData, _}, s1ap_proxy:handle_pdu(OrigData, S))]. - %% [eNB -> MME] E-RAB MODIFICATION INDICATION e_rab_modify_ind_pdu(TLA, TEID) when is_binary(TLA), - is_binary(TEID) -> + is_integer(TEID) -> << 16#00, 16#32, 16#00, 16#24, 16#00, 16#00, 16#03, 16#00, 16#00, 16#00, 16#02, 16#00, 16#02, 16#00, 16#08, 16#00, 16#04, 16#80, 16#06, 16#69, 16#2d, 16#00, 16#c7, 16#00, 16#0f, 16#00, 16#00, 16#c8, 16#00, 16#0a, 16#0a, 16#1f, TLA/bytes, %% transportLayerAddress (IPv4) - TEID/bytes %% GTP-TEID + TEID:32/big %% GTP-TEID >>. -test_e_rab_modify_ind(S) -> - %% Original input data - TEID = << 16#3d, 16#b0, 16#b5, 16#1d >>, - OrigTLA = << 16#c0, 16#a8, 16#12, 16#c6 >>, - OrigData = e_rab_modify_ind_pdu(OrigTLA, TEID), - - %% Expected output data - ExpData = e_rab_modify_ind_pdu(?EXP_ADDR_BIN, TEID), - - application:set_env(osmo_s1gw, mme_loc_addr, ?EXP_ADDR_STR), - [?_assertMatch({ExpData, _}, s1ap_proxy:handle_pdu(OrigData, S))]. - %% [eNB <- MME] INITIAL CONTEXT SETUP REQUEST initial_context_setup_req_pdu(TLA, TEID) when is_binary(TLA), - is_binary(TEID) -> + is_integer(TEID) -> << 16#00, 16#09, 16#00, 16#81, 16#10, 16#00, 16#00, 16#07, 16#00, 16#00, 16#00, 16#02, 16#00, 16#01, 16#00, 16#08, 16#00, 16#02, 16#00, 16#01, 16#00, 16#42, 16#00, 16#0a, @@ -159,7 +163,7 @@ 16#00, 16#34, 16#00, 16#80, 16#af, 16#45, 16#00, 16#09, 16#20, 16#0f, 16#80, TLA/bytes, %% transportLayerAddress (IPv4) - TEID/bytes, %% GTP-TEID + TEID:32/big, %% GTP-TEID 16#80, 16#9f, 16#27, 16#bd, 16#de, 16#61, 16#4e, 16#02, 16#07, 16#42, 16#02, 16#29, 16#06, 16#40, 16#32, 16#f8, 16#10, 16#00, 16#01, 16#00, 16#6e, @@ -190,40 +194,16 @@ 16#10, 16#03, 16#ff, 16#ff, 16#74 >>. -test_initial_context_setup_req(S) -> - %% Original input data - TEID = << 16#00, 16#00, 16#71, 16#23 >>, - OrigTLA = << 16#c0, 16#a8, 16#02, 16#d2 >>, - OrigData = initial_context_setup_req_pdu(OrigTLA, TEID), - - %% Expected output data - ExpData = initial_context_setup_req_pdu(?EXP_ADDR_BIN, TEID), - - application:set_env(osmo_s1gw, mme_loc_addr, ?EXP_ADDR_STR), - [?_assertMatch({ExpData, _}, s1ap_proxy:handle_pdu(OrigData, S))]. - %% [eNB -> MME] INITIAL CONTEXT SETUP RESPONSE initial_context_setup_rsp_pdu(TLA, TEID) when is_binary(TLA), - is_binary(TEID) -> + is_integer(TEID) -> << 16#20, 16#09, 16#00, 16#22, 16#00, 16#00, 16#03, 16#00, 16#00, 16#40, 16#02, 16#00, 16#01, 16#00, 16#08, 16#40, 16#02, 16#00, 16#01, 16#00, 16#33, 16#40, 16#0f, 16#00, 16#00, 16#32, 16#40, 16#0a, 16#0a, 16#1f, TLA/bytes, %% transportLayerAddress (IPv4) - TEID/bytes %% GTP-TEID + TEID:32/big %% GTP-TEID >>. -test_initial_context_setup_rsp(S) -> - %% Original input data - TEID = << 16#00, 16#00, 16#00, 16#01 >>, - OrigTLA = << 16#c0, 16#a8, 16#02, 16#cb >>, - OrigData = initial_context_setup_rsp_pdu(OrigTLA, TEID), - - %% Expected output data - ExpData = initial_context_setup_rsp_pdu(?EXP_ADDR_BIN, TEID), - - application:set_env(osmo_s1gw, s1gw_bind_addr, ?EXP_ADDR_STR), - [?_assertMatch({ExpData, _}, s1ap_proxy:handle_pdu(OrigData, S))]. - %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37463?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ibb7e25ab3adbadd7fd85e9cb22e0136c6ca133cf Gerrit-Change-Number: 37463 Gerrit-PatchSet: 12 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 year

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: s1gw: Split ConnHdlr to its own file

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37898?usp=email ) Change subject: s1gw: Split ConnHdlr to its own file ...................................................................... s1gw: Split ConnHdlr to its own file This allows easily separating general routines from test specific code. Change-Id: I9f8d9afbccd59f3e22649b35d2a7ef75578d051a --- A s1gw/ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 205 insertions(+), 172 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/37898/1 diff --git a/s1gw/ConnHdlr.ttcn b/s1gw/ConnHdlr.ttcn new file mode 100644 index 0000000..69c19b6 --- /dev/null +++ b/s1gw/ConnHdlr.ttcn @@ -0,0 +1,200 @@ +/* OsmoS1GW (S1AP Gateway) ConnHdlr + * + * (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> + * + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module ConnHdlr { + +import from General_Types all; +import from Osmocom_Types all; +import from Native_Functions all; +import from IPL4asp_Types all; +import from Misc_Helpers all; + +import from S1AP_CodecPort all; +import from S1AP_CodecPort_CtrlFunct all; +import from S1AP_Types all; +import from S1AP_Templates all; +import from S1AP_PDU_Descriptions all; +import from S1AP_IEs all; +import from S1AP_PDU_Contents all; +import from S1AP_Constants all; + +import from SCTP_Templates all; +import from S1AP_Server all; + +type component ConnHdlr extends S1APSRV_ConnHdlr { + port S1AP_CODEC_PT S1AP_ENB; + var ConnectionId g_s1ap_conn_id := -1; +}; +type record of ConnHdlr ConnHdlrList; + +type record ConnHdlrPars { + Global_ENB_ID genb_id +}; + +template Global_ENB_ID +ts_Global_ENB_ID(integer enb_id := 0, + OCT3 plmn_id := '00f110'O) := { + pLMNidentity := plmn_id, + eNB_ID := { + macroENB_ID := int2bit(enb_id, 20) + }, + iE_Extensions := omit +} + +template (value) ConnHdlrPars +t_ConnHdlrPars(integer enb_id := 0) := { + genb_id := ts_Global_ENB_ID(enb_id) +} + +type function void_fn(ConnHdlrPars pars) runs on ConnHdlr; + +function f_ConnHdlr_connect(charstring remote_addr) runs on ConnHdlr { + var Result res; + timer T; + + map(self:S1AP_ENB, system:S1AP_CODEC_PT); + + /* initiate SCTP connection establishment */ + res := S1AP_CodecPort_CtrlFunct.f_IPL4_connect(S1AP_ENB, + remote_addr, 36412, + "0.0.0.0", 0, -1, + { sctp := c_SctpTuple_S1AP }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not create an S1AP socket, check your configuration"); + mtc.stop; + } + g_s1ap_conn_id := res.connId; + + /* wait for the establishment confirmation */ + T.start(2.0); + alt { + [] S1AP_ENB.receive(tr_SctpAssocChange(SCTP_COMM_UP, g_s1ap_conn_id)) { + log("eNB connection established"); + } + [] S1AP_ENB.receive(PortEvent:{sctpEvent := ?}) { repeat; } + [] T.timeout { + setverdict(fail, "eNB connection establishment timeout"); + self.stop; + } + } +} + +function f_ConnHdlr_disconnect() runs on ConnHdlr { + var Result res; + + S1AP_CodecPort_CtrlFunct.f_IPL4_close(S1AP_ENB, g_s1ap_conn_id, + { sctp := c_SctpTuple_S1AP }); + g_s1ap_conn_id := -1; + unmap(self:S1AP_ENB, system:S1AP_CODEC_PT); + + S1AP_CONN.receive(S1APSRV_Event:S1APSRV_EVENT_CONN_DOWN); + + log("eNB connection closed"); +} + +function f_ConnHdlr_expect_shutdown() runs on ConnHdlr { + S1AP_ENB.receive(tr_SctpShutDownEvent(g_s1ap_conn_id)); + S1AP_ENB.receive(tr_SctpAssocChange(SCTP_SHUTDOWN_COMP, g_s1ap_conn_id)); + S1AP_ENB.receive(PortEvent:{connClosed := ?}); +} + +function f_ConnHdlr_tx_s1ap_from_enb(template (value) S1AP_PDU pdu) +runs on ConnHdlr { + S1AP_ENB.send(t_S1AP_Send(g_s1ap_conn_id, pdu)); +} + +function f_ConnHdlr_tx_s1ap_from_mme(template (value) S1AP_PDU pdu) +runs on ConnHdlr { + S1AP_CONN.send(pdu); +} + +function f_ConnHdlr_rx_s1ap_from_enb(out S1AP_PDU pdu, + template (present) S1AP_PDU tr_pdu := ?, + float Tval := 0.5) +runs on ConnHdlr { + timer T := Tval; + + T.start; + alt { + [] S1AP_CONN.receive(tr_pdu) -> value pdu { + setverdict(pass); + T.stop; + } + [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { + setverdict(fail, "Rx unexpected S1AP PDU from eNB: ", pdu); + T.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for S1AP PDU from eNB: ", tr_pdu); + } + } +} + +function f_ConnHdlr_rx_s1ap_from_mme(out S1AP_PDU pdu, + template (present) S1AP_PDU tr_pdu := ?, + float Tval := 0.5) +runs on ConnHdlr { + var S1AP_RecvFrom recv; + timer T := Tval; + + T.start; + alt { + [] S1AP_ENB.receive(t_S1AP_RecvFrom(tr_pdu)) -> value recv { + pdu := recv.msg; + setverdict(pass); + T.stop; + } + [] S1AP_ENB.receive(t_S1AP_RecvFrom(?)) -> value recv { + pdu := recv.msg; + setverdict(fail, "Rx unexpected S1AP PDU from MME: ", pdu); + T.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for S1AP PDU from MME: ", tr_pdu); + } + } +} + +function f_ConnHdlr_setup(Global_ENB_ID genb_id) runs on ConnHdlr { + var S1AP_PDU pdu; + timer T; + + var SupportedTAs supported_tas_dummy := { + { + tAC := '0000'O, + broadcastPLMNs := { '00f000'O }, + iE_Extensions := omit + } + }; + + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_SetupReq(genb_id, + supported_tas_dummy, + v32)); + T.start(1.0); + alt { + [] S1AP_CONN.receive(S1APSRV_Event:S1APSRV_EVENT_CONN_UP) { repeat; } + [] S1AP_CONN.receive(tr_S1AP_SetupReq) { + setverdict(pass); + T.stop; + } + [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { + setverdict(fail, "Rx unexpected S1AP PDU: ", pdu); + T.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for S1AP SetupReq"); + } + } +} + +} diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 0fb3075..2625799 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -30,6 +30,7 @@ import from SCTP_Templates all; import from S1AP_Server all; +import from ConnHdlr all; modulepar { charstring mp_s1gw_enb_ip; /* eNB facing address of the S1GW */ @@ -37,13 +38,6 @@ charstring mp_mme_bind_ip; /* MME address on which we get connections from S1GW */ } -private type record of ConnHdlr ConnHdlrList; - -type component ConnHdlr extends S1APSRV_ConnHdlr { - port S1AP_CODEC_PT S1AP_ENB; - var ConnectionId g_s1ap_conn_id := -1; -}; - type component test_CT { timer g_Tguard; var S1AP_Server_CT vc_S1APSRV; @@ -55,16 +49,6 @@ } } -template Global_ENB_ID -ts_Global_ENB_ID(integer enb_id := 0, - OCT3 plmn_id := '00f110'O) := { - pLMNidentity := plmn_id, - eNB_ID := { - macroENB_ID := int2bit(enb_id, 20) - }, - iE_Extensions := omit -} - function f_init(float Tval := 20.0) runs on test_CT { g_Tguard.start(Tval); activate(as_Tguard()); @@ -80,17 +64,6 @@ vc_S1APSRV.start(S1AP_Server.main(cpars)); } -type record ConnHdlrPars { - Global_ENB_ID genb_id -}; - -template (value) ConnHdlrPars -t_ConnHdlrPars(integer enb_id := 0) := { - genb_id := ts_Global_ENB_ID(enb_id) -} - -type function void_fn(ConnHdlrPars pars) runs on ConnHdlr; - function f_ConnHdlr_spawn(void_fn fn, ConnHdlrPars pars) runs on test_CT return ConnHdlr { var ConnHdlr vc_conn; @@ -105,150 +78,10 @@ return vc_conn; } -function f_ConnHdlr_connect() runs on ConnHdlr { - var Result res; - timer T; - - map(self:S1AP_ENB, system:S1AP_CODEC_PT); - - /* initiate SCTP connection establishment */ - res := S1AP_CodecPort_CtrlFunct.f_IPL4_connect(S1AP_ENB, - mp_s1gw_enb_ip, 36412, - "0.0.0.0", 0, -1, - { sctp := c_SctpTuple_S1AP }); - if (not ispresent(res.connId)) { - setverdict(fail, "Could not create an S1AP socket, check your configuration"); - mtc.stop; - } - g_s1ap_conn_id := res.connId; - - /* wait for the establishment confirmation */ - T.start(2.0); - alt { - [] S1AP_ENB.receive(tr_SctpAssocChange(SCTP_COMM_UP, g_s1ap_conn_id)) { - log("eNB connection established"); - } - [] S1AP_ENB.receive(PortEvent:{sctpEvent := ?}) { repeat; } - [] T.timeout { - setverdict(fail, "eNB connection establishment timeout"); - self.stop; - } - } -} - -function f_ConnHdlr_disconnect() runs on ConnHdlr { - var Result res; - - S1AP_CodecPort_CtrlFunct.f_IPL4_close(S1AP_ENB, g_s1ap_conn_id, - { sctp := c_SctpTuple_S1AP }); - g_s1ap_conn_id := -1; - unmap(self:S1AP_ENB, system:S1AP_CODEC_PT); - - S1AP_CONN.receive(S1APSRV_Event:S1APSRV_EVENT_CONN_DOWN); - - log("eNB connection closed"); -} - -function f_ConnHdlr_expect_shutdown() runs on ConnHdlr { - S1AP_ENB.receive(tr_SctpShutDownEvent(g_s1ap_conn_id)); - S1AP_ENB.receive(tr_SctpAssocChange(SCTP_SHUTDOWN_COMP, g_s1ap_conn_id)); - S1AP_ENB.receive(PortEvent:{connClosed := ?}); -} - -function f_ConnHdlr_tx_s1ap_from_enb(template (value) S1AP_PDU pdu) -runs on ConnHdlr { - S1AP_ENB.send(t_S1AP_Send(g_s1ap_conn_id, pdu)); -} - -function f_ConnHdlr_tx_s1ap_from_mme(template (value) S1AP_PDU pdu) -runs on ConnHdlr { - S1AP_CONN.send(pdu); -} - -function f_ConnHdlr_rx_s1ap_from_enb(out S1AP_PDU pdu, - template (present) S1AP_PDU tr_pdu := ?, - float Tval := 0.5) -runs on ConnHdlr { - timer T := Tval; - - T.start; - alt { - [] S1AP_CONN.receive(tr_pdu) -> value pdu { - setverdict(pass); - T.stop; - } - [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { - setverdict(fail, "Rx unexpected S1AP PDU from eNB: ", pdu); - T.stop; - } - [] T.timeout { - setverdict(fail, "Timeout waiting for S1AP PDU from eNB: ", tr_pdu); - } - } -} - -function f_ConnHdlr_rx_s1ap_from_mme(out S1AP_PDU pdu, - template (present) S1AP_PDU tr_pdu := ?, - float Tval := 0.5) -runs on ConnHdlr { - var S1AP_RecvFrom recv; - timer T := Tval; - - T.start; - alt { - [] S1AP_ENB.receive(t_S1AP_RecvFrom(tr_pdu)) -> value recv { - pdu := recv.msg; - setverdict(pass); - T.stop; - } - [] S1AP_ENB.receive(t_S1AP_RecvFrom(?)) -> value recv { - pdu := recv.msg; - setverdict(fail, "Rx unexpected S1AP PDU from MME: ", pdu); - T.stop; - } - [] T.timeout { - setverdict(fail, "Timeout waiting for S1AP PDU from MME: ", tr_pdu); - } - } -} - -function f_ConnHdlr_setup(Global_ENB_ID genb_id) runs on ConnHdlr { - var S1AP_PDU pdu; - timer T; - - var SupportedTAs supported_tas_dummy := { - { - tAC := '0000'O, - broadcastPLMNs := { '00f000'O }, - iE_Extensions := omit - } - }; - - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_SetupReq(genb_id, - supported_tas_dummy, - v32)); - T.start(1.0); - alt { - [] S1AP_CONN.receive(S1APSRV_Event:S1APSRV_EVENT_CONN_UP) { repeat; } - [] S1AP_CONN.receive(tr_S1AP_SetupReq) { - setverdict(pass); - T.stop; - } - [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { - setverdict(fail, "Rx unexpected S1AP PDU: ", pdu); - T.stop; - } - [] T.timeout { - setverdict(fail, "Timeout waiting for S1AP SetupReq"); - } - } -} - - function f_TC_setup(ConnHdlrPars pars) runs on ConnHdlr { f_ConnHdlr_register(pars.genb_id); - f_ConnHdlr_connect(); + f_ConnHdlr_connect(mp_s1gw_enb_ip); f_ConnHdlr_setup(pars.genb_id); f_sleep(0.5); /* keep the connection idle for some time */ f_ConnHdlr_disconnect(); @@ -287,7 +120,7 @@ function f_TC_conn_term_by_mme(ConnHdlrPars pars) runs on ConnHdlr { f_ConnHdlr_register(pars.genb_id); - f_ConnHdlr_connect(); + f_ConnHdlr_connect(mp_s1gw_enb_ip); f_ConnHdlr_setup(pars.genb_id); f_sleep(0.5); /* keep the connection idle for some time */ @@ -313,7 +146,7 @@ /* MME is not available, expect S1GW to terminate the eNB connection */ function f_TC_conn_term_mme_unavail(ConnHdlrPars pars) runs on ConnHdlr { /* establish an eNB connection to the S1GW */ - f_ConnHdlr_connect(); + f_ConnHdlr_connect(mp_s1gw_enb_ip); /* expect our eNB connection to be released gracefully */ f_ConnHdlr_expect_shutdown(); setverdict(pass); @@ -337,7 +170,7 @@ var S1AP_PDU pdu; f_ConnHdlr_register(pars.genb_id); - f_ConnHdlr_connect(); + f_ConnHdlr_connect(mp_s1gw_enb_ip); f_ConnHdlr_setup(pars.genb_id); log("eNB -> [S1GW] -> MME: E-RAB SETUP REQUEST"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9f8d9afbccd59f3e22649b35d2a7ef75578d051a Gerrit-Change-Number: 37898 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 year

1
0
0 0

[M] Change in osmo-sgsn[master]: Implement correct Routing Area based paging

by Jenkins Builder

Attention is currently required from: daniel, lynxis lazus, pespin. Jenkins Builder has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37866?usp=email ) Change subject: Implement correct Routing Area based paging ...................................................................... Patch Set 7: (1 comment) File src/sgsn/gprs_routing_area.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-18012): https://gerrit.osmocom.org/c/osmo-sgsn/+/37866/comment/c8043ef8_42c9b4dd?us… : PS7, Line 320: llist_for_each_entry(cell, &ra->cells, list) { space required before the open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37866?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I181da9f656e394ccfcb8999021a5b7e13ca0419f Gerrit-Change-Number: 37866 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 22 Aug 2024 11:14:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 year

1
0
0 0

[M] Change in osmo-sgsn[master]: GMM: split parsing of a RA Update Request in a separate file

by Jenkins Builder

Attention is currently required from: daniel, lynxis lazus. Jenkins Builder has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37869?usp=email ) Change subject: GMM: split parsing of a RA Update Request in a separate file ...................................................................... Patch Set 7: (4 comments) File src/sgsn/gprs_gmm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-18009): https://gerrit.osmocom.org/c/osmo-sgsn/+/37869/comment/d5fccd56_f7c1edc7?us… : PS7, Line 1624: LOGMMCTXP(LOGL_NOTICE, mmctx, "Update type %i unsupported in Mode III, is your SI13 corrupt?\n", req.update_type); Use %d instead of %i File src/sgsn/gprs_gmm_util.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-18009): https://gerrit.osmocom.org/c/osmo-sgsn/+/37869/comment/a3fd15d8_b7cb14e6?us… : PS7, Line 98: if (msgb_l3len(msg) < (len + (cur - msgb_gmmh(msg)))) that open brace { should be on the previous line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-18009): https://gerrit.osmocom.org/c/osmo-sgsn/+/37869/comment/d7468739_c8399467?us… : PS7, Line 108: if (msgb_l3len(msg) == mandatory_fields_len) { braces {} are not necessary for single statement blocks Robot Comment from checkpatch (run ID jenkins-gerrit-lint-18009): https://gerrit.osmocom.org/c/osmo-sgsn/+/37869/comment/e32a1295_80a35b72?us… : PS7, Line 115: if (ret < 0) { braces {} are not necessary for single statement blocks -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37869?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I413da1b6b4b7c0c4781393acd8564661bc74ce2d Gerrit-Change-Number: 37869 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 22 Aug 2024 11:14:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 year

1
0
0 0

[S] Change in osmo-sgsn[master]: Routing Area: Remove cells when NSEI becomes unavailable

by Jenkins Builder

Attention is currently required from: daniel, lynxis lazus, pespin. Jenkins Builder has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37865?usp=email ) Change subject: Routing Area: Remove cells when NSEI becomes unavailable ...................................................................... Patch Set 7: (2 comments) File src/sgsn/gprs_routing_area.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-18008): https://gerrit.osmocom.org/c/osmo-sgsn/+/37865/comment/fe227770_d5f71f22?us… : PS7, Line 294: llist_for_each_entry_safe(ra, ra2, &sgsn_ra_ctx->ras, list) { space required before the open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-18008): https://gerrit.osmocom.org/c/osmo-sgsn/+/37865/comment/8eb03cd9_fbb76b9d?us… : PS7, Line 295: llist_for_each_entry_safe(cell, cell2, &ra->cells, list) { space required before the open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37865?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9f0386d9eb7f0cabaf0fde45f8e78b4ea28c67c5 Gerrit-Change-Number: 37865 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 22 Aug 2024 11:14:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 year

1
0
0 0

[M] Change in osmo-sgsn[master]: Implement correct Routing Area based paging

by lynxis lazus

Attention is currently required from: daniel, lynxis lazus, pespin. Hello Jenkins Builder, daniel, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37866?usp=email to look at the new patch set (#7). Change subject: Implement correct Routing Area based paging ...................................................................... Implement correct Routing Area based paging Previous the SGSN would not support multiple BSS within the same routing area. Add support paging of a whole routing area. Change-Id: I181da9f656e394ccfcb8999021a5b7e13ca0419f --- M include/osmocom/sgsn/gprs_bssgp.h M include/osmocom/sgsn/gprs_routing_area.h M src/sgsn/gprs_bssgp.c M src/sgsn/gprs_routing_area.c M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_vty.c 6 files changed, 39 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/66/37866/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37866?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I181da9f656e394ccfcb8999021a5b7e13ca0419f Gerrit-Change-Number: 37866 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 year

1
0
0 0

[S] Change in osmo-sgsn[master]: Routing Area: Remove cells when NSEI becomes unavailable

by lynxis lazus

Attention is currently required from: daniel, lynxis lazus, pespin. Hello Jenkins Builder, daniel, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37865?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Code-Review-1 by pespin Change subject: Routing Area: Remove cells when NSEI becomes unavailable ...................................................................... Routing Area: Remove cells when NSEI becomes unavailable Change-Id: I9f0386d9eb7f0cabaf0fde45f8e78b4ea28c67c5 --- M include/osmocom/sgsn/gprs_routing_area.h M src/sgsn/gprs_ns.c M src/sgsn/gprs_routing_area.c 3 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/65/37865/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37865?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9f0386d9eb7f0cabaf0fde45f8e78b4ea28c67c5 Gerrit-Change-Number: 37865 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2024