From 7ff77ec713c6569715077344563ff9ab1719619c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 29 Dec 2010 23:06:22 +0100 Subject: smscb: Prepare to fill in the info for CBCH in SI4 Pass the number of bytes the rest octet for si4 should fill. --- openbsc/src/libbsc/rest_octets.c | 4 ++-- openbsc/src/libbsc/system_information.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'openbsc/src/libbsc') diff --git a/openbsc/src/libbsc/rest_octets.c b/openbsc/src/libbsc/rest_octets.c index 41bf5050b..4545794a9 100644 --- a/openbsc/src/libbsc/rest_octets.c +++ b/openbsc/src/libbsc/rest_octets.c @@ -141,13 +141,13 @@ static int append_lsa_params(struct bitvec *bv, } /* Generate SI4 Rest Octets (Chapter 10.5.2.35) */ -int rest_octets_si4(uint8_t *data, const struct gsm48_si_ro_info *si4) +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 = 10; /* FIXME: up to ? */ + bv.data_len = len; /* SI4 Rest Octets O */ append_selection_params(&bv, &si4->selection_params); diff --git a/openbsc/src/libbsc/system_information.c b/openbsc/src/libbsc/system_information.c index 8a6d02671..5071b0693 100644 --- a/openbsc/src/libbsc/system_information.c +++ b/openbsc/src/libbsc/system_information.c @@ -595,7 +595,7 @@ static int generate_si4(uint8_t *output, 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(restoct, &si_info); + rc = rest_octets_si4(restoct, &si_info, output + GSM_MACBLOCK_LEN - restoct); return l2_plen + 1 + rc; } -- cgit v1.2.3