1 files changed, 3 insertions, 92 deletions

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 24f59478c..1d0293a5f 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1198,25 +1198,11 @@ namespace Emby.Server.Implementations
 
         private CertificateInfo GetCertificateInfo(bool generateCertificate)
         {
-            if (!string.IsNullOrWhiteSpace(ServerConfigurationManager.Configuration.CertificatePath))
-            {
-                // Custom cert
-                return new CertificateInfo
-                {
-                    Path = ServerConfigurationManager.Configuration.CertificatePath,
-                    Password = ServerConfigurationManager.Configuration.CertificatePassword
-                };
-            }
-
-            // Generate self-signed cert
-            var certHost = GetHostnameFromExternalDns(ServerConfigurationManager.Configuration.WanDdns);
-            var certPath = Path.Combine(ServerConfigurationManager.ApplicationPaths.ProgramDataPath, "ssl", "cert_" + (certHost + "2").GetMD5().ToString("N", CultureInfo.InvariantCulture) + ".pfx");
-            const string Password = "embycert";
-
+            // Custom cert
             return new CertificateInfo
             {
-                Path = certPath,
-                Password = Password
+                Path = ServerConfigurationManager.Configuration.CertificatePath,
+                Password = ServerConfigurationManager.Configuration.CertificatePassword
             };
         }
 
@@ -1403,17 +1389,6 @@ namespace Emby.Server.Implementations
         {
             var localAddress = await GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
 
-            string wanAddress;
-
-            if (string.IsNullOrEmpty(ServerConfigurationManager.Configuration.WanDdns))
-            {
-                wanAddress = await GetWanApiUrlFromExternal(cancellationToken).ConfigureAwait(false);
-            }
-            else
-            {
-                wanAddress = GetWanApiUrl(ServerConfigurationManager.Configuration.WanDdns);
-            }
-
             return new SystemInfo
             {
                 HasPendingRestart = HasPendingRestart,
@@ -1435,7 +1410,6 @@ namespace Emby.Server.Implementations
                 OperatingSystemDisplayName = OperatingSystem.Name,
                 CanSelfRestart = CanSelfRestart,
                 CanLaunchWebBrowser = CanLaunchWebBrowser,
-                WanAddress = wanAddress,
                 HasUpdateAvailable = HasUpdateAvailable,
                 TranscodingTempPath = ApplicationPaths.TranscodingTempPath,
                 ServerName = FriendlyName,
@@ -1457,24 +1431,12 @@ namespace Emby.Server.Implementations
         {
             var localAddress = await GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
 
-            string wanAddress;
-
-            if (string.IsNullOrEmpty(ServerConfigurationManager.Configuration.WanDdns))
-            {
-                wanAddress = await GetWanApiUrlFromExternal(cancellationToken).ConfigureAwait(false);
-            }
-            else
-            {
-                wanAddress = GetWanApiUrl(ServerConfigurationManager.Configuration.WanDdns);
-            }
-
             return new PublicSystemInfo
             {
                 Version = ApplicationVersion,
                 ProductName = ApplicationProductName,
                 Id = SystemId,
                 OperatingSystem = OperatingSystem.Id.ToString(),
-                WanAddress = wanAddress,
                 ServerName = FriendlyName,
                 LocalAddress = localAddress
             };
@@ -1506,31 +1468,6 @@ namespace Emby.Server.Implementations
             return null;
         }
 
-        public async Task<string> GetWanApiUrlFromExternal(CancellationToken cancellationToken)
-        {
-            const string Url = "http://ipv4.icanhazip.com";
-            try
-            {
-                using (var response = await HttpClient.Get(new HttpRequestOptions
-                {
-                    Url = Url,
-                    LogErrorResponseBody = false,
-                    BufferContent = false,
-                    CancellationToken = cancellationToken
-                }).ConfigureAwait(false))
-                {
-                    string res = await response.ReadToEndAsync().ConfigureAwait(false);
-                    return GetWanApiUrl(res.Trim());
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex, "Error getting WAN Ip address information");
-            }
-
-            return null;
-        }
-
         /// <summary>
         /// Removes the scope id from IPv6 addresses.
         /// </summary>
@@ -1573,32 +1510,6 @@ namespace Emby.Server.Implementations
                     HttpPort.ToString(CultureInfo.InvariantCulture));
         }
 
-        public string GetWanApiUrl(IPAddress ipAddress)
-        {
-            if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
-            {
-                var str = RemoveScopeId(ipAddress.ToString());
-
-                return GetWanApiUrl("[" + str + "]");
-            }
-
-            return GetWanApiUrl(ipAddress.ToString());
-        }
-
-        public string GetWanApiUrl(string host)
-        {
-            if (EnableHttps)
-            {
-                return string.Format("https://{0}:{1}",
-                    host,
-                    ServerConfigurationManager.Configuration.PublicHttpsPort.ToString(CultureInfo.InvariantCulture));
-            }
-
-            return string.Format("http://{0}:{1}",
-                    host,
-                    ServerConfigurationManager.Configuration.PublicPort.ToString(CultureInfo.InvariantCulture));
-        }
-
         public Task<List<IPAddress>> GetLocalIpAddresses(CancellationToken cancellationToken)
         {
             return GetLocalIpAddressesInternal(true, 0, cancellationToken);