diff options
Diffstat (limited to 'Jellyfin.Networking/Configuration/NetworkConfiguration.cs')
| -rw-r--r-- | Jellyfin.Networking/Configuration/NetworkConfiguration.cs | 153 |
1 files changed, 47 insertions, 106 deletions
diff --git a/Jellyfin.Networking/Configuration/NetworkConfiguration.cs b/Jellyfin.Networking/Configuration/NetworkConfiguration.cs index 361dbc814..f90419851 100644 --- a/Jellyfin.Networking/Configuration/NetworkConfiguration.cs +++ b/Jellyfin.Networking/Configuration/NetworkConfiguration.cs @@ -22,21 +22,6 @@ namespace Jellyfin.Networking.Configuration 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,139 +64,113 @@ namespace Jellyfin.Networking.Configuration public bool EnableHttps { get; set; } /// <summary> - /// Gets or sets the public mapped port. - /// </summary> - /// <value>The public mapped port.</value> - public int PublicPort { get; set; } = DefaultHttpPort; - - /// <summary> - /// Gets or sets a value indicating whether the http port should be mapped as part of UPnP automatic port forwarding. - /// </summary> - public bool UPnPCreateHttpPortMap { get; set; } - - /// <summary> - /// Gets or sets the UDPPortRange. - /// </summary> - public string UDPPortRange { get; set; } = string.Empty; - - /// <summary> - /// Gets or sets a value indicating whether gets or sets IPV6 capability. - /// </summary> - public bool EnableIPV6 { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether gets or sets IPV4 capability. - /// </summary> - public bool EnableIPV4 { get; set; } = true; - - /// <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 a value indicating whether the server should force connections over HTTPS. /// </summary> - public bool EnableSSDPTracing { get; set; } + public bool RequireHttps { get; set; } /// <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 filesystem path of an X.509 certificate to use for SSL. /// </summary> - public string SSDPTracingFilter { get; set; } = string.Empty; + public string CertificatePath { get; set; } = string.Empty; /// <summary> - /// Gets or sets the number of times SSDP UDP messages are sent. + /// Gets or sets the password required to access the X.509 certificate data in the file specified by <see cref="CertificatePath"/>. /// </summary> - public int UDPSendCount { get; set; } = 2; + public string CertificatePassword { get; set; } = string.Empty; /// <summary> - /// Gets or sets the delay between each groups of SSDP messages (in ms). + /// Gets or sets the HTTPS server port number. /// </summary> - public int UDPSendDelay { get; set; } = 100; + /// <value>The HTTPS server port number.</value> + public int HttpsPortNumber { get; set; } = DefaultHttpsPort; /// <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 the public HTTPS port. /// </summary> - public bool IgnoreVirtualInterfaces { get; set; } = true; + /// <value>The public HTTPS port.</value> + public int PublicHttpsPort { get; set; } = DefaultHttpsPort; /// <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 the HTTP server port number. /// </summary> - public string VirtualInterfaceNames { get; set; } = "vEthernet*"; + /// <value>The HTTP server port number.</value> + public int HttpServerPortNumber { get; set; } = DefaultHttpPort; /// <summary> - /// Gets or sets the time (in seconds) between the pings of SSDP gateway monitor. + /// Gets or sets the public mapped port. /// </summary> - public int GatewayMonitorPeriod { get; set; } = 60; + /// <value>The public mapped port.</value> + public int PublicPort { get; set; } = DefaultHttpPort; /// <summary> - /// Gets a value indicating whether multi-socket binding is available. + /// Gets or sets a value indicating whether Autodiscovery is enabled. /// </summary> - public bool EnableMultiSocketBinding { get; } = true; + public bool AutoDiscovery { get; set; } = true; /// <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 a value indicating whether to enable automatic port forwarding. /// </summary> - public bool TrustAllIP6Interfaces { get; set; } + public bool EnableUPnP { get; set; } /// <summary> - /// Gets or sets the ports that HDHomerun uses. + /// Gets or sets a value indicating whether IPv6 is enabled or not. /// </summary> - public string HDHomerunPortRange { get; set; } = string.Empty; + public bool EnableIPV4 { get; set; } = true; /// <summary> - /// Gets or sets the PublishedServerUriBySubnet - /// Gets or sets PublishedServerUri to advertise for specific subnets. + /// Gets or sets a value indicating whether IPv6 is enabled or not. /// </summary> - public string[] PublishedServerUriBySubnet { get; set; } = Array.Empty<string>(); + public bool EnableIPV6 { get; set; } /// <summary> - /// Gets or sets a value indicating whether Autodiscovery tracing is enabled. + /// Gets or sets a value indicating whether access outside of the LAN is permitted. /// </summary> - public bool AutoDiscoveryTracing { get; set; } + public bool EnableRemoteAccess { get; set; } = true; /// <summary> - /// Gets or sets a value indicating whether Autodiscovery is enabled. + /// Gets or sets the subnets that are deemed to make up the LAN. /// </summary> - public bool AutoDiscovery { get; set; } = true; + public string[] LocalNetworkSubnets { get; set; } = Array.Empty<string>(); /// <summary> - /// Gets or sets the filter for remote IP connectivity. Used in conjunction with <seealso cref="IsRemoteIPFilterBlacklist"/>. + /// Gets or sets the interface addresses which Jellyfin will bind to. If empty, all interfaces will be used. /// </summary> - public string[] RemoteIPFilter { get; set; } = Array.Empty<string>(); + public string[] LocalNetworkAddresses { get; set; } = Array.Empty<string>(); /// <summary> - /// Gets or sets a value indicating whether <seealso cref="RemoteIPFilter"/> contains a blacklist or a whitelist. Default is a whitelist. + /// Gets or sets the known proxies. If the proxy is a network, it's added to the KnownNetworks. /// </summary> - public bool IsRemoteIPFilterBlacklist { get; set; } + public string[] KnownProxies { get; set; } = Array.Empty<string>(); /// <summary> - /// Gets or sets a value indicating whether to enable automatic port forwarding. + /// Gets or sets a value indicating whether address names that match <see cref="VirtualInterfaceNames"/> should be Ignore for the purposes of binding. /// </summary> - public bool EnableUPnP { get; set; } + public bool IgnoreVirtualInterfaces { get; set; } = true; /// <summary> - /// Gets or sets a value indicating whether access outside of the LAN is permitted. + /// 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 EnableRemoteAccess { get; set; } = true; + public string[] VirtualInterfaceNames { get; set; } = new string[] { "veth" }; /// <summary> - /// Gets or sets the subnets that are deemed to make up the LAN. + /// Gets or sets a value indicating whether the published server uri is based on information in HTTP requests. /// </summary> - public string[] LocalNetworkSubnets { get; set; } = Array.Empty<string>(); + public bool EnablePublishedServerUriByRequest { get; set; } = false; /// <summary> - /// Gets or sets the interface addresses which Jellyfin will bind to. If empty, all interfaces will be used. + /// Gets or sets the PublishedServerUriBySubnet + /// Gets or sets PublishedServerUri to advertise for specific subnets. /// </summary> - public string[] LocalNetworkAddresses { get; set; } = Array.Empty<string>(); + public string[] PublishedServerUriBySubnet { get; set; } = Array.Empty<string>(); /// <summary> - /// Gets or sets the known proxies. If the proxy is a network, it's added to the KnownNetworks. + /// Gets or sets the filter for remote IP connectivity. Used in conjuntion with <seealso cref="IsRemoteIPFilterBlacklist"/>. /// </summary> - public string[] KnownProxies { get; set; } = Array.Empty<string>(); + public string[] RemoteIPFilter { get; set; } = Array.Empty<string>(); /// <summary> - /// Gets or sets a value indicating whether the published server uri is based on information in HTTP requests. + /// Gets or sets a value indicating whether <seealso cref="RemoteIPFilter"/> contains a blacklist or a whitelist. Default is a whitelist. /// </summary> - public bool EnablePublishedServerUriByRequest { get; set; } = false; + public bool IsRemoteIPFilterBlacklist { get; set; } } } |