Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 09:37:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Log message tweaks

Browse source 
Also don't need std in std::move, somehow.
This commit is contained in:
Simon Walton 2019-06-28 11:30:09 -07:00
parent 9b894456e9
commit 225f65f4fb
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/networking/src/LimitedNodeList.cpp
View file

@ -1088,12 +1088,14 @@ void LimitedNodeList::processSTUNResponse(std::unique_ptr<udt::BasePacket> packe
if (parseSTUNResponse(packet.get(), newPublicAddress, newPublicPort)) { if (parseSTUNResponse(packet.get(), newPublicAddress, newPublicPort)) {
if (newPublicAddress != _publicSockAddr.getAddress() || newPublicPort != _publicSockAddr.getPort()) { if (newPublicAddress != _publicSockAddr.getAddress() || newPublicPort != _publicSockAddr.getPort()) {
_publicSockAddr = HifiSockAddr(newPublicAddress, newPublicPort); qCDebug(networking, "New public socket received from STUN server is %s:%hu (was %s:%hu)",
newPublicAddress.toString().toStdString().c_str(),
qCDebug(networking, "New public socket received from STUN server is %s:%hu", newPublicPort,
_publicSockAddr.getAddress().toString().toLocal8Bit().constData(), _publicSockAddr.getAddress().toString().toLocal8Bit().constData(),
_publicSockAddr.getPort()); _publicSockAddr.getPort());
_publicSockAddr = HifiSockAddr(newPublicAddress, newPublicPort);
if (!_hasCompletedInitialSTUN) { if (!_hasCompletedInitialSTUN) {
// if we're here we have definitely completed our initial STUN sequence // if we're here we have definitely completed our initial STUN sequence
stopInitialSTUNUpdate(true); stopInitialSTUNUpdate(true);

4
libraries/networking/src/udt/Socket.cpp
View file

@ -545,10 +545,10 @@ void Socket::handleRemoteAddressChange(HifiSockAddr previousAddress, HifiSockAdd
const auto connectionIter = _connectionsHash.find(previousAddress); const auto connectionIter = _connectionsHash.find(previousAddress);
if (connectionIter != _connectionsHash.end()) { if (connectionIter != _connectionsHash.end()) {
auto connection = std::move(connectionIter->second); auto connection = move(connectionIter->second);
_connectionsHash.erase(connectionIter); _connectionsHash.erase(connectionIter);
connection->setDestinationAddress(currentAddress); connection->setDestinationAddress(currentAddress);
_connectionsHash[currentAddress] = std::move(connection); _connectionsHash[currentAddress] = move(connection);
} }
} }