Change in libosmocore[master]: gsm: append_eutran_neib_cell: Fix SI2quater EARFCN list

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21712 )

Change subject: gsm: append_eutran_neib_cell: Fix SI2quater EARFCN list
......................................................................

gsm: append_eutran_neib_cell: Fix SI2quater EARFCN list

Commit bd6e7a9f2dd5d4e881a0a21ebdb29b7a76ebdc9a did the initial porting
of rest_octet APIs from osmo-bsc, but introduced a bug when moving
bts->e_offset to a generic pointer independent of bts structure.
As a result, using this API from osmo-bsc makes gsm0408 unit test fail
due to bad encoding of several EARFCNs in si2quater.

Fixes: bd6e7a9f2dd5d4e881a0a21ebdb29b7a76ebdc9a
Change-Id: I2bf5635b8536b11d69774d17ac1908019633e3af
---
M src/gsm/gsm48_rest_octets.c
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c
index 5c7d77a..1f9c2b5 100644
--- a/src/gsm/gsm48_rest_octets.c
+++ b/src/gsm/gsm48_rest_octets.c
@@ -64,6 +64,7 @@
 					   uint8_t budget)
 {
 	unsigned i, skip = 0;
+	size_t offset = *e_offset;
 	int16_t rem = budget - 6; /* account for mandatory stop bit and THRESH_E-UTRAN_high */
 	uint8_t earfcn_budget;
 
@@ -94,7 +95,7 @@
 	/* now we can proceed with actually adding EARFCNs within adjusted budget limit */
 	for (i = 0; i < e->length; i++) {
 		if (e->arfcn[i] != OSMO_EARFCN_INVALID) {
-			if (skip < *e_offset) {
+			if (skip < offset) {
 				skip++; /* ignore EARFCNs added on previous calls */
 			} else {
 				earfcn_budget = 17; /* compute budget per-EARFCN */

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2bf5635b8536b11d69774d17ac1908019633e3af
Gerrit-Change-Number: 21712
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201215/e1f7a3a8/attachment.htm>