pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply review suggestions

This commit is contained in:
Shadowghost 2022-11-17 11:34:48 +01:00
parent f6d6f0367b
commit 36994c17bf
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ namespace Jellyfin.Networking.Manager
private readonly IConfigurationManager _configurationManager; private readonly IConfigurationManager _configurationManager;
private readonly SemaphoreSlim _networkEvent; private readonly object _networkEventLock;
/// <summary> /// <summary>
/// Holds the published server URLs and the IPs to use them on. /// Holds the published server URLs and the IPs to use them on.
@ -86,7 +86,7 @@ namespace Jellyfin.Networking.Manager
_interfaces = new List<IPData>(); _interfaces = new List<IPData>();
_macAddresses = new List<PhysicalAddress>(); _macAddresses = new List<PhysicalAddress>();
_publishedServerUrls = new Dictionary<IPData, string>(); _publishedServerUrls = new Dictionary<IPData, string>();
_networkEvent = new SemaphoreSlim(1, 1); _networkEventLock = new object();
_remoteAddressFilter = new List<IPNetwork>(); _remoteAddressFilter = new List<IPNetwork>();
UpdateSettings(_configurationManager.GetNetworkConfiguration()); UpdateSettings(_configurationManager.GetNetworkConfiguration());
@ -162,16 +162,15 @@ namespace Jellyfin.Networking.Manager
/// </summary> /// </summary>
private void HandleNetworkChange() private void HandleNetworkChange()
{ {
_networkEvent.Wait(); lock(_networkEventLock){
if (!_eventfire) if (!_eventfire)
{ {
_logger.LogDebug("Network Address Change Event."); _logger.LogDebug("Network Address Change Event.");
// As network events tend to fire one after the other only fire once every second. // As network events tend to fire one after the other only fire once every second.
_eventfire = true; _eventfire = true;
OnNetworkChange(); OnNetworkChange();
}
} }
_networkEvent.Release();
} }
/// <summary> /// <summary>
@ -546,7 +545,6 @@ namespace Jellyfin.Networking.Manager
_configurationManager.NamedConfigurationUpdated -= ConfigurationUpdated; _configurationManager.NamedConfigurationUpdated -= ConfigurationUpdated;
NetworkChange.NetworkAddressChanged -= OnNetworkAddressChanged; NetworkChange.NetworkAddressChanged -= OnNetworkAddressChanged;
NetworkChange.NetworkAvailabilityChanged -= OnNetworkAvailabilityChanged; NetworkChange.NetworkAvailabilityChanged -= OnNetworkAvailabilityChanged;
_networkEvent.Dispose();
} }
_disposed = true; _disposed = true;