diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 029bac7c9c..c85fb730ee 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -219,20 +219,18 @@ bool LimitedNodeList::packetVersionAndHashMatch(const QByteArray& packet) { return false; } -// qint64 LimitedNodeList::readDatagram(char* data, qint64 maxSize, QHostAddress* address = 0, quint16 * port = 0) { +qint64 LimitedNodeList::readDatagram(QByteArray& incomingPacket, QHostAddress* address = 0, quint16* port = 0) { + qint64 result = getNodeSocket().readDatagram(incomingPacket.data(), incomingPacket.size(), address, port); -//qint64 LimitedNodeList::readDatagram(QByteArray& incomingPacket, QHostAddress* address = 0, quint16* port = 0) { -// qint64 result = getNodeSocket().readDatagram(incomingPacket.data(), incomingPacket.size(), address, port); -// -// SharedNodePointer sendingNode = sendingNodeForPacket(incomingPacket); -// if (sendingNode) { -// emit dataReceived(sendingNode->getType(), incomingPacket.size()); -// } else { -// emit dataReceived(NodeType::Unassigned, incomingPacket.size()); -// } -// -// return result; -//} + SharedNodePointer sendingNode = sendingNodeForPacket(incomingPacket); + if (sendingNode) { + emit dataReceived(sendingNode->getType(), incomingPacket.size()); + } else { + emit dataReceived(NodeType::Unassigned, incomingPacket.size()); + } + + return result; +} qint64 LimitedNodeList::writeDatagram(const QByteArray& datagram, const HifiSockAddr& destinationSockAddr) { // XXX can BandwidthRecorder be used for this?