- gerrit-log - lists.osmocom.org

[L] Change in pysim[master]: pySim.esim.saip: maintain a parsed fileystem hierarchy
by laforge 18 Aug '24

18 Aug '24

Attention is currently required from: fixeria. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/37848?usp=email ) Change subject: pySim.esim.saip: maintain a parsed fileystem hierarchy ...................................................................... Patch Set 2: (1 comment) File pySim/esim/saip/__init__.py: https://gerrit.osmocom.org/c/pysim/+/37848/comment/bc3d2a43_99325262?usp=em… : PS1, Line 139: if False: > Intentional? yes, at least for now. I clarified it in the updated version. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37848?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2caadc24b1087855f23f3c57cdf8dabbf81757c0 Gerrit-Change-Number: 37848 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 18 Aug 2024 13:22:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[L] Change in pysim[master]: pySim.esim.saip: maintain a parsed fileystem hierarchy
by Jenkins Builder 18 Aug '24

18 Aug '24

Attention is currently required from: laforge. Jenkins Builder has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/37848?usp=email ) Change subject: pySim.esim.saip: maintain a parsed fileystem hierarchy ...................................................................... Patch Set 2: (2 comments) File pySim/esim/saip/__init__.py: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-17802): https://gerrit.osmocom.org/c/pysim/+/37848/comment/e4fae582_e9d7a716?usp=em… : PS2, Line 1713: """Create and link an apropriate FsNode for the given 'file' and insert it. 'apropriate' may be misspelled - perhaps 'appropriate'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-17802): https://gerrit.osmocom.org/c/pysim/+/37848/comment/672f0b04_c66ed85f?usp=em… : PS2, Line 1729: logger.debug("%s.add_file(%s) -> return cur_df=%s" % (self, file, cur_df)) trailing whitespace -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37848?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2caadc24b1087855f23f3c57cdf8dabbf81757c0 Gerrit-Change-Number: 37848 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 18 Aug 2024 13:22:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[L] Change in pysim[master]: pySim.esim.saip: maintain a parsed fileystem hierarchy
by laforge 18 Aug '24

18 Aug '24

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/37848?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: pySim.esim.saip: maintain a parsed fileystem hierarchy ...................................................................... pySim.esim.saip: maintain a parsed fileystem hierarchy With this change, the ProfileElementSequence object will maintain a representation of the filesystem hierarchy of the eSIM profile. Every file that is added by a ProfileElement will add a FsNode into that tree, and each FsNode will point to the File object for the respective file. This allows us to find files by their path, as well as add files by path. Change-Id: I2caadc24b1087855f23f3c57cdf8dabbf81757c0 --- M pySim/esim/saip/__init__.py 1 file changed, 598 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/48/37848/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37848?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2caadc24b1087855f23f3c57cdf8dabbf81757c0 Gerrit-Change-Number: 37848 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in pysim[master]: Fix pySim.esim.es2p.Param.timestamp._encode
by laforge 18 Aug '24

18 Aug '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37854?usp=email ) Change subject: Fix pySim.esim.es2p.Param.timestamp._encode ...................................................................... Fix pySim.esim.es2p.Param.timestamp._encode ************* Module pySim.esim.es2p pySim/esim/es2p.py:107:19: E1101: Class 'datetime' has no 'toisoformat' member (no-member) Change-Id: Ib762792d595048bf6d7d6f5acbe2715f137ae5bb --- M pySim/esim/es2p.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/54/37854/1 diff --git a/pySim/esim/es2p.py b/pySim/esim/es2p.py index a73dd0c..954c7dc 100644 --- a/pySim/esim/es2p.py +++ b/pySim/esim/es2p.py @@ -104,7 +104,7 @@ @classmethod def _encode(cls, data): - return datetime.toisoformat(data) + return datetime.isoformat(data) class NotificationPointId(ApiParamInteger): pass -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37854?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib762792d595048bf6d7d6f5acbe2715f137ae5bb Gerrit-Change-Number: 37854 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in pysim[master]: osmo-smdpp: Proper error handling in case ctxParams1 is missing member
by laforge 18 Aug '24

18 Aug '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37855?usp=email ) Change subject: osmo-smdpp: Proper error handling in case ctxParams1 is missing member ...................................................................... osmo-smdpp: Proper error handling in case ctxParams1 is missing member ************* Module osmo-smdpp osmo-smdpp.py:373:15: E0601: Using variable 'iccid_str' before assignment (used-before-assignment) Change-Id: I52bef18cbcc9f5d14519ff1473532c8502d45908 --- M osmo-smdpp.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/55/37855/1 diff --git a/osmo-smdpp.py b/osmo-smdpp.py index a044b9b..3dbe9b1 100755 --- a/osmo-smdpp.py +++ b/osmo-smdpp.py @@ -368,9 +368,9 @@ with open(path, 'rb') as f: pes = saip.ProfileElementSequence.from_der(f.read()) iccid_str = b2h(pes.get_pe_for_type('header').decoded['iccid']) - - # make pylint happy: E0601: Using variable 'iccid_str' before assignment (used-before-assignment) - assert iccid_str + else: + # there's currently no other option in the ctxParams1 choice, so this cannot happen + raise ApiError('1.3.1', '2.2', 'ctxParams1 missing mandatory ctxParamsForCommonAuthentication') # FIXME: we actually want to perform the profile binding herr, and read the profile metadat from the profile -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37855?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I52bef18cbcc9f5d14519ff1473532c8502d45908 Gerrit-Change-Number: 37855 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

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

