From bd26a71fefe3a8e2affbe7a6c6d967de8064506a Mon Sep 17 00:00:00 2001
From: Filip Maj <filipmaj@gmail.com>
Date: Sun, 28 Aug 2016 14:25:37 -0400
Subject: [PATCH] Changed folder from Proxy to World. Did some nlog configing.

---
 .../FFXIVClassic Common Class Lib.csproj               |  3 +++
 FFXIVClassic Lobby Server/NLog.config                  |  6 +++---
 .../App.config                                         | 10 +++++-----
 .../ConfigConstants.cs                                 |  8 ++++----
 .../DataObjects/ClientConnection.cs                    |  0
 .../DataObjects/Session.cs                             |  2 +-
 .../DataObjects/ZoneServer.cs                          |  0
 .../FFXIVClassic World Server.csproj                   |  7 +++++--
 .../NLog.config                                        |  6 +++---
 .../NLog.xsd                                           |  0
 .../PacketProcessor.cs                                 |  2 ++
 .../Packets/Receive/HelloPacket.cs                     |  0
 .../Packets/Send/_0x2Packet.cs                         |  0
 .../Packets/Send/_0x7Packet.cs                         |  0
 .../Packets/Send/_0x8PingPacket.cs                     |  0
 .../Program.cs                                         |  0
 .../Properties/AssemblyInfo.cs                         |  0
 .../Server.cs                                          |  8 ++++----
 .../WorldMaster.cs                                     |  0
 .../packages.config                                    |  2 +-
 FFXIVClassic.sln                                       |  2 +-
 21 files changed, 32 insertions(+), 24 deletions(-)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/App.config (64%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/ConfigConstants.cs (87%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/DataObjects/ClientConnection.cs (100%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/DataObjects/Session.cs (88%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/DataObjects/ZoneServer.cs (100%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/FFXIVClassic World Server.csproj (95%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/NLog.config (85%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/NLog.xsd (100%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/PacketProcessor.cs (98%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/Packets/Receive/HelloPacket.cs (100%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/Packets/Send/_0x2Packet.cs (100%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/Packets/Send/_0x7Packet.cs (100%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/Packets/Send/_0x8PingPacket.cs (100%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/Program.cs (100%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/Properties/AssemblyInfo.cs (100%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/Server.cs (98%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/WorldMaster.cs (100%)
 rename {FFXIVClassic Proxy Server => FFXIVClassic World Server}/packages.config (93%)

diff --git a/FFXIVClassic Common Class Lib/FFXIVClassic Common Class Lib.csproj b/FFXIVClassic Common Class Lib/FFXIVClassic Common Class Lib.csproj
index df116585..2e8748d0 100644
--- a/FFXIVClassic Common Class Lib/FFXIVClassic Common Class Lib.csproj	
+++ b/FFXIVClassic Common Class Lib/FFXIVClassic Common Class Lib.csproj	
@@ -36,6 +36,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DotNetZip">
+      <HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
+    </Reference>
     <Reference Include="MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
       <Private>True</Private>
diff --git a/FFXIVClassic Lobby Server/NLog.config b/FFXIVClassic Lobby Server/NLog.config
index 2384b15b..4463f999 100644
--- a/FFXIVClassic Lobby Server/NLog.config	
+++ b/FFXIVClassic Lobby Server/NLog.config	
@@ -38,13 +38,13 @@
     <target xsi:type="ColoredConsole" name="packets"
             layout="${message}">
       <highlight-row
-        condition="equals('${logger}', 'FFXIVClassic_Lobby_Server.packets.BasePacket') and equals('${event-context:item=color}', '6')"
+        condition="equals('${logger}', 'FFXIVClassic.Common.BasePacket') and equals('${event-context:item=color}', '6')"
         backgroundColor="DarkYellow" foregroundColor="NoChange" />
       <highlight-row
-        condition="equals('${logger}', 'FFXIVClassic_Lobby_Server.packets.SubPacket') and equals('${event-context:item=color}', '4')"
+        condition="equals('${logger}', 'FFXIVClassic.Common.SubPacket') and equals('${event-context:item=color}', '4')"
         backgroundColor="DarkRed" foregroundColor="NoChange" />
       <highlight-row
-        condition="equals('${logger}', 'FFXIVClassic_Lobby_Server.packets.SubPacket') and equals('${event-context:item=color}', '5')"
+        condition="equals('${logger}', 'FFXIVClassic.Common.SubPacket') and equals('${event-context:item=color}', '5')"
         backgroundColor="DarkMagenta" foregroundColor="NoChange" />
     </target>
   </targets>
diff --git a/FFXIVClassic Proxy Server/App.config b/FFXIVClassic World Server/App.config
similarity index 64%
rename from FFXIVClassic Proxy Server/App.config
rename to FFXIVClassic World Server/App.config
index 78cae18f..329f3599 100644
--- a/FFXIVClassic Proxy Server/App.config	
+++ b/FFXIVClassic World Server/App.config	
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
 <system.data>
     <DbProviderFactories>
-      <remove invariant="MySql.Data.MySqlClient" />
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
+      <remove invariant="MySql.Data.MySqlClient"/>
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
     </DbProviderFactories>
-  </system.data></configuration>
\ No newline at end of file
+  </system.data></configuration>
diff --git a/FFXIVClassic Proxy Server/ConfigConstants.cs b/FFXIVClassic World Server/ConfigConstants.cs
similarity index 87%
rename from FFXIVClassic Proxy Server/ConfigConstants.cs
rename to FFXIVClassic World Server/ConfigConstants.cs
index dff311f8..028ad36a 100644
--- a/FFXIVClassic Proxy Server/ConfigConstants.cs	
+++ b/FFXIVClassic World Server/ConfigConstants.cs	
@@ -18,18 +18,18 @@ namespace FFXIVClassic_World_Server
 
         public static bool Load()
         {
-            Program.Log.Info("Loading world_config.ini");
+            Program.Log.Info("Loading config.ini");
 
-            if (!File.Exists("./world_config.ini"))
+            if (!File.Exists("./config.ini"))
             {
                 Program.Log.Error("FILE NOT FOUND!");
                 return false;
             }
 
-            INIFile configIni = new INIFile("./world_config.ini");
+            INIFile configIni = new INIFile("./config.ini");
 
             ConfigConstants.OPTIONS_BINDIP =        configIni.GetValue("General", "server_ip", "127.0.0.1");
-            ConfigConstants.OPTIONS_PORT =          configIni.GetValue("General", "server_port", "54994");
+            ConfigConstants.OPTIONS_PORT =          configIni.GetValue("General", "server_port", "54992");
             ConfigConstants.OPTIONS_TIMESTAMP =     configIni.GetValue("General", "showtimestamp", "true").ToLower().Equals("true");
 
             ConfigConstants.DATABASE_HOST =         configIni.GetValue("Database", "host", "");
diff --git a/FFXIVClassic Proxy Server/DataObjects/ClientConnection.cs b/FFXIVClassic World Server/DataObjects/ClientConnection.cs
similarity index 100%
rename from FFXIVClassic Proxy Server/DataObjects/ClientConnection.cs
rename to FFXIVClassic World Server/DataObjects/ClientConnection.cs
diff --git a/FFXIVClassic Proxy Server/DataObjects/Session.cs b/FFXIVClassic World Server/DataObjects/Session.cs
similarity index 88%
rename from FFXIVClassic Proxy Server/DataObjects/Session.cs
rename to FFXIVClassic World Server/DataObjects/Session.cs
index 31f29e9d..4bebf269 100644
--- a/FFXIVClassic Proxy Server/DataObjects/Session.cs	
+++ b/FFXIVClassic World Server/DataObjects/Session.cs	
@@ -16,7 +16,7 @@ namespace FFXIVClassic_World_Server.DataObjects
         public readonly Channel type;
         public ZoneServer routing1, routing2;
 
-        public Session(ulong sessionId, ClientConnection connection, Channel type)
+        public Session(uint sessionId, ClientConnection connection, Channel type)
         {
             this.sessionId = sessionId;
             this.clientConnection = connection;
diff --git a/FFXIVClassic Proxy Server/DataObjects/ZoneServer.cs b/FFXIVClassic World Server/DataObjects/ZoneServer.cs
similarity index 100%
rename from FFXIVClassic Proxy Server/DataObjects/ZoneServer.cs
rename to FFXIVClassic World Server/DataObjects/ZoneServer.cs
diff --git a/FFXIVClassic Proxy Server/FFXIVClassic World Server.csproj b/FFXIVClassic World Server/FFXIVClassic World Server.csproj
similarity index 95%
rename from FFXIVClassic Proxy Server/FFXIVClassic World Server.csproj
rename to FFXIVClassic World Server/FFXIVClassic World Server.csproj
index 52bf2d63..a2b0cb76 100644
--- a/FFXIVClassic Proxy Server/FFXIVClassic World Server.csproj	
+++ b/FFXIVClassic World Server/FFXIVClassic World Server.csproj	
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FFXIVClassic_World_Server</RootNamespace>
     <AssemblyName>FFXIVClassic World Server</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -69,7 +70,9 @@
     <Compile Include="DataObjects\Session.cs" />
     <Compile Include="PacketProcessor.cs" />
     <Compile Include="Packets\Receive\HelloPacket.cs" />
-    <Compile Include="Packets\Send\0x7ResponsePacket.cs" />
+    <Compile Include="Packets\Send\_0x2Packet.cs" />
+    <Compile Include="Packets\Send\_0x7Packet.cs" />
+    <Compile Include="Packets\Send\_0x8PingPacket.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Server.cs" />
diff --git a/FFXIVClassic Proxy Server/NLog.config b/FFXIVClassic World Server/NLog.config
similarity index 85%
rename from FFXIVClassic Proxy Server/NLog.config
rename to FFXIVClassic World Server/NLog.config
index 917f8554..aea50410 100644
--- a/FFXIVClassic Proxy Server/NLog.config	
+++ b/FFXIVClassic World Server/NLog.config	
@@ -38,13 +38,13 @@
     <target xsi:type="ColoredConsole" name="packets"
             layout="${message}">
       <highlight-row
-        condition="equals('${logger}', 'FFXIVClassic_Map_Server.packets.BasePacket') and equals('${event-context:item=color}', '6')"
+        condition="equals('${logger}', 'FFXIVClassic.Common.BasePacket') and equals('${event-context:item=color}', '6')"
         backgroundColor="DarkYellow" foregroundColor="NoChange" />
       <highlight-row
-        condition="equals('${logger}', 'FFXIVClassic_Map_Server.packets.SubPacket') and equals('${event-context:item=color}', '4')"
+        condition="equals('${logger}', 'FFXIVClassic.Common.SubPacket') and equals('${event-context:item=color}', '4')"
         backgroundColor="DarkRed" foregroundColor="NoChange" />
       <highlight-row
-        condition="equals('${logger}', 'FFXIVClassic_Map_Server.packets.SubPacket') and equals('${event-context:item=color}', '5')"
+        condition="equals('${logger}', 'FFXIVClassic.Common.SubPacket') and equals('${event-context:item=color}', '5')"
         backgroundColor="DarkMagenta" foregroundColor="NoChange" />
     </target>
   </targets>
diff --git a/FFXIVClassic Proxy Server/NLog.xsd b/FFXIVClassic World Server/NLog.xsd
similarity index 100%
rename from FFXIVClassic Proxy Server/NLog.xsd
rename to FFXIVClassic World Server/NLog.xsd
diff --git a/FFXIVClassic Proxy Server/PacketProcessor.cs b/FFXIVClassic World Server/PacketProcessor.cs
similarity index 98%
rename from FFXIVClassic Proxy Server/PacketProcessor.cs
rename to FFXIVClassic World Server/PacketProcessor.cs
index 6b57605c..f4b32176 100644
--- a/FFXIVClassic Proxy Server/PacketProcessor.cs	
+++ b/FFXIVClassic World Server/PacketProcessor.cs	
@@ -41,6 +41,8 @@ namespace FFXIVClassic_World_Server
             List<SubPacket> subPackets = packet.GetSubpackets();
             foreach (SubPacket subpacket in subPackets)
             {
+                subpacket.DebugPrintSubPacket();
+
                 //Initial Connect Packet, Create session
                 if (subpacket.header.type == 0x01)
                 {                    
diff --git a/FFXIVClassic Proxy Server/Packets/Receive/HelloPacket.cs b/FFXIVClassic World Server/Packets/Receive/HelloPacket.cs
similarity index 100%
rename from FFXIVClassic Proxy Server/Packets/Receive/HelloPacket.cs
rename to FFXIVClassic World Server/Packets/Receive/HelloPacket.cs
diff --git a/FFXIVClassic Proxy Server/Packets/Send/_0x2Packet.cs b/FFXIVClassic World Server/Packets/Send/_0x2Packet.cs
similarity index 100%
rename from FFXIVClassic Proxy Server/Packets/Send/_0x2Packet.cs
rename to FFXIVClassic World Server/Packets/Send/_0x2Packet.cs
diff --git a/FFXIVClassic Proxy Server/Packets/Send/_0x7Packet.cs b/FFXIVClassic World Server/Packets/Send/_0x7Packet.cs
similarity index 100%
rename from FFXIVClassic Proxy Server/Packets/Send/_0x7Packet.cs
rename to FFXIVClassic World Server/Packets/Send/_0x7Packet.cs
diff --git a/FFXIVClassic Proxy Server/Packets/Send/_0x8PingPacket.cs b/FFXIVClassic World Server/Packets/Send/_0x8PingPacket.cs
similarity index 100%
rename from FFXIVClassic Proxy Server/Packets/Send/_0x8PingPacket.cs
rename to FFXIVClassic World Server/Packets/Send/_0x8PingPacket.cs
diff --git a/FFXIVClassic Proxy Server/Program.cs b/FFXIVClassic World Server/Program.cs
similarity index 100%
rename from FFXIVClassic Proxy Server/Program.cs
rename to FFXIVClassic World Server/Program.cs
diff --git a/FFXIVClassic Proxy Server/Properties/AssemblyInfo.cs b/FFXIVClassic World Server/Properties/AssemblyInfo.cs
similarity index 100%
rename from FFXIVClassic Proxy Server/Properties/AssemblyInfo.cs
rename to FFXIVClassic World Server/Properties/AssemblyInfo.cs
diff --git a/FFXIVClassic Proxy Server/Server.cs b/FFXIVClassic World Server/Server.cs
similarity index 98%
rename from FFXIVClassic Proxy Server/Server.cs
rename to FFXIVClassic World Server/Server.cs
index b82ee279..1a71b338 100644
--- a/FFXIVClassic Proxy Server/Server.cs	
+++ b/FFXIVClassic World Server/Server.cs	
@@ -149,16 +149,16 @@ namespace FFXIVClassic_World_Server
                 case Session.Channel.ZONE:                    
                     if (mZoneSessionList.ContainsKey(id))
                     {
-                        mZoneSessionList[id].clientSocket.Disconnect();
-                        mConnectionList.Remove(mZoneSessionList[id].clientSocket);
+                        mZoneSessionList[id].clientConnection.Disconnect();
+                        mConnectionList.Remove(mZoneSessionList[id].clientConnection);
                         mZoneSessionList.Remove(id);
                     }
                     break;
                 case Session.Channel.CHAT:
                     if (mChatSessionList.ContainsKey(id))
                     {
-                        mChatSessionList[id].clientSocket.Disconnect();
-                        mConnectionList.Remove(mChatSessionList[id].clientSocket);
+                        mChatSessionList[id].clientConnection.Disconnect();
+                        mConnectionList.Remove(mChatSessionList[id].clientConnection);
                         mChatSessionList.Remove(id);
                     }
                     break;
diff --git a/FFXIVClassic Proxy Server/WorldMaster.cs b/FFXIVClassic World Server/WorldMaster.cs
similarity index 100%
rename from FFXIVClassic Proxy Server/WorldMaster.cs
rename to FFXIVClassic World Server/WorldMaster.cs
diff --git a/FFXIVClassic Proxy Server/packages.config b/FFXIVClassic World Server/packages.config
similarity index 93%
rename from FFXIVClassic Proxy Server/packages.config
rename to FFXIVClassic World Server/packages.config
index 043c0d66..6de55267 100644
--- a/FFXIVClassic Proxy Server/packages.config	
+++ b/FFXIVClassic World Server/packages.config	
@@ -6,5 +6,5 @@
   <package id="NLog" version="4.3.5" targetFramework="net452" />
   <package id="NLog.Config" version="4.3.5" targetFramework="net452" />
   <package id="NLog.Schema" version="4.3.4" targetFramework="net452" />
-  <package id="RabbitMQ.Client" version="4.0.0" targetFramework="net452" />
+  <package id="RabbitMQ.Client" version="4.0.0" targetFramework="net452" requireReinstallation="True" />
 </packages>
\ No newline at end of file
diff --git a/FFXIVClassic.sln b/FFXIVClassic.sln
index 9c2838fe..b79d9e72 100644
--- a/FFXIVClassic.sln
+++ b/FFXIVClassic.sln
@@ -15,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFXIVClassic Lobby Server",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFXIVClassic Common Class Lib", "FFXIVClassic Common Class Lib\FFXIVClassic Common Class Lib.csproj", "{3A3D6626-C820-4C18-8C81-64811424F20E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFXIVClassic World Server", "FFXIVClassic Proxy Server\FFXIVClassic World Server.csproj", "{3067889D-8A50-40D6-9CD5-23AA8EA96F26}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFXIVClassic World Server", "FFXIVClassic World Server\FFXIVClassic World Server.csproj", "{3067889D-8A50-40D6-9CD5-23AA8EA96F26}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3A3D6626-C820-4C18-8C81-64811424F20E} = {3A3D6626-C820-4C18-8C81-64811424F20E}
 	EndProjectSection