paulmataruso/osmo-cbc
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-cbc.git synced 2025-11-03 05:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix encoding of CBSP cell identifiers

Browse Source 
We need to use the matching enum values if we actually want to
match correctly.  Before this patch, the Cell List Items in CBSP
were encoded wrongly.

Change-Id: Iea3e2a28573baaead308eb9c8475c6b8093d0b48
This commit is contained in:
Harald Welte
2021-02-20 20:04:21 +01:00
parent 1c3cfd2ccc
commit 3ae1a77bbc
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/smscb_peer_fsm.c
View File

@@ -149,25 +149,28 @@ static void cci_from_cbsp(struct cbc_cell_id *cci, enum CELL_IDENT id_discr,
static void cbsp_from_cci(union gsm0808_cell_id_u *u, const struct cbc_cell_id *cci)
{
switch (cci->id_discr) {
case CELL_IDENT_NO_CELL:
case CBC_CELL_ID_NONE:
break;
case CELL_IDENT_WHOLE_GLOBAL:
case CBC_CELL_ID_CGI:
u->global = cci->u.cgi;
printf("u->gobal: %s\n", osmo_hexdump((uint8_t *) &u->global, sizeof(u->global)));
break;
case CELL_IDENT_LAC_AND_CI:
case CBC_CELL_ID_LAC_CI:
u->lac_and_ci = cci->u.lac_and_ci;
break;
case CELL_IDENT_CI:
case CBC_CELL_ID_CI:
u->ci = cci->u.ci;
break;
case CELL_IDENT_LAI:
case CBC_CELL_ID_LAI:
u->lai_and_lac = cci->u.lai;
break;
case CELL_IDENT_LAC:
case CBC_CELL_ID_LAC:
u->lac = cci->u.lac;
break;
case CELL_IDENT_BSS:
case CBC_CELL_ID_BSS:
break;
default:
OSMO_ASSERT(0);
}
}