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

Merge pull request #13045 from SimonWalton-HiFi/domain-checkins-tweak

Browse source 
Reset pending domain check-in count more frequently
This commit is contained in:
Stephen Birarda 2018-05-11 13:31:03 -07:00 committed by GitHub
commit 4f7ce7345d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/networking/src/DomainHandler.h
View file

@ -97,7 +97,7 @@ public:
int getCheckInPacketsSinceLastReply() const { return _checkInPacketsSinceLastReply; } int getCheckInPacketsSinceLastReply() const { return _checkInPacketsSinceLastReply; }
void sentCheckInPacket(); void sentCheckInPacket();
void domainListReceived() { _checkInPacketsSinceLastReply = 0; } void clearPendingCheckins() { _checkInPacketsSinceLastReply = 0; }
/**jsdoc /**jsdoc
* <p>The reasons that you may be refused connection to a domain are defined by numeric values:</p> * <p>The reasons that you may be refused connection to a domain are defined by numeric values:</p>

4
libraries/networking/src/NodeList.cpp
View file

@ -594,6 +594,8 @@ void NodeList::processDomainServerConnectionTokenPacket(QSharedPointer<ReceivedM
} }
// read in the connection token from the packet, then send domain-server checkin // read in the connection token from the packet, then send domain-server checkin
_domainHandler.setConnectionToken(QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID))); _domainHandler.setConnectionToken(QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID)));
_domainHandler.clearPendingCheckins();
sendDomainServerCheckIn(); sendDomainServerCheckIn();
} }
@ -605,7 +607,7 @@ void NodeList::processDomainServerList(QSharedPointer<ReceivedMessage> message)
} }
// this is a packet from the domain server, reset the count of un-replied check-ins // this is a packet from the domain server, reset the count of un-replied check-ins
_domainHandler.domainListReceived(); _domainHandler.clearPendingCheckins();
// emit our signal so listeners know we just heard from the DS // emit our signal so listeners know we just heard from the DS
emit receivedDomainServerList(); emit receivedDomainServerList();