From 1b4728925f0211e3a37cf7e2843bd17ba9be2286 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Thu, 3 Jan 2019 11:47:05 +0300 Subject: Fix build on Haiku diff --git a/src/net/socket_fd.cc b/src/net/socket_fd.cc index f04059f..7967ac0 100644 --- a/src/net/socket_fd.cc +++ b/src/net/socket_fd.cc @@ -70,9 +70,11 @@ SocketFd::set_priority(priority_type p) { check_valid(); int opt = p; +#ifndef __HAIKU__ 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; } -- 2.45.2 From 97f5eca7cba7e1663408166f1f770929f3316e67 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Mon, 4 Mar 2019 15:51:53 +0300 Subject: Workaround a bug "rtorrent: Could not allocate socket for listening." https://github.com/rakshasa/rtorrent/issues/820#issuecomment-455900997 diff --git a/src/net/socket_fd.cc b/src/net/socket_fd.cc index 7967ac0..9e39f6c 100644 --- a/src/net/socket_fd.cc +++ b/src/net/socket_fd.cc @@ -128,40 +128,14 @@ SocketFd::get_error() const { bool SocketFd::open_stream() { - 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; - - if (!set_ipv6_v6only(false)) { - close(); - return false; - } - - return true; + m_ipv6_socket = false; + return (m_fd = socket(rak::socket_address::pf_inet, SOCK_STREAM, IPPROTO_TCP)) != -1; } bool SocketFd::open_datagram() { - m_fd = socket(rak::socket_address::pf_inet6, SOCK_DGRAM, 0); - - if (m_fd == -1) { - m_ipv6_socket = false; - return (m_fd = socket(rak::socket_address::pf_inet, SOCK_DGRAM, 0)) != -1; - } - - m_ipv6_socket = true; - - if (!set_ipv6_v6only(false)) { - close(); - return false; - } - - return true; + m_ipv6_socket = false; + return (m_fd = socket(rak::socket_address::pf_inet, SOCK_DGRAM, 0)) != -1; } bool -- 2.45.2 From a733b858c06a76b4c1082b0910400d97fbaba7f9 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Wed, 28 Aug 2024 20:34:48 +0200 Subject: Define _GNU_SOURCE for pthread_setname_np diff --git a/src/torrent/utils/thread_base.cc b/src/torrent/utils/thread_base.cc index 778e4c3..9df7906 100644 --- a/src/torrent/utils/thread_base.cc +++ b/src/torrent/utils/thread_base.cc @@ -33,6 +33,7 @@ // // Skomakerveien 33 // 3185 Skoppum, NORWAY +#define _GNU_SOURCE #include "config.h" -- 2.45.2