fix for override ports contained in PublishedServerUrl

pull/5312/head
BaronGreenback 3 years ago
parent 0d3606a746
commit a25e3c0256

@ -313,9 +313,12 @@ namespace Emby.Dlna.Main
_logger.LogInformation("Registering publisher for {0} on {1}", fullService, address);
var uri = new UriBuilder(_appHost.GetSmartApiUrl(address.Address) + descriptorUri);
// DLNA will only work over http, so we must reset to http:// : {port}
uri.Scheme = "http://";
uri.Port = _netConfig.HttpServerPortNumber;
if (string.IsNullOrEmpty(_appHost.PublishedServerUrl))
{
// DLNA will only work over http, so we must reset to http:// : {port}.
uri.Scheme = "http";
uri.Port = _netConfig.HttpServerPortNumber;
}
var device = new SsdpRootDevice
{

@ -135,6 +135,11 @@ namespace Emby.Server.Implementations
public bool CoreStartupHasCompleted { get; private set; }
/// <summary>
/// Gets a value indicating whether this instance has a custom published url.
/// </summary>
public Uri PublishedServerUrl => _startupOptions.PublishedServerUrl;
public virtual bool CanLaunchWebBrowser
{
get
@ -1141,6 +1146,11 @@ namespace Emby.Server.Implementations
/// <inheritdoc/>
public bool ListenWithHttps => Certificate != null && ServerConfigurationManager.GetNetworkConfiguration().EnableHttps;
public string GetStartupOption(string propName)
{
return _startupOptions.GetType().GetProperty(propName).GetValue(src, null);
}
/// <inheritdoc/>
public string GetSmartApiUrl(IPAddress ipAddress, int? port = null)
{

@ -52,6 +52,11 @@ namespace MediaBrowser.Controller
/// <value>The name of the friendly.</value>
string FriendlyName { get; }
/// <summary>
/// Gets a value indicating whether this instance has a custom published url.
/// </summary>
Uri PublishedServerUrl { get; }
/// <summary>
/// Gets the system info.
/// </summary>

Loading…
Cancel
Save