From 3f125e5463f42552e71894d1f10fd292ff766331 Mon Sep 17 00:00:00 2001
From: Malloc of Kuzkycyziklistan <aleco@aroltd.com>
Date: Fri, 16 Jun 2017 16:00:01 -0500
Subject: [PATCH] another socket refactor

fuck
---
 client/ip.php                                 |  2 +
 server/Configuration.cs                       |  4 +-
 server/Entrypoint.cs                          |  2 +-
 .../Kneesocks/{WebSocket => }/Connection.cs   |  2 +-
 .../Kneesocks/{WebSocket => }/Frame.cs        |  2 +-
 .../Kneesocks/{WebSocket => }/Handshake.cs    |  2 +-
 server/Libraries/Kneesocks/Kneesocks.csproj   | 18 ++++----
 .../Kneesocks/{WebSocket => }/Pool.cs         |  2 +-
 .../Kneesocks/Properties/AssemblyInfo.cs      |  4 +-
 .../Kneesocks/{WebSocket => }/ReadBuffer.cs   |  2 +-
 .../Kneesocks/{WebSocket => }/Server.cs       |  2 +-
 .../Kneesocks/{WebSocket => }/Stack.cs        |  2 +-
 server/ServerList.cs                          | 15 +++++++
 server/Socks/MasterConnection.cs              |  2 +-
 server/Socks/MasterUdpClient.cs               | 11 +++++
 server/Socks/MasterUdpServer.cs               | 44 +++++++++++++++++++
 server/Socks/PlayerConnection.cs              |  2 +-
 server/config.ini                             |  3 ++
 18 files changed, 97 insertions(+), 24 deletions(-)
 create mode 100644 client/ip.php
 rename server/Libraries/Kneesocks/{WebSocket => }/Connection.cs (99%)
 rename server/Libraries/Kneesocks/{WebSocket => }/Frame.cs (99%)
 rename server/Libraries/Kneesocks/{WebSocket => }/Handshake.cs (99%)
 rename server/Libraries/Kneesocks/{WebSocket => }/Pool.cs (99%)
 rename server/Libraries/Kneesocks/{WebSocket => }/ReadBuffer.cs (98%)
 rename server/Libraries/Kneesocks/{WebSocket => }/Server.cs (98%)
 rename server/Libraries/Kneesocks/{WebSocket => }/Stack.cs (98%)
 create mode 100644 server/ServerList.cs
 create mode 100644 server/Socks/MasterUdpClient.cs
 create mode 100644 server/Socks/MasterUdpServer.cs

diff --git a/client/ip.php b/client/ip.php
new file mode 100644
index 0000000..adaf8a1
--- /dev/null
+++ b/client/ip.php
@@ -0,0 +1,2 @@
+<?php
+echo $_SERVER["REMOTE_ADDR"];
\ No newline at end of file
diff --git a/server/Configuration.cs b/server/Configuration.cs
index 75a4c22..8215fa8 100644
--- a/server/Configuration.cs
+++ b/server/Configuration.cs
@@ -41,9 +41,9 @@ namespace CircleScape {
             return Settings[section];
         }
 
