cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

Use rest_octets functionalities from libosmocore 

libosmocore > 1.4.0 is required (master, not yet released) since some
fixes done in osmo-bsc code where not cherry-picked to libosmocore APIs.

Depends: libosmocore.git I2bf5635b8536b11d69774d17ac1908019633e3af
Change-Id: I7d5e5ddd174463c2a3d957c8245d2911ce013681
This commit is contained in:
Pau Espin Pedrol 2020-12-14 16:27:17 +01:00 committed by pespin
parent 027b506c27
commit 0597745ac7
11 changed files with 54 additions and 1038 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO-RELEASE
View File

@ -9,4 +9,4 @@
#library what description / commit summary line
manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0
osmo-bsc Mobile Identity Coding OsmoBSC is stricter in rejecting invalid coding of Mobile Identity IEs
libosmocore >1.4.0 (1.4.1?) need BSSMAP-LE, BSSLAP, GAD coding
libosmocore >1.4.0 (1.4.1?) need BSSMAP-LE, BSSLAP, GAD coding, osmo_gsm48_si*

1
include/osmocom/bsc/Makefile.am
View File

@ -51,7 +51,6 @@ noinst_HEADERS = \
pcu_if.h \
pcuif_proto.h \
bssmap_reset.h \
rest_octets.h \
rs232.h \
signal.h \
system_information.h \

2
include/osmocom/bsc/bts.h
View File

@ -390,7 +390,7 @@ struct gsm_bts {
struct gsm48_rach_control rach_control;
uint8_t ncc_permitted;
struct gsm48_cell_sel_par cell_sel_par;
struct gsm48_si_selection_params cell_ro_sel_par; /* rest octet */
struct osmo_gsm48_si_selection_params cell_ro_sel_par; /* rest octet */
struct gsm48_cell_options cell_options;
struct gsm48_control_channel_descr chan_desc;
struct bitvec neigh_list;

2
include/osmocom/bsc/gsm_data.h
View File

@ -21,7 +21,7 @@
#include <osmocom/crypt/auth.h>
#include <osmocom/bsc/rest_octets.h>
#include <osmocom/gsm/gsm48_rest_octets.h>
#include <osmocom/core/bitvec.h>
#include <osmocom/gsm/gsm_utils.h>

121
include/osmocom/bsc/rest_octets.h
View File

@ -1,121 +0,0 @@
#ifndef _REST_OCTETS_H
#define _REST_OCTETS_H
#include <stdbool.h>
#include <osmocom/gsm/sysinfo.h>
struct gsm_bts;
/* generate SI1 rest octets */
int rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net);
int rest_octets_si2quater(uint8_t *data, struct gsm_bts *bts);
int rest_octets_si2ter(uint8_t *data);
int rest_octets_si2bis(uint8_t *data);
int rest_octets_si6(uint8_t *data, bool is1800_net);
struct gsm48_si_selection_params {
uint16_t penalty_time:5,
temp_offs:3,
cell_resel_off:6,
cbq:1,
present:1;
};
struct gsm48_si_power_offset {
uint8_t power_offset:2,
present:1;
};
struct gsm48_si3_gprs_ind {
uint8_t si13_position:1,
ra_colour:3,
present:1;
};
struct gsm48_lsa_params {
uint32_t prio_thr:3,
lsa_offset:3,
mcc:12,
mnc:12;
unsigned int present;
};
struct gsm48_si_ro_info {
struct gsm48_si_selection_params selection_params;
struct gsm48_si_power_offset power_offset;
bool si2ter_indicator;
bool early_cm_ctrl;
struct {
uint8_t where:3,
present:1;
} scheduling;
struct gsm48_si3_gprs_ind gprs_ind;
/* SI 3 specific */
bool early_cm_restrict_3g;
bool si2quater_indicator;
/* SI 4 specific */
struct gsm48_lsa_params lsa_params;
uint16_t cell_id;
uint8_t break_ind; /* do we have SI7 + SI8 ? */
};
/* Generate SI3 Rest Octests (Chapter 10.5.2.34 / Table 10.4.72) */
int rest_octets_si3(uint8_t *data, const struct gsm48_si_ro_info *si3);
/* Generate SI4 Rest Octets (Chapter 10.5.2.35) */
int rest_octets_si4(uint8_t *data, const struct gsm48_si_ro_info *si4, int len);
/* TS 03.60 Chapter 6.3.3.1: Network Mode of Operation */
enum gprs_nmo {
GPRS_NMO_I = 0, /* CS pagin on GPRS paging or traffic channel */
GPRS_NMO_II = 1, /* all paging on CCCH */
GPRS_NMO_III = 2, /* no paging coordination */
};
/* TS 04.60 12.24 */
struct gprs_cell_options {
enum gprs_nmo nmo;
/* T3168: wait for packet uplink assignment message */
uint32_t t3168; /* in milliseconds */
/* T3192: wait for release of the TBF after reception of the final block */
uint32_t t3192; /* in milliseconds */
uint32_t drx_timer_max;/* in seconds */
uint32_t bs_cv_max;
bool ctrl_ack_type_use_block; /* use PACKET CONTROL ACKNOWLEDGMENT */
uint8_t ext_info_present;
struct {
uint8_t egprs_supported;
uint8_t use_egprs_p_ch_req;
uint8_t bep_period;
uint8_t pfc_supported;
uint8_t dtm_supported;
uint8_t bss_paging_coordination;
} ext_info;
};
/* TS 04.60 Table 12.9.2 */
struct gprs_power_ctrl_pars {
uint8_t alpha;
uint8_t t_avg_w;
uint8_t t_avg_t;
uint8_t pc_meas_chan;
uint8_t n_avg_i;
};
struct gsm48_si13_info {
struct gprs_cell_options cell_opts;
struct gprs_power_ctrl_pars pwr_ctrl_pars;
uint8_t bcch_change_mark;
uint8_t si_change_field;
uint8_t rac;
uint8_t spgc_ccch_sup;
uint8_t net_ctrl_ord;
uint8_t prio_acc_thr;
};
/* Generate SI13 Rest Octests (Chapter 10.5.2.37b) */
int rest_octets_si13(uint8_t *data, const struct gsm48_si13_info *si13);
#endif /* _REST_OCTETS_H */

