etc/SmoOnlineServer
0
0
Fork 0
mirror of https://github.com/Sanae6/SmoOnlineServer.git synced 2024-11-22 03:05:16 +00:00
Code Issues Projects Releases Wiki Activity

Fixing variable packet sizes once and for all

Browse source
This commit is contained in:
Sanae 2022-03-11 23:42:51 -06:00
parent 93143a80ef
commit 3b13e1f86d
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Server/Server.cs
View file

@ -46,18 +46,19 @@ public class Server {
} }
catch (OperationCanceledException) { catch (OperationCanceledException) {
// ignore the exception, it's just for closing the server // ignore the exception, it's just for closing the server
}
Logger.Info("Server closing"); Logger.Info("Server closing");
try { try {
serverSocket.Shutdown(SocketShutdown.Both); serverSocket.Shutdown(SocketShutdown.Both);
} } catch {
finally { // ignored
serverSocket.Close(); } finally {
} serverSocket.Close();
}
Logger.Info("Server closed"); Logger.Info("Server closed");
}
} }
public static void FillPacket<T>(PacketHeader header, T packet, Memory<byte> memory) where T : struct, IPacket { public static void FillPacket<T>(PacketHeader header, T packet, Memory<byte> memory) where T : struct, IPacket {
@ -117,9 +118,8 @@ public class Server {
while (true) { while (true) {
memory = memoryPool.Rent(Constants.HeaderSize); memory = memoryPool.Rent(Constants.HeaderSize);
async Task<bool> Read(Memory<byte> readMem, int readSize = -1) { async Task<bool> Read(Memory<byte> readMem, int readSize, int readOffset) {
int readOffset = 0; readSize += readOffset;
if (readSize == -1) readSize = Constants.HeaderSize;
while (readOffset < readSize) { while (readOffset < readSize) {
int size = await socket.ReceiveAsync(readMem[readOffset..readSize], SocketFlags.None); int size = await socket.ReceiveAsync(readMem[readOffset..readSize], SocketFlags.None);
if (size == 0) { if (size == 0) {
@ -135,20 +135,21 @@ public class Server {
return true; return true;
} }
if (!await Read(memory.Memory[..Constants.HeaderSize])) if (!await Read(memory.Memory[..Constants.HeaderSize], Constants.HeaderSize, 0))
throw new Exception("Not enough bytes for packet header sent to server"); 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]);
{ Range packetRange = Constants.HeaderSize..(Constants.HeaderSize + header.PacketSize);
IMemoryOwner<byte> memTemp = memory; if (header.PacketSize > 0) {
IMemoryOwner<byte> memTemp = memory; // header to copy to new memory
memory = memoryPool.Rent(Constants.HeaderSize + header.PacketSize); memory = memoryPool.Rent(Constants.HeaderSize + header.PacketSize);
memTemp.Memory[..Constants.HeaderSize].CopyTo(memory.Memory[..Constants.HeaderSize]); memTemp.Memory.Span[..Constants.HeaderSize].CopyTo(memory.Memory.Span[..Constants.HeaderSize]);
memTemp.Dispose(); memTemp.Dispose();
Logger.Info("smth");
if (!await Read(memory.Memory, header.PacketSize, Constants.HeaderSize))
throw new Exception("Not enough bytes for packet data sent to server");
} }
if (header.PacketSize > 0
&& !await Read(memory.Memory[Constants.HeaderSize..(Constants.HeaderSize + header.PacketSize)], header.PacketSize))
throw new Exception("Not enough bytes for packet data sent to server");
Logger.Info($"Got your mom {header.Type}"); Logger.Info($"Got your mom {header.Id} {header.Type} 0x{header.PacketSize:X} 0x{memory.Memory.Length:X} 0x{header.Size:X}");
// connection initialization // connection initialization
if (first) { if (first) {
@ -156,7 +157,7 @@ public class Server {
if (header.Type != PacketType.Connect) throw new Exception($"First packet was not init, instead it was {header.Type}"); if (header.Type != PacketType.Connect) throw new Exception($"First packet was not init, instead it was {header.Type}");
ConnectPacket connect = new ConnectPacket(); ConnectPacket connect = new ConnectPacket();
connect.Deserialize(memory.Memory.Span[Constants.HeaderSize..(Constants.HeaderSize + header.PacketSize)]); connect.Deserialize(memory.Memory.Span[packetRange]);
lock (Clients) { lock (Clients) {
client.Name = connect.ClientName; client.Name = connect.ClientName;
bool firstConn = false; bool firstConn = false;
@ -266,7 +267,9 @@ public class Server {
Logger.Info($"Client {socket.RemoteEndPoint} ({client.Name}/{client.Id}) disconnected from the server"); Logger.Info($"Client {socket.RemoteEndPoint} ({client.Name}/{client.Id}) disconnected from the server");
Clients.Remove(client); Clients.Remove(client);
client.Dispose(); try {
client.Dispose();
} catch {/*lol*/}
Task.Run(() => Broadcast(new DisconnectPacket(), client)); Task.Run(() => Broadcast(new DisconnectPacket(), client));
} }