History

Merge branch 'master' into fix/cmdline-discovery

Kalila committed 5 years ago

Commit 35948d72 parents 241c549 42ffb57179 files · +2542 −1229Browse files

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

Unified · Split

assignment-client/src/AssignmentClient.cpp+4−3
@@ -4,6 +4,7 @@ · 3 unmodified lines
4//4//
5// Created by Stephen Birarda on 11/25/2013.5// Created by Stephen Birarda on 11/25/2013.
6// Copyright 2013 High Fidelity, Inc.6// Copyright 2013 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
@@ -83,7 +84,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri · 73 unmodified lines
83 _assignmentServerHostname = assignmentServerHostname;84 _assignmentServerHostname = assignmentServerHostname;
84 }85 }
85 86
86 _assignmentServerSocket = HifiSockAddr(_assignmentServerHostname, assignmentServerPort, true);87 _assignmentServerSocket = SockAddr(_assignmentServerHostname, assignmentServerPort, true);
87 if (_assignmentServerSocket.isNull()) {88 if (_assignmentServerSocket.isNull()) {
88 qCCritical(assignment_client) << "PAGE: Couldn't resolve domain server address" << _assignmentServerHostname;89 qCCritical(assignment_client) << "PAGE: Couldn't resolve domain server address" << _assignmentServerHostname;
89 }90 }
@@ -118,7 +119,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri · 28 unmodified lines
118 119
119 // did we get an assignment-client monitor port?120 // did we get an assignment-client monitor port?
120 if (assignmentMonitorPort > 0) {121 if (assignmentMonitorPort > 0) {
121 _assignmentClientMonitorSocket = HifiSockAddr(DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME, assignmentMonitorPort);122 _assignmentClientMonitorSocket = SockAddr(DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME, assignmentMonitorPort);
122 _assignmentClientMonitorSocket.setObjectName("AssignmentClientMonitor");123 _assignmentClientMonitorSocket.setObjectName("AssignmentClientMonitor");
123 124
124 qCDebug(assignment_client) << "Assignment-client monitor socket is" << _assignmentClientMonitorSocket;125 qCDebug(assignment_client) << "Assignment-client monitor socket is" << _assignmentClientMonitorSocket;
@@ -277,7 +278,7 @@ void AssignmentClient::handleCreateAssignmentPacket(QSharedPointer<ReceivedMessa · 152 unmodified lines
277}278}
278 279
279void AssignmentClient::handleStopNodePacket(QSharedPointer<ReceivedMessage> message) {280void AssignmentClient::handleStopNodePacket(QSharedPointer<ReceivedMessage> message) {
280 const HifiSockAddr& senderSockAddr = message->getSenderSockAddr();281 const SockAddr& senderSockAddr = message->getSenderSockAddr();
281 282
282 if (senderSockAddr.getAddress() == QHostAddress::LocalHost ||283 if (senderSockAddr.getAddress() == QHostAddress::LocalHost ||
283 senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) {284 senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) {