February 2025 - gerrit-log - lists.osmocom.org

[M] Change in osmo-sgsn[master]: Assign MME GroupId/Code to remote MMEs

by lynxis lazus

Attention is currently required from: laforge, lynxis lazus. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39294?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: Assign MME GroupId/Code to remote MMEs ...................................................................... Assign MME GroupId/Code to remote MMEs In preparation to route SGSN Context Req/Resp/Ack the SGSN need to route GTP messages based on the MME GroupId and MME Code. Change-Id: I881aeba904fb6ca815842d36e466a2459ad81913 --- M include/osmocom/sgsn/gtp_mme.h M src/sgsn/gtp_mme.c M src/sgsn/sgsn_vty.c 3 files changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/94/39294/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39294?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: I881aeba904fb6ca815842d36e466a2459ad81913 Gerrit-Change-Number: 39294 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

4 months, 2 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: increment *_IN_PKT_* counters on exception

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39569?usp=email ) Change subject: s1ap_proxy: increment *_IN_PKT_* counters on exception ...................................................................... s1ap_proxy: increment *_IN_PKT_* counters on exception Change-Id: Ie06e2679673df218da92f07f12ca18c085df299e --- M src/s1ap_proxy.erl 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/69/39569/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index db72dab..774fc66 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -237,6 +237,7 @@ Exception:Reason:StackTrace -> ?LOG_ERROR("An exception occurred: ~p, ~p, ~p", [Exception, Reason, StackTrace]), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_EXCEPTION), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED), {{forward, OrigData}, S0} %% XXX: proxy as-is or drop? end; @@ -249,6 +250,7 @@ Exception:Reason:StackTrace -> ?LOG_ERROR("An exception occurred: ~p, ~p, ~p", [Exception, Reason, StackTrace]), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_EXCEPTION), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_DECODE_ERROR), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED), {{forward, OrigData}, S0} %% XXX: proxy as-is or drop? end. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39569?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: Ie06e2679673df218da92f07f12ca18c085df299e Gerrit-Change-Number: 39569 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

[M] Change in osmo-sgsn[master]: Assign MME GroupId/Code to remote MMEs

by fixeria

Attention is currently required from: lynxis lazus. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39294?usp=email ) Change subject: Assign MME GroupId/Code to remote MMEs ...................................................................... Patch Set 3: (1 comment) File src/sgsn/gtp_mme.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/39294/comment/0b22db0a_3999d25c?us… : PS3, Line 138: osmo_gummei_cmp Shouldn't you check `gummei_valid` before invoking `osmo_gummei_cmp()`? Otherwise you're comparing the given GUMMEI against a garbage or zero-initialized field? Even worse, this function will still yield a result even though the operator did `no gummei` via the VTY... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39294?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: I881aeba904fb6ca815842d36e466a2459ad81913 Gerrit-Change-Number: 39294 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 17 Feb 2025 20:27:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

4 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: nokia_site: Add object_identity, object_state and object_identity_sta...

by pespin

Attention is currently required from: csaba.sipos, domi, fixeria, laforge. pespin has posted comments on this change by csaba.sipos. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39416?usp=email ) Change subject: nokia_site: Add object_identity, object_state and object_identity_state attributes ...................................................................... Patch Set 22: (1 comment) Patchset: PS22: > Is there anything missing on our end to get this merged? Just waiting for somebody else to +2 it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39416?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id9f819b0649ba3c247db72d7d738e49c72388dc3 Gerrit-Change-Number: 39416 Gerrit-PatchSet: 22 Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: domi <domi(a)tomcsanyi.net> Gerrit-Attention: csaba.sipos <metro4(a)freemail.hu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: domi <domi(a)tomcsanyi.net> Gerrit-Comment-Date: Mon, 17 Feb 2025 20:18:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: csaba.sipos <metro4(a)freemail.hu>

4 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: nokia_site: Add object_identity, object_state and object_identity_sta...

by csaba.sipos

Attention is currently required from: domi, fixeria, laforge. csaba.sipos has posted comments on this change by csaba.sipos. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39416?usp=email ) Change subject: nokia_site: Add object_identity, object_state and object_identity_state attributes ...................................................................... Patch Set 22: (1 comment) Patchset: PS22: Is there anything missing on our end to get this merged? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39416?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id9f819b0649ba3c247db72d7d738e49c72388dc3 Gerrit-Change-Number: 39416 Gerrit-PatchSet: 22 Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: domi <domi(a)tomcsanyi.net> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: domi <domi(a)tomcsanyi.net> Gerrit-Comment-Date: Mon, 17 Feb 2025 20:15:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

4 months, 2 weeks

1
0
0 0

