summaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorKahrl <kahrl@gmx.net>2014-03-07 01:00:03 +0100
committersapier <Sapier at GMX dot net>2014-04-10 22:03:42 +0200
commit6090e95cdcea7c0600ea75941289494505295cf2 (patch)
tree83745714b25e66fe087c8abdef08d18d5bcd8576 /src/server.cpp
parentedcad09dee6daf119f3e29b0a63837500e7b8b85 (diff)
downloadminetest-6090e95cdcea7c0600ea75941289494505295cf2.tar.gz
minetest-6090e95cdcea7c0600ea75941289494505295cf2.tar.bz2
minetest-6090e95cdcea7c0600ea75941289494505295cf2.zip
Infer ipv6_server from bind_address; fix client connect to IN(6)ADDR_ANY
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server.cpp b/src/server.cpp
index 0cd8630c3..5c93988b8 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -166,7 +166,8 @@ v3f ServerSoundParams::getPos(ServerEnvironment *env, bool *pos_exists) const
Server::Server(
const std::string &path_world,
const SubgameSpec &gamespec,
- bool simple_singleplayer_mode
+ bool simple_singleplayer_mode,
+ bool ipv6
):
m_path_world(path_world),
m_gamespec(gamespec),
@@ -176,7 +177,7 @@ Server::Server(
m_con(PROTOCOL_ID,
512,
CONNECTION_TIMEOUT,
- g_settings->getBool("enable_ipv6") && g_settings->getBool("ipv6_server"),
+ ipv6,
this),
m_banmanager(NULL),
m_rollback(NULL),