diff --git a/src/Plugin.Discord/Config.Designer.cs b/src/Plugin.Discord/Config.Designer.cs
index fc944820..c7915f06 100644
--- a/src/Plugin.Discord/Config.Designer.cs
+++ b/src/Plugin.Discord/Config.Designer.cs
@@ -12,7 +12,7 @@ namespace ServerManagerTool.Plugin.Discord {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")]
internal sealed partial class Config : global::System.Configuration.ApplicationSettingsBase {
private static Config defaultInstance = ((Config)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Config())));
@@ -32,15 +32,6 @@ namespace ServerManagerTool.Plugin.Discord {
}
}
- [global::System.Configuration.ApplicationScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("http://whatismyip.akamai.com/")]
- public string PublicIPCheckUrl {
- get {
- return ((string)(this["PublicIPCheckUrl"]));
- }
- }
-
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("12")]
@@ -154,5 +145,23 @@ namespace ServerManagerTool.Plugin.Discord {
return ((string)(this["VersionBetaFeedUrl"]));
}
}
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("https://api.ipify.org")]
+ public string PublicIPCheckUrl1 {
+ get {
+ return ((string)(this["PublicIPCheckUrl1"]));
+ }
+ }
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://whatismyip.akamai.com/")]
+ public string PublicIPCheckUrl2 {
+ get {
+ return ((string)(this["PublicIPCheckUrl2"]));
+ }
+ }
}
}
diff --git a/src/Plugin.Discord/Config.settings b/src/Plugin.Discord/Config.settings
index e95f2570..3548315e 100644
--- a/src/Plugin.Discord/Config.settings
+++ b/src/Plugin.Discord/Config.settings
@@ -5,9 +5,6 @@
http://servermanager.azurewebsites.net/api/plugin/call/{0}/{1}/
-
- http://whatismyip.akamai.com/
-
12
@@ -44,5 +41,11 @@
https://raw.githubusercontent.com/Bletch1971/ServerManagers/master/Plugins/Discord/beta/VersionFeed.xml
+
+ https://api.ipify.org
+
+
+ http://whatismyip.akamai.com/
+
\ No newline at end of file
diff --git a/src/Plugin.Discord/Utils/NetworkUtils.cs b/src/Plugin.Discord/Utils/NetworkUtils.cs
index 0590e7d4..05acefcd 100644
--- a/src/Plugin.Discord/Utils/NetworkUtils.cs
+++ b/src/Plugin.Discord/Utils/NetworkUtils.cs
@@ -13,10 +13,17 @@ namespace ServerManagerTool.Plugin.Discord
{
try
{
- var publicIP = await webClient.DownloadStringTaskAsync(Config.Default.PublicIPCheckUrl);
+ var publicIP = await webClient.DownloadStringTaskAsync(Config.Default.PublicIPCheckUrl1);
+ if (IPAddress.TryParse(publicIP, out IPAddress address1))
+ {
+ return address1;
+ }
- if (IPAddress.TryParse(publicIP, out IPAddress address))
- return address;
+ publicIP = await webClient.DownloadStringTaskAsync(Config.Default.PublicIPCheckUrl2);
+ if (IPAddress.TryParse(publicIP, out IPAddress address2))
+ {
+ return address2;
+ }
return IPAddress.None;
}
diff --git a/src/Plugin.Discord/app.config b/src/Plugin.Discord/app.config
index a2c1109e..76682998 100644
--- a/src/Plugin.Discord/app.config
+++ b/src/Plugin.Discord/app.config
@@ -10,9 +10,6 @@
http://servermanager.azurewebsites.net/api/plugin/call/{0}/{1}/
-
- http://whatismyip.akamai.com/
-
12
@@ -49,6 +46,12 @@
https://raw.githubusercontent.com/Bletch1971/ServerManagers/master/Plugins/Discord/beta/VersionFeed.xml
+
+ https://api.ipify.org
+
+
+ http://whatismyip.akamai.com/
+
diff --git a/src/ServerManager.Common/CommonConfig.Designer.cs b/src/ServerManager.Common/CommonConfig.Designer.cs
index 4e793e96..590d4991 100644
--- a/src/ServerManager.Common/CommonConfig.Designer.cs
+++ b/src/ServerManager.Common/CommonConfig.Designer.cs
@@ -12,7 +12,7 @@ namespace ServerManagerTool.Common {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")]
public sealed partial class CommonConfig : global::System.Configuration.ApplicationSettingsBase {
private static CommonConfig defaultInstance = ((CommonConfig)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new CommonConfig())));
@@ -23,15 +23,6 @@ namespace ServerManagerTool.Common {
}
}
- [global::System.Configuration.ApplicationScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("http://whatismyip.akamai.com/")]
- public string PublicIPCheckUrl {
- get {
- return ((string)(this["PublicIPCheckUrl"]));
- }
- }
-
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("SteamCMD")]
@@ -160,5 +151,23 @@ namespace ServerManagerTool.Common {
this["SteamCmdRemoveQuit"] = value;
}
}
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("https://api.ipify.org")]
+ public string PublicIPCheckUrl1 {
+ get {
+ return ((string)(this["PublicIPCheckUrl1"]));
+ }
+ }
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://whatismyip.akamai.com/")]
+ public string PublicIPCheckUrl2 {
+ get {
+ return ((string)(this["PublicIPCheckUrl2"]));
+ }
+ }
}
}
diff --git a/src/ServerManager.Common/CommonConfig.settings b/src/ServerManager.Common/CommonConfig.settings
index 74eaade6..290ed90c 100644
--- a/src/ServerManager.Common/CommonConfig.settings
+++ b/src/ServerManager.Common/CommonConfig.settings
@@ -2,9 +2,6 @@
-
- http://whatismyip.akamai.com/
-
SteamCMD
@@ -44,5 +41,11 @@
False
+
+ https://api.ipify.org
+
+
+ http://whatismyip.akamai.com/
+
\ No newline at end of file
diff --git a/src/ServerManager.Common/ServerManager.Common.csproj b/src/ServerManager.Common/ServerManager.Common.csproj
index b76aa89e..ad48231c 100644
--- a/src/ServerManager.Common/ServerManager.Common.csproj
+++ b/src/ServerManager.Common/ServerManager.Common.csproj
@@ -43,4 +43,17 @@
+
+
+ True
+ True
+ CommonConfig.settings
+
+
+
+
+ PublicSettingsSingleFileGenerator
+ CommonConfig.Designer.cs
+
+
\ No newline at end of file
diff --git a/src/ServerManager.Common/Utils/NetworkUtils.cs b/src/ServerManager.Common/Utils/NetworkUtils.cs
index 390a9329..a0e255bb 100644
--- a/src/ServerManager.Common/Utils/NetworkUtils.cs
+++ b/src/ServerManager.Common/Utils/NetworkUtils.cs
@@ -81,8 +81,14 @@ namespace ServerManagerTool.Common.Utils
{
try
{
- var publicIP = webClient.DownloadString(CommonConfig.Default.PublicIPCheckUrl);
- if (IPAddress.TryParse(publicIP, out IPAddress address))
+ var publicIP = webClient.DownloadString(CommonConfig.Default.PublicIPCheckUrl1);
+ if (IPAddress.TryParse(publicIP, out IPAddress address1))
+ {
+ return publicIP;
+ }
+
+ publicIP = webClient.DownloadString(CommonConfig.Default.PublicIPCheckUrl2);
+ if (IPAddress.TryParse(publicIP, out IPAddress address2))
{
return publicIP;
}
@@ -102,8 +108,14 @@ namespace ServerManagerTool.Common.Utils
{
try
{
- var publicIP = await webClient.DownloadStringTaskAsync(CommonConfig.Default.PublicIPCheckUrl);
- if (IPAddress.TryParse(publicIP, out IPAddress address))
+ var publicIP = await webClient.DownloadStringTaskAsync(CommonConfig.Default.PublicIPCheckUrl1);
+ if (IPAddress.TryParse(publicIP, out IPAddress address1))
+ {
+ return publicIP;
+ }
+
+ publicIP = await webClient.DownloadStringTaskAsync(CommonConfig.Default.PublicIPCheckUrl2);
+ if (IPAddress.TryParse(publicIP, out IPAddress address2))
{
return publicIP;
}
diff --git a/src/ServerManager.Common/app.config b/src/ServerManager.Common/app.config
index 9f599428..2160090b 100644
--- a/src/ServerManager.Common/app.config
+++ b/src/ServerManager.Common/app.config
@@ -10,9 +10,6 @@
-
- http://whatismyip.akamai.com/
-
SteamCMD
@@ -29,7 +26,7 @@
+login anonymous +quit
-
+
https://steamcommunity.com/dev/apikey
@@ -40,15 +37,21 @@
Steam
+
+ https://api.ipify.org
+
+
+ http://whatismyip.akamai.com/
+
-
+
-
+
True