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

[XS] Change in osmo-ttcn3-hacks[master]: SGSN: f_TC_cell_change_different_*: always expect the auth

by lynxis lazus

Attention is currently required from: lynxis lazus. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38404?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: SGSN: f_TC_cell_change_different_*: always expect the auth ...................................................................... SGSN: f_TC_cell_change_different_*: always expect the auth The new SGSN will always ask for authentication when receiving Attach or RA which is the correct behaviour as long the LLC layer doesn't indicate integrity or encryption protection. Change-Id: I24579b5fc843caf68e035e106cee4e4ec0a3c735 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/38404/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38404?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I24579b5fc843caf68e035e106cee4e4ec0a3c735 Gerrit-Change-Number: 38404 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: SGSN: fix encoding of IMEISV in Auth and Ciphering Response

by lynxis lazus

Attention is currently required from: lynxis lazus. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38414?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: SGSN: fix encoding of IMEISV in Auth and Ciphering Response ...................................................................... SGSN: fix encoding of IMEISV in Auth and Ciphering Response According to 24.008 the IMEISV field is exact 11 bytes long and must contain a IMEI + SV which is exact 16 digits long, not 15. Change-Id: I79dd79840de58f450c1a05e704fd9bd831455716 --- M sgsn/BSSGP_ConnHdlr.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/38414/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38414?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I79dd79840de58f450c1a05e704fd9bd831455716 Gerrit-Change-Number: 38414 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: SGSN: TC_attach_pdp_act_pmm_idle: use correct Service Request type

by lynxis lazus

Attention is currently required from: lynxis lazus. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38416?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: SGSN: TC_attach_pdp_act_pmm_idle: use correct Service Request type ...................................................................... SGSN: TC_attach_pdp_act_pmm_idle: use correct Service Request type When the UE requests data service, it must use the data service request type. Change-Id: I9301e7a37d96c3f93e77f7618d6c13dfa1fbe46b --- M sgsn/SGSN_Tests_Iu.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/38416/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38416?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9301e7a37d96c3f93e77f7618d6c13dfa1fbe46b Gerrit-Change-Number: 38416 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-sgsn[master]: move gsm48_gmm_att_tlvdef into gprs_gmm_util