[S] Change in osmo-upf[master]: Introduce hashtable to look up gtp_tundev by local TEID

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/39568?usp=email ) Change subject: Introduce hashtable to look up gtp_tundev by local TEID ...................................................................... Introduce hashtable to look up gtp_tundev by local TEID Use this hashtable while looking up for tunend based on <access.local.teid, access.remote.teid, access.remote.addr>. This kind of look up is used every time a session is added or removed, which means potentially thousands of tunend sessions were being iterated linerarly every time. For simplification (easier/quicker hashtable key generation), reduce the whole key presented above to a more general one based on "access.local.teid". This is usually enough since we are anyways allocating local TEIDs globally per tunnel without caring about remote address. Change-Id: Ib12ecc8ce87175071c52c0ed2217a29d901f0f05 --- M include/osmocom/upf/upf_gtp.h M src/osmo-upf/upf_gtp.c 2 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/68/39568/1 diff --git a/include/osmocom/upf/upf_gtp.h b/include/osmocom/upf/upf_gtp.h index b4cd3df..1162861 100644 --- a/include/osmocom/upf/upf_gtp.h +++ b/include/osmocom/upf/upf_gtp.h @@ -24,6 +24,7 @@ #pragma once #include <osmocom/core/linuxlist.h> +#include <osmocom/core/hashtable.h> #include <osmocom/core/select.h> #include <osmocom/core/logging.h> @@ -55,6 +56,8 @@ /* list of struct upf_gtp_tunend */ struct llist_head tunnels; + /* hashtable of (struct upf_gtp_tunen) with key desc.access.local.teid */ + DECLARE_HASHTABLE(tunnels_by_local_f_teid, 10); }; /* Description of a GTP encapsulation / decapsulation. diff --git a/src/osmo-upf/upf_gtp.c b/src/osmo-upf/upf_gtp.c index 528937b..4cbebcd 100644 --- a/src/osmo-upf/upf_gtp.c +++ b/src/osmo-upf/upf_gtp.c @@ -134,6 +134,7 @@ .gtpv1.ofd.fd = -1, }; INIT_LLIST_HEAD(&dev->tunnels); + hash_init(dev->tunnels_by_local_f_teid); osmo_sockaddr_str_from_str(&addr_conv, local_addr, PORT_GTP0_U); @@ -318,7 +319,8 @@ } struct upf_gtp_tunend { - struct llist_head entry; + struct llist_head entry; /* item in (struct upf_gtp_dev)->tunnels */ + struct hlist_node node_by_local_f_teid; /* item in g_upf->gtp.pdrs_by_local_f_teid */ struct upf_gtp_dev *dev; struct upf_tunend desc; @@ -349,6 +351,7 @@ { if (tun->active) upf_gtp_tunend_deactivate(tun); + hash_del(&tun->node_by_local_f_teid); llist_del(&tun->entry); return 0; } @@ -369,6 +372,7 @@ .dev = dev, .desc = *desc, }; + hash_add(dev->tunnels_by_local_f_teid, &tun->node_by_local_f_teid, tun->desc.access.local.teid); llist_add(&tun->entry, &dev->tunnels); talloc_set_destructor(tun, upf_gtp_tunend_destruct); return tun; @@ -425,7 +429,8 @@ { struct upf_gtp_tunend *tun; tunend_validate(tunend); - llist_for_each_entry(tun, &dev->tunnels, entry) { + + hash_for_each_possible(dev->tunnels_by_local_f_teid, tun, node_by_local_f_teid, tunend->access.local.teid) { if (upf_gtp_tunend_cmp(tunend, &tun->desc)) continue; return tun; -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39568?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ib12ecc8ce87175071c52c0ed2217a29d901f0f05 Gerrit-Change-Number: 39568 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: catch exceptions in handle_pdu/2

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39556?usp=email ) Change subject: s1ap_proxy: catch exceptions in handle_pdu/2 ...................................................................... s1ap_proxy: catch exceptions in handle_pdu/2 We do have a try-catch block in handle_pdu_bin/2 that does catch exceptions happening in decode_pdu/1, but does not catch anything else. For instance, if something goes wrong in handle_pdu/2, the whole process will be terminated, among with all the linked E-RAB FSMs. This should definitely be avoided. Change-Id: Ib1e6674f5b85557866c7beaea710ea903e4eeaca --- M src/s1ap_proxy.erl 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 56e5dee..0cef81e 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -215,7 +215,7 @@ try decode_pdu(OrigData) of {ok, PDU} -> ?LOG_DEBUG("Rx S1AP PDU: ~p", [PDU]), - case handle_pdu(PDU, S0) of + try handle_pdu(PDU, S0) of {{Action, NewPDU}, S1} -> {ok, NewData} = encode_pdu(NewPDU), ?LOG_DEBUG("Tx (~p) S1AP PDU: ~p", [Action, NewPDU]), @@ -232,6 +232,12 @@ s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL), s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED), {{forward, OrigData}, S1} + catch + Exception:Reason:StackTrace -> + ?LOG_ERROR("An exception occurred: ~p, ~p, ~p", [Exception, Reason, StackTrace]), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_EXCEPTION), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED), + {{forward, OrigData}, S0} %% XXX: proxy as-is or drop? end; {error, {asn1, Error}} -> ?LOG_ERROR("S1AP PDU decoding failed: ~p", [Error]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39556?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: Ib1e6674f5b85557866c7beaea710ea903e4eeaca Gerrit-Change-Number: 39556 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

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

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39117?usp=email ) Change subject: s1ap_proxy: handle E-RAB MODIFY REQ/RSP ...................................................................... s1ap_proxy: handle E-RAB MODIFY REQ/RSP Change-Id: I057a1c58d0c6ad04c00ad3ea4c68230d8632a07e Related: osmo-ttcn3-hacks.git I58b9964bae24b5aac526ee0c0c8ac8798f351e05 Related: SYS#7308 --- M include/s1gw_metrics.hrl M src/s1ap_proxy.erl M src/s1gw_metrics.erl M test/s1ap_proxy_test.erl 4 files changed, 197 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/s1gw_metrics.hrl b/include/s1gw_metrics.hrl index c416b1b..a2a0afd 100644 --- a/include/s1gw_metrics.hrl +++ b/include/s1gw_metrics.hrl @@ -18,6 +18,8 @@ -define(S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, [ctr, s1ap, proxy, in_pkt, proc_error]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ, [ctr, s1ap, proxy, in_pkt, erab_setup_req]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_RSP, [ctr, s1ap, proxy, in_pkt, erab_setup_rsp]). +-define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_REQ, [ctr, s1ap, proxy, in_pkt, erab_modify_req]). +-define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_RSP, [ctr, s1ap, proxy, in_pkt, erab_modify_rsp]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_CMD, [ctr, s1ap, proxy, in_pkt, erab_release_cmd]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_RSP, [ctr, s1ap, proxy, in_pkt, erab_release_rsp]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_IND, [ctr, s1ap, proxy, in_pkt, erab_release_ind]). diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 0cef81e..402eaaa 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -71,6 +71,7 @@ -record(proxy_state, {erabs :: dict:dict(), mme_ue_id :: undefined | mme_ue_id(), enb_ue_id :: undefined | enb_ue_id(), + erab_id :: undefined | erab_id(), path :: [s1ap_ie_id()] }). @@ -295,7 +296,37 @@ {forward, S1} %% XXX: forward as-is or drop? end; -%% TODO: 9.1.3.3 E-RAB MODIFY REQUEST / (Optional) Transport Information +%% 9.1.3.3 E-RAB MODIFY REQUEST +handle_pdu({Outcome = initiatingMessage, + #'InitiatingMessage'{procedureCode = ?'id-E-RABModify', + value = C0} = Msg}, S0) -> + ?LOG_DEBUG("Processing E-RAB MODIFY REQUEST"), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_REQ), + case handle_ies(?'id-E-RABToBeModifiedListBearerModReq', + C0#'E-RABModifyRequest'.protocolIEs, S0) of + {{ok, IEs}, S1} -> + C1 = C0#'E-RABModifyRequest'{protocolIEs = IEs}, + PDU = {Outcome, Msg#'InitiatingMessage'{value = C1}}, + {{forward, PDU}, S1}; %% forward patched PDU + {{error, Reason}, S1} -> + ?LOG_NOTICE("Failed to process E-RAB MODIFY REQUEST: ~p", [Reason]), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR), + {forward, S1} %% XXX: forward as-is or drop? + end; + +%% 9.1.3.4 E-RAB MODIFY RESPONSE +handle_pdu({successfulOutcome, + #'SuccessfulOutcome'{procedureCode = ?'id-E-RABModify', + value = C0}}, S0) -> + ?LOG_DEBUG("Processing E-RAB MODIFY RESPONSE"), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_RSP), + %% there's nothing to patch in this PDU, so we forward it as-is + %% TODO: check result of handle_ies(), inc. ?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR + {_, S1} = handle_ies(?'id-E-RABModifyListBearerModRes', + C0#'E-RABModifyResponse'.protocolIEs, S0), + {_, S2} = handle_ies(?'id-E-RABFailedToModifyList', + C0#'E-RABModifyResponse'.protocolIEs, S1), + {forward, S2}; %% 9.1.3.5 E-RAB RELEASE COMMAND handle_pdu({Outcome = initiatingMessage, @@ -533,6 +564,88 @@ {{error, erab_not_registered}, S} end; +%% 9.1.3.3 E-RAB MODIFY REQUEST related IEs +handle_ie([?'id-E-RABToBeModifiedListBearerModReq'], C, S) -> + %% This IE contains a list of BearerModReq, so patch inner IEs + handle_ies(?'id-E-RABToBeModifiedItemBearerModReq', C, S); + +handle_ie([?'id-E-RABToBeModifiedItemBearerModReq', + ?'id-E-RABToBeModifiedListBearerModReq'], + #'E-RABToBeModifiedItemBearerModReq'{'e-RAB-ID' = ERABId, + 'iE-Extensions' = E0} = C0, S0) -> + %% The IE-Extensions may optionally contain F-TEID, so patch inner IEs + case E0 of + %% no extensions means no F-TEID, so nothing to patch + asn1_NOVALUE -> + {{ok, C0}, S0}; + _ -> + case handle_ies(?'id-TransportInformation', + E0, S0#proxy_state{erab_id = ERABId}) of + {{ok, E1}, S1} -> + C1 = C0#'E-RABToBeModifiedItemBearerModReq'{'iE-Extensions' = E1}, + {{ok, C1}, S1}; + Error -> + Error + end + end; + +handle_ie([?'id-TransportInformation', + ?'id-E-RABToBeModifiedItemBearerModReq', + ?'id-E-RABToBeModifiedListBearerModReq'], + #'TransportInformation'{'transportLayerAddress' = TLA_In, + 'uL-GTP-TEID' = << TEID_In:32/big >>} = C0, S) -> + %% poke E-RAB FSM + case erab_fsm_find(S#proxy_state.erab_id, S) of + {ok, Pid} -> + case erab_fsm:erab_modify_req(Pid, {TEID_In, TLA_In}) of + {ok, {TEID_Out, TLA_Out}} -> + C1 = C0#'TransportInformation'{'transportLayerAddress' = TLA_Out, + 'uL-GTP-TEID' = << TEID_Out:32/big >>}, + {{ok, C1}, S}; + {error, Reason} -> + {{error, Reason}, S} + end; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", + [erab_uid(S#proxy_state.erab_id, S)]), + {{error, erab_not_registered}, S} + end; + +%% 9.1.3.4 E-RAB MODIFY RESPONSE related IEs +handle_ie([?'id-E-RABModifyListBearerModRes'], C, S) -> + %% This IE contains a list of BearerModRes, so patch inner IEs + handle_ies(?'id-E-RABModifyItemBearerModRes', C, S); + +handle_ie([?'id-E-RABModifyItemBearerModRes', + ?'id-E-RABModifyListBearerModRes'], + #'E-RABModifyItemBearerModRes'{'e-RAB-ID' = ERABId} = C, S) -> + %% poke E-RAB FSM + case erab_fsm_find(ERABId, S) of + {ok, Pid} -> + ok = erab_fsm:erab_modify_rsp(Pid, ack), + {{ok, C}, S}; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [erab_uid(ERABId, S)]), + {{error, erab_not_registered}, S} + end; + +handle_ie([?'id-E-RABFailedToModifyList'], C, S) -> + %% This IE contains a list of E-RABItem, so patch inner IEs + handle_ies(?'id-E-RABItem', C, S); + +handle_ie([?'id-E-RABItem', + ?'id-E-RABFailedToModifyList'], + #'E-RABItem'{'e-RAB-ID' = ERABId} = C, S) -> + %% poke E-RAB FSM + case erab_fsm_find(ERABId, S) of + {ok, Pid} -> + ok = erab_fsm:erab_modify_rsp(Pid, nack), + {{ok, C}, S}; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [erab_uid(ERABId, S)]), + {{error, erab_not_registered}, S} + end; + %% 9.1.3.5 E-RAB RELEASE COMMAND related IEs handle_ie([?'id-E-RABToBeReleasedList'], C, S) -> %% This IE contains a list of E-RABItem diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index 50cab10..c2785de 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -69,6 +69,8 @@ ?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR, %% failed to process ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ, %% E-RAB SETUP.req PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_RSP, %% E-RAB SETUP.rsp PDUs + ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_REQ, %% E-RAB MODIFY.req PDUs + ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_RSP, %% E-RAB MODIFY.rsp PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_CMD, %% E-RAB RELEASE.cmd PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_RSP, %% E-RAB RELEASE.rsp PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_IND, %% E-RAB RELEASE.ind PDUs diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index ce9032e..6c04d1b 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -42,6 +42,10 @@ ?TC(fun test_e_rab_release_cmd/1)}, {"E-RAB RELEASE INDICATION", ?TC(fun test_e_rab_release_ind/1)}, + {"E-RAB MODIFY REQUEST/RESPONSE (success)", + ?TC(fun test_e_rab_modify_req_rsp/1)}, + {"E-RAB MODIFY REQUEST/RESPONSE (failure)", + ?TC(fun test_e_rab_modify_req_rsp_fail/1)}, {"E-RAB MODIFICATION INDICATION", ?TC(fun test_e_rab_modify_ind/1)}, {"INITIAL CONTEXT SETUP REQUEST/RESPONSE", @@ -121,6 +125,49 @@ ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. +test_e_rab_modify_req_rsp(#{handler := Pid}) -> + %% [eNB <- MME] E-RAB SETUP REQUEST + SetupReq = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + %% [eNB -> MME] E-RAB SETUP RESPONSE + SetupRsp = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + %% eNB <- [S1GW <- MME] E-RAB MODIFY REQUEST (new F-TEID) + ModifyReqIn = e_rab_modify_req_pdu(?ADDR_U2CM, ?TEID_U2CM), + %% [eNB <- S1GW] <- MME E-RAB MODIFY REQUEST + %% for the eNB F-TEID remains unchanged + ModifyReqExp = e_rab_modify_req_pdu(?ADDR_A2U, ?TEID_A2U), + %% [eNB -> MME] E-RAB MODIFY RESPONSE + ModifyRsp = e_rab_modify_rsp_pdu(), + %% [eNB -> MME] E-RAB RELEASE INDICATION + ReleaseInd = e_rab_release_ind_pdu(), + + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupReq)), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRsp)), + ?_assertEqual({forward, ModifyReqExp}, s1ap_proxy:process_pdu(Pid, ModifyReqIn)), + ?_assertEqual({forward, ModifyRsp}, s1ap_proxy:process_pdu(Pid, ModifyRsp)), + ?_assertEqual({forward, ReleaseInd}, s1ap_proxy:process_pdu(Pid, ReleaseInd)), + ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. + + +test_e_rab_modify_req_rsp_fail(#{handler := Pid}) -> + %% [eNB <- MME] E-RAB SETUP REQUEST + SetupReq = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + %% [eNB -> MME] E-RAB SETUP RESPONSE + SetupRsp = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + %% [eNB <- MME] E-RAB MODIFY REQUEST (new F-TEID) + ModifyReq = e_rab_modify_req_pdu(?ADDR_U2CM, ?TEID_U2CM), + %% [eNB -> MME] E-RAB MODIFY RESPONSE (failure) + ModifyRsp = e_rab_modify_rsp_fail_pdu(), + %% [eNB -> MME] E-RAB RELEASE INDICATION + ReleaseInd = e_rab_release_ind_pdu(), + + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupReq)), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRsp)), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, ModifyReq)), + ?_assertEqual({forward, ModifyRsp}, s1ap_proxy:process_pdu(Pid, ModifyRsp)), + ?_assertEqual({forward, ReleaseInd}, s1ap_proxy:process_pdu(Pid, ReleaseInd)), + ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. + + test_e_rab_modify_ind(#{handler := Pid}) -> %% [eNB -> MME] E-RAB MODIFICATION INDICATION ModifyIndIn = e_rab_modify_ind_pdu(?ADDR_U2A, ?TEID_U2A), @@ -267,6 +314,38 @@ >>. +%% [eNB <- MME] E-RAB MODIFY REQUEST +e_rab_modify_req_pdu(TLA, TEID) when is_binary(TLA), + is_integer(TEID) -> + << 16#00, 16#06, 16#00, 16#2d, 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#1e, 16#00, 16#1a, 16#00, + 16#00, 16#24, 16#00, 16#15, 16#4c, 16#00, 16#05, 16#04, + 16#00, 16#00, 16#00, 16#00, 16#b9, 16#00, 16#0a, 16#07, + 16#c0, + TLA/bytes, %% transportLayerAddress (IPv4) + TEID:32/big %% GTP-TEID + >>. + + +%% [eNB -> MME] E-RAB MODIFY RESPONSE (success) +e_rab_modify_rsp_pdu() -> + << 16#20, 16#06, 16#00, 16#19, 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#1f, 16#40, 16#06, 16#00, + 16#00, 16#25, 16#40, 16#01, 16#0c + >>. + + +%% [eNB -> MME] E-RAB MODIFY RESPONSE (failure) +e_rab_modify_rsp_fail_pdu() -> + << 16#20, 16#06, 16#00, 16#1a, 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#20, 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/+/39117?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: I057a1c58d0c6ad04c00ad3ea4c68230d8632a07e Gerrit-Change-Number: 39117 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: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: handle E-RAB MODIFICATION IND/CNF

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39118?usp=email ) Change subject: s1ap_proxy: handle E-RAB MODIFICATION IND/CNF ...................................................................... s1ap_proxy: handle E-RAB MODIFICATION IND/CNF Change-Id: Icc16a57d40b68bd17c5d207b643927d58176e088 Related: osmo-ttcn3-hacks.git Iec95ca0ecf37290bddfbefce1861f8ae66bf4db1 Related: SYS#7308 --- M include/s1gw_metrics.hrl M src/s1ap_proxy.erl M src/s1gw_metrics.erl M test/erab_fsm_test.erl M test/s1ap_proxy_test.erl 5 files changed, 209 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/s1gw_metrics.hrl b/include/s1gw_metrics.hrl index a2a0afd..940529b 100644 --- a/include/s1gw_metrics.hrl +++ b/include/s1gw_metrics.hrl @@ -24,6 +24,7 @@ -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_RSP, [ctr, s1ap, proxy, in_pkt, erab_release_rsp]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_IND, [ctr, s1ap, proxy, in_pkt, erab_release_ind]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_IND, [ctr, s1ap, proxy, in_pkt, erab_mod_ind]). +-define(S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_CNF, [ctr, s1ap, proxy, in_pkt, erab_mod_cnf]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_REQ, [ctr, s1ap, proxy, in_pkt, init_ctx_req]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_RSP, [ctr, s1ap, proxy, in_pkt, init_ctx_rsp]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_REQ, [ctr, s1ap, proxy, in_pkt, release_ctx_req]). diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 402eaaa..db72dab 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -399,6 +399,25 @@ PDU = {Outcome, Msg#'InitiatingMessage'{value = C1}}, {{forward, PDU}, S2}; +%% 9.1.3.9 E-RAB MODIFICATION CONFIRM +handle_pdu({successfulOutcome, + #'SuccessfulOutcome'{procedureCode = ?'id-E-RABModificationIndication', + value = C0}}, S0) -> + ?LOG_DEBUG("Processing E-RAB MODIFICATION CONFIRM"), + s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_CNF), + IEs = C0#'E-RABModificationConfirm'.protocolIEs, + %% E-RAB Modify List + %% TODO: handle {error, Reason} + {_, S1} = handle_ies(?'id-E-RABModifyListBearerModConf', IEs, S0), + %% E-RAB Failed to Modify List + %% TODO: handle {error, Reason} + {_, S2} = handle_ies(?'id-E-RABFailedToModifyListBearerModConf', IEs, S1), + %% E-RAB To Be Released List + %% TODO: handle {error, Reason} + {_, S3} = handle_ies(?'id-E-RABToBeReleasedListBearerModConf', IEs, S2), + %% there's nothing to patch in this PDU, so we forward it as-is + {forward, S3}; + %% 9.1.4.1 INITIAL CONTEXT SETUP REQUEST handle_pdu({Outcome = initiatingMessage, #'InitiatingMessage'{procedureCode = ?'id-InitialContextSetup', @@ -700,16 +719,31 @@ {{error, erab_not_registered}, S} end; -%% E-RAB MODIFICATION INDICATION related IEs +%% 9.1.3.8 E-RAB MODIFICATION INDICATION related IEs handle_ie([?'id-E-RABToBeModifiedListBearerModInd'], C, S) -> %% This IE contains a list of BearerModInd, so patch inner IEs handle_ies(?'id-E-RABToBeModifiedItemBearerModInd', C, S); handle_ie([?'id-E-RABToBeModifiedItemBearerModInd', ?'id-E-RABToBeModifiedListBearerModInd'], - #'E-RABToBeModifiedItemBearerModInd'{} = C, S) -> - %% TODO: find and poke an E-RAB FSM associated with this E-RAB - {{ok, C}, S}; + #'E-RABToBeModifiedItemBearerModInd'{'e-RAB-ID' = ERABId, + 'transportLayerAddress' = TLA_In, + 'dL-GTP-TEID' = << TEID_In:32/big >>} = C0, S) -> + %% poke E-RAB FSM + case erab_fsm_find(ERABId, S) of + {ok, Pid} -> + case erab_fsm:erab_modify_ind(Pid, {TEID_In, TLA_In}) of + {ok, {TEID_Out, TLA_Out}} -> + C1 = C0#'E-RABToBeModifiedItemBearerModInd'{'transportLayerAddress' = TLA_Out, + 'dL-GTP-TEID' = << TEID_Out:32/big >>}, + {{ok, C1}, S}; + {error, Reason} -> + {{error, Reason}, S} + end; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [erab_uid(ERABId, S)]), + {{error, erab_not_registered}, S} + end; handle_ie([?'id-E-RABNotToBeModifiedListBearerModInd'], C, S) -> %% This IE contains a list of BearerModInd, so patch inner IEs @@ -717,9 +751,77 @@ handle_ie([?'id-E-RABNotToBeModifiedItemBearerModInd', ?'id-E-RABNotToBeModifiedListBearerModInd'], - #'E-RABNotToBeModifiedItemBearerModInd'{} = C, S) -> - %% TODO: find and poke an E-RAB FSM associated with this E-RAB - {{ok, C}, S}; + #'E-RABNotToBeModifiedItemBearerModInd'{'e-RAB-ID' = ERABId} = C0, S) -> + %% poke E-RAB FSM + case erab_fsm_find(ERABId, S) of + {ok, Pid} -> + %% Ignore F-TEID in the original message, just replace it with C2U F-TEID + Info = erab_fsm:fetch_info(Pid), + case proplists:get_value(f_teid_c2u, Info) of + {TEID, TLA} -> + C1 = C0#'E-RABNotToBeModifiedItemBearerModInd'{'transportLayerAddress' = TLA, + 'dL-GTP-TEID' = << TEID:32/big >>}, + {{ok, C1}, S}; + undefined -> + ?LOG_ERROR("E-RAB-ID ~p :: missing C2U F-TEID", [erab_uid(ERABId, S)]), + {{error, missing_f_teid}, S} + end; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [erab_uid(ERABId, S)]), + {{error, erab_not_registered}, S} + end; + +%% 9.1.3.9 E-RAB MODIFICATION CONFIRM related IEs +handle_ie([?'id-E-RABModifyListBearerModConf'], C, S) -> + %% This IE contains a list of BearerModConf, so patch inner IEs + handle_ies(?'id-E-RABModifyItemBearerModConf', C, S); + +handle_ie([?'id-E-RABModifyItemBearerModConf', + ?'id-E-RABModifyListBearerModConf'], + #'E-RABModifyItemBearerModConf'{'e-RAB-ID' = ERABId} = C, S) -> + %% poke E-RAB FSM + case erab_fsm_find(ERABId, S) of + {ok, Pid} -> + ok = erab_fsm:erab_modify_cnf(Pid, ack), + {{ok, C}, S}; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [erab_uid(ERABId, S)]), + {{error, erab_not_registered}, S} + end; + +handle_ie([?'id-E-RABFailedToModifyListBearerModConf'], C, S) -> + %% This IE contains a list of E-RABItem, so patch inner IEs + handle_ies(?'id-E-RABItem', C, S); + +handle_ie([?'id-E-RABItem', + ?'id-E-RABFailedToModifyListBearerModConf'], + #'E-RABItem'{'e-RAB-ID' = ERABId} = C, S) -> + %% poke E-RAB FSM + case erab_fsm_find(ERABId, S) of + {ok, Pid} -> + ok = erab_fsm:erab_modify_cnf(Pid, nack), + {{ok, C}, S}; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [erab_uid(ERABId, S)]), + {{error, erab_not_registered}, S} + end; + +handle_ie([?'id-E-RABToBeReleasedListBearerModConf'], C, S) -> + %% This IE contains a list of E-RABItem, so patch inner IEs + handle_ies(?'id-E-RABItem', C, S); + +handle_ie([?'id-E-RABItem', + ?'id-E-RABToBeReleasedListBearerModConf'], + #'E-RABItem'{'e-RAB-ID' = ERABId} = C, S) -> + %% poke E-RAB FSM + case erab_fsm_find(ERABId, S) of + {ok, Pid} -> + ok = erab_fsm:erab_release_ind(Pid), + {{ok, C}, S}; + error -> + ?LOG_ERROR("E-RAB-ID ~p is not registered", [erab_uid(ERABId, S)]), + {{error, erab_not_registered}, S} + end; %% INITIAL CONTEXT SETUP REQUEST related IEs handle_ie([?'id-E-RABToBeSetupListCtxtSUReq'], C, S) -> diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index c2785de..9f7b2e8 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -75,6 +75,7 @@ ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_RSP, %% E-RAB RELEASE.rsp PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_IND, %% E-RAB RELEASE.ind PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_IND, %% E-RAB MODIFY.ind PDUs + ?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_CNF, %% E-RAB MODIFY.cnf PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_REQ, %% INITIAL CONTEXT SETUP.req PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_RSP, %% INITIAL CONTEXT SETUP.rsp PDUs ?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_REQ, %% UE CONTEXT RELEASE.req PDUs diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index 3740f9a..a3dfb4d 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -51,6 +51,9 @@ ?TC(fun test_erab_setup_pfcp_modify_error/1)}]. +%% 8.2.4.2 Interactions with E-RAB Setup procedure or E-RAB Modify procedure: +%% TODO: test E-RAB MODIFY IND/CNF during E-RAB SETUP +%% TODO: test E-RAB MODIFY IND/CNF during E-RAB MODIFY erab_modify_test_() -> [{"E-RAB MODIFY REQ :: ACK", ?TC(fun test_erab_modify_req_ack/1)}, diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 6c04d1b..74f3f05 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -46,8 +46,12 @@ ?TC(fun test_e_rab_modify_req_rsp/1)}, {"E-RAB MODIFY REQUEST/RESPONSE (failure)", ?TC(fun test_e_rab_modify_req_rsp_fail/1)}, - {"E-RAB MODIFICATION INDICATION", - ?TC(fun test_e_rab_modify_ind/1)}, + {"E-RAB MODIFICATION INDICATION (modified)", + ?TC(fun test_e_rab_modify_ind_cnf_modified/1)}, + {"E-RAB MODIFICATION INDICATION (not modified)", + ?TC(fun test_e_rab_modify_ind_cnf_not_modified/1)}, + {"E-RAB MODIFICATION INDICATION (release)", + ?TC(fun test_e_rab_modify_ind_cnf_release/1)}, {"INITIAL CONTEXT SETUP REQUEST/RESPONSE", ?TC(fun test_initial_context_setup/1)}, {"UE CONTEXT RELEASE REQUEST", @@ -168,13 +172,70 @@ ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. -test_e_rab_modify_ind(#{handler := Pid}) -> - %% [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), +test_e_rab_modify_ind_cnf_modified(#{handler := Pid}) -> + %% [eNB <- MME] E-RAB SETUP REQUEST + SetupReq = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + %% [eNB -> MME] E-RAB SETUP RESPONSE + SetupRsp = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + %% [eNB -> S1GW] -> MME E-RAB MODIFICATION INDICATION (new F-TEID) + ModifyIndIn = e_rab_modify_ind_pdu(?ADDR_U2AM, ?TEID_U2AM), + %% eNB -> [S1GW -> MME] E-RAB MODIFICATION INDICATION + %% for the MME F-TEID remains unchanged + ModifyIndExp = e_rab_modify_ind_pdu(?ADDR_C2U, ?TEID_C2U), + %% [eNB <- MME] E-RAB MODIFICATION CONFIRMATION + ModifyCnf = e_rab_modify_cnf_pdu(modified), + %% [eNB -> MME] E-RAB RELEASE INDICATION + ReleaseInd = e_rab_release_ind_pdu(), - [?_assertEqual({forward, ModifyIndExp}, s1ap_proxy:process_pdu(Pid, ModifyIndIn))]. + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupReq)), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRsp)), + ?_assertEqual({forward, ModifyIndExp}, s1ap_proxy:process_pdu(Pid, ModifyIndIn)), + ?_assertEqual({forward, ModifyCnf}, s1ap_proxy:process_pdu(Pid, ModifyCnf)), + ?_assertEqual({forward, ReleaseInd}, s1ap_proxy:process_pdu(Pid, ReleaseInd)), + ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. + + +test_e_rab_modify_ind_cnf_not_modified(#{handler := Pid}) -> + %% [eNB <- MME] E-RAB SETUP REQUEST + SetupReq = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + %% [eNB -> MME] E-RAB SETUP RESPONSE + SetupRsp = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + %% [eNB -> S1GW] -> MME E-RAB MODIFICATION INDICATION (new F-TEID) + ModifyIndIn = e_rab_modify_ind_pdu(?ADDR_U2AM, ?TEID_U2AM), + %% eNB -> [S1GW -> MME] E-RAB MODIFICATION INDICATION + %% for the MME F-TEID remains unchanged + ModifyIndExp = e_rab_modify_ind_pdu(?ADDR_C2U, ?TEID_C2U), + %% [eNB <- MME] E-RAB MODIFICATION CONFIRMATION + ModifyCnf = e_rab_modify_cnf_pdu(not_modified), + %% [eNB -> MME] E-RAB RELEASE INDICATION + ReleaseInd = e_rab_release_ind_pdu(), + + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupReq)), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRsp)), + ?_assertEqual({forward, ModifyIndExp}, s1ap_proxy:process_pdu(Pid, ModifyIndIn)), + ?_assertEqual({forward, ModifyCnf}, s1ap_proxy:process_pdu(Pid, ModifyCnf)), + ?_assertEqual({forward, ReleaseInd}, s1ap_proxy:process_pdu(Pid, ReleaseInd)), + ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. + + +test_e_rab_modify_ind_cnf_release(#{handler := Pid}) -> + %% [eNB <- MME] E-RAB SETUP REQUEST + SetupReq = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + %% [eNB -> MME] E-RAB SETUP RESPONSE + SetupRsp = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + %% [eNB -> S1GW] -> MME E-RAB MODIFICATION INDICATION (new F-TEID) + ModifyIndIn = e_rab_modify_ind_pdu(?ADDR_U2AM, ?TEID_U2AM), + %% eNB -> [S1GW -> MME] E-RAB MODIFICATION INDICATION + %% for the MME F-TEID remains unchanged + ModifyIndExp = e_rab_modify_ind_pdu(?ADDR_C2U, ?TEID_C2U), + %% [eNB <- MME] E-RAB MODIFICATION CONFIRMATION + ModifyCnf = e_rab_modify_cnf_pdu(release), + + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupReq)), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRsp)), + ?_assertEqual({forward, ModifyIndExp}, s1ap_proxy:process_pdu(Pid, ModifyIndIn)), + ?_assertEqual({forward, ModifyCnf}, s1ap_proxy:process_pdu(Pid, ModifyCnf)), + ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. test_initial_context_setup(#{handler := Pid}) -> @@ -349,15 +410,37 @@ %% [eNB -> MME] E-RAB MODIFICATION INDICATION e_rab_modify_ind_pdu(TLA, TEID) when is_binary(TLA), 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, + << 16#00, 16#32, 16#00, 16#22, 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#c7, 16#00, 16#0f, 16#00, + 16#00, 16#c8, 16#00, 16#0a, 16#0c, 16#1f, TLA/bytes, %% transportLayerAddress (IPv4) TEID:32/big %% GTP-TEID >>. +%% [eNB -> MME] E-RAB MODIFICATION CONFIRMATION +e_rab_modify_cnf_pdu(Res) -> + IEs = case Res of + modified -> + << 16#00, 16#cb, 16#40, 16#06, 16#00, + 16#00, 16#cc, 16#40, 16#01, 16#0c >>; + not_modified -> + %% cause: transport: transport-resource-unavailable (0) + << 16#00, 16#cd, 16#40, 16#07, 16#00, + 16#00, 16#23, 16#40, 16#02, 16#0c, 16#20 >>; + release -> + %% cause: transport: transport-resource-unavailable (0) + << 16#00, 16#d2, 16#40, 16#07, 16#00, + 16#00, 16#23, 16#40, 16#02, 16#0c, 16#20 >> + end, + << 16#20, 16#32, 16#00, (15 + byte_size(IEs)), + 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, + IEs/bytes + >>. + + %% [eNB <- MME] INITIAL CONTEXT SETUP REQUEST initial_context_setup_req_pdu(TLA, TEID) when is_binary(TLA), is_integer(TEID) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39118?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Icc16a57d40b68bd17c5d207b643927d58176e088 Gerrit-Change-Number: 39118 Gerrit-PatchSet: 7 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: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: catch exceptions in handle_pdu/2

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39556?usp=email ) Change subject: s1ap_proxy: catch exceptions in handle_pdu/2 ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File src/s1ap_proxy.erl: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39556/comment/3056dcff_e2e0… : PS1, Line 240: {{forward, OrigData}, S0} %% XXX: proxy as-is or drop? > ... once processing of packets is split into multiple steps (parsing, processing, transmitting) If you carefully look at the code, you'll see that it's already done in three steps: * `decode_pdu/1` - parsing/decoding, * `handle_pdu/2` - processing (patching), * `encode_pdu/1` and return - encoding and sending. > ... the best would be to look at the parsed message type and answer accordingly eg. rejecting the request? The message type is already known here, as well as the criticality, so we can improve this aspect in follow-up patches. For now I simply want to address one specific problem: crashing process and loosing all E-RABs if something goes wrong in `handle_pdu/2`. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39556?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: Ib1e6674f5b85557866c7beaea710ea903e4eeaca Gerrit-Change-Number: 39556 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Feb 2025 17:19:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2025