Server: Allow hosting a simple HTTP server which serves an HTML about waiting lobbies

A new "enablehttp" option was added, which makes the server application create another listening socket on port 80 for a simple HTTP server. It only serves a root HTML page, which contains a table with the amount of waiting lobbies.

The waiting lobbies page separates lobbies, based on match skill level, if "skiplevel" is not set. Otherwise, a single counter is only shown on version/game. This page aims to make it easy for players to find others to play with.

Author: provigz

InternetGamesServer/Config.cpp

@@ -15,6 +15,7 @@ Config::Config() :
 	port(DEFAULT_PORT),
 	logsDirectory(DEFAULT_LOGS_DIRECTORY),
 	numConnectionsPerIP(0),
+	enableHTTP(false),
 	skipLevelMatching(false),
 	allowSinglePlayer(true),
 	disableXPAdBanner(false),
@@ -75,6 +76,11 @@ Config::Load(const std::string& file)
 			}
 		}
 	}
+	{
+		tinyxml2::XMLElement* elEnableHTTP = elRoot->FirstChildElement("EnableHTTP");
+		if (elEnableHTTP && elEnableHTTP->GetText())
+			enableHTTP = *elEnableHTTP->GetText() == '1';
+	}
 	{
 		tinyxml2::XMLElement* elSkipLevelMatching = elRoot->FirstChildElement("SkipLevelMatching");
 		if (elSkipLevelMatching && elSkipLevelMatching->GetText())
@@ -115,6 +121,7 @@ Config::Save()
 	NewElementWithText(elRoot, "Port", port);
 	NewElementWithText(elRoot, "LogsDirectory", logsDirectory.c_str());
 	NewElementWithText(elRoot, "NumConnectionsPerIP", numConnectionsPerIP);
+	NewElementWithText(elRoot, "EnableHTTP", enableHTTP ? "1" : "0");
 	NewElementWithText(elRoot, "SkipLevelMatching", skipLevelMatching ? "1" : "0");
 	NewElementWithText(elRoot, "AllowSinglePlayer", allowSinglePlayer ? "1" : "0");
 	NewElementWithText(elRoot, "DisableXPAdBanner", disableXPAdBanner ? "1" : "0");
@@ -136,6 +143,7 @@ const std::initializer_list<std::pair<std::string, std::string>> Config::s_optio
 	{ "port", "The port the server should be hosted on. Requires restart to apply. (Default: 28805)" },
 	{ "logdir", "The directory where log files are written to. Set to 0 to disable logging. Requires restart to fully apply. (Default: \"InternetGamesServer_logs\")" },
 	{ "numconnsip", "Limits the number of connections allowed from a given IP address. Maximum is 65535. 0 signifies no limit. NOTE: Make this 0 or higher than 1 to keep XP ad banner functionality! (Default: 0)" },
+	{ "enablehttp", "Create an HTTP server on startup (port 80). Only serves a root HTML page, which contains a table with the amount of waiting lobbies. Requires restart to apply. (Default: 0)" },
 	{ "skiplevel", "Do not match players in matches based on skill level. Value can only be 0 or 1. (Default: 0)" },
 	{ "singleplayer", "Allow matches, which support computer players, to exist with only one real player. (Default: 1)" },
 	{ "disablead", "Prevent the server from responding to ad banner requests from Windows XP games with a custom \"Powered by ZoneInternetGamesServer\" banner. Value can only be 0 or 1. (Default: 0)" }
@@ -150,6 +158,8 @@ Config::GetValue(const std::string& key) const
 		return logsDirectory;
 	if (key == "numconnsip")
 		return std::to_string(numConnectionsPerIP);
+	if (key == "enablehttp")
+		return enableHTTP ? "1" : "0";
 	if (key == "skiplevel")
 		return skipLevelMatching ? "1" : "0";
 	if (key == "singleplayer")
@@ -196,6 +206,8 @@ Config::SetValue(const std::string& key, const std::string& value)
 			throw std::runtime_error("Invalid \"numconnsip\" number: " + std::string(err.what()));
 		}
 	}
+	else if (key == "enablehttp")
+		CONFIG_SET_BOOL_VALUE(enableHTTP);
 	else if (key == "skiplevel")
 		CONFIG_SET_BOOL_VALUE(skipLevelMatching);
 	else if (key == "singleplayer")

InternetGamesServer/Config.hpp

@@ -27,6 +27,7 @@ class Config final
 	std::string logsDirectory;
 
 	USHORT numConnectionsPerIP;
+	bool enableHTTP;
 
 	bool skipLevelMatching; // When searching for a lobby, don't take the match level into account.
 	bool allowSinglePlayer; // Allow matches, which support computer players, to exist with only one real player.

InternetGamesServer/InternetGamesServer.vcxproj

@@ -153,6 +153,7 @@
   <ItemGroup>
     <ClCompile Include="Command.cpp" />
     <ClCompile Include="Config.cpp" />
