- CS 104 slave: don't call function to send ASDUs from Enqueue method

mzillgith · mzillgith · commit 1f38efa57243 · 2018-11-19T16:05:47.000+01:00
diff --git a/examples/cs101-master-balanced/cs101-master-balanced.csproj b/examples/cs101-master-balanced/cs101-master-balanced.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs101masterbalanced</RootNamespace>
     <AssemblyName>cs101-master-balanced</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs101-master-tcp/cs101-master-tcp.csproj b/examples/cs101-master-tcp/cs101-master-tcp.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs101mastertcp</RootNamespace>
     <AssemblyName>cs101-master-tcp</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs101-master-unbalanced/cs101-master-unbalanced.csproj b/examples/cs101-master-unbalanced/cs101-master-unbalanced.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs101_master_unbalanced</RootNamespace>
     <AssemblyName>cs101_master_unbalanced</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs101-slave-balanced/cs101-slave-balanced.csproj b/examples/cs101-slave-balanced/cs101-slave-balanced.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs101slavebalanced</RootNamespace>
     <AssemblyName>cs101-slave-balanced</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs101-slave-tcp/cs101-slave-tcp.csproj b/examples/cs101-slave-tcp/cs101-slave-tcp.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs101_slave_tcp</RootNamespace>
     <AssemblyName>cs101_slave_tcp</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs101-slave-unbalanced/cs101-slave-unbalanced.csproj b/examples/cs101-slave-unbalanced/cs101-slave-unbalanced.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs101slaveunbalanced</RootNamespace>
     <AssemblyName>cs101-slave-unbalanced</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-client1/cs104-client1.csproj b/examples/cs104-client1/cs104-client1.csproj
@@ -7,7 +7,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>testclient</RootNamespace>
     <AssemblyName>testclient</AssemblyName>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-client2/cs104-client2.csproj b/examples/cs104-client2/cs104-client2.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>testclient2</RootNamespace>
     <AssemblyName>testclient2</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-client3/cs104-client3.csproj b/examples/cs104-client3/cs104-client3.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>testclient3</RootNamespace>
     <AssemblyName>testclient3</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-multi-client-server/cs104-multi-client-server.csproj b/examples/cs104-multi-client-server/cs104-multi-client-server.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>multiclientserver</RootNamespace>
     <AssemblyName>multi-client-server</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-redundancy-server/cs104-redundancy-server.csproj b/examples/cs104-redundancy-server/cs104-redundancy-server.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs104redundancyserver</RootNamespace>
     <AssemblyName>cs104-redundancy-server</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-server-file/cs104-server-file.csproj b/examples/cs104-server-file/cs104-server-file.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs104serverfile</RootNamespace>
     <AssemblyName>cs104-server-file</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-server/cs104-server.csproj b/examples/cs104-server/cs104-server.csproj
@@ -7,7 +7,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>testserver</RootNamespace>
     <AssemblyName>testserver</AssemblyName>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-server2/cs104-server2.csproj b/examples/cs104-server2/cs104-server2.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>slave1</RootNamespace>
     <AssemblyName>slave1</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-server3/cs104-server3.csproj b/examples/cs104-server3/cs104-server3.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>cs104server3</RootNamespace>
     <AssemblyName>cs104-server3</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-tls-client/cs104-tls-client.csproj b/examples/cs104-tls-client/cs104-tls-client.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>tlsclient</RootNamespace>
     <AssemblyName>tlsclient</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/examples/cs104-tls-server/cs104-tls-server.csproj b/examples/cs104-tls-server/cs104-tls-server.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>tlsserver</RootNamespace>
     <AssemblyName>tlsserver</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/lib60870.NET.sln b/lib60870.NET.sln
@@ -173,7 +173,7 @@ Global
 		$7.inheritsSet = Mono
 		$7.inheritsScope = text/x-csharp
 		$7.scope = text/x-csharp
-		version = 2.1.0
+		version = 2.2.0
 		StartupItem = lib60870\lib60870.csproj
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
diff --git a/lib60870/CS104/Server.cs b/lib60870/CS104/Server.cs
@@ -236,7 +236,6 @@ public BufferFrame GetNextWaitingASDU(out long timestamp, out int index)
             if (enqueuedASDUs == null)
                 return null;
 
-            //lock (enqueuedASDUs) {
             if (numberOfAsduInQueue > 0)
             {
 
@@ -265,7 +264,6 @@ public BufferFrame GetNextWaitingASDU(out long timestamp, out int index)
 
                 return null;
             }
-            //}
 
             return null;
         }
@@ -476,13 +474,6 @@ public void EnqueueASDU(ASDU asdu)
             if (asduQueue != null)
             {
                 asduQueue.EnqueueAsdu(asdu);
-
-                /* inform active connection that there is a new ASDU */
-                foreach (ClientConnection connection in connections)
-                {
-                    if (connection.IsActive)
-                        connection.ASDUReadyToSend();
-                }
             }
         }
     }
@@ -877,7 +868,6 @@ public void EnqueueASDU(ASDU asdu)
                     if (connection.IsActive)
                     {
                         connection.GetASDUQueue().EnqueueAsdu(asdu);
-                        connection.ASDUReadyToSend();
                     }
                 }
             }
diff --git a/lib60870/lib60870.csproj b/lib60870/lib60870.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>lib60870</RootNamespace>
     <AssemblyName>lib60870</AssemblyName>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/tests/lib60870-tests.csproj b/tests/lib60870-tests.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>tests</RootNamespace>
     <AssemblyName>lib60870-tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
