King_Tech/FastTunnel
King_Tech/FastTunnel
1
0
Fork 0
mirror of https://github.com/FastTunnel/FastTunnel.git synced 2025-02-08 10:59:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix NullReferenceException

Browse Source
This commit is contained in:
ioxygen 2021-07-29 14:40:47 +08:00
parent bd27741d05
commit b701438617
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
FastTunnel.Core/Server/Server.cs
View File

@ -146,31 +146,47 @@ namespace FastTunnel.Core.Server
{ {
Interlocked.Increment(ref m_numConnectedSockets); Interlocked.Increment(ref m_numConnectedSockets);
_logger.LogInformation($"[当前连接数]:{_localEndPoint.Port} | {m_numConnectedSockets}"); _logger.LogInformation($"[当前连接数]:{_localEndPoint.Port} | {m_numConnectedSockets}");
_logger.LogDebug($"leftPool: {m_readWritePool.Count}");
// Get the socket for the accepted client connection and put it into the try
// ReadEventArg object user token
SocketAsyncEventArgs readEventArgs = m_readWritePool.Pop();
var token = readEventArgs.UserToken as AsyncUserToken;
token.Socket = e.AcceptSocket;
token.MassgeTemp = null;
token.Recived = null;
// 客户端请求不需要分配msgid
if (m_isHttpServer)
{ {
token.RequestId = $"{DateTime.Now.GetChinaTicks()}_{Guid.NewGuid().ToString().Replace("-", string.Empty)}"; // Get the socket for the accepted client connection and put it into the
_logger.LogDebug($"Accept {token.RequestId}"); // ReadEventArg object user token
} SocketAsyncEventArgs readEventArgs = m_readWritePool.Pop();
if (readEventArgs == null)
{
_logger.LogCritical($"Pop result is Null {m_readWritePool.Count}");
release(e);
return;
}
// As soon as the client is connected, post a receive to the connection var token = readEventArgs.UserToken as AsyncUserToken;
bool willRaiseEvent = e.AcceptSocket.ReceiveAsync(readEventArgs); token.Socket = e.AcceptSocket;
if (!willRaiseEvent) token.MassgeTemp = null;
token.Recived = null;
// 客户端请求不需要分配msgid
if (m_isHttpServer)
{
token.RequestId = $"{DateTime.Now.GetChinaTicks()}_{Guid.NewGuid().ToString().Replace("-", string.Empty)}";
_logger.LogDebug($"Accept {token.RequestId}");
}
// As soon as the client is connected, post a receive to the connection
bool willRaiseEvent = e.AcceptSocket.ReceiveAsync(readEventArgs);
if (!willRaiseEvent)
{
ProcessReceive(readEventArgs);
}
// Accept the next connection request
StartAccept(e);
}
catch (Exception ex)
{ {
ProcessReceive(readEventArgs); _logger.LogCritical(ex, "[ProcessAccept error]");
release(e);
} }
// Accept the next connection request
StartAccept(e);
} }
// This method is called whenever a receive or send operation is completed on a socket // This method is called whenever a receive or send operation is completed on a socket
@ -318,6 +334,8 @@ namespace FastTunnel.Core.Server
m_readWritePool.Push(e); m_readWritePool.Push(e);
m_maxNumberAcceptedClients.Release(); m_maxNumberAcceptedClients.Release();
_logger.LogDebug($"release ok");
} }
} }
} }