starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 22:13:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements to IPObjects

Browse Source
This commit is contained in:
Bond_009
2021-04-10 22:42:09 +02:00
parent a19a97ca42
commit be9cb7af2c
3 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Common/Net/IPNetAddress.cs
View File

@@ -38,7 +38,7 @@ namespace MediaBrowser.Common.Net
/// <summary>
/// IP6Loopback address host.
/// </summary>
public static readonly IPNetAddress IP6Loopback = IPNetAddress.Parse("::1");
public static readonly IPNetAddress IP6Loopback = new IPNetAddress(IPAddress.IPv6Loopback);
/// <summary>
/// Object's IP address.
@@ -113,7 +113,7 @@ namespace MediaBrowser.Common.Net
}
// Is it a network?
string[] tokens = addr.Split("/");
string[] tokens = addr.Split('/');
if (tokens.Length == 2)
{
@@ -171,8 +171,8 @@ namespace MediaBrowser.Common.Net
address = address.MapToIPv4();
}
var altAddress = NetworkAddressOf(address, PrefixLength);
return NetworkAddress.Address.Equals(altAddress.Address) && NetworkAddress.PrefixLength >= altAddress.PrefixLength;
var (altAddress, altPrefix) = NetworkAddressOf(address, PrefixLength);
return NetworkAddress.Address.Equals(altAddress) && NetworkAddress.PrefixLength >= altPrefix;
}
/// <inheritdoc/>
@@ -196,8 +196,8 @@ namespace MediaBrowser.Common.Net
return NetworkAddress.PrefixLength <= netaddrObj.PrefixLength;
}
var altAddress = NetworkAddressOf(netaddrObj.Address, PrefixLength);
return NetworkAddress.Address.Equals(altAddress.Address);
var altAddress = NetworkAddressOf(netaddrObj.Address, PrefixLength).address;
return NetworkAddress.Address.Equals(altAddress);
}
return false;
@@ -270,8 +270,8 @@ namespace MediaBrowser.Common.Net
/// <inheritdoc/>
protected override IPObject CalculateNetworkAddress()
{
var value = NetworkAddressOf(_address, PrefixLength);
return new IPNetAddress(value.Address, value.PrefixLength);
var (address, prefixLength) = NetworkAddressOf(_address, PrefixLength);
return new IPNetAddress(address, prefixLength);
}
}
}