- CS104 Slave: Add function to get number of ASDU in queue

Author: mzillgith

examples/cs104-redundancy-server/Program.cs

@@ -1,32 +1,11 @@
-// /*
-//  *  Copyright 2016, 2017 MZ Automation GmbH
-//  *
-//  *  This file is part of lib60870.NET
-//  *
-//  *  lib60870.NET is free software: you can redistribute it and/or modify
-//  *  it under the terms of the GNU General Public License as published by
-//  *  the Free Software Foundation, either version 3 of the License, or
-//  *  (at your option) any later version.
-//  *
-//  *  lib60870.NET is distributed in the hope that it will be useful,
-//  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  *  GNU General Public License for more details.
-//  *
-//  *  You should have received a copy of the GNU General Public License
-//  *  along with lib60870.NET.  If not, see <http://www.gnu.org/licenses/>.
-//  *
-//  *  See COPYING file for the complete license text.
-//  */
-//
-//
-using System;
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
 
 using lib60870;
 using lib60870.CS101;
 using lib60870.CS104;
-using System.Net;
-using System.Threading;
 
 namespace cs104_redundancy_server
 {

lib60870.NET.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.757
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34714.143
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "lib60870", "lib60870\lib60870.csproj", "{F604286A-1AFC-4355-8C2C-A998CFCEE979}"
 EndProject
@@ -43,6 +43,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cs104-redundancy-server", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cs104-client-file-upload", "examples\cs104-client-file-upload\cs104-client-file-upload.csproj", "{8DAC3BE2-E1C9-4E12-BF11-70FFBAE4C888}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cs104-server4", "examples\cs104-server4\cs104-server4.csproj", "{7A8DD7FA-3248-4DA4-8A6E-3BF673D2C6FE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cs104-server5", "examples\cs104-server5\cs104-server5.csproj", "{E510D4EA-5C1A-4343-8BA7-4E4C941B2CB8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -173,6 +177,22 @@ Global
 		{8DAC3BE2-E1C9-4E12-BF11-70FFBAE4C888}.Release|Any CPU.ActiveCfg = Release|x86
 		{8DAC3BE2-E1C9-4E12-BF11-70FFBAE4C888}.Release|x86.ActiveCfg = Release|x86
 		{8DAC3BE2-E1C9-4E12-BF11-70FFBAE4C888}.Release|x86.Build.0 = Release|x86
+		{7A8DD7FA-3248-4DA4-8A6E-3BF673D2C6FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A8DD7FA-3248-4DA4-8A6E-3BF673D2C6FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A8DD7FA-3248-4DA4-8A6E-3BF673D2C6FE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7A8DD7FA-3248-4DA4-8A6E-3BF673D2C6FE}.Debug|x86.Build.0 = Debug|Any CPU
+		{7A8DD7FA-3248-4DA4-8A6E-3BF673D2C6FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A8DD7FA-3248-4DA4-8A6E-3BF673D2C6FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A8DD7FA-3248-4DA4-8A6E-3BF673D2C6FE}.Release|x86.ActiveCfg = Release|Any CPU
+		{7A8DD7FA-3248-4DA4-8A6E-3BF673D2C6FE}.Release|x86.Build.0 = Release|Any CPU
+		{E510D4EA-5C1A-4343-8BA7-4E4C941B2CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E510D4EA-5C1A-4343-8BA7-4E4C941B2CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E510D4EA-5C1A-4343-8BA7-4E4C941B2CB8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E510D4EA-5C1A-4343-8BA7-4E4C941B2CB8}.Debug|x86.Build.0 = Debug|Any CPU
+		{E510D4EA-5C1A-4343-8BA7-4E4C941B2CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E510D4EA-5C1A-4343-8BA7-4E4C941B2CB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E510D4EA-5C1A-4343-8BA7-4E4C941B2CB8}.Release|x86.ActiveCfg = Release|Any CPU
+		{E510D4EA-5C1A-4343-8BA7-4E4C941B2CB8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

lib60870/CS101/ASDU.cs

@@ -227,12 +227,10 @@ internal void Encode(Frame frame, ApplicationLayerParameters parameters)
                 frame.AppendBytes(payload);
             else
             {
-
                 bool isFirst = true;
 
                 foreach (InformationObject io in informationObjects)
                 {
-
                     if (isFirst)
                     {
                         io.Encode(frame, parameters, false);
@@ -245,7 +243,6 @@ internal void Encode(Frame frame, ApplicationLayerParameters parameters)
                         else
                             io.Encode(frame, parameters, false);
                     }
-
                 }
             }
         }