by lynxis lazus

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37868?usp=email ) Change subject: move gsm48_gmm_att_tlvdef into gprs_gmm_util ...................................................................... move gsm48_gmm_att_tlvdef into gprs_gmm_util The gprs_gmm.c is huge. Move message parsing into gprs_gmm_util.c. Change-Id: I67dcdb986fd01dc093501d324b5c376246a5d30d --- M include/osmocom/sgsn/Makefile.am A include/osmocom/sgsn/gprs_gmm_util.h M src/sgsn/Makefile.am M src/sgsn/gprs_gmm.c A src/sgsn/gprs_gmm_util.c M tests/gprs_routing_area/Makefile.am M tests/sgsn/Makefile.am 7 files changed, 63 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index 9f87fd8..270ac7d 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -8,6 +8,7 @@ gprs_gmm.h \ gprs_gmm_fsm.h \ gprs_gmm_attach.h \ + gprs_gmm_util.h \ gprs_mm_state_gb_fsm.h \ gprs_mm_state_iu_fsm.h \ gprs_ns.h \ diff --git a/include/osmocom/sgsn/gprs_gmm_util.h b/include/osmocom/sgsn/gprs_gmm_util.h new file mode 100644 index 0000000..be89c35 --- /dev/null +++ b/include/osmocom/sgsn/gprs_gmm_util.h @@ -0,0 +1,5 @@ +#pragma once + +#include <osmocom/gsm/tlv.h> + +extern const struct tlv_definition gsm48_gmm_ie_tlvdef; diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am index c363a48..660e490 100644 --- a/src/sgsn/Makefile.am +++ b/src/sgsn/Makefile.am @@ -45,6 +45,7 @@ gprs_gmm_attach.c \ gprs_gmm.c \ gprs_gmm_fsm.c \ + gprs_gmm_util.c \ gprs_mm_state_gb_fsm.c \ gprs_ns.c \ gprs_routing_area.c \ diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index ea9ffe0..324c6bf 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -63,30 +63,12 @@ #include <osmocom/sgsn/gprs_sm.h> #include <osmocom/sgsn/gtp.h> #include <osmocom/sgsn/pdpctx.h> +#include <osmocom/sgsn/gprs_gmm_util.h> #include <pdp.h> #define PTMSI_ALLOC -static const struct tlv_definition gsm48_gmm_att_tlvdef = { - .def = { - [GSM48_IE_GMM_CIPH_CKSN] = { TLV_TYPE_SINGLE_TV, 1 }, - [GSM48_IE_GMM_TIMER_READY] = { TLV_TYPE_TV, 1 }, - [GSM48_IE_GMM_ALLOC_PTMSI] = { TLV_TYPE_TLV, 0 }, - [GSM48_IE_GMM_PTMSI_SIG] = { TLV_TYPE_FIXED, 3 }, - [GSM48_IE_GMM_AUTH_RAND] = { TLV_TYPE_FIXED, 16 }, - [GSM48_IE_GMM_AUTH_SRES] = { TLV_TYPE_FIXED, 4 }, - [GSM48_IE_GMM_AUTH_RES_EXT] = { TLV_TYPE_TLV, 0 }, - [GSM48_IE_GMM_AUTH_FAIL_PAR] = { TLV_TYPE_TLV, 0 }, - [GSM48_IE_GMM_IMEISV] = { TLV_TYPE_TLV, 0 }, - [GSM48_IE_GMM_RX_NPDU_NUM_LIST] = { TLV_TYPE_TLV, 0 }, - [GSM48_IE_GMM_DRX_PARAM] = { TLV_TYPE_FIXED, 2 }, - [GSM48_IE_GMM_MS_NET_CAPA] = { TLV_TYPE_TLV, 0 }, - [GSM48_IE_GMM_PDP_CTX_STATUS] = { TLV_TYPE_TLV, 0 }, - [GSM48_IE_GMM_PS_LCS_CAPA] = { TLV_TYPE_TLV, 0 }, - [GSM48_IE_GMM_GMM_MBMS_CTX_ST] = { TLV_TYPE_TLV, 0 }, - }, -}; /* Our implementation, should be kept in SGSN */ @@ -635,7 +617,7 @@ /* Stop T3360 */ mmctx_timer_stop(ctx, 3360); - tlv_parse(&tp, &gsm48_gmm_att_tlvdef, acr->data, + tlv_parse(&tp, &gsm48_gmm_ie_tlvdef, acr->data, (msg->data + msg->len) - acr->data, 0, 0); if (!TLVP_PRESENT(&tp, GSM48_IE_GMM_AUTH_SRES) || @@ -694,7 +676,7 @@ LOGMMCTXP(LOGL_INFO, ctx, "-> GMM AUTH AND CIPH FAILURE (cause = %s)\n", get_value_string(gsm48_gmm_cause_names, gmm_cause)); - tlv_parse(&tp, &gsm48_gmm_att_tlvdef, gh->data+1, msg->len - 1, 0, 0); + tlv_parse(&tp, &gsm48_gmm_ie_tlvdef, gh->data+1, msg->len - 1, 0, 0); /* Only if GMM cause is present and the AUTS is provided, we can * start re-sync procedure */ @@ -1651,7 +1633,7 @@ /* Optional: Old P-TMSI Signature, Requested READY timer, TMSI Status, * DRX parameter, MS network capability */ - tlv_parse(&tp, &gsm48_gmm_att_tlvdef, cur, + tlv_parse(&tp, &gsm48_gmm_ie_tlvdef, cur, (msg->data + msg->len) - cur, 0, 0); switch (upd_type) { @@ -1937,7 +1919,7 @@ LOGPC(DMM, LOGL_INFO, "\n"); /* Optional: PDP context status, MBMS context status, Uplink data status, Device properties */ - tlv_parse(&tp, &gsm48_gmm_att_tlvdef, cur, (msg->data + msg->len) - cur, 0, 0); + tlv_parse(&tp, &gsm48_gmm_ie_tlvdef, cur, (msg->data + msg->len) - cur, 0, 0); switch (mi.type) { case GSM_MI_TYPE_IMSI: diff --git a/src/sgsn/gprs_gmm_util.c b/src/sgsn/gprs_gmm_util.c new file mode 100644 index 0000000..1248e93 --- /dev/null +++ b/src/sgsn/gprs_gmm_util.c @@ -0,0 +1,49 @@ +/*! \file gprs_bssgp_util.c + * GPRS GMM protocol implementation as per 3GPP TS 24.008 */ +/* + * (C) 2009-2015 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * SPDX-License-Identifier: AGPL-3.0+ + * + * Author: Alexander Couzens <lynxis(a)fe80.eu> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <osmocom/gsm/gsm48.h> +#include <osmocom/gsm/protocol/gsm_04_08_gprs.h> +#include <osmocom/gsm/tlv.h> + +const struct tlv_definition gsm48_gmm_ie_tlvdef = { + .def = { + [GSM48_IE_GMM_CIPH_CKSN] = { TLV_TYPE_SINGLE_TV, 1 }, + [GSM48_IE_GMM_TIMER_READY] = { TLV_TYPE_TV, 1 }, + [GSM48_IE_GMM_ALLOC_PTMSI] = { TLV_TYPE_TLV, 0 }, + [GSM48_IE_GMM_PTMSI_SIG] = { TLV_TYPE_FIXED, 3 }, + [GSM48_IE_GMM_AUTH_RAND] = { TLV_TYPE_FIXED, 16 }, + [GSM48_IE_GMM_AUTH_SRES] = { TLV_TYPE_FIXED, 4 }, + [GSM48_IE_GMM_AUTH_RES_EXT] = { TLV_TYPE_TLV, 0 }, + [GSM48_IE_GMM_AUTH_FAIL_PAR] = { TLV_TYPE_TLV, 0 }, + [GSM48_IE_GMM_IMEISV] = { TLV_TYPE_TLV, 0 }, + [GSM48_IE_GMM_RX_NPDU_NUM_LIST] = { TLV_TYPE_TLV, 0 }, + [GSM48_IE_GMM_DRX_PARAM] = { TLV_TYPE_FIXED, 2 }, + [GSM48_IE_GMM_MS_NET_CAPA] = { TLV_TYPE_TLV, 0 }, + [GSM48_IE_GMM_PDP_CTX_STATUS] = { TLV_TYPE_TLV, 0 }, + [GSM48_IE_GMM_PS_LCS_CAPA] = { TLV_TYPE_TLV, 0 }, + [GSM48_IE_GMM_GMM_MBMS_CTX_ST] = { TLV_TYPE_TLV, 0 }, + }, +}; + diff --git a/tests/gprs_routing_area/Makefile.am b/tests/gprs_routing_area/Makefile.am index a61f866..f95d3ae 100644 --- a/tests/gprs_routing_area/Makefile.am +++ b/tests/gprs_routing_area/Makefile.am @@ -45,6 +45,7 @@ $(top_builddir)/src/sgsn/gprs_gmm_attach.o \ $(top_builddir)/src/sgsn/gprs_gmm.o \ $(top_builddir)/src/sgsn/gprs_gmm_fsm.o \ + $(top_builddir)/src/sgsn/gprs_gmm_util.o \ $(top_builddir)/src/sgsn/gprs_mm_state_gb_fsm.o \ $(top_builddir)/src/sgsn/gprs_routing_area.o \ $(top_builddir)/src/sgsn/gtp_ggsn.o \ diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index db40f99..f698774 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -59,6 +59,7 @@ $(top_builddir)/src/sgsn/gprs_gmm_attach.o \ $(top_builddir)/src/sgsn/gprs_gmm.o \ $(top_builddir)/src/sgsn/gprs_gmm_fsm.o \ + $(top_builddir)/src/sgsn/gprs_gmm_util.o \ $(top_builddir)/src/sgsn/gprs_mm_state_gb_fsm.o \ $(top_builddir)/src/sgsn/gprs_routing_area.o \ $(top_builddir)/src/sgsn/gtp_ggsn.o \ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37868?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I67dcdb986fd01dc093501d324b5c376246a5d30d Gerrit-Change-Number: 37868 Gerrit-PatchSet: 21 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

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

