fix bug #12 and remove timeouts

lontivero · Aug 9, 2014 · f3c6beb · f3c6beb
1 parent 3d0c611
commit f3c6beb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/Open.Nat/Upnp/UpnpNatDevice.cs b/Open.Nat/Upnp/UpnpNatDevice.cs
@@ -92,9 +92,11 @@ await _soapClient
                         mapping.PublicIP = IPAddress.None;
                         CreatePortMapAsync(mapping);
                         break;
-                    //case UpnpConstants.ExternalPortOnlySupportsWildcard:
-                    //    NatUtility.TraceSource.LogWarn("External Port Only Supports Wildcard");
-                    //    break;
+                    case UpnpConstants.ExternalPortOnlySupportsWildcard:
+                        NatDiscoverer.TraceSource.LogWarn("External Port Only Supports Wildcard");
+                        throw;
+                    default:
+                        throw;
                 }
             }
         }

diff --git a/Open.Nat/Utils/Extensions.cs b/Open.Nat/Utils/Extensions.cs
@@ -103,19 +103,17 @@ internal static string ToPrintableXml(this XmlDocument document)
 
         public static async Task<TResult> TimeoutAfter<TResult>(this Task<TResult> task, TimeSpan timeout)
         {
-#if DEBUG
             return await task;
-#endif
-            var timeoutCancellationTokenSource = new CancellationTokenSource();
+            //var timeoutCancellationTokenSource = new CancellationTokenSource();
 
-            Task completedTask = await Task.WhenAny(task, Task.Delay(timeout, timeoutCancellationTokenSource.Token));
-            if (completedTask == task)
-            {
-                timeoutCancellationTokenSource.Cancel();
-                return await task;
-            }
-            throw new TimeoutException(
-                "The operation has timed out. The network is broken, router has gone or is too busy.");
+            //Task completedTask = await Task.WhenAny(task, Task.Delay(timeout, timeoutCancellationTokenSource.Token));
+            //if (completedTask == task)
+            //{
+            //    timeoutCancellationTokenSource.Cancel();
+            //    return await task;
+            //}
+            //throw new TimeoutException(
+            //    "The operation has timed out. The network is broken, router has gone or is too busy.");
         }
     }
 }