diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj index 4ab59e11..7733eccb 100644 --- a/src/ARKServerManager/ARKServerManager.csproj +++ b/src/ARKServerManager/ARKServerManager.csproj @@ -374,6 +374,9 @@ Always + + Always + diff --git a/src/ARKServerManager/GameData/Fjordur.gamedata b/src/ARKServerManager/GameData/Fjordur.gamedata new file mode 100644 index 00000000..64558200 --- /dev/null +++ b/src/ARKServerManager/GameData/Fjordur.gamedata @@ -0,0 +1,13 @@ +{ + "Application": "ark", + "Version": "1.0.0", + "Created": "2022-06-12T00:00:00.0000000Z", + "GameMaps": [ + { + "IsSotF": false, + "ClassName": "Fjordur", + "Description": "Fjordur", + "Mod": "Fjordur" + } + ] +} \ No newline at end of file diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 565c06a3..9170af65 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -7,6 +7,34 @@ 2022-05-21T00:00:00Z + + urn:uuid:727E9DFF-08EA-4600-B75B-31DF15083056 + 1.1.430 (1.1.430.1) + 1.1.430.1 + + 2022-06-13T00:00:00Z + +
+

+ NEW +
+

    +
  • Gamedata files - new file for Fjordur map.
    • +
+ CHANGE +
+
    +
  • Updated querymaster to use the defined timeouts.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + + urn:uuid:D0681B47-5715-473E-99D3-63F475A997C4 1.1.429 (1.1.429.5) diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index e6a41bd8..c0b89acd 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -8,113 +8,23 @@ 2022-05-21T00:00:00Z - urn:uuid:C3F997CA-7A24-4679-9FA8-F458A351C64D - 1.1.429 (1.1.429.5) - 1.1.429.5 + urn:uuid:727E9DFF-08EA-4600-B75B-31DF15083056 + 1.1.430 (1.1.430.1) + 1.1.430.1 - 2022-05-21T00:00:00Z - -
-

- CHANGE -
-

    -
  • Added option to remove the -log settings from the command line.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:BA7B98BC-F986-4D46-A4C1-264D781798EC - 1.1.429 (1.1.429.4) - 1.1.429.4 - - 2022-05-19T00:00:00Z - -
-

- CHANGE -
-

    -
  • Server Monitor - refined the bulk server processing.
    • -
  • Server Monitor - added sequential server processing.
    • -
  • Server Monitor - added process cancelation button.
    • -
  • Server Shutdown - added a retry when sending RCON commands that fail.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:BA7B98BC-F986-4D46-A4C1-264D781798EC - 1.1.429 (1.1.429.3) - 1.1.429.3 - - 2022-05-18T00:00:00Z + 2022-06-13T00:00:00Z

NEW

    -
  • Server Monitor - added new functionality to bulk start, restart, stop, shutdown, update and backup your servers.
    • +
  • Gamedata files - new file for Fjordur map.
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:661C8C8B-B1DC-4368-95E7-A9C29C274B5B - 1.1.429 (1.1.429.2) - 1.1.429.2 - - 2022-05-18T00:00:00Z - -
-

CHANGE

    -
  • Backup Interval Changes - The backup interval has been changed to use the value in the global settings, when auto-backup is enabled or not.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:D0681B47-5715-473E-99D3-63F475A997C4 - 1.1.429 (1.1.429.1) - 1.1.429.1 - - 2022-05-18T00:00:00Z - -
-

- CHANGE -
-

    -
  • World Save Zipping - have changed the way the zip file is created. All files are now added to the zip in one pass, rather than as separate files.
    • +
  • Updated querymaster to use the defined timeouts.

diff --git a/src/QueryMaster/RconSource.cs b/src/QueryMaster/RconSource.cs index bcfb974f..fe198aca 100644 --- a/src/QueryMaster/RconSource.cs +++ b/src/QueryMaster/RconSource.cs @@ -9,14 +9,14 @@ namespace QueryMaster class RconSource : Rcon { internal TcpQuery socket; - private RconSource(IPEndPoint address) + private RconSource(IPEndPoint address, int sendTimeOut, int receiveTimeOut) { - socket = new TcpQuery(address, 3000, 3000); + socket = new TcpQuery(address, sendTimeOut, receiveTimeOut); } - internal static Rcon Authorize(IPEndPoint address, string msg) + internal static Rcon Authorize(IPEndPoint address, string msg, int sendTimeOut, int receiveTimeOut) { - RconSource obj = new RconSource(address); + RconSource obj = new RconSource(address, sendTimeOut, receiveTimeOut); byte[] recvData = new byte[50]; RconSrcPacket packet = new RconSrcPacket() { Body = msg, Id = (int)PacketId.ExecCmd, Type = (int)PacketType.Auth }; recvData = obj.socket.GetResponse(RconUtil.GetBytes(packet)); diff --git a/src/QueryMaster/Source.cs b/src/QueryMaster/Source.cs index f6515f0b..1d33d295 100644 --- a/src/QueryMaster/Source.cs +++ b/src/QueryMaster/Source.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Net; +using System.Net; namespace QueryMaster { @@ -11,7 +7,7 @@ namespace QueryMaster internal Source(IPEndPoint address, int sendTimeOut, int receiveTimeOut) : base(address, EngineType.Source, false, sendTimeOut, receiveTimeOut) { } public override Rcon GetControl(string pass) { - RConObj = RconSource.Authorize(socket.Address, pass); + RConObj = RconSource.Authorize(socket.Address, pass, socket.socket.SendTimeout, socket.socket.ReceiveTimeout); return RConObj; } }