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
44 //
55 // Created by Stephen Birarda on 11/25/2013.
66 // Copyright 2013 High Fidelity, Inc.
7+// Copyright 2021 Vircadia contributors.
78 //
89 // Distributed under the Apache License, Version 2.0.
910 // 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
8384 _assignmentServerHostname = assignmentServerHostname;
8485 }
8586
86− _assignmentServerSocket = HifiSockAddr(_assignmentServerHostname, assignmentServerPort, true);
87+ _assignmentServerSocket = SockAddr(_assignmentServerHostname, assignmentServerPort, true);
8788 if (_assignmentServerSocket.isNull()) {
8889 qCCritical(assignment_client) << "PAGE: Couldn't resolve domain server address" << _assignmentServerHostname;
8990 }
@@ -118,7 +119,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri · 28 unmodified lines
118119
119120 // did we get an assignment-client monitor port?
120121 if (assignmentMonitorPort > 0) {
121− _assignmentClientMonitorSocket = HifiSockAddr(DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME, assignmentMonitorPort);
122+ _assignmentClientMonitorSocket = SockAddr(DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME, assignmentMonitorPort);
122123 _assignmentClientMonitorSocket.setObjectName("AssignmentClientMonitor");
123124
124125 qCDebug(assignment_client) << "Assignment-client monitor socket is" << _assignmentClientMonitorSocket;
@@ -277,7 +278,7 @@ void AssignmentClient::handleCreateAssignmentPacket(QSharedPointer<ReceivedMessa · 152 unmodified lines
277278 }
278279
279280 void AssignmentClient::handleStopNodePacket(QSharedPointer<ReceivedMessage> message) {
280− const HifiSockAddr& senderSockAddr = message->getSenderSockAddr();
281+ const SockAddr& senderSockAddr = message->getSenderSockAddr();
281282
282283 if (senderSockAddr.getAddress() == QHostAddress::LocalHost ||
283284 senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) {