From 632dfc1929488fe173d64fced389b369a77f7aae Mon Sep 17 00:00:00 2001
From: Malloc of Kuzkycyziklistan <aleco@aroltd.com>
Date: Tue, 25 Apr 2017 16:01:41 -0500
Subject: [PATCH] striped socks

but only half a pair
---
 server/ActiveConnection.cs  |   4 +---
 server/CircleScape.csproj   |   6 ++++++
 server/Database/Database.cs |  10 ++++++++++
 server/Database/Query.cs    |  10 ++++++++++
 server/Database/Table.cs    |  10 ++++++++++
 server/Entrypoint.cs        |  27 ++++++---------------------
 server/PoolManager.cs       |   5 -----
 server/Websocket/Frame.cs   |  14 ++++++++++++++
 server/scape.db             | Bin 16384 -> 24576 bytes
 9 files changed, 57 insertions(+), 29 deletions(-)
 create mode 100644 server/Database/Database.cs
 create mode 100644 server/Database/Query.cs
 create mode 100644 server/Database/Table.cs

diff --git a/server/ActiveConnection.cs b/server/ActiveConnection.cs
index 3ba12ea..78953a7 100644
--- a/server/ActiveConnection.cs
+++ b/server/ActiveConnection.cs
@@ -9,8 +9,6 @@ namespace CircleScape {
     class ActiveConnection : Websocket.Connection {
         public ActiveConnection(TcpClient sock) : base(sock) { }
 
-        public ActiveConnection(PendingConnection conn) : base(conn) {
-
-        }
+        public ActiveConnection(PendingConnection conn) : base(conn) { }
     }
 }
diff --git a/server/CircleScape.csproj b/server/CircleScape.csproj
index d1b2c21..a316260 100644
--- a/server/CircleScape.csproj
+++ b/server/CircleScape.csproj
@@ -56,12 +56,18 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ActiveConnection.cs" />
+    <Compile Include="Database\Database.cs" />
+    <Compile Include="Database\Query.cs" />
+    <Compile Include="Database\Table.cs" />
     <Compile Include="Entrypoint.cs" />
+    <Compile Include="PendingConnection.cs" />
     <Compile Include="PoolManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utilities.cs" />
     <Compile Include="Websocket\Connection.cs" />
     <Compile Include="Websocket\Frame.cs" />
+    <Compile Include="Websocket\Handshake.cs" />
     <Compile Include="Websocket\Pool.cs" />
     <Compile Include="Websocket\Server.cs" />
     <Compile Include="Websocket\Stack.cs" />
diff --git a/server/Database/Database.cs b/server/Database/Database.cs
new file mode 100644
index 0000000..7650103
--- /dev/null
+++ b/server/Database/Database.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CircleScape.Database {
+    class Database {
+    }
+}
diff --git a/server/Database/Query.cs b/server/Database/Query.cs
new file mode 100644
index 0000000..7b159c0
--- /dev/null
+++ b/server/Database/Query.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CircleScape.Database {
+    class Query {
+    }
+}
diff --git a/server/Database/Table.cs b/server/Database/Table.cs
new file mode 100644
index 0000000..af47325
--- /dev/null
+++ b/server/Database/Table.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CircleScape.Database {
+    class Table {
+    }
+}
diff --git a/server/Entrypoint.cs b/server/Entrypoint.cs
index 0aa1437..3a922c0 100644
--- a/server/Entrypoint.cs
+++ b/server/Entrypoint.cs
@@ -1,24 +1,9 @@
-/***************************************/using
-    System                              ;using
-/***************************************/
-    System                              .
-     Collections                        .
-      Generic                           ;using
-/***************************************/
-    System                              .
-     Linq                               ;using
-/***************************************/
-    System                              . 
-     Text                               ;using
-/***************************************/
-    System                              .
-     Threading                          .
-      Tasks                             ;using
-/***************************************/
-    System                              .
-     Data                               .
-      SQLite                            ;
-/***************************************/
+using System;
+using System.Collections.Generic;
+using System.Data.SQLite;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace CircleScape {
     class Entrypoint {
diff --git a/server/PoolManager.cs b/server/PoolManager.cs
index a8711fa..3900030 100644
--- a/server/PoolManager.cs
+++ b/server/PoolManager.cs
@@ -21,11 +21,6 @@ namespace CircleScape {
             };
 
             ActiveConnectionsPool = new Pool<ActiveConnection>();
-
-            var test = new PendingConnection(new TcpClient());
-            var teste = test as ActiveConnection;
-
-            
         }
     }
 }
