diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2013-06-23 10:53:09 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-12-01 03:37:44 +0100 |
| commit | 4a1baa2b6cc786636ecd2ca1c7c0f9cd6745e171 (patch) | |
| tree | c044b4cca24e4ba6048391923ee9af6a67da7774 | |
| parent | 1d7dfa876ddea49b3d0a05f1d43fd2b704e06955 (diff) | |
Fix: meas_rep.c will only use valid DL measurement reports
When averaging measurements, only the valid reports are used. If there is
no valid report in the averaging window at all, an error is returned.
| -rw-r--r-- | src/libbsc/meas_rep.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/libbsc/meas_rep.c b/src/libbsc/meas_rep.c index 2a8d5ac5e..ee9ff6515 100644 --- a/src/libbsc/meas_rep.c +++ b/src/libbsc/meas_rep.c @@ -28,12 +28,20 @@ static int get_field(const struct gsm_meas_rep *rep, { switch (field) { case MEAS_REP_DL_RXLEV_FULL: + if (!(rep->flags & MEAS_REP_F_DL_VALID)) + return -EINVAL; return rep->dl.full.rx_lev; case MEAS_REP_DL_RXLEV_SUB: + if (!(rep->flags & MEAS_REP_F_DL_VALID)) + return -EINVAL; return rep->dl.sub.rx_lev; case MEAS_REP_DL_RXQUAL_FULL: + if (!(rep->flags & MEAS_REP_F_DL_VALID)) + return -EINVAL; return rep->dl.full.rx_qual; case MEAS_REP_DL_RXQUAL_SUB: + if (!(rep->flags & MEAS_REP_F_DL_VALID)) + return -EINVAL; return rep->dl.sub.rx_qual; case MEAS_REP_UL_RXLEV_FULL: return rep->ul.full.rx_lev; @@ -72,7 +80,7 @@ int get_meas_rep_avg(const struct gsm_lchan *lchan, enum meas_rep_field field, unsigned int num) { unsigned int i, idx; - int avg = 0; + int avg = 0, valid_num = 0; if (num < 1) return -EINVAL; @@ -85,11 +93,18 @@ int get_meas_rep_avg(const struct gsm_lchan *lchan, for (i = 0; i < num; i++) { int j = (idx+i) % ARRAY_SIZE(lchan->meas_rep); + int val = get_field(&lchan->meas_rep[j], field); - avg += get_field(&lchan->meas_rep[j], field); + if (val >= 0) { + avg += val; + valid_num++; + } } - return avg / num; + if (valid_num == 0) + return -EINVAL; + + return avg / valid_num; } /* Check if N out of M last values for FIELD are >= bd */ @@ -107,7 +122,7 @@ int meas_rep_n_out_of_m_be(const struct gsm_lchan *lchan, int j = (idx + i) % ARRAY_SIZE(lchan->meas_rep); int val = get_field(&lchan->meas_rep[j], field); - if (val >= be) + if (val >= be) /* implies that val < 0 will not count */ count++; if (count >= n) |