6 files changed, 20 insertions, 23 deletions
diff --git a/MediaBrowser.Common/Net/CustomHeaderNames.cs b/MediaBrowser.Common/Net/CustomHeaderNames.cs
deleted file mode 100644
index 5ca9897eb..000000000
--- a/MediaBrowser.Common/Net/CustomHeaderNames.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Common.Net
-{
-    public static class CustomHeaderNames
-    {
-        // Other Headers
-        public const string XForwardedFor = "X-Forwarded-For";
-        public const string XForwardedPort = "X-Forwarded-Port";
-        public const string XForwardedProto = "X-Forwarded-Proto";
-        public const string XRealIP = "X-Real-IP";
-    }
-}
diff --git a/MediaBrowser.Common/Net/IPHost.cs b/MediaBrowser.Common/Net/IPHost.cs
index 1f125f2b1..ec76a43b6 100644
--- a/MediaBrowser.Common/Net/IPHost.cs
+++ b/MediaBrowser.Common/Net/IPHost.cs
@@ -190,7 +190,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>Object representing the string, if it has successfully been parsed.</returns>
         public static IPHost Parse(string host)
         {
-            if (!string.IsNullOrEmpty(host) && IPHost.TryParse(host, out IPHost res))
+            if (IPHost.TryParse(host, out IPHost res))
             {
                 return res;
             }
@@ -206,7 +206,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>Object representing the string, if it has successfully been parsed.</returns>
         public static IPHost Parse(string host, AddressFamily family)
         {
-            if (!string.IsNullOrEmpty(host) && IPHost.TryParse(host, out IPHost res))
+            if (IPHost.TryParse(host, out IPHost res))
             {
                 if (family == AddressFamily.InterNetwork)
                 {
@@ -236,7 +236,7 @@ namespace MediaBrowser.Common.Net
         /// <inheritdoc/>
         public override bool Contains(IPAddress address)
         {
-            if (address != null && !Address.Equals(IPAddress.None))
+            if (address is not null && !Address.Equals(IPAddress.None))
             {
                 if (address.IsIPv4MappedToIPv6)
                 {
diff --git a/MediaBrowser.Common/Net/IPNetAddress.cs b/MediaBrowser.Common/Net/IPNetAddress.cs
index 98d1c2d97..de72d978e 100644
--- a/MediaBrowser.Common/Net/IPNetAddress.cs
+++ b/MediaBrowser.Common/Net/IPNetAddress.cs
@@ -167,6 +167,11 @@ namespace MediaBrowser.Common.Net
                 address = address.MapToIPv4();
             }
 
+            if (address.AddressFamily != AddressFamily)
+            {
+                return false;
+            }
+
             var (altAddress, altPrefix) = NetworkAddressOf(address, PrefixLength);
             return NetworkAddress.Address.Equals(altAddress) && NetworkAddress.PrefixLength >= altPrefix;
         }
@@ -214,7 +219,7 @@ namespace MediaBrowser.Common.Net
         /// <inheritdoc/>
         public override bool Equals(IPAddress ip)
         {
-            if (ip != null && !ip.Equals(IPAddress.None) && !Address.Equals(IPAddress.None))
+            if (ip is not null && !ip.Equals(IPAddress.None) && !Address.Equals(IPAddress.None))
             {
                 return ip.Equals(Address);
             }
diff --git a/MediaBrowser.Common/Net/IPObject.cs b/MediaBrowser.Common/Net/IPObject.cs
index 37385972f..93655234b 100644
--- a/MediaBrowser.Common/Net/IPObject.cs
+++ b/MediaBrowser.Common/Net/IPObject.cs
@@ -292,7 +292,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>Equality result.</returns>
         public virtual bool Equals(IPAddress ip)
         {
-            if (ip != null)
+            if (ip is not null)
             {
                 if (ip.IsIPv4MappedToIPv6)
                 {
@@ -312,7 +312,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>Equality result.</returns>
         public virtual bool Equals(IPObject? other)
         {
-            if (other != null)
+            if (other is not null)
             {
                 return !Address.Equals(IPAddress.None) && Address.Equals(other.Address);
             }
diff --git a/MediaBrowser.Common/Net/NamedClient.cs b/MediaBrowser.Common/Net/NamedClient.cs
index a6cacd4f1..9c5544b0f 100644
--- a/MediaBrowser.Common/Net/NamedClient.cs
+++ b/MediaBrowser.Common/Net/NamedClient.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Common.Net
+namespace MediaBrowser.Common.Net
 {
     /// <summary>
     /// Registered http client names.
@@ -6,7 +6,7 @@
     public static class NamedClient
     {
         /// <summary>
-        /// Gets the value for the default named http client.
+        /// Gets the value for the default named http client which implements happy eyeballs.
         /// </summary>
         public const string Default = nameof(Default);
 
@@ -19,5 +19,10 @@
         /// Gets the value for the DLNA named http client.
         /// </summary>
         public const string Dlna = nameof(Dlna);
+
+        /// <summary>
+        /// Non happy eyeballs implementation.
+        /// </summary>
+        public const string DirectIp = nameof(DirectIp);
     }
 }
diff --git a/MediaBrowser.Common/Net/NetworkExtensions.cs b/MediaBrowser.Common/Net/NetworkExtensions.cs
index 7ad005854..5e5e5b81b 100644
--- a/MediaBrowser.Common/Net/NetworkExtensions.cs
+++ b/MediaBrowser.Common/Net/NetworkExtensions.cs
@@ -114,7 +114,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>True if both are equal.</returns>
         public static bool Compare(this Collection<IPObject> source, Collection<IPObject> dest)
         {
-            if (dest == null || source.Count != dest.Count)
+            if (dest is null || source.Count != dest.Count)
             {
                 return false;
             }
@@ -187,7 +187,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>A new collection, with the items excluded.</returns>
         public static Collection<IPObject> Exclude(this Collection<IPObject> source, Collection<IPObject> excludeList, bool isNetwork)
         {
-            if (source.Count == 0 || excludeList == null)
+            if (source.Count == 0 || excludeList is null)
             {
                 return new Collection<IPObject>(source);
             }