From 5d11a0b3561ddf0cba153c5fbb7ca1d1473a7c9d Mon Sep 17 00:00:00 2001
From: Filip Maj <filipmaj@gmail.com>
Date: Tue, 19 Jan 2016 13:31:24 -0500
Subject: [PATCH] Changed isEncrypted to isCompressed in basepacket. After
 speaking with another dev, game packets are not encrypted... just compressed.
 Figured out that byte 3 of basepacket is the connection type when handshaking
 with the map server.

---
 FFXIVClassic Map Server/PacketProcessor.cs    |  2 +-
 FFXIVClassic Map Server/packets/BasePacket.cs | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/FFXIVClassic Map Server/PacketProcessor.cs b/FFXIVClassic Map Server/PacketProcessor.cs
index f622e2e4..51d9e4ae 100644
--- a/FFXIVClassic Map Server/PacketProcessor.cs	
+++ b/FFXIVClassic Map Server/PacketProcessor.cs	
@@ -67,7 +67,7 @@ namespace FFXIVClassic_Lobby_Server
             if (client.owner != 0 && mPlayers.ContainsKey(client.owner))
                 player = mPlayers[client.owner];
             
-            if (packet.header.isEncrypted == 0x01)                       
+            if (packet.header.isCompressed == 0x01)                       
                 BasePacket.decryptPacket(client.blowfish, ref packet);
 
           // packet.debugPrintPacket();
diff --git a/FFXIVClassic Map Server/packets/BasePacket.cs b/FFXIVClassic Map Server/packets/BasePacket.cs
index e99cd081..384a0df0 100644
--- a/FFXIVClassic Map Server/packets/BasePacket.cs	
+++ b/FFXIVClassic Map Server/packets/BasePacket.cs	
@@ -14,7 +14,7 @@ namespace FFXIVClassic_Lobby_Server.packets
     public struct BasePacketHeader
     {
         public byte         isAuthenticated;
-        public byte         isEncrypted;
+        public byte         isCompressed;
         public ushort       reserved;
         public ushort       packetSize;
         public ushort       numSubpackets;
@@ -194,14 +194,14 @@ namespace FFXIVClassic_Lobby_Server.packets
         }
 
         #region Utility Functions
-        public static BasePacket createPacket(List<SubPacket> subpackets, bool isAuthed, bool isEncrypted)
+        public static BasePacket createPacket(List<SubPacket> subpackets, bool isAuthed, bool isCompressed)
         {
             //Create Header
             BasePacketHeader header = new BasePacketHeader();
             byte[] data = null;
 
             header.isAuthenticated = isAuthed?(byte)1:(byte)0;
-            header.isEncrypted = isEncrypted?(byte)1:(byte)0;
+            header.isCompressed = isCompressed?(byte)1:(byte)0;
             header.numSubpackets = (ushort)subpackets.Count;
             header.packetSize = BASEPACKET_SIZE;
             header.timestamp = Utils.MilisUnixTimeStampUTC();
@@ -227,14 +227,14 @@ namespace FFXIVClassic_Lobby_Server.packets
             return packet;
         }
 
-        public static BasePacket createPacket(SubPacket subpacket, bool isAuthed, bool isEncrypted)
+        public static BasePacket createPacket(SubPacket subpacket, bool isAuthed, bool isCompressed)
         {
             //Create Header
             BasePacketHeader header = new BasePacketHeader();
             byte[] data = null;
 
             header.isAuthenticated = isAuthed ? (byte)1 : (byte)0;
-            header.isEncrypted = isEncrypted ? (byte)1 : (byte)0;
+            header.isCompressed = isCompressed ? (byte)1 : (byte)0;
             header.numSubpackets = (ushort)1;
             header.packetSize = BASEPACKET_SIZE;
             header.timestamp = Utils.MilisUnixTimeStampUTC();
@@ -254,7 +254,7 @@ namespace FFXIVClassic_Lobby_Server.packets
             return packet;
         }
 
-        public static BasePacket createPacket(byte[] data, bool isAuthed, bool isEncrypted)
+        public static BasePacket createPacket(byte[] data, bool isAuthed, bool isCompressed)
         {
 
             Debug.Assert(data != null);
@@ -263,7 +263,7 @@ namespace FFXIVClassic_Lobby_Server.packets
             BasePacketHeader header = new BasePacketHeader();
 
             header.isAuthenticated = isAuthed ? (byte)1 : (byte)0;
-            header.isEncrypted = isEncrypted ? (byte)1 : (byte)0;
+            header.isCompressed = isCompressed ? (byte)1 : (byte)0;
             header.numSubpackets = (ushort)1;
             header.packetSize = BASEPACKET_SIZE;
             header.timestamp = Utils.MilisUnixTimeStampUTC();
@@ -332,7 +332,7 @@ namespace FFXIVClassic_Lobby_Server.packets
         {
 #if DEBUG
             Console.BackgroundColor = ConsoleColor.DarkYellow;
-            Console.WriteLine("IsAuthed: {0}, IsEncrypted: {1}, Size: 0x{2:X}, Num Subpackets: {3}", header.isAuthenticated, header.isEncrypted, header.packetSize, header.numSubpackets);            
+            Console.WriteLine("IsAuthed: {0}, IsEncrypted: {1}, Size: 0x{2:X}, Num Subpackets: {3}", header.isAuthenticated, header.isCompressed, header.packetSize, header.numSubpackets);            
             Console.WriteLine("{0}", Utils.ByteArrayToHex(getHeaderBytes()));
             foreach (SubPacket sub in getSubpackets())
                 sub.debugPrintSubPacket();