From f4e34c84bd1738c6bee98b126b26d0a397a34395 Mon Sep 17 00:00:00 2001
From: Malloc of Kuzkycyziklistan <aleco@aroltd.com>
Date: Tue, 6 Jun 2017 16:13:25 -0500
Subject: [PATCH] sock refactor

considerations
---
 ClassLibrary1/Class1.cs                       |  8 ++++
 ClassLibrary1/ClassLibrary1.csproj            |  7 ++++
 server/CircleScape.csproj                     |  9 +++--
 server/CircleScape.sln                        |  2 +-
 server/DAL/Origin.cs                          | 11 +++++-
 server/DAL/ScapeDb.cs                         |  1 +
 server/DAL/Session.cs                         | 11 ++++++
 server/DAL/User.cs                            |  1 +
 server/Entrypoint.cs                          |  3 +-
 server/Libraries/Square/INI/Instance.cs       | 13 +++++++
 server/Libraries/Square/INI/Section.cs        | 16 ++++++++
 .../Square/INI/SectionRules.cs}               |  5 +--
 server/Libraries/Square/INI/SettingsFile.cs   | 34 +++++++++++++++++
 server/Libraries/Square/Square.csproj         |  5 +++
 server/Socks/ActiveConnection.cs              | 19 ----------
 server/Socks/MasterConnection.cs              | 13 +++++++
 ...ndingConnection.cs => PlayerConnection.cs} |  4 +-
 server/Socks/PoolManager.cs                   | 37 -------------------
 server/What/INIFile.cs                        |  8 ++++
 server/What/What.csproj                       |  7 ++++
 20 files changed, 146 insertions(+), 68 deletions(-)
 create mode 100644 ClassLibrary1/Class1.cs
 create mode 100644 ClassLibrary1/ClassLibrary1.csproj
 create mode 100644 server/Libraries/Square/INI/Instance.cs
 create mode 100644 server/Libraries/Square/INI/Section.cs
 rename server/{DAL/Server.cs => Libraries/Square/INI/SectionRules.cs} (60%)
 create mode 100644 server/Libraries/Square/INI/SettingsFile.cs
 delete mode 100644 server/Socks/ActiveConnection.cs
 create mode 100644 server/Socks/MasterConnection.cs
 rename server/Socks/{PendingConnection.cs => PlayerConnection.cs} (97%)
 delete mode 100644 server/Socks/PoolManager.cs
 create mode 100644 server/What/INIFile.cs
 create mode 100644 server/What/What.csproj

diff --git a/ClassLibrary1/Class1.cs b/ClassLibrary1/Class1.cs
new file mode 100644
index 0000000..174f12f
--- /dev/null
+++ b/ClassLibrary1/Class1.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace ClassLibrary1
+{
+    public class Class1
+    {
+    }
+}
diff --git a/ClassLibrary1/ClassLibrary1.csproj b/ClassLibrary1/ClassLibrary1.csproj
new file mode 100644
index 0000000..954020d
--- /dev/null
+++ b/ClassLibrary1/ClassLibrary1.csproj
@@ -0,0 +1,7 @@
+<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 3ad683c..6176eaa 100644
--- a/server/CircleScape.csproj
+++ b/server/CircleScape.csproj
@@ -71,7 +71,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DAL\Origin.cs" />
     <Compile Include="DAL\ScapeDb.cs" />
+    <Compile Include="DAL\Session.cs" />
     <Compile Include="DAL\User.cs" />
     <Compile Include="Encryption\KeyExchange.cs" />
     <Compile Include="Encryption\Cipher.cs" />
@@ -80,11 +82,10 @@
       <DependentUpon>201706040437361_Initial.cs</DependentUpon>
     </Compile>
     <Compile Include="Migrations\Configuration.cs" />
+    <Compile Include="Socks\MasterConnection.cs" />
     <Compile Include="Socks\Packet.cs" />
-    <Compile Include="Socks\ActiveConnection.cs" />
     <Compile Include="Entrypoint.cs" />
-    <Compile Include="Socks\PendingConnection.cs" />
-    <Compile Include="Socks\PoolManager.cs" />
+    <Compile Include="Socks\PlayerConnection.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -92,8 +93,8 @@
       <SubType>Designer</SubType>
     </None>
     <None Include="connectionStrings.config">
-      <SubType>Designer</SubType>
       <DependentUpon>App.config</DependentUpon>
+      <SubType>Designer</SubType>
     </None>
     <None Include="packages.config">
       <SubType>Designer</SubType>
diff --git a/server/CircleScape.sln b/server/CircleScape.sln
index e55c872..1289dc0 100644
--- a/server/CircleScape.sln
+++ b/server/CircleScape.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26403.7
+VisualStudioVersion = 15.0.26430.6
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CircleScape", "CircleScape.csproj", "{438DBAC1-BA37-40BB-9CCE-0FE1F23C6DC5}"
 EndProject
