warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switches to Kestrel (#102)

Browse source
This commit is contained in:
Kamron Batman 2020-04-12 20:57:48 -07:00 • committed by GitHub
parent 70fddfebde
commit 2c0d97cd36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
141 changed files with 1040 additions and 1679 deletions
Download patch file Download diff file Expand all files Collapse all files

125
Projects/Server/Network/NetState.cs
View file

@ -19,7 +19,6 @@
***************************************************************************/
using System;
using System.Buffers;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
@ -91,7 +90,7 @@ namespace Server.Network
public class NetState : IComparable<NetState>
{
private string m_ToString;
private readonly string m_ToString;
private ClientVersion m_Version;
public DateTime ConnectedOn { get; }
@ -105,10 +104,11 @@ namespace Server.Network
public IPAddress Address { get; }
private static AsyncState m_PauseState = new AsyncState(true);
private static AsyncState m_ResumeState = new AsyncState(false);
private static readonly AsyncState m_PauseState = new AsyncState(true);
private static readonly AsyncState m_ResumeState = new AsyncState(false);
private static AsyncState m_AsyncState = m_ResumeState;
public static AsyncState AsyncState => m_AsyncState;
public IPacketEncoder PacketEncoder { get; set; }
@ -279,9 +279,6 @@ namespace Server.Network
public List<IMenu> Menus { get; private set; }
public PipeReader RecvPipe => Connection.Transport.Input;
public PipeWriter SendPipe => Connection.Transport.Output;
public static int GumpCap { get; set; } = 512;
public static int HuePickerCap { get; set; } = 512;
@ -399,11 +396,7 @@ namespace Server.Network
public override string ToString() => m_ToString;
public static List<NetState> Instances { get; } = new List<NetState>();
public void SetConnectionAlive() => m_NextCheckActivity = Core.TickCount + 60000;
public NetState(ConnectionContext connection, MessagePump pump)
public NetState(ConnectionContext connection)
{
Connection = connection;
Seeded = false;
@ -412,10 +405,6 @@ namespace Server.Network
Menus = new List<IMenu>();
Trades = new List<SecureTrade>();
SetConnectionAlive();
Instances.Add(this);
try
{
Address = Utility.Intern(((IPEndPoint)Connection.RemoteEndPoint).Address);
@ -429,11 +418,6 @@ namespace Server.Network
}
ConnectedOn = DateTime.UtcNow;
Console.WriteLine("Client: {0}: Connected. [{1} Online]", this, Instances.Count);
#pragma warning disable 4014
ProcessRecvs(pump);
#pragma warning restore 4014
CreatedCallback?.Invoke(this);
}
@ -448,7 +432,7 @@ namespace Server.Network
m_AsyncState = Interlocked.Exchange(ref m_AsyncState, m_ResumeState);
}
public virtual void Send(Packet p)
public virtual async void Send(Packet p)
{
if (Connection == null || BlockAllPackets)
{
@ -456,19 +440,29 @@ namespace Server.Network
return;
}
var outPipe = Connection.Transport.Output;
try
{
ReadOnlySpan<byte> buffer = p.Compile(CompressionEnabled, out int length);
//TODO: Rented memory
ReadOnlyMemory<byte> buffer = p.Compile(CompressionEnabled, out int length);
if (buffer.Length <= 0 || length <= 0)
{
p.OnSend();
return;
}
if (buffer.Length > 0 && length > 0)
try
{
FlushResult result = await outPipe.WriteAsync(buffer.Slice(0, length));
buffer.Slice(0, length).CopyTo(SendPipe.GetSpan(length));
SendPipe.Advance(length);
SendPipe.FlushAsync().GetAwaiter().GetResult();
if (result.IsCanceled || result.IsCompleted)
{
Dispose();
return;
}
}
catch
{
Dispose();
// ignored
}
p.OnSend();
}
@ -497,48 +491,10 @@ namespace Server.Network
return false;
}
private async Task ProcessRecvs(MessagePump pump)
{
while (true)
{
ReadResult result = await RecvPipe.ReadAsync();
ReadOnlySequence<byte> seq = result.Buffer;
if (seq.IsEmpty)
break;
SetConnectionAlive();
int pos = PacketHandlers.ProcessPacket(pump, this, seq);
if (pos <= 0)
break;
RecvPipe.AdvanceTo(seq.Slice(0, pos).End);
if (result.IsCompleted || result.IsCanceled)
break;
}
RecvPipe.Complete();
Dispose();
}
public PacketHandler GetHandler(int packetID) =>
ContainerGridLines ? PacketHandlers.Get6017Handler(packetID) :
PacketHandlers.GetHandler(packetID);
private long m_NextCheckActivity;
public void CheckAlive(long curTicks)
{
if (Connection == null || m_NextCheckActivity - curTicks >= 0)
return;
Console.WriteLine("Client: {0}: Disconnecting due to inactivity...", this);
Dispose();
}
public static void TraceException(Exception ex)
{
if (!Core.Debug)
@ -586,30 +542,7 @@ namespace Server.Network
m_Disposed.Enqueue(this);
}
public static void Initialize()
{
Timer.DelayCall(TimeSpan.FromMinutes(1.0), TimeSpan.FromMinutes(1.5), CheckAllAlive);
}
public static void CheckAllAlive()
{
try
{
long curTicks = Core.TickCount;
if (Instances.Count >= 1024)
Parallel.ForEach(Instances, ns => ns.CheckAlive(curTicks));
else
for (int i = 0; i < Instances.Count; ++i)
Instances[i].CheckAlive(curTicks);
}
catch (Exception ex)
{
TraceException(ex);
}
}
private static ConcurrentQueue<NetState> m_Disposed = new ConcurrentQueue<NetState>();
private static readonly ConcurrentQueue<NetState> m_Disposed = new ConcurrentQueue<NetState>();
public static void ProcessDisposedQueue()
{
@ -636,12 +569,10 @@ namespace Server.Network
ns.ServerInfo = null;
ns.CityInfo = null;
Instances.Remove(ns);
if (a != null)
ns.WriteConsole("Disconnected. [{0} Online] [{1}]", Instances.Count, a);
ns.WriteConsole("Disconnected. [{0} Online] [{1}]", TcpServer.Instances.Count, a);
else
ns.WriteConsole("Disconnected. [{0} Online]", Instances.Count);
ns.WriteConsole("Disconnected. [{0} Online]", TcpServer.Instances.Count);
}
}