+    <ClCompile Include="SocketHttp.cpp" />
     <ClCompile Include="Win7\BackgammonMatch.cpp" />
     <ClCompile Include="Win7\CheckersMatch.cpp" />
     <ClCompile Include="external\tinyxml2\tinyxml2.cpp" />
@@ -179,6 +180,7 @@
     <ClInclude Include="Command.hpp" />
     <ClInclude Include="Config.hpp" />
     <ClInclude Include="Match.hpp" />
+    <ClInclude Include="SocketHttp.hpp" />
     <ClInclude Include="Win7\BackgammonMatch.hpp" />
     <ClInclude Include="Win7\CheckersMatch.hpp" />
     <ClInclude Include="Win7\Match.hpp" />

InternetGamesServer/InternetGamesServer.vcxproj.filters

@@ -84,6 +84,9 @@
     <ClCompile Include="Config.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="SocketHttp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Util.hpp">
@@ -179,6 +182,9 @@
     <ClInclude Include="Config.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="SocketHttp.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="MatchManager.hpp">

InternetGamesServer/Main.cpp

@@ -12,6 +12,7 @@
 #include "Config.hpp"
 #include "MatchManager.hpp"
 #include "Socket.hpp"
+#include "SocketHttp.hpp"
 #include "Util.hpp"
 
 #define DEFAULT_CONFIG_FILE "InternetGamesServer.config"
@@ -112,8 +113,11 @@ int main(int argc, char* argv[])
 		return 1;
 	}
 
-	struct addrinfo* result = NULL, * ptr = NULL, hints;
+	// If enabled, set up a simple HTTP server on port 80
+	if (g_config.enableHTTP)
+		SetUpSocketHTTP();
 
+	struct addrinfo* result = NULL, * ptr = NULL, hints;
 	ZeroMemory(&hints, sizeof(hints));
 	hints.ai_family = AF_INET;
 	hints.ai_socktype = SOCK_STREAM;

InternetGamesServer/Socket.cpp

@@ -111,7 +111,7 @@ Socket::SocketHandler(void* socket_)
 					throw std::runtime_error("Invalid WinXP initial message!");
 				}
 			}
-			else if (!strncmp("GET /windows/ad.asp", receivedBuf, strlen("GET /windows/ad.asp"))) // WINXP: Banner ad request
+			else if (!strncmp("GET /windows/ad.asp HTTP/1.", receivedBuf, strlen("GET /windows/ad.asp"))) // WINXP: Banner ad request
 			{
 				socket.m_type = WINXP_BANNER_AD_REQUEST;
 
@@ -122,16 +122,16 @@ Socket::SocketHandler(void* socket_)
 				// The banner.png image will be returned by this server later. Look for it on the same host using '/', so that browsers can display it too (useful for testing).
 				// We link to the GitHub repository on the Wayback Machine, as it can be somewhat loaded in IE6 via HTTP (ads strictly open with IE).
 				const std::string adHtml = R"(
-					<HTML>
-						<HEAD></HEAD>
-						<BODY MARGINWIDTH="0" MARGINHEIGHT="0" TOPMARGIN="0" LEFTMARGIN="0" BGCOLOR="#FFFFFF">
-							<A HREF="http://web.archive.org/web/2/https://github.com/provigz/ZoneInternetGamesServer" TARGET="_new">
-								<IMG SRC="/banner.png" ALT="Powered by ZoneInternetGamesServer" BORDER=0 WIDTH=380 HEIGHT=200>
-							</A>
-							<ZONEAD></ZONEAD>
-						</BODY>
-					</HTML>
-					)";
+<HTML>
+	<HEAD></HEAD>
+	<BODY MARGINWIDTH="0" MARGINHEIGHT="0" TOPMARGIN="0" LEFTMARGIN="0" BGCOLOR="#FFFFFF">
+		<A HREF="http://web.archive.org/web/2/https://github.com/provigz/ZoneInternetGamesServer" TARGET="_new">
+			<IMG SRC="/banner.png" ALT="Powered by ZoneInternetGamesServer" BORDER=0 WIDTH=380 HEIGHT=200>
+		</A>
+		<ZONEAD></ZONEAD>
+	</BODY>
+</HTML>
+)";
 				const std::string adHttpHeader =
 					"HTTP/1.1 200 OK\r\n"
 					"Content-Type: text/html; charset=UTF-8\r\n"
@@ -143,7 +143,7 @@ Socket::SocketHandler(void* socket_)
 
 				throw DisconnectSocket("Banner ad sent over.");
 			}
-			else if (!strncmp("GET /banner.png", receivedBuf, strlen("GET /banner.png"))) // WINXP: Banner ad image request
+			else if (!strncmp("GET /banner.png HTTP/1.", receivedBuf, strlen("GET /banner.png"))) // WINXP: Banner ad image request
 			{
 				socket.m_type = WINXP_BANNER_AD_IMAGE_REQUEST;