From 8b9cbd0550e31a4462c5e32db52677d0d42054b5 Mon Sep 17 00:00:00 2001
From: Malloc of Kuzkycyziklistan <aleco@aroltd.com>
Date: Thu, 8 Jun 2017 16:01:34 -0500
Subject: [PATCH] you can look now it's fixed

but it still sucks
---
 ClassLibrary1/Class1.cs                       |  8 -----
 ClassLibrary1/ClassLibrary1.csproj            |  7 -----
 server/CircleScape.csproj                     |  3 +-
 server/Entrypoint.cs                          | 29 +++++++++++++++----
 server/Libraries/Kneesocks/Kneesocks.csproj   | 17 ++++++-----
 .../Kneesocks/Properties/AssemblyInfo.cs      |  4 +--
 .../Kneesocks/{ => WebSocket}/Connection.cs   |  2 +-
 .../Kneesocks/{ => WebSocket}/Frame.cs        |  2 +-
 .../Kneesocks/{ => WebSocket}/Handshake.cs    |  2 +-
 .../Kneesocks/{ => WebSocket}/Pool.cs         |  2 +-
 .../Kneesocks/{ => WebSocket}/ReadBuffer.cs   |  2 +-
 .../Kneesocks/{ => WebSocket}/Server.cs       |  7 +++--
 .../Kneesocks/{ => WebSocket}/Stack.cs        |  5 ++--
 server/Libraries/Square/INI/Section.cs        |  2 +-
 server/Libraries/Square/INI/Value.cs          |  4 +--
 server/Socks/MasterConnection.cs              |  2 +-
 server/Socks/PlayerConnection.cs              |  2 +-
 17 files changed, 55 insertions(+), 45 deletions(-)
 delete mode 100644 ClassLibrary1/Class1.cs
 delete mode 100644 ClassLibrary1/ClassLibrary1.csproj
 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 (91%)
 rename server/Libraries/Kneesocks/{ => WebSocket}/Stack.cs (94%)

diff --git a/ClassLibrary1/Class1.cs b/ClassLibrary1/Class1.cs
deleted file mode 100644
index 174f12f..0000000
--- a/ClassLibrary1/Class1.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace ClassLibrary1
-{
-    public class Class1
-    {
-    }
-}
diff --git a/ClassLibrary1/ClassLibrary1.csproj b/ClassLibrary1/ClassLibrary1.csproj
deleted file mode 100644
index 954020d..0000000
--- a/ClassLibrary1/ClassLibrary1.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard1.4</TargetFramework>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file
diff --git a/server/CircleScape.csproj b/server/CircleScape.csproj
index 49f97d4..4971af3 100644
--- a/server/CircleScape.csproj
+++ b/server/CircleScape.csproj
@@ -141,7 +141,8 @@
     <Error Condition="!Exists('packages\Costura.Fody.1.4.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.1.4.0\build\Costura.Fody.targets'))" />
   </Target>
   <PropertyGroup>
-    <PostBuildEvent>XCOPY "$(ProjectDir)Assets" "$(TargetDir)" /Y /E
+    <PostBuildEvent>mkdir "$(TargetDir)Assets"
+XCOPY "$(ProjectDir)Assets" "$(TargetDir)Assets" /Y /E
 COPY "$(ProjectDir)config.ini" "$(TargetDir)" /Y</PostBuildEvent>
   </PropertyGroup>
   <Import Project="packages\Fody.2.0.4\build\dotnet\Fody.targets" Condition=" '$(Configuration)' == 'Release' " />
diff --git a/server/Entrypoint.cs b/server/Entrypoint.cs
index 6cf5440..7207280 100644
--- a/server/Entrypoint.cs
+++ b/server/Entrypoint.cs
@@ -7,13 +7,33 @@ using System.Threading.Tasks;
 using System.Numerics;
 using Square;
 using System.Net;
