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

Improve packet processing and send function

Browse source
This commit is contained in:
Sanae 2022-02-16 14:33:21 -06:00
parent 514c68d2e9
commit 18bd69338f
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Server/Client.cs
View file

@ -39,6 +39,8 @@ public class Client : IDisposable {
Type = Constants.PacketMap[typeof(T)].Type Type = Constants.PacketMap[typeof(T)].Type
}; };
Server.FillPacket(header, packet, memory.Memory); Server.FillPacket(header, packet, memory.Memory);
await Send(memory.Memory, sender);
memory.Dispose();
} }
public async Task Send(ReadOnlyMemory<byte> data, Client? sender) { public async Task Send(ReadOnlyMemory<byte> data, Client? sender) {

16
Server/Server.cs
View file

@ -25,6 +25,7 @@ public class Server {
while (true) { while (true) {
Socket socket = await serverSocket.AcceptAsync(); Socket socket = await serverSocket.AcceptAsync();
socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.NoDelay, true);
Logger.Warn($"Accepted connection for client {socket.RemoteEndPoint}"); Logger.Warn($"Accepted connection for client {socket.RemoteEndPoint}");
@ -50,6 +51,12 @@ public class Server {
} }
// broadcast packets to all clients // broadcast packets to all clients
public delegate void PacketReplacer<in T>(Client from, Client to, T value); // replacer must send
public async Task BroadcastReplace<T>(T packet, Client sender, PacketReplacer<T> packetReplacer) where T : struct, IPacket {
foreach (Client client in Clients.Where(client => sender.Id != client.Id)) {
packetReplacer(sender, client, packet);
}
}
public async Task Broadcast<T>(T packet, Client sender) where T : struct, IPacket { public async Task Broadcast<T>(T packet, Client sender) where T : struct, IPacket {
IMemoryOwner<byte> memory = memoryPool.Rent(Constants.MaxPacketSize); IMemoryOwner<byte> memory = memoryPool.Rent(Constants.MaxPacketSize);
@ -110,7 +117,7 @@ public class Server {
} }
PacketHeader header = GetHeader(memory.Memory.Span[..Constants.MaxPacketSize]); PacketHeader header = GetHeader(memory.Memory.Span[..Constants.MaxPacketSize]);
//Logger.Info($"first = {first}, type = {header.Type}, data = " + memory.Memory.Span[..size].Hex());
// connection initialization // connection initialization
if (first) { if (first) {
first = false; first = false;
@ -184,7 +191,7 @@ public class Server {
}); });
Logger.Info($"Client {client.Name} ({client.Id}/{socket.RemoteEndPoint}) connected."); Logger.Info($"Client {client.Name} ({client.Id}/{socket.RemoteEndPoint}) connected.");
} } else if (header.Id != client.Id && client.Id != Guid.Empty) throw new Exception($"Client {client.Name} sent packet with invalid client id {header.Id} instead of {client.Id}");
if (header.Type == PacketType.Costume) { if (header.Type == PacketType.Costume) {
CostumePacket costumePacket = new CostumePacket { CostumePacket costumePacket = new CostumePacket {
@ -198,7 +205,10 @@ public class Server {
// if (header.Type is not PacketType.Cap and not PacketType.Player) client.Logger.Warn($"lol {header.Type}"); // if (header.Type is not PacketType.Cap and not PacketType.Player) client.Logger.Warn($"lol {header.Type}");
IPacket packet = (IPacket) Activator.CreateInstance(Constants.PacketIdMap[header.Type])!; IPacket packet = (IPacket) Activator.CreateInstance(Constants.PacketIdMap[header.Type])!;
packet.Deserialize(memory.Memory.Span[Constants.HeaderSize..]); packet.Deserialize(memory.Memory.Span[Constants.HeaderSize..]);
if (PacketHandler?.Invoke(client, packet) is false) continue; if (PacketHandler?.Invoke(client, packet) is false) {
memory.Dispose();
continue;
}
} catch (Exception e){ } catch (Exception e){
client.Logger.Error($"Packet handler warning: {e}"); client.Logger.Error($"Packet handler warning: {e}");
} }