Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add OnError for SocketException #43

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add OnError for SocketException #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c10505c
KcpConnection.SendReliable: added OnError instead of logs
May 13, 2022
926af1c
Add OnError for SocketException
imerr Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions kcp2k/Assets/Tests/Editor/ClientServerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ public void ClientToServerTooLargeReliableMessage()
byte[] message = new byte[KcpConnection.ReliableMaxMessageSize(ReceiveWindowSize) + 1];

#if UNITY_2018_3_OR_NEWER
UnityEngine.TestTools.LogAssert.Expect(UnityEngine.LogType.Error, new Regex($".*Failed to send reliable message of size {message.Length} because it's larger than ReliableMaxMessageSize={KcpConnection.ReliableMaxMessageSize(ReceiveWindowSize)}"));
UnityEngine.TestTools.LogAssert.Expect(UnityEngine.LogType.Warning, new Regex($".*Failed to send reliable message of size {message.Length} because it's larger than ReliableMaxMessageSize={KcpConnection.ReliableMaxMessageSize(ReceiveWindowSize)}"));
#endif
SendClientToServerBlocking(new ArraySegment<byte>(message), KcpChannel.Reliable);
Assert.That(serverReceived.Count, Is.EqualTo(0));
Expand Down Expand Up @@ -660,7 +660,7 @@ public void ServerToClientTooLargeReliableMessage()

byte[] message = new byte[KcpConnection.ReliableMaxMessageSize(ReceiveWindowSize) + 1];
#if UNITY_2018_3_OR_NEWER
UnityEngine.TestTools.LogAssert.Expect(UnityEngine.LogType.Error, new Regex($".*Failed to send reliable message of size {message.Length} because it's larger than ReliableMaxMessageSize={KcpConnection.ReliableMaxMessageSize(ReceiveWindowSize)}"));
UnityEngine.TestTools.LogAssert.Expect(UnityEngine.LogType.Warning, new Regex($".*Failed to send reliable message of size {message.Length} because it's larger than ReliableMaxMessageSize={KcpConnection.ReliableMaxMessageSize(ReceiveWindowSize)}"));
#endif
SendServerToClientBlocking(connectionId, new ArraySegment<byte>(message), KcpChannel.Reliable);
Assert.That(clientReceived.Count, Is.EqualTo(0));
Expand All @@ -677,7 +677,7 @@ public void ServerToClientTooLargeUnreliableMessage()
byte[] message = new byte[KcpConnection.UnreliableMaxMessageSize + 1];

#if UNITY_2018_3_OR_NEWER
UnityEngine.TestTools.LogAssert.Expect(UnityEngine.LogType.Error, new Regex($".*Failed to send unreliable message of size {message.Length} because it's larger than UnreliableMaxMessageSize={KcpConnection.UnreliableMaxMessageSize}"));
UnityEngine.TestTools.LogAssert.Expect(UnityEngine.LogType.Warning, new Regex($".*Failed to send unreliable message of size {message.Length} because it's larger than UnreliableMaxMessageSize={KcpConnection.UnreliableMaxMessageSize}"));
#endif
SendServerToClientBlocking(connectionId, new ArraySegment<byte>(message), KcpChannel.Unreliable);
Assert.That(clientReceived.Count, Is.EqualTo(0));
Expand Down
5 changes: 1 addition & 4 deletions kcp2k/Assets/kcp2k/highlevel/KcpClientConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,7 @@ public void RawReceive()
// this is fine, the socket might have been closed in the other end
catch (SocketException ex)
{
// the other end closing the connection is not an 'error'.
// but connections should never just end silently.
// at least log a message for easier debugging.
Log.Info($"KCP ClientConnection: looks like the other end has closed the connection. This is fine: {ex}");
OnError(ErrorCode.ConnectionClosed, $"KCP ClientConnection: looks like the other end has closed the connection. This is fine: {ex}");
Disconnect();
}
}
Expand Down
6 changes: 3 additions & 3 deletions kcp2k/Assets/kcp2k/highlevel/KcpConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,12 +578,12 @@ void SendReliable(KcpHeader header, ArraySegment<byte> content)
if (sent < 0)
{
// GetType() shows Server/ClientConn instead of just Connection.
Log.Warning($"{GetType()}: Send failed with error={sent} for content with length={content.Count}");
OnError(ErrorCode.InvalidSend, $"{GetType()}: Send failed with error={sent} for content with length={content.Count}");
}
}
// otherwise content is larger than MaxMessageSize. let user know!
// GetType() shows Server/ClientConn instead of just Connection.
else Log.Error($"{GetType()}: Failed to send reliable message of size {content.Count} because it's larger than ReliableMaxMessageSize={ReliableMaxMessageSize(kcp.rcv_wnd)}");
// GetType() shows Server/ClientConn instead of just Connection.
else OnError(ErrorCode.InvalidSend, $"{GetType()}: Failed to send reliable message of size {content.Count} because it's larger than ReliableMaxMessageSize={ReliableMaxMessageSize(kcp.rcv_wnd)}");
}

void SendUnreliable(ArraySegment<byte> message)
Expand Down