+using Kneesocks.WebSocket;
 
 namespace CircleScape {
     class Entrypoint {
         static void Main(string[] args) {
-            foreach()
-            var server = new Kneesocks.Server<PlayerConnection>(6770, PoolManager.Pending);
-            server.Start();
+            
+            Dictionary<int, Server> servers
+                = new Dictionary<int, Server>();
+            Dictionary<int, Pool<PlayerConnection>> pools
+                = new Dictionary<int, Pool<PlayerConnection>>();
+
+            foreach(var server in Configuration.Servers) {
+                var pool = new Pool<PlayerConnection> {
+                    InitialCount = 3,
+                    InitialSize = 3,
+                    SizeGrowth = 3,
+                    MaxSize = 100
+                };
+
+                pools.Add(server["Id"], pool);
+                servers.Add(server["Id"], new Server<PlayerConnection>((ushort)server["Port"], pool, server));
+            }
+
+
+
+            //var server = new Server<PlayerConnection>(6770, PoolManager.Pending);
+            //server.Start();
 
             /*while(true) {
                 var send = Console.ReadLine();
@@ -24,8 +44,7 @@ namespace CircleScape {
 
             Console.ReadLine();
 
-            server.Stop();
-            PoolManager.Dispose();
+            //server.Stop();
         }
     }
 }
diff --git a/server/Libraries/Kneesocks/Kneesocks.csproj b/server/Libraries/Kneesocks/Kneesocks.csproj
index 0a5bc5b..ff2140c 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="Connection.cs" />
-    <Compile Include="Frame.cs" />
-    <Compile Include="Handshake.cs" />
-    <Compile Include="Pool.cs" />
+    <Compile Include="WebSocket\Connection.cs" />
+    <Compile Include="WebSocket\Frame.cs" />
+    <Compile Include="WebSocket\Handshake.cs" />
+    <Compile Include="WebSocket\Pool.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReadBuffer.cs" />
-    <Compile Include="Server.cs" />
-    <Compile Include="Stack.cs" />
+    <Compile Include="WebSocket\ReadBuffer.cs" />
+    <Compile Include="WebSocket\Server.cs" />
+    <Compile Include="WebSocket\Stack.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Square\Square.csproj">
@@ -55,6 +55,9 @@
       <Name>Square</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="UDP\" />
+  </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/Properties/AssemblyInfo.cs b/server/Libraries/Kneesocks/Properties/AssemblyInfo.cs
index 93e808d..a25e948 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")]
+[assembly: AssemblyTitle("Kneesocks.WebSocket")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Kneesocks")]
+[assembly: AssemblyProduct("Kneesocks.WebSocket")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/server/Libraries/Kneesocks/Connection.cs b/server/Libraries/Kneesocks/WebSocket/Connection.cs
similarity index 99%
rename from server/Libraries/Kneesocks/Connection.cs
rename to server/Libraries/Kneesocks/WebSocket/Connection.cs
index cfd849d..156ecc0 100644
--- a/server/Libraries/Kneesocks/Connection.cs
+++ b/server/Libraries/Kneesocks/WebSocket/Connection.cs
@@ -8,7 +8,7 @@ using Square;
 using System.IO;
 using System.Net;
 
-namespace Kneesocks {
+namespace Kneesocks.WebSocket {
     public class Connection {
         private bool Initialized = false;
 
diff --git a/server/Libraries/Kneesocks/Frame.cs b/server/Libraries/Kneesocks/WebSocket/Frame.cs
similarity index 99%
rename from server/Libraries/Kneesocks/Frame.cs
rename to server/Libraries/Kneesocks/WebSocket/Frame.cs
index 30611c5..ad78409 100644
--- a/server/Libraries/Kneesocks/Frame.cs
+++ b/server/Libraries/Kneesocks/WebSocket/Frame.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Square;
 
-namespace Kneesocks {
+namespace Kneesocks.WebSocket {
     public class Frame {
         public enum kClosingReason {
             Normal          = 1000,
diff --git a/server/Libraries/Kneesocks/Handshake.cs b/server/Libraries/Kneesocks/WebSocket/Handshake.cs
similarity index 99%
rename from server/Libraries/Kneesocks/Handshake.cs
rename to server/Libraries/Kneesocks/WebSocket/Handshake.cs
index d4b4bfa..a11ff99 100644
--- a/server/Libraries/Kneesocks/Handshake.cs
+++ b/server/Libraries/Kneesocks/WebSocket/Handshake.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Square;
 
-namespace Kneesocks {
+namespace Kneesocks.WebSocket {
     public class Handshake {
         private const string HttpVersion = "1.1";
         public bool IsRequest = false;
diff --git a/server/Libraries/Kneesocks/Pool.cs b/server/Libraries/Kneesocks/WebSocket/Pool.cs
similarity index 99%
rename from server/Libraries/Kneesocks/Pool.cs
rename to server/Libraries/Kneesocks/WebSocket/Pool.cs
index d3f4e93..22f0f08 100644
--- a/server/Libraries/Kneesocks/Pool.cs
+++ b/server/Libraries/Kneesocks/WebSocket/Pool.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 
-namespace Kneesocks {
+namespace Kneesocks.WebSocket {
     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/ReadBuffer.cs b/server/Libraries/Kneesocks/WebSocket/ReadBuffer.cs
similarity index 98%
rename from server/Libraries/Kneesocks/ReadBuffer.cs
rename to server/Libraries/Kneesocks/WebSocket/ReadBuffer.cs
index b9ef5a5..21c651d 100644
--- a/server/Libraries/Kneesocks/ReadBuffer.cs
+++ b/server/Libraries/Kneesocks/WebSocket/ReadBuffer.cs
@@ -5,7 +5,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Kneesocks {
+namespace Kneesocks.WebSocket {
     internal class ReadBuffer {
         private const int BufferSize = 1024;
 
diff --git a/server/Libraries/Kneesocks/Server.cs b/server/Libraries/Kneesocks/WebSocket/Server.cs
similarity index 91%
rename from server/Libraries/Kneesocks/Server.cs
rename to server/Libraries/Kneesocks/WebSocket/Server.cs
index 0cfa808..723a518 100644
--- a/server/Libraries/Kneesocks/Server.cs
+++ b/server/Libraries/Kneesocks/WebSocket/Server.cs
@@ -6,7 +6,7 @@ using System.Threading;
 using System.Net.Sockets;
 using System.Net;
 
-namespace Kneesocks {
+namespace Kneesocks.WebSocket {
     public abstract class Server {
         protected TcpListener Socket;
         protected Thread Listener = null;
@@ -45,8 +45,9 @@ namespace Kneesocks {
             
             while(Started) {
                 if(Socket.Pending()) {
-                    var templatedConnection = new T();
-                    templatedConnection.Server = this;
+                    var templatedConnection = new T() {
+                        Server = this
+                    };
                     templatedConnection.Initialize(Socket.AcceptTcpClient());
                     ConnectionPool.AddConnection(templatedConnection);
                 }
diff --git a/server/Libraries/Kneesocks/Stack.cs b/server/Libraries/Kneesocks/WebSocket/Stack.cs
similarity index 94%
rename from server/Libraries/Kneesocks/Stack.cs
rename to server/Libraries/Kneesocks/WebSocket/Stack.cs
index cc05643..1cdfb2f 100644
--- a/server/Libraries/Kneesocks/Stack.cs
+++ b/server/Libraries/Kneesocks/WebSocket/Stack.cs
@@ -5,7 +5,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 
-namespace Kneesocks {
+namespace Kneesocks.WebSocket {
     internal class Stack<T> where T : Connection {
         private Pool<T> PoolRef = null;
         private List<T> Clients = new List<T>();
@@ -64,7 +64,8 @@ namespace Kneesocks {
                     }
                 }
 
-                Thread.Sleep(10);
+                // TODO consider changing this later
+                Thread.Sleep(1);
             }
 
             Finished = true;
diff --git a/server/Libraries/Square/INI/Section.cs b/server/Libraries/Square/INI/Section.cs
index 4b69259..374caeb 100644
--- a/server/Libraries/Square/INI/Section.cs
+++ b/server/Libraries/Square/INI/Section.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Square.INI {
     public class Section : IEnumerable<Instance> {
-        private List<Instance> Instances;
+        private List<Instance> Instances = new List<Instance>();
 
         internal Section() { }
 
diff --git a/server/Libraries/Square/INI/Value.cs b/server/Libraries/Square/INI/Value.cs
index 3f30d6e..6c9884b 100644
--- a/server/Libraries/Square/INI/Value.cs
+++ b/server/Libraries/Square/INI/Value.cs
@@ -22,8 +22,8 @@ namespace Square.INI {
                 : false;
         }
 
-        public static implicit operator int(Value value) {
-            return Int32.TryParse(value.Raw, out int retval)
+        public static implicit operator Int32(Value value) {
+            return Int32.TryParse(value.Raw, out Int32 retval)
                 ? retval
                 : 0;
         }
diff --git a/server/Socks/MasterConnection.cs b/server/Socks/MasterConnection.cs
index cf8b4ce..88cceb4 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;
+using Kneesocks.WebSocket;
 using Square;
 
 namespace CircleScape.Socks {
diff --git a/server/Socks/PlayerConnection.cs b/server/Socks/PlayerConnection.cs
index 0405593..836ee06 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;
+using Kneesocks.WebSocket;
 using Square;
 using CircleScape.Encryption;