From 88b9b7468e3b8dc89f504dcc69b7ee9de2359174 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Sun, 27 Jun 2021 04:31:14 -0400 Subject: [PATCH] CR. --- assignment-client/src/AssignmentClient.cpp | 2 +- libraries/networking/src/NodeList.cpp | 2 +- libraries/networking/src/NodeList.h | 4 ++-- pkg-scripts/vircadia-assignment-client.service | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp index 8e44cdd157..29125fee6f 100644 --- a/assignment-client/src/AssignmentClient.cpp +++ b/assignment-client/src/AssignmentClient.cpp @@ -95,7 +95,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri qCDebug(assignment_client) << "Disabling domain port auto discovery by the assignment client due to parsed command line parameter."; } - nodeList->setDomainPortAutoDiscovery(_disableDomainPortAutoDiscovery); + nodeList->disableDomainPortAutoDiscovery(_disableDomainPortAutoDiscovery); qCDebug(assignment_client) << "Assignment server socket is" << _assignmentServerSocket; diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 41900d6130..3d28457633 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -377,7 +377,7 @@ void NodeList::sendDomainServerCheckIn() { // if so we need to make sure we have an up-to-date local port in case it restarted if ((domainSockAddr.getAddress() == QHostAddress::LocalHost || hostname == "localhost") - && _domainPortAutoDiscovery == true) { + && _domainPortAutoDiscovery == false) { quint16 domainPort = DEFAULT_DOMAIN_SERVER_PORT; getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, domainPort); diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h index 685b998269..9c47abbd9f 100644 --- a/libraries/networking/src/NodeList.h +++ b/libraries/networking/src/NodeList.h @@ -70,7 +70,7 @@ public: void setAssignmentServerSocket(const HifiSockAddr& serverSocket) { _assignmentServerSocket = serverSocket; } void sendAssignment(Assignment& assignment); - void setDomainPortAutoDiscovery(bool enabled = true) { _domainPortAutoDiscovery = enabled; }; + void disableDomainPortAutoDiscovery(bool disabled = false) { _domainPortAutoDiscovery = disabled; }; void setIsShuttingDown(bool isShuttingDown) { _isShuttingDown = isShuttingDown; } @@ -182,7 +182,7 @@ private: bool _requestsDomainListData { false }; bool _sendDomainServerCheckInEnabled { true }; - bool _domainPortAutoDiscovery { true }; + bool _domainPortAutoDiscovery { false }; mutable QReadWriteLock _ignoredSetLock; tbb::concurrent_unordered_set _ignoredNodeIDs; diff --git a/pkg-scripts/vircadia-assignment-client.service b/pkg-scripts/vircadia-assignment-client.service index c53fa5ddc7..d8b64be416 100644 --- a/pkg-scripts/vircadia-assignment-client.service +++ b/pkg-scripts/vircadia-assignment-client.service @@ -12,7 +12,7 @@ User=vircadia Group=vircadia #LimitCORE=infinity #ExecStart=/opt/vircadia/assignment-client -n 6 -ExecStart=/opt/vircadia/assignment-client --min 6 --max 20 --disable-domain-port-auto-discovery +ExecStart=/opt/vircadia/assignment-client --min 6 --max 20 [Install] WantedBy=multi-user.target