-        public static Section General {
+        public static Instance General {
             get {
-                return Settings["General"];
+                return Settings["General"][0];
             }
         }
 
diff --git a/server/Entrypoint.cs b/server/Entrypoint.cs
index 7207280..729489b 100644
--- a/server/Entrypoint.cs
+++ b/server/Entrypoint.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Numerics;
 using Square;
 using System.Net;
-using Kneesocks.WebSocket;
+using Kneesocks;
 
 namespace CircleScape {
     class Entrypoint {
diff --git a/server/Libraries/Kneesocks/WebSocket/Connection.cs b/server/Libraries/Kneesocks/Connection.cs
similarity index 99%
rename from server/Libraries/Kneesocks/WebSocket/Connection.cs
rename to server/Libraries/Kneesocks/Connection.cs
index 156ecc0..cfd849d 100644
--- a/server/Libraries/Kneesocks/WebSocket/Connection.cs
+++ b/server/Libraries/Kneesocks/Connection.cs
@@ -8,7 +8,7 @@ using Square;
 using System.IO;
 using System.Net;
 
-namespace Kneesocks.WebSocket {
+namespace Kneesocks {
     public class Connection {
         private bool Initialized = false;
 
diff --git a/server/Libraries/Kneesocks/WebSocket/Frame.cs b/server/Libraries/Kneesocks/Frame.cs
similarity index 99%
rename from server/Libraries/Kneesocks/WebSocket/Frame.cs
rename to server/Libraries/Kneesocks/Frame.cs
index ad78409..30611c5 100644
--- a/server/Libraries/Kneesocks/WebSocket/Frame.cs
+++ b/server/Libraries/Kneesocks/Frame.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Square;
 
-namespace Kneesocks.WebSocket {
+namespace Kneesocks {
     public class Frame {
         public enum kClosingReason {
             Normal          = 1000,
diff --git a/server/Libraries/Kneesocks/WebSocket/Handshake.cs b/server/Libraries/Kneesocks/Handshake.cs
similarity index 99%
rename from server/Libraries/Kneesocks/WebSocket/Handshake.cs
rename to server/Libraries/Kneesocks/Handshake.cs
index a11ff99..d4b4bfa 100644
--- a/server/Libraries/Kneesocks/WebSocket/Handshake.cs
+++ b/server/Libraries/Kneesocks/Handshake.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Square;
 
-namespace Kneesocks.WebSocket {
+namespace Kneesocks {
     public class Handshake {
         private const string HttpVersion = "1.1";
         public bool IsRequest = false;
diff --git a/server/Libraries/Kneesocks/Kneesocks.csproj b/server/Libraries/Kneesocks/Kneesocks.csproj
index ff2140c..0f59bb6 100644
--- a/server/Libraries/Kneesocks/Kneesocks.csproj
+++ b/server/Libraries/Kneesocks/Kneesocks.csproj
@@ -40,14 +40,14 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="WebSocket\Connection.cs" />
-    <Compile Include="WebSocket\Frame.cs" />
-    <Compile Include="WebSocket\Handshake.cs" />
-    <Compile Include="WebSocket\Pool.cs" />
+    <Compile Include="Connection.cs" />
+    <Compile Include="Frame.cs" />
+    <Compile Include="Handshake.cs" />
+    <Compile Include="Pool.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WebSocket\ReadBuffer.cs" />
-    <Compile Include="WebSocket\Server.cs" />
-    <Compile Include="WebSocket\Stack.cs" />
+    <Compile Include="ReadBuffer.cs" />
+    <Compile Include="Server.cs" />
+    <Compile Include="Stack.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Square\Square.csproj">
@@ -55,9 +55,7 @@
       <Name>Square</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="UDP\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/server/Libraries/Kneesocks/WebSocket/Pool.cs b/server/Libraries/Kneesocks/Pool.cs
similarity index 99%
rename from server/Libraries/Kneesocks/WebSocket/Pool.cs
rename to server/Libraries/Kneesocks/Pool.cs
index 22f0f08..d3f4e93 100644
--- a/server/Libraries/Kneesocks/WebSocket/Pool.cs
+++ b/server/Libraries/Kneesocks/Pool.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 
-namespace Kneesocks.WebSocket {
+namespace Kneesocks {
     public class Pool<T> where T : Connection {
         // number of threads that should be started when the pool is created
         // these threads will run for as long as the pool exists
diff --git a/server/Libraries/Kneesocks/Properties/AssemblyInfo.cs b/server/Libraries/Kneesocks/Properties/AssemblyInfo.cs
index a25e948..93e808d 100644
--- a/server/Libraries/Kneesocks/Properties/AssemblyInfo.cs
+++ b/server/Libraries/Kneesocks/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Kneesocks.WebSocket")]
+[assembly: AssemblyTitle("Kneesocks")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Kneesocks.WebSocket")]
+[assembly: AssemblyProduct("Kneesocks")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/server/Libraries/Kneesocks/WebSocket/ReadBuffer.cs b/server/Libraries/Kneesocks/ReadBuffer.cs
similarity index 98%
rename from server/Libraries/Kneesocks/WebSocket/ReadBuffer.cs
rename to server/Libraries/Kneesocks/ReadBuffer.cs
index 21c651d..b9ef5a5 100644
--- a/server/Libraries/Kneesocks/WebSocket/ReadBuffer.cs
+++ b/server/Libraries/Kneesocks/ReadBuffer.cs
@@ -5,7 +5,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Kneesocks.WebSocket {
+namespace Kneesocks {
     internal class ReadBuffer {
         private const int BufferSize = 1024;
 
diff --git a/server/Libraries/Kneesocks/WebSocket/Server.cs b/server/Libraries/Kneesocks/Server.cs
similarity index 98%
rename from server/Libraries/Kneesocks/WebSocket/Server.cs
rename to server/Libraries/Kneesocks/Server.cs
index 723a518..96b38b9 100644
--- a/server/Libraries/Kneesocks/WebSocket/Server.cs
+++ b/server/Libraries/Kneesocks/Server.cs
@@ -6,7 +6,7 @@ using System.Threading;
 using System.Net.Sockets;
 using System.Net;
 
-namespace Kneesocks.WebSocket {
+namespace Kneesocks {
     public abstract class Server {
         protected TcpListener Socket;
         protected Thread Listener = null;
diff --git a/server/Libraries/Kneesocks/WebSocket/Stack.cs b/server/Libraries/Kneesocks/Stack.cs
similarity index 98%
rename from server/Libraries/Kneesocks/WebSocket/Stack.cs
rename to server/Libraries/Kneesocks/Stack.cs
index 1cdfb2f..4630fd5 100644
--- a/server/Libraries/Kneesocks/WebSocket/Stack.cs
+++ b/server/Libraries/Kneesocks/Stack.cs
@@ -5,7 +5,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 
-namespace Kneesocks.WebSocket {
+namespace Kneesocks {
     internal class Stack<T> where T : Connection {
         private Pool<T> PoolRef = null;
         private List<T> Clients = new List<T>();
diff --git a/server/ServerList.cs b/server/ServerList.cs
new file mode 100644
index 0000000..6bc41f9
--- /dev/null
+++ b/server/ServerList.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CircleScape {
+    static class ServerList {
+        public static Dictionary<int, IPEndPoint> Servers { get; private set; } 
+            = new Dictionary<int, IPEndPoint>();
+
+        
+    }
+}
diff --git a/server/Socks/MasterConnection.cs b/server/Socks/MasterConnection.cs
index 88cceb4..cf8b4ce 100644
--- a/server/Socks/MasterConnection.cs
+++ b/server/Socks/MasterConnection.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Kneesocks.WebSocket;
+using Kneesocks;
 using Square;
 
 namespace CircleScape.Socks {
diff --git a/server/Socks/MasterUdpClient.cs b/server/Socks/MasterUdpClient.cs
new file mode 100644
index 0000000..e0e8778
--- /dev/null
+++ b/server/Socks/MasterUdpClient.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CircleScape.Socks {
+    class MasterUdpClient {
+
+    }
+}
diff --git a/server/Socks/MasterUdpServer.cs b/server/Socks/MasterUdpServer.cs
new file mode 100644
index 0000000..24b09a6
--- /dev/null
+++ b/server/Socks/MasterUdpServer.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace CircleScape.Socks {
+    static class MasterUdpServer {
+        private static UdpClient Sock;
+        private static Thread ListeningThread = null;
+        private static bool IsOpen = false;
+
+        public static void Initialize() {
+            if(!IsOpen && ListeningThread == null)
+                return;
+
+            short port = (short)Configuration.General["Master Port"];
+            Sock = new UdpClient(port);
+            
+            IsOpen = true;
+            ListeningThread = new Thread(new ThreadStart(Listener));
+            ListeningThread.Start();
+        }
+
+        public static void Listener() {
+            while(IsOpen) {
+                while(Sock.Available > 0) {
+
+                }
+
+                Thread.Sleep(1);
+            }
+        }
+
+        public static void Close() {
+            IsOpen = false;
+            ListeningThread.Join();
+            ListeningThread = null;
+        }
+    }
+}
diff --git a/server/Socks/PlayerConnection.cs b/server/Socks/PlayerConnection.cs
index 836ee06..0405593 100644
--- a/server/Socks/PlayerConnection.cs
+++ b/server/Socks/PlayerConnection.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
-using Kneesocks.WebSocket;
+using Kneesocks;
 using Square;
 using CircleScape.Encryption;
 
diff --git a/server/config.ini b/server/config.ini
index 0c615ed..b4dc288 100644
--- a/server/config.ini
+++ b/server/config.ini
@@ -11,6 +11,9 @@ Master Port = 16670
 ; this value used if the max users isn't specified in a server instance
   Max Users = 100
 
+; url to a web page that prints out the public ip address of the requester
+ Ip Checker = http://aroltd.com/ip.php
+
 [Server]
        Id = 1
      Port = 6770