Revert useless change in ISearcher

Put back .Net 4.5 implementations that have been replace by .Net 3.5 implementations
Fixed indentation

Author: Michael Catanzariti

Open.Nat/Discovery/ISearcher.cs

@@ -24,7 +24,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Threading;
@@ -33,11 +32,7 @@ namespace Open.Nat
 {
     internal interface ISearcher
     {
-#if NET45
         void Search(CancellationToken cancellationToken);
-#elif NET35
-        void Search();
-#endif
         IEnumerable<NatDevice> Receive();
         NatDevice AnalyseReceivedResponse(IPAddress localAddress, byte[] response, IPEndPoint endpoint);
     }

Open.Nat/Discovery/Searcher.cs

@@ -74,6 +74,7 @@ await Task.Factory.StartNew(_ =>
             return _devices;
         }
 #endif
+
         private void Discover(CancellationToken cancelationToken)
         {
             if(DateTime.UtcNow < NextSearch) return;

Open.Nat/NatDiscoverer.cs

@@ -108,6 +108,7 @@ public async Task<NatDevice> DiscoverDeviceAsync(PortMapper portMapper, Cancella
             return device;
         }
 #endif
+
         /// <summary>
         /// Discovers and returns all NAT devices for the specified type. If no NAT device is found it returns an empty enumerable
         /// </summary>
@@ -237,6 +238,7 @@ internal static void ReleaseSessionMappings()
 
         private static void RenewMappings(object state)
         {
+#if NET35
             Task.Factory.StartNew(()=>
             {
                 Task task = null;
@@ -246,6 +248,15 @@ private static void RenewMappings(object state)
                     task = (task == null) ? device.RenewMappings() : task.ContinueWith(t => d.RenewMappings());
                 }
             });
+#else
+            Task.Factory.StartNew(async () =>
+            {
+                foreach (var device in Devices.Values)
+                {
+                    await device.RenewMappings();
+                }
+            });
+#endif
         }
     }
 }

Open.Nat/Pmp/PmpNatDevice.cs

@@ -86,7 +86,11 @@ public override Task<IEnumerable<Mapping>> GetAllMappingsAsync()
 
         public override Task<IPAddress> GetExternalIPAsync()
         {
+#if NET35
             return Task.Factory.StartNew(() => _publicAddress)
+#else
+            return Task.Run(() => _publicAddress)
+#endif
                 .TimeoutAfter(TimeSpan.FromSeconds(4));
         }
 

Open.Nat/Upnp/UpnpNatDevice.cs

@@ -37,16 +37,16 @@
 namespace Open.Nat
 {
     internal sealed class UpnpNatDevice : NatDevice
-	{
-	    internal readonly UpnpNatDeviceInfo DeviceInfo;
+    {
+        internal readonly UpnpNatDeviceInfo DeviceInfo;
         private readonly SoapClient _soapClient;
 
-        internal UpnpNatDevice (UpnpNatDeviceInfo deviceInfo)
-		{
+        internal UpnpNatDevice(UpnpNatDeviceInfo deviceInfo)
+        {
             Touch();
             DeviceInfo = deviceInfo;
             _soapClient = new SoapClient(DeviceInfo.ServiceControlUri, DeviceInfo.ServiceType);
-		}
+        }
 
 #if NET35
         public override Task<IPAddress> GetExternalIPAsync()
@@ -65,7 +65,7 @@ public override Task<IPAddress> GetExternalIPAsync()
         }
 #else
         public override async Task<IPAddress> GetExternalIPAsync()
-	    {
+        {
             NatDiscoverer.TraceSource.LogInfo("GetExternalIPAsync - Getting external IP address");
             var message = new GetExternalIPAddressRequestMessage();
             var responseData = await _soapClient
@@ -216,30 +216,30 @@ public override Task DeletePortMapAsync(Mapping mapping)
         }
 #else
         public override async Task DeletePortMapAsync(Mapping mapping)
-		{
+        {
             Guard.IsNotNull(mapping, "mapping");
 
             if (mapping.PrivateIP.Equals(IPAddress.None)) mapping.PrivateIP = DeviceInfo.LocalAddress;
 
             NatDiscoverer.TraceSource.LogInfo("DeletePortMapAsync - Deleteing port mapping {0}", mapping);
 
             try
-		    {
+            {
                 var message = new DeletePortMappingRequestMessage(mapping);
                 await _soapClient
                     .InvokeAsync("DeletePortMapping", message.ToXml())
                     .TimeoutAfter(TimeSpan.FromSeconds(4));
                 UnregisterMapping(mapping);
             }
-		    catch (MappingException e)
-		    {
+            catch (MappingException e)
+            {
                 if(e.ErrorCode != UpnpConstants.NoSuchEntryInArray) throw; 
-		    }
+            }
         }
 #endif
 
 #if NET35
-        public void GetGenericMappingAsync(int index, List<Mapping> mappings, 
+        public void GetGenericMappingAsync(int index, List<Mapping> mappings,
             TaskCompletionSource<IEnumerable<Mapping>> taskCompletionSource)
         {
             var message = new GetGenericPortMappingEntry(index);
@@ -314,9 +314,9 @@ public override Task<IEnumerable<Mapping>> GetAllMappingsAsync()
         }
 #else
         public override async Task<IEnumerable<Mapping>> GetAllMappingsAsync()
-		{
+        {
             var index = 0;
-		    var mappings = new List<Mapping>();
+            var mappings = new List<Mapping>();
 
             NatDiscoverer.TraceSource.LogInfo("GetAllMappingsAsync - Getting all mappings");
             while (true)
@@ -410,7 +410,7 @@ public override Task<Mapping> GetSpecificMappingAsync(Protocol protocol, int por
         }
 #else
         public override async Task<Mapping> GetSpecificMappingAsync (Protocol protocol, int port)
-		{
+        {
             Guard.IsTrue(protocol == Protocol.Tcp || protocol == Protocol.Udp, "protocol");
             Guard.IsInRange(port, 0, ushort.MaxValue, "port");
 
@@ -448,12 +448,12 @@ public override async Task<Mapping> GetSpecificMappingAsync (Protocol protocol,
         }
 #endif
 
-        public override string ToString( )
+        public override string ToString()
         {
             //GetExternalIP is blocking and can throw exceptions, can't use it here.
-            return String.Format( 
+            return String.Format(
                 "EndPoint: {0}\nControl Url: {1}\nService Type: {2}\nLast Seen: {3}",
-                DeviceInfo.HostEndPoint, DeviceInfo.ServiceControlUri,  DeviceInfo.ServiceType, LastSeen);
+                DeviceInfo.HostEndPoint, DeviceInfo.ServiceControlUri, DeviceInfo.ServiceType, LastSeen);
         }
-	}
+    }
 }

Open.Nat/Utils/Extensions.cs

@@ -119,7 +119,7 @@ public static Task<TResult> TimeoutAfter<TResult>(this Task<TResult> task, TimeS
                 "The operation has timed out. The network is broken, router has gone or is too busy.");
         }
 #else
-    public static async Task<TResult> TimeoutAfter<TResult>(this Task<TResult> task, TimeSpan timeout)
+        public static async Task<TResult> TimeoutAfter<TResult>(this Task<TResult> task, TimeSpan timeout)
         {
 #if DEBUG
             return await task;