1 files changed, 22 insertions, 10 deletions

diff --git a/RSSDP/SsdpDevicePublisher.cs b/RSSDP/SsdpDevicePublisher.cs
index 921f33c21..7f3e56394 100644
--- a/RSSDP/SsdpDevicePublisher.cs
+++ b/RSSDP/SsdpDevicePublisher.cs
@@ -2,13 +2,10 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Net.Http;
-using System.Text;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Net;
 using MediaBrowser.Common.Net;
-using Rssdp;
 
 namespace Rssdp.Infrastructure
 {
@@ -199,7 +196,12 @@ namespace Rssdp.Infrastructure
             }
         }
 
-        private void ProcessSearchRequest(string mx, string searchTarget, IpEndPointInfo remoteEndPoint, IpAddressInfo receivedOnlocalIpAddress, CancellationToken cancellationToken)
+        private void ProcessSearchRequest(
+            string mx,
+            string searchTarget,
+            IPEndPoint remoteEndPoint,
+            IPAddress receivedOnlocalIpAddress,
+            CancellationToken cancellationToken)
         {
             if (String.IsNullOrEmpty(searchTarget))
             {
@@ -258,7 +260,7 @@ namespace Rssdp.Infrastructure
                     foreach (var device in deviceList)
                     {
                         if (!_sendOnlyMatchedHost ||
-                            _networkManager.IsInSameSubnet(device.ToRootDevice().Address, remoteEndPoint.IpAddress, device.ToRootDevice().SubnetMask))
+                            _networkManager.IsInSameSubnet(device.ToRootDevice().Address, remoteEndPoint.Address, device.ToRootDevice().SubnetMask))
                         {
                             SendDeviceSearchResponses(device, remoteEndPoint, receivedOnlocalIpAddress, cancellationToken);
                         }
@@ -276,7 +278,11 @@ namespace Rssdp.Infrastructure
             return _Devices.Union(_Devices.SelectManyRecursive<SsdpDevice>((d) => d.Devices));
         }
 
-        private void SendDeviceSearchResponses(SsdpDevice device, IpEndPointInfo endPoint, IpAddressInfo receivedOnlocalIpAddress, CancellationToken cancellationToken)
+        private void SendDeviceSearchResponses(
+            SsdpDevice device,
+            IPEndPoint endPoint,
+            IPAddress receivedOnlocalIpAddress,
+            CancellationToken cancellationToken)
         {
             bool isRootDevice = (device as SsdpRootDevice) != null;
             if (isRootDevice)
@@ -296,7 +302,13 @@ namespace Rssdp.Infrastructure
             return String.Format("{0}::{1}", udn, fullDeviceType);
         }
 
-        private async void SendSearchResponse(string searchTarget, SsdpDevice device, string uniqueServiceName, IpEndPointInfo endPoint, IpAddressInfo receivedOnlocalIpAddress, CancellationToken cancellationToken)
+        private async void SendSearchResponse(
+            string searchTarget,
+            SsdpDevice device,
+            string uniqueServiceName,
+            IPEndPoint endPoint,
+            IPAddress receivedOnlocalIpAddress,
+            CancellationToken cancellationToken)
         {
             var rootDevice = device.ToRootDevice();
 
@@ -333,7 +345,7 @@ namespace Rssdp.Infrastructure
             //WriteTrace(String.Format("Sent search response to " + endPoint.ToString()), device);
         }
 
-        private bool IsDuplicateSearchRequest(string searchTarget, IpEndPointInfo endPoint)
+        private bool IsDuplicateSearchRequest(string searchTarget, IPEndPoint endPoint)
         {
             var isDuplicateRequest = false;
 
@@ -556,7 +568,7 @@ namespace Rssdp.Infrastructure
 
         private class SearchRequest
         {
-            public IpEndPointInfo EndPoint { get; set; }
+            public IPEndPoint EndPoint { get; set; }
             public DateTime Received { get; set; }
             public string SearchTarget { get; set; }