github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 14:08:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Removed systemIp6 functionality.

Browse source
This commit is contained in:
BaronGreenback 2021-01-19 12:50:11 +00:00
parent 821473557c
commit 82d365045a
3 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Jellyfin.Networking/Manager/NetworkManager.cs
View file

@ -129,16 +129,6 @@ namespace Jellyfin.Networking.Manager
/// </summary>
public static string MockNetworkSettings { get; set; } = string.Empty;
/// <summary>
/// Gets or sets a value indicating whether the system has IP4 is enabled.
/// </summary>
public static bool SystemIP4Enabled { get; set; }
/// <summary>
/// Gets or sets a value indicating whether the system has IP6 is enabled.
/// </summary>
public static bool SystemIP6Enabled { get; set; }
/// <summary>
/// Gets or sets a value indicating whether IP6 is enabled.
/// </summary>
@ -1059,7 +1049,6 @@ namespace Jellyfin.Networking.Manager
{
if (info.Address.AddressFamily == AddressFamily.InterNetwork)
{
SystemIP4Enabled = true;
if (IsIP4Enabled)
{
IPNetAddress nw = new IPNetAddress(info.Address, IPObject.MaskToCidr(info.IPv4Mask))
@ -1084,7 +1073,6 @@ namespace Jellyfin.Networking.Manager
}
else if (info.Address.AddressFamily == AddressFamily.InterNetworkV6)
{
SystemIP6Enabled = true;
if (IsIP6Enabled)
{
IPNetAddress nw = new IPNetAddress(info.Address, (byte)info.PrefixLength)

2
Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
View file

@ -353,7 +353,7 @@ namespace Jellyfin.Server.Extensions
}
// In order for dual-mode sockets to be used, IP6 has to be enabled in JF and an interface has to have an IP6 address.
if (NetworkManager.SystemIP6Enabled && addr.AddressFamily == AddressFamily.InterNetwork && config.EnableIPV6)
if (addr.AddressFamily == AddressFamily.InterNetwork && config.EnableIPV6)
{
// If the server is using dual-mode sockets, IPv4 addresses are supplied in an IPv6 format.
// https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/proxy-load-balancer?view=aspnetcore-5.0 .

1
tests/Jellyfin.Api.Tests/ParseNetworkTests.cs
View file

@ -30,7 +30,6 @@ namespace Jellyfin.Api.Tests
public void TestNetworks(bool ip4, bool ip6, string hostList, string match)
{
using var nm = CreateNetworkManager();
NetworkManager.SystemIP6Enabled = ip6;
var settings = new NetworkConfiguration
{