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

make enum_net use feature ifdefs instead of platform ifdefs

Browse Source
This commit is contained in:
Arvid Norberg
2011-04-09 03:49:46 +00:00
parent 61ceaba6de
commit 8aae74ea03
2 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/enum_net.cpp
View File

@@ -53,7 +53,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <boost/scoped_array.hpp>
#endif
#if defined TORRENT_BSD
#if TORRENT_USE_SYSCTL
#include <sys/sysctl.h>
#endif
@@ -112,10 +112,10 @@ namespace libtorrent { namespace
int sockaddr_len(sockaddr const* sin)
{
#if defined TORRENT_WINDOWS || defined TORRENT_MINGW || defined TORRENT_LINUX
return sin->sa_family == AF_INET ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
#else
#if TORRENT_HAS_SALEN
return sin->sa_len;
#else
return sin->sa_family == AF_INET ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
#endif
}
@@ -132,7 +132,7 @@ namespace libtorrent { namespace
return address();
}
#if defined TORRENT_LINUX
#if TORRENT_USE_NETLINK
int read_nl_sock(int sock, char *buf, int bufsize, int seq, int pid)
{
@@ -220,7 +220,7 @@ namespace libtorrent { namespace
}
#endif
#if defined TORRENT_BSD
#if TORRENT_USE_SYSCTL
bool parse_route(int s, rt_msghdr* rtm, ip_route* rt_info)
{
@@ -270,20 +270,6 @@ namespace libtorrent { namespace
}
#endif
#ifdef TORRENT_BSD
bool verify_sockaddr(sockaddr_in* sin)
{
return (sin->sin_len == sizeof(sockaddr_in)
&& sin->sin_family == AF_INET)
#if TORRENT_USE_IPV6
|| (sin->sin_len == sizeof(sockaddr_in6)
&& sin->sin_family == AF_INET6)
#endif
;
}
#endif
#if TORRENT_USE_IFADDRS
bool iface_from_ifaddrs(ifaddrs *ifa, ip_interface &rv, error_code& ec)
{
@@ -354,7 +340,7 @@ namespace libtorrent
return false;
}
#if defined TORRENT_WINDOWS || defined TORRENT_MINGW
#if TORRENT_USE_GETIPFORWARDTABLE
address build_netmask(int bits, int family)
{
if (family == AF_INET)
@@ -450,7 +436,7 @@ namespace libtorrent
close(s);
freeifaddrs(ifaddr);
// MacOS X, BSD and solaris
#elif defined TORRENT_LINUX || defined TORRENT_BSD || defined TORRENT_SOLARIS
#elif TORRENT_USE_IFCONF
int s = socket(AF_INET, SOCK_DGRAM, 0);
if (s < 0)
{
@@ -532,7 +518,7 @@ namespace libtorrent
}
close(s);
#elif defined TORRENT_WINDOWS || defined TORRENT_MINGW
#elif TORRENT_USE_GETADAPTERSADDRESSES
#if _WIN32_WINNT >= 0x0501
// Load Iphlpapi library
@@ -665,7 +651,7 @@ namespace libtorrent
{
std::vector<ip_route> ret;
#if defined TORRENT_BSD
#if TORRENT_USE_SYSCTL
/*
struct rt_msg
{
@@ -813,7 +799,7 @@ namespace libtorrent
}
close(s);
#elif defined TORRENT_WINDOWS || defined TORRENT_MINGW
#elif TORRENT_USE_GETIPFORWARDTABLE
/*
move this to enum_net_interfaces
// Load Iphlpapi library
@@ -976,8 +962,7 @@ namespace libtorrent
// Free memory
free(routes);
FreeLibrary(iphlp);
#elif defined TORRENT_LINUX
#elif TORRENT_USE_NETLINK
enum { BUFSIZE = 8192 };
int sock = socket(PF_ROUTE, SOCK_DGRAM, NETLINK_ROUTE);