lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use GetSmartApiUrl instead (hopefully it works)

Browse Source
This commit is contained in:
cvium 2021-09-07 10:27:55 +02:00
parent ffe5ae8056
commit be9663ae89
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Emby.Server.Implementations/ApplicationHost.cs
View File

@ -1186,14 +1186,7 @@ namespace Emby.Server.Implementations
}
/// <inheritdoc/>
public string GetUrlForUseByHttpApi()
{
// GetBindInterfaces will return an interface.
var bind = NetManager.GetInternalBindAddresses().FirstOrDefault() ??
NetManager.GetAllBindInterfaces(true).First();
return GetLocalApiUrl(bind.Address.ToString(), Uri.UriSchemeHttp);
}
public string GetUrlForUseByHttpApi() => GetSmartApiUrl(string.Empty);
/// <inheritdoc/>
public string GetLocalApiUrl(string hostname, string scheme = null, int? port = null)

8
tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
View File

@ -482,9 +482,9 @@ namespace Jellyfin.Networking.Tests
[InlineData("192.168.1.208/24,-16,eth16|10.0.0.1/24,10,eth7", "192.168.1.0/24", "", "192.168.1.208")] // LAN address is specified by default.
[InlineData("192.168.1.208/24,-16,eth16|10.0.0.1/24,10,eth7", "192.168.1.0/24", "10.0.0.1", "10.0.0.1")] // return bind address
public void Get_Appropriate_Interface_NoSource(string interfaces, string lan, string bind, string result)
public void GetBindInterface_NoSourceGiven_Success(string interfaces, string lan, string bind, string result)
{
var conf = new NetworkConfiguration()
var conf = new NetworkConfiguration
{
EnableIPV4 = true,
LocalNetworkSubnets = lan.Split(','),
@ -506,9 +506,9 @@ namespace Jellyfin.Networking.Tests
[InlineData("192.168.1.208/24,-16,eth16|10.0.0.1/24,10,eth7", "192.168.1.0/24", "10.0.0.1", "192.168.1.209", "10.0.0.1")] // LAN not bound, so return external.
[InlineData("192.168.1.208/24,-16,eth16|10.0.0.1/24,10,eth7", "192.168.1.0/24", "192.168.1.208,10.0.0.1", "8.8.8.8", "10.0.0.1")] // return external bind address
[InlineData("192.168.1.208/24,-16,eth16|10.0.0.1/24,10,eth7", "192.168.1.0/24", "192.168.1.208,10.0.0.1", "192.168.1.210", "192.168.1.208")] // return LAN bind address
public void Get_Appropriate_Interface_ForSource(string interfaces, string lan, string bind, string source, string result)
public void GetBindInterface_ValidSourceGiven_Success(string interfaces, string lan, string bind, string source, string result)
{
var conf = new NetworkConfiguration()
var conf = new NetworkConfiguration
{
EnableIPV4 = true,
LocalNetworkSubnets = lan.Split(','),