1
src/osmo-bsc/Makefile.am
View File

@ -100,7 +100,6 @@ osmo_bsc_SOURCES = \
pcu_sock.c \
penalty_timers.c \
bssmap_reset.c \
rest_octets.c \
system_information.c \
timeslot_fsm.c \
smscb.c \

2
src/osmo-bsc/bsc_vty.c
View File

@ -896,7 +896,7 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts)
bts->si_common.cell_sel_par.rxlev_acc_min, VTY_NEWLINE);
if (bts->si_common.cell_ro_sel_par.present) {
struct gsm48_si_selection_params *sp;
struct osmo_gsm48_si_selection_params *sp;
sp = &bts->si_common.cell_ro_sel_par;
if (sp->cbq)

899
src/osmo-bsc/rest_octets.c
View File

@ -1,899 +0,0 @@
/* GSM Mobile Radio Interface Layer 3 messages on the A-bis interface,
* rest octet handling according to
* 3GPP TS 04.08 version 7.21.0 Release 1998 / ETSI TS 100 940 V7.21.0 */
/* (C) 2009 by Harald Welte <laforge@gnumonks.org>
*
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include <string.h>
#include <stdlib.h>
#include <errno.h>
#include <stdbool.h>
#include <osmocom/bsc/debug.h>
#include <osmocom/bsc/gsm_data.h>
#include <osmocom/core/bitvec.h>
#include <osmocom/gsm/bitvec_gsm.h>
#include <osmocom/bsc/rest_octets.h>
#include <osmocom/bsc/arfcn_range_encode.h>
#include <osmocom/bsc/system_information.h>
#include <osmocom/bsc/bts.h>
/* generate SI1 rest octets */
int rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net)
{
struct bitvec bv;
memset(&bv, 0, sizeof(bv));
bv.data = data;
bv.data_len = 1;
if (nch_pos) {
bitvec_set_bit(&bv, H);
bitvec_set_uint(&bv, *nch_pos, 5);
} else
bitvec_set_bit(&bv, L);
if (is1800_net)
bitvec_set_bit(&bv, L);
else
bitvec_set_bit(&bv, H);
bitvec_spare_padding(&bv, 6);
return bv.data_len;
}
/* Append Repeated E-UTRAN Neighbour Cell to bitvec: see 3GPP TS 44.018 Table 10.5.2.33b.1 */
static inline bool append_eutran_neib_cell(struct bitvec *bv, struct gsm_bts *bts, uint8_t budget)
{
const struct osmo_earfcn_si2q *e = &bts->si_common.si2quater_neigh_list;
unsigned i, skip = 0;
size_t offset = bts->e_offset;
int16_t rem = budget - 6; /* account for mandatory stop bit and THRESH_E-UTRAN_high */
uint8_t earfcn_budget;
if (budget <= 6)
return false;
OSMO_ASSERT(budget <= SI2Q_MAX_LEN);
/* first we have to properly adjust budget requirements */
if (e->prio_valid) /* E-UTRAN_PRIORITY: 3GPP TS 45.008*/
rem -= 4;
else
rem--;
if (e->thresh_lo_valid) /* THRESH_E-UTRAN_low: */
rem -= 6;
else
rem--;
if (e->qrxlm_valid) /* E-UTRAN_QRXLEVMIN: */
rem -= 6;
else
rem--;
if (rem < 0)
return false;
/* now we can proceed with actually adding EARFCNs within adjusted budget limit */
for (i = 0; i < e->length; i++) {
if (e->arfcn[i] != OSMO_EARFCN_INVALID) {
if (skip < offset) {
skip++; /* ignore EARFCNs added on previous calls */
} else {
earfcn_budget = 17; /* compute budget per-EARFCN */
if (OSMO_EARFCN_MEAS_INVALID == e->meas_bw[i])
earfcn_budget++;
else
earfcn_budget += 4;
if (rem - earfcn_budget < 0)
break;
else {
bts->e_offset++;
rem -= earfcn_budget;
if (rem < 0)
return false;
bitvec_set_bit(bv, 1); /* EARFCN: */
bitvec_set_uint(bv, e->arfcn[i], 16);
if (OSMO_EARFCN_MEAS_INVALID == e->meas_bw[i])
bitvec_set_bit(bv, 0);
else { /* Measurement Bandwidth: 9.1.54 */
bitvec_set_bit(bv, 1);
bitvec_set_uint(bv, e->meas_bw[i], 3);
}
}
}
}
}
/* stop bit - end of EARFCN + Measurement Bandwidth sequence */
bitvec_set_bit(bv, 0);
/* Note: we don't support different EARFCN arrays each with different priority, threshold etc. */
if (e->prio_valid) {
/* E-UTRAN_PRIORITY: 3GPP TS 45.008*/
bitvec_set_bit(bv, 1);
bitvec_set_uint(bv, e->prio, 3);
} else
bitvec_set_bit(bv, 0);
/* THRESH_E-UTRAN_high */
bitvec_set_uint(bv, e->thresh_hi, 5);
if (e->thresh_lo_valid) {
/* THRESH_E-UTRAN_low: */
bitvec_set_bit(bv, 1);
bitvec_set_uint(bv, e->thresh_lo, 5);
} else
bitvec_set_bit(bv, 0);
if (e->qrxlm_valid) {
/* E-UTRAN_QRXLEVMIN: */
bitvec_set_bit(bv, 1);
bitvec_set_uint(bv, e->qrxlm, 5);
} else
bitvec_set_bit(bv, 0);
return true;
}
static inline void append_earfcn(struct bitvec *bv, struct gsm_bts *bts, uint8_t budget)
{
bool appended;
unsigned int old = bv->cur_bit; /* save current position to make rollback possible */
int rem = ((int)budget) - 40;
if (rem <= 0)
return;
OSMO_ASSERT(budget <= SI2Q_MAX_LEN);
/* Additions in Rel-5: */
bitvec_set_bit(bv, H);
/* No 3G Additional Measurement Param. Descr. */
bitvec_set_bit(bv, 0);
/* No 3G ADDITIONAL MEASUREMENT Param. Descr. 2 */
bitvec_set_bit(bv, 0);
/* Additions in Rel-6: */
bitvec_set_bit(bv, H);
/* 3G_CCN_ACTIVE */
bitvec_set_bit(bv, 0);
/* Additions in Rel-7: */
bitvec_set_bit(bv, H);
/* No 700_REPORTING_OFFSET */
bitvec_set_bit(bv, 0);
/* No 810_REPORTING_OFFSET */
bitvec_set_bit(bv, 0);
/* Additions in Rel-8: */
bitvec_set_bit(bv, H);
/* Priority and E-UTRAN Parameters Description */
bitvec_set_bit(bv, 1);
/* budget: 10 bits used above */
/* Serving Cell Priority Parameters Descr. is Present,
* see also: 3GPP TS 44.018, Table 10.5.2.33b.1 */
bitvec_set_bit(bv, 1);
/* GERAN_PRIORITY */
bitvec_set_uint(bv, 0, 3);
/* THRESH_Priority_Search */
bitvec_set_uint(bv, 0, 4);
/* THRESH_GSM_low */
bitvec_set_uint(bv, 0, 4);
/* H_PRIO */
bitvec_set_uint(bv, 0, 2);
/* T_Reselection */
bitvec_set_uint(bv, 0, 2);
/* budget: 26 bits used above */
/* No 3G Priority Parameters Description */
bitvec_set_bit(bv, 0);
/* E-UTRAN Parameters Description */
bitvec_set_bit(bv, 1);
/* E-UTRAN_CCN_ACTIVE */
bitvec_set_bit(bv, 0);
/* E-UTRAN_Start: 9.1.54 */
bitvec_set_bit(bv, 1);
/* E-UTRAN_Stop: 9.1.54 */
bitvec_set_bit(bv, 1);
/* No E-UTRAN Measurement Parameters Descr. */
bitvec_set_bit(bv, 0);
/* No GPRS E-UTRAN Measurement Param. Descr. */
bitvec_set_bit(bv, 0);
/* Note: each of next 3 "repeated" structures might be repeated any
(0, 1, 2...) times - we only support 1 and 0 */
/* Repeated E-UTRAN Neighbour Cells */
bitvec_set_bit(bv, 1);
/* budget: 34 bits used above */
appended = append_eutran_neib_cell(bv, bts, rem);
if (!appended) { /* appending is impossible within current budget: rollback */
bv->cur_bit = old;
return;
}
/* budget: further 6 bits used below, totalling 40 bits */
/* stop bit - end of Repeated E-UTRAN Neighbour Cells sequence: */
bitvec_set_bit(bv, 0);
/* Note: following 2 repeated structs are not supported ATM */
/* stop bit - end of Repeated E-UTRAN Not Allowed Cells sequence: */
bitvec_set_bit(bv, 0);
/* stop bit - end of Repeated E-UTRAN PCID to TA mapping sequence: */
bitvec_set_bit(bv, 0);
/* Priority and E-UTRAN Parameters Description ends here */
/* No 3G CSG Description */
bitvec_set_bit(bv, 0);
/* No E-UTRAN CSG Description */
bitvec_set_bit(bv, 0);
/* No Additions in Rel-9: */
bitvec_set_bit(bv, L);
}
static inline int f0_helper(int *sc, size_t length, uint8_t *chan_list)
{
int w[RANGE_ENC_MAX_ARFCNS] = { 0 };
return range_encode(ARFCN_RANGE_1024, sc, length, w, 0, chan_list);
}
/* Estimate how many bits it'll take to append single FDD UARFCN */
static inline int append_utran_fdd_length(uint16_t u, const int *sc, size_t sc_len, size_t length)
{
uint8_t chan_list[16] = { 0 };
int tmp[sc_len], f0;
memcpy(tmp, sc, sizeof(tmp));
f0 = f0_helper(tmp, length, chan_list);
if (f0 < 0)
return f0;
return 21 + range1024_p(length);
}
/* Append single FDD UARFCN */
static inline int append_utran_fdd(struct bitvec *bv, uint16_t u, int *sc, size_t length)
{
uint8_t chan_list[16] = { 0 };
int f0 = f0_helper(sc, length, chan_list);
if (f0 < 0)
return f0;
/* Repeated UTRAN FDD Neighbour Cells */
bitvec_set_bit(bv, 1);
/* FDD-ARFCN */
bitvec_set_bit(bv, 0);
bitvec_set_uint(bv, u, 14);
/* FDD_Indic0: parameter value '0000000000' is a member of the set? */
bitvec_set_bit(bv, f0);
/* NR_OF_FDD_CELLS */
bitvec_set_uint(bv, length, 5);
f0 = bv->cur_bit;
bitvec_add_range1024(bv, (struct gsm48_range_1024 *)chan_list);
bv->cur_bit = f0 + range1024_p(length);
return 21 + range1024_p(length);
}
static inline int try_adding_uarfcn(struct bitvec *bv, struct gsm_bts *bts, uint16_t uarfcn,
uint8_t num_sc, uint8_t start_pos, uint8_t budget)
{
int i, k, rc, a[bts->si_common.uarfcn_length];
if (budget < 23)
return -ENOMEM;
/* copy corresponding Scrambling Codes: range encoder make in-place modifications */
for (i = start_pos, k = 0; i < num_sc; a[k++] = bts->si_common.data.scramble_list[i++]);
/* estimate bit length requirements */
rc = append_utran_fdd_length(uarfcn, a, bts->si_common.uarfcn_length, k);
if (rc < 0)
return rc; /* range encoder failure */
if (budget - rc <= 0)
return -ENOMEM; /* we have ran out of budget in current SI2q */
/* compute next offset */
bts->u_offset += k;
return budget - append_utran_fdd(bv, uarfcn, a, k);
}
/* Append multiple FDD UARFCNs */
static inline void append_uarfcns(struct bitvec *bv, struct gsm_bts *bts, uint8_t budget)
{
const uint16_t *u = bts->si_common.data.uarfcn_list;
int i, rem = budget - 7, st = bts->u_offset; /* account for constant bits right away */
uint16_t cu = u[bts->u_offset]; /* caller ensures that length is positive */
OSMO_ASSERT(budget <= SI2Q_MAX_LEN);
if (budget <= 7)
return;
/* 3G Neighbour Cell Description */
bitvec_set_bit(bv, 1);
/* No Index_Start_3G */
bitvec_set_bit(bv, 0);
/* No Absolute_Index_Start_EMR */
bitvec_set_bit(bv, 0);
/* UTRAN FDD Description */
bitvec_set_bit(bv, 1);
/* No Bandwidth_FDD */
bitvec_set_bit(bv, 0);
for (i = bts->u_offset; i <= bts->si_common.uarfcn_length; i++)
if (u[i] != cu) { /* we've reached new UARFCN */
rem = try_adding_uarfcn(bv, bts, cu, i, st, rem);
if (rem < 0)
break;
if (i < bts->si_common.uarfcn_length) {
cu = u[i];
st = i;
} else
break;
}
/* stop bit - end of Repeated UTRAN FDD Neighbour Cells */
bitvec_set_bit(bv, 0);
/* UTRAN TDD Description */
bitvec_set_bit(bv, 0);
}
/* generate SI2quater rest octets: 3GPP TS 44.018 § 10.5.2.33b */
int rest_octets_si2quater(uint8_t *data, struct gsm_bts *bts)
{
int rc;
struct bitvec bv;
if (bts->si2q_count < bts->si2q_index)
return -EINVAL;
bv.data = data;
bv.data_len = 20;
bitvec_zero(&bv);
/* BA_IND: Set to '0' as that's what we use for SI2xxx type,
* whereas '1' is used for SI5xxx type messages. The point here
* is to be able to correlate whether a given MS measurement
* report was using the neighbor cells advertised in SI2 or in
* SI5, as those two could very well be different */
bitvec_set_bit(&bv, 0);
/* 3G_BA_IND */
bitvec_set_bit(&bv, 1);
/* MP_CHANGE_MARK */
bitvec_set_bit(&bv, 0);
/* SI2quater_INDEX */
bitvec_set_uint(&bv, bts->si2q_index, 4);
/* SI2quater_COUNT */
bitvec_set_uint(&bv, bts->si2q_count, 4);
/* No Measurement_Parameters Description */
bitvec_set_bit(&bv, 0);
/* No GPRS_Real Time Difference Description */
bitvec_set_bit(&bv, 0);
/* No GPRS_BSIC Description */
bitvec_set_bit(&bv, 0);
/* No GPRS_REPORT PRIORITY Description */
bitvec_set_bit(&bv, 0);
/* No GPRS_MEASUREMENT_Parameters Description */
bitvec_set_bit(&bv, 0);
/* No NC Measurement Parameters */
bitvec_set_bit(&bv, 0);
/* No extension (length) */
bitvec_set_bit(&bv, 0);
rc = SI2Q_MAX_LEN - (bv.cur_bit + 3);
if (rc > 0 && bts->si_common.uarfcn_length - bts->u_offset > 0)
append_uarfcns(&bv, bts, rc);
else /* No 3G Neighbour Cell Description */
bitvec_set_bit(&bv, 0);
/* No 3G Measurement Parameters Description */
bitvec_set_bit(&bv, 0);
/* No GPRS_3G_MEASUREMENT Parameters Descr. */
bitvec_set_bit(&bv, 0);
rc = SI2Q_MAX_LEN - bv.cur_bit;
if (rc > 0 && si2q_earfcn_count(&bts->si_common.si2quater_neigh_list) - bts->e_offset > 0)
append_earfcn(&bv, bts, rc);
else /* No Additions in Rel-5: */
bitvec_set_bit(&bv, L);
bitvec_spare_padding(&bv, (bv.data_len * 8) - 1);
return bv.data_len;
}
/* Append selection parameters to bitvec */
static void append_selection_params(struct bitvec *bv,
const struct gsm48_si_selection_params *sp)
{
if (sp->present) {
bitvec_set_bit(bv, H);
bitvec_set_bit(bv, sp->cbq);
bitvec_set_uint(bv, sp->cell_resel_off, 6);
bitvec_set_uint(bv, sp->temp_offs, 3);
bitvec_set_uint(bv, sp->penalty_time, 5);
} else
bitvec_set_bit(bv, L);
}
/* Append power offset to bitvec */
static void append_power_offset(struct bitvec *bv,
const struct gsm48_si_power_offset *po)
{
if (po->present) {
bitvec_set_bit(bv, H);
bitvec_set_uint(bv, po->power_offset, 2);
} else
bitvec_set_bit(bv, L);
}
/* Append GPRS indicator to bitvec */
static void append_gprs_ind(struct bitvec *bv,
const struct gsm48_si3_gprs_ind *gi)
{
if (gi->present) {
bitvec_set_bit(bv, H);
bitvec_set_uint(bv, gi->ra_colour, 3);
/* 0 == SI13 in BCCH Norm, 1 == SI13 sent on BCCH Ext */
bitvec_set_bit(bv, gi->si13_position);
} else
bitvec_set_bit(bv, L);
}
/* Generate SI2ter Rest Octests 3GPP TS 44.018 Table 10.5.2.33a.1 */
int rest_octets_si2ter(uint8_t *data)
{
struct bitvec bv;
memset(&bv, 0, sizeof(bv));
bv.data = data;
bv.data_len = 4;
/* No SI2ter_MP_CHANGE_MARK */
bitvec_set_bit(&bv, L);
bitvec_spare_padding(&bv, (bv.data_len * 8) - 1);
return bv.data_len;
}
/* Generate SI2bis Rest Octests 3GPP TS 44.018 Table 10.5.2.33.1 */
int rest_octets_si2bis(uint8_t *data)
{
struct bitvec bv;
memset(&bv, 0, sizeof(bv));
bv.data = data;
bv.data_len = 1;
bitvec_spare_padding(&bv, (bv.data_len * 8) - 1);
return bv.data_len;
}
/* Generate SI3 Rest Octests (Chapter 10.5.2.34 / Table 10.4.72) */
int rest_octets_si3(uint8_t *data, const struct gsm48_si_ro_info *si3)
{
struct bitvec bv;
memset(&bv, 0, sizeof(bv));
bv.data = data;
bv.data_len = 4;
/* Optional Selection Parameters */
append_selection_params(&bv, &si3->selection_params);
/* Optional Power Offset */
append_power_offset(&bv, &si3->power_offset);
/* Do we have a SI2ter on the BCCH? */
if (si3->si2ter_indicator)
bitvec_set_bit(&bv, H);
else
bitvec_set_bit(&bv, L);
/* Early Classmark Sending Control */
if (si3->early_cm_ctrl)
bitvec_set_bit(&bv, H);
else
bitvec_set_bit(&bv, L);
/* Do we have a SI Type 9 on the BCCH? */
if (si3->scheduling.present) {
bitvec_set_bit(&bv, H);
bitvec_set_uint(&bv, si3->scheduling.where, 3);
} else
bitvec_set_bit(&bv, L);
/* GPRS Indicator */
append_gprs_ind(&bv, &si3->gprs_ind);
/* 3G Early Classmark Sending Restriction. If H, then controlled by
* early_cm_ctrl above */
if (si3->early_cm_restrict_3g)
bitvec_set_bit(&bv, L);
else
bitvec_set_bit(&bv, H);
if (si3->si2quater_indicator) {
bitvec_set_bit(&bv, H); /* indicator struct present */
bitvec_set_uint(&bv, 0, 1); /* message is sent on BCCH Norm */
}
bitvec_spare_padding(&bv, (bv.data_len*8)-1);
return bv.data_len;
}
static int append_lsa_params(struct bitvec *bv,
const struct gsm48_lsa_params *lsa_params)
{
/* FIXME */
return -1;
}
/* Generate SI4 Rest Octets (Chapter 10.5.2.35) */
int rest_octets_si4(uint8_t *data, const struct gsm48_si_ro_info *si4, int len)
{
struct bitvec bv;
memset(&bv, 0, sizeof(bv));
bv.data = data;
bv.data_len = len;
/* SI4 Rest Octets O */
append_selection_params(&bv, &si4->selection_params);
append_power_offset(&bv, &si4->power_offset);
append_gprs_ind(&bv, &si4->gprs_ind);
if (0 /* FIXME */) {
/* H and SI4 Rest Octets S */
bitvec_set_bit(&bv, H);
/* LSA Parameters */
if (si4->lsa_params.present) {
bitvec_set_bit(&bv, H);
append_lsa_params(&bv, &si4->lsa_params);
} else
bitvec_set_bit(&bv, L);
/* Cell Identity */
if (1) {
bitvec_set_bit(&bv, H);
bitvec_set_uint(&bv, si4->cell_id, 16);
} else
bitvec_set_bit(&bv, L);
/* LSA ID Information */
if (0) {
bitvec_set_bit(&bv, H);
/* FIXME */
} else
bitvec_set_bit(&bv, L);
} else {
/* L and break indicator */
bitvec_set_bit(&bv, L);
bitvec_set_bit(&bv, si4->break_ind ? H : L);
}
return bv.data_len;
}
/* GSM 04.18 ETSI TS 101 503 V8.27.0 (2006-05)
<SI6 rest octets> ::=
{L | H <PCH and NCH info>}
{L | H <VBS/VGCS options : bit(2)>}
{ < DTM_support : bit == L > I < DTM_support : bit == H >
< RAC : bit (8) >
< MAX_LAPDm : bit (3) > }
< Band indicator >
{ L | H < GPRS_MS_TXPWR_MAX_CCH : bit (5) > }
<implicit spare >;
*/
int rest_octets_si6(uint8_t *data, bool is1800_net)
{
struct bitvec bv;
memset(&bv, 0, sizeof(bv));
bv.data = data;
bv.data_len = 1;
/* no PCH/NCH info */
bitvec_set_bit(&bv, L);
/* no VBS/VGCS options */
bitvec_set_bit(&bv, L);
/* no DTM_support */
bitvec_set_bit(&bv, L);
/* band indicator */
if (is1800_net)
bitvec_set_bit(&bv, L);
else
bitvec_set_bit(&bv, H);
/* no GPRS_MS_TXPWR_MAX_CCH */
bitvec_set_bit(&bv, L);
bitvec_spare_padding(&bv, (bv.data_len * 8) - 1);
return bv.data_len;
}
/* GPRS Mobile Allocation as per TS 04.60 Chapter 12.10a:
< GPRS Mobile Allocation IE > ::=
< HSN : bit (6) >
{ 0 | 1 < RFL number list : < RFL number list struct > > }
{ 0 < MA_LENGTH : bit (6) >
< MA_BITMAP: bit (val(MA_LENGTH) + 1) >
| 1 { 0 | 1 <ARFCN index list : < ARFCN index list struct > > } } ;
< RFL number list struct > :: =
< RFL_NUMBER : bit (4) >
{ 0 | 1 < RFL number list struct > } ;
< ARFCN index list struct > ::=
< ARFCN_INDEX : bit(6) >
{ 0 | 1 < ARFCN index list struct > } ;
*/
static int append_gprs_mobile_alloc(struct bitvec *bv)
{
/* Hopping Sequence Number */
bitvec_set_uint(bv, 0, 6);
if (0) {
/* We want to use a RFL number list */
bitvec_set_bit(bv, 1);
/* FIXME: RFL number list */
} else
bitvec_set_bit(bv, 0);
if (0) {
/* We want to use a MA_BITMAP */
bitvec_set_bit(bv, 0);
/* FIXME: MA_LENGTH, MA_BITMAP, ... */
} else {
bitvec_set_bit(bv, 1);
if (0) {
/* We want to provide an ARFCN index list */
bitvec_set_bit(bv, 1);
/* FIXME */
} else
bitvec_set_bit(bv, 0);
}
return 0;
}
static int encode_t3192(unsigned int t3192)
{
/* See also 3GPP TS 44.060
Table 12.24.2: GPRS Cell Options information element details */
if (t3192 == 0)
return 3;
else if (t3192 <= 80)
return 4;
else if (t3192 <= 120)
return 5;
else if (t3192 <= 160)
return 6;
else if (t3192 <= 200)
return 7;
else if (t3192 <= 500)
return 0;
else if (t3192 <= 1000)
return 1;
else if (t3192 <= 1500)
return 2;
else
return -EINVAL;
}
static int encode_drx_timer(unsigned int drx)
{
if (drx == 0)
return 0;
else if (drx == 1)
return 1;
else if (drx == 2)
return 2;
else if (drx <= 4)
return 3;
else if (drx <= 8)
return 4;
else if (drx <= 16)
return 5;
else if (drx <= 32)
return 6;
else if (drx <= 64)
return 7;
else
return -EINVAL;
}
/* GPRS Cell Options as per TS 04.60 Chapter 12.24
< GPRS Cell Options IE > ::=
< NMO : bit(2) >
< T3168 : bit(3) >
< T3192 : bit(3) >
< DRX_TIMER_MAX: bit(3) >
< ACCESS_BURST_TYPE: bit >
< CONTROL_ACK_TYPE : bit >
< BS_CV_MAX: bit(4) >
{ 0 | 1 < PAN_DEC : bit(3) >
< PAN_INC : bit(3) >
< PAN_MAX : bit(3) >
{ 0 | 1 < Extension Length : bit(6) >
< bit (val(Extension Length) + 1
& { < Extension Information > ! { bit ** = <no string> } } ;
< Extension Information > ::=
{ 0 | 1 < EGPRS_PACKET_CHANNEL_REQUEST : bit >
< BEP_PERIOD : bit(4) > }
< PFC_FEATURE_MODE : bit >
< DTM_SUPPORT : bit >
<BSS_PAGING_COORDINATION: bit >
<spare bit > ** ;
*/
static int append_gprs_cell_opt(struct bitvec *bv,
const struct gprs_cell_options *gco)
{
int t3192, drx_timer_max;
t3192 = encode_t3192(gco->t3192);
if (t3192 < 0)
return t3192;
drx_timer_max = encode_drx_timer(gco->drx_timer_max);
if (drx_timer_max < 0)
return drx_timer_max;
bitvec_set_uint(bv, gco->nmo, 2);
/* See also 3GPP TS 44.060
Table 12.24.2: GPRS Cell Options information element details */
bitvec_set_uint(bv, gco->t3168 / 500 - 1, 3);
bitvec_set_uint(bv, t3192, 3);
bitvec_set_uint(bv, drx_timer_max, 3);
/* ACCESS_BURST_TYPE: Hard-code 8bit */
bitvec_set_bit(bv, 0);
/* CONTROL_ACK_TYPE: */
bitvec_set_bit(bv, gco->ctrl_ack_type_use_block);
bitvec_set_uint(bv, gco->bs_cv_max, 4);
if (0) {
/* hard-code no PAN_{DEC,INC,MAX} */
bitvec_set_bit(bv, 0);
} else {
/* copied from ip.access BSC protocol trace */
bitvec_set_bit(bv, 1);
bitvec_set_uint(bv, 1, 3); /* DEC */
bitvec_set_uint(bv, 1, 3); /* INC */
bitvec_set_uint(bv, 15, 3); /* MAX */
}
if (!gco->ext_info_present) {
/* no extension information */
bitvec_set_bit(bv, 0);
} else {
/* extension information */
bitvec_set_bit(bv, 1);
if (!gco->ext_info.egprs_supported) {
/* 6bit length of extension */
bitvec_set_uint(bv, (1 + 3)-1, 6);
/* EGPRS supported in the cell */
bitvec_set_bit(bv, 0);
} else {
/* 6bit length of extension */
bitvec_set_uint(bv, (1 + 5 + 3)-1, 6);
/* EGPRS supported in the cell */
bitvec_set_bit(bv, 1);
/* 1bit EGPRS PACKET CHANNEL REQUEST (inverted logic) */
bitvec_set_bit(bv, !gco->ext_info.use_egprs_p_ch_req);
/* 4bit BEP PERIOD */
bitvec_set_uint(bv, gco->ext_info.bep_period, 4);
}
bitvec_set_bit(bv, gco->ext_info.pfc_supported);
bitvec_set_bit(bv, gco->ext_info.dtm_supported);
bitvec_set_bit(bv, gco->ext_info.bss_paging_coordination);
}
return 0;
}
static void append_gprs_pwr_ctrl_pars(struct bitvec *bv,
const struct gprs_power_ctrl_pars *pcp)
{
bitvec_set_uint(bv, pcp->alpha, 4);
bitvec_set_uint(bv, pcp->t_avg_w, 5);
bitvec_set_uint(bv, pcp->t_avg_t, 5);
bitvec_set_uint(bv, pcp->pc_meas_chan, 1);
bitvec_set_uint(bv, pcp->n_avg_i, 4);
}
/* Generate SI13 Rest Octests (04.08 Chapter 10.5.2.37b) */
int rest_octets_si13(uint8_t *data, const struct gsm48_si13_info *si13)
{
struct bitvec bv;
memset(&bv, 0, sizeof(bv));
bv.data = data;
bv.data_len = 20;
if (0) {
/* No rest octets */
bitvec_set_bit(&bv, L);
} else {
bitvec_set_bit(&bv, H);
bitvec_set_uint(&bv, si13->bcch_change_mark, 3);
bitvec_set_uint(&bv, si13->si_change_field, 4);
if (1) {
bitvec_set_bit(&bv, 0);
} else {
bitvec_set_bit(&bv, 1);
bitvec_set_uint(&bv, si13->bcch_change_mark, 2);
append_gprs_mobile_alloc(&bv);
}
/* PBCCH not present in cell:
it shall never be indicated according to 3GPP TS 44.018 Table 10.5.2.37b.1 */
bitvec_set_bit(&bv, 0);
bitvec_set_uint(&bv, si13->rac, 8);
bitvec_set_bit(&bv, si13->spgc_ccch_sup);
bitvec_set_uint(&bv, si13->prio_acc_thr, 3);
bitvec_set_uint(&bv, si13->net_ctrl_ord, 2);
append_gprs_cell_opt(&bv, &si13->cell_opts);
append_gprs_pwr_ctrl_pars(&bv, &si13->pwr_ctrl_pars);
/* 3GPP TS 44.018 Release 6 / 10.5.2.37b */
bitvec_set_bit(&bv, H); /* added Release 99 */
/* claim our SGSN is compatible with Release 99, as EDGE and EGPRS
* was only added in this Release */
bitvec_set_bit(&bv, 1);
}
bitvec_spare_padding(&bv, (bv.data_len*8)-1);
return bv.data_len;
}

