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

enum_net windows fixes

This commit is contained in:
Arvid Norberg 2008-05-06 19:13:59 +00:00
parent 9429ca4b1f
commit 081953db51
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/enum_net.cpp
View File

@ -359,8 +359,13 @@ namespace libtorrent
address get_default_gateway(io_service& ios, error_code& ec) address get_default_gateway(io_service& ios, error_code& ec)
{ {
std::vector<ip_route> ret = enum_routes(ios, ec); std::vector<ip_route> ret = enum_routes(ios, ec);
#ifdef TORRENT_WINDOWS
std::vector<ip_route>::iterator i = std::find_if(ret.begin(), ret.end()
, boost::bind(&is_loopback, boost::bind(&ip_route::destination, _1)));
#else
std::vector<ip_route>::iterator i = std::find_if(ret.begin(), ret.end() std::vector<ip_route>::iterator i = std::find_if(ret.begin(), ret.end()
, boost::bind(&ip_route::destination, _1) == address()); , boost::bind(&ip_route::destination, _1) == address());
#endif
if (i == ret.end()) return address(); if (i == ret.end()) return address();
return i->gateway; return i->gateway;
} }
@ -547,7 +552,6 @@ namespace libtorrent
return std::vector<ip_route>(); return std::vector<ip_route>();
} }
address ret;
if (GetAdaptersInfo(adapter_info, &out_buf_size) == NO_ERROR) if (GetAdaptersInfo(adapter_info, &out_buf_size) == NO_ERROR)
{ {
for (PIP_ADAPTER_INFO adapter = adapter_info; for (PIP_ADAPTER_INFO adapter = adapter_info;
@ -555,10 +559,10 @@ namespace libtorrent
{ {
ip_route r; ip_route r;
r.source = address::from_string(adapter->IpAddressList.IpAddress.String, ec); r.destination = address::from_string(adapter->IpAddressList.IpAddress.String, ec);
r.gateway = address::from_string(adapter->GatewayList.IpAddress.String, ec); r.gateway = address::from_string(adapter->GatewayList.IpAddress.String, ec);
r.netmask = address::from_string(adapter->IpAddressList.IpMask.String, ec); r.netmask = address::from_string(adapter->IpAddressList.IpMask.String, ec);
strncpy(r.name, adapter->AdapterName, sizeof(ip_route::name)); strncpy(r.name, adapter->AdapterName, sizeof(r.name));
if (ec) if (ec)
{ {
@ -573,8 +577,6 @@ namespace libtorrent
free(adapter_info); free(adapter_info);
FreeLibrary(iphlp); FreeLibrary(iphlp);
return ret;
#elif defined TORRENT_LINUX #elif defined TORRENT_LINUX
enum { BUFSIZE = 8192 }; enum { BUFSIZE = 8192 };