Change in osmo-bsc[master]: fix wrong ARFCNs in local-cell neighbor config

[neels]

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23784 )


Change subject: fix wrong ARFCNs in local-cell neighbor config
......................................................................

fix wrong ARFCNs in local-cell neighbor config

For neighbors configured without explicit ARFCN+BSIC ('neighbor bts N',
'neighbor lac-ci N M', ...), actually use the local neighbor cell's
ARFCN.

So far the code looked correct on first sight, but passed an unused part
of the struct neighbor union, always resulting in ARFCN 0.

Related: SYS#5367
Change-Id: Ifb54d9a91e9bca032c721f12c873c6216733e7b1
---
M src/osmo-bsc/system_information.c
1 file changed, 5 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/23784/1

diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c
index 0dbf53c..7ec613c 100644
--- a/src/osmo-bsc/system_information.c
+++ b/src/osmo-bsc/system_information.c
@@ -673,12 +673,14 @@
 					bitvec_set_bit_pos(bv, n->cell_id.ab.arfcn, 1);
 				} else {
 					struct gsm_bts *neigh_bts;
-					if (resolve_local_neighbor(&neigh_bts, bts, n) == 0)
-						bitvec_set_bit_pos(bv, n->cell_id.ab.arfcn, 1);
-					else
+					if (resolve_local_neighbor(&neigh_bts, bts, n)) {
 						LOGP(DHO, LOGL_ERROR,
 						     "Neither local nor remote neighbor: BTS %u -> %s\n",
 						     bts->nr, neighbor_to_str_c(OTC_SELECT, n));
+						continue;
+					}
+					if (neigh_bts->c0)
+						bitvec_set_bit_pos(bv, neigh_bts->c0->arfcn, 1);
 				}
 			}
 		}

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ifb54d9a91e9bca032c721f12c873c6216733e7b1
Gerrit-Change-Number: 23784
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210418/76453a3a/attachment.htm>