Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 18:56:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

change new Node flag to isForcedNeverSilent

Browse source
This commit is contained in:
Stephen Birarda 2017-06-14 17:20:37 -07:00
parent 747cca9beb
commit 10649c8f6e
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/src/DomainServer.cpp
View file

@ -2267,7 +2267,7 @@ void DomainServer::updateDownstreamNodes() {
// manually add the downstream node to our node list // manually add the downstream node to our node list
auto node = nodeList->addOrUpdateNode(QUuid::createUuid(), downstreamNodeType, auto node = nodeList->addOrUpdateNode(QUuid::createUuid(), downstreamNodeType,
downstreamServerAddr, downstreamServerAddr); downstreamServerAddr, downstreamServerAddr);
node->setIsForcedAlive(true); node->setIsForcedNeverSilent(true);
qDebug() << "Adding downstream node:" << node->getUUID() << downstreamServerAddr; qDebug() << "Adding downstream node:" << node->getUUID() << downstreamServerAddr;

2
libraries/networking/src/LimitedNodeList.cpp
View file

@ -749,7 +749,7 @@ void LimitedNodeList::removeSilentNodes() {
SharedNodePointer node = it->second; SharedNodePointer node = it->second;
node->getMutex().lock(); node->getMutex().lock();
if (!node->isForcedAlive() if (!node->isForcedNeverSilent()
&& (usecTimestampNow() - node->getLastHeardMicrostamp()) > (NODE_SILENCE_THRESHOLD_MSECS * USECS_PER_MSEC)) { && (usecTimestampNow() - node->getLastHeardMicrostamp()) > (NODE_SILENCE_THRESHOLD_MSECS * USECS_PER_MSEC)) {
// call the NodeHash erase to get rid of this node // call the NodeHash erase to get rid of this node
it = _nodeHash.unsafe_erase(it); it = _nodeHash.unsafe_erase(it);

6
libraries/networking/src/NetworkPeer.h
View file

@ -76,8 +76,8 @@ public:
float getOutboundBandwidth() const; // in kbps float getOutboundBandwidth() const; // in kbps
float getInboundBandwidth() const; // in kbps float getInboundBandwidth() const; // in kbps
bool isForcedAlive() const { return _isForcedAlive; } bool isForcedNeverSilent() const { return _isForcedNeverSilent; }
void setIsForcedAlive(bool isForcedAlive) { _isForcedAlive = isForcedAlive; } void setIsForcedNeverSilent(bool isForcedNeverSilent) { _isForcedNeverSilent = isForcedNeverSilent; }
friend QDataStream& operator<<(QDataStream& out, const NetworkPeer& peer); friend QDataStream& operator<<(QDataStream& out, const NetworkPeer& peer);
friend QDataStream& operator>>(QDataStream& in, NetworkPeer& peer); friend QDataStream& operator>>(QDataStream& in, NetworkPeer& peer);
@ -107,7 +107,7 @@ protected:
int _connectionAttempts; int _connectionAttempts;
bool _isForcedAlive { false }; bool _isForcedNeverSilent { false };
}; };
QDebug operator<<(QDebug debug, const NetworkPeer &peer); QDebug operator<<(QDebug debug, const NetworkPeer &peer);