diff options
| author | Harald Welte <laforge@gnumonks.org> | 2009-11-13 14:41:52 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2009-11-13 14:41:52 +0100 |
| commit | aff237d7393b7d492edbc67ddc91a1b02ab4bebf (patch) | |
| tree | 419bafd9fcf20a98992caacb77467863ee8a31c5 /openbsc/src/abis_nm.c | |
| parent | 999549d9ae62a182d426b092042400e54abc23fd (diff) | |
[OML] fix bugs in BCCH info parser for ip.access
Diffstat (limited to 'openbsc/src/abis_nm.c')
| -rwxr-xr-x | openbsc/src/abis_nm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/openbsc/src/abis_nm.c b/openbsc/src/abis_nm.c index 757bb95f5..c64582a92 100755 --- a/openbsc/src/abis_nm.c +++ b/openbsc/src/abis_nm.c @@ -2731,8 +2731,8 @@ void ipac_parse_cgi(struct cell_global_id *cid, const u_int8_t *buf) cid->mnc += (buf[1] >> 4) * 1; } - cid->lac = ntohs(buf+3); - cid->ci = ntohs(buf+5); + cid->lac = ntohs(*((u_int16_t *)&buf[3])); + cid->ci = ntohs(*((u_int16_t *)&buf[5])); } /* parse BCCH information IEI from wire format to struct ipac_bcch_info */ @@ -2750,6 +2750,8 @@ int ipac_parse_bcch_info(struct ipac_bcch_info *binf, u_int8_t *buf) len = ntohs(*(u_int16_t *)cur); cur += 2; + DEBUGP(DNM, "bcch info: %s\n", hexdump(cur, len)); + binf->info_type = ntohs(*(u_int16_t *)cur); cur += 2; @@ -2780,7 +2782,7 @@ int ipac_parse_bcch_info(struct ipac_bcch_info *binf, u_int8_t *buf) cur += 4; if (binf->info_type & IPAC_BINF_BSIC) - binf->bsic = *cur++ & 0x3f; + binf->bsic = *cur & 0x3f; cur++; ipac_parse_cgi(&binf->cgi, cur); |