premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

IP overhead calculation fix

This commit is contained in:
Arvid Norberg 2008-12-28 20:06:59 +00:00
parent a72dc4a75d
commit 725fdef85e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/peer_connection.cpp
View File

@ -3623,7 +3623,7 @@ namespace libtorrent
TORRENT_ASSERT(m_channel_state[download_channel] == peer_info::bw_network); TORRENT_ASSERT(m_channel_state[download_channel] == peer_info::bw_network);
m_channel_state[download_channel] = peer_info::bw_idle; m_channel_state[download_channel] = peer_info::bw_idle;
m_statistics.trancieve_ip_packet(bytes_transferred, m_remote.address().is_v6()); int bytes_in_loop = bytes_transferred;
if (error) if (error)
{ {
@ -3631,6 +3631,7 @@ namespace libtorrent
(*m_logger) << time_now_string() << " **ERROR**: " (*m_logger) << time_now_string() << " **ERROR**: "
<< error.message() << "[in peer_connection::on_receive_data]\n"; << error.message() << "[in peer_connection::on_receive_data]\n";
#endif #endif
m_statistics.trancieve_ip_packet(bytes_in_loop, m_remote.address().is_v6());
on_receive(error, bytes_transferred); on_receive(error, bytes_transferred);
disconnect(error.message().c_str()); disconnect(error.message().c_str());
return; return;
@ -3646,7 +3647,11 @@ namespace libtorrent
if (!m_ignore_bandwidth_limits) if (!m_ignore_bandwidth_limits)
m_bandwidth_limit[download_channel].use_quota(bytes_transferred); m_bandwidth_limit[download_channel].use_quota(bytes_transferred);
if (m_disconnecting) return; if (m_disconnecting)
{
m_statistics.trancieve_ip_packet(bytes_in_loop, m_remote.address().is_v6());
return;
}
TORRENT_ASSERT(m_packet_size > 0); TORRENT_ASSERT(m_packet_size > 0);
TORRENT_ASSERT(bytes_transferred > 0); TORRENT_ASSERT(bytes_transferred > 0);
@ -3725,14 +3730,16 @@ namespace libtorrent
} }
if (ec && ec != asio::error::would_block) if (ec && ec != asio::error::would_block)
{ {
m_statistics.trancieve_ip_packet(bytes_in_loop, m_remote.address().is_v6());
disconnect(ec.message().c_str()); disconnect(ec.message().c_str());
return; return;
} }
if (ec == asio::error::would_block) break; if (ec == asio::error::would_block) break;
m_statistics.trancieve_ip_packet(bytes_transferred, m_remote.address().is_v6()); bytes_in_loop += bytes_transferred;
} }
while (bytes_transferred > 0); while (bytes_transferred > 0);
m_statistics.trancieve_ip_packet(bytes_in_loop, m_remote.address().is_v6());
setup_receive(); setup_receive();
} }