merged changes from RC_1_0

This commit is contained in:
Arvid Norberg 2014-10-01 18:19:44 +00:00
parent 0ed0bdc50c
commit 7830081585
2 changed files with 10 additions and 1 deletions

View File

@ -114,6 +114,8 @@
0.16.18 release
* fix uninitialized values in DHT DOS mitigation
* fix error handling in file::phys_offset
* fix bug in HTTP scrape response parsing
* enable TCP keepalive for socks5 connection for UDP associate
* fix python3 support

View File

@ -43,7 +43,14 @@ namespace libtorrent { namespace dht
TORRENT_DECLARE_LOG(dht_tracker);
#endif
dos_blocker::dos_blocker() {}
dos_blocker::dos_blocker()
{
for (int i = 0; i < num_ban_nodes; ++i)
{
m_ban_nodes[i].count = 0;
m_ban_nodes[i].limit = min_time();
}
}
bool dos_blocker::incoming(address addr, ptime now)
{