fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-07 18:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed ifdef for ipv6.

Browse Source
This commit is contained in:
rakshasa
2014-09-23 18:56:29 +09:00
parent 6c39da6943
commit 0df0a6650d
10 changed files with 15 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/socket_fd.cc
+6 -23
View File
@@ -71,12 +71,10 @@ SocketFd::set_priority(priority_type p) {
check_valid();
int opt = p;
#ifdef RAK_USE_INET6
if (m_ipv6_socket)
return setsockopt(m_fd, IPPROTO_IPV6, IPV6_TCLASS, &opt, sizeof(opt)) == 0;
else
#endif
return setsockopt(m_fd, IPPROTO_IP, IP_TOS, &opt, sizeof(opt)) == 0;
return setsockopt(m_fd, IPPROTO_IP, IP_TOS, &opt, sizeof(opt)) == 0;
}
bool
@@ -135,24 +133,21 @@ SocketFd::get_error() const {
bool
SocketFd::open_stream() {
#ifdef RAK_USE_INET6
m_fd = socket(rak::socket_address::pf_inet6, SOCK_STREAM, IPPROTO_TCP);
if (m_fd == -1) {
m_ipv6_socket = false;
return (m_fd = socket(rak::socket_address::pf_inet, SOCK_STREAM, IPPROTO_TCP)) != -1;
}
m_ipv6_socket = true;
int zero = 0;
return setsockopt(m_fd, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero)) != -1;
#else
return (m_fd = socket(rak::socket_address::pf_inet, SOCK_STREAM, IPPROTO_TCP)) != -1;
#endif
}
bool
SocketFd::open_datagram() {
#ifdef RAK_USE_INET6
m_fd = socket(rak::socket_address::pf_inet6, SOCK_DGRAM, 0);
if (m_fd == -1) {
m_ipv6_socket = false;
@@ -162,9 +157,6 @@ SocketFd::open_datagram() {
int zero = 0;
return setsockopt(m_fd, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero)) != -1;
#else
return (m_fd = socket(rak::socket_address::pf_inet, SOCK_DGRAM, 0)) != -1;
#endif
}
bool
@@ -182,12 +174,11 @@ bool
SocketFd::bind(const rak::socket_address& sa) {
check_valid();
#ifdef RAK_USE_INET6
if (m_ipv6_socket && sa.family() == rak::socket_address::pf_inet) {
rak::socket_address_inet6 sa_mapped = sa.sa_inet()->to_mapped_address();
return !::bind(m_fd, sa_mapped.c_sockaddr(), sizeof(sa_mapped));
}
#endif
return !::bind(m_fd, sa.c_sockaddr(), sa.length());
}
@@ -195,12 +186,11 @@ bool
SocketFd::bind(const rak::socket_address& sa, unsigned int length) {
check_valid();
#ifdef RAK_USE_INET6
if (m_ipv6_socket && sa.family() == rak::socket_address::pf_inet) {
rak::socket_address_inet6 sa_mapped = sa.sa_inet()->to_mapped_address();
return !::bind(m_fd, sa_mapped.c_sockaddr(), sizeof(sa_mapped));
}
#endif
return !::bind(m_fd, sa.c_sockaddr(), length);
}
@@ -208,12 +198,11 @@ bool
SocketFd::connect(const rak::socket_address& sa) {
check_valid();
#ifdef RAK_USE_INET6
if (m_ipv6_socket && sa.family() == rak::socket_address::pf_inet) {
rak::socket_address_inet6 sa_mapped = sa.sa_inet()->to_mapped_address();
return !::connect(m_fd, sa_mapped.c_sockaddr(), sizeof(sa_mapped)) || errno == EINPROGRESS;
}
#endif
return !::connect(m_fd, sa.c_sockaddr(), sa.length()) || errno == EINPROGRESS;
}
@@ -226,11 +215,9 @@ SocketFd::getsockname(rak::socket_address *sa) {
return false;
}
#ifdef RAK_USE_INET6
if (m_ipv6_socket && sa->family() == rak::socket_address::af_inet6) {
*sa = sa->sa_inet6()->normalize_address();
}
#endif
return true;
}
@@ -247,7 +234,6 @@ SocketFd::accept(rak::socket_address* sa) {
check_valid();
socklen_t len = sizeof(rak::socket_address);
#ifdef RAK_USE_INET6
if (sa == NULL) {
return SocketFd(::accept(m_fd, NULL, &len));
}
@@ -256,9 +242,6 @@ SocketFd::accept(rak::socket_address* sa) {
*sa = sa->sa_inet6()->normalize_address();
}
return SocketFd(fd);
#else
return SocketFd(::accept(m_fd, sa != NULL ? sa->c_sockaddr() : NULL, &len));
#endif
}
// unsigned int