18 Aug '24

fixeria has submitted this change. ( 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, 49 insertions(+), 49 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 8a9d0ec..8fef437 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,15 +408,15 @@ -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 + %% 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' => []}, forwarding_parameters => 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: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ie6f65516fd5621acf002de97eeeb2b9b0b4fae4a Gerrit-Change-Number: 37803 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>

1 0

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

18 Aug '24

fixeria has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 8fef437..5290b93 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 F_TEID TEID and bind address indicated by the MME. +%% @returns TEID and Addr to be sent to the eNB; an error otherwise. %% @end --spec erab_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, F_TEID) -> + gen_statem:call(Pid, {?FUNCTION_NAME, F_TEID}). %% @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 F_TEID 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, F_TEID) -> + gen_statem:call(Pid, {?FUNCTION_NAME, F_TEID}). -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 Access 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-TEID (prefer IPv6 over IPv4) +f_teid_addr(#f_teid{ipv6 = << IPv6:16/bytes >>}) -> + IPv6; +f_teid_addr(#f_teid{ipv4 = << IPv4:4/bytes >>}) -> + IPv4; +f_teid_addr(#f_teid{}) -> + erlang:error("F-TEID IE contains no IPv4/IPv6"). + %% 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: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ifdc492c41266d07d0e951dcdcc1e4ba74da0b13b Gerrit-Change-Number: 37804 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>

1 0

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

18 Aug '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37795?usp=email ) Change subject: erab_fsm: include Network Instance IE in PDRs and FARs ...................................................................... erab_fsm: include Network Instance IE in PDRs and FARs Change-Id: I4dbe8e0b1d14eed5fdb3f9f3f2543c44fd543d22 --- M config/sys.config M src/erab_fsm.erl 2 files changed, 20 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/config/sys.config b/config/sys.config index 993176b..66fbdc9 100644 --- a/config/sys.config +++ b/config/sys.config @@ -16,6 +16,9 @@ {mme_rem_addr, "127.0.2.10"}, %% remote address for outgoing connections to the MME {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 +%% Optional PFCP Network Instance IEs (omitted if not configured) +%% {pfcp_net_inst_core, << 16#09, "core-side" >>}, %% PFCP Network Instance IE value (to core) +%% {pfcp_net_inst_access, << 16#0a, "radio-side" >>} %% PFCP Network Instance IE value (to access) ]}, %% ================================================================================ %% kernel config diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 5290b93..753d1bf 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -375,9 +375,20 @@ 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 @@ -386,6 +397,7 @@ outer_header_removal => OHR, pdi => #{f_teid => #f_teid{teid = choose, ipv4 = choose}, + network_instance => NI_Core, source_interface => {source_interface, 'Core'}}}, #{pdr_id => {pdr_id, 2}, %% -- for Access -> Core far_id => {far_id, 2}, %% see FARs below @@ -393,6 +405,7 @@ outer_header_removal => OHR, pdi => #{f_teid => #f_teid{teid = choose, ipv4 = choose}, + network_instance => NI_Access, source_interface => {source_interface, 'Access'}}}], %% Forwarding Action Rules FARs = [#{far_id => {far_id, 1}, %% -- for Core -> Access @@ -403,6 +416,7 @@ apply_action => #{'FORW' => []}, forwarding_parameters => #{outer_header_creation => ohc(U2C), + network_instance => NI_Core, destination_interface => {destination_interface, 'Core'}}}], pfcp_peer:session_establish_req(F_SEID, PDRs, FARs). @@ -410,6 +424,8 @@ -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 FARs = [#{far_id => {far_id, 1}, %% -- for Core -> Access %% Now we know the Access side TEID / GTP-U address, so we modify @@ -417,6 +433,7 @@ apply_action => #{'FORW' => []}, forwarding_parameters => #{outer_header_creation => ohc(U2A), + network_instance => NI_Access, destination_interface => {destination_interface, 'Access'}}}], pfcp_peer:session_modify_req(SEID, [], FARs). -- 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: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4dbe8e0b1d14eed5fdb3f9f3f2543c44fd543d22 Gerrit-Change-Number: 37795 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: erab_fsm: fix improper IEs in session_modify_req()
by fixeria 18 Aug '24

18 Aug '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37853?usp=email ) Change subject: erab_fsm: fix improper IEs in session_modify_req() ...................................................................... erab_fsm: fix improper IEs in session_modify_req() Change-Id: I7917d524e08161f1d0614ca052be17e082b60170 Fixes: 9f2a172 "erab_fsm: E-RAB FSM implementation" --- M src/erab_fsm.erl 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 753d1bf..931b47f 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -431,10 +431,9 @@ %% 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' => []}, - forwarding_parameters => + update_forwarding_parameters => #{outer_header_creation => ohc(U2A), - network_instance => NI_Access, - destination_interface => {destination_interface, 'Access'}}}], + network_instance => NI_Access}}], pfcp_peer:session_modify_req(SEID, [], FARs). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37853?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: I7917d524e08161f1d0614ca052be17e082b60170 Gerrit-Change-Number: 37853 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: erab_fsm: fix improper IEs in session_modify_req()
by fixeria 18 Aug '24

18 Aug '24

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37853?usp=email ) Change subject: erab_fsm: fix improper IEs in session_modify_req() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37853?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: I7917d524e08161f1d0614ca052be17e082b60170 Gerrit-Change-Number: 37853 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 18 Aug 2024 08:55:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log