Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

checkpoint to deal with merge

Browse source
This commit is contained in:
Roxanne Skelly 2019-06-05 11:08:12 -07:00
parent 512b43e1de
commit 06ed751f56
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -446,7 +446,11 @@ qint64 LimitedNodeList::sendPacket(std::unique_ptr<NLPacket> packet, const HifiS
return size; return size;
} else { } else {
return sendUnreliablePacket(*packet, sockAddr, hmacAuth); auto size = sendUnreliablePacket(*packet, sockAddr, hmacAuth);
if (size < 0) {
}
return size;
} }
} }

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

@ -226,8 +226,11 @@ qint64 Socket::writeDatagram(const QByteArray& datagram, const HifiSockAddr& soc
qint64 bytesWritten = _udpSocket.writeDatagram(datagram, sockAddr.getAddress(), sockAddr.getPort()); qint64 bytesWritten = _udpSocket.writeDatagram(datagram, sockAddr.getAddress(), sockAddr.getPort());
if (bytesWritten < 0) { if (bytesWritten < 0) {
// when saturating a link this isn't an uncommon message - suppress it so it doesn't bomb the debug qCDebug(networking) << "udt::writeDatagram (" << _udpSocket.state() << ") error - " << _udpSocket.error() << "(" << _udpSocket.errorString() << ")";
qCDebug(networking) << "Socket::writeDatagram : " << sockAddr << " " << _udpSocket.error(); #ifdef DEBUG_EVENT_QUEUE
int nodeListQueueSize = ::hifi::qt::getEventQueueSize(thread());
qCDebug(networking) << "Networking queue size - " << nodeListQueueSize;
#endif // DEBUG_EVENT_QUEUE
} }
return bytesWritten; return bytesWritten;