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

fix for connection denied packet in Application

Browse source
This commit is contained in:
Stephen Birarda 2015-07-10 17:52:51 -07:00
parent d85fbbfb74
commit 9ee62a8a38
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
interface/src/Application.cpp
View file

@ -3815,16 +3815,8 @@ void Application::domainChanged(const QString& domainHostname) {
_domainConnectionRefusals.clear(); _domainConnectionRefusals.clear();
} }
void Application::domainConnectionDenied(const QString& reason) { void Application::handleDomainConnectionDeniedPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) {
if (!_domainConnectionRefusals.contains(reason)) { QDataStream packetStream(packet.data());
_domainConnectionRefusals.append(reason);
emit domainConnectionRefused(reason);
}
}
void Application::handleDomainConnectionDeniedPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode, HifiSockAddr senderSockAddr) {
int headerSize = numBytesForPacketHeaderGivenPacketType(PacketType::DomainConnectionDenied);
QDataStream packetStream(QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader()));
QString reason; QString reason;
packetStream >> reason; packetStream >> reason;
@ -3833,7 +3825,12 @@ void Application::handleDomainConnectionDeniedPacket(QSharedPointer<NLPacket> pa
// and check and signal for an access token so that we can make sure they are logged in // and check and signal for an access token so that we can make sure they are logged in
qCDebug(interfaceapp) << "The domain-server denied a connection request: " << reason; qCDebug(interfaceapp) << "The domain-server denied a connection request: " << reason;
qCDebug(interfaceapp) << "You may need to re-log to generate a keypair so you can provide a username signature."; qCDebug(interfaceapp) << "You may need to re-log to generate a keypair so you can provide a username signature.";
domainConnectionDenied(reason);
if (!_domainConnectionRefusals.contains(reason)) {
_domainConnectionRefusals.append(reason);
emit domainConnectionRefused(reason);
}
AccountManager::getInstance().checkAndSignalForAccessToken(); AccountManager::getInstance().checkAndSignalForAccessToken();
} }

3
interface/src/Application.h
View file

@ -443,8 +443,7 @@ public slots:
void notifyPacketVersionMismatch(); void notifyPacketVersionMismatch();
void domainConnectionDenied(const QString& reason); void handleDomainConnectionDeniedPacket(QSharedPointer<NLPacket>, SharedNodePointer senderNode);
void handleDomainConnectionDeniedPacket(QSharedPointer<NLPacket>, SharedNodePointer senderNode, HifiSockAddr senderSockAddr);
void cameraMenuChanged(); void cameraMenuChanged();