by lynxis lazus

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37869?usp=email ) Change subject: GMM: split parsing of a RA Update Request in a separate file ...................................................................... GMM: split parsing of a RA Update Request in a separate file gprs_gmm.c is huge. Further split the general validation and parsing of the message into an own function. Change-Id: I413da1b6b4b7c0c4781393acd8564661bc74ce2d --- M include/osmocom/sgsn/gprs_gmm_util.h M src/sgsn/gprs_gmm.c M src/sgsn/gprs_gmm_util.c 3 files changed, 104 insertions(+), 44 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/sgsn/gprs_gmm_util.h b/include/osmocom/sgsn/gprs_gmm_util.h index be89c35..c136cce 100644 --- a/include/osmocom/sgsn/gprs_gmm_util.h +++ b/include/osmocom/sgsn/gprs_gmm_util.h @@ -1,5 +1,25 @@ #pragma once +#include <stdbool.h> +#include <stdint.h> + +#include <osmocom/gsm/gsm23003.h> #include <osmocom/gsm/tlv.h> +struct msgb; + extern const struct tlv_definition gsm48_gmm_ie_tlvdef; + +/* 9.4.14 RAU Request */ +struct gprs_gmm_ra_upd_req { + uint8_t skip_ind; /* 10.3.1 */ + uint8_t update_type; /* 10.5.5.18 */ + bool follow_up_req; /* 10.5.5.18 */ + uint8_t cksq; /* 10.5.1.2 */ + struct osmo_routing_area_id old_rai; /* 10.5.5.15 */ + uint8_t *ms_radio_cap; /* 10.5.5.12a */ + uint8_t ms_radio_cap_len; + struct tlv_parsed tlv; +}; + +int gprs_gmm_parse_ra_upd_req(struct msgb *msg, struct gprs_gmm_ra_upd_req *rau_req); diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 324c6bf..6122421 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -1594,52 +1594,30 @@ #ifndef PTMSI_ALLOC struct sgsn_signal_data sig_data; #endif - struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); - uint8_t *cur = gh->data; - uint8_t ms_ra_acc_cap_len; - struct osmo_routing_area_id old_ra_id; - struct tlv_parsed tp; - uint8_t upd_type; enum gsm48_gmm_cause reject_cause = GMM_CAUSE_PROTO_ERR_UNSPEC; + struct gprs_gmm_ra_upd_req req; int rc; + rc = gprs_gmm_parse_ra_upd_req(msg, &req); + if (rc) { + reject_cause = rc; + goto rejected; + } + /* TODO: In iu mode - handle follow-on request. * The follow-on request can be signaled in an Attach Request on IuPS. * This means the MS/UE asks to keep the PS connection open for further requests * after the Attach Request succeed. * The SGSN can decide if it close the connection or not. Both are spec conform. */ - /* Update Type 10.5.5.18 */ - upd_type = *cur++ & 0x07; - rate_ctr_inc(rate_ctr_group_get_ctr(sgsn->rate_ctrs, CTR_GPRS_ROUTING_AREA_REQUEST)); LOGMMCTXP(LOGL_INFO, mmctx, "-> GMM RA UPDATE REQUEST type=\"%s\"\n", - get_value_string(gprs_upd_t_strs, upd_type)); + get_value_string(gprs_upd_t_strs, req.update_type)); - /* Old routing area identification 10.5.5.15 */ - osmo_routing_area_id_decode(&old_ra_id, cur, msgb_l3len(msg) - (cur - msgb_gmmh(msg))); - cur += 6; - - /* MS Radio Access Capability 10.5.5.12a */ - ms_ra_acc_cap_len = *cur++; - if (ms_ra_acc_cap_len > 52) { - LOGMMCTXP(LOGL_ERROR, mmctx, - "Rejecting GMM RA Update Request: MS Radio Access Capability too long" - " (ms_ra_acc_cap_len = %u > 52)\n", ms_ra_acc_cap_len); - reject_cause = GMM_CAUSE_PROTO_ERR_UNSPEC; - goto rejected; - } - cur += ms_ra_acc_cap_len; - - /* Optional: Old P-TMSI Signature, Requested READY timer, TMSI Status, - * DRX parameter, MS network capability */ - tlv_parse(&tp, &gsm48_gmm_ie_tlvdef, cur, - (msg->data + msg->len) - cur, 0, 0); - - switch (upd_type) { + switch (req.update_type) { case GPRS_UPD_T_RA_LA: case GPRS_UPD_T_RA_LA_IMSI_ATT: - LOGMMCTXP(LOGL_NOTICE, mmctx, "Update type %i unsupported in Mode III, is your SI13 corrupt?\n", upd_type); + LOGMMCTXP(LOGL_NOTICE, mmctx, "Update type %d unsupported in Mode III, is your SI13 corrupt?\n", req.update_type); reject_cause = GMM_CAUSE_PROTO_ERR_UNSPEC; goto rejected; case GPRS_UPD_T_RA: @@ -1658,13 +1636,13 @@ /* Look-up the MM context based on old RA-ID and TLLI */ if (!MSG_IU_UE_CTX(msg)) { /* Gb */ - mmctx = sgsn_mm_ctx_by_tlli_and_ptmsi(msgb_tlli(msg), &old_ra_id); - } else if (TLVP_PRESENT(&tp, GSM48_IE_GMM_ALLOC_PTMSI)) { + mmctx = sgsn_mm_ctx_by_tlli_and_ptmsi(msgb_tlli(msg), &req.old_rai); + } else if (TLVP_PRESENT(&req.tlv, GSM48_IE_GMM_ALLOC_PTMSI)) { #ifdef BUILD_IU /* In Iu mode search only for ptmsi */ struct osmo_mobile_identity mi; - if (osmo_mobile_identity_decode(&mi, TLVP_VAL(&tp, GSM48_IE_GMM_ALLOC_PTMSI), - TLVP_LEN(&tp, GSM48_IE_GMM_ALLOC_PTMSI), false) + if (osmo_mobile_identity_decode(&mi, TLVP_VAL(&req.tlv, GSM48_IE_GMM_ALLOC_PTMSI), + TLVP_LEN(&req.tlv, GSM48_IE_GMM_ALLOC_PTMSI), false) || mi.type != GSM_MI_TYPE_TMSI) { LOGIUP(MSG_IU_UE_CTX(msg), LOGL_ERROR, "Cannot decode P-TMSI\n"); goto rejected; @@ -1692,7 +1670,7 @@ osmo_fsm_inst_dispatch(mmctx->gmm_fsm, E_GMM_COMMON_PROC_INIT_REQ, NULL); } - } else if (osmo_rai_cmp(&mmctx->ra, &old_ra_id) || + } else if (osmo_rai_cmp(&mmctx->ra, &req.old_rai) || mmctx->gmm_fsm->state == ST_GMM_DEREGISTERED) { /* We've received either a RAU for a MS which isn't registered @@ -1707,11 +1685,11 @@ if (mmctx->gmm_fsm->state == ST_GMM_DEREGISTERED) LOGMMCTXP(LOGL_INFO, mmctx, "Rejecting RAU - GMM state is deregistered. Old RA: %s New RA: %s\n", - osmo_rai_name2(&old_ra_id), new_ra); + osmo_rai_name2(&req.old_rai), new_ra); else LOGMMCTXP(LOGL_INFO, mmctx, "Rejecting RAU - Old RA doesn't match MM. Old RA: %s New RA: %s\n", - osmo_rai_name2(&old_ra_id), new_ra); + osmo_rai_name2(&req.old_rai), new_ra); reject_cause = GMM_CAUSE_IMPL_DETACHED; goto rejected; @@ -1732,7 +1710,7 @@ mmctx = sgsn_mm_ctx_by_llme(llme); if (mmctx) { char old_ra_id_name[32]; - osmo_rai_name2_buf(old_ra_id_name, sizeof(old_ra_id_name), &old_ra_id); + osmo_rai_name2_buf(old_ra_id_name, sizeof(old_ra_id_name), &req.old_rai); LOGMMCTXP(LOGL_NOTICE, mmctx, "Rx RA Update Request with unexpected TLLI=%08x Old RA=%s (expected Old RA: %s)!\n", msgb_tlli(msg), old_ra_id_name, osmo_rai_name2(&mmctx->ra)); @@ -1764,8 +1742,8 @@ mmctx->gb.tlli = msgb_tlli(msg); } /* Update the MM context with the new DRX params */ - if (TLVP_PRESENT(&tp, GSM48_IE_GMM_DRX_PARAM)) - memcpy(&mmctx->drx_parms, TLVP_VAL(&tp, GSM48_IE_GMM_DRX_PARAM), sizeof(mmctx->drx_parms)); + if (TLVP_PRESENT(&req.tlv, GSM48_IE_GMM_DRX_PARAM)) + memcpy(&mmctx->drx_parms, TLVP_VAL(&req.tlv, GSM48_IE_GMM_DRX_PARAM), sizeof(mmctx->drx_parms)); /* FIXME: Update the MM context with the MS radio acc capabilities */ /* FIXME: Update the MM context with the MS network capabilities */ @@ -1798,8 +1776,8 @@ /* Look at PDP Context Status IE and see if MS's view of * activated/deactivated NSAPIs agrees with our view */ - if (TLVP_PRESENT(&tp, GSM48_IE_GMM_PDP_CTX_STATUS)) { - const uint8_t *pdp_status = TLVP_VAL(&tp, GSM48_IE_GMM_PDP_CTX_STATUS); + if (TLVP_PRESENT(&req.tlv, GSM48_IE_GMM_PDP_CTX_STATUS)) { + const uint8_t *pdp_status = TLVP_VAL(&req.tlv, GSM48_IE_GMM_PDP_CTX_STATUS); process_ms_ctx_status(mmctx, pdp_status); } diff --git a/src/sgsn/gprs_gmm_util.c b/src/sgsn/gprs_gmm_util.c index 1248e93..0cf730f 100644 --- a/src/sgsn/gprs_gmm_util.c +++ b/src/sgsn/gprs_gmm_util.c @@ -23,10 +23,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <osmocom/core/msgb.h> +#include <osmocom/gprs/gprs_msgb.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/protocol/gsm_04_08_gprs.h> #include <osmocom/gsm/tlv.h> +#include <osmocom/sgsn/gprs_gmm_util.h> + const struct tlv_definition gsm48_gmm_ie_tlvdef = { .def = { [GSM48_IE_GMM_CIPH_CKSN] = { TLV_TYPE_SINGLE_TV, 1 }, @@ -47,3 +51,61 @@ }, }; +/*! Parse 24.008 9.4.14 RAU Request + * \param[in] msg l3 pointers must point to gmm. + * \param[out] rau_req parsed RA update request + * \returns 0 on success or GMM cause + */ +int gprs_gmm_parse_ra_upd_req(struct msgb *msg, struct gprs_gmm_ra_upd_req *rau_req) +{ + uint8_t *cur, len; + size_t mandatory_fields_len; + struct gsm48_hdr *gh; + int ret; + + OSMO_ASSERT(msg); + OSMO_ASSERT(rau_req); + + memset(rau_req, 0, sizeof(struct gprs_gmm_ra_upd_req)); + + /* all mandatory fields + variable length MS Radio Cap (min value) */ + if (msgb_l3len(msg) < 16) + return GMM_CAUSE_PROTO_ERR_UNSPEC; + + gh = (struct gsm48_hdr *) msgb_gmmh(msg); + cur = gh->data; + + rau_req->skip_ind = gh->proto_discr >> 4; + + /* V: Update Type 10.5.5.18 */ + rau_req->update_type = *cur & 0x07; + rau_req->follow_up_req = !!(*cur & 0x08); + /* V: GPRS Ciphering Key Sequence 10.5.1.2 */ + rau_req->cksq = *cur >> 4; + cur++; + + /* V: Old routing area identification 10.5.5.15 */ + osmo_routing_area_id_decode(&rau_req->old_rai, cur, 6); + cur += 6; + + /* LV: MS radio cap 10.5.5.12a */ + len = *cur++; + if (msgb_l3len(msg) < (len + (cur - msgb_gmmh(msg)))) + return GMM_CAUSE_PROTO_ERR_UNSPEC; + + rau_req->ms_radio_cap = cur; + rau_req->ms_radio_cap_len = len; + cur += len; + + mandatory_fields_len = (cur - msgb_gmmh(msg)); + if (msgb_l3len(msg) == mandatory_fields_len) + return 0; + + ret = tlv_parse(&rau_req->tlv, &gsm48_gmm_ie_tlvdef, + cur, msgb_l3len(msg) - mandatory_fields_len, 0, 0); + + if (ret < 0) + return GMM_CAUSE_COND_IE_ERR; + + return 0; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37869?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I413da1b6b4b7c0c4781393acd8564661bc74ce2d Gerrit-Change-Number: 37869 Gerrit-PatchSet: 23 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-sgsn[master]: Use %d instead of %i

