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

Fix initialization of variables for SendQueue and Connection

Browse source
This commit is contained in:
Ryan Huffman 2016-02-26 11:20:31 -08:00
parent a0203cf9d5
commit a7bb47fbcc
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,6 +88,7 @@ SendQueue& Connection::getSendQueue() {
// Lasily create send queue // Lasily create send queue
_sendQueue = SendQueue::create(_parentSocket, _destination); _sendQueue = SendQueue::create(_parentSocket, _destination);
_lastReceivedACK = _sendQueue->getCurrentSequenceNumber();
#ifdef UDT_CONNECTION_DEBUG #ifdef UDT_CONNECTION_DEBUG
qCDebug(networking) << "Created SendQueue for connection to" << _destination; qCDebug(networking) << "Created SendQueue for connection to" << _destination;
@ -410,6 +411,12 @@ bool Connection::processReceivedSequenceNumber(SequenceNumber sequenceNumber, in
// refuse to process any packets until we've received the handshake // refuse to process any packets until we've received the handshake
return false; return false;
} }
if (!_hasReceivedData) {
_initialReceiveSequenceNumber = sequenceNumber;
_lastReceivedSequenceNumber = sequenceNumber - 1;
_lastSentACK = sequenceNumber - 1;
}
_isReceivingData = _hasReceivedData = true; _isReceivingData = _hasReceivedData = true;

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

@ -92,7 +92,7 @@ SendQueue::SendQueue(Socket* socket, HifiSockAddr dest) :
// set our member variables from randomized initial number // set our member variables from randomized initial number
_currentSequenceNumber = _initialSequenceNumber - 1; _currentSequenceNumber = _initialSequenceNumber - 1;
_atomicCurrentSequenceNumber = uint32_t(_currentSequenceNumber); _atomicCurrentSequenceNumber = uint32_t(_currentSequenceNumber);
_lastACKSequenceNumber = uint32_t(_initialSequenceNumber); _lastACKSequenceNumber = uint32_t(_currentSequenceNumber) - 1;
} }
void SendQueue::queuePacket(std::unique_ptr<Packet> packet) { void SendQueue::queuePacket(std::unique_ptr<Packet> packet) {