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

updates to upnp code

This commit is contained in:
Arvid Norberg 2007-05-05 22:06:26 +00:00
parent d320928e8f
commit b239eecc04
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libtorrent/upnp.hpp
View File

@ -134,6 +134,7 @@ private:
{
rootdevice(): lease_duration(default_lease_time)
, supports_specific_external(true)
, service_namespace(0)
{
mapping[0].protocol = 0;
mapping[1].protocol = 1;
@ -146,7 +147,7 @@ private:
// the url to the WANIP or WANPPP interface
std::string control_url;
// either the WANIP namespace or the WANPPP namespace
std::string service_namespace;
char const* service_namespace;
mapping_t mapping[num_mappings];

26
src/upnp.cpp
View File

@ -394,6 +394,8 @@ void upnp::map_port(rootdevice& d, int i)
}
d.mapping[i].need_update = false;
assert(!d.upnp_connection);
assert(d.service_namespace);
d.upnp_connection.reset(new http_connection(m_socket.io_service()
, m_cc, m_strand.wrap(bind(&upnp::on_upnp_map_response, this, _1, _2
, boost::ref(d), i))));
@ -553,15 +555,29 @@ void upnp::on_upnp_xml(asio::error_code const& e
s.reset("urn:schemas-upnp-org:service:WANIPConnection:1");
xml_parse((char*)p.get_body().begin, (char*)p.get_body().end
, m_strand.wrap(bind(&find_control_url, _1, _2, boost::ref(s))));
d.service_namespace = "urn:schemas-upnp-org:service:WANIPConnection:1";
if (!s.found_service)
if (s.found_service)
{
d.service_namespace = s.service_type;
}
else
{
// we didn't find the WAN IP connection, look for
// a PPP IP connection
s.reset("urn:schemas-upnp-org:service:PPPIPConnection:1");
// a PPP connection
s.reset("urn:schemas-upnp-org:service:WANPPPConnection:1");
xml_parse((char*)p.get_body().begin, (char*)p.get_body().end
, m_strand.wrap(bind(&find_control_url, _1, _2, boost::ref(s))));
d.service_namespace = "urn:schemas-upnp-org:service:WANPPPConnection:1";
if (s.found_service)
{
d.service_namespace = s.service_type;
}
else
{
#ifdef TORRENT_UPNP_LOGGING
m_log << time_now_string()
<< " <== Rootdevice response, did not find a port mapping interface" << std::endl;
#endif
return;
}
}
#ifdef TORRENT_UPNP_LOGGING