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

Merge pull request #81 from aldenml/no-full-namespace-udp-endpoint 

Removed unnecessary full namespace reference to udp::endpoint in new dht_direct_request feature.
This commit is contained in:
Arvid Norberg 2015-08-12 01:15:53 -04:00
parent 1a25448b64 b303a36ac2
commit ca793121e0
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/aux_/session_impl.hpp
View File

@ -322,7 +322,7 @@ namespace libtorrent
void dht_get_peers(sha1_hash const& info_hash); void dht_get_peers(sha1_hash const& info_hash);
void dht_announce(sha1_hash const& info_hash, int port = 0, int flags = 0); void dht_announce(sha1_hash const& info_hash, int port = 0, int flags = 0);
void dht_direct_request(boost::asio::ip::udp::endpoint ep, entry& e, void* userdata); void dht_direct_request(udp::endpoint ep, entry& e, void* userdata = 0);
#ifndef TORRENT_NO_DEPRECATE #ifndef TORRENT_NO_DEPRECATE
entry dht_state() const; entry dht_state() const;

2
include/libtorrent/kademlia/dht_tracker.hpp
View File

@ -107,7 +107,7 @@ namespace libtorrent { namespace dht
, boost::function<void(item&)> cb, std::string salt = std::string()); , boost::function<void(item&)> cb, std::string salt = std::string());
// send an arbitrary DHT request directly to a node // send an arbitrary DHT request directly to a node
void direct_request(boost::asio::ip::udp::endpoint ep, entry& e void direct_request(udp::endpoint ep, entry& e
, boost::function<void(msg const&)> f); , boost::function<void(msg const&)> f);
#ifndef TORRENT_NO_DEPRECATE #ifndef TORRENT_NO_DEPRECATE

6
include/libtorrent/session_handle.hpp
View File

@ -432,12 +432,12 @@ namespace libtorrent
void dht_announce(sha1_hash const& info_hash, int port = 0, int flags = 0); void dht_announce(sha1_hash const& info_hash, int port = 0, int flags = 0);
// Send an arbitrary DHT request directly to the specified endpoint. This // Send an arbitrary DHT request directly to the specified endpoint. This
// function is intended for use by plugins. Whan a response is received // function is intended for use by plugins. When a response is received
// or the request times out, a dht_direct_response_alert will be posted // or the request times out, a dht_direct_response_alert will be posted
// with the response (if any) and the userdata pointer passed in here. // with the response (if any) and the userdata pointer passed in here.
// Since this alert is a reponse to an explicit call, it will always be // Since this alert is a response to an explicit call, it will always be
// posted, regardless of the alert mask. // posted, regardless of the alert mask.
void dht_direct_request(boost::asio::ip::udp::endpoint ep, entry const& e, void* userdata); void dht_direct_request(udp::endpoint ep, entry const& e, void* userdata = 0);
#ifndef TORRENT_NO_DEPRECATE #ifndef TORRENT_NO_DEPRECATE
// deprecated in 0.15 // deprecated in 0.15

2
src/kademlia/dht_tracker.cpp
View File

@ -311,7 +311,7 @@ namespace libtorrent { namespace dht
, _1, _2, cb)); , _1, _2, cb));
} }
void dht_tracker::direct_request(boost::asio::ip::udp::endpoint ep, entry& e void dht_tracker::direct_request(udp::endpoint ep, entry& e
, boost::function<void(msg const&)> f) , boost::function<void(msg const&)> f)
{ {
m_dht.direct_request(ep, e, f); m_dht.direct_request(ep, e, f);

2
src/session_handle.cpp
View File

@ -396,7 +396,7 @@ namespace libtorrent
#endif #endif
} }
void session_handle::dht_direct_request(boost::asio::ip::udp::endpoint ep, entry const& e, void* userdata) void session_handle::dht_direct_request(udp::endpoint ep, entry const& e, void* userdata)
{ {
#ifndef TORRENT_DISABLE_DHT #ifndef TORRENT_DISABLE_DHT
TORRENT_ASYNC_CALL3(dht_direct_request, ep, e, userdata); TORRENT_ASYNC_CALL3(dht_direct_request, ep, e, userdata);

2
src/session_impl.cpp
View File

@ -5589,7 +5589,7 @@ retry:
m_dht->announce(info_hash, port, flags, boost::bind(&on_dht_get_peers, boost::ref(m_alerts), info_hash, _1)); m_dht->announce(info_hash, port, flags, boost::bind(&on_dht_get_peers, boost::ref(m_alerts), info_hash, _1));
} }
void session_impl::dht_direct_request(boost::asio::ip::udp::endpoint ep, entry& e, void* userdata) void session_impl::dht_direct_request(udp::endpoint ep, entry& e, void* userdata)
{ {
if (!m_dht) return; if (!m_dht) return;
m_dht->direct_request(ep, e, boost::bind(&on_direct_response, boost::ref(m_alerts), userdata, _1)); m_dht->direct_request(ep, e, boost::bind(&on_direct_response, boost::ref(m_alerts), userdata, _1));