0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "wesnothd: enable keepalive on socket before accept rather than after"

Browse source 
This reverts commit 1a95b20611.
This commit is contained in:
loonycyborg 2021-12-22 20:11:40 +03:00
parent 03679821b4
commit 9eee6058a7
No known key found for this signature in database
GPG key ID: 6E8233FAB8F26D61
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/server/common/server_base.cpp
View file

@ -114,6 +114,17 @@ void server_base::serve(boost::asio::yield_context yield, boost::asio::ip::tcp::
socket_ptr socket = std::make_shared<socket_ptr::element_type>(io_service_);
boost::system::error_code error;
acceptor.async_accept(socket->lowest_layer(), yield[error]);
if(error) {
ERR_SERVER << "Accept failed: " << error.message() << "\n";
BOOST_THROW_EXCEPTION(server_shutdown("Accept failed", error));
}
if(accepting_connections()) {
boost::asio::spawn(io_service_, [this, &acceptor, endpoint](boost::asio::yield_context yield) { serve(yield, acceptor, endpoint); });
}
#ifndef _WIN32
if(keep_alive_) {
int timeout = 30;
@ -130,17 +141,6 @@ void server_base::serve(boost::asio::yield_context yield, boost::asio::ip::tcp::
}
#endif
boost::system::error_code error;
acceptor.async_accept(socket->lowest_layer(), yield[error]);
if(error) {
ERR_SERVER << "Accept failed: " << error.message() << "\n";
BOOST_THROW_EXCEPTION(server_shutdown("Accept failed", error));
}
if(accepting_connections()) {
boost::asio::spawn(io_service_, [this, &acceptor, endpoint](boost::asio::yield_context yield) { serve(yield, acceptor, endpoint); });
}
DBG_SERVER << client_address(socket) << "\tnew connection tentatively accepted\n";
uint32_t protocol_version;