jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed DHT bootstrapping issue

Browse Source
This commit is contained in:
Arvid Norberg
2010-02-14 07:46:57 +00:00
parent 0acfe4a480
commit 5c02f3df59
7 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/session_impl.cpp
View File

@@ -3251,12 +3251,11 @@ namespace aux {
m_dht_socket.bind(m_dht_settings.service_port);
}
for (std::list<std::pair<std::string, int> >::iterator i = m_dht_router_nodes.begin()
for (std::list<udp::endpoint>::iterator i = m_dht_router_nodes.begin()
, end(m_dht_router_nodes.end()); i != end; ++i)
{
m_dht->add_router_node(*i);
}
std::list<std::pair<std::string, int> >().swap(m_dht_router_nodes);
m_dht->start(startup_state);
@@ -3367,11 +3366,22 @@ namespace aux {
void session_impl::add_dht_router(std::pair<std::string, int> const& node)
{
// router nodes should be added before the DHT is started (and bootstrapped)
if (m_dht) m_dht->add_router_node(node);
else m_dht_router_nodes.push_back(node);
char port[7];
snprintf(port, sizeof(port), "%d", node.second);
tcp::resolver::query q(node.first, port);
m_host_resolver.async_resolve(q,
bind(&session_impl::on_dht_router_name_lookup, this, _1, _2));
}
void session_impl::on_dht_router_name_lookup(error_code const& e
, tcp::resolver::iterator host)
{
if (e || host == tcp::resolver::iterator()) return;
// router nodes should be added before the DHT is started (and bootstrapped)
udp::endpoint ep(host->endpoint().address(), host->endpoint().port());
if (m_dht) m_dht->add_router_node(ep);
m_dht_router_nodes.push_back(ep);
}
#endif
#ifndef TORRENT_DISABLE_ENCRYPTION