diff --git a/server/Websocket/Frame.cs b/server/Websocket/Frame.cs
index 7563ad3..b2c21f1 100644
--- a/server/Websocket/Frame.cs
+++ b/server/Websocket/Frame.cs
@@ -6,6 +6,20 @@ using System.Threading.Tasks;
 
 namespace CircleScape.Websocket {
     class Frame {
+        public enum kOpcode {
+            Continuation    = 0x0,
+            TextFrame       = 0x1,
+            BinaryFrame     = 0x2,
+            Close           = 0x8,
+            Ping            = 0x9,
+            Pong            = 0xA
+        };
+
+        public kOpcode Opcode { get; private set; }
+        public bool IsFinal { get; private set; }
+        public bool IsMasked { get; private set; }
+        public byte[] Mask { get; private set; }
+        public byte Reserved { get; private set; }
 
     }
 }
diff --git a/server/scape.db b/server/scape.db
index 5a29be238139f005b8fa02e8ad3dc3ca69798d43..ace31b00a1a8a1c7f2bc4a5a7cc2e5f31c59bb20 100644
GIT binary patch
literal 24576
zcmeI)zi!$<9Ki82P6(iaGeq)w$^=R}pv+b4R#t^doP-)tCIg8pS>jIsBif-uc!)kn
z$38^YK1PQwnR{m-Ds2<7MYX<`&VTNo{rj9foQ!#UQIFzKz8_5n-B_N8ePI~lg_J^w
zj7r&6()$N0?WnX~jP=d~+l+Yn^J~$1F3gf6N<T`D_1)@Oy$4!Qga85vAb<b@2q1s}
z0th^+z@qqM&u+Dh#m9J&FD-Y+aktkGr{lhwKlLV~`81palW^D_gu&&gKN}2#VK@)A
zuatS!a2?;3zVou~%Fb3DcVxMc??hLfe9iOS*KR|4XTJ2B^}0N7)J~m7TfTAI(rNl<
zHBa?_>U#dMYN4;PllR?ss`9!))2m%HU0r%TR~>E?>fGr1kIX_v&FjA0RFsEp8;fcZ
z>P#_AlhtNChe_Vy<6iH%nYE9OjP`GX5=_JKEF5002J-H3XJa&$gK<|_)_%vTWkubU
zpLO&%v%jK`cC+@UmLVc*wH;oCA66Z8XYnY~$H7*^98|ZeW~!?>(a%Xmo${HjPW{hQ
zCL<A4lZ{!__4oCP1px#QKmY**5I_I{1Q0*~0R+-2P|$%b=l}X0KMMi~Ab<b@2q1s}
z0tg_000Ic4P(Z)`H>_J>-CEyL7#<-ZfB*srAb<b@2q1s}0tg_GI)QT5Y~{B4QXrQ#
z?OgH!0KflF-EBZX2q1s}0tg_000IagfB*sr+$W&_%WwC-Lh=zn009ILKmY**5I_I{
L1Q0;r{}%WKS)~ms

delta 231
zcmZoTz}V2hI6+#Fk%57M1&CpQaiWf~Fe8H=V+1e%4+dtww+#ID{Ac;zZWa`%=9~PM
zFNmv=n~_~yT%577bh0;}Y<+2QYEiL*MrMkFr(cMxyK9g_K#-@eV^E}mw`-(=V`zxK
zr=N3>tFNnHh=QL#5QqBs=qThR=B6ryIR-g<I0h+b7#e9Rg!*{~hPomtDJV}-fJmE}
zXliOQv5DJ?Gcsi6rKDCA7v^M^q{b(fmgG-<%P-6UbUX+%Y!cuW*vu{Pm4A`}%VrjV
GKl}jjN;(bz