From 6090e95cdcea7c0600ea75941289494505295cf2 Mon Sep 17 00:00:00 2001
From: Kahrl <kahrl@gmx.net>
Date: Fri, 7 Mar 2014 01:00:03 +0100
Subject: Infer ipv6_server from bind_address; fix client connect to
 IN(6)ADDR_ANY

---
 src/server.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/server.cpp')

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),
-- 
cgit v1.2.3