diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2013-06-01 16:46:39 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-01-19 16:03:16 +0100 |
| commit | 970b43486f6c85ce1da11ba8f10b18323b1e023b (patch) | |
| tree | 31cdb772460fd3889ba924b7ab46f473f94e1942 /src/libbsc | |
| parent | 4d3baa6bdf85999dad28659461e8f9911cdd48ab (diff) | |
HO: Count the actual meas.rep. get_meas_rep_avg fails if not reached
get_meas_rep_avg will return -EINVAL, if the required number of
measurements are not reached. There will be no handover possible until the
given number of measurements are available.
Change-Id: Ibc4410b4e162cdb6c070128d2c63946bb79d6d65
Diffstat (limited to 'src/libbsc')
| -rw-r--r-- | src/libbsc/abis_rsl.c | 9 | ||||
| -rw-r--r-- | src/libbsc/chan_alloc.c | 4 | ||||
| -rw-r--r-- | src/libbsc/meas_rep.c | 6 |
3 files changed, 17 insertions, 2 deletions
diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index 64e5c92cf..457cc9504 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -1470,8 +1470,11 @@ static int rsl_rx_meas_res(struct msgb *msg) if (!TLVP_PRESENT(&tp, RSL_IE_MEAS_RES_NR) || !TLVP_PRESENT(&tp, RSL_IE_UPLINK_MEAS) || - !TLVP_PRESENT(&tp, RSL_IE_BS_POWER)) + !TLVP_PRESENT(&tp, RSL_IE_BS_POWER)) { + LOGP(DRSL, LOGL_ERROR, "%s Measurement Report lacks mandatory IEs\n", + gsm_lchan_name(mr->lchan)); return -EIO; + } /* Mandatory Parts */ mr->nr = *TLVP_VAL(&tp, RSL_IE_MEAS_RES_NR); @@ -1517,6 +1520,10 @@ static int rsl_rx_meas_res(struct msgb *msg) return rc; } + mr->lchan->meas_rep_count++; + LOGP(DRSL, LOGL_DEBUG, "%s: meas_rep_cnt++=%d\n", + gsm_lchan_name(mr->lchan), mr->lchan->meas_rep_count); + print_meas_rep(msg->lchan, mr); send_lchan_signal(S_LCHAN_MEAS_REP, msg->lchan, mr); diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index 07248fb23..1caa13d9a 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -347,6 +347,10 @@ struct gsm_lchan *lchan_alloc(struct gsm_bts *bts, enum gsm_chan_t type, gsm_ts_and_pchan_name(lchan->ts), lchan->nr, gsm_lchant_name(lchan->type)); + /* reset measurement report counter and index */ + lchan->meas_rep_count = 0; + lchan->meas_rep_idx = 0; + /* clear sapis */ memset(lchan->sapis, 0, ARRAY_SIZE(lchan->sapis)); diff --git a/src/libbsc/meas_rep.c b/src/libbsc/meas_rep.c index cb8379e0b..fbd15156d 100644 --- a/src/libbsc/meas_rep.c +++ b/src/libbsc/meas_rep.c @@ -19,6 +19,7 @@ * */ +#include <errno.h> #include <osmocom/bsc/gsm_data.h> #include <osmocom/bsc/meas_rep.h> @@ -75,7 +76,10 @@ int get_meas_rep_avg(const struct gsm_lchan *lchan, int avg = 0; if (num < 1) - return 0; + return -EINVAL; + + if (num > lchan->meas_rep_count) + return -EINVAL; idx = calc_initial_idx(ARRAY_SIZE(lchan->meas_rep), lchan->meas_rep_idx, num); |