paulmataruso/openbts
1
0
Fork 0
mirror of https://github.com/RangeNetworks/openbts.git synced 2025-10-23 07:42:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes for potential bugs in peering that were extremely unlikely ever to occur.

Browse Source
This commit is contained in:
pat
2014-10-19 07:48:46 -07:00
committed by Michael Iedema
parent a716ed66c0
commit 0490bbaef4
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GSM/GSMChannelHistory.cpp
View File

@@ -198,7 +198,7 @@ bool ChannelHistory::neighborAddMeasurements(SACCHLogicalChannel* SACCH,const L3
int thisBSCI = measurements->BSIC_NCELL(i); int thisBSCI = measurements->BSIC_NCELL(i);
int arfcn = gNeighborTable.getARFCN(thisFreq); int arfcn = gNeighborTable.getARFCN(thisFreq);
if (arfcn < 0) { if (arfcn < 0) {
LOG(INFO) << "Measurement report with invalid freq index:" << thisFreq << " arfcn:" << arfcn; // SVGDBG seeing this error LOG(INFO) << "Measurement report with invalid freq index:" << thisFreq << " arfcn:" << arfcn; // SVGDBG seeing this error (pat) Maybe fixed 10-17-2014 by ticket #1915
continue; continue;
} }
this->neighborAddMeasurement(sampleTime.FN(),(unsigned)arfcn,thisBSCI,thisRxLevel); this->neighborAddMeasurement(sampleTime.FN(),(unsigned)arfcn,thisBSCI,thisRxLevel);

2
Peering/NeighborTable.cpp
View File

@@ -329,6 +329,7 @@ bool NeighborTable::ntAddInfo(NeighborEntry &newentry)
NeighborTableMap::iterator mit = mNeighborMap.find(newentry.mIPAddress); NeighborTableMap::iterator mit = mNeighborMap.find(newentry.mIPAddress);
if (mit == mNeighborMap.end()) { if (mit == mNeighborMap.end()) {
LOG(NOTICE) << "Ignoring unsolicited 'RSP NEIGHBOR_PARAMS' from " << newentry.mIPAddress; LOG(NOTICE) << "Ignoring unsolicited 'RSP NEIGHBOR_PARAMS' from " << newentry.mIPAddress;
return false; // (pat) Added 10-17-2014. Oops.
} }
NeighborEntry &oldentry = mit->second; NeighborEntry &oldentry = mit->second;
// (pat) Added test to see if C0 or BCC changed. That would not change the beacon but we need to recheck for conflicts // (pat) Added test to see if C0 or BCC changed. That would not change the beacon but we need to recheck for conflicts
@@ -498,6 +499,7 @@ void NeighborTable::setHoldOff(string ipaddress, unsigned seconds)
NeighborTableMap::iterator mit = mNeighborMap.find(ipaddress); NeighborTableMap::iterator mit = mNeighborMap.find(ipaddress);
if (mit == mNeighborMap.end()) { if (mit == mNeighborMap.end()) {
LOG(NOTICE) << "Can not set holdoff for unknown IP address:"<<ipaddress; LOG(NOTICE) << "Can not set holdoff for unknown IP address:"<<ipaddress;
return; // (pat) Added 10-17-2014. Oops.
} }
NeighborEntry &entry = mit->second; NeighborEntry &entry = mit->second;
entry.mHoldoff = time(NULL) + seconds; entry.mHoldoff = time(NULL) + seconds;