From 35f00f9ba1388f362d2c21e4bfe2e7407cfdc23a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 29 Jul 2015 16:12:50 -0700 Subject: [PATCH] rename the CC and send queue updater --- libraries/networking/src/udt/Connection.cpp | 6 +++--- libraries/networking/src/udt/Connection.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/networking/src/udt/Connection.cpp b/libraries/networking/src/udt/Connection.cpp index 626833c5c5..ec175d8f39 100644 --- a/libraries/networking/src/udt/Connection.cpp +++ b/libraries/networking/src/udt/Connection.cpp @@ -384,7 +384,7 @@ void Connection::processACK(std::unique_ptr controlPacket) { } // give this ACK to the congestion control and update the send queue parameters - updateCongestionControlAndSentQueue([this, ack](){ + updateCongestionControlAndSendQueue([this, ack](){ _congestionControl->onAck(ack); }); @@ -453,7 +453,7 @@ void Connection::processNAK(std::unique_ptr controlPacket) { _sendQueue->nak(start, end); // give the loss to the congestion control object and update the send queue parameters - updateCongestionControlAndSentQueue([this, start, end](){ + updateCongestionControlAndSendQueue([this, start, end](){ _congestionControl->onLoss(start, end); }); @@ -494,7 +494,7 @@ int Connection::estimatedTimeout() const { return _congestionControl->_userDefinedRto ? _rtt + _rttVariance * 4 : _congestionControl->_rto; } -void Connection::updateCongestionControlAndSentQueue(std::function congestionCallback) { +void Connection::updateCongestionControlAndSendQueue(std::function congestionCallback) { // update the last sent sequence number in congestion control _congestionControl->setSendCurrentSequenceNumber(_sendQueue->getCurrentSequenceNumber()); diff --git a/libraries/networking/src/udt/Connection.h b/libraries/networking/src/udt/Connection.h index b46d2c37cf..eaa55797d9 100644 --- a/libraries/networking/src/udt/Connection.h +++ b/libraries/networking/src/udt/Connection.h @@ -64,7 +64,7 @@ private: int estimatedTimeout() const; - void updateCongestionControlAndSentQueue(std::function congestionCallback); + void updateCongestionControlAndSendQueue(std::function congestionCallback); int _synInterval; // Periodical Rate Control Interval, in microseconds