Use configuration setting to decide whether to download the server list or directly connect to the server. Accept other server lists. Accept un'zlib'ed server lists. Use IPv6 address from server list if configured.

src/net/common/clientcontext.cpp

@@ -20,7 +20,7 @@
 #include <net/clientcontext.h>
 
 ClientContext::ClientContext()
-: m_protocol(0), m_addrFamily(AF_INET), m_serverPort(0)
+: m_protocol(0), m_addrFamily(AF_INET), m_useServerList(false), m_serverPort(0)
 {
 	bzero(&m_clientSockaddr, sizeof(m_clientSockaddr));
 }

src/net/common/clientstate.cpp

@@ -103,9 +103,10 @@ ClientStateInit::Process(ClientThread &client)
 	setsockopt(context.GetSocket(), SOL_SOCKET, SO_NOSIGPIPE, (char *)&nosigpipe, sizeof(nosigpipe));
 #endif
 
-	// TODO
-	//client.SetState(ClientStateStartResolve::Instance());
-	client.SetState(ClientStateStartServerListDownload::Instance());
+	if (context.GetUseServerList())
+		client.SetState(ClientStateStartServerListDownload::Instance());
+	else
+		client.SetState(ClientStateStartResolve::Instance());
 
 	return MSG_SOCK_INIT_DONE;
 }
@@ -256,14 +257,20 @@ ClientStateStartServerListDownload::Process(ClientThread &client)
 
 	const ClientContext &context = client.GetContext();
 	path tmpServerListPath(context.GetCacheDir());
-	tmpServerListPath /= "serverlist.xml.z";
-
+	string serverListUrl(context.GetServerListUrl());
+	// Retrieve the file name from the URL.
+	size_t pos = serverListUrl.find_last_of('/');
+	if (pos == string::npos || ++pos >= serverListUrl.length())
+	{
+		// TODO throw exception.
+	}
+	tmpServerListPath /= serverListUrl.substr(pos);
 	if (exists(tmpServerListPath))
 	{
 		// Download and compare md5.
 		tmpServerListPath = change_extension(tmpServerListPath, extension(tmpServerListPath) + ".md5");
 		std::auto_ptr<DownloadHelper> downloader(new DownloadHelper);
-		downloader->Init("pokerth.net/serverlist.xml.z.md5", tmpServerListPath.directory_string());
+		downloader->Init(serverListUrl + ".md5", tmpServerListPath.directory_string());
 		ClientStateSynchronizingServerList::Instance().SetDownloadHelper(downloader.release());
 		client.SetState(ClientStateSynchronizingServerList::Instance());
 	}
@@ -271,7 +278,7 @@ ClientStateStartServerListDownload::Process(ClientThread &client)
 	{
 		// Download server list.
 		std::auto_ptr<DownloadHelper> downloader(new DownloadHelper);
-		downloader->Init("pokerth.net/serverlist.xml.z", tmpServerListPath.directory_string());
+		downloader->Init(serverListUrl, tmpServerListPath.directory_string());
 		ClientStateDownloadingServerList::Instance().SetDownloadHelper(downloader.release());
 		client.SetState(ClientStateDownloadingServerList::Instance());
 	}
@@ -315,7 +322,10 @@ ClientStateSynchronizingServerList::Process(ClientThread &client)
 		Cleanup();
 		ClientContext &context = client.GetContext();
 		path md5ServerListPath(context.GetCacheDir());
-		md5ServerListPath /= "serverlist.xml.z.md5";
+
+		// No more checking needed as this was done before.
+		md5ServerListPath /= context.GetServerListUrl().substr(context.GetServerListUrl().find_last_of('/') + 1) + ".md5";
+
 		path zippedServerListPath = change_extension(md5ServerListPath, "");
 		// Compare the md5 sums.
 		string tmpMd5;
@@ -424,18 +434,24 @@ ClientStateReadingServerList::Process(ClientThread &client)
 
 	ClientContext &context = client.GetContext();
 	path zippedServerListPath(context.GetCacheDir());
