jellyfin/jellyfin-plugin-dlna
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-plugin-dlna.git synced 2024-11-26 16:00:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix TTL not following SsdpConstants (#88)
Some checks failed
🏗️ Build Plugin / call (push) Has been cancelled
Details
📝 Create/Update Release Draft & Release Bump PR / call (push) Has been cancelled
Details
🔬 Run CodeQL / call (push) Has been cancelled
Details
🧪 Test Plugin / call (push) Has been cancelled
Details
🏷️ Sync labels / call (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Gleb Salmanov 2024-10-30 02:23:50 +03:00 committed by GitHub
parent 119996f614
commit de7fc62660
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Rssdp/SsdpCommunicationsServer.cs
View File

@ -363,7 +363,7 @@ namespace Rssdp.Infrastructure
{
try
{
var socket = CreateUdpMulticastSocket(multicastGroupAddress, intf, _MulticastTtl, SsdpConstants.MulticastPort);
var socket = CreateUdpMulticastSocket(multicastGroupAddress, intf, SsdpConstants.MulticastPort);
_ = ListenToSocketInternal(socket, intf);
sockets.Add(socket);
}
@ -385,7 +385,7 @@ namespace Rssdp.Infrastructure
{
try
{
var socket = CreateSsdpUdpSocket(intf, _LocalPort);
var socket = CreateSsdpUdpSocket(intf, _MulticastTtl, _LocalPort);
_ = ListenToSocketInternal(socket, intf);
sockets.Add(socket);
}
@ -507,11 +507,16 @@ namespace Rssdp.Infrastructure
});
}
private Socket CreateSsdpUdpSocket(IPData bindInterface, int localPort)
private Socket CreateSsdpUdpSocket(IPData bindInterface, int multicastTimeToLive, int localPort)
{
var interfaceAddress = bindInterface.Address;
ArgumentNullException.ThrowIfNull(interfaceAddress);
if (multicastTimeToLive <= 0)
{
throw new ArgumentException("multicastTimeToLive cannot be zero or less.", nameof(multicastTimeToLive));
}
if (localPort < 0)
{
throw new ArgumentException("localPort cannot be less than zero.", nameof(localPort));
@ -521,6 +526,7 @@ namespace Rssdp.Infrastructure
try
{
socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
socket.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive, multicastTimeToLive);
socket.Bind(new IPEndPoint(interfaceAddress, localPort));
return socket;
@ -533,17 +539,12 @@ namespace Rssdp.Infrastructure
}
}
private Socket CreateUdpMulticastSocket(IPAddress multicastAddress, IPData bindInterface, int multicastTimeToLive, int localPort)
private Socket CreateUdpMulticastSocket(IPAddress multicastAddress, IPData bindInterface, int localPort)
{
var bindIPAddress = bindInterface.Address;
ArgumentNullException.ThrowIfNull(multicastAddress);
ArgumentNullException.ThrowIfNull(bindIPAddress);
if (multicastTimeToLive <= 0)
{
throw new ArgumentException("multicastTimeToLive cannot be zero or less.", nameof(multicastTimeToLive));
}
if (localPort < 0)
{
throw new ArgumentException("localPort cannot be less than zero.", nameof(localPort));
@ -556,7 +557,6 @@ namespace Rssdp.Infrastructure
socket.MulticastLoopback = false;
socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
socket.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.PacketInformation, true);
socket.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive, multicastTimeToLive);
if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
{