by lynxis lazus

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38281?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Use %d instead of %i ...................................................................... Use %d instead of %i %d and %i has the same meaning when used in format string for printf. The linter will warn when using %i. %i was only added to provide symmetry between scanf() and printf(). Change-Id: Icd5f5f9b0d2ed8fd82afa406787acb4bd95358bf --- M src/sgsn/gprs_ranap.c M src/sgsn/slhc.c M tests/slhc/slhc_test.c M tests/sndcp_xid/sndcp_xid_test.c M tests/v42bis/v42bis_test.c M tests/xid/xid_test.c 6 files changed, 16 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c index 2ad663e..b652cb5 100644 --- a/src/sgsn/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c @@ -186,7 +186,7 @@ rc = 0; break; default: - LOGMMCTXP(LOGL_NOTICE, mm, "Unknown event received: %i\n", type); + LOGMMCTXP(LOGL_NOTICE, mm, "Unknown event received: %d\n", type); rc = -1; break; } diff --git a/src/sgsn/slhc.c b/src/sgsn/slhc.c index 20e571d..62df24d 100644 --- a/src/sgsn/slhc.c +++ b/src/sgsn/slhc.c @@ -388,7 +388,7 @@ DEBUGP(DSLHC, "slhc_compress(): Unexpected change: th->doff != cs->cs_tcp.doff\n"); if(ip->ihl > 5 && memcmp(ip+1,cs->cs_ipopt,((ip->ihl)-5)*4) != 0) { DEBUGP(DSLHC, "slhc_compress(): Unexpected change: (ip->ihl > 5 && memcmp(ip+1,cs->cs_ipopt,((ip->ihl)-5)*4) != 0)\n"); - DEBUGP(DSLHC, "slhc_compress(): ip->ihl = %i\n", ip->ihl); + DEBUGP(DSLHC, "slhc_compress(): ip->ihl = %d\n", ip->ihl); DEBUGP(DSLHC, "slhc_compress(): ip+1 = %s\n", osmo_hexdump_nospc((uint8_t*)(ip+1),((ip->ihl)-5)*4)); DEBUGP(DSLHC, "slhc_compress(): Unexpected change: cs->cs_ipopt = %s\n", @@ -396,7 +396,7 @@ } if(th->doff > 5 && memcmp(th+1,cs->cs_tcpopt,((th->doff)-5)*4) != 0) { DEBUGP(DSLHC, "slhc_compress(): Unexpected change: (th->doff > 5 && memcmp(th+1,cs->cs_tcpopt,((th->doff)-5)*4) != 0)\n"); - DEBUGP(DSLHC, "slhc_compress(): th->doff = %i\n", th->doff); + DEBUGP(DSLHC, "slhc_compress(): th->doff = %d\n", th->doff); DEBUGP(DSLHC, "slhc_compress(): th+1 = %s\n", osmo_hexdump_nospc((uint8_t*)(th+1),((th->doff)-5)*4)); DEBUGP(DSLHC, "slhc_compress(): cs->cs_tcpopt = %s\n", @@ -538,8 +538,8 @@ cp += 2; /* deltaS is now the size of the change section of the compressed header */ - DEBUGP(DSLHC, "slhc_compress(): Delta-list length (deltaS) = %li\n",deltaS); - DEBUGP(DSLHC, "slhc_compress(): Original header len (hlen) = %i\n",hlen); + DEBUGP(DSLHC, "slhc_compress(): Delta-list length (deltaS) = %ld\n", deltaS); + DEBUGP(DSLHC, "slhc_compress(): Original header len (hlen) = %d\n", hlen); memcpy(cp,new_seq,deltaS); /* Write list of deltas */ memcpy(cp+deltaS,icp+hlen,isize-hlen); diff --git a/tests/slhc/slhc_test.c b/tests/slhc/slhc_test.c index 5c13313..9013623 100644 --- a/tests/slhc/slhc_test.c +++ b/tests/slhc/slhc_test.c @@ -209,12 +209,12 @@ packet_len = DISP_MAX_BYTES; if (packet_decompr_len > DISP_MAX_BYTES) packet_decompr_len = DISP_MAX_BYTES; - printf("Original Packet: (%i bytes) %s\n", packet_len, + printf("Original Packet: (%d bytes) %s\n", packet_len, osmo_hexdump_nospc(packet, packet_len)); - printf("DecompressedPacket: (%i bytes) %s\n", + printf("DecompressedPacket: (%d bytes) %s\n", packet_decompr_len, osmo_hexdump_nospc(packet_decompr, packet_decompr_len)); - printf("CompressedPacket: (%i bytes) %s\n", packet_compr_len, + printf("CompressedPacket: (%d bytes) %s\n", packet_compr_len, osmo_hexdump_nospc(packet_compr, packet_compr_len)); slhc_o_status(comp); slhc_o_status(comp); diff --git a/tests/sndcp_xid/sndcp_xid_test.c b/tests/sndcp_xid/sndcp_xid_test.c index 56b97e3..92f04ba 100644 --- a/tests/sndcp_xid/sndcp_xid_test.c +++ b/tests/sndcp_xid/sndcp_xid_test.c @@ -55,7 +55,7 @@ /* Encode comp-fields again */ rc = gprs_sndcp_compile_xid(xid_r,sizeof(xid_r), comp_fields, DEFAULT_SNDCP_VERSION); - printf("Result length=%i\n",rc); + printf("Result length=%d\n", rc); printf("Encoded: %s\n", osmo_hexdump_nospc(xid, sizeof(xid))); printf("Rencoded: %s\n", osmo_hexdump_nospc(xid_r, rc)); @@ -231,7 +231,7 @@ DEFAULT_SNDCP_VERSION); OSMO_ASSERT(rc > 0); - printf("Encoded: %s (%i bytes)\n", osmo_hexdump_nospc(xid, rc), rc); + printf("Encoded: %s (%d bytes)\n", osmo_hexdump_nospc(xid, rc), rc); /* Parse and show contained comp fields */ comp_fields_dec = gprs_sndcp_parse_xid(NULL, ctx, xid, rc, NULL); diff --git a/tests/v42bis/v42bis_test.c b/tests/v42bis/v42bis_test.c index e9c5069..7ada0e2 100644 --- a/tests/v42bis/v42bis_test.c +++ b/tests/v42bis/v42bis_test.c @@ -268,7 +268,7 @@ rc_sum += rc; /* Check results */ - printf("Mode: %i\n", mode); + printf("Mode: %d\n", mode); printf("uncompressed_original= %s ASCII:", osmo_hexdump_nospc(uncompressed_original, len)); @@ -314,7 +314,7 @@ int len; printf ("Testing compression/decompression with realistic TCP/IP packets:\n"); - printf("Packet No.: %i\n", packet_id); + printf("Packet No.: %d\n", packet_id); len = strlen(uncompr_packets[packet_id]); testvec = talloc_zero_size(ctx, len); len = osmo_hexparse(uncompr_packets[packet_id], testvec, len); @@ -339,7 +339,7 @@ printf ("Testing decompression with sniffed compressed TCP/IP packets:\n"); - printf("Packet No.: %i\n", packet_id); + printf("Packet No.: %d\n", packet_id); len = strlen(compr_packets[packet_id]); uncompressed = talloc_zero_size(ctx, len); diff --git a/tests/xid/xid_test.c b/tests/xid/xid_test.c index 89d82e9..8c2c53e 100644 --- a/tests/xid/xid_test.c +++ b/tests/xid/xid_test.c @@ -73,8 +73,8 @@ /* Encode data */ rc = gprs_llc_compile_xid(xid, sizeof(xid), &xid_fields); OSMO_ASSERT(rc == 14); - printf("Encoded: %s (%i bytes)\n", osmo_hexdump_nospc(xid, rc), rc); - printf("Expected: %s (%i bytes)\n", + printf("Encoded: %s (%d bytes)\n", osmo_hexdump_nospc(xid, rc), rc); + printf("Expected: %s (%d bytes)\n", osmo_hexdump_nospc(xid_expected, sizeof(xid_expected)), (int)sizeof(xid_expected)); @@ -112,7 +112,7 @@ /* Encode xid-fields again */ rc = gprs_llc_compile_xid(xid_r, sizeof(xid_r), xid_fields); - printf("Result length=%i\n",rc); + printf("Result length=%d\n", rc); printf("Encoded: %s\n", osmo_hexdump_nospc(xid, sizeof(xid))); printf("Rencoded: %s\n", osmo_hexdump_nospc(xid_r, rc)); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Icd5f5f9b0d2ed8fd82afa406787acb4bd95358bf Gerrit-Change-Number: 38281 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: rename erab_release_req/1 -> erab_release_cmd/1

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38765?usp=email ) Change subject: erab_fsm: rename erab_release_req/1 -> erab_release_cmd/1 ...................................................................... erab_fsm: rename erab_release_req/1 -> erab_release_cmd/1 The respective S1AP PDU is COMMAND, not REQUEST. Change-Id: I2f19d2c9bad52b89327f68f7dc6a2f6347a00ba0 --- M src/erab_fsm.erl M src/s1ap_proxy.erl M test/erab_fsm_test.erl 3 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/65/38765/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index ae17a6e..fb6def3 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -49,7 +49,7 @@ -export([start_link/1, erab_setup_req/2, erab_setup_rsp/2, - erab_release_req/1, + erab_release_cmd/1, erab_release_rsp/1, shutdown/1]). @@ -120,8 +120,8 @@ gen_statem:call(Pid, {?FUNCTION_NAME, F_TEID}). --spec erab_release_req(pid()) -> ok. -erab_release_req(Pid) -> +-spec erab_release_cmd(pid()) -> ok. +erab_release_cmd(Pid) -> gen_statem:call(Pid, ?FUNCTION_NAME). @@ -286,7 +286,7 @@ {keep_state, S}; erab_setup({call, From}, - erab_release_req, + erab_release_cmd, #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB RELEASE Req"), {next_state, session_delete, diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index ea20106..5f7775e 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -451,7 +451,7 @@ #'E-RABItem'{'e-RAB-ID' = ERABId} = C, case erab_fsm_find(ERABId, S) of {ok, Pid} -> - ok = erab_fsm:erab_release_req(Pid), + ok = erab_fsm:erab_release_cmd(Pid), {{ok, C}, S}; error -> ?LOG_ERROR("E-RAB ~p is not registered", [erab_uid(ERABId, S)]), diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index 1722b3c..e4b036e 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -94,7 +94,7 @@ test_erab_release_success(Pid) -> [?_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_cmd(Pid)), ?_assertEqual(ok, erab_fsm:erab_release_rsp(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. @@ -107,7 +107,7 @@ Error = {unexp_pdu, session_delete}, [?_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)), + ?_assertEqual({error, Error}, erab_fsm:erab_release_cmd(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38765?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: I2f19d2c9bad52b89327f68f7dc6a2f6347a00ba0 Gerrit-Change-Number: 38765 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: add erab_release/2 and erab_release_ind/1

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38766?usp=email ) Change subject: erab_fsm: add erab_release/2 and erab_release_ind/1 ...................................................................... erab_fsm: add erab_release/2 and erab_release_ind/1 The E-RAB RELEASE INDICATION message is used by the eNB to indicate termination of one or several E-RAB(s). Unlike with the RELEASE COMMAND, there is no response to that message. Thus, we shall not wait for it (by entering state erab_wait_release_rsp) but terminate the E-RAB FSM immediately instead. Change-Id: Icc9c0f6a1aef327e9585942b3c9d2302feda393a --- M src/erab_fsm.erl M test/erab_fsm_test.erl 2 files changed, 51 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/66/38766/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index fb6def3..f185867 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -49,8 +49,10 @@ -export([start_link/1, erab_setup_req/2, erab_setup_rsp/2, + erab_release/2, erab_release_cmd/1, erab_release_rsp/1, + erab_release_ind/1, shutdown/1]). -include_lib("kernel/include/logger.hrl"). @@ -70,13 +72,16 @@ addr() %% GTP-U Transport Layer Address }. +-type rel_kind() :: cmd | ind. + -record(erab_state, {from :: undefined | gen_statem:from(), %% destination to use when replying 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 + seid_rem :: undefined | pfcp_peer:pfcp_seid(), %% remote SEID, chosen by the UPF + rel_kind :: undefined | rel_kind() %% E-RAB RELEASE kind }). -type erab_state() :: #erab_state{}. @@ -120,6 +125,13 @@ gen_statem:call(Pid, {?FUNCTION_NAME, F_TEID}). +-spec erab_release(pid(), rel_kind()) -> ok. +erab_release(Pid, cmd) -> + erab_release_cmd(Pid); +erab_release(Pid, ind) -> + erab_release_ind(Pid). + + -spec erab_release_cmd(pid()) -> ok. erab_release_cmd(Pid) -> gen_statem:call(Pid, ?FUNCTION_NAME). @@ -130,6 +142,11 @@ gen_statem:cast(Pid, ?FUNCTION_NAME). +-spec erab_release_ind(pid()) -> ok. +erab_release_ind(Pid) -> + gen_statem:call(Pid, ?FUNCTION_NAME). + + -spec shutdown(pid()) -> ok. shutdown(Pid) -> gen_statem:stop(Pid). @@ -290,7 +307,16 @@ #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB RELEASE Req"), {next_state, session_delete, - S#erab_state{from = From}}; + S#erab_state{from = From, + rel_kind = cmd}}; + +erab_setup({call, From}, + erab_release_ind, + #erab_state{} = S) -> + ?LOG_DEBUG("Rx E-RAB RELEASE Ind"), + {next_state, session_delete, + S#erab_state{from = From, + rel_kind = ind}}; %% Catch-all handler for this state erab_setup(Event, EventData, S) -> @@ -317,15 +343,22 @@ session_delete(info, #pfcp{} = PDU, #erab_state{from = From, - seid_loc = SEID_Rsp} = S) -> + seid_loc = SEID_Rsp, + rel_kind = RelKind} = S) -> case PDU of #pfcp{type = session_deletion_response, seid = SEID_Rsp, %% matches F-SEID we sent in the ESTABLISH Req ie = #{pfcp_cause := 'Request accepted'}} -> ?LOG_DEBUG("PFCP session deleted"), - {next_state, erab_wait_release_rsp, - S#erab_state{from = undefined}, - [{reply, From, ok}]}; + Reply = {reply, From, ok}, + case RelKind of + cmd -> %% E-RAB RELEASE CMD => wait for the RSP + {next_state, erab_wait_release_rsp, + S#erab_state{from = undefined}, + [Reply]}; + ind -> %% E-RAB RELEASE IND => terminate immediately + {stop_and_reply, normal, [Reply]} + end; _ -> ?LOG_ERROR("Rx unexpected PFCP PDU: ~p", [PDU]), {stop_and_reply, diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index e4b036e..0bd6b8b 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -44,8 +44,10 @@ erab_release_test_() -> - [{"E-RAB release :: success", - ?TC(fun test_erab_release_success/1)}, + [{"E-RAB RELEASE CMD :: success", + ?TC(fun test_erab_release_cmd_success/1)}, + {"E-RAB RELEASE IND :: success", + ?TC(fun test_erab_release_ind_success/1)}, {"E-RAB release :: PFCP session deletion error", ?TC(fun test_erab_release_pfcp_delete_error/1)}]. @@ -91,7 +93,7 @@ ?_assertNot(erlang:is_process_alive(Pid))]. -test_erab_release_success(Pid) -> +test_erab_release_cmd_success(Pid) -> [?_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_cmd(Pid)), @@ -99,6 +101,13 @@ ?_assertNot(erlang:is_process_alive(Pid))]. +test_erab_release_ind_success(Pid) -> + [?_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_ind(Pid)), + ?_assertNot(erlang:is_process_alive(Pid))]. + + test_erab_release_pfcp_delete_error(Pid) -> %% pfcp_peer:session_delete_req/1 responds with a reject PDU = pfcp_mock:pdu_rsp_reject(session_deletion_response, ?SEID_Loc), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38766?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: Icc9c0f6a1aef327e9585942b3c9d2302feda393a Gerrit-Change-Number: 38766 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: properly handle E-RAB RELEASE IND

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38767?usp=email ) Change subject: s1ap_proxy: properly handle E-RAB RELEASE IND ...................................................................... s1ap_proxy: properly handle E-RAB RELEASE IND Use the right release kind in the case of E-RAB RELEASE IND, so that the E-RAB FSM can be terminated immediately. Change-Id: Id1b77ef59818d6416326477a25e9866ab636b3ad --- M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 2 files changed, 7 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/67/38767/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 5f7775e..1d0e1af 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -70,7 +70,8 @@ -record(proxy_state, {erabs :: dict:dict(), mme_ue_id :: undefined | mme_ue_id(), - enb_ue_id :: undefined | enb_ue_id() + enb_ue_id :: undefined | enb_ue_id(), + rel_kind :: undefined | cmd | ind }). -type proxy_state() :: #proxy_state{}. @@ -443,7 +444,7 @@ handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeReleasedList', value = Content}, S) -> %% This IE contains a list of E-RABItem - handle_ies(Content, ?'id-E-RABItem', S); + handle_ies(Content, ?'id-E-RABItem', S#proxy_state{rel_kind = cmd}); handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABItem', value = C}, S) -> @@ -451,7 +452,7 @@ #'E-RABItem'{'e-RAB-ID' = ERABId} = C, case erab_fsm_find(ERABId, S) of {ok, Pid} -> - ok = erab_fsm:erab_release_cmd(Pid), + ok = erab_fsm:erab_release(Pid, S#proxy_state.rel_kind), {{ok, C}, S}; error -> ?LOG_ERROR("E-RAB ~p is not registered", [erab_uid(ERABId, S)]), @@ -481,7 +482,7 @@ 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); + handle_ies(Content, ?'id-E-RABItem', S#proxy_state{rel_kind = ind}); %% E-RAB MODIFICATION INDICATION related IEs handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeModifiedListBearerModInd', diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 9e94716..917b63e 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -111,12 +111,10 @@ %% [eNB -> MME] E-RAB RELEASE INDICATION ReleaseInd = e_rab_release_ind_pdu(), - %% TODO: make sure that the E-RAB FSM has been terminated - %% FIXME: erab_fsm does not tear down immediately, but after a timeout - [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupReq)), ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRsp)), - ?_assertEqual({forward, ReleaseInd}, s1ap_proxy:process_pdu(Pid, ReleaseInd))]. + ?_assertEqual({forward, ReleaseInd}, s1ap_proxy:process_pdu(Pid, ReleaseInd)), + ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. test_e_rab_modify_ind(#{handler := Pid}) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38767?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: Id1b77ef59818d6416326477a25e9866ab636b3ad Gerrit-Change-Number: 38767 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: use osmo_csd_ra2_* API from libosmotrau

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38750?usp=email ) Change subject: csd_v110: use osmo_csd_ra2_* API from libosmotrau ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38750?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0be44b15a812397377fe7772b988724dd205737c Gerrit-Change-Number: 38750 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Nov 2024 21:03:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024