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

Merge pull request #8077 from birarda/api-recheck-on-fail

Browse source 
clear domain connection refusals on hard reset only
This commit is contained in:
Clément Brisset 2016-06-15 10:24:39 -07:00 committed by GitHub
commit 6ed972257f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/networking/src/DomainHandler.cpp
View file

@ -97,7 +97,6 @@ void DomainHandler::softReset() {
clearSettings(); clearSettings();
_domainConnectionRefusals.clear();
_connectionDenialsSinceKeypairRegen = 0; _connectionDenialsSinceKeypairRegen = 0;
// cancel the failure timeout for any pending requests for settings // cancel the failure timeout for any pending requests for settings
@ -119,6 +118,7 @@ void DomainHandler::hardReset() {
_sockAddr.clear(); _sockAddr.clear();
_hasSignalledProtocolMismatch = false; _hasSignalledProtocolMismatch = false;
_domainConnectionRefusals.clear();
_hasCheckedForAccessToken = false; _hasCheckedForAccessToken = false;
@ -408,6 +408,7 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer<Rec
qCWarning(networking) << "The domain-server denied a connection request: " << reasonMessage; qCWarning(networking) << "The domain-server denied a connection request: " << reasonMessage;
if (!_domainConnectionRefusals.contains(reasonCode)) { if (!_domainConnectionRefusals.contains(reasonCode)) {
_domainConnectionRefusals.append(reasonCode); _domainConnectionRefusals.append(reasonCode);
bool shouldSignal = true; bool shouldSignal = true;