# Conflicts: # assignment-client/src/AssignmentClient.cpp # domain-server/src/DomainServer.cpp # libraries/networking/src/DomainHandler.cpp # libraries/networking/src/LimitedNodeList.cpp # libraries/networking/src/LimitedNodeList.h # libraries/networking/src/SockAddr.cpp # libraries/networking/src/SockAddr.h # libraries/networking/src/udt/Socket.cpp # libraries/networking/src/udt/Socket.h # tools/ice-client/src/ICEClientApp.cpp
Showing the changes to assignment-client/src/AssignmentClient.cpp (1 of 168 files). Show all
Unified · Split
| @@ -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.html | 10 | // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html |
| @@ -82,7 +83,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri · 72 unmodified lines | |||
| 82 | _assignmentServerHostname = assignmentServerHostname; | 83 | _assignmentServerHostname = assignmentServerHostname; |
| 83 | } | 84 | } |
| 84 | 85 | ||
| 85 | _assignmentServerSocket = HifiSockAddr(SocketType::UDP, _assignmentServerHostname, assignmentServerPort, true); | 86 | _assignmentServerSocket = SockAddr(SocketType::UDP, _assignmentServerHostname, assignmentServerPort, true); |
| 86 | if (_assignmentServerSocket.isNull()) { | 87 | if (_assignmentServerSocket.isNull()) { |
| 87 | qCCritical(assignment_client) << "PAGE: Couldn't resolve domain server address" << _assignmentServerHostname; | 88 | qCCritical(assignment_client) << "PAGE: Couldn't resolve domain server address" << _assignmentServerHostname; |
| 88 | } | 89 | } |
| @@ -110,7 +111,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri · 21 unmodified lines | |||
| 110 | 111 | ||
| 111 | // did we get an assignment-client monitor port? | 112 | // did we get an assignment-client monitor port? |
| 112 | if (assignmentMonitorPort > 0) { | 113 | if (assignmentMonitorPort > 0) { |
| 113 | _assignmentClientMonitorSocket = HifiSockAddr(SocketType::UDP, DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME, | 114 | _assignmentClientMonitorSocket = SockAddr(SocketType::UDP, DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME, |
| 114 | assignmentMonitorPort); | 115 | assignmentMonitorPort); |
| 115 | _assignmentClientMonitorSocket.setObjectName("AssignmentClientMonitor"); | 116 | _assignmentClientMonitorSocket.setObjectName("AssignmentClientMonitor"); |
| 116 | 117 | ||
| @@ -270,7 +271,7 @@ void AssignmentClient::handleCreateAssignmentPacket(QSharedPointer<ReceivedMessa · 153 unmodified lines | |||
| 270 | } | 271 | } |
| 271 | 272 | ||
| 272 | void AssignmentClient::handleStopNodePacket(QSharedPointer<ReceivedMessage> message) { | 273 | void AssignmentClient::handleStopNodePacket(QSharedPointer<ReceivedMessage> message) { |
| 273 | const HifiSockAddr& senderSockAddr = message->getSenderSockAddr(); | 274 | const SockAddr& senderSockAddr = message->getSenderSockAddr(); |
| 274 | 275 | ||
| 275 | if (senderSockAddr.getAddress() == QHostAddress::LocalHost || | 276 | if (senderSockAddr.getAddress() == QHostAddress::LocalHost || |
| 276 | senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) { | 277 | senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) { |