merge uTP slow start fix from RC_0_16

This commit is contained in:
Arvid Norberg 2012-09-26 01:27:58 +00:00
parent 28e32b57b6
commit 2f985de420
2 changed files with 4 additions and 1 deletions

View File

@ -4,6 +4,7 @@
* fix uTP edge case where udp socket buffer fills up
* fix nagle implementation in uTP
* improve uTP slow start behavior
* fixed UDP socket error causing it to fail on Win7
* update use of boost.system to not use deprecated functions
* fix GIL issue in python bindings. Deprecated extension support in python

View File

@ -3042,7 +3042,9 @@ void utp_socket_impl::do_ledbat(int acked_bytes, int delay, int in_flight, ptime
if (m_slow_start)
{
scaled_gain = (std::max)((window_factor * m_cwnd) >> 16, linear_gain);
// mimic TCP slow-start by adding the number of acked
// bytes to cwnd
scaled_gain = (std::max)(boost::int64_t(acked_bytes) << 16, linear_gain);
}
else
{