Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-12 14:22:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

actually process the connection denied packets

Browse source
This commit is contained in:
Stephen Birarda 2016-02-23 15:00:42 -08:00
parent 42582e5d0f
commit bb561e98d0
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,7 +94,7 @@ void DomainHandler::softReset() {
clearSettings(); clearSettings();
_connectionDenialsSinceKeypairRegen = 0; _connectionDenialsSinceKeypairRegen = 0;
// cancel the failure timeout for any pending requests for settings // cancel the failure timeout for any pending requests for settings
QMetaObject::invokeMethod(&_settingsTimer, "stop"); QMetaObject::invokeMethod(&_settingsTimer, "stop");
} }
@ -107,7 +107,9 @@ void DomainHandler::hardReset() {
_iceServerSockAddr = HifiSockAddr(); _iceServerSockAddr = HifiSockAddr();
_hostname = QString(); _hostname = QString();
_sockAddr.clear(); _sockAddr.clear();
_hasCheckedForAccessToken = false; _hasCheckedForAccessToken = false;
_domainConnectionRefusals.clear();
// clear any pending path we may have wanted to ask the previous DS about // clear any pending path we may have wanted to ask the previous DS about
_pendingPath.clear(); _pendingPath.clear();
@ -369,7 +371,7 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer<Rec
auto& accountManager = AccountManager::getInstance(); auto& accountManager = AccountManager::getInstance();
if (_hasCheckedForAccessToken) { if (!_hasCheckedForAccessToken) {
accountManager.checkAndSignalForAccessToken(); accountManager.checkAndSignalForAccessToken();
_hasCheckedForAccessToken = true; _hasCheckedForAccessToken = true;
} }

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

@ -110,6 +110,7 @@ NodeList::NodeList(char newOwnerType, unsigned short socketListenPort, unsigned
packetReceiver.registerListener(PacketType::ICEPing, this, "processICEPingPacket"); packetReceiver.registerListener(PacketType::ICEPing, this, "processICEPingPacket");
packetReceiver.registerListener(PacketType::DomainServerAddedNode, this, "processDomainServerAddedNode"); packetReceiver.registerListener(PacketType::DomainServerAddedNode, this, "processDomainServerAddedNode");
packetReceiver.registerListener(PacketType::DomainServerConnectionToken, this, "processDomainServerConnectionTokenPacket"); packetReceiver.registerListener(PacketType::DomainServerConnectionToken, this, "processDomainServerConnectionTokenPacket");
packetReceiver.registerListener(PacketType::DomainConnectionDenied, &_domainHandler, "processDomainServerConnectionDeniedPacket");
packetReceiver.registerListener(PacketType::DomainSettings, &_domainHandler, "processSettingsPacketList"); packetReceiver.registerListener(PacketType::DomainSettings, &_domainHandler, "processSettingsPacketList");
packetReceiver.registerListener(PacketType::ICEServerPeerInformation, &_domainHandler, "processICEResponsePacket"); packetReceiver.registerListener(PacketType::ICEServerPeerInformation, &_domainHandler, "processICEResponsePacket");
packetReceiver.registerListener(PacketType::DomainServerRequireDTLS, &_domainHandler, "processDTLSRequirementPacket"); packetReceiver.registerListener(PacketType::DomainServerRequireDTLS, &_domainHandler, "processDTLSRequirementPacket");