60
src/osmo-bsc/system_information.c
View File

@ -31,12 +31,12 @@
#include <osmocom/core/utils.h>
#include <osmocom/gsm/sysinfo.h>
#include <osmocom/gsm/gsm48_ie.h>
#include <osmocom/gsm/gsm48_rest_octets.h>
#include <osmocom/gsm/gsm48.h>
#include <osmocom/bsc/debug.h>
#include <osmocom/bsc/gsm_data.h>
#include <osmocom/bsc/abis_rsl.h>
#include <osmocom/bsc/rest_octets.h>
#include <osmocom/bsc/arfcn_range_encode.h>
#include <osmocom/bsc/gsm_04_08_rr.h>
#include <osmocom/bsc/acc.h>
@ -169,7 +169,12 @@ static int make_si2quaters(struct gsm_bts *bts, bool counting)
si2q->header.system_information = GSM48_MT_RR_SYSINFO_2quater;
}
rc = rest_octets_si2quater(si2q->rest_octets, bts);
rc = osmo_gsm48_rest_octets_si2quater_encode(si2q->rest_octets, bts->si2q_index,
bts->si2q_count, bts->si_common.data.uarfcn_list,
&bts->u_offset, bts->si_common.uarfcn_length,
bts->si_common.data.scramble_list,
&bts->si_common.si2quater_neigh_list,
&bts->e_offset);
if (rc < 0)
return rc;
@ -729,7 +734,7 @@ static int generate_si1(enum osmo_sysinfo_type t, struct gsm_bts *bts)
* SI1 Rest Octets (10.5.2.32), contains NCH position and band
* indicator but that is not in the 04.08.
*/
rc = rest_octets_si1(si1->rest_octets, NULL, is_dcs_net(bts));
rc = osmo_gsm48_rest_octets_si1_encode(si1->rest_octets, NULL, is_dcs_net(bts));
return sizeof(*si1) + rc;
}
@ -759,6 +764,20 @@ static int generate_si2(enum osmo_sysinfo_type t, struct gsm_bts *bts)
return sizeof(*si2);
}
/* Generate SI2bis Rest Octests 3GPP TS 44.018 Table 10.5.2.33.1 */
static int rest_octets_si2bis(uint8_t *data)
{
struct bitvec bv;
memset(&bv, 0, sizeof(bv));
bv.data = data;
bv.data_len = 1;
bitvec_spare_padding(&bv, (bv.data_len * 8) - 1);
return bv.data_len;
}
static int generate_si2bis(enum osmo_sysinfo_type t, struct gsm_bts *bts)
{
int rc;
@ -796,6 +815,24 @@ static int generate_si2bis(enum osmo_sysinfo_type t, struct gsm_bts *bts)
return sizeof(*si2b) + rc;
}
/* Generate SI2ter Rest Octests 3GPP TS 44.018 Table 10.5.2.33a.1 */
static int rest_octets_si2ter(uint8_t *data)
{
struct bitvec bv;
memset(&bv, 0, sizeof(bv));
bv.data = data;
bv.data_len = 4;
/* No SI2ter_MP_CHANGE_MARK */
bitvec_set_bit(&bv, L);
bitvec_spare_padding(&bv, (bv.data_len * 8) - 1);
return bv.data_len;
}
static int generate_si2ter(enum osmo_sysinfo_type t, struct gsm_bts *bts)
{
int rc;
@ -865,7 +902,7 @@ static int generate_si2quater(enum osmo_sysinfo_type t, struct gsm_bts *bts)
return sizeof(*si2q) + rc;
}
static struct gsm48_si_ro_info si_info = {
static struct osmo_gsm48_si_ro_info si_info = {
.selection_params = {
.present = 0,
},
@ -934,7 +971,7 @@ static int generate_si3(enum osmo_sysinfo_type t, struct gsm_bts *bts)
CBQ, CELL_RESELECT_OFFSET, TEMPORARY_OFFSET, PENALTY_TIME
Power Offset, 2ter Indicator, Early Classmark Sending,
Scheduling if and WHERE, GPRS Indicator, SI13 position */
rc = rest_octets_si3(si3->rest_octets, &si_info);
rc = osmo_gsm48_rest_octets_si3_encode(si3->rest_octets, &si_info);
return sizeof(*si3) + rc;
}
@ -989,7 +1026,7 @@ static int generate_si4(enum osmo_sysinfo_type t, struct gsm_bts *bts)
/* SI4 Rest Octets (10.5.2.35), containing
Optional Power offset, GPRS Indicator,
Cell Identity, LSA ID, Selection Parameter */
rc = rest_octets_si4(tail, &si_info, (uint8_t *)GSM_BTS_SI(bts, t) + GSM_MACBLOCK_LEN - tail);
rc = osmo_gsm48_rest_octets_si4_encode(tail, &si_info, (uint8_t *)GSM_BTS_SI(bts, t) + GSM_MACBLOCK_LEN - tail);
return l2_plen + 1 + rc;
}
@ -1114,11 +1151,13 @@ static int generate_si5ter(enum osmo_sysinfo_type t, struct gsm_bts *bts)
static int generate_si6(enum osmo_sysinfo_type t, struct gsm_bts *bts)
{
struct gsm48_system_information_type_6 *si6;
struct osmo_gsm48_si6_ro_info si6_ro_info;
uint8_t *output = GSM_BTS_SI(bts, t);
int l2_plen = 11;
int rc;
memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN);
memset(&si6_ro_info, 0, sizeof(si6_ro_info));
/* ip.access nanoBTS needs l2_plen!! */
switch (bts->type) {
@ -1145,12 +1184,13 @@ static int generate_si6(enum osmo_sysinfo_type t, struct gsm_bts *bts)
gsm48_set_dtx(&si6->cell_options, bts->dtxu, bts->dtxu, false);
/* SI6 Rest Octets: 10.5.2.35a: PCH / NCH info, VBS/VGCS options */
rc = rest_octets_si6(si6->rest_octets, is_dcs_net(bts));
si6_ro_info.band_indicator_1900 = is_dcs_net(bts);
rc = osmo_gsm48_rest_octets_si6_encode(si6->rest_octets, &si6_ro_info);
return l2_plen + rc;
}
static struct gsm48_si13_info si13_default = {
static struct osmo_gsm48_si13_info si13_default = {
.cell_opts = {
.nmo = GPRS_NMO_II,
.t3168 = 2000,
@ -1215,7 +1255,7 @@ static int generate_si13(enum osmo_sysinfo_type t, struct gsm_bts *bts)
else
si13_default.cell_opts.ext_info.bss_paging_coordination = 0;
ret = rest_octets_si13(si13->rest_octets, &si13_default);
ret = osmo_gsm48_rest_octets_si13_encode(si13->rest_octets, &si13_default);
if (ret < 0)
return ret;
@ -1262,7 +1302,7 @@ int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type)
memcpy(&si_info.selection_params,
&bts->si_common.cell_ro_sel_par,
sizeof(struct gsm48_si_selection_params));
sizeof(struct osmo_gsm48_si_selection_params));
gen_si = gen_si_fn[si_type];
if (!gen_si) {

1
tests/gsm0408/Makefile.am
View File

@ -33,7 +33,6 @@ gsm0408_test_LDADD = \
$(top_builddir)/src/osmo-bsc/bts_trx.o \
$(top_builddir)/src/osmo-bsc/gsm_data.o \
$(top_builddir)/src/osmo-bsc/net_init.o \
$(top_builddir)/src/osmo-bsc/rest_octets.o \
$(top_builddir)/src/osmo-bsc/system_information.o \
$(top_builddir)/src/osmo-bsc/neighbor_ident.o \
$(top_builddir)/src/osmo-bsc/nm_common_fsm.o \

1
tests/handover/Makefile.am
View File

@ -97,7 +97,6 @@ handover_test_LDADD = \
$(top_builddir)/src/osmo-bsc/paging.o \
$(top_builddir)/src/osmo-bsc/pcu_sock.o \
$(top_builddir)/src/osmo-bsc/penalty_timers.o \
$(top_builddir)/src/osmo-bsc/rest_octets.o \
$(top_builddir)/src/osmo-bsc/system_information.o \
$(top_builddir)/src/osmo-bsc/timeslot_fsm.o \
$(top_builddir)/src/osmo-bsc/smscb.o \