Compare commits
7 Commits
main
...
developmen
| Author | SHA1 | Date | |
|---|---|---|---|
| 49a6c9665a | |||
| 7c8b7debca | |||
| 55a6fca1fd | |||
| 48daeb2f19 | |||
| edda4b873c | |||
| a050909375 | |||
| 24d9cdeafa |
@@ -11,7 +11,8 @@ public static class LoggerExtensions
|
||||
logger.Log(body, level, force);
|
||||
}
|
||||
|
||||
public static void LogWarning<T>(this ILogger logger, T caller, string message, bool force = false) => Log(logger, caller, message, ILogger.Level.Info, force);
|
||||
public static void LogWarning<T>(this ILogger logger, T caller, string message, bool force = false)
|
||||
=> Log(logger, caller, message, ILogger.Level.Info, force);
|
||||
|
||||
public static void LogError<T>(this ILogger logger, T caller, string message, bool force = false)
|
||||
{
|
||||
@@ -30,7 +31,11 @@ public static class LoggerExtensions
|
||||
}
|
||||
|
||||
public static void LogTrace<T>(this ILogger logger, T caller, StackTrace? stackTrace = null, bool force = false)
|
||||
=> Log(logger, caller, $"{nameof(StackTrace)}:{Environment.NewLine}{stackTrace ?? new()}", ILogger.Level.Trace, force);
|
||||
|
||||
public static void LogTrace<T>(this ILogger logger, T caller, string message, StackTrace? stackTrace = null, bool force = false)
|
||||
{
|
||||
Log(logger, caller, $"{nameof(StackTrace)}:{Environment.NewLine}{stackTrace ?? new()}", ILogger.Level.Trace, force);
|
||||
Log(logger, caller, message, ILogger.Level.Trace, force);
|
||||
LogTrace(logger, caller, stackTrace, force);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,8 +92,9 @@ public class LiteNetLibClient : LiteNetLibCommunicatorBase, INetworkCommunicator
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
Manager.PollEvents();
|
||||
Thread.Sleep(1);
|
||||
try { Manager.PollEvents(); }
|
||||
catch (Exception e) { logger?.LogException(this, e, force: true); }
|
||||
}
|
||||
}, cancellationToken);
|
||||
}
|
||||
|
||||
@@ -53,25 +53,10 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
|
||||
|
||||
public INetworkCommunicatorServer SendToClient<T>(IConnection connection, T packet, PacketDelivery packetDelivery) where T : class, new()
|
||||
{
|
||||
netDataWriter.Reset();
|
||||
|
||||
if (Manager.ConnectedPeerList.FirstOrDefault(p => p.Id.ToString().CompareTo(connection.Id) == 0) is not NetPeer netPeer)
|
||||
throw new($"Peer {connection} couldn't be found.");
|
||||
|
||||
if (packet is INetworkPacketEncrypted) // TODO performance improvements
|
||||
{
|
||||
netDataWriterEncrypted.Reset();
|
||||
netPacketProcessor.Write(netDataWriterEncrypted, packet);
|
||||
byte[] encryptedData = cryptor.Encrypt(netDataWriterEncrypted.CopyData());
|
||||
|
||||
netDataWriter.Put(true);
|
||||
netDataWriter.PutBytesWithLength(encryptedData);
|
||||
}
|
||||
else
|
||||
{
|
||||
netDataWriter.Put(false);
|
||||
netPacketProcessor.Write(netDataWriter, packet);
|
||||
}
|
||||
WritePacket(packet);
|
||||
|
||||
switch (packetDelivery)
|
||||
{
|
||||
@@ -87,25 +72,7 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
|
||||
|
||||
public INetworkCommunicatorServer SendToAll<T>(T packet, PacketDelivery packetDelivery) where T : class, new()
|
||||
{
|
||||
netDataWriter.Reset();
|
||||
netPacketProcessor.Write(netDataWriter, packet);
|
||||
|
||||
if (packet is INetworkPacketEncrypted)
|
||||
{
|
||||
netDataWriterEncrypted.Reset();
|
||||
|
||||
logger?.Log($"Encrypted Packet Sending");
|
||||
netPacketProcessor.Write(netDataWriterEncrypted, packet);
|
||||
byte[] encryptedData = cryptor.Encrypt(netDataWriterEncrypted.CopyData());
|
||||
netDataWriter.PutBytesWithLength(encryptedData);
|
||||
netDataWriter.Put(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
logger?.Log($"Regular Packet Sending");
|
||||
netPacketProcessor.Write(netDataWriter, packet);
|
||||
netDataWriter.Put(false);
|
||||
}
|
||||
WritePacket(packet);
|
||||
|
||||
switch (packetDelivery)
|
||||
{
|
||||
@@ -118,6 +85,25 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
|
||||
return this;
|
||||
}
|
||||
|
||||
private void WritePacket<T>(T packet) where T : class, new()
|
||||
{
|
||||
netDataWriter.Reset();
|
||||
netDataWriterEncrypted.Reset();
|
||||
|
||||
if (packet is INetworkPacketEncrypted)
|
||||
{
|
||||
netPacketProcessor.Write(netDataWriterEncrypted, packet);
|
||||
byte[] encryptedData = cryptor.Encrypt(netDataWriterEncrypted.CopyData());
|
||||
netDataWriter.Put(true);
|
||||
netDataWriter.PutBytesWithLength(encryptedData);
|
||||
}
|
||||
else
|
||||
{
|
||||
netDataWriter.Put(false);
|
||||
netPacketProcessor.Write(netDataWriter, packet);
|
||||
}
|
||||
}
|
||||
|
||||
private void PollEvents(IUniverse sender, IUniverse.UpdateArguments args) => Manager.PollEvents();
|
||||
|
||||
public override void EnterUniverse(IUniverse universe)
|
||||
|
||||
@@ -77,8 +77,8 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
|
||||
{
|
||||
if (entityDataPacket is IEntityNetworkPacket entityPacket)
|
||||
RoutePacket(sender, entityDataPacket, entityPacket);
|
||||
else
|
||||
BroadcastPacket(sender, entityDataPacket);
|
||||
|
||||
BroadcastPacket(sender, entityDataPacket);
|
||||
}
|
||||
|
||||
private void RoutePacket<T>(IConnection sender, T entityDataPacket, IEntityNetworkPacket entityPacket)
|
||||
|
||||
Reference in New Issue
Block a user