alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 10:04:44 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Auto discover published URL override

Browse Source
This commit is contained in:
Neil Burrows
2020-05-02 17:56:09 +01:00
parent 62e251663f
commit b737301c70
4 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Emby.Server.Implementations/Udp/UdpServer.cs
View File

@@ -7,6 +7,7 @@ using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Controller;
using MediaBrowser.Model.ApiClient;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.Udp
@@ -21,6 +22,12 @@ namespace Emby.Server.Implementations.Udp
/// </summary>
private readonly ILogger _logger;
private readonly IServerApplicationHost _appHost;
private readonly IConfiguration _config;
/// <summary>
/// Address Override Configuration Key
/// </summary>
public const string AddressOverrideConfigKey = "AutoDiscoverAddressOverride";
private Socket _udpSocket;
private IPEndPoint _endpoint;
@@ -31,15 +38,26 @@ namespace Emby.Server.Implementations.Udp
/// <summary>
/// Initializes a new instance of the <see cref="UdpServer" /> class.
/// </summary>
public UdpServer(ILogger logger, IServerApplicationHost appHost)
public UdpServer(ILogger logger, IServerApplicationHost appHost, IConfiguration configuration)
{
_logger = logger;
_appHost = appHost;
_config = configuration;
}
private async Task RespondToV2Message(string messageText, EndPoint endpoint, CancellationToken cancellationToken)
{
var localUrl = await _appHost.GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
string localUrl;
if (!string.IsNullOrEmpty(_config[AddressOverrideConfigKey]))
{
localUrl = _config[AddressOverrideConfigKey];
}
else
{
localUrl = await _appHost.GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
}
if (!string.IsNullOrEmpty(localUrl))
{
@@ -105,7 +123,7 @@ namespace Emby.Server.Implementations.Udp
}
catch (SocketException ex)
{
_logger.LogError(ex, "Failed to receive data drom socket");
_logger.LogError(ex, "Failed to receive data from socket");
}
catch (OperationCanceledException)
{