Change in osmo-cbc[master]: fix encoding of CBSP cell identifiers

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Sat Feb 20 19:08:55 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23011 )

Change subject: fix encoding of CBSP cell identifiers
......................................................................

fix encoding of CBSP cell identifiers

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
---
M src/smscb_peer_fsm.c
1 file changed, 10 insertions(+), 7 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c
index 341c205..4e431ff 100644
--- a/src/smscb_peer_fsm.c
+++ b/src/smscb_peer_fsm.c
@@ -149,25 +149,28 @@
 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);
 	}
 }
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23011
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: Iea3e2a28573baaead308eb9c8475c6b8093d0b48
Gerrit-Change-Number: 23011
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210220/b9b4f014/attachment.htm>


More information about the gerrit-log mailing list