diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-03-22 03:25:11 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-03-24 06:16:04 +0100 |
| commit | 22481bf76d129d3c41d20b96b6587ef085be485b (patch) | |
| tree | 8c8de852e945dd5422a83bc7e0c37548d2911fe2 /openbsc/src/rest_octets.c | |
| parent | b973955295b720b8ba7c556d0165750ed9bfb381 (diff) | |
| parent | 61b4232c6363ff9d78ef73b9dbf47ec16c94d610 (diff) | |
Merge remote branch 'origin/master' into on-waves/bsc-master
* Move to libosmocore
* Move to new debugging architecture
* Register the BTS types
* Has only been compile tested
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/include/openbsc/gsm_data.h
openbsc/include/openbsc/ipaccess.h
openbsc/include/openbsc/mgcp.h
openbsc/include/openbsc/msgb.h
openbsc/include/openbsc/tlv.h
openbsc/src/Makefile.am
openbsc/src/abis_rsl.c
openbsc/src/bsc_init.c
openbsc/src/bsc_mgcp.c
openbsc/src/chan_alloc.c
openbsc/src/debug.c
openbsc/src/gsm_subscriber_base.c
openbsc/src/msgb.c
openbsc/src/rest_octets.c
openbsc/src/sccp/sccp.c
openbsc/src/vty/command.c
openbsc/src/vty_interface.c
openbsc/tests/Makefile.am
Diffstat (limited to 'openbsc/src/rest_octets.c')
| -rw-r--r-- | openbsc/src/rest_octets.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/openbsc/src/rest_octets.c b/openbsc/src/rest_octets.c index 6c8c40314..a57e7dffe 100644 --- a/openbsc/src/rest_octets.c +++ b/openbsc/src/rest_octets.c @@ -27,7 +27,7 @@ #include <errno.h> #include <openbsc/gsm_data.h> -#include <openbsc/bitvec.h> +#include <osmocore/bitvec.h> #include <openbsc/rest_octets.h> /* generate SI1 rest octets */ @@ -46,7 +46,7 @@ int rest_octets_si1(u_int8_t *data, u_int8_t *nch_pos) bitvec_set_bit(&bv, L); bitvec_spare_padding(&bv, 7); - return 0; + return bv.data_len; } /* Append selection parameters to bitvec */ @@ -125,7 +125,8 @@ int rest_octets_si3(u_int8_t *data, const struct gsm48_si_ro_info *si3) /* GPRS Indicator */ append_gprs_ind(&bv, &si3->gprs_ind); - return bitvec_spare_padding(&bv, (bv.data_len*8)-1); + bitvec_spare_padding(&bv, (bv.data_len*8)-1); + return bv.data_len; } static int append_lsa_params(struct bitvec *bv, @@ -178,7 +179,7 @@ int rest_octets_si4(u_int8_t *data, const struct gsm48_si_ro_info *si4) bitvec_set_bit(&bv, si4->break_ind ? H : L); } - return 0; + return bv.data_len; } /* GPRS Mobile Allocation as per TS 04.60 Chapter 12.10a: @@ -390,5 +391,6 @@ int rest_octets_si13(u_int8_t *data, const struct gsm48_si13_info *si13) } } } - return bitvec_spare_padding(&bv, (bv.data_len*8)-1); + bitvec_spare_padding(&bv, (bv.data_len*8)-1); + return bv.data_len; } |