diff --git a/tools/ac-client/src/ACClientApp.cpp b/tools/ac-client/src/ACClientApp.cpp index 0d952e8cc1..f174f50ab6 100644 --- a/tools/ac-client/src/ACClientApp.cpp +++ b/tools/ac-client/src/ACClientApp.cpp @@ -113,8 +113,6 @@ ACClientApp::ACClientApp(int argc, char* argv[]) : connect(&domainHandler, SIGNAL(hostnameChanged(const QString&)), SLOT(domainChanged(const QString&))); // connect(&domainHandler, SIGNAL(resetting()), SLOT(resettingDomain())); - // connect(&domainHandler, SIGNAL(connectedToDomain(const QString&)), SLOT(updateWindowTitle())); - // connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle())); // connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(clearDomainOctreeDetails())); connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &ACClientApp::domainConnectionRefused); @@ -123,7 +121,7 @@ ACClientApp::ACClientApp(int argc, char* argv[]) : connect(nodeList.data(), &NodeList::nodeActivated, this, &ACClientApp::nodeActivated); // connect(nodeList.data(), &NodeList::uuidChanged, getMyAvatar(), &MyAvatar::setSessionUUID); // connect(nodeList.data(), &NodeList::uuidChanged, this, &ACClientApp::setSessionUUID); - // connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &ACClientApp::notifyPacketVersionMismatch); + connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &ACClientApp::notifyPacketVersionMismatch); nodeList->addSetOfNodeTypesToNodeInterestSet(NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer << NodeType::EntityServer << NodeType::AssetServer << NodeType::MessagesMixer); @@ -208,6 +206,13 @@ void ACClientApp::timedOut() { finish(1); } +void ACClientApp::notifyPacketVersionMismatch() { + if (_verbose) { + qDebug() << "packet version mismatch"; + } + finish(1); +} + void ACClientApp::finish(int exitCode) { auto nodeList = DependencyManager::get(); diff --git a/tools/ac-client/src/ACClientApp.h b/tools/ac-client/src/ACClientApp.h index 36de592401..f6c726dfbc 100644 --- a/tools/ac-client/src/ACClientApp.h +++ b/tools/ac-client/src/ACClientApp.h @@ -27,23 +27,19 @@ public: ACClientApp(int argc, char* argv[]); ~ACClientApp(); - const int stunFailureExitStatus { 1 }; - const int iceFailureExitStatus { 2 }; - const int domainPingExitStatus { 3 }; - private slots: void domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo); void domainChanged(const QString& domainHostname); void nodeAdded(SharedNodePointer node); void nodeActivated(SharedNodePointer node); void nodeKilled(SharedNodePointer node); + void notifyPacketVersionMismatch(); private: NodeList* _nodeList; void timedOut(); void finish(int exitCode); bool _verbose; - QTimer* _pingDomainTimer { nullptr }; bool _sawEntityServer { false }; bool _sawAudioMixer { false };