Bond-009 2 年之前
父节点
当前提交
36b7157589
共有 2 个文件被更改,包括 6 次插入0 次删除
  1. 5 0
      MediaBrowser.Common/Net/IPNetAddress.cs
  2. 1 0
      tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs

+ 5 - 0
MediaBrowser.Common/Net/IPNetAddress.cs

@@ -167,6 +167,11 @@ namespace MediaBrowser.Common.Net
                 address = address.MapToIPv4();
                 address = address.MapToIPv4();
             }
             }
 
 
+            if (address.AddressFamily != AddressFamily)
+            {
+                return false;
+            }
+
             var (altAddress, altPrefix) = NetworkAddressOf(address, PrefixLength);
             var (altAddress, altPrefix) = NetworkAddressOf(address, PrefixLength);
             return NetworkAddress.Address.Equals(altAddress) && NetworkAddress.PrefixLength >= altPrefix;
             return NetworkAddress.Address.Equals(altAddress) && NetworkAddress.PrefixLength >= altPrefix;
         }
         }

+ 1 - 0
tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs

@@ -45,6 +45,7 @@ namespace Jellyfin.Networking.Tests
         [InlineData("fd23:184f:2029:0::/56", "fd24:184f:2029:0:3139:7386:67d7:d517")]
         [InlineData("fd23:184f:2029:0::/56", "fd24:184f:2029:0:3139:7386:67d7:d517")]
         [InlineData("fd23:184f:2029:0::/56, !fd23:184f:2029:0:3139:7386:67d7:d500/120", "fd23:184f:2029:0:3139:7386:67d7:d517")]
         [InlineData("fd23:184f:2029:0::/56, !fd23:184f:2029:0:3139:7386:67d7:d500/120", "fd23:184f:2029:0:3139:7386:67d7:d517")]
         [InlineData("fd23:184f:2029:0::/56", "192.168.10.60")]
         [InlineData("fd23:184f:2029:0::/56", "192.168.10.60")]
+        [InlineData("2001:abcd:abcd:6b40::0/60", "192.168.10.60")]
         public void InNetwork_False_Success(string network, string value)
         public void InNetwork_False_Success(string network, string value)
         {
         {
             var ip = IPAddress.Parse(value);
             var ip = IPAddress.Parse(value);