diff --git a/server/DAL/Origin.cs b/server/DAL/Origin.cs
index 31f3453..47726f7 100644
--- a/server/DAL/Origin.cs
+++ b/server/DAL/Origin.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -13,6 +14,14 @@ namespace CircleScape.DAL {
         public long UserId { get; set; }
         public virtual User User { get; set; }
 
-        public string Ip { get; set; } 
+        protected string RawIp { get; set; }
+        public IPAddress Ip {
+            get {
+                return IPAddress.Parse(RawIp);
+            }
+            set {
+                RawIp = value.ToString();
+            }
+        }
     }
 }
diff --git a/server/DAL/ScapeDb.cs b/server/DAL/ScapeDb.cs
index 7433be0..1f5a0c0 100644
--- a/server/DAL/ScapeDb.cs
+++ b/server/DAL/ScapeDb.cs
@@ -18,6 +18,7 @@ namespace CircleScape.DAL {
 
         public DbSet<User> Users { get; set; }
         public DbSet<Origin> Origins { get; set; }
+        public DbSet<Session> Sessions { get; set; }
 
 
         protected override void OnModelCreating(DbModelBuilder modelBuilder) {
diff --git a/server/DAL/Session.cs b/server/DAL/Session.cs
index d487e42..6e39df3 100644
--- a/server/DAL/Session.cs
+++ b/server/DAL/Session.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -13,6 +14,16 @@ namespace CircleScape.DAL {
         public int UserId { get; set; }
         public virtual User User { get; set; }
 
+        protected string RawIp { get; set; }
+        public IPAddress Ip {
+            get {
+                return IPAddress.Parse(RawIp);
+            }
+            set {
+                RawIp = value.ToString();
+            }
+        }
 
+        public int ServerId { get; set; }
     }
 }
diff --git a/server/DAL/User.cs b/server/DAL/User.cs
index f94f5a6..6a53c3b 100644
--- a/server/DAL/User.cs
+++ b/server/DAL/User.cs
@@ -20,5 +20,6 @@ namespace CircleScape.DAL {
         public DateTime? LastLogin { get; set; }
 
         public virtual ICollection<Origin> Origins { get; set; }
+        public virtual Session Session { get; set; }
     }
 }
diff --git a/server/Entrypoint.cs b/server/Entrypoint.cs
index e02d8d7..57ccdfc 100644
--- a/server/Entrypoint.cs
+++ b/server/Entrypoint.cs
@@ -6,11 +6,12 @@ using System.Threading.Tasks;
 //using CircleScape.DAL;
 using System.Numerics;
 using Square;
