Merge branch 'SatoshiARA-master'

rdavisau · Jan 10, 2016 · 23ad4e8 · 23ad4e8
2 parents 356d0c5 + 443d458
commit 23ad4e8
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/Sockets/Samples/SocketsSample.XF/SocketsSample.XF.Droid/SocketsSample.XF.Droid.csproj b/Sockets/Samples/SocketsSample.XF/SocketsSample.XF.Droid/SocketsSample.XF.Droid.csproj
@@ -20,7 +20,7 @@
     <MandroidI18n />
     <JavaMaximumHeapSize />
     <JavaOptions />
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Sockets/Sockets.Implementation.NET/UdpSocketBase.cs b/Sockets/Sockets.Implementation.NET/UdpSocketBase.cs
@@ -119,6 +119,7 @@ protected Task SendToAsync(byte[] data, int length, string address, int port)
                 .WrapNativeSocketExceptions();
         }
 
+
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
@@ -141,7 +142,10 @@ private void Dispose(bool disposing)
             if (disposing)
             {
                 if (_backingUdpClient != null)
+                {
                     ((IDisposable)_backingUdpClient).Dispose();
+                    _backingUdpClient = null;
+                }
             }
         }
 

diff --git a/Sockets/Sockets.Implementation.NET/UdpSocketClient.cs b/Sockets/Sockets.Implementation.NET/UdpSocketClient.cs
@@ -30,6 +30,7 @@ public UdpSocketClient()
                 _backingUdpClient = new UdpClient
                 {
                     EnableBroadcast = true
+
                 };
             }
             catch (PlatformSocketException ex)
@@ -48,9 +49,11 @@ public Task ConnectAsync(string address, int port)
         {
             _messageCanceller = new CancellationTokenSource();
 
-            return Task
-                .Run(() => this._backingUdpClient.Connect(address, port))
-                .WrapNativeSocketExceptions();
+            return Task.Run(() => {
+                _backingUdpClient.Connect(address, port);
+                base.RunMessageReceiver(_messageCanceller.Token);
+            })
+            .WrapNativeSocketExceptions();
         }
 
         /// <summary>
@@ -59,10 +62,17 @@ public Task ConnectAsync(string address, int port)
         /// </summary>
         public Task DisconnectAsync()
         {
-            return Task.Run(() =>
-            {
-                _messageCanceller.Cancel();
-                _backingUdpClient.Close();
+            return Task.Run(() => {
+                if (_messageCanceller != null)
+                {
+                    _messageCanceller.Cancel();
+                    _messageCanceller.Dispose();
+                    _messageCanceller = null;
+                }
+                if (_backingUdpClient != null)
+                {
+                    _backingUdpClient.Close();
+                }
             });
         }
 
@@ -110,5 +120,16 @@ public Task DisconnectAsync()
         {
             return base.SendToAsync(data, length, address, port);
         }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public override void Dispose()
+        {
+            if (_messageCanceller != null && !_messageCanceller.IsCancellationRequested)
+                _messageCanceller.Cancel();
+
+            base.Dispose();
+        }
     }
-}
+}