removed dead code

Mono.Nat/IMapper.cs

@@ -1,50 +0,0 @@
-//
-// Authors:
-//   Nicholas Terry <nick.i.terry@gmail.com>
-//
-// 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<DeviceEventArgs> DeviceFound;
-
-        void Map(IPAddress gatewayAddress);
-
-        void Handle(IPAddress localAddres, byte[] response);
-    }
-}

Mono.Nat/Mono.Nat.csproj

@@ -46,21 +46,18 @@
     <Compile Include="Enums\ProtocolType.cs" />
     <Compile Include="EventArgs\DeviceEventArgs.cs" />
     <Compile Include="Exceptions\MappingException.cs" />
-    <Compile Include="IMapper.cs" />
     <Compile Include="INatDevice.cs" />
     <Compile Include="ISearcher.cs" />
     <Compile Include="Mapping.cs" />
     <Compile Include="NatProtocol.cs" />
     <Compile Include="NatUtility.cs" />
     <Compile Include="Pmp\AsyncResults\PortMapAsyncResult.cs" />
-    <Compile Include="Pmp\Mappers\PmpMapper.cs" />
     <Compile Include="Pmp\PmpConstants.cs" />
     <Compile Include="Pmp\PmpNatDevice.cs" />
     <Compile Include="Pmp\Searchers\PmpSearcher.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Upnp\AsyncResults\GetAllMappingsAsyncResult.cs" />
     <Compile Include="Upnp\AsyncResults\PortMapAsyncResult.cs" />
-    <Compile Include="Upnp\Mappers\UpnpMapper.cs" />
     <Compile Include="Upnp\Messages\DiscoverDeviceMessage.cs" />
     <Compile Include="Upnp\Messages\ErrorMessage.cs" />
     <Compile Include="Upnp\Messages\GetServicesMessage.cs" />

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
 {

Mono.Nat/Pmp/Mappers/PmpMapper.cs

@@ -1,69 +0,0 @@
-//
-// Authors:
-//   Nicholas Terry <nick.i.terry@gmail.com>
-//
-// 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<DeviceEventArgs> 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);
-        }  
-    }
-}

Mono.Nat/Upnp/Mappers/UpnpMapper.cs

@@ -1,117 +0,0 @@
-//
-// Authors:
-//   Nicholas Terry <nick.i.terry@gmail.com>
-//
-// 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<DeviceEventArgs> 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<UpnpNatDevice> 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);
-        }
-    }
-}