upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-14 22:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made campaignd and wesnothd accept IPv6 connections as well as IPv4

Browse Source
This commit is contained in:
loonycyborg 2018-12-22 13:20:23 +03:00
parent d8bbcc6b1e
commit 0e2b415177
4 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -96,6 +96,7 @@
UI afterwards (e.g. [redraw]) and the status panels are updated immediately.
as well.
* Re-added the Font Scaling preference.
* Enabled wesnothd and campaignd to accept IPv6 connections too
## Version 1.14.5+dev
### AI

6
src/server/server.cpp
View File

@ -2060,7 +2060,8 @@ void server::shut_down_handler(
} else {
// Graceful shut down.
graceful_restart = true;
acceptor_.close();
acceptor_v6_.close();
acceptor_v4_.close();
timer_.expires_from_now(boost::posix_time::seconds(10));
timer_.async_wait(std::bind(&server::handle_graceful_timeout, this, _1));
@ -2091,7 +2092,8 @@ void server::restart_handler(const std::string& issuer_name,
*out << "No restart_command configured! Not restarting.";
} else {
graceful_restart = true;
acceptor_.close();
acceptor_v6_.close();
acceptor_v4_.close();
timer_.expires_from_now(boost::posix_time::seconds(10));
timer_.async_wait(std::bind(&server::handle_graceful_timeout, this, _1));

38
src/server/server_base.cpp
View File

@ -34,7 +34,8 @@ server_base::server_base(unsigned short port, bool keep_alive) :
port_(port),
keep_alive_(keep_alive),
io_service_(),
acceptor_(io_service_),
acceptor_v6_(io_service_),
acceptor_v4_(io_service_),
#ifndef _WIN32
input_(io_service_),
sighup_(io_service_, SIGHUP),
@ -43,15 +44,26 @@ server_base::server_base(unsigned short port, bool keep_alive) :
{
}
void server_base::setup_acceptor(boost::asio::ip::tcp::acceptor& acceptor, boost::asio::ip::tcp::endpoint endpoint)
{
acceptor.open(endpoint.protocol());
acceptor.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
acceptor.set_option(boost::asio::ip::tcp::acceptor::keep_alive(keep_alive_));
if(endpoint.protocol() == boost::asio::ip::tcp::v6())
acceptor.set_option(boost::asio::ip::v6_only(true));
acceptor.bind(endpoint);
acceptor.listen();
}
void server_base::start_server()
{
boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::tcp::v4(), port_);
acceptor_.open(endpoint.protocol());
acceptor_.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
acceptor_.set_option(boost::asio::ip::tcp::acceptor::keep_alive(keep_alive_));
acceptor_.bind(endpoint);
acceptor_.listen();
serve();
boost::asio::ip::tcp::endpoint endpoint_v6(boost::asio::ip::tcp::v6(), port_);
setup_acceptor(acceptor_v6_, endpoint_v6);
serve(acceptor_v6_);
boost::asio::ip::tcp::endpoint endpoint_v4(boost::asio::ip::tcp::v4(), port_);
setup_acceptor(acceptor_v4_, endpoint_v4);
serve(acceptor_v4_);
handshake_response_.connection_num = htonl(42);
@ -63,16 +75,18 @@ void server_base::start_server()
sigs_.async_wait(std::bind(&server_base::handle_termination, this, _1, _2));
}
void server_base::serve()
void server_base::serve(boost::asio::ip::tcp::acceptor& acceptor)
{
socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(std::ref(io_service_));
acceptor_.async_accept(*socket, std::bind(&server_base::accept_connection, this, _1, socket));
acceptor.async_accept(*socket, [&acceptor, socket, this](const boost::system::error_code& error){
this->accept_connection(acceptor, error, socket);
});
}
void server_base::accept_connection(const boost::system::error_code& error, socket_ptr socket)
void server_base::accept_connection(boost::asio::ip::tcp::acceptor& acceptor, const boost::system::error_code& error, socket_ptr socket)
{
if(accepting_connections())
serve();
serve(acceptor);
if(error) {
ERR_SERVER << "Accept failed: " << error.message() << "\n";
return;

8
src/server/server_base.hpp
View File

@ -43,10 +43,12 @@ protected:
unsigned short port_;
bool keep_alive_;
boost::asio::io_service io_service_;
boost::asio::ip::tcp::acceptor acceptor_;
boost::asio::ip::tcp::acceptor acceptor_v6_;
boost::asio::ip::tcp::acceptor acceptor_v4_;
void setup_acceptor(boost::asio::ip::tcp::acceptor& acceptor, boost::asio::ip::tcp::endpoint endpoint);
void start_server();
void serve();
void accept_connection(const boost::system::error_code& error, socket_ptr socket);
void serve(boost::asio::ip::tcp::acceptor& acceptor);
void accept_connection(boost::asio::ip::tcp::acceptor& acceptor, const boost::system::error_code& error, socket_ptr socket);
union {
uint32_t connection_num;