fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-10 04:02: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/core/curl_get.cc
+3 -4
View File
@@ -95,9 +95,8 @@ CurlGet::start() {
curl_easy_setopt(m_handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_WHATEVER);
curl_easy_setopt(m_handle, CURLOPT_ENCODING, "");
#ifdef RAK_USE_INET6
m_ipv6 = false;
#endif
m_stack->add_get(this);
}
@@ -115,16 +114,16 @@ CurlGet::close() {
m_handle = NULL;
}
#ifdef RAK_USE_INET6
void
CurlGet::retry_ipv6() {
CURL* nhandle = curl_easy_duphandle(m_handle);
curl_easy_setopt(nhandle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6);
curl_easy_cleanup(m_handle);
m_handle = nhandle;
m_ipv6 = true;
}
#endif
void
CurlGet::receive_timeout() {
src/core/curl_get.h
+1 -4
View File
@@ -57,10 +57,9 @@ public:
void start();
void close();
#ifdef RAK_USE_INET6
bool is_using_ipv6() { return m_ipv6; }
void retry_ipv6();
#endif
bool is_busy() const { return m_handle; }
bool is_active() const { return m_active; }
@@ -79,9 +78,7 @@ private:
void receive_timeout();
bool m_active;
#ifdef RAK_USE_INET6
bool m_ipv6;
#endif
rak::priority_item m_taskTimeout;
src/core/manager.cc
-9
View File
@@ -228,13 +228,8 @@ Manager::set_bind_address(const std::string& addr) {
int err;
rak::address_info* ai;
#ifdef RAK_USE_INET6
if ((err = rak::address_info::get_address_info(addr.c_str(), PF_INET, SOCK_STREAM, &ai)) != 0 &&
(err = rak::address_info::get_address_info(addr.c_str(), PF_INET6, SOCK_STREAM, &ai)) != 0)
#else
if ((err = rak::address_info::get_address_info(addr.c_str(), PF_INET, SOCK_STREAM, &ai)) != 0)
#endif
throw torrent::input_error("Could not set bind address: " + std::string(rak::address_info::strerror(err)) + ".");
try {
@@ -268,12 +263,8 @@ Manager::set_local_address(const std::string& addr) {
int err;
rak::address_info* ai;
#ifdef RAK_USE_INET6
if ((err = rak::address_info::get_address_info(addr.c_str(), PF_INET, SOCK_STREAM, &ai)) != 0 &&
(err = rak::address_info::get_address_info(addr.c_str(), PF_INET6, SOCK_STREAM, &ai)) != 0)
#else
if ((err = rak::address_info::get_address_info(addr.c_str(), PF_INET, SOCK_STREAM, &ai)) != 0)
#endif
throw torrent::input_error("Could not set local address: " + std::string(rak::address_info::strerror(err)) + ".");
try {