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

Merge pull request #683 from arvidn/upnp-single-threaded 

remove mutex in upnp
This commit is contained in:
Arvid Norberg 2016-05-01 15:49:24 -04:00
parent 0d5428a664 60c119c52d
commit c8241f4eac
5 changed files with 206 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,8 +100,8 @@ namespace libtorrent
{
struct plugin;
class upnp;
class natpmp;
struct upnp;
struct natpmp;
class lsd;
class torrent;
class alert;

27
include/libtorrent/natpmp.hpp
View File

@ -39,8 +39,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/error_code.hpp"
#include "libtorrent/deadline_timer.hpp"
#include "libtorrent/time.hpp"
#include <mutex>
#include "libtorrent/debug.hpp"
#include "libtorrent/aux_/disable_warnings_push.hpp"
@ -59,9 +58,10 @@ namespace libtorrent
typedef boost::function<void(int, address, int, int, error_code const&)> portmap_callback_t;
typedef boost::function<void(char const*)> log_callback_t;
class natpmp : public boost::enable_shared_from_this<natpmp>
struct natpmp
: boost::enable_shared_from_this<natpmp>
, single_threaded
{
public:
natpmp(io_service& ios, portmap_callback_t const& cb
, log_callback_t const& lcb);
@ -80,19 +80,19 @@ private:
boost::shared_ptr<natpmp> self() { return shared_from_this(); }
void update_mapping(int i, std::unique_lock<std::mutex>& l);
void send_map_request(int i, std::unique_lock<std::mutex>& l);
void send_get_ip_address_request(std::unique_lock<std::mutex>& l);
void update_mapping(int i);
void send_map_request(int i);
void send_get_ip_address_request();
void resend_request(int i, error_code const& e);
void on_reply(error_code const& e
, std::size_t bytes_transferred);
void try_next_mapping(int i, std::unique_lock<std::mutex>& l);
void update_expiration_timer(std::unique_lock<std::mutex>& l);
void try_next_mapping(int i);
void update_expiration_timer();
void mapping_expired(error_code const& e, int i);
void close_impl(std::unique_lock<std::mutex>& l);
void close_impl();
void log(char const* msg, std::unique_lock<std::mutex>& l);
void disable(error_code const& ec, std::unique_lock<std::mutex>& l);
void log(char const* msg);
void disable(error_code const& ec);
struct mapping_t
{
@ -173,9 +173,6 @@ private:
bool m_disabled;
bool m_abort;
// TODO:3 is this object really acceessed from multiple threads?
mutable std::mutex m_mutex;
};
}

28
include/libtorrent/upnp.hpp
View File

@ -40,6 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/deadline_timer.hpp"
#include "libtorrent/enum_net.hpp"
#include "libtorrent/resolver.hpp"
#include "libtorrent/debug.hpp"
#include <boost/function/function1.hpp>
#include <boost/function/function5.hpp>
@ -47,7 +48,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <set>
#include <mutex>
namespace libtorrent
{
@ -129,9 +129,10 @@ TORRENT_EXTRA_EXPORT void find_control_url(int type, char const* string
, int str_len, parse_state& state);
// TODO: support using the windows API for UPnP operations as well
class TORRENT_EXTRA_EXPORT upnp : public boost::enable_shared_from_this<upnp>
struct TORRENT_EXTRA_EXPORT upnp final
: boost::enable_shared_from_this<upnp>
, single_threaded
{
public:
upnp(io_service& ios
, std::string const& user_agent
, portmap_callback_t const& cb, log_callback_t const& lcb
@ -174,7 +175,7 @@ public:
// the router, it can be queried through this function.
std::string router_model()
{
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(is_single_thread());
return m_model;
}
@ -183,8 +184,8 @@ private:
boost::shared_ptr<upnp> self() { return shared_from_this(); }
void map_timer(error_code const& ec);
void try_map_upnp(std::unique_lock<std::mutex>& l, bool timer = false);
void discover_device_impl(std::unique_lock<std::mutex>& l);
void try_map_upnp(bool timer = false);
void discover_device_impl();
static address_v4 upnp_multicast_address;
static udp::endpoint upnp_multicast_endpoint;
@ -199,8 +200,8 @@ private:
, std::size_t bytes_transferred);
struct rootdevice;
void next(rootdevice& d, int i, std::unique_lock<std::mutex>& l);
void update_map(rootdevice& d, int i, std::unique_lock<std::mutex>& l);
void next(rootdevice& d, int i);
void update_map(rootdevice& d, int i);
void on_upnp_xml(error_code const& e
@ -217,15 +218,15 @@ private:
, int mapping, http_connection& c);
void on_expire(error_code const& e);
void disable(error_code const& ec, std::unique_lock<std::mutex>& l);
void return_error(int mapping, int code, std::unique_lock<std::mutex>& l);
void log(char const* msg, std::unique_lock<std::mutex>& l);
void disable(error_code const& ec);
void return_error(int mapping, int code);
void log(char const* msg);
void get_ip_address(rootdevice& d);
void delete_port_mapping(rootdevice& d, int i);
void create_port_mapping(http_connection& c, rootdevice& d, int i);
void post(upnp::rootdevice const& d, char const* soap
, char const* soap_action, std::unique_lock<std::mutex>& l);
, char const* soap_action);
int num_mappings() const { return int(m_mappings.size()); }
@ -394,9 +395,6 @@ private:
bool m_closing;
bool m_ignore_non_routers;
// TODO: 3 is this class really accessed from multiple threads?
std::mutex m_mutex;
std::string m_model;
// cache of interfaces

123
src/natpmp.cpp
View File

@ -79,11 +79,12 @@ natpmp::natpmp(io_service& ios
// for this array not to be reallocated, by passing
// around pointers to its elements. so reserve size for now
m_mappings.reserve(10);
TORRENT_ASSERT(is_single_thread());
}
void natpmp::start()
{
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(is_single_thread());
error_code ec;
address gateway = get_default_gateway(m_socket.get_io_service(), ec);
@ -92,8 +93,8 @@ void natpmp::start()
char msg[200];
snprintf(msg, sizeof(msg), "failed to find default route: %s"
, convert_from_native(ec.message()).c_str());
log(msg, l);
disable(ec, l);
log(msg);
disable(ec);
return;
}
@ -106,25 +107,25 @@ void natpmp::start()
char msg[200];
snprintf(msg, sizeof(msg), "found router at: %s"
, print_address(m_nat_endpoint.address()).c_str());
log(msg, l);
log(msg);
m_socket.open(udp::v4(), ec);
if (ec)
{
disable(ec, l);
disable(ec);
return;
}
m_socket.bind(udp::endpoint(address_v4::any(), 0), ec);
if (ec)
{
disable(ec, l);
disable(ec);
return;
}
ADD_OUTSTANDING_ASYNC("natpmp::on_reply");
m_socket.async_receive_from(boost::asio::buffer(&m_response_buffer, 16)
, m_remote, boost::bind(&natpmp::on_reply, self(), _1, _2));
send_get_ip_address_request(l);
send_get_ip_address_request();
for (std::vector<mapping_t>::iterator i = m_mappings.begin()
, end(m_mappings.end()); i != end; ++i)
@ -133,19 +134,20 @@ void natpmp::start()
|| i->action != mapping_t::action_none)
continue;
i->action = mapping_t::action_add;
update_mapping(i - m_mappings.begin(), l);
update_mapping(i - m_mappings.begin());
}
}
void natpmp::send_get_ip_address_request(std::unique_lock<std::mutex>& l)
void natpmp::send_get_ip_address_request()
{
TORRENT_ASSERT(is_single_thread());
using namespace libtorrent::detail;
char buf[2];
char* out = buf;
write_uint8(0, out); // NAT-PMP version
write_uint8(0, out); // public IP address request opcode
log("==> get public IP address", l);
log("==> get public IP address");
error_code ec;
m_socket.send_to(boost::asio::buffer(buf, sizeof(buf)), m_nat_endpoint, 0, ec);
@ -153,7 +155,7 @@ void natpmp::send_get_ip_address_request(std::unique_lock<std::mutex>& l)
bool natpmp::get_mapping(int index, int& local_port, int& external_port, int& protocol) const
{
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(is_single_thread());
TORRENT_ASSERT(index < int(m_mappings.size()) && index >= 0);
if (index >= int(m_mappings.size()) || index < 0) return false;
@ -165,15 +167,15 @@ bool natpmp::get_mapping(int index, int& local_port, int& external_port, int& pr
return true;
}
void natpmp::log(char const* msg, std::unique_lock<std::mutex>& l)
void natpmp::log(char const* msg)
{
l.unlock();
TORRENT_ASSERT(is_single_thread());
m_log_callback(msg);
l.lock();
}
void natpmp::disable(error_code const& ec, std::unique_lock<std::mutex>& l)
void natpmp::disable(error_code const& ec)
{
TORRENT_ASSERT(is_single_thread());
m_disabled = true;
for (std::vector<mapping_t>::iterator i = m_mappings.begin()
@ -183,16 +185,14 @@ void natpmp::disable(error_code const& ec, std::unique_lock<std::mutex>& l)
int const proto = i->protocol;
i->protocol = none;
int index = i - m_mappings.begin();
l.unlock();
m_callback(index, address(), 0, proto, ec);
l.lock();
}
close_impl(l);
close_impl();
}
void natpmp::delete_mapping(int index)
{
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(is_single_thread());
TORRENT_ASSERT(index < int(m_mappings.size()) && index >= 0);
if (index >= int(m_mappings.size()) || index < 0) return;
@ -207,12 +207,12 @@ void natpmp::delete_mapping(int index)
}
m.action = mapping_t::action_delete;
update_mapping(index, l);
update_mapping(index);
}
int natpmp::add_mapping(protocol_type p, int external_port, int local_port)
{
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(is_single_thread());
if (m_disabled) return -1;
@ -245,12 +245,13 @@ int natpmp::add_mapping(protocol_type p, int external_port, int local_port)
}
#endif
update_mapping(mapping_index, l);
update_mapping(mapping_index);
return mapping_index;
}
void natpmp::try_next_mapping(int i, std::unique_lock<std::mutex>& l)
void natpmp::try_next_mapping(int i)
{
TORRENT_ASSERT(is_single_thread());
#ifdef NATPMP_LOG
time_point now = aux::time_now();
for (std::vector<mapping_t>::iterator m = m_mappings.begin()
@ -267,7 +268,7 @@ void natpmp::try_next_mapping(int i, std::unique_lock<std::mutex>& l)
#endif
if (i < int(m_mappings.size()) - 1)
{
update_mapping(i + 1, l);
update_mapping(i + 1);
return;
}
@ -293,11 +294,12 @@ void natpmp::try_next_mapping(int i, std::unique_lock<std::mutex>& l)
std::cout << " updating " << (m - m_mappings.begin()) << std::endl;
#endif
update_mapping(m - m_mappings.begin(), l);
update_mapping(m - m_mappings.begin());
}
void natpmp::update_mapping(int i, std::unique_lock<std::mutex>& l)
void natpmp::update_mapping(int i)
{
TORRENT_ASSERT(is_single_thread());
if (i == int(m_mappings.size()))
{
if (m_abort)
@ -316,7 +318,7 @@ void natpmp::update_mapping(int i, std::unique_lock<std::mutex>& l)
if (m.action == mapping_t::action_none
|| m.protocol == none)
{
try_next_mapping(i, l);
try_next_mapping(i);
return;
}
@ -325,12 +327,13 @@ void natpmp::update_mapping(int i, std::unique_lock<std::mutex>& l)
// the socket is not currently in use
// send out a mapping request
m_retry_count = 0;
send_map_request(i, l);
send_map_request(i);
}
}
void natpmp::send_map_request(int i, std::unique_lock<std::mutex>& l)
void natpmp::send_map_request(int i)
{
TORRENT_ASSERT(is_single_thread());
using namespace libtorrent::detail;
TORRENT_ASSERT(m_currently_mapping == -1
@ -354,7 +357,7 @@ void natpmp::send_map_request(int i, std::unique_lock<std::mutex>& l)
, i, m.action == mapping_t::action_add ? "add" : "delete"
, m.protocol == udp ? "udp" : "tcp"
, m.local_port, m.external_port, ttl);
log(msg, l);
log(msg);
error_code ec;
m_socket.send_to(boost::asio::buffer(buf, sizeof(buf)), m_nat_endpoint, 0, ec);
@ -367,7 +370,7 @@ void natpmp::send_map_request(int i, std::unique_lock<std::mutex>& l)
// immediately
m_currently_mapping = -1;
m.action = mapping_t::action_none;
try_next_mapping(i, l);
try_next_mapping(i);
}
else
{
@ -381,9 +384,9 @@ void natpmp::send_map_request(int i, std::unique_lock<std::mutex>& l)
void natpmp::resend_request(int i, error_code const& e)
{
TORRENT_ASSERT(is_single_thread());
COMPLETE_ASYNC("natpmp::resend_request");
if (e) return;
std::unique_lock<std::mutex> l(m_mutex);
if (m_currently_mapping != i) return;
// if we're shutting down, don't retry, just move on
@ -394,16 +397,16 @@ void natpmp::resend_request(int i, error_code const& e)
m_mappings[i].action = mapping_t::action_none;
// try again in two hours
m_mappings[i].expires = aux::time_now() + hours(2);
try_next_mapping(i, l);
try_next_mapping(i);
return;
}
send_map_request(i, l);
send_map_request(i);
}
void natpmp::on_reply(error_code const& e
, std::size_t bytes_transferred)
{
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(is_single_thread());
COMPLETE_ASYNC("natpmp::on_reply");
@ -413,7 +416,7 @@ void natpmp::on_reply(error_code const& e
char msg[200];
snprintf(msg, sizeof(msg), "error on receiving reply: %s"
, convert_from_native(e.message()).c_str());
log(msg, l);
log(msg);
return;
}
@ -430,7 +433,7 @@ void natpmp::on_reply(error_code const& e
/*
if ((random() % 2) == 0)
{
log(" simulating drop", l);
log(" simulating drop");
return;
}
*/
@ -439,7 +442,7 @@ void natpmp::on_reply(error_code const& e
char msg[200];
snprintf(msg, sizeof(msg), "received packet from wrong IP: %s"
, print_endpoint(m_remote).c_str());
log(msg, l);
log(msg);
return;
}
@ -450,7 +453,7 @@ void natpmp::on_reply(error_code const& e
{
char msg[200];
snprintf(msg, sizeof(msg), "received packet of invalid size: %d", int(bytes_transferred));
log(msg, l);
log(msg);
return;
}
@ -467,7 +470,7 @@ void natpmp::on_reply(error_code const& e
char msg[200];
snprintf(msg, sizeof(msg), "<== public IP address [ %s ]", print_address(m_external_ip).c_str());
log(msg, l);
log(msg);
return;
}
@ -476,7 +479,7 @@ void natpmp::on_reply(error_code const& e
{
char msg[200];
snprintf(msg, sizeof(msg), "received packet of invalid size: %d", int(bytes_transferred));
log(msg, l);
log(msg);
return;
}
@ -498,7 +501,7 @@ void natpmp::on_reply(error_code const& e
{
snprintf(msg + num_chars, sizeof(msg) - num_chars, "unexpected version: %u"
, version);
log(msg, l);
log(msg);
}
mapping_t* m = 0;
@ -518,12 +521,12 @@ void natpmp::on_reply(error_code const& e
if (m == 0)
{
snprintf(msg + num_chars, sizeof(msg) - num_chars, " not found in map table");
log(msg, l);
log(msg);
return;
}
m->outstanding_request = false;
log(msg, l);
log(msg);
if (public_port == 0 || lifetime == 0)
{
@ -552,18 +555,14 @@ void natpmp::on_reply(error_code const& e
m->expires = aux::time_now() + hours(2);
int const proto = m->protocol;
l.unlock();
m_callback(index, address(), 0, proto
, error_code(ev, get_libtorrent_category()));
l.lock();
}
else if (m->action == mapping_t::action_add)
{
int const proto = m->protocol;
l.unlock();
m_callback(index, m_external_ip, m->external_port, proto
, error_code(errors::no_error, get_libtorrent_category()));
l.lock();
}
if (m_abort) return;
@ -571,12 +570,13 @@ void natpmp::on_reply(error_code const& e
m_currently_mapping = -1;
m->action = mapping_t::action_none;
m_send_timer.cancel(ec);
update_expiration_timer(l);
try_next_mapping(index, l);
update_expiration_timer();
try_next_mapping(index);
}
void natpmp::update_expiration_timer(std::unique_lock<std::mutex>& l)
void natpmp::update_expiration_timer()
{
TORRENT_ASSERT(is_single_thread());
if (m_abort) return;
time_point now = aux::time_now() + milliseconds(100);
@ -606,10 +606,10 @@ void natpmp::update_expiration_timer(std::unique_lock<std::mutex>& l)
{
char msg[200];
snprintf(msg, sizeof(msg), "mapping %u expired", index);
log(msg, l);
log(msg);
i->action = mapping_t::action_add;
if (m_next_refresh == index) m_next_refresh = -1;
update_mapping(index, l);
update_mapping(index);
}
else if (i->expires < min_expire)
{
@ -641,27 +641,28 @@ void natpmp::update_expiration_timer(std::unique_lock<std::mutex>& l)
void natpmp::mapping_expired(error_code const& e, int i)
{
TORRENT_ASSERT(is_single_thread());
COMPLETE_ASYNC("natpmp::mapping_expired");
if (e) return;
std::unique_lock<std::mutex> l(m_mutex);
char msg[200];
snprintf(msg, sizeof(msg), "mapping %u expired", i);
log(msg, l);
log(msg);
m_mappings[i].action = mapping_t::action_add;
if (m_next_refresh == i) m_next_refresh = -1;
update_mapping(i, l);
update_mapping(i);
}
void natpmp::close()
{
std::unique_lock<std::mutex> l(m_mutex);
close_impl(l);
TORRENT_ASSERT(is_single_thread());
close_impl();
}
void natpmp::close_impl(std::unique_lock<std::mutex>& l)
void natpmp::close_impl()
{
TORRENT_ASSERT(is_single_thread());
m_abort = true;
log("closing", l);
log("closing");
#ifdef NATPMP_LOG
std::cout << time_now_string() << " close" << std::endl;
time_point now = aux::time_now();
@ -685,6 +686,6 @@ void natpmp::close_impl(std::unique_lock<std::mutex>& l)
error_code ec;
m_refresh_timer.cancel(ec);
m_currently_mapping = -1;
update_mapping(0, l);
update_mapping(0);
}

239
src/upnp.cpp
View File

@ -90,10 +90,13 @@ upnp::upnp(io_service& ios
, m_last_if_update(min_time())
{
TORRENT_ASSERT(cb);
TORRENT_ASSERT(is_single_thread());
}
void upnp::start()
{
TORRENT_ASSERT(is_single_thread());
error_code ec;
m_socket.open(boost::bind(&upnp::on_reply, self(), _1, _2, _3)
, m_refresh_timer.get_io_service(), ec);
@ -103,26 +106,27 @@ void upnp::start()
upnp::~upnp()
{
TORRENT_ASSERT(is_single_thread());
}
void upnp::discover_device()
{
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(is_single_thread());
if (m_socket.num_send_sockets() == 0)
log("No network interfaces to broadcast to", l);
log("No network interfaces to broadcast to");
discover_device_impl(l);
discover_device_impl();
}
void upnp::log(char const* msg, std::unique_lock<std::mutex>& l)
void upnp::log(char const* msg)
{
l.unlock();
TORRENT_ASSERT(is_single_thread());
m_log_callback(msg);
l.lock();
}
void upnp::discover_device_impl(std::unique_lock<std::mutex>& l)
void upnp::discover_device_impl()
{
TORRENT_ASSERT(is_single_thread());
const char msearch[] =
"M-SEARCH * HTTP/1.1\r\n"
"HOST: 239.255.255.250:1900\r\n"
@ -143,8 +147,8 @@ void upnp::discover_device_impl(std::unique_lock<std::mutex>& l)
char msg[500];
snprintf(msg, sizeof(msg), "broadcast failed: %s. Aborting."
, convert_from_native(ec.message()).c_str());
log(msg, l);
disable(ec, l);
log(msg);
disable(ec);
return;
}
@ -154,22 +158,21 @@ void upnp::discover_device_impl(std::unique_lock<std::mutex>& l)
m_broadcast_timer.async_wait(boost::bind(&upnp::resend_request
, self(), _1));
log("broadcasting search for rootdevice", l);
log("broadcasting search for rootdevice");
}
// returns a reference to a mapping or -1 on failure
int upnp::add_mapping(upnp::protocol_type p, int external_port, int local_port)
{
TORRENT_ASSERT(is_single_thread());
// external port 0 means _every_ port
TORRENT_ASSERT(external_port != 0);
std::unique_lock<std::mutex> l(m_mutex);
char msg[500];
snprintf(msg, sizeof(msg), "adding port map: [ protocol: %s ext_port: %u "
"local_port: %u ] %s", (p == tcp?"tcp":"udp"), external_port
, local_port, m_disabled ? "DISABLED": "");
log(msg, l);
log(msg);
if (m_disabled) return -1;
std::vector<global_mapping_t>::iterator mapping_it = std::find_if(
@ -203,7 +206,7 @@ int upnp::add_mapping(upnp::protocol_type p, int external_port, int local_port)
m.external_port = external_port;
m.local_port = local_port;
if (d.service_namespace) update_map(d, mapping_index, l);
if (d.service_namespace) update_map(d, mapping_index);
}
return mapping_index;
@ -211,7 +214,7 @@ int upnp::add_mapping(upnp::protocol_type p, int external_port, int local_port)
void upnp::delete_mapping(int mapping)
{
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(is_single_thread());
if (mapping >= int(m_mappings.size())) return;
@ -221,7 +224,7 @@ void upnp::delete_mapping(int mapping)
snprintf(msg, sizeof(msg), "deleting port map: [ protocol: %s ext_port: %u "
"local_port: %u ]", (m.protocol == tcp?"tcp":"udp"), m.external_port
, m.local_port);
log(msg, l);
log(msg);
if (m.protocol == none) return;
@ -234,12 +237,13 @@ void upnp::delete_mapping(int mapping)
TORRENT_ASSERT(mapping < int(d.mapping.size()));
d.mapping[mapping].action = mapping_t::action_delete;
if (d.service_namespace) update_map(d, mapping, l);
if (d.service_namespace) update_map(d, mapping);
}
}
bool upnp::get_mapping(int index, int& local_port, int& external_port, int& protocol) const
{
TORRENT_ASSERT(is_single_thread());
TORRENT_ASSERT(index < int(m_mappings.size()) && index >= 0);
if (index >= int(m_mappings.size()) || index < 0) return false;
global_mapping_t const& m = m_mappings[index];
@ -252,25 +256,24 @@ bool upnp::get_mapping(int index, int& local_port, int& external_port, int& prot
void upnp::resend_request(error_code const& ec)
{
TORRENT_ASSERT(is_single_thread());
COMPLETE_ASYNC("upnp::resend_request");
if (ec) return;
boost::shared_ptr<upnp> me(self());
std::unique_lock<std::mutex> l(m_mutex);
if (m_closing) return;
if (m_retry_count < 12
&& (m_devices.empty() || m_retry_count < 4))
{
discover_device_impl(l);
discover_device_impl();
return;
}
if (m_devices.empty())
{
disable(errors::no_router, l);
disable(errors::no_router);
return;
}
@ -287,7 +290,7 @@ void upnp::resend_request(error_code const& ec)
{
char msg[500];
snprintf(msg, sizeof(msg), "connecting to: %s", d.url.c_str());
log(msg, l);
log(msg);
if (d.upnp_connection) d.upnp_connection->close();
d.upnp_connection.reset(new http_connection(m_io_service
, m_resolver
@ -300,7 +303,7 @@ void upnp::resend_request(error_code const& ec)
TORRENT_DECLARE_DUMMY(std::exception, exc);
char msg[500];
snprintf(msg, sizeof(msg), "connection failed to: %s %s", d.url.c_str(), exc.what());
log(msg, l);
log(msg);
d.disabled = true;
}
}
@ -310,10 +313,9 @@ void upnp::resend_request(error_code const& ec)
void upnp::on_reply(udp::endpoint const& from, char* buffer
, std::size_t bytes_transferred)
{
TORRENT_ASSERT(is_single_thread());
boost::shared_ptr<upnp> me(self());
std::unique_lock<std::mutex> l(m_mutex);
using namespace libtorrent::detail;
// parse out the url for the device
@ -351,7 +353,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
char msg[500];
snprintf(msg, sizeof(msg), "when receiving response from: %s: %s"
, print_endpoint(from).c_str(), convert_from_native(ec.message()).c_str());
log(msg, l);
log(msg);
}
m_last_if_update = aux::time_now();
}
@ -370,7 +372,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
num_chars += snprintf(msg + num_chars, sizeof(msg) - num_chars, "(%s,%s) "
, print_address(i->interface_address).c_str(), print_address(i->netmask).c_str());
}
log(msg, l);
log(msg);
return;
}
@ -389,7 +391,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
snprintf(msg, sizeof(msg), "failed to enumerate routes when "
"receiving response from: %s: %s"
, print_endpoint(from).c_str(), convert_from_native(ec.message()).c_str());
log(msg, l);
log(msg);
}
else
{
@ -403,7 +405,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
num_chars += snprintf(msg + num_chars, sizeof(msg) - num_chars, "(%s,%s) "
, print_address(i->gateway).c_str(), print_address(i->netmask).c_str());
}
log(msg, l);
log(msg);
non_router = true;
}
}
@ -418,7 +420,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
char msg[500];
snprintf(msg, sizeof(msg), "received malformed HTTP from: %s"
, print_endpoint(from).c_str());
log(msg, l);
log(msg);
return;
}
@ -429,14 +431,14 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
char msg[500];
snprintf(msg, sizeof(msg), "HTTP status %u from %s"
, p.status_code(), print_endpoint(from).c_str());
log(msg, l);
log(msg);
}
else
{
char msg[500];
snprintf(msg, sizeof(msg), "HTTP method %s from %s"
, p.method().c_str(), print_endpoint(from).c_str());
log(msg, l);
log(msg);
}
return;
}
@ -446,7 +448,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
char msg[500];
snprintf(msg, sizeof(msg), "incomplete HTTP packet from %s"
, print_endpoint(from).c_str());
log(msg, l);
log(msg);
return;
}
@ -456,7 +458,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
char msg[500];
snprintf(msg, sizeof(msg), "missing location header from %s"
, print_endpoint(from).c_str());
log(msg, l);
log(msg);
return;
}
@ -479,7 +481,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
char msg[500];
snprintf(msg, sizeof(msg), "invalid URL %s from %s: %s"
, d.url.c_str(), print_endpoint(from).c_str(), convert_from_native(ec.message()).c_str());
log(msg, l);
log(msg);
return;
}
@ -491,7 +493,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
char msg[500];
snprintf(msg, sizeof(msg), "unsupported protocol %s from %s"
, protocol.c_str(), print_endpoint(from).c_str());
log(msg, l);
log(msg);
return;
}
@ -500,7 +502,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
char msg[500];
snprintf(msg, sizeof(msg), "URL with port 0 from %s"
, print_endpoint(from).c_str());
log(msg, l);
log(msg);
return;
}
@ -508,7 +510,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
char msg[500];
snprintf(msg, sizeof(msg), "found rootdevice: %s (%d)"
, d.url.c_str(), int(m_devices.size()));
log(msg, l);
log(msg);
}
if (m_devices.size() >= 50)
@ -516,7 +518,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
char msg[500];
snprintf(msg, sizeof(msg), "too many rootdevices: (%d). Ignoring %s"
, int(m_devices.size()), d.url.c_str());
log(msg, l);
log(msg);
return;
}
d.non_router = non_router;
@ -537,7 +539,7 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
// iterate over the devices we know and connect and issue the mappings
try_map_upnp(l);
try_map_upnp();
if (m_ignore_non_routers)
{
@ -553,16 +555,17 @@ void upnp::on_reply(udp::endpoint const& from, char* buffer
void upnp::map_timer(error_code const& ec)
{
TORRENT_ASSERT(is_single_thread());
COMPLETE_ASYNC("upnp::map_timer");
if (ec) return;
if (m_closing) return;
std::unique_lock<std::mutex> l(m_mutex);
try_map_upnp(l, true);
try_map_upnp(true);
}
void upnp::try_map_upnp(std::unique_lock<std::mutex>& l, bool timer)
void upnp::try_map_upnp(bool timer)
{
TORRENT_ASSERT(is_single_thread());
if (m_devices.empty()) return;
bool override_ignore_non_routers = false;
@ -578,7 +581,7 @@ void upnp::try_map_upnp(std::unique_lock<std::mutex>& l, bool timer)
{
char msg[500];
snprintf(msg, sizeof(msg), "overriding ignore non-routers");
log(msg, l);
log(msg);
}
}
@ -604,7 +607,7 @@ void upnp::try_map_upnp(std::unique_lock<std::mutex>& l, bool timer)
char msg[500];
snprintf(msg, sizeof(msg), "connecting to: %s"
, d.url.c_str());
log(msg, l);
log(msg);
if (d.upnp_connection) d.upnp_connection->close();
d.upnp_connection.reset(new http_connection(m_io_service
@ -619,7 +622,7 @@ void upnp::try_map_upnp(std::unique_lock<std::mutex>& l, bool timer)
char msg[500];
snprintf(msg, sizeof(msg), "connection failed to: %s %s"
, d.url.c_str(), exc.what());
log(msg, l);
log(msg);
d.disabled = true;
}
}
@ -627,8 +630,9 @@ void upnp::try_map_upnp(std::unique_lock<std::mutex>& l, bool timer)
}
void upnp::post(upnp::rootdevice const& d, char const* soap
, char const* soap_action, std::unique_lock<std::mutex>& l)
, char const* soap_action)
{
TORRENT_ASSERT(is_single_thread());
TORRENT_ASSERT(d.magic == 1337);
TORRENT_ASSERT(d.upnp_connection);
@ -647,12 +651,12 @@ void upnp::post(upnp::rootdevice const& d, char const* soap
char msg[1024];
snprintf(msg, sizeof(msg), "sending: %s", header);
log(msg, l);
log(msg);
}
void upnp::create_port_mapping(http_connection& c, rootdevice& d, int i)
{
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(is_single_thread());
TORRENT_ASSERT(d.magic == 1337);
@ -661,7 +665,7 @@ void upnp::create_port_mapping(http_connection& c, rootdevice& d, int i)
TORRENT_ASSERT(d.disabled);
char msg[500];
snprintf(msg, sizeof(msg), "mapping %u aborted", i);
log(msg, l);
log(msg);
return;
}
@ -691,14 +695,15 @@ void upnp::create_port_mapping(http_connection& c, rootdevice& d, int i)
, m_user_agent.c_str(), local_endpoint.c_str(), d.mapping[i].local_port
, d.lease_duration, soap_action);
post(d, soap, soap_action, l);
post(d, soap, soap_action);
}
void upnp::next(rootdevice& d, int i, std::unique_lock<std::mutex>& l)
void upnp::next(rootdevice& d, int i)
{
TORRENT_ASSERT(is_single_thread());
if (i < num_mappings() - 1)
{
update_map(d, i + 1, l);
update_map(d, i + 1);
}
else
{
@ -707,12 +712,13 @@ void upnp::next(rootdevice& d, int i, std::unique_lock<std::mutex>& l)
, boost::bind(&mapping_t::action, _1) != int(mapping_t::action_none));
if (j == d.mapping.end()) return;
update_map(d, j - d.mapping.begin(), l);
update_map(d, j - d.mapping.begin());
}
}
void upnp::update_map(rootdevice& d, int i, std::unique_lock<std::mutex>& l)
void upnp::update_map(rootdevice& d, int i)
{
TORRENT_ASSERT(is_single_thread());
TORRENT_ASSERT(d.magic == 1337);
TORRENT_ASSERT(i < int(d.mapping.size()));
TORRENT_ASSERT(d.mapping.size() == m_mappings.size());
@ -728,9 +734,9 @@ void upnp::update_map(rootdevice& d, int i, std::unique_lock<std::mutex>& l)
{
char msg[500];
snprintf(msg, sizeof(msg), "mapping %u does not need updating, skipping", i);
log(msg, l);
log(msg);
m.action = mapping_t::action_none;
next(d, i, l);
next(d, i);
return;
}
@ -739,14 +745,14 @@ void upnp::update_map(rootdevice& d, int i, std::unique_lock<std::mutex>& l)
char msg[500];
snprintf(msg, sizeof(msg), "connecting to %s", d.hostname.c_str());
log(msg, l);
log(msg);
if (m.action == mapping_t::action_add)
{
if (m.failcount > 5)
{
m.action = mapping_t::action_none;
// giving up
next(d, i, l);
next(d, i);
return;
}
@ -777,7 +783,7 @@ void upnp::update_map(rootdevice& d, int i, std::unique_lock<std::mutex>& l)
void upnp::delete_port_mapping(rootdevice& d, int i)
{
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(is_single_thread());
TORRENT_ASSERT(d.magic == 1337);
@ -786,7 +792,7 @@ void upnp::delete_port_mapping(rootdevice& d, int i)
TORRENT_ASSERT(d.disabled);
char msg[500];
snprintf(msg, sizeof(msg), "unmapping %u aborted", i);
log(msg, l);
log(msg);
return;
}
@ -807,7 +813,7 @@ void upnp::delete_port_mapping(rootdevice& d, int i)
, (d.mapping[i].protocol == udp ? "UDP" : "TCP")
, soap_action);
post(d, soap, soap_action, l);
post(d, soap, soap_action);
}
namespace
@ -878,10 +884,9 @@ void upnp::on_upnp_xml(error_code const& e
, libtorrent::http_parser const& p, rootdevice& d
, http_connection& c)
{
TORRENT_ASSERT(is_single_thread());
boost::shared_ptr<upnp> me(self());
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(d.magic == 1337);
if (d.upnp_connection && d.upnp_connection.get() == &c)
{
@ -894,7 +899,7 @@ void upnp::on_upnp_xml(error_code const& e
char msg[500];
snprintf(msg, sizeof(msg), "error while fetching control url from: %s: %s"
, d.url.c_str(), convert_from_native(e.message()).c_str());
log(msg, l);
log(msg);
d.disabled = true;
return;
}
@ -904,7 +909,7 @@ void upnp::on_upnp_xml(error_code const& e
char msg[500];
snprintf(msg, sizeof(msg), "error while fetching control url from: %s: incomplete HTTP message"
, d.url.c_str());
log(msg, l);
log(msg);
d.disabled = true;
return;
}
@ -914,7 +919,7 @@ void upnp::on_upnp_xml(error_code const& e
char msg[500];
snprintf(msg, sizeof(msg), "error while fetching control url from: %s: %s"
, d.url.c_str(), convert_from_native(p.message()).c_str());
log(msg, l);
log(msg);
d.disabled = true;
return;
}
@ -927,7 +932,7 @@ void upnp::on_upnp_xml(error_code const& e
char msg[500];
snprintf(msg, sizeof(msg), "could not find a port mapping interface in response from: %s"
, d.url.c_str());
log(msg, l);
log(msg);
d.disabled = true;
return;
}
@ -965,7 +970,7 @@ void upnp::on_upnp_xml(error_code const& e
"urlbase: %s in response from %s"
, d.control_url.c_str(), d.service_namespace
, s.url_base.c_str(), d.url.c_str());
log(msg, l);
log(msg);
}
boost::tie(protocol, auth, d.hostname, d.port, d.path)
@ -977,7 +982,7 @@ void upnp::on_upnp_xml(error_code const& e
char msg[500];
snprintf(msg, sizeof(msg), "failed to parse URL '%s': %s"
, d.control_url.c_str(), convert_from_native(ec.message()).c_str());
log(msg, l);
log(msg);
d.disabled = true;
return;
}
@ -993,7 +998,7 @@ void upnp::on_upnp_xml(error_code const& e
void upnp::get_ip_address(rootdevice& d)
{
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(is_single_thread());
TORRENT_ASSERT(d.magic == 1337);
@ -1002,7 +1007,7 @@ void upnp::get_ip_address(rootdevice& d)
TORRENT_ASSERT(d.disabled);
char msg[500];
snprintf(msg, sizeof(msg), "getting external IP address");
log(msg, l);
log(msg);
return;
}
@ -1018,11 +1023,12 @@ void upnp::get_ip_address(rootdevice& d)
, soap_action, d.service_namespace
, soap_action);
post(d, soap, soap_action, l);
post(d, soap, soap_action);
}
void upnp::disable(error_code const& ec, std::unique_lock<std::mutex>& l)
void upnp::disable(error_code const& ec)
{
TORRENT_ASSERT(is_single_thread());
m_disabled = true;
// kill all mappings
@ -1032,9 +1038,7 @@ void upnp::disable(error_code const& ec, std::unique_lock<std::mutex>& l)
if (i->protocol == none) continue;
int const proto = i->protocol;
i->protocol = none;
l.unlock();
m_callback(i - m_mappings.begin(), address(), 0, proto, ec);
l.lock();
}
// we cannot clear the devices since there
@ -1161,10 +1165,9 @@ void upnp::on_upnp_get_ip_address_response(error_code const& e
, libtorrent::http_parser const& p, rootdevice& d
, http_connection& c)
{
TORRENT_ASSERT(is_single_thread());
boost::shared_ptr<upnp> me(self());
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(d.magic == 1337);
if (d.upnp_connection && d.upnp_connection.get() == &c)
{
@ -1179,15 +1182,15 @@ void upnp::on_upnp_get_ip_address_response(error_code const& e
char msg[500];
snprintf(msg, sizeof(msg), "error while getting external IP address: %s"
, convert_from_native(e.message()).c_str());
log(msg, l);
if (num_mappings() > 0) update_map(d, 0, l);
log(msg);
if (num_mappings() > 0) update_map(d, 0);
return;
}
if (!p.header_finished())
{
log("error while getting external IP address: incomplete http message", l);
if (num_mappings() > 0) update_map(d, 0, l);
log("error while getting external IP address: incomplete http message");
if (num_mappings() > 0) update_map(d, 0);
return;
}
@ -1196,8 +1199,8 @@ void upnp::on_upnp_get_ip_address_response(error_code const& e
char msg[500];
snprintf(msg, sizeof(msg), "error while getting external IP address: %s"
, convert_from_native(p.message()).c_str());
log(msg, l);
if (num_mappings() > 0) update_map(d, 0, l);
log(msg);
if (num_mappings() > 0) update_map(d, 0);
return;
}
@ -1214,7 +1217,7 @@ void upnp::on_upnp_get_ip_address_response(error_code const& e
char msg[500];
snprintf(msg, sizeof(msg), "get external IP address response: %s"
, std::string(p.get_body().begin, p.get_body().end).c_str());
log(msg, l);
log(msg);
}
ip_address_parse_state s;
@ -1225,29 +1228,28 @@ void upnp::on_upnp_get_ip_address_response(error_code const& e
char msg[500];
snprintf(msg, sizeof(msg), "error while getting external IP address, code: %u"
, s.error_code);
log(msg, l);
log(msg);
}
if (!s.ip_address.empty()) {
char msg[500];
snprintf(msg, sizeof(msg), "got router external IP address %s", s.ip_address.c_str());
log(msg, l);
log(msg);
d.external_ip = address::from_string(s.ip_address.c_str(), ignore_error);
} else {
log("failed to find external IP address in response", l);
log("failed to find external IP address in response");
}
if (num_mappings() > 0) update_map(d, 0, l);
if (num_mappings() > 0) update_map(d, 0);
}
void upnp::on_upnp_map_response(error_code const& e
, libtorrent::http_parser const& p, rootdevice& d, int mapping
, http_connection& c)
{
TORRENT_ASSERT(is_single_thread());
boost::shared_ptr<upnp> me(self());
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(d.magic == 1337);
if (d.upnp_connection && d.upnp_connection.get() == &c)
{
@ -1260,7 +1262,7 @@ void upnp::on_upnp_map_response(error_code const& e
char msg[500];
snprintf(msg, sizeof(msg), "error while adding port map: %s"
, convert_from_native(e.message()).c_str());
log(msg, l);
log(msg);
d.disabled = true;
return;
}
@ -1286,8 +1288,8 @@ void upnp::on_upnp_map_response(error_code const& e
if (!p.header_finished())
{
log("error while adding port map: incomplete http message", l);
next(d, mapping, l);
log("error while adding port map: incomplete http message");
next(d, mapping);
return;
}
@ -1302,8 +1304,8 @@ void upnp::on_upnp_map_response(error_code const& e
char msg[300];
snprintf(msg, sizeof(msg), "error while adding port map: invalid content-type, \"%s\". Expected text/xml or application/soap+xml"
, ct.c_str());
log(msg, l);
next(d, mapping, l);
log(msg);
next(d, mapping);
return;
}
@ -1320,7 +1322,7 @@ void upnp::on_upnp_map_response(error_code const& e
char msg[500];
snprintf(msg, sizeof(msg), "error while adding port map, code: %u"
, s.error_code);
log(msg, l);
log(msg);
}
mapping_t& m = d.mapping[mapping];
@ -1331,12 +1333,12 @@ void upnp::on_upnp_map_response(error_code const& e
d.lease_duration = 0;
m.action = mapping_t::action_add;
++m.failcount;
update_map(d, mapping, l);
update_map(d, mapping);
return;
}
else if (s.error_code == 727)
{
return_error(mapping, s.error_code, l);
return_error(mapping, s.error_code);
}
else if ((s.error_code == 718 || s.error_code == 501) && m.failcount < 4)
{
@ -1346,24 +1348,22 @@ void upnp::on_upnp_map_response(error_code const& e
m.external_port = 40000 + (random() % 10000);
m.action = mapping_t::action_add;
++m.failcount;
update_map(d, mapping, l);
update_map(d, mapping);
return;
}
else if (s.error_code != -1)
{
return_error(mapping, s.error_code, l);
return_error(mapping, s.error_code);
}
char msg[500];
snprintf(msg, sizeof(msg), "map response: %s"
, std::string(p.get_body().begin, p.get_body().end).c_str());
log(msg, l);
log(msg);
if (s.error_code == -1)
{
l.unlock();
m_callback(mapping, d.external_ip, m.external_port, m.protocol, error_code());
l.lock();
if (d.lease_duration > 0)
{
m.expires = aux::time_now()
@ -1385,11 +1385,12 @@ void upnp::on_upnp_map_response(error_code const& e
m.failcount = 0;
}
next(d, mapping, l);
next(d, mapping);
}
void upnp::return_error(int mapping, int code, std::unique_lock<std::mutex>& l)
void upnp::return_error(int mapping, int code)
{
TORRENT_ASSERT(is_single_thread());
int num_errors = sizeof(error_codes) / sizeof(error_codes[0]);
error_code_t* end = error_codes + num_errors;
error_code_t tmp = {code, 0};
@ -1403,19 +1404,16 @@ void upnp::return_error(int mapping, int code, std::unique_lock<std::mutex>& l)
error_string += e->msg;
}
const int proto = m_mappings[mapping].protocol;
l.unlock();
m_callback(mapping, address(), 0, proto, error_code(code, get_upnp_category()));
l.lock();
}
void upnp::on_upnp_unmap_response(error_code const& e
, libtorrent::http_parser const& p, rootdevice& d, int mapping
, http_connection& c)
{
TORRENT_ASSERT(is_single_thread());
boost::shared_ptr<upnp> me(self());
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(d.magic == 1337);
if (d.upnp_connection && d.upnp_connection.get() == &c)
{
@ -1428,25 +1426,25 @@ void upnp::on_upnp_unmap_response(error_code const& e
char msg[500];
snprintf(msg, sizeof(msg), "error while deleting portmap: %s"
, convert_from_native(e.message()).c_str());
log(msg, l);
log(msg);
}
else if (!p.header_finished())
{
log("error while deleting portmap: incomplete http message", l);
log("error while deleting portmap: incomplete http message");
}
else if (p.status_code() != 200)
{
char msg[500];
snprintf(msg, sizeof(msg), "error while deleting portmap: %s"
, convert_from_native(p.message()).c_str());
log(msg, l);
log(msg);
}
else
{
char msg[500];
snprintf(msg, sizeof(msg), "unmap response: %s"
, std::string(p.get_body().begin, p.get_body().end).c_str());
log(msg, l);
log(msg);
}
error_code_parse_state s;
@ -1459,27 +1457,24 @@ void upnp::on_upnp_unmap_response(error_code const& e
int const proto = m_mappings[mapping].protocol;
l.unlock();
m_callback(mapping, address(), 0, proto, p.status_code() != 200
? error_code(p.status_code(), get_http_category())
: error_code(s.error_code, get_upnp_category()));
l.lock();
d.mapping[mapping].protocol = none;
next(d, mapping, l);
next(d, mapping);
}
void upnp::on_expire(error_code const& ec)
{
TORRENT_ASSERT(is_single_thread());
COMPLETE_ASYNC("upnp::on_expire");
if (ec) return;
time_point now = aux::time_now();
time_point next_expire = max_time();
std::unique_lock<std::mutex> l(m_mutex);
for (std::set<rootdevice>::iterator i = m_devices.begin()
, end(m_devices.end()); i != end; ++i)
{
@ -1493,7 +1488,7 @@ void upnp::on_expire(error_code const& ec)
if (d.mapping[m].expires < now)
{
d.mapping[m].expires = max_time();
update_map(d, m, l);
update_map(d, m);
}
else if (d.mapping[m].expires < next_expire)
{
@ -1512,7 +1507,7 @@ void upnp::on_expire(error_code const& ec)
void upnp::close()
{
std::unique_lock<std::mutex> l(m_mutex);
TORRENT_ASSERT(is_single_thread());
error_code ec;
m_refresh_timer.cancel(ec);
@ -1539,7 +1534,7 @@ void upnp::close()
j->action = mapping_t::action_delete;
m_mappings[j - d.mapping.begin()].protocol = none;
}
if (num_mappings() > 0) update_map(d, 0, l);
if (num_mappings() > 0) update_map(d, 0);
}
}