History

Add disable domain port auto discovery by assignment client option.

Kalila L committed 5 years ago

Commit 2d4da7b1 parent 78ab7a68 files · +62 −31Browse files

Showing the changes to assignment-client/src/AssignmentClientMonitor.cpp (1 of 8 files). Show all

Unified · Split

assignment-client/src/AssignmentClientMonitor.cpp+9−3
@@ -4,6 +4,7 @@ · 3 unmodified lines
4//4//
5// Created by Stephen Birarda on 1/10/2014.5// Created by Stephen Birarda on 1/10/2014.
6// Copyright 2014 High Fidelity, Inc.6// Copyright 2014 High Fidelity, Inc.
7// Copyright 2021 Vircadia contributors.
7//8//
8// Distributed under the Apache License, Version 2.0.9// Distributed under the Apache License, Version 2.0.
9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html10// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -41,7 +42,8 @@ AssignmentClientMonitor::AssignmentClientMonitor(const unsigned int numAssignmen · 31 unmodified lines
41 const unsigned int maxAssignmentClientForks,42 const unsigned int maxAssignmentClientForks,
42 Assignment::Type requestAssignmentType, QString assignmentPool,43 Assignment::Type requestAssignmentType, QString assignmentPool,
43 quint16 listenPort, quint16 childMinListenPort, QUuid walletUUID, QString assignmentServerHostname,44 quint16 listenPort, quint16 childMinListenPort, QUuid walletUUID, QString assignmentServerHostname,
44 quint16 assignmentServerPort, quint16 httpStatusServerPort, QString logDirectory) :45 quint16 assignmentServerPort, quint16 httpStatusServerPort, QString logDirectory,
46 bool disableDomainPortAutoDiscovery) :
45 _httpManager(QHostAddress::LocalHost, httpStatusServerPort, "", this),47 _httpManager(QHostAddress::LocalHost, httpStatusServerPort, "", this),
46 _numAssignmentClientForks(numAssignmentClientForks),48 _numAssignmentClientForks(numAssignmentClientForks),
47 _minAssignmentClientForks(minAssignmentClientForks),49 _minAssignmentClientForks(minAssignmentClientForks),
@@ -51,7 +53,8 @@ AssignmentClientMonitor::AssignmentClientMonitor(const unsigned int numAssignmen · 3 unmodified lines
51 _walletUUID(walletUUID),53 _walletUUID(walletUUID),
52 _assignmentServerHostname(assignmentServerHostname),54 _assignmentServerHostname(assignmentServerHostname),
53 _assignmentServerPort(assignmentServerPort),55 _assignmentServerPort(assignmentServerPort),
54 _childMinListenPort(childMinListenPort)56 _childMinListenPort(childMinListenPort),
57 _disableDomainPortAutoDiscovery(disableDomainPortAutoDiscovery)
55{58{
56 qDebug() << "_requestAssignmentType =" << _requestAssignmentType;59 qDebug() << "_requestAssignmentType =" << _requestAssignmentType;
57 60
@@ -198,6 +201,9 @@ void AssignmentClientMonitor::spawnChildClient() { · 140 unmodified lines
198 _childArguments.append("--" + ASSIGNMENT_TYPE_OVERRIDE_OPTION);201 _childArguments.append("--" + ASSIGNMENT_TYPE_OVERRIDE_OPTION);
199 _childArguments.append(QString::number(_requestAssignmentType));202 _childArguments.append(QString::number(_requestAssignmentType));
200 }203 }
204 if (_disableDomainPortAutoDiscovery != false) {
205 _childArguments.append("--" + ASSIGNMENT_DISABLE_DOMAIN_AUTO_PORT_DISCOVERY);
206 }
201 207
202 if (listenPort) {208 if (listenPort) {
203 _childArguments.append("-" + ASSIGNMENT_CLIENT_LISTEN_PORT_OPTION);209 _childArguments.append("-" + ASSIGNMENT_CLIENT_LISTEN_PORT_OPTION);
@@ -266,7 +272,7 @@ void AssignmentClientMonitor::spawnChildClient() { · 62 unmodified lines
266 stderrPath = stderrPathTemp;272 stderrPath = stderrPathTemp;
267 stderrFilename = stderrFilenameTemp;273 stderrFilename = stderrFilenameTemp;
268 }274 }
269 275
270 qDebug() << "Child stdout being written to: " << stdoutFilename;276 qDebug() << "Child stdout being written to: " << stdoutFilename;
271 qDebug() << "Child stderr being written to: " << stderrFilename;277 qDebug() << "Child stderr being written to: " << stderrFilename;
272 }278 }