summaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorproller <proller@github.com>2013-06-23 11:31:22 +0400
committerproller <proller@github.com>2013-06-23 11:31:22 +0400
commitf960c3be313c761fe02f9167dc1fe3fca5dc4ada (patch)
tree54543a7e61e6ed273840d9bcba6bc9655add5243 /src/server.cpp
parent309c5f3641dccaf1260953f098ccd593396dee64 (diff)
downloadminetest-f960c3be313c761fe02f9167dc1fe3fca5dc4ada.tar.gz
minetest-f960c3be313c761fe02f9167dc1fe3fca5dc4ada.tar.bz2
minetest-f960c3be313c761fe02f9167dc1fe3fca5dc4ada.zip
Add support for IPv6
Two new configuration options are added: - "enable_ipv6" to enable/disable the overall use of IPv6 - "ipv6_server" to enable/disable the use of IPv6 sockets when running a server (when "enable_ipv6" is enabled)
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server.cpp b/src/server.cpp
index 7963aeaae..fea4349f1 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -639,7 +639,8 @@ Server::Server(
m_simple_singleplayer_mode(simple_singleplayer_mode),
m_async_fatal_error(""),
m_env(NULL),
- m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, this),
+ m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT,
+ g_settings->getBool("enable_ipv6") && g_settings->getBool("ipv6_server"), this),
m_banmanager(path_world+DIR_DELIM+"ipban.txt"),
m_rollback(NULL),
m_rollback_sink_enabled(true),