From a7339f23a5d401bf489d49825a632cc502e78367 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 27 Oct 2016 21:10:39 -0400 Subject: [PATCH] removed dead code --- Mono.Nat/IMapper.cs | 50 ------------ Mono.Nat/Mono.Nat.csproj | 3 - Mono.Nat/NatUtility.cs | 3 - Mono.Nat/Pmp/Mappers/PmpMapper.cs | 69 ---------------- Mono.Nat/Upnp/Mappers/UpnpMapper.cs | 117 ---------------------------- 5 files changed, 242 deletions(-) delete mode 100644 Mono.Nat/IMapper.cs delete mode 100644 Mono.Nat/Pmp/Mappers/PmpMapper.cs delete mode 100644 Mono.Nat/Upnp/Mappers/UpnpMapper.cs diff --git a/Mono.Nat/IMapper.cs b/Mono.Nat/IMapper.cs deleted file mode 100644 index b18e6cff20..0000000000 --- a/Mono.Nat/IMapper.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -// Authors: -// Nicholas Terry -// -// Copyright (C) 2014 Nicholas Terry -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Net.Sockets; -using System.Text; - -namespace Mono.Nat -{ - public enum MapperType - { - Pmp, - Upnp - } - - internal interface IMapper - { - event EventHandler DeviceFound; - - void Map(IPAddress gatewayAddress); - - void Handle(IPAddress localAddres, byte[] response); - } -} diff --git a/Mono.Nat/Mono.Nat.csproj b/Mono.Nat/Mono.Nat.csproj index c31fb3f879..c9d79bbdfd 100644 --- a/Mono.Nat/Mono.Nat.csproj +++ b/Mono.Nat/Mono.Nat.csproj @@ -46,21 +46,18 @@ - - - diff --git a/Mono.Nat/NatUtility.cs b/Mono.Nat/NatUtility.cs index 9c1c4637ab..78788685a9 100644 --- a/Mono.Nat/NatUtility.cs +++ b/Mono.Nat/NatUtility.cs @@ -37,9 +37,6 @@ using System.Net.NetworkInformation; using MediaBrowser.Common.Net; using MediaBrowser.Controller.Dlna; using MediaBrowser.Model.Logging; -using Mono.Nat.Pmp.Mappers; -using Mono.Nat.Upnp; -using Mono.Nat.Upnp.Mappers; namespace Mono.Nat { diff --git a/Mono.Nat/Pmp/Mappers/PmpMapper.cs b/Mono.Nat/Pmp/Mappers/PmpMapper.cs deleted file mode 100644 index 9ca2b88569..0000000000 --- a/Mono.Nat/Pmp/Mappers/PmpMapper.cs +++ /dev/null @@ -1,69 +0,0 @@ -// -// Authors: -// Nicholas Terry -// -// Copyright (C) 2014 Nicholas Terry -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Net.Sockets; -using System.Text; -using Mono.Nat.Pmp; - -namespace Mono.Nat.Pmp.Mappers -{ - internal class PmpMapper : IMapper - { - public event EventHandler DeviceFound; - - public void Map(IPAddress gatewayAddress) - { - } - - public void Handle(IPAddress localAddres, byte[] response) - { - //if (!IsSearchAddress(endpoint.Address)) - // return; - if (response.Length != 12) - return; - if (response[0] != PmpConstants.Version) - return; - if (response[1] != PmpConstants.ServerNoop) - return; - int errorcode = IPAddress.NetworkToHostOrder(BitConverter.ToInt16(response, 2)); - if (errorcode != 0) - NatUtility.Log("Non zero error: {0}", errorcode); - - IPAddress publicIp = new IPAddress(new byte[] { response[8], response[9], response[10], response[11] }); - OnDeviceFound(new DeviceEventArgs(new PmpNatDevice(localAddres, publicIp))); - } - - private void OnDeviceFound(DeviceEventArgs args) - { - if (DeviceFound != null) - DeviceFound(this, args); - } - } -} diff --git a/Mono.Nat/Upnp/Mappers/UpnpMapper.cs b/Mono.Nat/Upnp/Mappers/UpnpMapper.cs deleted file mode 100644 index ddacb4b117..0000000000 --- a/Mono.Nat/Upnp/Mappers/UpnpMapper.cs +++ /dev/null @@ -1,117 +0,0 @@ -// -// Authors: -// Nicholas Terry -// -// Copyright (C) 2014 Nicholas Terry -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Net; -using System.Net.Sockets; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using MediaBrowser.Common.Net; -using MediaBrowser.Model.Logging; - -namespace Mono.Nat.Upnp.Mappers -{ - internal class UpnpMapper : Upnp, IMapper - { - public event EventHandler DeviceFound; - - public UdpClient Client { get; set; } - - public UpnpMapper(ILogger logger, IHttpClient httpClient) - : base(logger, httpClient) - { - //Bind to local port 1900 for ssdp responses - Client = new UdpClient(1900); - } - - public void Map(IPAddress gatewayAddress) - { - //Get the httpu request payload - byte[] data = DiscoverDeviceMessage.EncodeUnicast(gatewayAddress); - - Client.Send(data, data.Length, new IPEndPoint(gatewayAddress, 1900)); - - new Thread(Receive).Start(); - } - - public async void Receive() - { - while (true) - { - IPEndPoint received = new IPEndPoint(IPAddress.Parse("192.168.0.1"), 5351); - if (Client.Available > 0) - { - IPAddress localAddress = ((IPEndPoint)Client.Client.LocalEndPoint).Address; - byte[] data = Client.Receive(ref received); - - await Handle(localAddress, data, received); - } - } - } - - public void Handle(IPAddress localAddres, byte[] response) - { - } - - public override async Task Handle(IPAddress localAddress, byte[] response, IPEndPoint endpoint) - { - // No matter what, this method should never throw an exception. If something goes wrong - // we should still be in a position to handle the next reply correctly. - try - { - var d = await base.Handle(localAddress, response, endpoint).ConfigureAwait(false); - var result = await d.GetServicesList().ConfigureAwait(false); - - if (result) - { - DeviceSetupComplete(d); - } - - return d; - } - catch (Exception ex) - { - Logger.ErrorException("Error mapping port. Data string: {0}", ex, Encoding.UTF8.GetString(response)); - return null; - } - } - - private void DeviceSetupComplete(INatDevice device) - { - OnDeviceFound(new DeviceEventArgs(device)); - } - - private void OnDeviceFound(DeviceEventArgs args) - { - if (DeviceFound != null) - DeviceFound(this, args); - } - } -}