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

Remove call to has pending datagrams

Browse source
This commit is contained in:
Atlante45 2015-08-03 17:14:42 -07:00
parent acd7a7a732
commit c0852f0eb2
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/networking/src/udt/Connection.cpp
View file

@ -283,9 +283,8 @@ bool Connection::processReceivedSequenceNumber(SequenceNumber sequenceNumber, in
_receiveWindow.onProbePair1Arrival(); _receiveWindow.onProbePair1Arrival();
} else if (((uint32_t) sequenceNumber & 0xF) == 1) { } else if (((uint32_t) sequenceNumber & 0xF) == 1) {
_receiveWindow.onProbePair2Arrival(); _receiveWindow.onProbePair2Arrival();
} else {
_receiveWindow.onPacketArrival();
} }
_receiveWindow.onPacketArrival();
// If this is not the next sequence number, report loss // If this is not the next sequence number, report loss
if (sequenceNumber > _lastReceivedSequenceNumber + 1) { if (sequenceNumber > _lastReceivedSequenceNumber + 1) {

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

@ -129,12 +129,12 @@ Connection& Socket::findOrCreateConnection(const HifiSockAddr& sockAddr) {
} }
void Socket::readPendingDatagrams() { void Socket::readPendingDatagrams() {
while (_udpSocket.hasPendingDatagrams()) { int packetSizeWithHeader = -1;
while ((packetSizeWithHeader = _udpSocket.pendingDatagramSize()) != -1) {
// setup a HifiSockAddr to read into // setup a HifiSockAddr to read into
HifiSockAddr senderSockAddr; HifiSockAddr senderSockAddr;
// setup a buffer to read the packet into // setup a buffer to read the packet into
int packetSizeWithHeader = _udpSocket.pendingDatagramSize();
auto buffer = std::unique_ptr<char[]>(new char[packetSizeWithHeader]); auto buffer = std::unique_ptr<char[]>(new char[packetSizeWithHeader]);
// pull the datagram // pull the datagram