etc/SmoOnlineServer
0
0
Fork 0
mirror of https://github.com/Sanae6/SmoOnlineServer.git synced 2024-11-25 12:45:18 +00:00
Code Issues Projects Releases Wiki Activity

More log changes

Browse source
This commit is contained in:
Sanae 2022-03-11 20:16:10 -06:00
parent 4c5682e59b
commit ebf5080a00
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Server/Server.cs
View file

@ -138,17 +138,18 @@ public class Server {
return true; return true;
} }
if (!await Read(memory.Memory[..Constants.HeaderSize])) break; if (!await Read(memory.Memory[..Constants.HeaderSize]))
throw new Exception("Not enough bytes for packet header sent to server");
PacketHeader header = GetHeader(memory.Memory.Span[..Constants.HeaderSize]); PacketHeader header = GetHeader(memory.Memory.Span[..Constants.HeaderSize]);
{ {
IMemoryOwner<byte> memTemp = memory; IMemoryOwner<byte> memTemp = memory;
memory = memoryPool.Rent(Constants.HeaderSize + header.PacketSize); memory = memoryPool.Rent(Constants.HeaderSize + header.PacketSize);
memTemp.Memory.CopyTo(memory.Memory); memTemp.Memory[..Constants.HeaderSize].CopyTo(memory.Memory[..Constants.HeaderSize]);
memTemp.Dispose(); memTemp.Dispose();
} }
if (header.PacketSize > 0 if (header.PacketSize > 0
&& !await Read(memory.Memory[Constants.HeaderSize..(Constants.HeaderSize + header.PacketSize)], header.PacketSize)) && !await Read(memory.Memory[Constants.HeaderSize..(Constants.HeaderSize + header.PacketSize)], header.PacketSize))
break; throw new Exception("Not enough bytes for packet data sent to server");
// connection initialization // connection initialization
if (first) { if (first) {
@ -255,14 +256,15 @@ public class Server {
} }
catch (Exception e) { catch (Exception e) {
if (e is SocketException {SocketErrorCode: SocketError.ConnectionReset}) { if (e is SocketException {SocketErrorCode: SocketError.ConnectionReset}) {
client.Logger.Info($"Client {socket.RemoteEndPoint} ({client.Id}) disconnected from the server"); client.Logger.Info($"Disconnected from the server: Connection reset");
} else { } else {
client.Logger.Error($"Exception on socket {socket.RemoteEndPoint} ({client.Id}) and disconnecting for: {e}"); client.Logger.Error($"Disconnecting due to exception: {e}");
if (socket.Connected) Task.Run(() => socket.DisconnectAsync(false)); if (socket.Connected) Task.Run(() => socket.DisconnectAsync(false));
} }
memory?.Dispose(); memory?.Dispose();
} }
Logger.Info($"Client {socket.RemoteEndPoint} ({client.Name}/{client.Id}) disconnected from the server");
Clients.Remove(client); Clients.Remove(client);
client.Dispose(); client.Dispose();