Don't loop for ever waiting for cipher

CreatorDev · Sep 23, 2016 · 060f53b · 060f53b
1 parent 89bd048
commit 060f53b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/src/DTLS.Net/Client.cs b/src/DTLS.Net/Client.cs
@@ -128,8 +128,17 @@ private void ProcessHandshake(DTLSRecord record)
             byte[] data;
             if (_EncyptedServerEpoch.HasValue && (_EncyptedServerEpoch.Value == record.Epoch))
             {
-                while (_Cipher == null)
+
+                int count = 0;
+                while ((_Cipher == null) && (count < 50))
+                {
                     System.Threading.Thread.Sleep(10);
+                    count++;
+                }
+
+                if (_Cipher == null)
+                    throw new Exception();
+
 
                 if (_Cipher != null)
                 {

diff --git a/src/DTLS.Net/Server.cs b/src/DTLS.Net/Server.cs
@@ -362,6 +362,7 @@ private void ProcessRecord(SocketAddress address, Session session, DTLSRecord re
             catch
             {
 #endif
+                SendAlert(session, address, TAlertLevel.Fatal, TAlertDescription.InternalError);
             }
         }
 

diff --git a/src/DTLS.Net/ServerHandshake.cs b/src/DTLS.Net/ServerHandshake.cs
@@ -71,8 +71,17 @@ public void ProcessHandshake(DTLSRecord record)
             byte[] data;
             if ((session != null) && session.IsEncypted(record))
             {
-                while (session.Cipher == null)
+                int count = 0;
+                while ((session.Cipher == null) && (count < 50))
+                {
                     System.Threading.Thread.Sleep(10);
+                    count++;
+                }
+
+                if (session.Cipher == null)
+                {                    
+                    throw new Exception();
+                }
 
                 if (session.Cipher != null)
                 {

diff --git a/src/DTLS.Net/project.json b/src/DTLS.Net/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.18-*",
+  "version": "1.0.19-*",
   "title": "DTLS.Net",
   "description": "DTLS.Net Class Library", 
   "authors": [ "Delme Thomas" ],