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

Replace ad-hoc function with generic one from libosmocore 

Signed-off-by: Max <max.suraev@fairwaves.co>
This commit is contained in:
Max 2014-10-22 16:21:20 +02:00 committed by Holger Hans Peter Freyther
parent 072bee5c85
commit 4c6e667968
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openbsc/src/osmo-bsc/osmo_bsc_bssap.c
View File

@ -29,16 +29,6 @@
#include <osmocom/gsm/protocol/gsm_08_08.h>
#include <osmocom/gsm/gsm0808.h>
#include <arpa/inet.h>
static uint16_t read_data16(const uint8_t *data)
{
uint16_t res;
memcpy(&res, data, sizeof(res));
return res;
}
/*
* helpers for the assignment command
*/
@ -154,7 +144,7 @@ static int bssmap_handle_paging(struct osmo_msc_data *msc,
* Support paging to all network or one BTS at one LAC
*/
if (data_length == 3 && data[0] == CELL_IDENT_LAC) {
lac = ntohs(read_data16(&data[1]));
lac = osmo_load16be(&data[1]);
} else if (data_length > 1 || (data[0] & 0x0f) != CELL_IDENT_BSS) {
LOGP(DMSC, LOGL_ERROR, "Unsupported Cell Identifier List: %s\n", osmo_hexdump(data, data_length));
return -1;
@ -321,7 +311,7 @@ static int bssmap_handle_assignm_req(struct osmo_bsc_sccp_con *conn,
goto reject;
}
conn->cic = ntohs(read_data16(TLVP_VAL(&tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE)));
conn->cic = osmo_load16be(TLVP_VAL(&tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE));
timeslot = conn->cic & 0x1f;
multiplex = (conn->cic & ~0x1f) >> 5;