+using System.Net;
 
 namespace CircleScape {
     class Entrypoint {
         static void Main(string[] args) {
-            var server = new Kneesocks.Server<PendingConnection>(6770, PoolManager.Pending);
+            var server = new Kneesocks.Server<PlayerConnection>(6770, PoolManager.Pending);
             server.Start();
 
             /*while(true) {
diff --git a/server/Libraries/Square/INI/Instance.cs b/server/Libraries/Square/INI/Instance.cs
new file mode 100644
index 0000000..ebe0e8b
--- /dev/null
+++ b/server/Libraries/Square/INI/Instance.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Square.INI {
+    class Instance {
+        private Dictionary<string, string> Data { get; set; }
+
+
+    }
+}
diff --git a/server/Libraries/Square/INI/Section.cs b/server/Libraries/Square/INI/Section.cs
new file mode 100644
index 0000000..aabdd7f
--- /dev/null
+++ b/server/Libraries/Square/INI/Section.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Square.INI {
+    public class Section : IEnumerable {
+        private List<Instance> Instances;
+
+        public IEnumerator GetEnumerator() {
+            return Instances.GetEnumerator();
+        }
+    }
+}
diff --git a/server/DAL/Server.cs b/server/Libraries/Square/INI/SectionRules.cs
similarity index 60%
rename from server/DAL/Server.cs
rename to server/Libraries/Square/INI/SectionRules.cs
index 13f7415..35ac38b 100644
--- a/server/DAL/Server.cs
+++ b/server/Libraries/Square/INI/SectionRules.cs
@@ -4,9 +4,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CircleScape.DAL {
-    class Server {
-        public int Id { get; set; }
+namespace Square.INI {
+    public class SectionRules {
 
     }
 }
diff --git a/server/Libraries/Square/INI/SettingsFile.cs b/server/Libraries/Square/INI/SettingsFile.cs
new file mode 100644
index 0000000..62b1e54
--- /dev/null
+++ b/server/Libraries/Square/INI/SettingsFile.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Square.INI {
+    public class SettingsFile {
+        private Dictionary<string, Section> Sections 
+            = new Dictionary<string, Section>(StringComparer.OrdinalIgnoreCase);
+
+        public SettingsFile(string path) {
+            var lines = File.ReadAllLines(path);
+
+            string currentSection = null;
+            foreach(var line in lines) {
+
+            }
+        }
+
+        public SettingsFile(string path, List<SectionRules> rules) {
+
+        }
+
+        public Section this[string section] {
+            get {
+                if(Sections.ContainsKey(section))
+                    return Sections[section];
+                else return null;
+            }
+        }
+    }
+}
diff --git a/server/Libraries/Square/Square.csproj b/server/Libraries/Square/Square.csproj
index 5a2bcd5..8c25c5a 100644
--- a/server/Libraries/Square/Square.csproj
+++ b/server/Libraries/Square/Square.csproj
@@ -44,11 +44,16 @@
     <Compile Include="ArrayExtensions.cs" />
     <Compile Include="CryptoExtensions.cs" />
     <Compile Include="General.cs" />
+    <Compile Include="INI\Instance.cs" />
+    <Compile Include="INI\Section.cs" />
+    <Compile Include="INI\SectionRules.cs" />
+    <Compile Include="INI\SettingsFile.cs" />
     <Compile Include="NumericExtensions.cs" />
     <Compile Include="RandomContext.cs" />
     <Compile Include="StringExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </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/Socks/ActiveConnection.cs b/server/Socks/ActiveConnection.cs
deleted file mode 100644
index e9f19ab..0000000
--- a/server/Socks/ActiveConnection.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading.Tasks;
-using Kneesocks;
-using CircleScape.Encryption;
-
-namespace CircleScape {
-    class ActiveConnection : Connection {
-        private Cipher Encryptor;
-
-        public void Initialize(PendingConnection conn) {
-            Initialize(conn, false);
-            Encryptor = conn.Encryptor;
-        }
-    }
-}
diff --git a/server/Socks/MasterConnection.cs b/server/Socks/MasterConnection.cs
new file mode 100644
index 0000000..cf8b4ce
--- /dev/null
+++ b/server/Socks/MasterConnection.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Kneesocks;
+using Square;
+
+namespace CircleScape.Socks {
+    class MasterConnection : Connection {
+
+    }
+}
diff --git a/server/Socks/PendingConnection.cs b/server/Socks/PlayerConnection.cs
similarity index 97%
rename from server/Socks/PendingConnection.cs
rename to server/Socks/PlayerConnection.cs
index 01fa2ac..0405593 100644
--- a/server/Socks/PendingConnection.cs
+++ b/server/Socks/PlayerConnection.cs
@@ -4,12 +4,12 @@ using System.Linq;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
-using Square;
 using Kneesocks;
+using Square;
 using CircleScape.Encryption;
 
 namespace CircleScape {
-    class PendingConnection : Connection {
+    class PlayerConnection : Connection {
         private DateTime ConnectionOpened;
         private Key Key;
         public Cipher Encryptor { get; private set; } = null;
diff --git a/server/Socks/PoolManager.cs b/server/Socks/PoolManager.cs
deleted file mode 100644
index 4782cd6..0000000
--- a/server/Socks/PoolManager.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Kneesocks;
-using System.Net.Sockets;
-
-namespace CircleScape {
-    static class PoolManager {
-        private static Pool<PendingConnection> PendingConnectionsPool;
-        private static Pool<ActiveConnection> ActiveConnectionsPool;
-        public static Pool<PendingConnection> Pending {
-            get => PendingConnectionsPool;
-        }
-        public static Pool<ActiveConnection> Active {
-            get => ActiveConnectionsPool;
-        }
-
-        static PoolManager() {
-            PendingConnectionsPool = new Pool<PendingConnection> {
-                InitialCount = 1,
-                InitialSize = 10,
-                SizeGrowth = 10,
-                MaxSize = 50,
-                MaxCount = 5
-            };
-
-            ActiveConnectionsPool = new Pool<ActiveConnection>();
-        }
-
-        public static void Dispose() {
-            PendingConnectionsPool.Dispose();
-            ActiveConnectionsPool.Dispose();
-        }
-    }
-}
diff --git a/server/What/INIFile.cs b/server/What/INIFile.cs
new file mode 100644
index 0000000..f74d857
--- /dev/null
+++ b/server/What/INIFile.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace What
+{
+    public class INIFile {
+
+    }
+}
diff --git a/server/What/What.csproj b/server/What/What.csproj
new file mode 100644
index 0000000..954020d
--- /dev/null
+++ b/server/What/What.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.4</TargetFramework>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file