History

Merge branch 'master' into dev/rename-hifisockaddr-webapp

# 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

David Rowe committed 5 years ago

Commit 74c27882 parents dfd71ab 42ffb57168 files · +2145 −1101Browse files

Showing the changes to assignment-client/src/AssignmentClient.cpp (1 of 168 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
@@ -82,7 +83,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri · 72 unmodified lines
8283 _assignmentServerHostname = assignmentServerHostname;
8384 }
8485
85− _assignmentServerSocket = HifiSockAddr(SocketType::UDP, _assignmentServerHostname, assignmentServerPort, true);
86+ _assignmentServerSocket = SockAddr(SocketType::UDP, _assignmentServerHostname, assignmentServerPort, true);
8687 if (_assignmentServerSocket.isNull()) {
8788 qCCritical(assignment_client) << "PAGE: Couldn't resolve domain server address" << _assignmentServerHostname;
8889 }
@@ -110,7 +111,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri · 21 unmodified lines
110111
111112 // did we get an assignment-client monitor port?
112113 if (assignmentMonitorPort > 0) {
113− _assignmentClientMonitorSocket = HifiSockAddr(SocketType::UDP, DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME,
114+ _assignmentClientMonitorSocket = SockAddr(SocketType::UDP, DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME,
114115 assignmentMonitorPort);
115116 _assignmentClientMonitorSocket.setObjectName("AssignmentClientMonitor");
116117
@@ -270,7 +271,7 @@ void AssignmentClient::handleCreateAssignmentPacket(QSharedPointer<ReceivedMessa · 153 unmodified lines
270271 }
271272
272273 void AssignmentClient::handleStopNodePacket(QSharedPointer<ReceivedMessage> message) {
273− const HifiSockAddr& senderSockAddr = message->getSenderSockAddr();
274+ const SockAddr& senderSockAddr = message->getSenderSockAddr();
274275
275276 if (senderSockAddr.getAddress() == QHostAddress::LocalHost ||
276277 senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t