pt/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-09-06 13:57:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Respond to config changes correctly for external port forwarding

Browse Source
This commit is contained in:
Mark Monteiro 2020-04-06 00:22:27 -04:00
parent 26afb42a72
commit 78d9b9894c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
View File

@ -30,7 +30,7 @@ namespace Emby.Server.Implementations.EntryPoints
private readonly ConcurrentDictionary<IPEndPoint, byte> _createdRules = new ConcurrentDictionary<IPEndPoint, byte>(); private readonly ConcurrentDictionary<IPEndPoint, byte> _createdRules = new ConcurrentDictionary<IPEndPoint, byte>();
private Timer _timer; private Timer _timer;
private string _lastConfigIdentifier; private string _configIdentifier;
private bool _disposed = false; private bool _disposed = false;
@ -70,7 +70,10 @@ namespace Emby.Server.Implementations.EntryPoints
private void OnConfigurationUpdated(object sender, EventArgs e) private void OnConfigurationUpdated(object sender, EventArgs e)
{ {
if (!string.Equals(_lastConfigIdentifier, GetConfigIdentifier(), StringComparison.OrdinalIgnoreCase)) var oldConfigIdentifier = _configIdentifier;
_configIdentifier = GetConfigIdentifier();
if (!string.Equals(_configIdentifier, oldConfigIdentifier, StringComparison.OrdinalIgnoreCase))
{ {
Stop(); Stop();
Start(); Start();
@ -94,7 +97,7 @@ namespace Emby.Server.Implementations.EntryPoints
return; return;
} }
_logger.LogDebug("Starting NAT discovery"); _logger.LogInformation("Starting NAT discovery");
NatUtility.DeviceFound += OnNatUtilityDeviceFound; NatUtility.DeviceFound += OnNatUtilityDeviceFound;
NatUtility.StartDiscovery(); NatUtility.StartDiscovery();
@ -102,13 +105,11 @@ namespace Emby.Server.Implementations.EntryPoints
_timer = new Timer((_) => _createdRules.Clear(), null, TimeSpan.FromMinutes(10), TimeSpan.FromMinutes(10)); _timer = new Timer((_) => _createdRules.Clear(), null, TimeSpan.FromMinutes(10), TimeSpan.FromMinutes(10));
_deviceDiscovery.DeviceDiscovered += OnDeviceDiscoveryDeviceDiscovered; _deviceDiscovery.DeviceDiscovered += OnDeviceDiscoveryDeviceDiscovered;
_lastConfigIdentifier = GetConfigIdentifier();
} }
private void Stop() private void Stop()
{ {
_logger.LogDebug("Stopping NAT discovery"); _logger.LogInformation("Stopping NAT discovery");
NatUtility.StopDiscovery(); NatUtility.StopDiscovery();
NatUtility.DeviceFound -= OnNatUtilityDeviceFound; NatUtility.DeviceFound -= OnNatUtilityDeviceFound;