Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-03 12:23:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply review suggestions

Browse source
This commit is contained in:
Shadowghost 2023-02-20 16:58:22 +01:00
parent c5a363a007
commit a5f16136eb
5 changed files with 92 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MediaBrowser.Common/Net/INetworkManager.cs
View file

@ -76,7 +76,6 @@ namespace MediaBrowser.Common.Net
/// <summary> /// <summary>
/// Retrieves the bind address to use in system URLs. (Server Discovery, PlayTo, LiveTV, SystemInfo) /// Retrieves the bind address to use in system URLs. (Server Discovery, PlayTo, LiveTV, SystemInfo)
/// If no bind addresses are specified, an internal interface address is selected. /// If no bind addresses are specified, an internal interface address is selected.
/// (See <see cref="GetBindAddress(IPAddress, out int?, bool)"/>.
/// </summary> /// </summary>
/// <param name="source">IP address of the request.</param> /// <param name="source">IP address of the request.</param>
/// <param name="port">Optional port returned, if it's part of an override.</param> /// <param name="port">Optional port returned, if it's part of an override.</param>

13
MediaBrowser.Model/Net/IPData.cs
View file

@ -2,13 +2,13 @@ using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.HttpOverrides;
namespace MediaBrowser.Model.Net namespace MediaBrowser.Model.Net;
/// <summary>
/// Base network object class.
/// </summary>
public class IPData
{ {
/// <summary>
/// Base network object class.
/// </summary>
public class IPData
{
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="IPData"/> class. /// Initializes a new instance of the <see cref="IPData"/> class.
/// </summary> /// </summary>
@ -71,5 +71,4 @@ namespace MediaBrowser.Model.Net
} }
} }
} }
}
} }

13
MediaBrowser.Model/Net/ISocketFactory.cs
View file

@ -1,13 +1,13 @@
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
namespace MediaBrowser.Model.Net namespace MediaBrowser.Model.Net;
/// <summary>
/// Implemented by components that can create specific socket configurations.
/// </summary>
public interface ISocketFactory
{ {
/// <summary>
/// Implemented by components that can create specific socket configurations.
/// </summary>
public interface ISocketFactory
{
/// <summary> /// <summary>
/// Creates a new unicast socket using the specified local port number. /// Creates a new unicast socket using the specified local port number.
/// </summary> /// </summary>
@ -32,5 +32,4 @@ namespace MediaBrowser.Model.Net
/// <param name="localPort">The local port to bind to.</param> /// <param name="localPort">The local port to bind to.</param>
/// <returns>A new multicast socket using the specfied bind interface, multicast address, multicast time to live and port.</returns> /// <returns>A new multicast socket using the specfied bind interface, multicast address, multicast time to live and port.</returns>
Socket CreateUdpMulticastSocket(IPAddress multicastAddress, IPData bindInterface, int multicastTimeToLive, int localPort); Socket CreateUdpMulticastSocket(IPAddress multicastAddress, IPData bindInterface, int multicastTimeToLive, int localPort);
}
} }

28
RSSDP/SsdpDeviceLocator.cs
View file

@ -34,30 +34,9 @@ namespace Rssdp.Infrastructure
string osName, string osName,
string osVersion) string osVersion)
{ {
if (communicationsServer is null) ArgumentNullException.ThrowIfNull(communicationsServer);
{ ArgumentNullException.ThrowIfNullOrEmpty(osName);
throw new ArgumentNullException(nameof(communicationsServer)); ArgumentNullException.ThrowIfNullOrEmpty(osVersion);
}
if (osName is null)
{
throw new ArgumentNullException(nameof(osName));
}
if (osName.Length == 0)
{
throw new ArgumentException("osName cannot be an empty string.", nameof(osName));
}
if (osVersion is null)
{
throw new ArgumentNullException(nameof(osVersion));
}
if (osVersion.Length == 0)
{
throw new ArgumentException("osVersion cannot be an empty string.", nameof(osName));
}
_OSName = osName; _OSName = osName;
_OSVersion = osVersion; _OSVersion = osVersion;
@ -363,7 +342,6 @@ namespace Rssdp.Infrastructure
var values = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); var values = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
values["HOST"] = "239.255.255.250:1900"; values["HOST"] = "239.255.255.250:1900";
values["USER-AGENT"] = "UPnP/1.0 DLNADOC/1.50 Platinum/1.0.4.2";
values["USER-AGENT"] = string.Format(CultureInfo.InvariantCulture, "{0}/{1} UPnP/1.0 RSSDP/{2}", _OSName, _OSVersion, SsdpConstants.ServerVersion); values["USER-AGENT"] = string.Format(CultureInfo.InvariantCulture, "{0}/{1} UPnP/1.0 RSSDP/{2}", _OSName, _OSVersion, SsdpConstants.ServerVersion);
values["MAN"] = "\"ssdp:discover\""; values["MAN"] = "\"ssdp:discover\"";

27
RSSDP/SsdpDevicePublisher.cs
View file

@ -40,30 +40,9 @@ namespace Rssdp.Infrastructure
string osVersion, string osVersion,
bool sendOnlyMatchedHost) bool sendOnlyMatchedHost)
{ {
if (communicationsServer is null) ArgumentNullException.ThrowIfNull(communicationsServer);
{ ArgumentNullException.ThrowIfNullOrEmpty(osName);
throw new ArgumentNullException(nameof(communicationsServer)); ArgumentNullException.ThrowIfNullOrEmpty(osVersion);
}
if (osName is null)
{
throw new ArgumentNullException(nameof(osName));
}
if (osName.Length == 0)
{
throw new ArgumentException("osName cannot be an empty string.", nameof(osName));
}
if (osVersion is null)
{
throw new ArgumentNullException(nameof(osVersion));
}
if (osVersion.Length == 0)
{
throw new ArgumentException("osVersion cannot be an empty string.", nameof(osName));
}
_SupportPnpRootDevice = true; _SupportPnpRootDevice = true;
_Devices = new List<SsdpRootDevice>(); _Devices = new List<SsdpRootDevice>();