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

deleted localization files as they're now generated during release

Browse Source 
reintroduce throttling for servers that are unreachable (defaults to 60 seconds between polls)
small revert to the RektT5M parser contell -> tell
add migration to introduce gamename to server
impllement quickmessage mapping
This commit is contained in:
RaidMax
2019-04-23 17:27:20 -05:00
parent 0711249a46
commit 03ae3b5822
22 changed files with 833 additions and 1118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SharedLibraryCore/RCon/Connection.cs
View File

@ -120,7 +120,7 @@ namespace SharedLibraryCore.RCon
retrySend:
using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
{
//DontFragment = true,
DontFragment = true,
Ttl = 100,
ExclusiveAddressUse = true,
})
@ -138,7 +138,7 @@ namespace SharedLibraryCore.RCon
if (response.Length == 0 && waitForResponse)
{
throw new Exception();
throw new NetworkException("Expected response but got 0 bytes back");
}
connectionState.OnComplete.Release(1);
@ -149,18 +149,16 @@ namespace SharedLibraryCore.RCon
{
if (connectionState.ConnectionAttempts < StaticHelpers.AllowedConnectionFails)
{
// Log.WriteWarning($"{Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMUNICATION"]} [{this.Endpoint}] ({connectionState.ConnectionAttempts}/{StaticHelpers.AllowedConnectionFails})");
await Task.Delay(StaticHelpers.FloodProtectionInterval);
goto retrySend;
}
connectionState.OnComplete.Release(1);
//Log.WriteDebug(ex.GetExceptionInfo());
throw new NetworkException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMUNICATION"].FormatExt(Endpoint));
}
}
string responseString = Encoding.GetEncoding("windows-1252").GetString(response, 0, response.Length) + '\n';
string responseString = defaultEncoding.GetString(response, 0, response.Length) + '\n';
if (responseString.Contains("Invalid password"))
{
@ -229,6 +227,8 @@ namespace SharedLibraryCore.RCon
}
}
rconSocket.Close();
byte[] response = connectionState.ReceiveBuffer
.Take(connectionState.ReceiveEventArgs.BytesTransferred)
.ToArray();