Merge branch 'master' into trickplay

1 files changed, 48 insertions, 107 deletions

diff --git a/Jellyfin.Networking/Configuration/NetworkConfiguration.cs b/Jellyfin.Networking/Configuration/NetworkConfiguration.cs
index 361dbc814..90ebcd390 100644
--- a/Jellyfin.Networking/Configuration/NetworkConfiguration.cs
+++ b/Jellyfin.Networking/Configuration/NetworkConfiguration.cs
@@ -10,33 +10,18 @@ namespace Jellyfin.Networking.Configuration
     public class NetworkConfiguration
     {
         /// <summary>
-        /// The default value for <see cref="HttpServerPortNumber"/>.
+        /// The default value for <see cref="InternalHttpPort"/>.
         /// </summary>
         public const int DefaultHttpPort = 8096;
 
         /// <summary>
-        /// The default value for <see cref="PublicHttpsPort"/> and <see cref="HttpsPortNumber"/>.
+        /// The default value for <see cref="PublicHttpsPort"/> and <see cref="InternalHttpsPort"/>.
         /// </summary>
         public const int DefaultHttpsPort = 8920;
 
         private string _baseUrl = string.Empty;
 
         /// <summary>
-        /// Gets or sets a value indicating whether the server should force connections over HTTPS.
-        /// </summary>
-        public bool RequireHttps { get; set; }
-
-        /// <summary>
-        /// Gets or sets the filesystem path of an X.509 certificate to use for SSL.
-        /// </summary>
-        public string CertificatePath { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the password required to access the X.509 certificate data in the file specified by <see cref="CertificatePath"/>.
-        /// </summary>
-        public string CertificatePassword { get; set; } = string.Empty;
-
-        /// <summary>
         /// Gets or sets a value used to specify the URL prefix that your Jellyfin instance can be accessed at.
         /// </summary>
         public string BaseUrl
@@ -70,24 +55,6 @@ namespace Jellyfin.Networking.Configuration
         }
 
         /// <summary>
-        /// Gets or sets the public HTTPS port.
-        /// </summary>
-        /// <value>The public HTTPS port.</value>
-        public int PublicHttpsPort { get; set; } = DefaultHttpsPort;
-
-        /// <summary>
-        /// Gets or sets the HTTP server port number.
-        /// </summary>
-        /// <value>The HTTP server port number.</value>
-        public int HttpServerPortNumber { get; set; } = DefaultHttpPort;
-
-        /// <summary>
-        /// Gets or sets the HTTPS server port number.
-        /// </summary>
-        /// <value>The HTTPS server port number.</value>
-        public int HttpsPortNumber { get; set; } = DefaultHttpsPort;
-
-        /// <summary>
         /// Gets or sets a value indicating whether to use HTTPS.
         /// </summary>
         /// <remarks>
@@ -97,100 +64,104 @@ namespace Jellyfin.Networking.Configuration
         public bool EnableHttps { get; set; }
 
         /// <summary>
-        /// Gets or sets the public mapped port.
+        /// Gets or sets a value indicating whether the server should force connections over HTTPS.
         /// </summary>
-        /// <value>The public mapped port.</value>
-        public int PublicPort { get; set; } = DefaultHttpPort;
+        public bool RequireHttps { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the http port should be mapped as part of UPnP automatic port forwarding.
+        /// Gets or sets the filesystem path of an X.509 certificate to use for SSL.
         /// </summary>
-        public bool UPnPCreateHttpPortMap { get; set; }
+        public string CertificatePath { get; set; } = string.Empty;
 
         /// <summary>
-        /// Gets or sets the UDPPortRange.
+        /// Gets or sets the password required to access the X.509 certificate data in the file specified by <see cref="CertificatePath"/>.
         /// </summary>
-        public string UDPPortRange { get; set; } = string.Empty;
+        public string CertificatePassword { get; set; } = string.Empty;
 
         /// <summary>
-        /// Gets or sets a value indicating whether gets or sets IPV6 capability.
+        /// Gets or sets the internal HTTP server port.
         /// </summary>
-        public bool EnableIPV6 { get; set; }
+        /// <value>The HTTP server port.</value>
+        public int InternalHttpPort { get; set; } = DefaultHttpPort;
 
         /// <summary>
-        /// Gets or sets a value indicating whether gets or sets IPV4 capability.
+        /// Gets or sets the internal HTTPS server port.
         /// </summary>
-        public bool EnableIPV4 { get; set; } = true;
+        /// <value>The HTTPS server port.</value>
+        public int InternalHttpsPort { get; set; } = DefaultHttpsPort;
 
         /// <summary>
-        /// Gets or sets a value indicating whether detailed SSDP logs are sent to the console/log.
-        /// "Emby.Dlna": "Debug" must be set in logging.default.json for this property to have any effect.
+        /// Gets or sets the public HTTP port.
         /// </summary>
-        public bool EnableSSDPTracing { get; set; }
+        /// <value>The public HTTP port.</value>
+        public int PublicHttpPort { get; set; } = DefaultHttpPort;
 
         /// <summary>
-        /// Gets or sets the SSDPTracingFilter
-        /// Gets or sets a value indicating whether an IP address is to be used to filter the detailed ssdp logs that are being sent to the console/log.
-        /// If the setting "Emby.Dlna": "Debug" msut be set in logging.default.json for this property to work.
+        /// Gets or sets the public HTTPS port.
         /// </summary>
-        public string SSDPTracingFilter { get; set; } = string.Empty;
+        /// <value>The public HTTPS port.</value>
+        public int PublicHttpsPort { get; set; } = DefaultHttpsPort;
 
         /// <summary>
-        /// Gets or sets the number of times SSDP UDP messages are sent.
+        /// Gets or sets a value indicating whether Autodiscovery is enabled.
         /// </summary>
-        public int UDPSendCount { get; set; } = 2;
+        public bool AutoDiscovery { get; set; } = true;
 
         /// <summary>
-        /// Gets or sets the delay between each groups of SSDP messages (in ms).
+        /// Gets or sets a value indicating whether to enable automatic port forwarding.
         /// </summary>
-        public int UDPSendDelay { get; set; } = 100;
+        public bool EnableUPnP { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether address names that match <see cref="VirtualInterfaceNames"/> should be Ignore for the purposes of binding.
+        /// Gets or sets a value indicating whether IPv6 is enabled.
         /// </summary>
-        public bool IgnoreVirtualInterfaces { get; set; } = true;
+        public bool EnableIPv4 { get; set; } = true;
 
         /// <summary>
-        /// Gets or sets a value indicating the interfaces that should be ignored. The list can be comma separated. <seealso cref="IgnoreVirtualInterfaces"/>.
+        /// Gets or sets a value indicating whether IPv6 is enabled.
         /// </summary>
-        public string VirtualInterfaceNames { get; set; } = "vEthernet*";
+        public bool EnableIPv6 { get; set; }
 
         /// <summary>
-        /// Gets or sets the time (in seconds) between the pings of SSDP gateway monitor.
+        /// Gets or sets a value indicating whether access from outside of the LAN is permitted.
         /// </summary>
-        public int GatewayMonitorPeriod { get; set; } = 60;
+        public bool EnableRemoteAccess { get; set; } = true;
 
         /// <summary>
-        /// Gets a value indicating whether multi-socket binding is available.
+        /// Gets or sets the subnets that are deemed to make up the LAN.
         /// </summary>
-        public bool EnableMultiSocketBinding { get; } = true;
+        public string[] LocalNetworkSubnets { get; set; } = Array.Empty<string>();
 
         /// <summary>
-        /// Gets or sets a value indicating whether all IPv6 interfaces should be treated as on the internal network.
-        /// Depending on the address range implemented ULA ranges might not be used.
+        /// Gets or sets the interface addresses which Jellyfin will bind to. If empty, all interfaces will be used.
         /// </summary>
-        public bool TrustAllIP6Interfaces { get; set; }
+        public string[] LocalNetworkAddresses { get; set; } = Array.Empty<string>();
 
         /// <summary>
-        /// Gets or sets the ports that HDHomerun uses.
+        /// Gets or sets the known proxies.
         /// </summary>
-        public string HDHomerunPortRange { get; set; } = string.Empty;
+        public string[] KnownProxies { get; set; } = Array.Empty<string>();
 
         /// <summary>
-        /// Gets or sets the PublishedServerUriBySubnet
-        /// Gets or sets PublishedServerUri to advertise for specific subnets.
+        /// Gets or sets a value indicating whether address names that match <see cref="VirtualInterfaceNames"/> should be ignored for the purposes of binding.
         /// </summary>
-        public string[] PublishedServerUriBySubnet { get; set; } = Array.Empty<string>();
+        public bool IgnoreVirtualInterfaces { get; set; } = true;
 
         /// <summary>
-        /// Gets or sets a value indicating whether Autodiscovery tracing is enabled.
+        /// Gets or sets a value indicating the interface name prefixes that should be ignored. The list can be comma separated and values are case-insensitive. <seealso cref="IgnoreVirtualInterfaces"/>.
         /// </summary>
-        public bool AutoDiscoveryTracing { get; set; }
+        public string[] VirtualInterfaceNames { get; set; } = new string[] { "veth" };
 
         /// <summary>
-        /// Gets or sets a value indicating whether Autodiscovery is enabled.
+        /// Gets or sets a value indicating whether the published server uri is based on information in HTTP requests.
         /// </summary>
-        public bool AutoDiscovery { get; set; } = true;
+        public bool EnablePublishedServerUriByRequest { get; set; } = false;
+
+        /// <summary>
+        /// Gets or sets the PublishedServerUriBySubnet
+        /// Gets or sets PublishedServerUri to advertise for specific subnets.
+        /// </summary>
+        public string[] PublishedServerUriBySubnet { get; set; } = Array.Empty<string>();
 
         /// <summary>
         /// Gets or sets the filter for remote IP connectivity. Used in conjunction with <seealso cref="IsRemoteIPFilterBlacklist"/>.
@@ -201,35 +172,5 @@ namespace Jellyfin.Networking.Configuration
         /// Gets or sets a value indicating whether <seealso cref="RemoteIPFilter"/> contains a blacklist or a whitelist. Default is a whitelist.
         /// </summary>
         public bool IsRemoteIPFilterBlacklist { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to enable automatic port forwarding.
-        /// </summary>
-        public bool EnableUPnP { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether access outside of the LAN is permitted.
-        /// </summary>
-        public bool EnableRemoteAccess { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the subnets that are deemed to make up the LAN.
-        /// </summary>
-        public string[] LocalNetworkSubnets { get; set; } = Array.Empty<string>();
-
-        /// <summary>
-        /// Gets or sets the interface addresses which Jellyfin will bind to. If empty, all interfaces will be used.
-        /// </summary>
-        public string[] LocalNetworkAddresses { get; set; } = Array.Empty<string>();
-
-        /// <summary>
-        /// Gets or sets the known proxies. If the proxy is a network, it's added to the KnownNetworks.
-        /// </summary>
-        public string[] KnownProxies { get; set; } = Array.Empty<string>();
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the published server uri is based on information in HTTP requests.
-        /// </summary>
-        public bool EnablePublishedServerUriByRequest { get; set; } = false;
     }
 }