Fixed disconnect reasons not passed (fixes #717)

Author: Splamy

TS3AudioBot/Ts3Client.cs

@@ -579,6 +579,7 @@ private void TsFullClient_OnDisconnected(object sender, DisconnectEventArgs e)
 						e.ExitReason == Reason.KickedFromServer ? ReconnectType.Kick :
 						e.ExitReason == Reason.ServerShutdown || e.ExitReason == Reason.ServerStopped ? ReconnectType.ServerShutdown :
 						e.ExitReason == Reason.Banned ? ReconnectType.Ban :
+						e.ExitReason == Reason.SocketError ? ReconnectType.Error :
 						ReconnectType.None))
 					return;
 			}

TSLib/Full/PacketHandler.cs

@@ -65,7 +65,7 @@ internal sealed class PacketHandler<TIn, TOut>
 		private int closed; // bool
 
 		public PacketEvent<TIn> PacketEvent;
-		public Action<Reason> StopEvent;
+		public Action<Reason?> StopEvent;
 
 		public PacketHandler(TsCrypt ts3Crypt, Id id)
 		{
@@ -165,7 +165,8 @@ private void Initialize(IPEndPoint address, bool connect)
 			}
 		}
 
-		public void Stop(Reason closeReason = Reason.Timeout)
+		public void Stop() => Stop(null);
+		private void Stop(Reason? closeReason)
 		{
 			var wasClosed = Interlocked.Exchange(ref closed, 1);
 			if (wasClosed != 0)
@@ -345,7 +346,7 @@ private static void FetchPacketEvent(object selfObj, SocketAsyncEventArgs args)
 						Log.Debug("Socket error: {@args}", args);
 						if (args.SocketError == SocketError.ConnectionReset)
 						{
-							self.Stop();
+							self.Stop(Reason.SocketError);
 						}
 					}
 
@@ -672,7 +673,7 @@ private void ResendLoop()
 				}
 				if (close)
 				{
-					Stop();
+					Stop(Reason.Timeout);
 					return;
 				}
 
@@ -695,7 +696,7 @@ private void ResendLoop()
 				if (elapsed > PacketTimeout)
 				{
 					LogTimeout.Debug("TIMEOUT: Got no ping packet response for {0}", elapsed);
-					Stop();
+					Stop(Reason.Timeout);
 					return;
 				}
 			}

TSLib/Full/QuickerLz.cs

@@ -105,7 +105,7 @@ public static Span<byte> Compress(ReadOnlySpan<byte> data, int level)
 						}
 						else
 						{
-							Write24(dest, destPos, hash << 4 | (matchlen << 16));
+							Write24(destSpan, destPos, hash << 4 | (matchlen << 16));
 							destPos += 3;
 						}
 						sourcePos += matchlen;
@@ -262,28 +262,30 @@ private static void WriteHeader(Span<byte> dest, int srcLen, int level, int head
 		}
 
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		private static void Write24(byte[] outArr, int outOff, int value)
+		private static void Write24(Span<byte> outArr, int outOff, int value)
 		{
-			outArr[outOff + 0] = unchecked((byte)(value >> 00));
-			outArr[outOff + 1] = unchecked((byte)(value >> 08));
-			outArr[outOff + 2] = unchecked((byte)(value >> 16));
+			var sli3 = outArr.Slice(outOff, 3);
+			BinaryPrimitives.WriteUInt16LittleEndian(sli3, unchecked((ushort)value));
+			sli3[2] = unchecked((byte)(value >> 16));
 		}
 
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		private static int Read24(ReadOnlySpan<byte> intArr, int inOff)
-			=> unchecked(intArr[inOff] | (intArr[inOff + 1] << 8) | (intArr[inOff + 2] << 16));
+		{
+			var sli3 = intArr.Slice(inOff, 3);
+			return unchecked(BinaryPrimitives.ReadUInt16LittleEndian(sli3) | (sli3[2] << 16));
+		}
 
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		private static int Hash(int value) => ((value >> 12) ^ value) & 0xfff;
 
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		private static bool Is6Same(ReadOnlySpan<byte> arr)
 		{
-			return arr[0] == arr[1]
-				&& arr[1] == arr[2]
-				&& arr[2] == arr[3]
-				&& arr[3] == arr[4]
-				&& arr[4] == arr[5];
+			var sli6 = arr.Slice(0, 6);
+			var i0 = BinaryPrimitives.ReadUInt32LittleEndian(sli6);
+			var u1 = BinaryPrimitives.ReadUInt16LittleEndian(sli6.Slice(4));
+			return i0 == i0 >> 8 && unchecked((ushort)i0) == u1;
 		}
 
 		/// <summary>Copy <code>[start; start + length)</code> bytes from `data` to the end of `data`</summary>

TSLib/Full/TsFullClient.cs

@@ -97,7 +97,7 @@ public override void Connect(ConnectionData conData)
 
 				packetHandler = new PacketHandler<S2C, C2S>(tsCrypt, conData.LogId);
 				packetHandler.PacketEvent = (ref Packet<S2C> packet) => { PacketEvent(ctx, ref packet); };
-				packetHandler.StopEvent = (closeReason) => { ctx.ExitReason = closeReason; DisconnectInternal(ctx, setStatus: TsClientStatus.Disconnected); };
+				packetHandler.StopEvent = (closeReason) => { ctx.ExitReason = ctx.ExitReason ?? closeReason; DisconnectInternal(ctx, setStatus: TsClientStatus.Disconnected); };
 				packetHandler.Connect(remoteAddress);
 				dispatcher = new ExtraThreadEventDispatcher();
 				dispatcher.Init(InvokeEvent, conData.LogId);
@@ -284,7 +284,7 @@ partial void ProcessEachClientLeftView(ClientLeftView clientLeftView)
 		{
 			if (clientLeftView.ClientId == packetHandler.ClientId)
 			{
-				context.ExitReason = Reason.LeftServer;
+				context.ExitReason = clientLeftView.Reason;
 				DisconnectInternal(context, setStatus: TsClientStatus.Disconnected);
 			}
 		}

TSLib/TsEnums.cs

@@ -82,6 +82,8 @@ public enum Reason
 		ChannelUpdated,
 		ServerOrChannelEdited,
 		ServerShutdown,
+
+		SocketError = 1000,
 	}
 
 	public enum GroupWhisperType : byte