Gigantic cleanup of all unnecessary files. Renaming of folders to be …

…more appropriate to project files.
nightkidfifa · Feb 20, 2012 · 3e26250 · 3e26250
1 parent cdd1336
commit 3e26250
Show file tree

Hide file tree

Showing 394 changed files with 9,641 additions and 9,174 deletions.
diff --git a/ClientConsole/ClientConsole.csproj b/ClientConsole/ClientConsole.csproj
@@ -38,6 +38,12 @@
     <Reference Include="BouncyCastle.Crypto, Version=1.7.4114.6375, Culture=neutral, PublicKeyToken=0e99375e54769942">
       <HintPath>..\References\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
+    <Reference Include="Google.ProtocolBuffers, Version=2.4.1.473, Culture=neutral, PublicKeyToken=55f7125234beb589, processorArchitecture=MSIL">
+      <HintPath>E:\dev\Libraries\protobuf\csharp\Debug\v4.0\Google.ProtocolBuffers.dll</HintPath>
+    </Reference>
+    <Reference Include="Google.ProtocolBuffers.Serialization">
+      <HintPath>E:\dev\Libraries\protobuf\csharp\Debug\v4.0\Google.ProtocolBuffers.Serialization.dll</HintPath>
+    </Reference>
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
       <HintPath>E:\dev\Libraries\log4net\log4net.dll</HintPath>
     </Reference>
@@ -60,15 +66,19 @@
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SocketService.Crypto\SocketServer.Crypto.csproj">
+    <ProjectReference Include="..\SocketServer.Client\SocketServer.Client.csproj">
+      <Project>{93FD4F32-5214-40E3-8E36-5B4E354F10C4}</Project>
+      <Name>SocketServer.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SocketServer.Crypto\SocketServer.Crypto.csproj">
       <Project>{4138075A-49CD-4A46-92CB-DFF64A0BB0B6}</Project>
       <Name>SocketServer.Crypto</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SocketService.Messages\SocketServer.Messages.csproj">
+    <ProjectReference Include="..\SocketServer.Messages\SocketServer.Messages.csproj">
       <Project>{9394CA0C-0014-4C8B-8795-3A5C45B254EE}</Project>
       <Name>SocketServer.Messages</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SocketService.Shared\SocketServer.Shared.csproj">
+    <ProjectReference Include="..\SocketServer.Shared\SocketServer.Shared.csproj">
       <Project>{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}</Project>
       <Name>SocketServer.Shared</Name>
     </ProjectReference>

diff --git a/ClientConsole/Program.cs b/ClientConsole/Program.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using SocketServer;
 using System.Threading;
 using System.Net.Sockets;
 using SocketServer.Shared.Serialization;
@@ -11,6 +10,7 @@
 using SocketServer.Messages;
 using SocketServer.Crypto;
 using Org.BouncyCastle.Math;
+using com.BlazeServer.Messages.MessageProtos;
 
 namespace ClientConsole
 {
@@ -135,11 +135,11 @@ private static void client_MessageReceived(object sender, MessageEventArgs e)
         private static void HandleEnableEncryptionResponse(MessageEventArgs e)
         {
             EnableEncryptionResponse response = e.Message as EnableEncryptionResponse;
-            encryptionEnabled = response.Enabled;
+            encryptionEnabled = response.Success;
 
             if (encryptionEnabled)
             {
-                e.ClientConnection.Envelope = new EncryptedMessageEnvelope(
+                e.ClientConnection.Envelope = new EncryptedMessageEnvelope((ICrypto)
                     new SharedKeyCrypto(
                         sa.Parameters,
                         sa.KeyPair,
@@ -151,19 +151,19 @@ private static void HandleEnableEncryptionResponse(MessageEventArgs e)
 
         private static void HandleServerConnectResponse(MessageEventArgs e)
         {
-            ServerConnectionResponse response = e.Message as ServerConnectionResponse;
-
-            sa = new ServerAuthority(new BigInteger(response.DiffieHellmanInfo.P, 16), new BigInteger(response.DiffieHellmanInfo.G, 16));
-            serverPublicKey = response.DiffieHellmanInfo.PublicKeyInfo;
-
-            // now enable encryption
-            e.ClientConnection.Send(
-                new EnableEncryptionMessage() 
-                { 
-                    MessageID = "EnableEncryptionMessage", 
-                    Enable = true, 
-                    PublicKeyInfo = sa.GenerateEncodedPublicKeyInfo() 
-                });
+            //ServerConnectionResponse response = e.Message as ServerConnectionResponse;
+
+            //sa = new ServerAuthority(new BigInteger(response.DiffieHellmanInfo.P, 16), new BigInteger(response.DiffieHellmanInfo.G, 16));
+            //serverPublicKey = response.DiffieHellmanInfo.PublicKeyInfo;
+
+            //// now enable encryption
+            //e.ClientConnection.Send(
+            //    new EnableEncryptionMessage() 
+            //    { 
+            //        MessageID = "EnableEncryptionMessage", 
+            //        Enable = true, 
+            //        PublicKeyInfo = sa.GenerateEncodedPublicKeyInfo() 
+            //    });
         }
 
         static void client_ClientClosed(object sender, DisconnectedArgs e)

diff --git a/ConsoleApplication1/ConsoleApplication1.csproj b/ConsoleApplication1/ConsoleApplication1.csproj
@@ -56,11 +56,19 @@
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SocketService.Client\SocketServer.Client.csproj">
+    <ProjectReference Include="..\SocketServer.Client\SocketServer.Client.csproj">
       <Project>{93FD4F32-5214-40E3-8E36-5B4E354F10C4}</Project>
       <Name>SocketServer.Client</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SocketService.Shared\SocketServer.Shared.csproj">
+    <ProjectReference Include="..\SocketServer.Crypto\SocketServer.Crypto.csproj">
+      <Project>{4138075A-49CD-4A46-92CB-DFF64A0BB0B6}</Project>
+      <Name>SocketServer.Crypto</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SocketServer.Messages\SocketServer.Messages.csproj">
+      <Project>{9394CA0C-0014-4C8B-8795-3A5C45B254EE}</Project>
+      <Name>SocketServer.Messages</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SocketServer.Shared\SocketServer.Shared.csproj">
       <Project>{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}</Project>
       <Name>SocketServer.Shared</Name>
     </ProjectReference>

diff --git a/Database/ServerData.sdf b/Database/ServerData.sdf
diff --git a/NewSocketServer/ChannelEventArgs.cs b/NewSocketServer/ChannelEventArgs.cs