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

correction of previous fix

This commit is contained in:
Arvid Norberg 2007-01-07 13:55:27 +00:00
parent b62d54948c
commit 327f820292
1 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/kademlia/node.cpp
View File

@ -371,61 +371,68 @@ void node_impl::announce(sha1_hash const& info_hash, int listen_port
, info_hash, f)); , info_hash, f));
} }
time_duration node_impl::refresh_timeout() try time_duration node_impl::refresh_timeout()
{ {
int refresh = -1; int refresh = -1;
ptime now = second_clock::universal_time(); ptime now = second_clock::universal_time();
ptime next = now + minutes(15); ptime next = now + minutes(15);
for (int i = 0; i < 160; ++i) try
{ {
ptime r = m_table.next_refresh(i); for (int i = 0; i < 160; ++i)
if (r <= now)
{ {
if (refresh == -1) refresh = i; ptime r = m_table.next_refresh(i);
if (r <= now)
{
if (refresh == -1) refresh = i;
}
else if (r < next)
{
next = r;
}
} }
else if (r < next) if (refresh != -1)
{ {
next = r; #ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_LOG(node) << "refreshing bucket: " << refresh;
#endif
refresh_bucket(refresh);
} }
} }
if (refresh != -1) catch (std::exception&) {}
{
#ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_LOG(node) << "refreshing bucket: " << refresh;
#endif
refresh_bucket(refresh);
}
if (next < now + seconds(5)) return seconds(5); if (next < now + seconds(5)) return seconds(5);
return next - now; return next - now;
} }
catch (std::exception&) {}
time_duration node_impl::connection_timeout() try time_duration node_impl::connection_timeout()
{ {
time_duration d = m_rpc.tick(); time_duration d = m_rpc.tick();
try
ptime now(second_clock::universal_time());
if (now - m_last_tracker_tick < minutes(10)) return d;
m_last_tracker_tick = now;
// look through all peers and see if any have timed out
for (data_iterator i = begin_data(), end(end_data()); i != end;)
{ {
torrent_entry& t = i->second; ptime now(second_clock::universal_time());
node_id const& key = i->first; if (now - m_last_tracker_tick < minutes(10)) return d;
++i; m_last_tracker_tick = now;
purge_peers(t.peers);
// look through all peers and see if any have timed out
// if there are no more peers, remove the entry altogether for (data_iterator i = begin_data(), end(end_data()); i != end;)
if (t.peers.empty())
{ {
table_t::iterator i = m_map.find(key); torrent_entry& t = i->second;
if (i != m_map.end()) m_map.erase(i); node_id const& key = i->first;
++i;
purge_peers(t.peers);
// if there are no more peers, remove the entry altogether
if (t.peers.empty())
{
table_t::iterator i = m_map.find(key);
if (i != m_map.end()) m_map.erase(i);
}
} }
} }
catch (std::exception&) {}
return d; return d;
} }
catch (std::exception&) {}
void node_impl::on_announce(msg const& m, msg& reply) void node_impl::on_announce(msg const& m, msg& reply)
{ {