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

Merge branch 'atp' of https://github.com/birarda/hifi into protocol

Browse source
This commit is contained in:
Atlante45 2015-08-03 17:15:12 -07:00
commit 99fcb08fd1
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/networking/src/udt/BasePacket.cpp
View file

@ -156,13 +156,13 @@ bool BasePacket::reset() {
} }
qint64 BasePacket::writeData(const char* data, qint64 maxSize) { qint64 BasePacket::writeData(const char* data, qint64 maxSize) {
Q_ASSERT_X(maxSize <= bytesAvailableForWrite(), "BasePacket::writeData", "not enough space for write");
// make sure we have the space required to write this block // make sure we have the space required to write this block
if (maxSize <= bytesAvailableForWrite()) { if (maxSize <= bytesAvailableForWrite()) {
qint64 currentPos = pos(); qint64 currentPos = pos();
Q_ASSERT(currentPos < _payloadCapacity);
// good to go - write the data // good to go - write the data
memcpy(_payloadStart + currentPos, data, maxSize); memcpy(_payloadStart + currentPos, data, maxSize);

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

@ -286,6 +286,8 @@ bool Connection::processReceivedSequenceNumber(SequenceNumber sequenceNumber, in
} }
_receiveWindow.onPacketArrival(); _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) {
if (_lastReceivedSequenceNumber + 1 == sequenceNumber - 1) { if (_lastReceivedSequenceNumber + 1 == sequenceNumber - 1) {