alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-05 07:18:47 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Enforce interface bindings on SSDP, add Loopback to LAN if no LAN defined

Browse Source
This commit is contained in:
Shadowghost
2022-07-21 09:26:18 +02:00
parent 05458a4a42
commit f6e41269d9
5 changed files with 74 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
RSSDP/SsdpCommunicationsServer.cs
View File

@@ -33,7 +33,7 @@ namespace Rssdp.Infrastructure
*/
private object _BroadcastListenSocketSynchroniser = new object();
private ISocket _BroadcastListenSocket;
private List<ISocket> _BroadcastListenSockets;
private object _SendSocketSynchroniser = new object();
private List<ISocket> _sendSockets;
@@ -111,24 +111,21 @@ namespace Rssdp.Infrastructure
{
ThrowIfDisposed();
if (_BroadcastListenSocket == null)
lock (_BroadcastListenSocketSynchroniser)
{
lock (_BroadcastListenSocketSynchroniser)
if (_BroadcastListenSockets == null)
{
if (_BroadcastListenSocket == null)
try
{
try
{
_BroadcastListenSocket = ListenForBroadcastsAsync();
}
catch (SocketException ex)
{
_logger.LogError("Failed to bind to port 1900: {Message}. DLNA will be unavailable", ex.Message);
}
catch (Exception ex)
{
_logger.LogError(ex, "Error in BeginListeningForBroadcasts");
}
_BroadcastListenSockets = ListenForBroadcastsAsync();
}
catch (SocketException ex)
{
_logger.LogError("Failed to bind to port 1900: {Message}. DLNA will be unavailable", ex.Message);
}
catch (Exception ex)
{
_logger.LogError(ex, "Error in BeginListeningForBroadcasts");
}
}
}
@@ -142,11 +139,15 @@ namespace Rssdp.Infrastructure
{
lock (_BroadcastListenSocketSynchroniser)
{
if (_BroadcastListenSocket != null)
if (_BroadcastListenSockets != null)
{
_logger.LogInformation("{0} disposing _BroadcastListenSocket", GetType().Name);
_BroadcastListenSocket.Dispose();
_BroadcastListenSocket = null;
foreach (var socket in _BroadcastListenSockets)
{
socket.Dispose();
}
_BroadcastListenSockets = null;
}
}
}
@@ -336,12 +337,40 @@ namespace Rssdp.Infrastructure
return Task.CompletedTask;
}
private ISocket ListenForBroadcastsAsync()
private List<ISocket> ListenForBroadcastsAsync()
{
var socket = _SocketFactory.CreateUdpMulticastSocket(IPAddress.Parse(SsdpConstants.MulticastLocalAdminAddress), _MulticastTtl, SsdpConstants.MulticastPort);
_ = ListenToSocketInternal(socket);
var sockets = new List<ISocket>();
if (_enableMultiSocketBinding)
{
foreach (var address in _networkManager.GetInternalBindAddresses())
{
if (address.AddressFamily == AddressFamily.InterNetworkV6)
{
// Not support IPv6 right now
continue;
}
return socket;
try
{
sockets.Add(_SocketFactory.CreateUdpMulticastSocket(IPAddress.Parse(SsdpConstants.MulticastLocalAdminAddress), address.Address, _MulticastTtl, SsdpConstants.MulticastPort));
}
catch (Exception ex)
{
_logger.LogError(ex, "Error in ListenForBroadcastsAsync. IPAddress: {0}", address);
}
}
}
else
{
sockets.Add(_SocketFactory.CreateUdpMulticastSocket(IPAddress.Parse(SsdpConstants.MulticastLocalAdminAddress), IPAddress.Any, _MulticastTtl, SsdpConstants.MulticastPort));
}
foreach (var socket in sockets)
{
_ = ListenToSocketInternal(socket);
}
return sockets;
}
private List<ISocket> CreateSocketAndListenForResponsesAsync()