lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5345 from BaronGreenback/IP6Fix

Browse Source 
Dual IP4 / IP6 server fails on non-windows platforms
This commit is contained in:
dkanada 2021-03-04 17:03:53 +09:00 committed by GitHub
commit 8615847a8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Jellyfin.Networking/Manager/NetworkManager.cs
View File

@ -285,14 +285,25 @@ namespace Jellyfin.Networking.Manager
// No bind address and no exclusions, so listen on all interfaces. // No bind address and no exclusions, so listen on all interfaces.
Collection<IPObject> result = new Collection<IPObject>(); Collection<IPObject> result = new Collection<IPObject>();
if (IsIP4Enabled) if (IsIP6Enabled && IsIP4Enabled)
{
// Kestrel source code shows it uses Sockets.DualMode - so this also covers IPAddress.Any
result.AddItem(IPAddress.IPv6Any);
}
else if (IsIP4Enabled)
{ {
result.AddItem(IPAddress.Any); result.AddItem(IPAddress.Any);
} }
else if (IsIP6Enabled)
if (IsIP6Enabled)
{ {
result.AddItem(IPAddress.IPv6Any); // Cannot use IPv6Any as Kestrel will bind to IPv4 addresses.
foreach (var iface in _interfaceAddresses)
{
if (iface.AddressFamily == AddressFamily.InterNetworkV6)
{
result.AddItem(iface.Address);
}
}
} }
return result; return result;
@ -414,7 +425,7 @@ namespace Jellyfin.Networking.Manager
} }
// There isn't any others, so we'll use the loopback. // There isn't any others, so we'll use the loopback.
result = IsIP6Enabled ? "::" : "127.0.0.1"; result = IsIP6Enabled ? "::1" : "127.0.0.1";
_logger.LogWarning("{Source}: GetBindInterface: Loopback {Result} returned.", source, result); _logger.LogWarning("{Source}: GetBindInterface: Loopback {Result} returned.", source, result);
return result; return result;
} }

2
Jellyfin.Server/Program.cs
View File

@ -280,7 +280,7 @@ namespace Jellyfin.Server
bool flagged = false; bool flagged = false;
foreach (IPObject netAdd in addresses) foreach (IPObject netAdd in addresses)
{ {
_logger.LogInformation("Kestrel listening on {0}", netAdd); _logger.LogInformation("Kestrel listening on {Address}", netAdd.Address == IPAddress.IPv6Any ? "All Addresses" : netAdd);
options.Listen(netAdd.Address, appHost.HttpPort); options.Listen(netAdd.Address, appHost.HttpPort);
if (appHost.ListenWithHttps) if (appHost.ListenWithHttps)
{ {