aboutsummaryrefslogtreecommitdiff
path: root/contrib/epee
diff options
context:
space:
mode:
authorxiphon <xiphon@protonmail.com>2019-10-01 13:25:52 +0000
committerxiphon <xiphon@protonmail.com>2019-10-02 19:08:02 +0000
commitc9cfbf7fb33f65743c6921580d25d8b7ad2947d6 (patch)
treebaa7274d8d3e5bacf1bbb405ceb2d8274034041f /contrib/epee
parentMerge pull request #5939 (diff)
downloadmonero-c9cfbf7fb33f65743c6921580d25d8b7ad2947d6.tar.xz
epee: tcp server - set SO_LINGER instead of SO_REUSEADDR option
Diffstat (limited to 'contrib/epee')
-rw-r--r--contrib/epee/include/net/abstract_tcp_server2.inl6
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index e455d0204..c48deb31d 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -984,8 +984,7 @@ PRAGMA_WARNING_DISABLE_VS(4355)
boost::asio::ip::tcp::resolver::query query(address, boost::lexical_cast<std::string>(port), boost::asio::ip::tcp::resolver::query::canonical_name);
boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
acceptor_.open(endpoint.protocol());
- // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
- acceptor_.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
+ acceptor_.set_option(boost::asio::ip::tcp::acceptor::linger(true, 0));
acceptor_.bind(endpoint);
acceptor_.listen();
boost::asio::ip::tcp::endpoint binded_endpoint = acceptor_.local_endpoint();
@@ -1019,8 +1018,7 @@ PRAGMA_WARNING_DISABLE_VS(4355)
boost::asio::ip::tcp::resolver::query query(address_ipv6, boost::lexical_cast<std::string>(port_ipv6), boost::asio::ip::tcp::resolver::query::canonical_name);
boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
acceptor_ipv6.open(endpoint.protocol());
- // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
- acceptor_ipv6.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
+ acceptor_ipv6.set_option(boost::asio::ip::tcp::acceptor::linger(true, 0));
acceptor_ipv6.set_option(boost::asio::ip::v6_only(true));
acceptor_ipv6.bind(endpoint);
acceptor_ipv6.listen();