paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-11-03 13:33:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix off-by-one error when mapping from meas rep to neighbor cell

Browse Source
This commit is contained in:
Harald Welte
2009-12-25 23:01:54 +01:00
parent 950eca9b76
commit eaa95d545e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openbsc/src/gsm_04_08_utils.c
View File

@@ -735,7 +735,7 @@ int gsm48_parse_meas_rep(struct gsm_meas_rep *rep, struct msgb *msg)
mrc = &rep->cell[0]; mrc = &rep->cell[0];
mrc->rxlev = data[3] & 0x3f; mrc->rxlev = data[3] & 0x3f;
mrc->neigh_idx = data[4] >> 3; mrc->neigh_idx = data[4] >> 3;
mrc->arfcn = bitvec_get_nth_set_bit(nbv, mrc->neigh_idx); mrc->arfcn = bitvec_get_nth_set_bit(nbv, mrc->neigh_idx + 1);
mrc->bsic = ((data[4] & 0x07) << 3) | (data[5] >> 5); mrc->bsic = ((data[4] & 0x07) << 3) | (data[5] >> 5);
if (rep->num_cell < 2) if (rep->num_cell < 2)
return 0; return 0;
@@ -743,7 +743,7 @@ int gsm48_parse_meas_rep(struct gsm_meas_rep *rep, struct msgb *msg)
mrc = &rep->cell[1]; mrc = &rep->cell[1];
mrc->rxlev = ((data[5] & 0x1f) << 1) | (data[6] >> 7); mrc->rxlev = ((data[5] & 0x1f) << 1) | (data[6] >> 7);
mrc->neigh_idx = (data[6] >> 2) & 0x1f; mrc->neigh_idx = (data[6] >> 2) & 0x1f;
mrc->arfcn = bitvec_get_nth_set_bit(nbv, mrc->neigh_idx); mrc->arfcn = bitvec_get_nth_set_bit(nbv, mrc->neigh_idx + 1);
mrc->bsic = ((data[6] & 0x03) << 4) | (data[7] >> 4); mrc->bsic = ((data[6] & 0x03) << 4) | (data[7] >> 4);
if (rep->num_cell < 3) if (rep->num_cell < 3)
return 0; return 0;
@@ -751,7 +751,7 @@ int gsm48_parse_meas_rep(struct gsm_meas_rep *rep, struct msgb *msg)
mrc = &rep->cell[2]; mrc = &rep->cell[2];
mrc->rxlev = ((data[7] & 0x0f) << 2) | (data[8] >> 6); mrc->rxlev = ((data[7] & 0x0f) << 2) | (data[8] >> 6);
mrc->neigh_idx = (data[8] >> 1) & 0x1f; mrc->neigh_idx = (data[8] >> 1) & 0x1f;
mrc->arfcn = bitvec_get_nth_set_bit(nbv, mrc->neigh_idx); mrc->arfcn = bitvec_get_nth_set_bit(nbv, mrc->neigh_idx + 1);
mrc->bsic = ((data[8] & 0x01) << 6) | (data[9] >> 3); mrc->bsic = ((data[8] & 0x01) << 6) | (data[9] >> 3);
if (rep->num_cell < 4) if (rep->num_cell < 4)
return 0; return 0;
@@ -759,7 +759,7 @@ int gsm48_parse_meas_rep(struct gsm_meas_rep *rep, struct msgb *msg)
mrc = &rep->cell[3]; mrc = &rep->cell[3];
mrc->rxlev = ((data[9] & 0x07) << 3) | (data[10] >> 5); mrc->rxlev = ((data[9] & 0x07) << 3) | (data[10] >> 5);
mrc->neigh_idx = data[10] & 0x1f; mrc->neigh_idx = data[10] & 0x1f;
mrc->arfcn = bitvec_get_nth_set_bit(nbv, mrc->neigh_idx); mrc->arfcn = bitvec_get_nth_set_bit(nbv, mrc->neigh_idx + 1);
mrc->bsic = data[11] >> 2; mrc->bsic = data[11] >> 2;
if (rep->num_cell < 5) if (rep->num_cell < 5)
return 0; return 0;
@@ -767,7 +767,7 @@ int gsm48_parse_meas_rep(struct gsm_meas_rep *rep, struct msgb *msg)
mrc = &rep->cell[4]; mrc = &rep->cell[4];
mrc->rxlev = ((data[11] & 0x03) << 4) | (data[12] >> 4); mrc->rxlev = ((data[11] & 0x03) << 4) | (data[12] >> 4);
mrc->neigh_idx = ((data[12] & 0xf) << 1) | (data[13] >> 7); mrc->neigh_idx = ((data[12] & 0xf) << 1) | (data[13] >> 7);
mrc->arfcn = bitvec_get_nth_set_bit(nbv, mrc->neigh_idx); mrc->arfcn = bitvec_get_nth_set_bit(nbv, mrc->neigh_idx + 1);
mrc->bsic = (data[13] >> 1) & 0x3f; mrc->bsic = (data[13] >> 1) & 0x3f;
if (rep->num_cell < 6) if (rep->num_cell < 6)
return 0; return 0;
@@ -775,7 +775,7 @@ int gsm48_parse_meas_rep(struct gsm_meas_rep *rep, struct msgb *msg)
mrc = &rep->cell[5]; mrc = &rep->cell[5];
mrc->rxlev = ((data[13] & 0x01) << 5) | (data[14] >> 3); mrc->rxlev = ((data[13] & 0x01) << 5) | (data[14] >> 3);
mrc->neigh_idx = ((data[14] & 0x07) << 2) | (data[15] >> 6); mrc->neigh_idx = ((data[14] & 0x07) << 2) | (data[15] >> 6);
mrc->arfcn = bitvec_get_nth_set_bit(nbv, mrc->neigh_idx); mrc->arfcn = bitvec_get_nth_set_bit(nbv, mrc->neigh_idx + 1);
mrc->bsic = data[15] & 0x3f; mrc->bsic = data[15] & 0x3f;
return 0; return 0;