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

fix to tracker announce code

This commit is contained in:
Arvid Norberg 2010-07-17 23:32:17 +00:00
parent 0dd925ef14
commit 0c7b5ab3da
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/torrent.cpp
View File

@ -1523,6 +1523,8 @@ namespace libtorrent
m_ses.m_tracker_manager.queue_request(m_ses.m_io_service, m_ses.m_half_open, req m_ses.m_tracker_manager.queue_request(m_ses.m_io_service, m_ses.m_half_open, req
, tracker_login() , m_abort?boost::shared_ptr<torrent>():shared_from_this()); , tracker_login() , m_abort?boost::shared_ptr<torrent>():shared_from_this());
ae.updating = true; ae.updating = true;
ae.next_announce = now + seconds(20);
ae.min_announce = now + seconds(10);
if (m_ses.m_alerts.should_post<tracker_announce_alert>()) if (m_ses.m_alerts.should_post<tracker_announce_alert>())
{ {
@ -1750,12 +1752,7 @@ namespace libtorrent
void torrent::force_tracker_request() void torrent::force_tracker_request()
{ {
if (is_paused()) return; force_tracker_request(time_now_hires());
ptime now = time_now_hires();
for (std::vector<announce_entry>::iterator i = m_trackers.begin()
, end(m_trackers.end()); i != end; ++i)
i->next_announce = (std::max)(now, i->min_announce);
update_tracker_timer(now);
} }
void torrent::force_tracker_request(ptime t) void torrent::force_tracker_request(ptime t)
@ -1763,7 +1760,7 @@ namespace libtorrent
if (is_paused()) return; if (is_paused()) return;
for (std::vector<announce_entry>::iterator i = m_trackers.begin() for (std::vector<announce_entry>::iterator i = m_trackers.begin()
, end(m_trackers.end()); i != end; ++i) , end(m_trackers.end()); i != end; ++i)
i->next_announce = (std::max)(t, i->min_announce); i->next_announce = (std::max)(t, i->min_announce) + seconds(1);
update_tracker_timer(time_now_hires()); update_tracker_timer(time_now_hires());
} }
@ -5563,19 +5560,12 @@ namespace libtorrent
&& !settings().announce_to_all_tiers) break; && !settings().announce_to_all_tiers) break;
} }
if (next_announce == max_time()) return; if (next_announce <= now) return;
m_waiting_tracker = true; m_waiting_tracker = true;
error_code ec; error_code ec;
boost::weak_ptr<torrent> self(shared_from_this()); boost::weak_ptr<torrent> self(shared_from_this());
if (next_announce <= now)
{
// no need to post this via asio, just call directly
on_tracker_announce_disp(self, ec);
return;
}
// since we don't know if we have to re-issue the async_wait or not // since we don't know if we have to re-issue the async_wait or not
// always do it // always do it
// if (m_tracker_timer.expires_at() <= next_announce) return; // if (m_tracker_timer.expires_at() <= next_announce) return;