();
+
+ public ServerBlacklist(string blacklistFile)
+ {
+ XDocument document = XDocument.Load(blacklistFile);
+ var servers = document.Descendants("Server");
+ foreach (var server in servers)
+ {
+ serverIps.Add(server.Attribute("IP").Value);
+ }
+ }
+
+ public bool IsBlacklisted(string serverIp)
+ {
+ return serverIps.Contains(serverIp);
+ }
+
+}
diff --git a/source/CubeMS/Bin/mysql.data.dll b/source/CubeMS/Bin/mysql.data.dll
new file mode 100644
index 00000000..209cf282
Binary files /dev/null and b/source/CubeMS/Bin/mysql.data.dll differ
diff --git a/source/CubeMS/Blacklist.xml b/source/CubeMS/Blacklist.xml
new file mode 100644
index 00000000..6225e37c
--- /dev/null
+++ b/source/CubeMS/Blacklist.xml
@@ -0,0 +1,402 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/CubeMS/Default.aspx b/source/CubeMS/Default.aspx
index 088c33b1..e7faac2a 100644
--- a/source/CubeMS/Default.aspx
+++ b/source/CubeMS/Default.aspx
@@ -12,13 +12,14 @@
AssaultCube Master Server
Server List
-
- <%# IPTools.IntToIp((int)DataBinder.Eval(Container.DataItem, "IP")).ToString() %>
+ <%-- <%# IPTools.IntToIp((int)DataBinder.Eval(Container.DataItem, "IP")).ToString() %> --%>
@@ -35,14 +36,8 @@
-
- Interfaces
-
- You can retrieve the server list data using those url's:
-
diff --git a/source/CubeMS/cgi-bin/actioncube.pl/info.txt b/source/CubeMS/cgi-bin/actioncube.pl/info.txt
new file mode 100644
index 00000000..cb66f106
--- /dev/null
+++ b/source/CubeMS/cgi-bin/actioncube.pl/info.txt
@@ -0,0 +1,6 @@
+This directory is required to fool apache.
+
+The masterserver http handler dispatches requests matching *.do
+However apache always checks if the requested file/dir actually exists,
+if not the request is being aborted. Therefore we need this directory
+to ensure that the request reaches our http handler.
diff --git a/source/CubeMS/web.config b/source/CubeMS/web.config
index 756e0402..6920d689 100644
--- a/source/CubeMS/web.config
+++ b/source/CubeMS/web.config
@@ -8,16 +8,32 @@
\Windows\Microsoft.Net\Framework\v2.x\Config
-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+