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

added router_for_interface along with a proper windows implementation. NAT-PMP support is now good on windows

Browse Source
This commit is contained in:
Arvid Norberg
2007-10-01 17:21:19 +00:00
parent 6fd42631c0
commit 973e7be386
8 changed files with 120 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/natpmp.cpp
View File

@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/natpmp.hpp"
#include "libtorrent/io.hpp"
#include "libtorrent/assert.hpp"
#include "libtorrent/enum_net.hpp"
using boost::bind;
using namespace libtorrent;
@@ -48,7 +49,7 @@ namespace libtorrent
{
// defined in upnp.cpp
bool is_local(address const& a);
address_v4 guess_local_address(asio::io_service&);
address guess_local_address(asio::io_service&);
}
natpmp::natpmp(io_service& ios, address const& listen_interface, portmap_callback_t const& cb)
@@ -71,10 +72,10 @@ natpmp::natpmp(io_service& ios, address const& listen_interface, portmap_callbac
void natpmp::rebind(address const& listen_interface) try
{
address_v4 local = address_v4::any();
if (listen_interface.is_v4() && listen_interface != address_v4::any())
address local = address_v4::any();
if (listen_interface != address_v4::any())
{
local = listen_interface.to_v4();
local = listen_interface;
}
else
{
@@ -101,14 +102,12 @@ void natpmp::rebind(address const& listen_interface) try
m_disabled = false;
// assume the router is located on the local
// network as x.x.x.1
udp::endpoint nat_endpoint(
address_v4((local.to_ulong() & 0xffffff00) | 1), 5351);
asio::error_code ec;
udp::endpoint nat_endpoint(router_for_interface(local, ec), 5351);
if (ec)
throw std::runtime_error("cannot retrieve router address");
if (nat_endpoint == m_nat_endpoint) return;
// TODO: find a better way to figure out the router IP
m_nat_endpoint = nat_endpoint;
#if defined(TORRENT_LOGGING) || defined(TORRENT_VERBOSE_LOGGING)