From eb17ddc04fd45dfdbfe67c5fc32eb75f6438411d Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 10 Aug 2015 10:13:50 -0700 Subject: [PATCH] fix capitalization of RTO for CongestionControl --- libraries/networking/src/udt/CongestionControl.h | 4 ++-- libraries/networking/src/udt/Connection.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/networking/src/udt/CongestionControl.h b/libraries/networking/src/udt/CongestionControl.h index f131324acb..a8a4ba3342 100644 --- a/libraries/networking/src/udt/CongestionControl.h +++ b/libraries/networking/src/udt/CongestionControl.h @@ -42,7 +42,7 @@ public: protected: void setAckInterval(int ackInterval) { _ackInterval = ackInterval; } - void setRto(int rto) { _userDefinedRto = true; _rto = rto; } + void setRTO(int rto) { _userDefinedRTO = true; _rto = rto; } void setMSS(int mss) { _mss = mss; } void setMaxCongestionWindowSize(int window) { _maxCongestionWindowSize = window; } @@ -74,7 +74,7 @@ private: int _synInterval { DEFAULT_SYN_INTERVAL }; - bool _userDefinedRto { false }; // if the RTO value is defined by users + bool _userDefinedRTO { false }; // if the RTO value is defined by users int _rto { -1 }; // RTO value, microseconds }; diff --git a/libraries/networking/src/udt/Connection.cpp b/libraries/networking/src/udt/Connection.cpp index 56f76d2f5b..ba3ae29e98 100644 --- a/libraries/networking/src/udt/Connection.cpp +++ b/libraries/networking/src/udt/Connection.cpp @@ -580,7 +580,7 @@ void Connection::updateRTT(int rtt) { } int Connection::estimatedTimeout() const { - return _congestionControl->_userDefinedRto ? _congestionControl->_rto : _rtt + _rttVariance * 4; + return _congestionControl->_userDefinedRTO ? _congestionControl->_rto : _rtt + _rttVariance * 4; } void Connection::updateCongestionControlAndSendQueue(std::function congestionCallback) {