Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 12:26:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply suggestions from code review

Browse source 
Co-authored-by: Heather Anderson <heath@odysseus.anderson.name>
This commit is contained in:
Kalila 2021-08-12 23:01:13 -04:00 committed by GitHub
parent 35948d7467
commit 019e012f2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/AssignmentClient.cpp
View file

@ -91,7 +91,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
_assignmentServerSocket.setObjectName("AssignmentServer"); _assignmentServerSocket.setObjectName("AssignmentServer");
nodeList->setAssignmentServerSocket(_assignmentServerSocket); nodeList->setAssignmentServerSocket(_assignmentServerSocket);
if (disableDomainPortAutoDiscovery == true) { if (disableDomainPortAutoDiscovery) {
_disableDomainPortAutoDiscovery = disableDomainPortAutoDiscovery; _disableDomainPortAutoDiscovery = disableDomainPortAutoDiscovery;
qCDebug(assignment_client) << "Disabling domain port auto discovery by the assignment client due to parsed command line parameter."; qCDebug(assignment_client) << "Disabling domain port auto discovery by the assignment client due to parsed command line parameter.";
} }

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

@ -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 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") if ((domainSockAddr.getAddress() == QHostAddress::LocalHost || hostname == "localhost")
&& _domainPortAutoDiscovery == false) { && _domainPortAutoDiscovery) {
quint16 domainPort = DEFAULT_DOMAIN_SERVER_PORT; quint16 domainPort = DEFAULT_DOMAIN_SERVER_PORT;
getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, domainPort); getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, domainPort);

4
libraries/networking/src/NodeList.h
View file

@ -71,7 +71,7 @@ public:
void setAssignmentServerSocket(const SockAddr& serverSocket) { _assignmentServerSocket = serverSocket; } void setAssignmentServerSocket(const SockAddr& serverSocket) { _assignmentServerSocket = serverSocket; }
void sendAssignment(Assignment& assignment); void sendAssignment(Assignment& assignment);
void disableDomainPortAutoDiscovery(bool disabled = false) { _domainPortAutoDiscovery = disabled; }; void disableDomainPortAutoDiscovery(bool disabled = false) { _domainPortAutoDiscovery = !disabled; };
void setIsShuttingDown(bool isShuttingDown) { _isShuttingDown = isShuttingDown; } void setIsShuttingDown(bool isShuttingDown) { _isShuttingDown = isShuttingDown; }
@ -183,7 +183,7 @@ private:
bool _requestsDomainListData { false }; bool _requestsDomainListData { false };
bool _sendDomainServerCheckInEnabled { true }; bool _sendDomainServerCheckInEnabled { true };
bool _domainPortAutoDiscovery { false }; bool _domainPortAutoDiscovery { true };
mutable QReadWriteLock _ignoredSetLock; mutable QReadWriteLock _ignoredSetLock;
tbb::concurrent_unordered_set<QUuid, UUIDHasher> _ignoredNodeIDs; tbb::concurrent_unordered_set<QUuid, UUIDHasher> _ignoredNodeIDs;