wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

Refactor to expose a more convenient get_peers function as part of the DHT api. 

Now announce (a particular case of get_peers DHT operation) uses the function get_peers.
This commit is contained in:
Alden Torres 2015-06-23 12:24:30 -04:00
parent 9fc4968dc4
commit 5c8c9cd653
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libtorrent/kademlia/node.hpp
View File

@ -238,6 +238,10 @@ public:
#endif #endif
enum flags_t { flag_seed = 1, flag_implied_port = 2 }; enum flags_t { flag_seed = 1, flag_implied_port = 2 };
void get_peers(sha1_hash const& info_hash
, boost::function<void(std::vector<tcp::endpoint> const&)> dcallback
, boost::function<void(std::vector<std::pair<node_entry, std::string> > const&)> ncallback
, bool noseeds);
void announce(sha1_hash const& info_hash, int listen_port, int flags void announce(sha1_hash const& info_hash, int listen_port, int flags
, boost::function<void(std::vector<tcp::endpoint> const&)> f); , boost::function<void(std::vector<tcp::endpoint> const&)> f);

41
src/kademlia/node.cpp
View File

@ -372,6 +372,27 @@ void node::add_node(udp::endpoint node)
send_single_refresh(node, m_table.num_active_buckets()); send_single_refresh(node, m_table.num_active_buckets());
} }
void node::get_peers(sha1_hash const& info_hash
, boost::function<void(std::vector<tcp::endpoint> const&)> dcallback
, boost::function<void(std::vector<std::pair<node_entry, std::string> > const&)> ncallback
, bool noseeds)
{
// search for nodes with ids close to id or with peers
// for info-hash id. then send announce_peer to them.
boost::intrusive_ptr<dht::get_peers> ta;
if (m_settings.privacy_lookups)
{
ta.reset(new dht::obfuscated_get_peers(*this, info_hash, dcallback, ncallback, noseeds));
}
else
{
ta.reset(new dht::get_peers(*this, info_hash, dcallback, ncallback, noseeds));
}
ta->start();
}
void node::announce(sha1_hash const& info_hash, int listen_port, int flags void node::announce(sha1_hash const& info_hash, int listen_port, int flags
, boost::function<void(std::vector<tcp::endpoint> const&)> f) , boost::function<void(std::vector<tcp::endpoint> const&)> f)
{ {
@ -384,24 +405,10 @@ void node::announce(sha1_hash const& info_hash, int listen_port, int flags
, hex_ih, listen_port); , hex_ih, listen_port);
} }
#endif #endif
// search for nodes with ids close to id or with peers
// for info-hash id. then send announce_peer to them.
boost::intrusive_ptr<get_peers> ta; get_peers(info_hash, f
if (m_settings.privacy_lookups) , boost::bind(&announce_fun, _1, boost::ref(*this)
{ , listen_port, info_hash, flags), flags & node::flag_seed);
ta.reset(new obfuscated_get_peers(*this, info_hash, f
, boost::bind(&announce_fun, _1, boost::ref(*this)
, listen_port, info_hash, flags), flags & node::flag_seed));
}
else
{
ta.reset(new get_peers(*this, info_hash, f
, boost::bind(&announce_fun, _1, boost::ref(*this)
, listen_port, info_hash, flags), flags & node::flag_seed));
}
ta->start();
} }
void node::get_item(sha1_hash const& target void node::get_item(sha1_hash const& target