Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

update to cod rcon parser for windows socket quirk with UDP WSAECONNRESET

Browse Source
This commit is contained in:
RaidMax 2023-04-21 20:43:33 -05:00
parent 123d84088f
commit 9b56ff520f
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Integrations/Cod/CodRConConnection.cs
View File

@ -125,7 +125,7 @@ namespace Integrations.Cod
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
_log.LogDebug("Waiting for flood protect did not complete before timeout timeout {Count}", _log.LogDebug("Waiting for flood protect did not complete before timeout {Count}",
connectionState.OnComplete.CurrentCount); connectionState.OnComplete.CurrentCount);
throw new RConException("Timed out waiting for flood protect to expire", true); throw new RConException("Timed out waiting for flood protect to expire", true);
} }
@ -375,8 +375,18 @@ namespace Integrations.Cod
private async Task ReceiveAndStoreSocketData(Socket rconSocket, CancellationToken token, private async Task ReceiveAndStoreSocketData(Socket rconSocket, CancellationToken token,
ConnectionState connectionState) ConnectionState connectionState)
{ {
var result = await rconSocket.ReceiveFromAsync(connectionState.ReceiveBuffer, SocketReceiveFromResult result;
try
{
result = await rconSocket.ReceiveFromAsync(connectionState.ReceiveBuffer,
SocketFlags.None, Endpoint, token); SocketFlags.None, Endpoint, token);
}
// windows quirk that occurs when remote server returns ICMP port unreachable
catch (SocketException ex) when (ex.SocketErrorCode == SocketError.ConnectionReset)
{
await Task.Delay(Timeout.Infinite, token);
return;
}
if (result.ReceivedBytes == 0) if (result.ReceivedBytes == 0)
{ {