- CS 104 slave: catch ASDUParserException and close connection when detecting an invalid ASDU

Author: mzillgith

lib60870/CS104/ClientConnection.cs

@@ -119,17 +119,24 @@ private void ProcessASDUs()
 
 			while (callbackThreadRunning) {
 
-				while ((receivedASDUs.Count > 0) && (callbackThreadRunning) && (running)) {
-				
-					ASDU asdu;
-
-					if (receivedASDUs.TryDequeue (out asdu)) {
-						HandleASDU (asdu);
-					}
-						
-				}
+                try {
+    				while ((receivedASDUs.Count > 0) && (callbackThreadRunning) && (running)) {
+    				
+    					ASDU asdu;
+
+    					if (receivedASDUs.TryDequeue (out asdu)) {
+    						HandleASDU (asdu);
+    					}
+    						
+				    }
+
+                    Thread.Sleep (50);
+                }
+                catch (ASDUParsingException) {
+                    DebugLog("Failed to parse ASDU --> close connection");
+                    running = false;
+                }
 
-				Thread.Sleep (50);
 			}
 
 			DebugLog ("ProcessASDUs exit thread");
@@ -341,32 +348,36 @@ private bool isSentBufferFull() {
 				return false;
 		}
 
-		private void PrintSendBuffer() {
-
-			if (oldestSentASDU != -1) {
+        private void PrintSendBuffer() 
+        {
+            if (debugOutput)
+            {
+                if (oldestSentASDU != -1)
+                {
 
-				int currentIndex = oldestSentASDU;
+                    int currentIndex = oldestSentASDU;
 
-				int nextIndex = 0;
+                    int nextIndex = 0;
 
-				DebugLog ("------k-buffer------");
+                    DebugLog("------k-buffer------");
 
-				do {
-					DebugLog (currentIndex + " : S " + sentASDUs[currentIndex].seqNo + " : time " +
-						sentASDUs[currentIndex].sentTime + " : " + sentASDUs[currentIndex].queueIndex);
+                    do
+                    {
+                        DebugLog(currentIndex + " : S " + sentASDUs[currentIndex].seqNo + " : time " +
+                            sentASDUs[currentIndex].sentTime + " : " + sentASDUs[currentIndex].queueIndex);
 
-					if (currentIndex == newestSentASDU)
-						nextIndex = -1;
-					else
-						currentIndex = (currentIndex + 1) % maxSentASDUs;
+                        if (currentIndex == newestSentASDU)
+                            nextIndex = -1;
+                        else
+                            currentIndex = (currentIndex + 1) % maxSentASDUs;
 
-				} while (nextIndex != -1);
+                    } while (nextIndex != -1);
 
-				DebugLog ("--------------------");
+                    DebugLog("--------------------");
 
-			}
-
-		}
+                }
+            }
+        }
 
 		private void sendNextAvailableASDU() 
 		{