osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

Make EARFCN size calculation more robust 

* add osmo_earfcn_bit_size_ext() function which allows to specify how many
  EARFCNs we should skip when estimating required bit size for SI2quater
* make old osmo_earfcn_bit_size() into wrapper over newly added function
  and mark it as deprecated

This is necessary to properly estimate necessary space for EARFCNs when
they are spread over several SI2q messages with different index.

Change-Id: I92e12e91605bdab9916a3f665705287572434f74
Related: RT#8792
This commit is contained in:
Max 2017-05-11 15:38:10 +02:00 committed by Harald Welte
parent 6959e3c110
commit 91dd219b99
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/osmocom/gsm/sysinfo.h
View File

@ -1,6 +1,8 @@
#pragma once
#include <stdbool.h>
#include <osmocom/core/defs.h>
#include <osmocom/core/utils.h>
#include <osmocom/gsm/protocol/gsm_04_08.h>
@ -66,7 +68,8 @@ typedef uint8_t sysinfo_buf_t[GSM_MACBLOCK_LEN];
extern const struct value_string osmo_sitype_strs[_MAX_SYSINFO_TYPE];
int osmo_earfcn_add(struct osmo_earfcn_si2q *e, uint16_t arfcn, uint8_t meas_bw);
int osmo_earfcn_del(struct osmo_earfcn_si2q *e, uint16_t arfcn);
size_t osmo_earfcn_bit_size(const struct osmo_earfcn_si2q *e);
size_t osmo_earfcn_bit_size(const struct osmo_earfcn_si2q *e) OSMO_DEPRECATED("Use osmo_earfcn_bit_size_ext()instead.");
size_t osmo_earfcn_bit_size_ext(const struct osmo_earfcn_si2q *e, size_t offset);
void osmo_earfcn_init(struct osmo_earfcn_si2q *e);
uint8_t osmo_sitype2rsl(enum osmo_sysinfo_type si_type);
enum osmo_sysinfo_type osmo_rsl2sitype(uint8_t rsl_si);

1
src/gsm/libosmogsm.map
View File

@ -48,6 +48,7 @@ dbm2rxlev;
osmo_earfcn_add;
osmo_earfcn_del;
osmo_earfcn_bit_size;
osmo_earfcn_bit_size_ext;
osmo_earfcn_init;
gprs_cipher_gen_input_i;

27
src/gsm/sysinfo.c
View File

@ -150,16 +150,31 @@ int osmo_earfcn_add(struct osmo_earfcn_si2q *e, uint16_t arfcn, uint8_t meas_bw)
* \returns number of bits
*/
size_t osmo_earfcn_bit_size(const struct osmo_earfcn_si2q *e)
{
return osmo_earfcn_bit_size_ext(e, 0);
}
/*! \brief Return number of bits necessary to represent earfcn struct as
* Repeated E-UTRAN Neighbour Cells IE from 3GPP TS 44.018 Table 10.5.2.33b.1
* \param[in,out] e earfcn struct
* \param[in] offset into earfcn struct: how many EARFCNs to skip while estimating size
* \returns number of bits
*/
size_t osmo_earfcn_bit_size_ext(const struct osmo_earfcn_si2q *e, size_t offset)
{
/* 1 stop bit + 5 bits for THRESH_E-UTRAN_high */
size_t i, bits = 6;
size_t i, bits = 6, skip = 0;
for (i = 0; i < e->length; i++) {
if (e->arfcn[i] != OSMO_EARFCN_INVALID) {
bits += 17;
if (OSMO_EARFCN_MEAS_INVALID == e->meas_bw[i])
bits++;
else
bits += 4;
if (skip < offset)
skip++;
else {
bits += 17;
if (OSMO_EARFCN_MEAS_INVALID == e->meas_bw[i])
bits++;
else
bits += 4;
}
}
}
bits += (e->prio_valid) ? 4 : 1;