diff options
| author | Max <msuraev@sysmocom.de> | 2017-12-11 12:24:18 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-12-12 18:00:56 +0000 |
| commit | 61b0c30cca80cba5522b172b884b2904b91eb516 (patch) | |
| tree | ea76c34e9366eb00dfbe4f7214a068bf91f3c058 | |
| parent | d382bf63e2b7e28fe41c5310c26fe584f0356897 (diff) | |
Generate SI2bis Rest Octets
According to the spec it's an empty 1-byte element reserved for future
extension but we still have to generate padding properly. Add stub
function similar to the used for SI2ter and adjust test output
accordingly.
Related: OS#2711
Change-Id: I3c278c57880a173df3c4648c9724339d23ce94fd
| -rw-r--r-- | include/osmocom/bsc/rest_octets.h | 1 | ||||
| -rw-r--r-- | src/libbsc/rest_octets.c | 14 | ||||
| -rw-r--r-- | src/libbsc/system_information.c | 5 | ||||
| -rw-r--r-- | tests/gsm0408/gsm0408_test.ok | 2 |
4 files changed, 20 insertions, 2 deletions
diff --git a/include/osmocom/bsc/rest_octets.h b/include/osmocom/bsc/rest_octets.h index ba25b6d06..f7ad682b7 100644 --- a/include/osmocom/bsc/rest_octets.h +++ b/include/osmocom/bsc/rest_octets.h @@ -10,6 +10,7 @@ struct gsm_bts; 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 { diff --git a/src/libbsc/rest_octets.c b/src/libbsc/rest_octets.c index b8a29bac5..9f2b4c0ab 100644 --- a/src/libbsc/rest_octets.c +++ b/src/libbsc/rest_octets.c @@ -478,6 +478,20 @@ int rest_octets_si2ter(uint8_t *data) 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) { diff --git a/src/libbsc/system_information.c b/src/libbsc/system_information.c index 4575454d4..a04959d87 100644 --- a/src/libbsc/system_information.c +++ b/src/libbsc/system_information.c @@ -739,7 +739,10 @@ static int generate_si2bis(enum osmo_sysinfo_type t, struct gsm_bts *bts) si2b->rach_control = bts->si_common.rach_control; - return sizeof(*si2b); + /* SI2bis Rest Octets as per 3GPP TS 44.018 ยง10.5.2.33 */ + rc = rest_octets_si2bis(si2b->rest_octets); + + return sizeof(*si2b) + rc; } static int generate_si2ter(enum osmo_sysinfo_type t, struct gsm_bts *bts) diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 868cd9bf7..536287caa 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -203,7 +203,7 @@ generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 86 59 84 2b 54 21 27 6 generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 86 59 84 26 53 97 65 60 2b 2b 2b 2b 2b 2b 2b 2b 2b Testing if BA-IND is set as expected in SI2xxx and SI5xxx SI2: 59 06 1a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -SI2bis: 59 06 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +SI2bis: 59 06 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 2b SI2ter: 59 06 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 2b 2b 2b 2b SI5: 06 1d 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 SI5bis: 06 05 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |