Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed not checking for sync on socket.

Browse Source
This commit is contained in:
hondacrx
2017-10-29 10:02:32 -04:00
parent 19d27aa6f1
commit c0431f8a17
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Networking/SocketBase.cs
+10 -9
View File
@@ -61,11 +61,12 @@ namespace Framework.Networking
socketEventargs.SetBuffer(_receiveBuffer, 0, _receiveBuffer.Length);
socketEventargs.Completed += ReadHandlerInternal;
socketEventargs.UserToken = _socket;
socketEventargs.Completed += (sender, args) => ReadHandlerInternal(args);
socketEventargs.SocketFlags = SocketFlags.None;
socketEventargs.RemoteEndPoint = _socket.RemoteEndPoint;
_socket.ReceiveAsync(socketEventargs);
if (!_socket.ReceiveAsync(socketEventargs))
ReadHandlerInternal(socketEventargs);
}
catch (Exception ex)
{
@@ -73,7 +74,7 @@ namespace Framework.Networking
}
}
public delegate void SocketReadCallback(object sender, SocketAsyncEventArgs args);
public delegate void SocketReadCallback(SocketAsyncEventArgs args);
public void AsyncReadWithCallback(SocketReadCallback callback)
{
if (!IsOpen())
@@ -85,11 +86,11 @@ namespace Framework.Networking
socketEventargs.SetBuffer(_receiveBuffer, 0, _receiveBuffer.Length);
socketEventargs.Completed += new EventHandler<SocketAsyncEventArgs>(callback);
socketEventargs.Completed += (sender, args) => callback(args);
socketEventargs.UserToken = _socket;
socketEventargs.SocketFlags = SocketFlags.None;
_socket.ReceiveAsync(socketEventargs);
if (!_socket.ReceiveAsync(socketEventargs))
callback(socketEventargs);
}
catch (Exception ex)
{
@@ -97,9 +98,8 @@ namespace Framework.Networking
}
}
void ReadHandlerInternal(object sender, SocketAsyncEventArgs args)
void ReadHandlerInternal(SocketAsyncEventArgs args)
{
args.Completed -= ReadHandlerInternal;
if (args.SocketError != SocketError.Success)
{
CloseSocket();
@@ -126,6 +126,7 @@ namespace Framework.Networking
socketEventargs.SetBuffer(data, 0, data.Length);
socketEventargs.Completed += WriteHandlerInternal;
socketEventargs.RemoteEndPoint = _socket.RemoteEndPoint;
socketEventargs.UserToken = _socket;
socketEventargs.SocketFlags = SocketFlags.None;
_socket.SendAsync(socketEventargs);
Source/Game/Network/WorldSocket.cs
+1 -2
View File
@@ -84,9 +84,8 @@ namespace Game.Network
AsyncReadWithCallback(InitializeHandler);
}
public void InitializeHandler(object sender, SocketAsyncEventArgs args)
public void InitializeHandler(SocketAsyncEventArgs args)
{
args.Completed -= InitializeHandler;
if (args.SocketError != SocketError.Success)
{
CloseSocket();