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

fixed force reannounce bug with min_interval support

This commit is contained in:
Arvid Norberg 2009-12-13 16:36:45 +00:00
parent 25798ba1fa
commit cebcbc3eeb
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/libtorrent/torrent.hpp
View File

@ -1131,39 +1131,6 @@ namespace libtorrent
// paused or auto_managed from the resume data // paused or auto_managed from the resume data
bool m_override_resume_data:1; bool m_override_resume_data:1;
}; };
inline ptime torrent::next_announce() const
{
return m_waiting_tracker?m_tracker_timer.expires_at():min_time();
}
inline void torrent::force_tracker_request()
{
if (is_paused()) return;
ptime now = time_now();
for (std::vector<announce_entry>::iterator i = m_trackers.begin()
, end(m_trackers.end()); i != end; ++i)
i->next_announce = now;
update_tracker_timer();
}
inline void torrent::force_tracker_request(ptime t)
{
if (is_paused()) return;
for (std::vector<announce_entry>::iterator i = m_trackers.begin()
, end(m_trackers.end()); i != end; ++i)
i->next_announce = t;
update_tracker_timer();
}
inline void torrent::set_tracker_login(
std::string const& name
, std::string const& pw)
{
m_username = name;
m_password = pw;
}
} }
#endif // TORRENT_TORRENT_HPP_INCLUDED #endif // TORRENT_TORRENT_HPP_INCLUDED

35
src/torrent.cpp
View File

@ -1553,6 +1553,38 @@ namespace libtorrent
} }
} }
ptime torrent::next_announce() const
{
return m_waiting_tracker?m_tracker_timer.expires_at():min_time();
}
void torrent::force_tracker_request()
{
if (is_paused()) return;
ptime now = time_now();
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();
}
void torrent::force_tracker_request(ptime t)
{
if (is_paused()) return;
for (std::vector<announce_entry>::iterator i = m_trackers.begin()
, end(m_trackers.end()); i != end; ++i)
i->next_announce = (std::max)(t, i->min_announce);
update_tracker_timer();
}
void torrent::set_tracker_login(
std::string const& name
, std::string const& pw)
{
m_username = name;
m_password = pw;
}
#if TORRENT_USE_I2P #if TORRENT_USE_I2P
void torrent::on_i2p_resolve(error_code const& ec, char const* dest) void torrent::on_i2p_resolve(error_code const& ec, char const* dest)
{ {
@ -5148,9 +5180,10 @@ namespace libtorrent
if (i->is_working()) { tier = i->tier; found_working = false; } if (i->is_working()) { tier = i->tier; found_working = false; }
if (i->fails >= i->fail_limit && i->fail_limit != 0) continue; if (i->fails >= i->fail_limit && i->fail_limit != 0) continue;
if (i->updating) { found_working = true; continue; } if (i->updating) { found_working = true; continue; }
if (i->next_announce < next_announce) next_announce = i->next_announce;
if (i->is_working()) if (i->is_working())
{ {
ptime next_tracker_announce = (std::max)(i->next_announce, i->min_announce);
if (!i->updating && next_tracker_announce < next_announce) next_announce = next_tracker_announce;
found_working = true; found_working = true;
if (!m_settings.announce_to_all_trackers if (!m_settings.announce_to_all_trackers
&& !m_settings.announce_to_all_tiers) break; && !m_settings.announce_to_all_tiers) break;