Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From 67aece9560579810e82e7b57471fce17b20c5b49 Mon Sep 17 00:00:00 2001
- From: NegativeOne
- Date: Mon, 30 Dec 2019 08:22:15 +0100
- Subject: [PATCH] Complete diff between cocomed code and latest changes
- Unlist servers that disconnect or crash
- Support password protected servers
- Simple chat implementation for lobby screen
- Show number of players on servers
- ---
- S2Library/Protocol/ChatPayloads.cs | 78 +--
- S2Library/Protocol/Crypto.cs | 7 +-
- S2Library/Protocol/Payloads.cs | 941 +++++++++++++++--------------
- S2Lobby/Accounts.cs | 19 +-
- S2Lobby/Channels.cs | 243 ++++++++
- S2Lobby/ChatProcessor.cs | 302 ++++++++-
- S2Lobby/Database.cs | 29 +
- S2Lobby/LobbyProcessor.cs | 74 ++-
- S2Lobby/NetworkProcessor.cs | 15 +-
- S2Lobby/Program.cs | 40 +-
- S2Lobby/S2Lobby.csproj | 1 +
- S2Lobby/ServerProcessor.cs | 19 +-
- S2Lobby/Servers.cs | 4 +
- 13 files changed, 1210 insertions(+), 562 deletions(-)
- create mode 100644 S2Lobby/Channels.cs
- diff --git a/S2Library/Protocol/ChatPayloads.cs b/S2Library/Protocol/ChatPayloads.cs
- index 5448477..c5d2c7b 100644
- --- a/S2Library/Protocol/ChatPayloads.cs
- +++ b/S2Library/Protocol/ChatPayloads.cs
- @@ -7,17 +7,17 @@ namespace S2Library.Protocol
- {
- public enum ChatTypes : ushort
- {
- - UnknownType00 = 0,
- + ChannelInfo = 0, // UnknownType00
- UnknownType01 = 1,
- - UnknownType02 = 2,
- - UnknownType03 = 3,
- + ChatMessage = 2, // UnknownType02
- + ChatReply = 3, // UnknownType03
- UnknownType04 = 4,
- UnknownType05 = 5,
- CreateChannel = 7, // UnknownType07
- UnknownType08 = 8,
- - UnknownType09 = 9,
- + ChannelJoined = 9, // UnknownType09
- UnknownType10 = 10,
- - UnknownType11 = 11,
- + StatusReply = 11, // UnknownType11
- }
- private static readonly Dictionary<Type, ChatTypes> ChatPayloadTypes = new Dictionary<Type, ChatTypes>();
- @@ -25,17 +25,17 @@ namespace S2Library.Protocol
- static ChatPayloads()
- {
- - ChatPayloadTypes.Add(typeof(ChatPayload0), ChatTypes.UnknownType00);
- + ChatPayloadTypes.Add(typeof(ChannelInfo), ChatTypes.ChannelInfo); // ChatPayload0
- ChatPayloadTypes.Add(typeof(ChatPayload1), ChatTypes.UnknownType01);
- - ChatPayloadTypes.Add(typeof(ChatPayload2), ChatTypes.UnknownType02);
- - ChatPayloadTypes.Add(typeof(ChatPayload3), ChatTypes.UnknownType03);
- + ChatPayloadTypes.Add(typeof(ChatMessage), ChatTypes.ChatMessage); // ChatPayload2
- + ChatPayloadTypes.Add(typeof(ChatReply), ChatTypes.ChatReply); // ChatPayload3
- ChatPayloadTypes.Add(typeof(ChatPayload4), ChatTypes.UnknownType04);
- ChatPayloadTypes.Add(typeof(ChatPayload5), ChatTypes.UnknownType05);
- ChatPayloadTypes.Add(typeof(CreateChannel), ChatTypes.CreateChannel); // ChatPayload7
- ChatPayloadTypes.Add(typeof(ChatPayload8), ChatTypes.UnknownType08);
- - ChatPayloadTypes.Add(typeof(ChatPayload9), ChatTypes.UnknownType09);
- + ChatPayloadTypes.Add(typeof(ChannelJoined), ChatTypes.ChannelJoined); // ChatPayload9
- ChatPayloadTypes.Add(typeof(ChatPayload10), ChatTypes.UnknownType10);
- - ChatPayloadTypes.Add(typeof(ChatPayload11), ChatTypes.UnknownType11);
- + ChatPayloadTypes.Add(typeof(StatusReply), ChatTypes.StatusReply); // ChatPayload11
- foreach (KeyValuePair<Type, ChatTypes> payloadType in ChatPayloadTypes)
- {
- @@ -77,6 +77,7 @@ namespace S2Library.Protocol
- {
- public ushort Magic;
- public ushort Type;
- + public ushort Id;
- public const ushort PayloadMagic = 0x0062;
- @@ -84,25 +85,24 @@ namespace S2Library.Protocol
- {
- serializer.Serialize(nameof(Magic), ref Magic);
- serializer.Serialize(nameof(Type), ref Type);
- + serializer.Serialize(nameof(Id), ref Id);
- }
- }
- - public class ChatPayload0 : ChatPayloadPrefix
- + public class ChannelInfo : ChatPayloadPrefix // ChatPayload0
- {
- - public ushort Id;
- public byte[] Data;
- public uint CellId;
- public uint TicketId;
- - public ChatPayload0()
- + public ChannelInfo()
- {
- - Id = (ushort) ChatPayloads.ChatTypes.UnknownType00;
- + Id = (ushort) ChatPayloads.ChatTypes.ChannelInfo;
- }
- public override void Serialize(Serializer serializer)
- {
- base.Serialize(serializer);
- - serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(Data), ref Data);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -111,7 +111,6 @@ namespace S2Library.Protocol
- public class ChatPayload1 : ChatPayloadPrefix
- {
- - public ushort Id;
- public uint CellId;
- public uint TicketId;
- public ushort Option;
- @@ -124,16 +123,14 @@ namespace S2Library.Protocol
- public override void Serialize(Serializer serializer)
- {
- base.Serialize(serializer);
- - serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- serializer.Serialize(nameof(Option), ref Option);
- }
- }
- - public class ChatPayload2 : ChatPayloadPrefix
- + public class ChatMessage : ChatPayloadPrefix // ChatPayload2
- {
- - public ushort Id;
- public ushort ModuleId;
- public ushort MessageId;
- public uint Except;
- @@ -142,15 +139,14 @@ namespace S2Library.Protocol
- public bool Self;
- public bool Ispropset;
- - public ChatPayload2()
- + public ChatMessage()
- {
- - Id = (ushort)ChatPayloads.ChatTypes.UnknownType02;
- + Id = (ushort)ChatPayloads.ChatTypes.ChatMessage;
- }
- public override void Serialize(Serializer serializer)
- {
- base.Serialize(serializer);
- - serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(ModuleId), ref ModuleId);
- serializer.Serialize(nameof(MessageId), ref MessageId);
- serializer.Serialize(nameof(Except), ref Except);
- @@ -161,24 +157,22 @@ namespace S2Library.Protocol
- }
- }
- - public class ChatPayload3 : ChatPayloadPrefix
- + public class ChatReply : ChatPayloadPrefix // ChatPayload3
- {
- - public ushort Id;
- public ushort MessageId;
- public byte[] Data;
- public uint CellId;
- public uint FromId;
- public bool Ispropset;
- - public ChatPayload3()
- + public ChatReply()
- {
- - Id = (ushort)ChatPayloads.ChatTypes.UnknownType03;
- + Id = (ushort)ChatPayloads.ChatTypes.ChatReply;
- }
- public override void Serialize(Serializer serializer)
- {
- base.Serialize(serializer);
- - serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(MessageId), ref MessageId);
- serializer.Serialize(nameof(Data), ref Data);
- serializer.Serialize(nameof(CellId), ref CellId);
- @@ -189,7 +183,6 @@ namespace S2Library.Protocol
- public class ChatPayload4 : ChatPayloadPrefix
- {
- - public ushort Id;
- public uint CellId;
- public uint TicketId;
- public ushort Option;
- @@ -202,7 +195,6 @@ namespace S2Library.Protocol
- public override void Serialize(Serializer serializer)
- {
- base.Serialize(serializer);
- - serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- serializer.Serialize(nameof(Option), ref Option);
- @@ -211,7 +203,6 @@ namespace S2Library.Protocol
- public class ChatPayload5 : ChatPayloadPrefix
- {
- - public ushort Id;
- public uint CellId;
- public uint TicketId;
- public ushort Option;
- @@ -224,7 +215,6 @@ namespace S2Library.Protocol
- public override void Serialize(Serializer serializer)
- {
- base.Serialize(serializer);
- - serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- serializer.Serialize(nameof(Option), ref Option);
- @@ -233,7 +223,6 @@ namespace S2Library.Protocol
- public class CreateChannel : ChatPayloadPrefix // ChatPayload7
- {
- - public ushort Id;
- public byte[] Data;
- public uint TicketId;
- @@ -245,7 +234,6 @@ namespace S2Library.Protocol
- public override void Serialize(Serializer serializer)
- {
- base.Serialize(serializer);
- - serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(Data), ref Data);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -253,7 +241,6 @@ namespace S2Library.Protocol
- public class ChatPayload8 : ChatPayloadPrefix
- {
- - public ushort Id;
- public uint CellId;
- public uint TicketId;
- public ushort Option;
- @@ -266,29 +253,26 @@ namespace S2Library.Protocol
- public override void Serialize(Serializer serializer)
- {
- base.Serialize(serializer);
- - serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- serializer.Serialize(nameof(Option), ref Option);
- }
- }
- - public class ChatPayload9 : ChatPayloadPrefix
- + public class ChannelJoined : ChatPayloadPrefix // ChatPayload9
- {
- - public ushort Id;
- public uint CellId;
- public uint TicketId;
- public ushort Option;
- - public ChatPayload9()
- + public ChannelJoined()
- {
- - Id = (ushort)ChatPayloads.ChatTypes.UnknownType09;
- + Id = (ushort)ChatPayloads.ChatTypes.ChannelJoined;
- }
- public override void Serialize(Serializer serializer)
- {
- base.Serialize(serializer);
- - serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- serializer.Serialize(nameof(Option), ref Option);
- @@ -297,7 +281,6 @@ namespace S2Library.Protocol
- public class ChatPayload10 : ChatPayloadPrefix
- {
- - public ushort Id;
- public uint CellId;
- public uint TicketId;
- public ushort Option;
- @@ -310,36 +293,33 @@ namespace S2Library.Protocol
- public override void Serialize(Serializer serializer)
- {
- base.Serialize(serializer);
- - serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- serializer.Serialize(nameof(Option), ref Option);
- }
- }
- - public class ChatPayload11 : ChatPayloadPrefix
- + public class StatusReply : ChatPayloadPrefix // ChatPayload11
- {
- - public ushort Id;
- public uint CellId;
- public uint TicketId;
- public ushort ResultId;
- - public ChatPayload11()
- + public StatusReply()
- {
- - Id = (ushort)ChatPayloads.ChatTypes.UnknownType11;
- + Id = (ushort)ChatPayloads.ChatTypes.StatusReply;
- }
- public override void Serialize(Serializer serializer)
- {
- base.Serialize(serializer);
- - serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- serializer.Serialize(nameof(ResultId), ref ResultId);
- }
- }
- - public class UnknownData
- + public class ChannelData
- {
- public string Publish;
- public string Name;
- @@ -352,7 +332,7 @@ namespace S2Library.Protocol
- public bool Hidden;
- public uint CreatorPid;
- - public UnknownData()
- + public ChannelData()
- {
- Publish = "SC";
- }
- diff --git a/S2Library/Protocol/Crypto.cs b/S2Library/Protocol/Crypto.cs
- index a035e5a..b40a18b 100644
- --- a/S2Library/Protocol/Crypto.cs
- +++ b/S2Library/Protocol/Crypto.cs
- @@ -1,5 +1,6 @@
- using System;
- using System.IO;
- +
- using Org.BouncyCastle.Asn1;
- using Org.BouncyCastle.Asn1.X9;
- using Org.BouncyCastle.Crypto;
- @@ -117,7 +118,7 @@ namespace S2Library.Protocol
- return result;
- }
- - public static byte[] HandleUser(byte[] cipher, byte[] secretKey)
- + public static byte[] HandleCipher(byte[] cipher, byte[] secretKey)
- {
- TwofishEngine engine = new TwofishEngine();
- @@ -154,14 +155,12 @@ namespace S2Library.Protocol
- TwofishEngine engine = new TwofishEngine();
- CtrBlockCipher blockCipher = new CtrBlockCipher(engine);
- - PaddedBufferedBlockCipher bufferedBlockCipher = new PaddedBufferedBlockCipher(blockCipher, new ZeroBytePadding());
- KeyParameter secret = new KeyParameter(sharedSecret);
- ParametersWithIV key = new ParametersWithIV(secret, iv);
- - bufferedBlockCipher.Init(true, key);
- + blockCipher.Init(true, key);
- byte[] result = new byte[iv.Length + sessionKey.Length];
- - bufferedBlockCipher.ProcessBytes(sessionKey, 0, sessionKey.Length, result, 16);
- Array.Copy(iv, result, iv.Length);
- int pos = 0;
- diff --git a/S2Library/Protocol/Payloads.cs b/S2Library/Protocol/Payloads.cs
- index 25f260a..5ca3bd9 100644
- --- a/S2Library/Protocol/Payloads.cs
- +++ b/S2Library/Protocol/Payloads.cs
- @@ -8,11 +8,11 @@ namespace S2Library.Protocol
- public enum Types : ushort
- {
- UnknownType001 = 1,
- - UnknownType002 = 2,
- + ChatPayload = 2, // UnknownType002
- UnknownType003 = 3,
- UnknownType004 = 4,
- - UnknownType005 = 5,
- - UnknownType006 = 6,
- + ChatUserInfo = 5, // UnknownType005
- + ChatDisconnected = 6, // UnknownType006
- UnknownType007 = 7,
- UnknownType008 = 8,
- UnknownType009 = 9,
- @@ -23,7 +23,7 @@ namespace S2Library.Protocol
- UnknownType014 = 14,
- UnknownType015 = 15,
- UnknownType016 = 16,
- - UnknownType017 = 17,
- + JoinChatChannel = 17, // UnknownType017
- UnknownType018 = 18,
- UnknownType019 = 19,
- UnknownType020 = 20,
- @@ -141,7 +141,7 @@ namespace S2Library.Protocol
- UnknownType143 = 143,
- UnknownType144 = 144,
- UnknownType145 = 145,
- - UnknownType146 = 146,
- + PlayerJoinedServer = 146, // UnknownType146
- UnknownType147 = 147,
- UnknownType148 = 148,
- UnknownType149 = 149,
- @@ -164,7 +164,7 @@ namespace S2Library.Protocol
- UnknownType166 = 166,
- UnknownType167 = 167,
- RegisterServer = 168, // UnknownType168
- - UnknownType169 = 169,
- + UnlistServer = 169, // UnknownType169
- ServerInfo = 170, // UnknownType170
- GetServers = 171, // UnknownType171
- StopServerUpdates = 172, // UnknownType172
- @@ -185,7 +185,7 @@ namespace S2Library.Protocol
- UnknownType187 = 187,
- VersionCheck = 188, // UnknownType188
- GetChatServer = 189, // UnknownType189
- - UnknownType190 = 190,
- + PlayerLeftServer = 190, // UnknownType190
- UnknownType191 = 191,
- SendChatServerInfo = 192, // UnknownType192
- UnknownType193 = 193,
- @@ -236,11 +236,11 @@ namespace S2Library.Protocol
- static Payloads()
- {
- PayloadTypes.Add(typeof(Payload1), Types.UnknownType001);
- - PayloadTypes.Add(typeof(Payload2), Types.UnknownType002);
- + PayloadTypes.Add(typeof(ChatPayload), Types.ChatPayload); // Payload2
- PayloadTypes.Add(typeof(Payload3), Types.UnknownType003);
- PayloadTypes.Add(typeof(Payload4), Types.UnknownType004);
- - PayloadTypes.Add(typeof(Payload5), Types.UnknownType005);
- - PayloadTypes.Add(typeof(Payload6), Types.UnknownType006);
- + PayloadTypes.Add(typeof(ChatUserInfo), Types.ChatUserInfo); // Payload5
- + PayloadTypes.Add(typeof(ChatDisconnected), Types.ChatDisconnected); // Payload6
- PayloadTypes.Add(typeof(Payload7), Types.UnknownType007);
- PayloadTypes.Add(typeof(Payload8), Types.UnknownType008);
- PayloadTypes.Add(typeof(Payload9), Types.UnknownType009);
- @@ -251,7 +251,7 @@ namespace S2Library.Protocol
- PayloadTypes.Add(typeof(Payload14), Types.UnknownType014);
- PayloadTypes.Add(typeof(Payload15), Types.UnknownType015);
- PayloadTypes.Add(typeof(Payload16), Types.UnknownType016);
- - PayloadTypes.Add(typeof(Payload17), Types.UnknownType017);
- + PayloadTypes.Add(typeof(JoinChatChannel), Types.JoinChatChannel); // Payload17
- PayloadTypes.Add(typeof(Payload18), Types.UnknownType018);
- PayloadTypes.Add(typeof(Payload19), Types.UnknownType019);
- PayloadTypes.Add(typeof(Payload20), Types.UnknownType020);
- @@ -369,7 +369,7 @@ namespace S2Library.Protocol
- PayloadTypes.Add(typeof(Payload143), Types.UnknownType143);
- PayloadTypes.Add(typeof(Payload144), Types.UnknownType144);
- PayloadTypes.Add(typeof(Payload145), Types.UnknownType145);
- - PayloadTypes.Add(typeof(Payload146), Types.UnknownType146);
- + PayloadTypes.Add(typeof(PlayerJoinedServer), Types.PlayerJoinedServer); // Payload146
- PayloadTypes.Add(typeof(Payload147), Types.UnknownType147);
- PayloadTypes.Add(typeof(Payload148), Types.UnknownType148);
- PayloadTypes.Add(typeof(Payload149), Types.UnknownType149);
- @@ -392,7 +392,7 @@ namespace S2Library.Protocol
- PayloadTypes.Add(typeof(Payload166), Types.UnknownType166);
- PayloadTypes.Add(typeof(Payload167), Types.UnknownType167);
- PayloadTypes.Add(typeof(RegisterServer), Types.RegisterServer); // Payload168
- - PayloadTypes.Add(typeof(Payload169), Types.UnknownType169);
- + PayloadTypes.Add(typeof(UnlistServer), Types.UnlistServer); // Payload169
- PayloadTypes.Add(typeof(ServerInfo), Types.ServerInfo); // Payload170
- PayloadTypes.Add(typeof(GetServers), Types.GetServers); // Payload171
- PayloadTypes.Add(typeof(StopServerUpdates), Types.StopServerUpdates); // Payload172
- @@ -413,7 +413,7 @@ namespace S2Library.Protocol
- PayloadTypes.Add(typeof(Payload187), Types.UnknownType187);
- PayloadTypes.Add(typeof(VersionCheck), Types.VersionCheck); // Payload188
- PayloadTypes.Add(typeof(GetChatServer), Types.GetChatServer); // Payload189
- - PayloadTypes.Add(typeof(Payload190), Types.UnknownType190);
- + PayloadTypes.Add(typeof(PlayerLeftServer), Types.PlayerLeftServer); // Payload190
- PayloadTypes.Add(typeof(Payload191), Types.UnknownType191);
- PayloadTypes.Add(typeof(SendChatServerInfo), Types.SendChatServerInfo); // Payload192
- PayloadTypes.Add(typeof(Payload193), Types.UnknownType193);
- @@ -508,11 +508,20 @@ namespace S2Library.Protocol
- public const ushort PayloadMagic = 0x26B6;
- - public virtual void Serialize(Serializer serializer)
- + public virtual void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - serializer.Serialize(nameof(Magic), ref Magic);
- - serializer.Serialize(nameof(Type1), ref Type1);
- + if (fullHeader)
- + {
- + serializer.Serialize(nameof(Magic), ref Magic);
- + serializer.Serialize(nameof(Type1), ref Type1);
- + }
- serializer.Serialize(nameof(Type2), ref Type2);
- +
- + if (!fullHeader)
- + {
- + Magic = PayloadMagic;
- + Type1 = Type2;
- + }
- }
- }
- @@ -524,9 +533,9 @@ namespace S2Library.Protocol
- {
- public uint Data;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Data), ref Data);
- }
- }
- @@ -538,16 +547,16 @@ namespace S2Library.Protocol
- // (**(code**)(* piVar1 + 8))("ticket_id",8);
- // (**(code**)(* piVar1 + 8))("from_id",8);
- // (**(code**)(* unaff_EDI + 4))(2,piVar1);
- - public class Payload2 : PayloadPrefix
- + public class ChatPayload : PayloadPrefix // Payload2
- {
- public uint Mode;
- public string Txt;
- public uint TicketId;
- public uint FromId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Mode), ref Mode);
- serializer.Serialize(nameof(Txt), ref Txt);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -573,9 +582,9 @@ namespace S2Library.Protocol
- public uint ToId;
- public string FromName;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Mode), ref Mode);
- serializer.Serialize(nameof(Txt), ref Txt);
- serializer.Serialize(nameof(CellId), ref CellId);
- @@ -603,9 +612,9 @@ namespace S2Library.Protocol
- public uint Patchlevel;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Nick), ref Nick);
- serializer.Serialize(nameof(Password), ref Password);
- serializer.Serialize(nameof(CdKey), ref CdKey);
- @@ -621,15 +630,15 @@ namespace S2Library.Protocol
- // (**(code**)(* piVar1 + 8))("cell_id",8);
- // (**(code**)(* piVar1 + 4))("nick",2,0x100);
- // (**(code**)(* unaff_EDI + 4))(5,piVar1);
- - public class Payload5 : PayloadPrefix
- + public class ChatUserInfo : PayloadPrefix // Payload5
- {
- public uint PermId;
- public uint CellId;
- public string Nick;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(Nick), ref Nick);
- @@ -641,14 +650,14 @@ namespace S2Library.Protocol
- // (**(code**)(* piVar1 + 8))("perm_id",8);
- // (**(code**)(* piVar1 + 8))("cell_id",8);
- // (**(code**)(* unaff_EDI + 4))(6,piVar1);
- - public class Payload6 : PayloadPrefix
- + public class ChatDisconnected : PayloadPrefix // Payload6
- {
- public uint PermId;
- public uint CellId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(CellId), ref CellId);
- }
- @@ -664,9 +673,9 @@ namespace S2Library.Protocol
- public uint CellId;
- public uint UsrCount;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(UsrCount), ref UsrCount);
- }
- @@ -680,9 +689,9 @@ namespace S2Library.Protocol
- {
- public uint CellId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- }
- }
- @@ -699,9 +708,9 @@ namespace S2Library.Protocol
- public uint MsgId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(MsgId), ref MsgId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -718,9 +727,9 @@ namespace S2Library.Protocol
- public uint CellId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -762,9 +771,9 @@ namespace S2Library.Protocol
- public uint DeliveryDate;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(MsgId), ref MsgId);
- serializer.Serialize(nameof(MsgType), ref MsgType);
- @@ -793,9 +802,9 @@ namespace S2Library.Protocol
- public uint CellId;
- public byte[] Idlist;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(Idlist), ref Idlist);
- }
- @@ -835,9 +844,9 @@ namespace S2Library.Protocol
- public uint DeliveryInterval;
- public uint DeliveryDate;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(MsgId), ref MsgId);
- serializer.Serialize(nameof(MsgType), ref MsgType);
- @@ -891,9 +900,9 @@ namespace S2Library.Protocol
- public uint DeliveryDate;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(MsgId), ref MsgId);
- serializer.Serialize(nameof(MsgType), ref MsgType);
- @@ -924,9 +933,9 @@ namespace S2Library.Protocol
- public uint MsgId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(MsgId), ref MsgId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -945,9 +954,9 @@ namespace S2Library.Protocol
- public uint PermId;
- public uint FromId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(FromId), ref FromId);
- @@ -962,7 +971,7 @@ namespace S2Library.Protocol
- // (**(code**)(* piVar1 + 4))("password",2,0x20);
- // (**(code**)(* piVar1 + 8))("from_id",8);
- // (**(code**)(* unaff_EDI + 4))(0x11,piVar1);
- - public class Payload17 : PayloadPrefix
- + public class JoinChatChannel : PayloadPrefix // Payload17
- {
- public uint CellId;
- public uint TicketId;
- @@ -970,9 +979,9 @@ namespace S2Library.Protocol
- public string Password;
- public uint FromId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- serializer.Serialize(nameof(Option), ref Option);
- @@ -993,9 +1002,9 @@ namespace S2Library.Protocol
- public uint PermId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -1010,9 +1019,9 @@ namespace S2Library.Protocol
- {
- public uint PermId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- }
- }
- @@ -1025,9 +1034,9 @@ namespace S2Library.Protocol
- {
- public uint GroupId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- }
- }
- @@ -1052,9 +1061,9 @@ namespace S2Library.Protocol
- public bool Active;
- public bool Banned;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Username), ref Username);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Userpwd), ref Userpwd);
- @@ -1079,9 +1088,9 @@ namespace S2Library.Protocol
- public uint Grouptype;
- public uint GroupAccess;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Groupname), ref Groupname);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(Grouptype), ref Grouptype);
- @@ -1107,9 +1116,9 @@ namespace S2Library.Protocol
- public bool Active;
- public bool Banned;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Username), ref Username);
- serializer.Serialize(nameof(Userpwd), ref Userpwd);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- @@ -1131,9 +1140,9 @@ namespace S2Library.Protocol
- public uint GroupAccess;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Groupname), ref Groupname);
- serializer.Serialize(nameof(GroupAccess), ref GroupAccess);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -1160,9 +1169,9 @@ namespace S2Library.Protocol
- public bool Active;
- public bool Banned;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Username), ref Username);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Userpwd), ref Userpwd);
- @@ -1187,9 +1196,9 @@ namespace S2Library.Protocol
- public uint GroupAccess;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Groupname), ref Groupname);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(GroupAccess), ref GroupAccess);
- @@ -1205,9 +1214,9 @@ namespace S2Library.Protocol
- {
- public uint PermId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- }
- }
- @@ -1220,9 +1229,9 @@ namespace S2Library.Protocol
- {
- public uint GroupId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- }
- }
- @@ -1237,9 +1246,9 @@ namespace S2Library.Protocol
- public uint ResultId;
- public uint UsrGrpId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ResultId), ref ResultId);
- serializer.Serialize(nameof(UsrGrpId), ref UsrGrpId);
- }
- @@ -1261,9 +1270,9 @@ namespace S2Library.Protocol
- public uint FromId;
- public uint PermId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Mode), ref Mode);
- serializer.Serialize(nameof(Txt), ref Txt);
- serializer.Serialize(nameof(CellId), ref CellId);
- @@ -1282,9 +1291,9 @@ namespace S2Library.Protocol
- public string DeliveryTargetName;
- public string Body;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(DeliveryTargetName), ref DeliveryTargetName);
- serializer.Serialize(nameof(Body), ref Body);
- }
- @@ -1328,9 +1337,9 @@ namespace S2Library.Protocol
- public uint DeliveryInterval;
- public uint DeliveryDate;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- serializer.Serialize(nameof(MsgId), ref MsgId);
- @@ -1358,9 +1367,9 @@ namespace S2Library.Protocol
- {
- public uint CellId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- }
- }
- @@ -1385,9 +1394,9 @@ namespace S2Library.Protocol
- public byte[] ItemData;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Owner), ref Owner);
- serializer.Serialize(nameof(ItemType), ref ItemType);
- serializer.Serialize(nameof(ItemName), ref ItemName);
- @@ -1410,9 +1419,9 @@ namespace S2Library.Protocol
- public uint ItemPrize;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ItemId), ref ItemId);
- serializer.Serialize(nameof(ItemPrize), ref ItemPrize);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -1429,9 +1438,9 @@ namespace S2Library.Protocol
- public uint ItemId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ItemId), ref ItemId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -1449,9 +1458,9 @@ namespace S2Library.Protocol
- public uint ItemId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Netzone), ref Netzone);
- serializer.Serialize(nameof(ItemId), ref ItemId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -1482,9 +1491,9 @@ namespace S2Library.Protocol
- public byte[] ItemData;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ItemId), ref ItemId);
- serializer.Serialize(nameof(Owner), ref Owner);
- serializer.Serialize(nameof(OwnerName), ref OwnerName);
- @@ -1527,9 +1536,9 @@ namespace S2Library.Protocol
- public string Criterias;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Netzone), ref Netzone);
- serializer.Serialize(nameof(ItemType), ref ItemType);
- serializer.Serialize(nameof(OwnerName), ref OwnerName);
- @@ -1553,9 +1562,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -1570,9 +1579,9 @@ namespace S2Library.Protocol
- public ushort Limit;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Limit), ref Limit);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -1590,9 +1599,9 @@ namespace S2Library.Protocol
- public string Errormsg;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Errorcode), ref Errorcode);
- serializer.Serialize(nameof(Errormsg), ref Errormsg);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -1611,9 +1620,9 @@ namespace S2Library.Protocol
- public uint NotificationType;
- public uint TargetMsgId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(NotificationType), ref NotificationType);
- serializer.Serialize(nameof(TargetMsgId), ref TargetMsgId);
- @@ -1632,9 +1641,9 @@ namespace S2Library.Protocol
- public uint Buyer;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ItemId), ref ItemId);
- serializer.Serialize(nameof(Buyer), ref Buyer);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -1653,9 +1662,9 @@ namespace S2Library.Protocol
- public uint Buyer;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ItemId), ref ItemId);
- serializer.Serialize(nameof(Buyer), ref Buyer);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -1683,9 +1692,9 @@ namespace S2Library.Protocol
- public byte[] ItemData;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ItemId), ref ItemId);
- serializer.Serialize(nameof(Buyer), ref Buyer);
- serializer.Serialize(nameof(ItemType), ref ItemType);
- @@ -1707,9 +1716,9 @@ namespace S2Library.Protocol
- public uint ItemsFound;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ItemsFound), ref ItemsFound);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -1723,9 +1732,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -1740,9 +1749,9 @@ namespace S2Library.Protocol
- public string ValueName;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ValueName), ref ValueName);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -1758,9 +1767,9 @@ namespace S2Library.Protocol
- public string ValueName;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ValueName), ref ValueName);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -1776,9 +1785,9 @@ namespace S2Library.Protocol
- public string Value;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Value), ref Value);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -1794,9 +1803,9 @@ namespace S2Library.Protocol
- public ushort Resultcode;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Resultcode), ref Resultcode);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -1820,9 +1829,9 @@ namespace S2Library.Protocol
- public uint Selection;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(CdKey), ref CdKey);
- serializer.Serialize(nameof(Keypool), ref Keypool);
- @@ -1842,9 +1851,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -1860,9 +1869,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -1878,9 +1887,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -1898,9 +1907,9 @@ namespace S2Library.Protocol
- public ushort AccessIndex;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(AccessIndex), ref AccessIndex);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -1937,9 +1946,9 @@ namespace S2Library.Protocol
- public uint TotalLogins;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(Password), ref Password);
- @@ -1985,9 +1994,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CharId), ref CharId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(OwnerId), ref OwnerId);
- @@ -2025,9 +2034,9 @@ namespace S2Library.Protocol
- public string ServerName;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(BuddyId), ref BuddyId);
- serializer.Serialize(nameof(Name), ref Name);
- @@ -2055,9 +2064,9 @@ namespace S2Library.Protocol
- public byte Level;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(Name), ref Name);
- @@ -2080,9 +2089,9 @@ namespace S2Library.Protocol
- public uint Access;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(AccessIndex), ref AccessIndex);
- serializer.Serialize(nameof(Access), ref Access);
- @@ -2104,9 +2113,9 @@ namespace S2Library.Protocol
- public uint Selection;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(Selection), ref Selection);
- @@ -2124,9 +2133,9 @@ namespace S2Library.Protocol
- public uint GroupId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -2144,9 +2153,9 @@ namespace S2Library.Protocol
- public ushort AccessIndex;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(AccessIndex), ref AccessIndex);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -2171,9 +2180,9 @@ namespace S2Library.Protocol
- public string ServerName;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(Name), ref Name);
- @@ -2197,9 +2206,9 @@ namespace S2Library.Protocol
- public byte Level;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(Level), ref Level);
- @@ -2221,9 +2230,9 @@ namespace S2Library.Protocol
- public uint Access;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(AccessIndex), ref AccessIndex);
- serializer.Serialize(nameof(Access), ref Access);
- @@ -2249,9 +2258,9 @@ namespace S2Library.Protocol
- public uint Patchlevel;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Nick), ref Nick);
- serializer.Serialize(nameof(Password), ref Password);
- serializer.Serialize(nameof(CdKey), ref CdKey);
- @@ -2275,9 +2284,9 @@ namespace S2Library.Protocol
- public uint Selection;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CharId), ref CharId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(Selection), ref Selection);
- @@ -2295,9 +2304,9 @@ namespace S2Library.Protocol
- public uint Count;
- public byte[] Data;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Count), ref Count);
- serializer.Serialize(nameof(Data), ref Data);
- }
- @@ -2313,9 +2322,9 @@ namespace S2Library.Protocol
- public uint MsgType;
- public byte[] Data;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(MsgType), ref MsgType);
- serializer.Serialize(nameof(Data), ref Data);
- }
- @@ -2351,9 +2360,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CharId), ref CharId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(OwnerId), ref OwnerId);
- @@ -2379,9 +2388,9 @@ namespace S2Library.Protocol
- public uint CellId;
- public uint PermId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(PermId), ref PermId);
- }
- @@ -2401,9 +2410,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(OwnerId), ref OwnerId);
- serializer.Serialize(nameof(Data), ref Data);
- @@ -2427,9 +2436,9 @@ namespace S2Library.Protocol
- public uint Selection;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(OwnerId), ref OwnerId);
- serializer.Serialize(nameof(GuildId), ref GuildId);
- serializer.Serialize(nameof(Name), ref Name);
- @@ -2452,9 +2461,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(OwnerId), ref OwnerId);
- serializer.Serialize(nameof(Data), ref Data);
- @@ -2472,9 +2481,9 @@ namespace S2Library.Protocol
- public uint GuildId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GuildId), ref GuildId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -2498,9 +2507,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GuildId), ref GuildId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(OwnerId), ref OwnerId);
- @@ -2534,9 +2543,9 @@ namespace S2Library.Protocol
- public byte GuildRole;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GuildId), ref GuildId);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Name), ref Name);
- @@ -2569,9 +2578,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(Cipher), ref Cipher);
- serializer.Serialize(nameof(Mail), ref Mail);
- @@ -2594,9 +2603,9 @@ namespace S2Library.Protocol
- public byte Level;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(Level), ref Level);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -2617,9 +2626,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(Data), ref Data);
- @@ -2641,9 +2650,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(OwnerId), ref OwnerId);
- serializer.Serialize(nameof(Data), ref Data);
- @@ -2675,9 +2684,9 @@ namespace S2Library.Protocol
- public uint PropertyMask;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(Cipher), ref Cipher);
- @@ -2706,9 +2715,9 @@ namespace S2Library.Protocol
- public byte Level;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(PropertyMask), ref PropertyMask);
- serializer.Serialize(nameof(Name), ref Name);
- @@ -2733,9 +2742,9 @@ namespace S2Library.Protocol
- public uint PropertyMask;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CharId), ref CharId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(Data), ref Data);
- @@ -2762,9 +2771,9 @@ namespace S2Library.Protocol
- public uint PropertyMask;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GuildId), ref GuildId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(OwnerId), ref OwnerId);
- @@ -2784,9 +2793,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -2802,9 +2811,9 @@ namespace S2Library.Protocol
- public uint GroupId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -2820,9 +2829,9 @@ namespace S2Library.Protocol
- public uint CharId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CharId), ref CharId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -2838,9 +2847,9 @@ namespace S2Library.Protocol
- public uint GuildId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GuildId), ref GuildId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -2860,9 +2869,9 @@ namespace S2Library.Protocol
- public ushort Keypool;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(CdKey), ref CdKey);
- serializer.Serialize(nameof(Keypool), ref Keypool);
- @@ -2884,9 +2893,9 @@ namespace S2Library.Protocol
- public ushort Keypool;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(CdKey), ref CdKey);
- serializer.Serialize(nameof(Keypool), ref Keypool);
- @@ -2906,9 +2915,9 @@ namespace S2Library.Protocol
- public uint BuddyId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(BuddyId), ref BuddyId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -2927,9 +2936,9 @@ namespace S2Library.Protocol
- public uint BuddyId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(BuddyId), ref BuddyId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -2948,9 +2957,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -2969,9 +2978,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -2990,9 +2999,9 @@ namespace S2Library.Protocol
- public uint GuildId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(GuildId), ref GuildId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3011,9 +3020,9 @@ namespace S2Library.Protocol
- public uint GuildId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(GuildId), ref GuildId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3034,9 +3043,9 @@ namespace S2Library.Protocol
- public uint Access;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(GroupId), ref GroupId);
- serializer.Serialize(nameof(AccessIndex), ref AccessIndex);
- serializer.Serialize(nameof(Access), ref Access);
- @@ -3052,9 +3061,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -3069,9 +3078,9 @@ namespace S2Library.Protocol
- public string Txt;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Txt), ref Txt);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -3085,9 +3094,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -3100,9 +3109,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -3117,9 +3126,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public string Name;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(Name), ref Name);
- }
- @@ -3133,9 +3142,9 @@ namespace S2Library.Protocol
- {
- public uint UserId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- }
- }
- @@ -3148,9 +3157,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -3163,9 +3172,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -3178,9 +3187,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -3193,9 +3202,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -3210,9 +3219,9 @@ namespace S2Library.Protocol
- public bool SendAll;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(SendAll), ref SendAll);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -3226,9 +3235,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -3241,9 +3250,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -3256,9 +3265,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -3275,9 +3284,9 @@ namespace S2Library.Protocol
- public ushort Keypool;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CdKey), ref CdKey);
- serializer.Serialize(nameof(Keypool), ref Keypool);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3300,9 +3309,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CdKey), ref CdKey);
- serializer.Serialize(nameof(Keypool), ref Keypool);
- serializer.Serialize(nameof(Banned), ref Banned);
- @@ -3325,9 +3334,9 @@ namespace S2Library.Protocol
- public uint Selection;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(MachineId), ref MachineId);
- serializer.Serialize(nameof(Ip), ref Ip);
- serializer.Serialize(nameof(Selection), ref Selection);
- @@ -3351,9 +3360,9 @@ namespace S2Library.Protocol
- public bool Active;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(MachineId), ref MachineId);
- serializer.Serialize(nameof(Description), ref Description);
- serializer.Serialize(nameof(Ip), ref Ip);
- @@ -3372,9 +3381,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -3392,9 +3401,9 @@ namespace S2Library.Protocol
- public uint MachineId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(MachineId), ref MachineId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3411,9 +3420,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -3429,9 +3438,9 @@ namespace S2Library.Protocol
- public uint CharId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CharId), ref CharId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -3447,9 +3456,9 @@ namespace S2Library.Protocol
- public uint CharId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CharId), ref CharId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -3469,9 +3478,9 @@ namespace S2Library.Protocol
- public string Filename;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(RestoreChars), ref RestoreChars);
- serializer.Serialize(nameof(Filename), ref Filename);
- @@ -3491,9 +3500,9 @@ namespace S2Library.Protocol
- public string Filename;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CharId), ref CharId);
- serializer.Serialize(nameof(Filename), ref Filename);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3514,9 +3523,9 @@ namespace S2Library.Protocol
- public uint Port;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Ip), ref Ip);
- serializer.Serialize(nameof(Port), ref Port);
- @@ -3534,9 +3543,9 @@ namespace S2Library.Protocol
- public uint PermId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -3554,9 +3563,9 @@ namespace S2Library.Protocol
- public ushort Keypool;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CdKey), ref CdKey);
- serializer.Serialize(nameof(Keypool), ref Keypool);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3575,9 +3584,9 @@ namespace S2Library.Protocol
- public ushort Keypool;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CdKey), ref CdKey);
- serializer.Serialize(nameof(Keypool), ref Keypool);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3596,9 +3605,9 @@ namespace S2Library.Protocol
- public ushort Keypool;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CdKey), ref CdKey);
- serializer.Serialize(nameof(Keypool), ref Keypool);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3617,9 +3626,9 @@ namespace S2Library.Protocol
- public ushort Keypool;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CdKey), ref CdKey);
- serializer.Serialize(nameof(Keypool), ref Keypool);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3638,9 +3647,9 @@ namespace S2Library.Protocol
- public string Name;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3661,9 +3670,9 @@ namespace S2Library.Protocol
- public ushort PermIdType;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(PermIdType), ref PermIdType);
- @@ -3676,14 +3685,14 @@ namespace S2Library.Protocol
- // (**(code**)(* piVar1 + 8))("perm_id",8);
- // (**(code**)(* piVar1 + 8))("ticket_id",8);
- // (**(code**)(* unaff_EDI + 4))(0x92,piVar1);
- - public class Payload146 : PayloadPrefix
- + public class PlayerJoinedServer : PayloadPrefix // Payload146
- {
- public uint PermId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -3701,9 +3710,9 @@ namespace S2Library.Protocol
- public uint Selection;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(DeliveryTarget), ref DeliveryTarget);
- serializer.Serialize(nameof(Selection), ref Selection);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3722,9 +3731,9 @@ namespace S2Library.Protocol
- public byte Status;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(MessageId), ref MessageId);
- serializer.Serialize(nameof(Status), ref Status);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3755,9 +3764,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(DeliveryTarget), ref DeliveryTarget);
- serializer.Serialize(nameof(MessageId), ref MessageId);
- serializer.Serialize(nameof(Creator), ref Creator);
- @@ -3790,9 +3799,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(DeliveryTarget), ref DeliveryTarget);
- serializer.Serialize(nameof(Creator), ref Creator);
- serializer.Serialize(nameof(CreationTime), ref CreationTime);
- @@ -3813,9 +3822,9 @@ namespace S2Library.Protocol
- public uint MessageId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(MessageId), ref MessageId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -3835,9 +3844,9 @@ namespace S2Library.Protocol
- public byte GuildRole;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(GuildId), ref GuildId);
- serializer.Serialize(nameof(GuildRole), ref GuildRole);
- @@ -3859,9 +3868,9 @@ namespace S2Library.Protocol
- public uint Id;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Errorcode), ref Errorcode);
- serializer.Serialize(nameof(Errormsg), ref Errormsg);
- serializer.Serialize(nameof(Id), ref Id);
- @@ -3881,9 +3890,9 @@ namespace S2Library.Protocol
- public uint IgnoreId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(IgnoreId), ref IgnoreId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3902,9 +3911,9 @@ namespace S2Library.Protocol
- public uint IgnoreId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(IgnoreId), ref IgnoreId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -3921,9 +3930,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -3939,9 +3948,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -3957,9 +3966,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -3979,9 +3988,9 @@ namespace S2Library.Protocol
- public ushort Keypool;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(CdKey), ref CdKey);
- serializer.Serialize(nameof(Keypool), ref Keypool);
- @@ -4011,9 +4020,9 @@ namespace S2Library.Protocol
- public string ServerName;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(IgnoreId), ref IgnoreId);
- serializer.Serialize(nameof(Name), ref Name);
- @@ -4037,9 +4046,9 @@ namespace S2Library.Protocol
- public int Index;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Kategory), ref Kategory);
- serializer.Serialize(nameof(Index), ref Index);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -4060,9 +4069,9 @@ namespace S2Library.Protocol
- public int Value;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Kategory), ref Kategory);
- serializer.Serialize(nameof(Index), ref Index);
- serializer.Serialize(nameof(Value), ref Value);
- @@ -4084,9 +4093,9 @@ namespace S2Library.Protocol
- public int Value;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Kategory), ref Kategory);
- serializer.Serialize(nameof(Index), ref Index);
- serializer.Serialize(nameof(Value), ref Value);
- @@ -4108,9 +4117,9 @@ namespace S2Library.Protocol
- public int Value;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Kategory), ref Kategory);
- serializer.Serialize(nameof(Index), ref Index);
- serializer.Serialize(nameof(Value), ref Value);
- @@ -4128,9 +4137,9 @@ namespace S2Library.Protocol
- public string Txt;
- public uint FromId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Txt), ref Txt);
- serializer.Serialize(nameof(FromId), ref FromId);
- }
- @@ -4154,9 +4163,9 @@ namespace S2Library.Protocol
- public uint Selection;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ServerId), ref ServerId);
- serializer.Serialize(nameof(RoomId), ref RoomId);
- serializer.Serialize(nameof(ServerType), ref ServerType);
- @@ -4178,9 +4187,9 @@ namespace S2Library.Protocol
- public uint Selection;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(MachineId), ref MachineId);
- serializer.Serialize(nameof(Selection), ref Selection);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -4237,9 +4246,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(Description), ref Description);
- serializer.Serialize(nameof(Ip), ref Ip);
- @@ -4271,15 +4280,15 @@ namespace S2Library.Protocol
- // (**(code**)(* piVar1 + 8))("running",0xe);
- // (**(code**)(* piVar1 + 8))("ticket_id",8);
- // (**(code**)(* unaff_EDI + 4))(0xa9,piVar1);
- - public class Payload169 : PayloadPrefix
- + public class UnlistServer : PayloadPrefix // Payload169
- {
- public uint ServerId;
- public bool Running;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ServerId), ref ServerId);
- serializer.Serialize(nameof(Running), ref Running);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -4340,9 +4349,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ServerId), ref ServerId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(OwnerId), ref OwnerId);
- @@ -4392,9 +4401,9 @@ namespace S2Library.Protocol
- public uint Selection;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(SendAll), ref SendAll);
- serializer.Serialize(nameof(ServerType), ref ServerType);
- serializer.Serialize(nameof(RoomId), ref RoomId);
- @@ -4414,9 +4423,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -4429,9 +4438,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -4454,9 +4463,9 @@ namespace S2Library.Protocol
- public byte[] Password;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Ip), ref Ip);
- serializer.Serialize(nameof(Port), ref Port);
- serializer.Serialize(nameof(Name), ref Name);
- @@ -4478,9 +4487,9 @@ namespace S2Library.Protocol
- public bool SendAll;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(SendAll), ref SendAll);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -4497,9 +4506,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -4543,9 +4552,9 @@ namespace S2Library.Protocol
- public uint PropertyMask;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(Description), ref Description);
- serializer.Serialize(nameof(Cipher), ref Cipher);
- @@ -4575,9 +4584,9 @@ namespace S2Library.Protocol
- public uint Patchlevel;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Patchlevel), ref Patchlevel);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -4593,9 +4602,9 @@ namespace S2Library.Protocol
- public string Txt;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Txt), ref Txt);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -4609,9 +4618,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -4634,9 +4643,9 @@ namespace S2Library.Protocol
- public string Txt;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Starttime), ref Starttime);
- serializer.Serialize(nameof(Starttimestamp), ref Starttimestamp);
- serializer.Serialize(nameof(Time), ref Time);
- @@ -4664,9 +4673,9 @@ namespace S2Library.Protocol
- public uint StartedGameservers;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Uptime), ref Uptime);
- serializer.Serialize(nameof(RegisteredUsers), ref RegisteredUsers);
- serializer.Serialize(nameof(Logins), ref Logins);
- @@ -4686,9 +4695,9 @@ namespace S2Library.Protocol
- public byte Level;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Level), ref Level);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -4704,9 +4713,9 @@ namespace S2Library.Protocol
- public bool Visible;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Visible), ref Visible);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -4720,9 +4729,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -4741,9 +4750,9 @@ namespace S2Library.Protocol
- public uint UserId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(OldGroupId), ref OldGroupId);
- serializer.Serialize(nameof(NewGroupId), ref NewGroupId);
- serializer.Serialize(nameof(UserId), ref UserId);
- @@ -4769,9 +4778,9 @@ namespace S2Library.Protocol
- public ushort NewKeypool;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(UserId), ref UserId);
- serializer.Serialize(nameof(OldCdKey), ref OldCdKey);
- serializer.Serialize(nameof(OldKeypool), ref OldKeypool);
- @@ -4793,9 +4802,9 @@ namespace S2Library.Protocol
- public short Subversion;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Version), ref Version);
- serializer.Serialize(nameof(Subversion), ref Subversion);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -4814,9 +4823,9 @@ namespace S2Library.Protocol
- public byte ServerSubtype;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ServerType), ref ServerType);
- serializer.Serialize(nameof(ServerSubtype), ref ServerSubtype);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -4828,14 +4837,14 @@ namespace S2Library.Protocol
- // (**(code**)(* piVar1 + 8))("perm_id",8);
- // (**(code**)(* piVar1 + 8))("ticket_id",8);
- // (**(code**)(* unaff_EDI + 4))(0xbe,piVar1);
- - public class Payload190 : PayloadPrefix
- + public class PlayerLeftServer : PayloadPrefix // Payload190
- {
- public uint PermId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -4855,9 +4864,9 @@ namespace S2Library.Protocol
- public ushort MaxPlayers;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Ip), ref Ip);
- serializer.Serialize(nameof(Port), ref Port);
- serializer.Serialize(nameof(MaxPlayers), ref MaxPlayers);
- @@ -4885,9 +4894,9 @@ namespace S2Library.Protocol
- public byte[] Data;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(ServerId), ref ServerId);
- serializer.Serialize(nameof(Ip), ref Ip);
- serializer.Serialize(nameof(Port), ref Port);
- @@ -4908,9 +4917,9 @@ namespace S2Library.Protocol
- public uint PermId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -4930,9 +4939,9 @@ namespace S2Library.Protocol
- public uint UserAccess;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Username), ref Username);
- serializer.Serialize(nameof(UserAccess), ref UserAccess);
- @@ -4950,9 +4959,9 @@ namespace S2Library.Protocol
- public byte[] Key;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Key), ref Key);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -4968,9 +4977,9 @@ namespace S2Library.Protocol
- public byte[] Cipher;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Cipher), ref Cipher);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -4986,9 +4995,9 @@ namespace S2Library.Protocol
- public byte[] Cipher;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Cipher), ref Cipher);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -5004,9 +5013,9 @@ namespace S2Library.Protocol
- public byte[] Cipher;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Cipher), ref Cipher);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -5022,9 +5031,9 @@ namespace S2Library.Protocol
- public byte[] Cipher;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Cipher), ref Cipher);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -5040,9 +5049,9 @@ namespace S2Library.Protocol
- public byte[] Cipher;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Cipher), ref Cipher);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -5060,9 +5069,9 @@ namespace S2Library.Protocol
- public byte[] Cipher;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Cipher), ref Cipher);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -5077,9 +5086,9 @@ namespace S2Library.Protocol
- {
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- }
- @@ -5094,9 +5103,9 @@ namespace S2Library.Protocol
- public byte[] Nonce;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Nonce), ref Nonce);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- }
- @@ -5114,9 +5123,9 @@ namespace S2Library.Protocol
- public byte[] Cipher;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Cipher), ref Cipher);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -5137,9 +5146,9 @@ namespace S2Library.Protocol
- public byte[] Nonce;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Cipher), ref Cipher);
- serializer.Serialize(nameof(Nonce), ref Nonce);
- @@ -5159,9 +5168,9 @@ namespace S2Library.Protocol
- public uint ServerId;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(ServerId), ref ServerId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -5190,9 +5199,9 @@ namespace S2Library.Protocol
- public string Errormsg;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(ServerId), ref ServerId);
- serializer.Serialize(nameof(Ip), ref Ip);
- @@ -5228,9 +5237,9 @@ namespace S2Library.Protocol
- public byte GuildRole;
- public byte[] Data;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Nonce), ref Nonce);
- serializer.Serialize(nameof(CharId), ref CharId);
- serializer.Serialize(nameof(Name), ref Name);
- @@ -5257,9 +5266,9 @@ namespace S2Library.Protocol
- public uint TicketId;
- public byte[] Password;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Nonce), ref Nonce);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -5283,9 +5292,9 @@ namespace S2Library.Protocol
- public byte Status;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(FromId), ref FromId);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(MessageText), ref MessageText);
- @@ -5310,9 +5319,9 @@ namespace S2Library.Protocol
- public byte Status;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(FromId), ref FromId);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(MessageText), ref MessageText);
- @@ -5339,9 +5348,9 @@ namespace S2Library.Protocol
- public byte Status;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(FromId), ref FromId);
- serializer.Serialize(nameof(Name), ref Name);
- serializer.Serialize(nameof(PasswordRequired), ref PasswordRequired);
- @@ -5371,9 +5380,9 @@ namespace S2Library.Protocol
- public byte Status;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(FromId), ref FromId);
- serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(Name), ref Name);
- @@ -5396,9 +5405,9 @@ namespace S2Library.Protocol
- public uint Id;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(FromId), ref FromId);
- serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -5419,9 +5428,9 @@ namespace S2Library.Protocol
- public string Password;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(FromId), ref FromId);
- serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(Password), ref Password);
- @@ -5441,9 +5450,9 @@ namespace S2Library.Protocol
- public uint Id;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(FromId), ref FromId);
- serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -5462,9 +5471,9 @@ namespace S2Library.Protocol
- public uint Id;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -5483,9 +5492,9 @@ namespace S2Library.Protocol
- public uint Id;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -5506,9 +5515,9 @@ namespace S2Library.Protocol
- public uint Id;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(FromId), ref FromId);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Id), ref Id);
- @@ -5528,9 +5537,9 @@ namespace S2Library.Protocol
- public uint Id;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Id), ref Id);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -5551,9 +5560,9 @@ namespace S2Library.Protocol
- public uint UserAccess;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Nick), ref Nick);
- serializer.Serialize(nameof(UserAccess), ref UserAccess);
- @@ -5579,9 +5588,9 @@ namespace S2Library.Protocol
- public uint Custom1;
- public uint Custom2;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermIdA), ref PermIdA);
- serializer.Serialize(nameof(PermIdB), ref PermIdB);
- serializer.Serialize(nameof(Result), ref Result);
- @@ -5603,9 +5612,9 @@ namespace S2Library.Protocol
- public uint PermIdB;
- public uint ResultId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermIdA), ref PermIdA);
- serializer.Serialize(nameof(PermIdB), ref PermIdB);
- serializer.Serialize(nameof(ResultId), ref ResultId);
- @@ -5622,9 +5631,9 @@ namespace S2Library.Protocol
- public ushort Ranktable;
- public uint PermId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Ranktable), ref Ranktable);
- serializer.Serialize(nameof(PermId), ref PermId);
- }
- @@ -5656,9 +5665,9 @@ namespace S2Library.Protocol
- public uint Tie;
- public uint Disconnected;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Ranktable), ref Ranktable);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Nick), ref Nick);
- @@ -5684,9 +5693,9 @@ namespace S2Library.Protocol
- public uint Rangestart;
- public uint Rangeend;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Ranktable), ref Ranktable);
- serializer.Serialize(nameof(Rangestart), ref Rangestart);
- serializer.Serialize(nameof(Rangeend), ref Rangeend);
- @@ -5709,9 +5718,9 @@ namespace S2Library.Protocol
- public uint Count;
- public byte[] Rankdata;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Ranktable), ref Ranktable);
- serializer.Serialize(nameof(Rangestart), ref Rangestart);
- serializer.Serialize(nameof(Rangeend), ref Rangeend);
- @@ -5732,9 +5741,9 @@ namespace S2Library.Protocol
- public uint Port;
- public uint TicketId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(Ip), ref Ip);
- serializer.Serialize(nameof(Port), ref Port);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- @@ -5753,9 +5762,9 @@ namespace S2Library.Protocol
- public uint TicketId;
- public uint FromId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(CellId), ref CellId);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- serializer.Serialize(nameof(FromId), ref FromId);
- @@ -5774,9 +5783,9 @@ namespace S2Library.Protocol
- public uint ConnectionPid;
- public uint UserPid;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- serializer.Serialize(nameof(ConnectionPid), ref ConnectionPid);
- serializer.Serialize(nameof(UserPid), ref UserPid);
- @@ -5799,9 +5808,9 @@ namespace S2Library.Protocol
- public uint TicketId;
- public uint ResultId;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(PermId), ref PermId);
- serializer.Serialize(nameof(Username), ref Username);
- serializer.Serialize(nameof(UserAccess), ref UserAccess);
- @@ -5820,9 +5829,9 @@ namespace S2Library.Protocol
- public uint TicketId;
- public string Name;
- - public override void Serialize(Serializer serializer)
- + public override void Serialize(Serializer serializer, bool fullHeader = true)
- {
- - base.Serialize(serializer);
- + base.Serialize(serializer, fullHeader);
- serializer.Serialize(nameof(TicketId), ref TicketId);
- serializer.Serialize(nameof(Name), ref Name);
- }
- diff --git a/S2Lobby/Accounts.cs b/S2Lobby/Accounts.cs
- index 645fdf5..9757fe1 100644
- --- a/S2Lobby/Accounts.cs
- +++ b/S2Lobby/Accounts.cs
- @@ -84,7 +84,21 @@ namespace S2Lobby
- public Account Get(SQLiteConnection sql, string name)
- {
- SQLiteParameter para1 = new SQLiteParameter();
- + para1.Value = name.ToUpperInvariant();
- +
- + return GetInternal(sql, "user_name_upper", para1);
- + }
- +
- + public Account Get(SQLiteConnection sql, uint id)
- + {
- + SQLiteParameter para1 = new SQLiteParameter();
- + para1.Value = id;
- + return GetInternal(sql, "account_id", para1);
- + }
- +
- + private Account GetInternal(SQLiteConnection sql, string field, SQLiteParameter para1)
- + {
- StringBuilder cmd = new StringBuilder();
- cmd.AppendLine("SELECT ");
- cmd.AppendLine(" account_id");
- @@ -95,9 +109,7 @@ namespace S2Lobby
- cmd.AppendLine(", user_data");
- cmd.AppendLine(", player_nickname");
- cmd.AppendLine("FROM accounts");
- - cmd.AppendLine("WHERE user_name_upper = ?;");
- -
- - para1.Value = name.ToUpperInvariant();
- + cmd.AppendLine($"WHERE {field} = ?;");
- SQLiteCommand command = new SQLiteCommand(cmd.ToString(), sql);
- command.Parameters.Add(para1);
- @@ -119,6 +131,7 @@ namespace S2Lobby
- PlayerName = reader["player_nickname"] as string,
- };
- + reader.Close();
- command.Dispose();
- return account;
- diff --git a/S2Lobby/Channels.cs b/S2Lobby/Channels.cs
- new file mode 100644
- index 0000000..7791a1c
- --- /dev/null
- +++ b/S2Lobby/Channels.cs
- @@ -0,0 +1,243 @@
- +using System.Collections.Generic;
- +using System.Data.SQLite;
- +using System.Text;
- +
- +namespace S2Lobby
- +{
- + public class Channels
- + {
- + private Program _program;
- +
- + public void Init(Program program)
- + {
- + _program = program;
- +
- + SQLiteConnection sql = new SQLiteConnection("Data Source=channels.sqlite;");
- + sql.Open();
- +
- + SQLiteTransaction transaction = sql.BeginTransaction();
- +
- + StringBuilder cmd = new StringBuilder();
- + cmd.AppendLine("CREATE TABLE IF NOT EXISTS channels (");
- + cmd.AppendLine(" channel_id INTEGER PRIMARY KEY AUTOINCREMENT");
- + cmd.AppendLine(", channel_name VARCHAR(127) NOT NULL");
- + cmd.AppendLine(", channel_subject VARCHAR(255)");
- + cmd.AppendLine(", channel_creator VARCHAR(127) NOT NULL");
- + cmd.AppendLine(", creator_id INTEGER NOT NULL");
- + cmd.AppendLine(", channel_protected INTEGER NOT NULL DEFAULT(0)");
- + cmd.AppendLine(", channel_password VARCHAR(127)");
- + cmd.AppendLine(", channel_hidden INTEGER NOT NULL DEFAULT(0)");
- + cmd.AppendLine(");");
- +
- + SQLiteCommand command = new SQLiteCommand(cmd.ToString(), sql, transaction);
- + if (command.ExecuteNonQuery() >= 0)
- + {
- + string cmd1 = "INSERT INTO channels (channel_name, channel_subject, channel_creator, creator_id, channel_protected) VALUES ('System', 'System Channel', 'Admin', 0, 1);";
- + SQLiteCommand command1 = new SQLiteCommand(cmd1, sql, transaction);
- + command1.ExecuteNonQuery();
- +
- + string cmd2 = "INSERT INTO channels (channel_name, channel_subject, channel_creator, creator_id, channel_protected) VALUES ('Lobby', 'Lobby Channel', 'Admin', 0, 1);";
- + SQLiteCommand command2 = new SQLiteCommand(cmd2, sql, transaction);
- + command2.ExecuteNonQuery();
- + }
- +
- + transaction.Commit();
- +
- + command.Dispose();
- + transaction.Dispose();
- +
- + sql.Close();
- + sql.Dispose();
- +
- + _program.Log($"[Channel database ready]");
- + }
- +
- + public uint Create(SQLiteConnection sql, Channel channel)
- + {
- + Channel existing = Get(sql, channel.Id);
- + if (existing != null)
- + {
- + return 0;
- + }
- +
- + SQLiteParameter para1 = new SQLiteParameter();
- + SQLiteParameter para2 = new SQLiteParameter();
- + SQLiteParameter para3 = new SQLiteParameter();
- + SQLiteParameter para4 = new SQLiteParameter();
- + SQLiteParameter para5 = new SQLiteParameter();
- + SQLiteParameter para6 = new SQLiteParameter();
- + SQLiteParameter para7 = new SQLiteParameter();
- +
- + StringBuilder cmd = new StringBuilder();
- + cmd.AppendLine("INSERT INTO channels (channel_name, channel_subject, channel_creator, creator_id, channel_protected, channel_password, channel_hidden) VALUES (?, ?, ?, ?, ?, ?, ?);");
- +
- + para1.Value = channel.Name;
- + para2.Value = channel.Subject;
- + para3.Value = channel.Creator;
- + para4.Value = channel.CreatorId;
- + para5.Value = channel.Protected ? 1 : 0;
- + para6.Value = channel.Password;
- + para7.Value = channel.Hidden ? 1 : 0;
- +
- + SQLiteTransaction transaction = sql.BeginTransaction();
- +
- + SQLiteCommand command = new SQLiteCommand(cmd.ToString(), sql, transaction);
- + command.Parameters.Add(para1);
- + command.Parameters.Add(para2);
- + command.Parameters.Add(para3);
- + command.Parameters.Add(para4);
- + command.Parameters.Add(para5);
- + command.Parameters.Add(para6);
- + command.Parameters.Add(para7);
- +
- + command.ExecuteNonQuery();
- +
- + transaction.Commit();
- +
- + command.Dispose();
- + transaction.Dispose();
- +
- + return (uint)GetLastAutoIncrement(sql);
- + }
- +
- + public Channel Get(SQLiteConnection sql, uint id)
- + {
- + SQLiteParameter para1 = new SQLiteParameter();
- + para1.Value = id;
- +
- + return GetInternal(sql, "channel_id", para1);
- + }
- +
- + private Channel GetInternal(SQLiteConnection sql, string field, SQLiteParameter para1)
- + {
- + StringBuilder cmd = new StringBuilder();
- + cmd.AppendLine("SELECT ");
- + cmd.AppendLine(" channel_id");
- + cmd.AppendLine(", channel_name");
- + cmd.AppendLine(", channel_subject");
- + cmd.AppendLine(", channel_creator");
- + cmd.AppendLine(", creator_id");
- + cmd.AppendLine(", channel_protected");
- + cmd.AppendLine(", channel_password");
- + cmd.AppendLine(", channel_hidden");
- + cmd.AppendLine("FROM channels");
- + cmd.AppendLine($"WHERE {field} = ?;");
- +
- + SQLiteCommand command = new SQLiteCommand(cmd.ToString(), sql);
- + command.Parameters.Add(para1);
- +
- + SQLiteDataReader reader = command.ExecuteReader();
- + if (!reader.Read())
- + {
- + return null;
- + }
- +
- + Channel channel = new Channel()
- + {
- + Id = (uint)(long)reader["channel_id"],
- + Name = reader["channel_name"] as string,
- + Subject = reader["channel_subject"] as string,
- + Creator = reader["channel_creator"] as string,
- + CreatorId = (uint)(long)reader["creator_id"],
- + Protected = (long)reader["channel_protected"] != 0,
- + Password = reader["channel_password"] as string,
- + Hidden = (long)reader["channel_hidden"] != 0,
- + Persistent = true,
- + };
- +
- + reader.Close();
- + command.Dispose();
- +
- + return channel;
- + }
- +
- + public List<Channel> GetAll(SQLiteConnection sql)
- + {
- + StringBuilder cmd = new StringBuilder();
- + cmd.AppendLine("SELECT ");
- + cmd.AppendLine(" channel_id");
- + cmd.AppendLine(", channel_name");
- + cmd.AppendLine(", channel_subject");
- + cmd.AppendLine(", channel_creator");
- + cmd.AppendLine(", creator_id");
- + cmd.AppendLine(", channel_protected");
- + cmd.AppendLine(", channel_password");
- + cmd.AppendLine(", channel_hidden");
- + cmd.AppendLine("FROM channels");
- + cmd.AppendLine("ORDER BY channel_id;");
- +
- + SQLiteCommand command = new SQLiteCommand(cmd.ToString(), sql);
- +
- + List<Channel> result = new List<Channel>();
- +
- + SQLiteDataReader reader = command.ExecuteReader();
- + while (reader.Read())
- + {
- + Channel channel = new Channel()
- + {
- + Id = (uint)(long)reader["channel_id"],
- + Name = reader["channel_name"] as string,
- + Subject = reader["channel_subject"] as string,
- + Creator = reader["channel_creator"] as string,
- + CreatorId = (uint)(long)reader["creator_id"],
- + Protected = (long)reader["channel_protected"] != 0,
- + Password = reader["channel_password"] as string,
- + Hidden = (long)reader["channel_hidden"] != 0,
- + Persistent = true,
- + };
- +
- + result.Add(channel);
- + }
- +
- + reader.Close();
- + command.Dispose();
- +
- + return result;
- + }
- +
- + public void Delete(SQLiteConnection sql, uint id)
- + {
- + SQLiteParameter para1 = new SQLiteParameter();
- +
- + StringBuilder cmd = new StringBuilder();
- + cmd.AppendLine("DELETE FROM channels WHERE channel_protected = 0 AND channel_id = ?;");
- +
- + para1.Value = id;
- +
- + SQLiteTransaction transaction = sql.BeginTransaction();
- +
- + SQLiteCommand command = new SQLiteCommand(cmd.ToString(), sql, transaction);
- + command.Parameters.Add(para1);
- +
- + command.ExecuteNonQuery();
- +
- + transaction.Commit();
- +
- + command.Dispose();
- + transaction.Dispose();
- + }
- +
- + private static long GetLastAutoIncrement(SQLiteConnection sql)
- + {
- + string cmd= "SELECT last_insert_rowid();";
- + SQLiteCommand command2 = new SQLiteCommand(cmd, sql);
- + long scalar = (long) command2.ExecuteScalar();
- + command2.Dispose();
- + return scalar;
- + }
- + }
- +
- + public class Channel
- + {
- + public uint Id;
- + public string Name;
- + public string Subject;
- + public string Creator;
- + public uint CreatorId;
- + public bool Protected;
- + public string Password;
- + public bool Hidden;
- + public bool Persistent;
- + public bool AutoDelete;
- + }
- +}
- diff --git a/S2Lobby/ChatProcessor.cs b/S2Lobby/ChatProcessor.cs
- index d041d9c..7217523 100644
- --- a/S2Lobby/ChatProcessor.cs
- +++ b/S2Lobby/ChatProcessor.cs
- @@ -1,24 +1,104 @@
- using System.IO;
- +using System.Collections.Concurrent;
- +using System.Collections.Generic;
- +using System.Linq;
- +
- using S2Library.Protocol;
- namespace S2Lobby
- {
- public class ChatProcessor : ServerProcessor
- {
- - private readonly byte[] _initial1 = Crypto.BytesFromHexString("620000000000370000000200000053430600000053797374656d0e00000053797374656d206368616e6e656c0500000041646d696e0000000000010000000000000100000000000000");
- - private readonly byte[] _initial2 = Crypto.BytesFromHexString("62000000000030000000020000005343050000004c6f6262790d0000004c6f626279204368616e6e656c000000000000000000010000000000000200000000000000");
- + private static readonly ConcurrentDictionary<uint, ConcurrentBag<uint>> _channelConnections = new ConcurrentDictionary<uint, ConcurrentBag<uint>>();
- + private static readonly ConcurrentDictionary<uint, Channel> _channels = new ConcurrentDictionary<uint, Channel>();
- public ChatProcessor(Program program, uint connection) : base(program, connection)
- {
- }
- - protected override void HandleInitialReply(MemoryStream replyStream)
- + public override void Close()
- {
- - BinaryWriter writer = new BinaryWriter(replyStream);
- - writer.Write(_initial1);
- - SendReply(MessageContainer.Types.ApplicationMessage, replyStream);
- - writer.Write(_initial2);
- - SendReply(MessageContainer.Types.ApplicationMessage, replyStream);
- + base.Close();
- + if (Account == null)
- + {
- + return;
- + }
- +
- + KeyValuePair<uint, ConcurrentBag<uint>>[] channels = _channelConnections.ToArray();
- + foreach(KeyValuePair<uint, ConcurrentBag<uint>> channel in channels)
- + {
- + uint channelId = channel.Key;
- + uint[] connections = channel.Value.ToArray();
- +
- + foreach(uint connection in connections)
- + {
- + if (connection != Connection)
- + {
- + continue;
- + }
- +
- + ChatDisconnected disconnected = Payloads.CreatePayload<ChatDisconnected>();
- + disconnected.PermId = Account.Id;
- + disconnected.CellId = channelId;
- +
- + SendAsChatReply(MessageContainer.ConnectionServer, disconnected, channelId);
- + }
- + }
- + }
- +
- + protected override void HandleInitialReply()
- + {
- + List<Channel> channels = Program.Channels.GetAll(Database.Channels);
- +
- + foreach (Channel channel in channels)
- + {
- + _channels[channel.Id] = channel;
- + }
- +
- + List<uint> ids = _channels.Keys.ToList();
- + ids.Sort();
- +
- + foreach (uint id in ids)
- + {
- + Channel channel = _channels[id];
- +
- + ChannelData channelData = new ChannelData()
- + {
- + Name = channel.Name,
- + Subject = channel.Subject,
- + Creator = channel.Creator,
- + Password = channel.Password,
- + Protected = channel.Protected,
- + Persistent = channel.Persistent,
- + Autodelete = channel.AutoDelete,
- + Hidden = channel.Hidden,
- + CreatorPid = channel.CreatorId,
- + };
- +
- + ChannelInfo payload = ChatPayloads.CreateChatPayload<ChannelInfo>();
- + payload.Data = WriteChannelData(channelData);
- + payload.CellId = channel.Id;
- + payload.TicketId = 0;
- + SendChat(payload);
- + }
- + }
- +
- + private void SendChat(ChatPayloadPrefix payload)
- + {
- + ChatPayloads.ChatTypes chatPayloadType = (ChatPayloads.ChatTypes)payload.Id;
- +
- + Program.LogDebug($" --- Chat Payload sending: {chatPayloadType} ---");
- + payload.Serialize(Logger);
- +
- + MemoryStream stream = new MemoryStream();
- + BinaryWriter writer = new BinaryWriter(stream);
- +
- + PayloadWriter payloadWriter = new PayloadWriter(writer);
- + payload.Serialize(payloadWriter);
- + SendReply(MessageContainer.Types.ApplicationMessage, stream);
- +
- + writer.Close();
- + stream.Close();
- }
- protected sealed override bool HandlePayloadType(Payloads.Types payloadType, PayloadPrefix payload, PayloadWriter writer)
- @@ -36,6 +116,9 @@ namespace S2Lobby
- case Payloads.Types.VerifyChatLogin:
- HandleVerifyChatLogin((VerifyChatLogin)payload, writer);
- return true;
- + case Payloads.Types.JoinChatChannel:
- + HandleJoinChatChannel((JoinChatChannel)payload, writer);
- + return true;
- default:
- return false;
- }
- @@ -51,6 +134,9 @@ namespace S2Lobby
- case ChatPayloads.ChatTypes.CreateChannel:
- ChatHandleCreateChannel((CreateChannel)chatPayload, writer);
- break;
- + case ChatPayloads.ChatTypes.ChatMessage:
- + ChatHandleChatMessage((ChatMessage)chatPayload, writer);
- + break;
- default:
- return;
- }
- @@ -66,36 +152,214 @@ namespace S2Lobby
- private void HandleVerifyChatLogin(VerifyChatLogin payload, PayloadWriter writer)
- {
- - StatusWithId resultPayload = Payloads.CreatePayload<StatusWithId>();
- - resultPayload.Errorcode = 0;
- - resultPayload.Errormsg = null;
- - resultPayload.Id = 0;
- - resultPayload.TicketId = payload.TicketId;
- - SendReply(writer, resultPayload);
- + Account = Program.Accounts.Get(Database.Connection, payload.PermId);
- + if (Account == null || Account.Id != payload.PermId)
- + {
- + StatusWithId resultPayload1 = Payloads.CreatePayload<StatusWithId>();
- + resultPayload1.Errorcode = 1;
- + resultPayload1.Errormsg = "Account not found";
- + resultPayload1.Id = 0;
- + resultPayload1.TicketId = payload.TicketId;
- + SendReply(writer, resultPayload1);
- + return;
- + }
- +
- + StatusWithId resultPayload2 = Payloads.CreatePayload<StatusWithId>();
- + resultPayload2.Errorcode = 0;
- + resultPayload2.Errormsg = null;
- + resultPayload2.Id = 0;
- + resultPayload2.TicketId = payload.TicketId;
- + SendReply(writer, resultPayload2);
- + }
- +
- + private void HandleJoinChatChannel(JoinChatChannel payload, PayloadWriter writer)
- + {
- + ConcurrentBag<uint> connections;
- + if (!_channelConnections.TryGetValue(payload.CellId, out connections)) {
- + connections = new ConcurrentBag<uint>();
- + _channelConnections[payload.CellId] = connections;
- + }
- +
- + connections.Add(Connection);
- + Program.LogDebug($" # User {Connection} joins channel {payload.CellId}");
- +
- + ChannelJoined joined = ChatPayloads.CreateChatPayload<ChannelJoined>();
- + joined.CellId = payload.CellId;
- + joined.TicketId = payload.TicketId;
- + joined.Option = 0;
- +
- + SendChat(joined);
- +
- + StatusReply reply = ChatPayloads.CreateChatPayload<StatusReply>();
- + reply.CellId = payload.CellId;
- + reply.TicketId = payload.TicketId;
- + reply.ResultId = 0;
- +
- + SendChat(reply);
- +
- + ChatUserInfo userInfo = Payloads.CreatePayload<ChatUserInfo>();
- + userInfo.PermId = Account.Id;
- + userInfo.CellId = payload.CellId;
- + userInfo.Nick = Account.PlayerName;
- +
- + SendAsChatReply(MessageContainer.ConnectionServer, userInfo, payload.CellId);
- +
- + uint[] cellConnections = connections.ToArray();
- + foreach (uint connection in cellConnections)
- + {
- + if (connection == Connection)
- + {
- + continue;
- + }
- +
- + ChatProcessor processor = Program.GetChatProcessor(connection);
- + if (processor == null)
- + {
- + continue;
- + }
- +
- + ChatUserInfo info = Payloads.CreatePayload<ChatUserInfo>();
- + info.PermId = processor.Account.Id;
- + info.CellId = payload.CellId;
- + info.Nick = processor.Account.PlayerName;
- +
- + SendChatReplyTo(this, info, payload.CellId);
- + }
- + }
- +
- + private void SendAsChatReply(uint from, PayloadPrefix payload, uint cellId)
- + {
- + ConcurrentBag<uint> connections;
- + if (!_channelConnections.TryGetValue(cellId, out connections))
- + {
- + return;
- + }
- +
- + MemoryStream stream = new MemoryStream();
- + BinaryWriter binaryWriter = new BinaryWriter(stream);
- + PayloadWriter payloadWriter = new PayloadWriter(binaryWriter);
- +
- + payload.Serialize(payloadWriter, false);
- + byte[] data = stream.ToArray();
- +
- + binaryWriter.Close();
- + stream.Close();
- +
- + ChatReply chatReply = ChatPayloads.CreateChatPayload<ChatReply>();
- + chatReply.MessageId = payload.Type2;
- + chatReply.Data = data;
- + chatReply.CellId = cellId;
- + chatReply.FromId = from;
- + chatReply.Ispropset = true;
- +
- + uint[] cellConnections = connections.ToArray();
- + foreach (uint connection in cellConnections)
- + {
- + ChatProcessor processor = Program.GetChatProcessor(connection);
- + if (processor != null)
- + {
- + processor.SendChat(chatReply);
- + }
- + }
- + }
- +
- + private void SendChatReplyTo(ChatProcessor to, PayloadPrefix payload, uint cellId)
- + {
- + MemoryStream stream = new MemoryStream();
- + BinaryWriter binaryWriter = new BinaryWriter(stream);
- + PayloadWriter payloadWriter = new PayloadWriter(binaryWriter);
- +
- + payload.Serialize(payloadWriter, false);
- + byte[] data = stream.ToArray();
- +
- + binaryWriter.Close();
- + stream.Close();
- +
- + ChatReply chatReply = ChatPayloads.CreateChatPayload<ChatReply>();
- + chatReply.MessageId = payload.Type2;
- + chatReply.Data = data;
- + chatReply.CellId = cellId;
- + chatReply.FromId = MessageContainer.ConnectionServer;
- + chatReply.Ispropset = true;
- +
- + to.SendChat(chatReply);
- }
- private void ChatHandleCreateChannel(CreateChannel chatPayload, PayloadWriter writer)
- {
- - UnknownData data = ReadUnknownData(chatPayload.Data);
- + ChannelData data = ReadChannelData(chatPayload.Data);
- Program.LogDebug($" --- Chat Create Channel Data ---");
- data.Serialize(Logger);
- +
- + StatusReply reply = ChatPayloads.CreateChatPayload<StatusReply>();
- + reply.CellId = 3;
- + reply.TicketId = chatPayload.TicketId;
- + reply.ResultId = 0;
- +
- + SendChat(reply);
- + }
- +
- + private void ChatHandleChatMessage(ChatMessage chatPayload, PayloadWriter w)
- + {
- + if (chatPayload.MessageId != (ushort)Payloads.Types.ChatPayload)
- + {
- + Program.Log($" !!! Received chat message of invalid type {(Payloads.Types)chatPayload.MessageId}");
- + return;
- + }
- +
- + MemoryStream stream = new MemoryStream(chatPayload.Data);
- + BinaryReader reader = new BinaryReader(stream);
- + PayloadReader payloadReader = new PayloadReader(reader);
- +
- + ChatPayload chat = Payloads.CreatePayload<ChatPayload>();
- + chat.Serialize(payloadReader, false);
- +
- + reader.Close();
- + stream.Close();
- +
- + Program.LogDebug($" + Chat Payload +");
- + chat.Serialize(Logger);
- +
- + ChatPayload resultPayload = Payloads.CreatePayload<ChatPayload>();
- + resultPayload.Mode = chat.Mode;
- + resultPayload.Txt = chat.Txt;
- + resultPayload.TicketId = chat.TicketId;
- + resultPayload.FromId = chat.FromId;
- +
- + SendAsChatReply(Account.Id, resultPayload, chatPayload.CellId);
- }
- - private UnknownData ReadUnknownData(byte[] data)
- + private ChannelData ReadChannelData(byte[] data)
- {
- MemoryStream stream = new MemoryStream(data);
- BinaryReader reader = new BinaryReader(stream);
- Serializer dataReader = new PayloadReader(reader);
- - UnknownData unknownData = new UnknownData();
- - unknownData.Serialize(dataReader);
- + ChannelData channelData = new ChannelData();
- + channelData.Serialize(dataReader);
- reader.Close();
- stream.Close();
- - return unknownData;
- + return channelData;
- + }
- +
- + private byte[] WriteChannelData(ChannelData data)
- + {
- + MemoryStream stream = new MemoryStream();
- + BinaryWriter writer = new BinaryWriter(stream);
- +
- + Serializer dataWriter = new PayloadWriter(writer);
- + data.Serialize(dataWriter);
- +
- + byte[] result = stream.ToArray();
- +
- + writer.Close();
- + stream.Close();
- +
- + return result;
- }
- }
- }
- diff --git a/S2Lobby/Database.cs b/S2Lobby/Database.cs
- index 6dea42a..fe372fb 100644
- --- a/S2Lobby/Database.cs
- +++ b/S2Lobby/Database.cs
- @@ -7,6 +7,22 @@ namespace S2Lobby
- {
- public readonly SQLiteConnection Connection;
- + private SQLiteConnection _channelDB;
- +
- + public SQLiteConnection Channels
- + {
- + get
- + {
- + if (_channelDB == null)
- + {
- + string connectionString = "Data Source=channels.sqlite;";
- + _channelDB = new SQLiteConnection(connectionString);
- + _channelDB.Open();
- + }
- + return _channelDB;
- + }
- + }
- +
- public Database()
- {
- string connectionString = "Data Source=accounts.sqlite;";
- @@ -14,10 +30,23 @@ namespace S2Lobby
- Connection.Open();
- }
- + public void CloseChannelDB()
- + {
- + if (_channelDB != null)
- + {
- + _channelDB.Close();
- + _channelDB.Dispose();
- + _channelDB = null;
- + }
- + }
- +
- public void Dispose()
- {
- + CloseChannelDB();
- +
- Connection.Close();
- Connection.Dispose();
- }
- +
- }
- }
- diff --git a/S2Lobby/LobbyProcessor.cs b/S2Lobby/LobbyProcessor.cs
- index dea2659..3ef4b1d 100644
- --- a/S2Lobby/LobbyProcessor.cs
- +++ b/S2Lobby/LobbyProcessor.cs
- @@ -1,5 +1,7 @@
- -using System.Collections.Concurrent;
- +using System;
- +using System.Collections.Concurrent;
- using System.Collections.Generic;
- +
- using S2Library.Protocol;
- namespace S2Lobby
- @@ -23,6 +25,7 @@ namespace S2Lobby
- if (_server != null)
- {
- Program.Servers.Remove(_server.Id);
- + NotifyUnlistServer(_server.Id, _server.Running);
- _server = null;
- }
- }
- @@ -81,6 +84,12 @@ namespace S2Lobby
- case Payloads.Types.UpdateServerInfo:
- HandleUpdateServerInfo((UpdateServerInfo)payload, writer);
- return true;
- + case Payloads.Types.PlayerJoinedServer:
- + HandlePlayerJoinedServer((PlayerJoinedServer)payload, writer);
- + return true;
- + case Payloads.Types.PlayerLeftServer:
- + HandlePlayerLeftServer((PlayerLeftServer)payload, writer);
- + return true;
- default:
- return false;
- }
- @@ -345,6 +354,16 @@ namespace S2Lobby
- _server.Running = payload.Running;
- _server.LockedConfig = payload.LockedConfig;
- _server.Data = payload.Data;
- + if (payload.Cipher != null)
- + {
- + byte[] serverPassword = Crypto.HandleCipher(payload.Cipher, SessionKey);
- + int length = System.Array.FindIndex(serverPassword, b => b == 0);
- + string password = System.Text.Encoding.ASCII.GetString(serverPassword, 0, length);
- + Program.LogDebug($" Server password is: {password}");
- +
- + _server.NeedsPassword = true;
- + _server.Password = password;
- + }
- SendServerUpdates();
- @@ -398,7 +417,7 @@ namespace S2Lobby
- resultPayload1.ServerSubtype = server.SubType;
- resultPayload1.Version = "1.1";
- resultPayload1.MaxPlayers = server.MaxPlayers;
- - resultPayload1.CurPlayers = 0;
- + resultPayload1.CurPlayers = (ushort)server.Players.Count;
- resultPayload1.MaxSpectators = 0;
- resultPayload1.CurSpectators = 0;
- resultPayload1.AiPlayers = 0;
- @@ -410,6 +429,7 @@ namespace S2Lobby
- resultPayload1.Running = server.Running;
- resultPayload1.LockedConfig = server.LockedConfig;
- resultPayload1.Data = server.Data; // Crypto.BytesFromHexString("25000000785e63607264d26567c00f001041007a");
- + resultPayload1.PasswordRequired = server.NeedsPassword;
- resultPayload1.TicketId = ticketId;
- return resultPayload1;
- }
- @@ -507,6 +527,21 @@ namespace S2Lobby
- _server.Running = payload.Running;
- _server.LockedConfig = payload.LockedConfig;
- _server.Data = payload.Data;
- + if (payload.Cipher == null)
- + {
- + _server.NeedsPassword = false;
- + _server.Password = null;
- + }
- + else
- + {
- + byte[] serverPassword = Crypto.HandleCipher(payload.Cipher, SessionKey);
- + int length = System.Array.FindIndex(serverPassword, b => b == 0);
- + string password = System.Text.Encoding.ASCII.GetString(serverPassword, 0, length);
- + Program.LogDebug($" Server password is: {password}");
- +
- + _server.NeedsPassword = true;
- + _server.Password = password;
- + }
- SendServerUpdates();
- @@ -517,6 +552,29 @@ namespace S2Lobby
- SendReply(writer, resultPayload2);
- }
- + private void HandlePlayerJoinedServer(PlayerJoinedServer payload, PayloadWriter writer)
- + {
- + if (_server == null)
- + {
- + return;
- + }
- +
- + _server.Players.TryAdd(payload.PermId, Connection);
- + SendServerUpdates();
- + }
- +
- + private void HandlePlayerLeftServer(PlayerLeftServer payload, PayloadWriter writer)
- + {
- + if (_server == null)
- + {
- + return;
- + }
- +
- + uint dummy;
- + _server.Players.TryRemove(payload.PermId, out dummy);
- + SendServerUpdates();
- + }
- +
- private void SendServerUpdates()
- {
- ServerInfo serverInfo = CreateServerInfoPayload(_server, 0);
- @@ -526,5 +584,17 @@ namespace S2Lobby
- SendToLobbyConnection(server.Key, serverInfo);
- }
- }
- +
- + private void NotifyUnlistServer(uint serverId, bool running)
- + {
- + UnlistServer unlistInfo = Payloads.CreatePayload<UnlistServer>();
- + unlistInfo.ServerId = serverId;
- + unlistInfo.Running = running;
- + KeyValuePair<uint, uint>[] servers = ServerUpdateReceivers.ToArray();
- + foreach (KeyValuePair<uint, uint> server in servers)
- + {
- + SendToLobbyConnection(server.Key, unlistInfo);
- + }
- + }
- }
- }
- diff --git a/S2Lobby/NetworkProcessor.cs b/S2Lobby/NetworkProcessor.cs
- index 15c69a3..ac823a4 100644
- --- a/S2Lobby/NetworkProcessor.cs
- +++ b/S2Lobby/NetworkProcessor.cs
- @@ -1,6 +1,7 @@
- using System;
- using System.Collections.Concurrent;
- using System.IO;
- +
- using S2Library.Protocol;
- namespace S2Lobby
- @@ -197,7 +198,11 @@ namespace S2Lobby
- writer.Write(handshake.Unknown1);
- SendReply(MessageContainer.Types.HandShakeConnected, writeStream);
- - HandleInitialReply(writeStream);
- +
- + writer.Close();
- + writeStream.Close();
- +
- + HandleInitialReply();
- }
- else if (Message.Type == MessageContainer.Types.ApplicationMessage)
- {
- @@ -208,6 +213,12 @@ namespace S2Lobby
- BinaryWriter writer = new BinaryWriter(writeStream);
- HandleMessage(reader, writer);
- +
- + writer.Close();
- + writeStream.Close();
- +
- + reader.Close();
- + readStream.Close();
- }
- else if (Message.Type == MessageContainer.Types.Ping)
- {
- @@ -219,7 +230,7 @@ namespace S2Lobby
- }
- }
- - protected virtual void HandleInitialReply(MemoryStream replyStream)
- + protected virtual void HandleInitialReply()
- {
- }
- diff --git a/S2Lobby/Program.cs b/S2Lobby/Program.cs
- index 4930b3e..28d1acd 100644
- --- a/S2Lobby/Program.cs
- +++ b/S2Lobby/Program.cs
- @@ -1,6 +1,7 @@
- using System;
- using System.Collections.Concurrent;
- using System.IO;
- +
- using S2Library.Connection;
- using S2Library.Protocol;
- @@ -13,8 +14,8 @@ namespace S2Lobby
- new Program().Run();
- }
- - private const uint LobbyPort = 6800;
- - public const uint ChatPort = 6801;
- + private uint LobbyPort { get; set; } = 6800;
- + public uint ChatPort { get; private set; } = 6801;
- public string Ip { get; private set; } = "127.0.0.1";
- @@ -36,6 +37,7 @@ namespace S2Lobby
- public static readonly Accounts Accounts = new Accounts();
- public static readonly Servers Servers = new Servers();
- + public static readonly Channels Channels = new Channels();
- private void Run()
- {
- @@ -46,6 +48,23 @@ namespace S2Lobby
- {
- Ip = lines[0];
- }
- + if (lines.Length > 1)
- + {
- + uint port;
- + if (UInt32.TryParse(lines[1], out port))
- + {
- + LobbyPort = port;
- + ChatPort = port + 1;
- + }
- + }
- + if (lines.Length > 2)
- + {
- + uint port;
- + if (UInt32.TryParse(lines[2], out port))
- + {
- + ChatPort = port;
- + }
- + }
- }
- lock (_sync)
- @@ -61,6 +80,7 @@ namespace S2Lobby
- Accounts.Init(this);
- Servers.Init(this);
- + Channels.Init(this);
- _lobbyConnectionManager.Connected += LobbyConnectionManagerOnConnected;
- _lobbyConnectionManager.ConnectFailed += LobbyConnectionManagerOnConnectFailed;
- @@ -183,9 +203,9 @@ namespace S2Lobby
- NetworkProcessor incomingLobbyProcessor;
- if (!_incomingLobbyProcessors.TryRemove(args.Conn.Id, out incomingLobbyProcessor))
- {
- - incomingLobbyProcessor.Close();
- Log($" Can't remove from incoming lobby processors: {args.Conn.Id}");
- }
- + incomingLobbyProcessor.Close();
- ConcurrentQueue<byte[]> outgoingLobbyQueue;
- if (!_outgoingLobbyQueues.TryRemove(args.Conn.Id, out outgoingLobbyQueue))
- @@ -210,9 +230,9 @@ namespace S2Lobby
- NetworkProcessor incomingChatProcessor;
- if (!_incomingChatProcessors.TryRemove(args.Conn.Id, out incomingChatProcessor))
- {
- - incomingChatProcessor.Close();
- Log($" Can't remove from incoming chat processors: {args.Conn.Id}");
- }
- + incomingChatProcessor.Close();
- ConcurrentQueue<byte[]> outgoingChatQueue;
- if (!_outgoingChatQueues.TryRemove(args.Conn.Id, out outgoingChatQueue))
- @@ -237,9 +257,9 @@ namespace S2Lobby
- NetworkProcessor incomingLobbyProcessor;
- if (!_incomingLobbyProcessors.TryRemove(args.Conn.Id, out incomingLobbyProcessor))
- {
- - incomingLobbyProcessor.Close();
- Log($" Can't remove from incoming lobby processors: {args.Conn.Id}");
- }
- + incomingLobbyProcessor.Close();
- ConcurrentQueue<byte[]> outgoingLobbyQueue;
- if (!_outgoingLobbyQueues.TryRemove(args.Conn.Id, out outgoingLobbyQueue))
- @@ -264,9 +284,9 @@ namespace S2Lobby
- NetworkProcessor incomingChatProcessor;
- if (!_incomingChatProcessors.TryRemove(args.Conn.Id, out incomingChatProcessor))
- {
- - incomingChatProcessor.Close();
- Log($" Can't remove from incoming chat processors: {args.Conn.Id}");
- }
- + incomingChatProcessor.Close();
- ConcurrentQueue<byte[]> outgoingChatQueue;
- if (!_outgoingChatQueues.TryRemove(args.Conn.Id, out outgoingChatQueue))
- @@ -384,23 +404,23 @@ namespace S2Lobby
- }
- }
- - public NetworkProcessor GetLobbyProcessor(uint connId)
- + public LobbyProcessor GetLobbyProcessor(uint connId)
- {
- NetworkProcessor incomingLobbyProcessor;
- if (_incomingLobbyProcessors.TryGetValue(connId, out incomingLobbyProcessor))
- {
- - return incomingLobbyProcessor;
- + return incomingLobbyProcessor as LobbyProcessor;
- }
- return null;
- }
- - public NetworkProcessor GetChatProcessor(uint connId)
- + public ChatProcessor GetChatProcessor(uint connId)
- {
- NetworkProcessor incomingChatProcessor;
- if (_incomingChatProcessors.TryGetValue(connId, out incomingChatProcessor))
- {
- - return incomingChatProcessor;
- + return incomingChatProcessor as ChatProcessor;
- }
- return null;
- diff --git a/S2Lobby/S2Lobby.csproj b/S2Lobby/S2Lobby.csproj
- index 9f8006e..16344cf 100644
- --- a/S2Lobby/S2Lobby.csproj
- +++ b/S2Lobby/S2Lobby.csproj
- @@ -48,6 +48,7 @@
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- + <Compile Include="Channels.cs" />
- <Compile Include="Accounts.cs" />
- <Compile Include="ChatProcessor.cs" />
- <Compile Include="Database.cs" />
- diff --git a/S2Lobby/ServerProcessor.cs b/S2Lobby/ServerProcessor.cs
- index 1690daf..bf9f027 100644
- --- a/S2Lobby/ServerProcessor.cs
- +++ b/S2Lobby/ServerProcessor.cs
- @@ -1,5 +1,6 @@
- using System.IO;
- using System.Text;
- +
- using S2Library.Protocol;
- namespace S2Lobby
- @@ -12,6 +13,7 @@ namespace S2Lobby
- protected Account Account;
- private byte[] _sharedSecret;
- + protected byte[] SessionKey;
- public ServerProcessor(Program program, uint connection) : base(program, connection)
- {
- @@ -26,7 +28,7 @@ namespace S2Lobby
- protected bool SendToLobbyConnection(uint connection, PayloadPrefix message)
- {
- - NetworkProcessor processor = Program.GetLobbyProcessor(connection);
- + LobbyProcessor processor = Program.GetLobbyProcessor(connection);
- if (processor == null)
- {
- return false;
- @@ -165,7 +167,7 @@ namespace S2Lobby
- {
- byte[] loginCipher = payload.Cipher;
- - byte[] result = Crypto.HandleUser(loginCipher, _sharedSecret);
- + byte[] result = Crypto.HandleCipher(loginCipher, _sharedSecret);
- Program.LogDebug($" User: {Serializer.DumpBytes(result)}");
- MemoryStream stream = new MemoryStream(result);
- @@ -249,7 +251,8 @@ namespace S2Lobby
- return;
- }
- - byte[] secret = Crypto.HandleSessionKey(Crypto.CreateSecretKey(), _sharedSecret);
- + SessionKey = Crypto.CreateSecretKey();
- + byte[] secret = Crypto.HandleSessionKey(SessionKey, _sharedSecret);
- LoginReplyCipher resultPayload2 = Payloads.CreatePayload<LoginReplyCipher>();
- resultPayload2.PermId = Account.Id;
- @@ -264,7 +267,7 @@ namespace S2Lobby
- {
- byte[] loginCipher = payload.Cipher;
- - byte[] result = Crypto.HandleUser(loginCipher, _sharedSecret);
- + byte[] result = Crypto.HandleCipher(loginCipher, _sharedSecret);
- Program.LogDebug($" User: {Serializer.DumpBytes(result)}");
- MemoryStream stream = new MemoryStream(result);
- @@ -331,7 +334,8 @@ namespace S2Lobby
- return;
- }
- - byte[] secret = Crypto.HandleSessionKey(Crypto.CreateSecretKey(), _sharedSecret);
- + SessionKey = Crypto.CreateSecretKey();
- + byte[] secret = Crypto.HandleSessionKey(SessionKey, _sharedSecret);
- LoginReplyCipher resultPayload = Payloads.CreatePayload<LoginReplyCipher>();
- resultPayload.PermId = Account.Id;
- @@ -346,7 +350,7 @@ namespace S2Lobby
- {
- byte[] loginCipher = payload.Cipher;
- - byte[] result = Crypto.HandleUser(loginCipher, _sharedSecret);
- + byte[] result = Crypto.HandleCipher(loginCipher, _sharedSecret);
- Program.LogDebug($" User: {Serializer.DumpBytes(result)}");
- MemoryStream stream = new MemoryStream(result);
- @@ -413,7 +417,8 @@ namespace S2Lobby
- return;
- }
- - byte[] secret = Crypto.HandleSessionKey(Crypto.CreateSecretKey(), _sharedSecret);
- + SessionKey = Crypto.CreateSecretKey();
- + byte[] secret = Crypto.HandleSessionKey(SessionKey, _sharedSecret);
- LoginReplyCipher resultPayload = Payloads.CreatePayload<LoginReplyCipher>();
- resultPayload.PermId = Account.Id;
- diff --git a/S2Lobby/Servers.cs b/S2Lobby/Servers.cs
- index 81d31d0..344b605 100644
- --- a/S2Lobby/Servers.cs
- +++ b/S2Lobby/Servers.cs
- @@ -92,5 +92,9 @@ namespace S2Lobby
- public bool Running;
- public bool LockedConfig;
- public byte[] Data;
- + public bool NeedsPassword;
- + public string Password;
- +
- + public ConcurrentDictionary<uint, uint> Players = new ConcurrentDictionary<uint, uint>();
- }
- }
- --
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement