diff options
| author | Bond-009 <bond.009@outlook.com> | 2023-02-14 20:08:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 12:08:52 -0700 |
| commit | 36b7157589c07097df891738934ec0f351be69cb (patch) | |
| tree | 1433be0b88de31a11e9d3bf59dc428ceca2a7950 | |
| parent | 48c646194521b13165053bd4b9bb13733af42d29 (diff) | |
Fix #9300 (#9312)
| -rw-r--r-- | MediaBrowser.Common/Net/IPNetAddress.cs | 5 | ||||
| -rw-r--r-- | tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Common/Net/IPNetAddress.cs b/MediaBrowser.Common/Net/IPNetAddress.cs index ac3396a9f..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; } diff --git a/tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs b/tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs index 61f913252..df2a2ca70 100644 --- a/tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs +++ b/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, !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("2001:abcd:abcd:6b40::0/60", "192.168.10.60")] public void InNetwork_False_Success(string network, string value) { var ip = IPAddress.Parse(value); |