From aaca1217be46fe93ae99e4ab1c921834d2b3f4fe Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Sun, 2 Jun 2019 01:15:19 +0700 Subject: common/rsl.c: RSL_IE_HANDO_REF is mandatory for handover CHAN ACT According to 3GPP TS 48.058, section 8.4.1, the Handover Reference element must be included if channel activation type is 'handover'. Let's properly reject CHANnel ACTivation messages with missing RSL_IE_HANDO_REF. Otherwise such requests are misinterpreted as regular (non-handover) channel requests. Found using TC_ho_rach() TTCN-3 test case. Change-Id: I9c50e1dbeb54c5470560adcdfb2bdf5abbe47993 --- src/common/rsl.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/common/rsl.c') diff --git a/src/common/rsl.c b/src/common/rsl.c index b96182ff..410b38a7 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1090,9 +1090,13 @@ static int rsl_rx_chan_activ(struct msgb *msg) memset(&lchan->encr, 0, sizeof(lchan->encr)); /* 9.3.9 Handover Reference */ - if ((type == RSL_ACT_INTER_ASYNC || - type == RSL_ACT_INTER_SYNC) && - TLVP_PRES_LEN(&tp, RSL_IE_HANDO_REF, 1)) { + if ((type == RSL_ACT_INTER_ASYNC || type == RSL_ACT_INTER_SYNC)) { + /* According to 8.4.1, the Handover Reference element is included + * if activation type is handover. Assuming it's mandatory. */ + if (!TLVP_PRES_LEN(&tp, RSL_IE_HANDO_REF, 1)) { + LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "Missing Handover Reference IE\n"); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_MAND_IE_ERROR); + } lchan->ho.active = HANDOVER_ENABLED; lchan->ho.ref = *TLVP_VAL(&tp, RSL_IE_HANDO_REF); } -- cgit v1.2.3