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

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add multi-eNB variants of TC_e_rab_setup

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38213?usp=email ) Change subject: s1gw: add multi-eNB variants of TC_e_rab_setup ...................................................................... Patch Set 5: (1 comment) File s1gw/S1GW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38213/comment/f5df50db_818b… : PS4, Line 83: vc_mutex_disp := f_MutexDisp_start(); > What kind of additional complexity we're talking about? Spawning a component that waits for messages […] Having more stuff startd and stopped running and logging into the logs files. It's just a matter of adding a boolean use_mutex := false above and check it here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38213?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: I9e2eb25a7ae78ff623b94802d881af4894d0cacd Gerrit-Change-Number: 38213 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Sep 2024 22:29:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: library/s1ap: fix wrong field in S1AP-RABReleaseInd

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38243?usp=email ) Change subject: library/s1ap: fix wrong field in S1AP-RABReleaseInd ...................................................................... library/s1ap: fix wrong field in S1AP-RABReleaseInd Change-Id: I7a24b6401a19a6e37392083b26657bcb45b35cbe Fixes: e59e681c "library/s1ap: add E-RAB RELEASE templates" --- M library/s1ap/S1AP_Templates.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/38243/1 diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index dca5844..cd99ce2 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -1325,7 +1325,7 @@ procedureCode := S1AP_Constants.id_E_RABReleaseIndication, criticality := reject, value_ := { - e_RABReleaseCommand := { + e_RABReleaseIndication := { protocolIEs := { { id := S1AP_Constants.id_MME_UE_S1AP_ID, @@ -1353,7 +1353,7 @@ procedureCode := S1AP_Constants.id_E_RABReleaseIndication, criticality := reject, value_ := { - e_RABReleaseCommand := { + e_RABReleaseIndication := { protocolIEs := { { id := S1AP_Constants.id_MME_UE_S1AP_ID, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38243?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: I7a24b6401a19a6e37392083b26657bcb45b35cbe Gerrit-Change-Number: 38243 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

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

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38241?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: s1ap_proxy: handle E-RAB RELEASE INDICATION ...................................................................... s1ap_proxy: handle E-RAB RELEASE INDICATION Change-Id: I13584620e28edf529325dc661c4b40d09acacc3f --- M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 2 files changed, 48 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/41/38241/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38241?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I13584620e28edf529325dc661c4b40d09acacc3f Gerrit-Change-Number: 38241 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

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

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38242?usp=email ) Change subject: s1ap_proxy: handle E-RAB RELEASE INDICATION ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38242?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ibaf4cfaad9edfadf8abadeffe19076501d696607 Gerrit-Change-Number: 38242 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder

9 months, 1 week

1
0
0 0

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

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38241?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: s1ap_proxy: handle E-RAB RELEASE INDICATION ...................................................................... s1ap_proxy: handle E-RAB RELEASE INDICATION Change-Id: I13584620e28edf529325dc661c4b40d09acacc3f --- M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 2 files changed, 48 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/41/38241/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38241?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I13584620e28edf529325dc661c4b40d09acacc3f Gerrit-Change-Number: 38241 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

9 months, 1 week

1
0
0 0

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

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38242?usp=email ) Change subject: s1ap_proxy: handle E-RAB RELEASE INDICATION ...................................................................... s1ap_proxy: handle E-RAB RELEASE INDICATION Change-Id: Ibaf4cfaad9edfadf8abadeffe19076501d696607 --- M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 2 files changed, 48 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/42/38242/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 46a7c79..e0ef45a 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -177,6 +177,16 @@ NewContent = Content#'E-RABReleaseResponse'{protocolIEs = IEs}, handle_pdu_new(Data, {Outcome, Pdu#'SuccessfulOutcome'{value = NewContent}}, S1); +%% 9.1.3.7 E-RAB RELEASE INDICATION +handle_pdu(Data, {Outcome = initiatingMessage, + #'InitiatingMessage'{procedureCode = ?'id-E-RABReleaseIndication', + value = Content} = Pdu}, S0) -> + ?LOG_DEBUG("Processing E-RAB RELEASE INDICATION"), + {IEs, S1} = handle_ies(Content#'E-RABReleaseIndication'.protocolIEs, + ?'id-E-RABReleasedList', S0), + NewContent = Content#'E-RABReleaseCommand'{protocolIEs = IEs}, + handle_pdu_new(Data, {Outcome, Pdu#'InitiatingMessage'{value = NewContent}}, S1); + %% 9.1.3.8 E-RAB MODIFICATION INDICATION handle_pdu(Data, {Outcome = initiatingMessage, #'InitiatingMessage'{procedureCode = ?'id-E-RABModificationIndication', @@ -302,6 +312,12 @@ end, {Content, S}; +%% 9.1.3.7 E-RAB RELEASE INDICATION related IEs +handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABReleasedList', + value = Content}, S) -> + %% This IE contains a list of E-RABItem + handle_ies(Content, ?'id-E-RABItem', 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 5f6167d..93702df 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -33,7 +33,9 @@ {"E-RAB SETUP REQUEST/RESPONSE", ?TC(fun test_e_rab_setup/1)}, {"E-RAB RELEASE COMMAND/RESPONSE", - ?TC(fun test_e_rab_release/1)}, + ?TC(fun test_e_rab_release_cmd/1)}, + {"E-RAB RELEASE INDICATION", + ?TC(fun test_e_rab_release_ind/1)}, {"E-RAB MODIFICATION INDICATION", ?TC(fun test_e_rab_modify_ind/1)}, {"INITIAL CONTEXT SETUP REQUEST/RESPONSE", @@ -65,7 +67,7 @@ ?_assertEqual(SetupRspExp, SetupRspOut)]. -test_e_rab_release(S0) -> +test_e_rab_release_cmd(S0) -> %% [eNB <- MME] E-RAB SETUP REQUEST SetupReqIn = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), {_, S1} = s1ap_proxy:handle_pdu(SetupReqIn, S0), @@ -88,6 +90,24 @@ ?_assertEqual(ReleaseRsp, ReleaseRspOut)]. +test_e_rab_release_ind(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 INDICATION + ReleaseInd = e_rab_release_ind_pdu(), + {ReleaseIndOut, _S3} = s1ap_proxy:handle_pdu(ReleaseInd, S2), + + %% TODO: make sure that the E-RAB FSM has been terminated + + [?_assertEqual(ReleaseInd, ReleaseIndOut)]. + + test_e_rab_modify_ind(S0) -> %% [eNB -> MME] E-RAB MODIFICATION INDICATION ModifyIndIn = e_rab_modify_ind_pdu(?ADDR_U2A, ?TEID_U2A), @@ -185,6 +205,16 @@ >>. +%% [eNB -> MME] E-RAB RELEASE INDICATION +%% TODO: make E-RAB IDs configurable +e_rab_release_ind_pdu() -> + << 16#00, 16#08, 16#00, 16#1a, 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#6e, 16#40, 16#07, 16#00, + 16#00, 16#23, 16#40, 16#02, 16#0c, 16#40 + >>. + + %% [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/+/38242?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ibaf4cfaad9edfadf8abadeffe19076501d696607 Gerrit-Change-Number: 38242 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy_test: test E-RAB RELEASE INDICATION

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38241?usp=email ) Change subject: s1ap_proxy_test: test E-RAB RELEASE INDICATION ...................................................................... s1ap_proxy_test: test E-RAB RELEASE INDICATION Change-Id: I13584620e28edf529325dc661c4b40d09acacc3f --- M test/s1ap_proxy_test.erl 1 file changed, 32 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/41/38241/1 diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 5f6167d..78b8688 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -33,7 +33,9 @@ {"E-RAB SETUP REQUEST/RESPONSE", ?TC(fun test_e_rab_setup/1)}, {"E-RAB RELEASE COMMAND/RESPONSE", - ?TC(fun test_e_rab_release/1)}, + ?TC(fun test_e_rab_release_cmd/1)}, + {"E-RAB RELEASE INDICATION", + ?TC(fun test_e_rab_release_ind/1)}, {"E-RAB MODIFICATION INDICATION", ?TC(fun test_e_rab_modify_ind/1)}, {"INITIAL CONTEXT SETUP REQUEST/RESPONSE", @@ -65,7 +67,7 @@ ?_assertEqual(SetupRspExp, SetupRspOut)]. -test_e_rab_release(S0) -> +test_e_rab_release_cmd(S0) -> %% [eNB <- MME] E-RAB SETUP REQUEST SetupReqIn = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), {_, S1} = s1ap_proxy:handle_pdu(SetupReqIn, S0), @@ -88,6 +90,24 @@ ?_assertEqual(ReleaseRsp, ReleaseRspOut)]. +test_e_rab_release_ind(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 INDICATION + ReleaseInd = e_rab_release_ind_pdu(), + {ReleaseIndOut, _S3} = s1ap_proxy:handle_pdu(ReleaseInd, S2), + + %% TODO: make sure that the E-RAB FSM has been terminated + + [?_assertEqual(ReleaseInd, ReleaseIndOut)]. + + test_e_rab_modify_ind(S0) -> %% [eNB -> MME] E-RAB MODIFICATION INDICATION ModifyIndIn = e_rab_modify_ind_pdu(?ADDR_U2A, ?TEID_U2A), @@ -185,6 +205,16 @@ >>. +%% [eNB -> MME] E-RAB RELEASE INDICATION +%% TODO: make E-RAB IDs configurable +e_rab_release_ind_pdu() -> + << 16#00, 16#08, 16#00, 16#1b, 16#00, 16#00, 16#03, 16#00, + 16#00, 16#00, 16#03, 16#40, 16#10, 16#92, 16#00, 16#08, + 16#00, 16#02, 16#00, 16#00, 16#00, 16#6e, 16#40, 16#07, + 16#00, 16#00, 16#23, 16#40, 16#02, 16#00, 16#40 + >>. + + %% [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/+/38241?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I13584620e28edf529325dc661c4b40d09acacc3f Gerrit-Change-Number: 38241 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy_test: re-generate E-RAB RELEASE.{cmd,rsp} PDU blobs

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38240?usp=email ) Change subject: s1ap_proxy_test: re-generate E-RAB RELEASE.{cmd,rsp} PDU blobs ...................................................................... s1ap_proxy_test: re-generate E-RAB RELEASE.{cmd,rsp} PDU blobs These PDU blobs contained the right E-RAB-ID=6, but different and unexpected {MME,ENB}-UE-S1AP-ID values. As a result of this, the E-RAB {7,9,6} that we establish in test_e_rab_setup/1 is never released properly, and this is why we're seeing these two errors: E-RAB {1,0,6} is not registered (s1ap_proxy:handle_ie/2) E-RAB {2,1,6} is not registered (s1ap_proxy:handle_ie/2) The new S1AP PDU blobs were re-generated using ttcn3-s1gw-test. Change-Id: I229c47148fd7408e44f1339ae2a2909f570c73ec --- M test/s1ap_proxy_test.erl 1 file changed, 6 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/40/38240/1 diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 9534980..5f6167d 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -168,14 +168,10 @@ %% [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 + << 16#00, 16#07, 16#00, 16#1a, 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#21, 16#40, 16#07, 16#00, + 16#00, 16#23, 16#40, 16#02, 16#0c, 16#40 >>. @@ -183,8 +179,8 @@ %% 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#00, 16#02, 16#00, 16#07, 16#00, 16#08, 16#00, + 16#02, 16#00, 16#09, 16#00, 16#45, 16#40, 16#06, 16#00, 16#00, 16#0f, 16#40, 16#01, 16#0c >>. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38240?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I229c47148fd7408e44f1339ae2a2909f570c73ec Gerrit-Change-Number: 38240 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: print unique E-RAB ID in error messages

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38239?usp=email ) Change subject: s1ap_proxy: print unique E-RAB ID in error messages ...................................................................... s1ap_proxy: print unique E-RAB ID in error messages Include the {MME,ENB}-UE-S1AP-ID when printing error messages. Printing E-RAB-ID may be misleading. Change-Id: I7327e25ea407b3a21706e8b5e4487135675d91d5 --- M src/s1ap_proxy.erl 1 file changed, 14 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/39/38239/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 1df1518..46a7c79 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -53,6 +53,7 @@ -type mme_ue_id() :: 0..16#ffffffff. -type enb_ue_id() :: 0..16#ffffff. -type erab_id() :: 0..16#ff. +-type erab_uid() :: {mme_ue_id(), enb_ue_id(), erab_id()}. -record(proxy_state, {erabs :: dict:dict(), mme_ue_id :: undefined | mme_ue_id(), @@ -101,6 +102,12 @@ %% private API %% ------------------------------------------------------------------ +-spec erab_uid(erab_id(), proxy_state()) -> erab_uid(). +erab_uid(ERABId, #proxy_state{mme_ue_id = MmeUeId, + enb_ue_id = EnbUeId}) -> + {MmeUeId, EnbUeId, ERABId}. + + %% Encode an S1AP PDU -spec encode_pdu(tuple()) -> {ok, binary()} | {error, {asn1, tuple()}}. @@ -273,7 +280,7 @@ {ok, Pid} -> ok = erab_fsm:erab_release_req(Pid); error -> - ?LOG_ERROR("E-RAB-ID ~p is not registered", [ERABId]) + ?LOG_ERROR("E-RAB ~p is not registered", [erab_uid(ERABId, S)]) end, {Content, S}; @@ -291,7 +298,7 @@ {ok, Pid} -> ok = erab_fsm:erab_release_rsp(Pid); error -> - ?LOG_ERROR("E-RAB-ID ~p is not registered", [ERABId]) + ?LOG_ERROR("E-RAB ~p is not registered", [erab_uid(ERABId, S)]) end, {Content, S}; @@ -352,7 +359,7 @@ C0#'E-RABSetupItemCtxtSURes'{'transportLayerAddress' = TLA_Out, 'gTP-TEID' = << TEID_Out:32/big >>}; error -> - ?LOG_ERROR("E-RAB-ID ~p is not registered", [ERABId]), + ?LOG_ERROR("E-RAB ~p is not registered", [erab_uid(ERABId, S)]), C0 %% XXX: proxy as-is or drop? end, {C1, S}; @@ -391,19 +398,15 @@ -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}, +erab_fsm_start_reg(RABId, #proxy_state{erabs = ERABs} = S) -> + UID = erab_uid(RABId, S), {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}, +erab_fsm_find(RABId, #proxy_state{erabs = ERABs} = S) -> + UID = erab_uid(RABId, S), dict:find(UID, ERABs). %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38239?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I7327e25ea407b3a21706e8b5e4487135675d91d5 Gerrit-Change-Number: 38239 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: f_ConnHdlr_erab_release_cmd(): add missing logging

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38236?usp=email ) Change subject: s1gw: f_ConnHdlr_erab_release_cmd(): add missing logging ...................................................................... s1gw: f_ConnHdlr_erab_release_cmd(): add missing logging Change-Id: I6e4574ebda2459f0a5f23ee51a21a883d079c54a --- M s1gw/S1GW_ConnHdlr.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/38236/1 diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index a37cdd7..a3d2aec 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -656,8 +656,10 @@ function f_ConnHdlr_erab_release_cmd(inout ERabList erabs, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { + log("eNB <- [S1GW <- MME]: E-RAB RELEASE COMMAND"); f_ConnHdlr_tx_erab_release_cmd(erabs, cause); f_ConnHdlr_session_delete(erabs); + log("[eNB <- S1GW] <- MME: E-RAB RELEASE COMMAND"); f_ConnHdlr_rx_erab_release_cmd(erabs, cause); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38236?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: I6e4574ebda2459f0a5f23ee51a21a883d079c54a Gerrit-Change-Number: 38236 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024