aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations
diff options
context:
space:
mode:
Diffstat (limited to 'Emby.Server.Implementations')
-rw-r--r--Emby.Server.Implementations/ApplicationHost.cs4
-rw-r--r--Emby.Server.Implementations/Emby.Server.Implementations.csproj1
-rw-r--r--Emby.Server.Implementations/Net/SocketFactory.cs80
-rw-r--r--Emby.Server.Implementations/SystemManager.cs1
4 files changed, 0 insertions, 86 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 4540ab205..895542409 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -13,7 +13,6 @@ using System.Net;
using System.Reflection;
using System.Security.Cryptography.X509Certificates;
using System.Threading.Tasks;
-using Emby.Dlna.Main;
using Emby.Naming.Common;
using Emby.Photos;
using Emby.Server.Implementations.Channels;
@@ -867,9 +866,6 @@ namespace Emby.Server.Implementations
// MediaEncoding
yield return typeof(MediaBrowser.MediaEncoding.Encoder.MediaEncoder).Assembly;
- // Dlna
- yield return typeof(DlnaHost).Assembly;
-
// Local metadata
yield return typeof(BoxSetXmlSaver).Assembly;
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 905f36e43..abe387181 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -14,7 +14,6 @@
<ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
<ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj" />
<ProjectReference Include="..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj" />
- <ProjectReference Include="..\Emby.Dlna\Emby.Dlna.csproj" />
<ProjectReference Include="..\MediaBrowser.LocalMetadata\MediaBrowser.LocalMetadata.csproj" />
<ProjectReference Include="..\Emby.Photos\Emby.Photos.csproj" />
<ProjectReference Include="..\src\Jellyfin.Drawing\Jellyfin.Drawing.csproj" />
diff --git a/Emby.Server.Implementations/Net/SocketFactory.cs b/Emby.Server.Implementations/Net/SocketFactory.cs
index 2bcd5eab2..a3484f43e 100644
--- a/Emby.Server.Implementations/Net/SocketFactory.cs
+++ b/Emby.Server.Implementations/Net/SocketFactory.cs
@@ -1,7 +1,5 @@
using System;
-using System.Linq;
using System.Net;
-using System.Net.NetworkInformation;
using System.Net.Sockets;
using MediaBrowser.Model.Net;
@@ -37,83 +35,5 @@ namespace Emby.Server.Implementations.Net
throw;
}
}
-
- /// <inheritdoc />
- public Socket CreateSsdpUdpSocket(IPData bindInterface, int localPort)
- {
- var interfaceAddress = bindInterface.Address;
- ArgumentNullException.ThrowIfNull(interfaceAddress);
-
- if (localPort < 0)
- {
- throw new ArgumentException("localPort cannot be less than zero.", nameof(localPort));
- }
-
- var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
- try
- {
- socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
- socket.Bind(new IPEndPoint(interfaceAddress, localPort));
-
- return socket;
- }
- catch
- {
- socket.Dispose();
-
- throw;
- }
- }
-
- /// <inheritdoc />
- public Socket CreateUdpMulticastSocket(IPAddress multicastAddress, IPData bindInterface, int multicastTimeToLive, 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));
- }
-
- var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-
- try
- {
- 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())
- {
- socket.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(multicastAddress));
- socket.Bind(new IPEndPoint(multicastAddress, localPort));
- }
- else
- {
- // Only create socket if interface supports multicast
- var interfaceIndex = bindInterface.Index;
- var interfaceIndexSwapped = IPAddress.HostToNetworkOrder(interfaceIndex);
-
- socket.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(multicastAddress, interfaceIndex));
- socket.Bind(new IPEndPoint(bindIPAddress, localPort));
- }
-
- return socket;
- }
- catch
- {
- socket.Dispose();
-
- throw;
- }
- }
}
}
diff --git a/Emby.Server.Implementations/SystemManager.cs b/Emby.Server.Implementations/SystemManager.cs
index 2c477218f..c4552474c 100644
--- a/Emby.Server.Implementations/SystemManager.cs
+++ b/Emby.Server.Implementations/SystemManager.cs
@@ -1,4 +1,3 @@
-using System;
using System.Linq;
using System.Threading.Tasks;
using MediaBrowser.Common.Configuration;