Change in ...osmo-bts[master]: pcu_sock: fix endian-swapped CellID

osmith gerrit-no-reply at lists.osmocom.org
Thu Aug 29 12:36:29 UTC 2019


osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15326


Change subject: pcu_sock: fix endian-swapped CellID
......................................................................

pcu_sock: fix endian-swapped CellID

Restore the correct endianness of the cell identity stored in the system
information type 3 struct, just like we do it with the location area
code.

In the Osmocom stack, the CellID is configured in OsmoBSC, sent via RSL
to OsmoBTS, then with a socket to OsmoPCU. OsmoBTS was always sending
the swapped CellID to OsmoPCU. In March 2018, a regression in OsmoPCU
([1]) caused it to swap the CellID again, by chance resulting in the
correct value sent from OsmoBSC. This regression was fixed in March
2019 ([2]).

I've verified this fix with a TTCN3 test [3].

[1] I787fed84a7b613158a5618dd5cffafe4e4927234 (osmo-pcu)
[2] I2f6cc930c5dbf8dac386b24b0756df2efe8199e4 (osmo-pcu)
[3] I6516808f4b9e9a2301f9ccc1e55ded14e7334c33 (osmo-ttcn3-hacks)

Related: OS#3854
Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262
---
M src/common/pcu_sock.c
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/26/15326/1

diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 36cc6ed..84a98f5 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -259,7 +259,7 @@
 						bts->si_buf[SYSINFO_TYPE_3];
 		osmo_plmn_from_bcd(si3->lai.digits, &net->plmn);
 		bts->location_area_code = ntohs(si3->lai.lac);
-		bts->cell_identity = si3->cell_identity;
+		bts->cell_identity = ntohs(si3->cell_identity);
 		avail_lai = 1;
 		break;
 	case S_NEW_NSE_ATTR:

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I68faf4558f0686fb2a3db24077dceaae05bf0262
Gerrit-Change-Number: 15326
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190829/20380160/attachment.html>


More information about the gerrit-log mailing list