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

more command-line arguments

Browse source
This commit is contained in:
Seth Alves 2016-09-16 13:51:33 -07:00
parent 6231fc4ba1
commit d3dc0698a5
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tools/ice-client/src/ICEClientApp.cpp
View file

@ -33,6 +33,10 @@ ICEClientApp::ICEClientApp(int argc, char* argv[]) : QCoreApplication(argc, argv
const QCommandLineOption howManyTimesOption("n", "how many times to cycle", "0"); const QCommandLineOption howManyTimesOption("n", "how many times to cycle", "0");
parser.addOption(howManyTimesOption); parser.addOption(howManyTimesOption);
const QCommandLineOption domainIDOption("d", "domain-server uuid");
parser.addOption(domainIDOption);
if (!parser.parse(QCoreApplication::arguments())) { if (!parser.parse(QCoreApplication::arguments())) {
qCritical() << parser.errorText() << endl; qCritical() << parser.errorText() << endl;
parser.showHelp(); parser.showHelp();
@ -50,6 +54,11 @@ ICEClientApp::ICEClientApp(int argc, char* argv[]) : QCoreApplication(argc, argv
_actionMax = parser.value(howManyTimesOption).toInt(); _actionMax = parser.value(howManyTimesOption).toInt();
} }
if (parser.isSet(domainIDOption)) {
_domainID = QUuid(parser.value(howManyTimesOption));
}
_iceServerAddr = HifiSockAddr("127.0.0.1", ICE_SERVER_DEFAULT_PORT); _iceServerAddr = HifiSockAddr("127.0.0.1", ICE_SERVER_DEFAULT_PORT);
if (parser.isSet(iceServerAddressOption)) { if (parser.isSet(iceServerAddressOption)) {
// parse the IP and port combination for this target // parse the IP and port combination for this target
@ -97,12 +106,21 @@ void ICEClientApp::doSomething() {
_localSockAddr = HifiSockAddr("127.0.0.1", _socket->localPort()); _localSockAddr = HifiSockAddr("127.0.0.1", _socket->localPort());
_publicSockAddr = HifiSockAddr("127.0.0.1", _socket->localPort()); _publicSockAddr = HifiSockAddr("127.0.0.1", _socket->localPort());
QUuid peerID = QUuid("75cd162a-53dc-4292-aaa5-1304ab1bb0f2"); // QUuid peerID = QUuid("75cd162a-53dc-4292-aaa5-1304ab1bb0f2");
QUuid peerID;
if (_domainID == QUuid()) {
// pick a random domain-id
peerID = QUuid::createUuid();
_state = 2;
} else {
// use the domain UUID given on the command-line
peerID = _domainID;
_state = 1;
}
_sessionUUID = QUuid::createUuid(); _sessionUUID = QUuid::createUuid();
sendPacketToIceServer(PacketType::ICEServerQuery, _iceServerAddr, _sessionUUID, peerID); sendPacketToIceServer(PacketType::ICEServerQuery, _iceServerAddr, _sessionUUID, peerID);
_state = 1;
_actionCount++; _actionCount++;
} else if (_state == 2) { } else if (_state == 2) {
_state = 3; _state = 3;

1
tools/ice-client/src/ICEClientApp.h
View file

@ -39,6 +39,7 @@ private:
unsigned int _actionMax { 0 }; unsigned int _actionMax { 0 };
QUuid _sessionUUID; QUuid _sessionUUID;
QUuid _domainID;
QTimer* _pingDomainTimer { nullptr }; QTimer* _pingDomainTimer { nullptr };