From a784f9ae0125d80ed0375f37d1079f41369e0620 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Tue, 20 Mar 2018 10:15:52 +0100 Subject: [PATCH] Add UDP to default SteamProtocols --- ArchiSteamFarm/GlobalConfig.cs | 19 +++++++++++++------ ArchiSteamFarm/config/ASF.json | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ArchiSteamFarm/GlobalConfig.cs b/ArchiSteamFarm/GlobalConfig.cs index edcca2566..59fd6e4c9 100644 --- a/ArchiSteamFarm/GlobalConfig.cs +++ b/ArchiSteamFarm/GlobalConfig.cs @@ -36,6 +36,8 @@ namespace ArchiSteamFarm { internal const ushort DefaultIPCPort = 1242; internal const byte DefaultLoginLimiterDelay = 10; + private const ProtocolTypes DefaultSteamProtocols = ProtocolTypes.Tcp | ProtocolTypes.Udp; + internal static readonly HashSet SalesBlacklist = new HashSet { 267420, 303700, 335590, 368020, 425280, 480730, 566020, 639900, 762800 }; // Steam Summer/Winter sales private static readonly SemaphoreSlim WriteSemaphore = new SemaphoreSlim(1, 1); @@ -110,7 +112,7 @@ namespace ArchiSteamFarm { internal ulong SteamOwnerID { get; private set; } [JsonProperty(Required = Required.DisallowNull)] - internal ProtocolTypes SteamProtocols { get; private set; } = ProtocolTypes.Tcp; + internal ProtocolTypes SteamProtocols { get; private set; } = DefaultSteamProtocols; [JsonProperty(PropertyName = SharedInfo.UlongCompatibilityStringPrefix + nameof(SteamOwnerID), Required = Required.DisallowNull)] private string SSteamOwnerID { @@ -151,8 +153,8 @@ namespace ArchiSteamFarm { // User might not know what he's doing // Ensure that he can't screw core ASF variables - if (globalConfig.MaxFarmingTime == 0) { - ASF.ArchiLogger.LogGenericError(string.Format(Strings.ErrorConfigPropertyInvalid, nameof(globalConfig.MaxFarmingTime), globalConfig.MaxFarmingTime)); + if (globalConfig.ConnectionTimeout == 0) { + ASF.ArchiLogger.LogGenericError(string.Format(Strings.ErrorConfigPropertyInvalid, nameof(globalConfig.ConnectionTimeout), globalConfig.ConnectionTimeout)); return null; } @@ -161,15 +163,20 @@ namespace ArchiSteamFarm { return null; } - if (globalConfig.ConnectionTimeout == 0) { - ASF.ArchiLogger.LogGenericError(string.Format(Strings.ErrorConfigPropertyInvalid, nameof(globalConfig.ConnectionTimeout), globalConfig.ConnectionTimeout)); + if (globalConfig.MaxFarmingTime == 0) { + ASF.ArchiLogger.LogGenericError(string.Format(Strings.ErrorConfigPropertyInvalid, nameof(globalConfig.MaxFarmingTime), globalConfig.MaxFarmingTime)); + return null; + } + + if (globalConfig.SteamProtocols == 0) { + ASF.ArchiLogger.LogGenericError(string.Format(Strings.ErrorConfigPropertyInvalid, nameof(globalConfig.SteamProtocols), globalConfig.SteamProtocols)); return null; } if (globalConfig.SteamProtocols.HasFlag(ProtocolTypes.WebSocket) && !OS.SupportsWebSockets()) { globalConfig.SteamProtocols &= ~ProtocolTypes.WebSocket; if (globalConfig.SteamProtocols == 0) { - globalConfig.SteamProtocols = ProtocolTypes.Tcp; + globalConfig.SteamProtocols = DefaultSteamProtocols; } } diff --git a/ArchiSteamFarm/config/ASF.json b/ArchiSteamFarm/config/ASF.json index 23d26c1d3..13451d54a 100644 --- a/ArchiSteamFarm/config/ASF.json +++ b/ArchiSteamFarm/config/ASF.json @@ -22,7 +22,7 @@ "OptimizationMode": 0, "Statistics": true, "SteamOwnerID": 0, - "SteamProtocols": 1, + "SteamProtocols": 3, "UpdateChannel": 1, "UpdatePeriod": 24 } \ No newline at end of file