Merge pull request #10660 from barronpm/move-networking

Move Jellyfin.Networking

2 files changed, 0 insertions, 361 deletions

diff --git a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
deleted file mode 100644
index c4cd935c37..0000000000
--- a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-#nullable disable
-
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Net;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Plugins;
-using Microsoft.Extensions.Logging;
-using Mono.Nat;
-
-namespace Emby.Server.Implementations.EntryPoints
-{
-    /// <summary>
-    /// Server entrypoint handling external port forwarding.
-    /// </summary>
-    public class ExternalPortForwarding : IServerEntryPoint
-    {
-        private readonly IServerApplicationHost _appHost;
-        private readonly ILogger<ExternalPortForwarding> _logger;
-        private readonly IServerConfigurationManager _config;
-
-        private readonly ConcurrentDictionary<IPEndPoint, byte> _createdRules = new ConcurrentDictionary<IPEndPoint, byte>();
-
-        private Timer _timer;
-        private string _configIdentifier;
-
-        private bool _disposed = false;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExternalPortForwarding"/> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="appHost">The application host.</param>
-        /// <param name="config">The configuration manager.</param>
-        public ExternalPortForwarding(
-            ILogger<ExternalPortForwarding> logger,
-            IServerApplicationHost appHost,
-            IServerConfigurationManager config)
-        {
-            _logger = logger;
-            _appHost = appHost;
-            _config = config;
-        }
-
-        private string GetConfigIdentifier()
-        {
-            const char Separator = '|';
-            var config = _config.GetNetworkConfiguration();
-
-            return new StringBuilder(32)
-                .Append(config.EnableUPnP).Append(Separator)
-                .Append(config.PublicHttpPort).Append(Separator)
-                .Append(config.PublicHttpsPort).Append(Separator)
-                .Append(_appHost.HttpPort).Append(Separator)
-                .Append(_appHost.HttpsPort).Append(Separator)
-                .Append(_appHost.ListenWithHttps).Append(Separator)
-                .Append(config.EnableRemoteAccess).Append(Separator)
-                .ToString();
-        }
-
-        private void OnConfigurationUpdated(object sender, EventArgs e)
-        {
-            var oldConfigIdentifier = _configIdentifier;
-            _configIdentifier = GetConfigIdentifier();
-
-            if (!string.Equals(_configIdentifier, oldConfigIdentifier, StringComparison.OrdinalIgnoreCase))
-            {
-                Stop();
-                Start();
-            }
-        }
-
-        /// <inheritdoc />
-        public Task RunAsync()
-        {
-            Start();
-
-            _config.ConfigurationUpdated += OnConfigurationUpdated;
-
-            return Task.CompletedTask;
-        }
-
-        private void Start()
-        {
-            var config = _config.GetNetworkConfiguration();
-            if (!config.EnableUPnP || !config.EnableRemoteAccess)
-            {
-                return;
-            }
-
-            _logger.LogInformation("Starting NAT discovery");
-
-            NatUtility.DeviceFound += OnNatUtilityDeviceFound;
-            NatUtility.StartDiscovery();
-
-            _timer = new Timer((_) => _createdRules.Clear(), null, TimeSpan.FromMinutes(10), TimeSpan.FromMinutes(10));
-        }
-
-        private void Stop()
-        {
-            _logger.LogInformation("Stopping NAT discovery");
-
-            NatUtility.StopDiscovery();
-            NatUtility.DeviceFound -= OnNatUtilityDeviceFound;
-
-            _timer?.Dispose();
-        }
-
-        private async void OnNatUtilityDeviceFound(object sender, DeviceEventArgs e)
-        {
-            try
-            {
-                await CreateRules(e.Device).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error creating port forwarding rules");
-            }
-        }
-
-        private Task CreateRules(INatDevice device)
-        {
-            if (_disposed)
-            {
-                throw new ObjectDisposedException(GetType().Name);
-            }
-
-            // On some systems the device discovered event seems to fire repeatedly
-            // This check will help ensure we're not trying to port map the same device over and over
-            if (!_createdRules.TryAdd(device.DeviceEndpoint, 0))
-            {
-                return Task.CompletedTask;
-            }
-
-            return Task.WhenAll(CreatePortMaps(device));
-        }
-
-        private IEnumerable<Task> CreatePortMaps(INatDevice device)
-        {
-            var config = _config.GetNetworkConfiguration();
-            yield return CreatePortMap(device, _appHost.HttpPort, config.PublicHttpPort);
-
-            if (_appHost.ListenWithHttps)
-            {
-                yield return CreatePortMap(device, _appHost.HttpsPort, config.PublicHttpsPort);
-            }
-        }
-
-        private async Task CreatePortMap(INatDevice device, int privatePort, int publicPort)
-        {
-            _logger.LogDebug(
-                "Creating port map on local port {LocalPort} to public port {PublicPort} with device {DeviceEndpoint}",
-                privatePort,
-                publicPort,
-                device.DeviceEndpoint);
-
-            try
-            {
-                var mapping = new Mapping(Protocol.Tcp, privatePort, publicPort, 0, _appHost.Name);
-                await device.CreatePortMapAsync(mapping).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(
-                    ex,
-                    "Error creating port map on local port {LocalPort} to public port {PublicPort} with device {DeviceEndpoint}.",
-                    privatePort,
-                    publicPort,
-                    device.DeviceEndpoint);
-            }
-        }
-
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool dispose)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _config.ConfigurationUpdated -= OnConfigurationUpdated;
-
-            Stop();
-
-            _timer = null;
-
-            _disposed = true;
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
deleted file mode 100644
index 56ccb21ee7..0000000000
--- a/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.Server.Implementations.Udp;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Plugins;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using IConfigurationManager = MediaBrowser.Common.Configuration.IConfigurationManager;
-
-namespace Emby.Server.Implementations.EntryPoints
-{
-    /// <summary>
-    /// Class responsible for registering all UDP broadcast endpoints and their handlers.
-    /// </summary>
-    public sealed class UdpServerEntryPoint : IServerEntryPoint
-    {
-        /// <summary>
-        /// The port of the UDP server.
-        /// </summary>
-        public const int PortNumber = 7359;
-
-        /// <summary>
-        /// The logger.
-        /// </summary>
-        private readonly ILogger<UdpServerEntryPoint> _logger;
-        private readonly IServerApplicationHost _appHost;
-        private readonly IConfiguration _config;
-        private readonly IConfigurationManager _configurationManager;
-        private readonly INetworkManager _networkManager;
-
-        /// <summary>
-        /// The UDP server.
-        /// </summary>
-        private readonly List<UdpServer> _udpServers;
-        private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
-        private bool _disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UdpServerEntryPoint" /> class.
-        /// </summary>
-        /// <param name="logger">Instance of the <see cref="ILogger{UdpServerEntryPoint}"/> interface.</param>
-        /// <param name="appHost">Instance of the <see cref="IServerApplicationHost"/> interface.</param>
-        /// <param name="configuration">Instance of the <see cref="IConfiguration"/> interface.</param>
-        /// <param name="configurationManager">Instance of the <see cref="IConfigurationManager"/> interface.</param>
-        /// <param name="networkManager">Instance of the <see cref="INetworkManager"/> interface.</param>
-        public UdpServerEntryPoint(
-            ILogger<UdpServerEntryPoint> logger,
-            IServerApplicationHost appHost,
-            IConfiguration configuration,
-            IConfigurationManager configurationManager,
-            INetworkManager networkManager)
-        {
-            _logger = logger;
-            _appHost = appHost;
-            _config = configuration;
-            _configurationManager = configurationManager;
-            _networkManager = networkManager;
-            _udpServers = new List<UdpServer>();
-        }
-
-        /// <inheritdoc />
-        public Task RunAsync()
-        {
-            CheckDisposed();
-
-            if (!_configurationManager.GetNetworkConfiguration().AutoDiscovery)
-            {
-                return Task.CompletedTask;
-            }
-
-            try
-            {
-                // Linux needs to bind to the broadcast addresses to get broadcast traffic
-                // Windows receives broadcast fine when binding to just the interface, it is unable to bind to broadcast addresses
-                if (OperatingSystem.IsLinux())
-                {
-                    // Add global broadcast listener
-                    var server = new UdpServer(_logger, _appHost, _config, IPAddress.Broadcast, PortNumber);
-                    server.Start(_cancellationTokenSource.Token);
-                    _udpServers.Add(server);
-
-                    // Add bind address specific broadcast listeners
-                    // IPv6 is currently unsupported
-                    var validInterfaces = _networkManager.GetInternalBindAddresses().Where(i => i.AddressFamily == AddressFamily.InterNetwork);
-                    foreach (var intf in validInterfaces)
-                    {
-                        var broadcastAddress = NetworkUtils.GetBroadcastAddress(intf.Subnet);
-                        _logger.LogDebug("Binding UDP server to {Address} on port {PortNumber}", broadcastAddress, PortNumber);
-
-                        server = new UdpServer(_logger, _appHost, _config, broadcastAddress, PortNumber);
-                        server.Start(_cancellationTokenSource.Token);
-                        _udpServers.Add(server);
-                    }
-                }
-                else
-                {
-                    // Add bind address specific broadcast listeners
-                    // IPv6 is currently unsupported
-                    var validInterfaces = _networkManager.GetInternalBindAddresses().Where(i => i.AddressFamily == AddressFamily.InterNetwork);
-                    foreach (var intf in validInterfaces)
-                    {
-                        var intfAddress = intf.Address;
-                        _logger.LogDebug("Binding UDP server to {Address} on port {PortNumber}", intfAddress, PortNumber);
-
-                        var server = new UdpServer(_logger, _appHost, _config, intfAddress, PortNumber);
-                        server.Start(_cancellationTokenSource.Token);
-                        _udpServers.Add(server);
-                    }
-                }
-            }
-            catch (SocketException ex)
-            {
-                _logger.LogWarning(ex, "Unable to start AutoDiscovery listener on UDP port {PortNumber}", PortNumber);
-            }
-
-            return Task.CompletedTask;
-        }
-
-        private void CheckDisposed()
-        {
-            if (_disposed)
-            {
-                throw new ObjectDisposedException(GetType().Name);
-            }
-        }
-
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _cancellationTokenSource.Cancel();
-            _cancellationTokenSource.Dispose();
-            foreach (var server in _udpServers)
-            {
-                server.Dispose();
-            }
-
-            _udpServers.Clear();
-            _disposed = true;
-        }
-    }
-}