Large number of files

This commit is contained in:
Jim Cartlidge
2020-09-12 16:41:37 +01:00
parent 6bf0acb854
commit 9ef79d190b
43 changed files with 1977 additions and 1345 deletions

View File

@@ -6,6 +6,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Jellyfin.Networking\Jellyfin.Networking.csproj" />
<ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
</ItemGroup>

View File

@@ -7,6 +7,7 @@ using System.Net.Sockets;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Jellyfin.Networking.Manager;
using MediaBrowser.Common.Net;
using MediaBrowser.Model.Net;
using Microsoft.Extensions.Logging;
@@ -352,7 +353,7 @@ namespace Rssdp.Infrastructure
if (_enableMultiSocketBinding)
{
foreach (var address in _networkManager.GetLocalIpAddresses())
foreach (var address in _networkManager.GetAllBindInterfaces())
{
if (address.AddressFamily == AddressFamily.InterNetworkV6)
{
@@ -362,7 +363,7 @@ namespace Rssdp.Infrastructure
try
{
sockets.Add(_SocketFactory.CreateSsdpUdpSocket(address, _LocalPort));
sockets.Add(_SocketFactory.CreateSsdpUdpSocket(address.Address, _LocalPort));
}
catch (Exception ex)
{

View File

@@ -5,7 +5,9 @@ using System.Linq;
using System.Net;
using System.Threading;
using System.Threading.Tasks;
using Jellyfin.Networking.Manager;
using MediaBrowser.Common.Net;
using NetworkCollection;
namespace Rssdp.Infrastructure
{
@@ -300,17 +302,14 @@ namespace Rssdp.Infrastructure
foreach (var device in deviceList)
{
if (!_sendOnlyMatchedHost ||
_networkManager.IsInSameSubnet(device.ToRootDevice().Address, remoteEndPoint.Address, device.ToRootDevice().SubnetMask))
var ip1 = new IPNetAddress(device.ToRootDevice().Address, device.ToRootDevice().SubnetMask);
var ip2 = new IPNetAddress(remoteEndPoint.Address, device.ToRootDevice().SubnetMask);
if (!_sendOnlyMatchedHost || ip1.NetworkAddress.Equals(ip2.NetworkAddress))
{
SendDeviceSearchResponses(device, remoteEndPoint, receivedOnlocalIpAddress, cancellationToken);
}
}
}
else
{
// WriteTrace(String.Format("Sending 0 search responses."));
}
});
}