aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common/Net
diff options
context:
space:
mode:
authorBond_009 <bond.009@outlook.com>2025-11-11 17:41:46 +0100
committerBond_009 <bond.009@outlook.com>2026-01-14 18:55:47 +0100
commit9e480f6efb4bc0e1f0d1323ed7ed5a7208fded99 (patch)
treec625d535cce961c69faacde23e3bb0f4f259eb31 /MediaBrowser.Common/Net
parent62e51fd00a429cf06e72e49c1e94cbd499fd366a (diff)
Update to .NET 10.0
Diffstat (limited to 'MediaBrowser.Common/Net')
-rw-r--r--MediaBrowser.Common/Net/NetworkConstants.cs1
-rw-r--r--MediaBrowser.Common/Net/NetworkUtils.cs10
2 files changed, 4 insertions, 7 deletions
diff --git a/MediaBrowser.Common/Net/NetworkConstants.cs b/MediaBrowser.Common/Net/NetworkConstants.cs
index ccef5d271..cec996a1a 100644
--- a/MediaBrowser.Common/Net/NetworkConstants.cs
+++ b/MediaBrowser.Common/Net/NetworkConstants.cs
@@ -1,5 +1,4 @@
using System.Net;
-using IPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;
namespace MediaBrowser.Common.Net;
diff --git a/MediaBrowser.Common/Net/NetworkUtils.cs b/MediaBrowser.Common/Net/NetworkUtils.cs
index 24ed47a81..9c9a35a16 100644
--- a/MediaBrowser.Common/Net/NetworkUtils.cs
+++ b/MediaBrowser.Common/Net/NetworkUtils.cs
@@ -6,7 +6,6 @@ using System.Net;
using System.Net.Sockets;
using System.Text.RegularExpressions;
using Jellyfin.Extensions;
-using IPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;
namespace MediaBrowser.Common.Net;
@@ -196,7 +195,7 @@ public static partial class NetworkUtils
/// <param name="result">An <see cref="IPNetwork"/>.</param>
/// <param name="negated">Boolean signaling if negated or not negated values should be parsed.</param>
/// <returns><c>True</c> if parsing was successful.</returns>
- public static bool TryParseToSubnet(ReadOnlySpan<char> value, [NotNullWhen(true)] out IPNetwork? result, bool negated = false)
+ public static bool TryParseToSubnet(ReadOnlySpan<char> value, out IPNetwork result, bool negated = false)
{
// If multiple IP addresses are in a comma-separated string, the individual addresses may contain leading and/or trailing whitespace
value = value.Trim();
@@ -210,7 +209,7 @@ public static partial class NetworkUtils
if (isAddressNegated != negated)
{
- result = null;
+ result = default;
return false;
}
@@ -235,7 +234,7 @@ public static partial class NetworkUtils
}
}
- result = null;
+ result = default;
return false;
}
@@ -330,7 +329,7 @@ public static partial class NetworkUtils
/// <returns>The broadcast address.</returns>
public static IPAddress GetBroadcastAddress(IPNetwork network)
{
- var addressBytes = network.Prefix.GetAddressBytes();
+ var addressBytes = network.BaseAddress.GetAddressBytes();
uint ipAddress = BitConverter.ToUInt32(addressBytes, 0);
uint ipMaskV4 = BitConverter.ToUInt32(CidrToMask(network.PrefixLength, AddressFamily.InterNetwork).GetAddressBytes(), 0);
uint broadCastIPAddress = ipAddress | ~ipMaskV4;
@@ -347,7 +346,6 @@ public static partial class NetworkUtils
public static bool SubnetContainsAddress(IPNetwork network, IPAddress address)
{
ArgumentNullException.ThrowIfNull(address);
- ArgumentNullException.ThrowIfNull(network);
if (address.IsIPv4MappedToIPv6)
{