alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-25 11:34:43 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

improve ipv6 error handling

Browse Source
This commit is contained in:
Luke Pulverenti
2016-12-07 15:02:34 -05:00
parent 20c2499797
commit 0130209cdc
6 changed files with 80 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Emby.Server.Core/ApplicationHost.cs
View File

@@ -1305,19 +1305,49 @@ namespace Emby.Server.Core
public async Task<List<IpAddressInfo>> GetLocalIpAddresses()
{
var addresses = NetworkManager.GetLocalIpAddresses().ToList();
var list = new List<IpAddressInfo>();
var addresses = ServerConfigurationManager
.Configuration
.LocalNetworkAddresses
.Select(NormalizeConfiguredLocalAddress)
.Where(i => i != null)
.ToList();
foreach (var address in addresses)
if (addresses.Count == 0)
{
var valid = await IsIpAddressValidAsync(address).ConfigureAwait(false);
if (valid)
addresses.AddRange(NetworkManager.GetLocalIpAddresses());
var list = new List<IpAddressInfo>();
foreach (var address in addresses)
{
list.Add(address);
var valid = await IsIpAddressValidAsync(address).ConfigureAwait(false);
if (valid)
{
list.Add(address);
}
}
addresses = list;
}
return list;
return addresses;
}
private IpAddressInfo NormalizeConfiguredLocalAddress(string address)
{
var index = address.Trim('/').IndexOf('/');
if (index != -1)
{
address = address.Substring(index + 1);
}
IpAddressInfo result;
if (NetworkManager.TryParseIpAddress(address.Trim('/'), out result))
{
return result;
}
return null;
}
private readonly ConcurrentDictionary<string, bool> _validAddressResults = new ConcurrentDictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
@@ -1553,7 +1583,8 @@ namespace Emby.Server.Core
throw new NotImplementedException();
}
var process = ProcessFactory.Create(new ProcessOptions {
var process = ProcessFactory.Create(new ProcessOptions
{
FileName = url,
EnableRaisingEvents = true,
UseShellExecute = true,