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

check for hard refusal to 404

Browse source
This commit is contained in:
Wayne Chen 2018-10-01 10:06:13 -07:00
parent eab57633a5
commit 5f05be554f
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -139,6 +139,11 @@ void DomainHandler::hardReset() {
_pendingPath.clear(); _pendingPath.clear();
} }
bool DomainHandler::isHardRefusal(int reasonCode) {
return (reasonCode == (int)ConnectionRefusedReason::ProtocolMismatch || reasonCode == (int)ConnectionRefusedReason::NotAuthorized ||
reasonCode == (int)ConnectionRefusedReason::TimedOut);
}
bool DomainHandler::getInterstitialModeEnabled() const { bool DomainHandler::getInterstitialModeEnabled() const {
return _interstitialModeSettingLock.resultWithReadLock<bool>([&] { return _interstitialModeSettingLock.resultWithReadLock<bool>([&] {
return _enableInterstitialMode.get(); return _enableInterstitialMode.get();
@ -360,7 +365,7 @@ void DomainHandler::loadedErrorDomain(std::map<QString, QString> namedPaths) {
void DomainHandler::setRedirectErrorState(QUrl errorUrl, QString reasonMessage, int reasonCode, const QString& extraInfo) { void DomainHandler::setRedirectErrorState(QUrl errorUrl, QString reasonMessage, int reasonCode, const QString& extraInfo) {
_lastDomainConnectionError = reasonCode; _lastDomainConnectionError = reasonCode;
if (getInterstitialModeEnabled()) { if (getInterstitialModeEnabled() && isHardRefusal(reasonCode)) {
_errorDomainURL = errorUrl; _errorDomainURL = errorUrl;
_isInErrorState = true; _isInErrorState = true;
qCDebug(networking) << "Error connecting to domain: " << reasonMessage; qCDebug(networking) << "Error connecting to domain: " << reasonMessage;

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

@ -212,6 +212,8 @@ private:
void sendDisconnectPacket(); void sendDisconnectPacket();
void hardReset(); void hardReset();
bool isHardRefusal(int reasonCode);
QUuid _uuid; QUuid _uuid;
Node::LocalID _localID; Node::LocalID _localID;
QUrl _domainURL; QUrl _domainURL;