fixed unchoke logic when using web seeds

This commit is contained in:
Arvid Norberg 2012-04-12 00:02:35 +00:00
parent 85497a0563
commit ccb1a880aa
2 changed files with 6 additions and 1 deletions

View File

@ -1,4 +1,7 @@
* fixed unchoke logic when using web seeds
* fixed compatibility with older versions of boost (down to boost 1.40)
0.16 release 0.16 release
* support torrents with more than 262000 pieces * support torrents with more than 262000 pieces

View File

@ -4310,6 +4310,7 @@ namespace aux {
TORRENT_ASSERT(p); TORRENT_ASSERT(p);
policy::peer* pi = p->peer_info_struct(); policy::peer* pi = p->peer_info_struct();
if (!pi) continue; if (!pi) continue;
if (pi->web_seed) continue;
torrent* t = p->associated_torrent().lock().get(); torrent* t = p->associated_torrent().lock().get();
if (!t) continue; if (!t) continue;
if (t->is_paused()) continue; if (t->is_paused()) continue;
@ -4408,7 +4409,8 @@ namespace aux {
torrent* t = p->associated_torrent().lock().get(); torrent* t = p->associated_torrent().lock().get();
policy::peer* pi = p->peer_info_struct(); policy::peer* pi = p->peer_info_struct();
if (p->ignore_unchoke_slots() || t == 0 || pi == 0 || t->is_paused()) continue; if (p->ignore_unchoke_slots() || t == 0 || pi == 0 || pi->web_seed || t->is_paused())
continue;
if (m_settings.choking_algorithm == session_settings::bittyrant_choker) if (m_settings.choking_algorithm == session_settings::bittyrant_choker)
{ {