-	zippedServerListPath /= "serverlist.xml.z";
-	path xmlServerListPath = change_extension(zippedServerListPath, "");
-
-	// Unzip the file.
+	zippedServerListPath /= context.GetServerListUrl().substr(context.GetServerListUrl().find_last_of('/') + 1);
+	path xmlServerListPath;
+	if (extension(zippedServerListPath) == ".z")
 	{
-		ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary);
-		ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out);
-		boost::iostreams::filtering_streambuf<boost::iostreams::input> in;
-		in.push(boost::iostreams::zlib_decompressor());
-		in.push(inFile);
-		boost::iostreams::copy(in, outFile);
+		xmlServerListPath = change_extension(zippedServerListPath, "");
+
+		// Unzip the file using zlib.
+		{
+			ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary);
+			ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out);
+			boost::iostreams::filtering_streambuf<boost::iostreams::input> in;
+			in.push(boost::iostreams::zlib_decompressor());
+			in.push(inFile);
+			boost::iostreams::copy(in, outFile);
+		}
 	}
+	else
+		xmlServerListPath = zippedServerListPath;
 
 	// Parse the server address.
 	TiXmlDocument doc(xmlServerListPath.directory_string());
@@ -446,7 +462,11 @@ ClientStateReadingServerList::Process(ClientThread &client)
 		const TiXmlElement *firstServer = docHandle.FirstChild("ServerList" ).FirstChild("Server").ToElement();
 		if (firstServer)
 		{
-			const TiXmlNode *addrNode = firstServer->FirstChild("IPv4Address");
+			const TiXmlNode *addrNode;
+			if (context.GetAddrFamily() == AF_INET6)
+				addrNode = firstServer->FirstChild("IPv6Address");
+			else
+				addrNode = firstServer->FirstChild("IPv4Address");
 			if (addrNode && addrNode->ToElement())
 				context.SetServerAddr(addrNode->ToElement()->Attribute("value"));
 			const TiXmlNode *portNode = firstServer->FirstChild("Port");
@@ -455,6 +475,7 @@ ClientStateReadingServerList::Process(ClientThread &client)
 				int tmpPort = 0;
 				portNode->ToElement()->QueryIntAttribute("value", &tmpPort);
 				context.SetServerPort((unsigned)tmpPort);
+				retVal = MSG_SOCK_SERVER_LIST_DONE;
 			}
 		}
 	}

src/net/common/clientthread.cpp

@@ -74,8 +74,8 @@ ClientThread::~ClientThread()
 
 void
 ClientThread::Init(
-	const string &serverAddress, const string &alternateServerAddress,
-	unsigned serverPort, bool ipv6, bool sctp,
+	const string &serverAddress, const string &serverListUrl,
+	bool useServerList, unsigned serverPort, bool ipv6, bool sctp,
 	const string &pwd, const string &playerName, const string &avatarFile,
 	const string &cacheDir)
 {
@@ -90,7 +90,8 @@ ClientThread::Init(
 	context.SetProtocol(sctp ? SOCKET_IPPROTO_SCTP : 0);
 	context.SetAddrFamily(ipv6 ? AF_INET6 : AF_INET);
 	context.SetServerAddr(serverAddress);
-	context.SetAlternateServerAddr(alternateServerAddress);
+	context.SetServerListUrl(serverListUrl);
+	context.SetUseServerList(useServerList);
 	context.SetServerPort(serverPort);
 	context.SetPassword(pwd);
 	context.SetPlayerName(playerName);

src/net/common/resolverthread.cpp

@@ -46,7 +46,6 @@ ResolverThread::Init(const ClientContext &context)
 
 	GetContext().SetAddrFamily(context.GetAddrFamily());
 	GetContext().SetServerAddr(context.GetServerAddr());
-	GetContext().SetAlternateServerAddr(context.GetAlternateServerAddr());
 	GetContext().SetServerPort(context.GetServerPort());
 }
 
@@ -80,19 +79,6 @@ ResolverThread::Main()
 		context.GetProtocol(),
 		(struct sockaddr *)context.GetClientSockaddr(),
 		context.GetClientSockaddrSize());
-
-	if (!m_retVal && !context.GetAlternateServerAddr().empty())
-	{
-		// Try alternate name.
-		m_retVal = socket_resolve(
-			context.GetAlternateServerAddr().c_str(),
-			tmpStr.str().c_str(),
-			context.GetAddrFamily(),
-			SOCK_STREAM,
-			context.GetProtocol(),
-			(struct sockaddr *)context.GetClientSockaddr(),
-			context.GetClientSockaddrSize());
-	}
 }
 
 const ClientContext &