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

CR.

Browse source
This commit is contained in:
Kalila L 2021-06-27 04:31:14 -04:00
parent a217f80ee3
commit 88b9b7468e
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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."; 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; qCDebug(assignment_client) << "Assignment server socket is" << _assignmentServerSocket;

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 == true) { && _domainPortAutoDiscovery == false) {
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

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

2
pkg-scripts/vircadia-assignment-client.service
View file

@ -12,7 +12,7 @@ User=vircadia
Group=vircadia Group=vircadia
#LimitCORE=infinity #LimitCORE=infinity
#ExecStart=/opt/vircadia/assignment-client -n 6 #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] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target