Compliance fixes for OperationLimits and SetTriggering (#1469)

OPCFoundation · Jul 26, 2021 · b5421ea · b5421ea
1 parent ad0a5af
commit b5421ea
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml b/Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml
@@ -252,7 +252,10 @@
     -->
     <OperationLimits>
       <MaxNodesPerRead>1000</MaxNodesPerRead>
-      <MaxNodesPerBrowse>250</MaxNodesPerBrowse>
+      <MaxNodesPerWrite>1000</MaxNodesPerWrite>
+      <MaxNodesPerMethodCall>250</MaxNodesPerMethodCall>
+      <MaxNodesPerBrowse>2500</MaxNodesPerBrowse>
+      <MaxNodesPerTranslateBrowsePathsToNodeIds>1000</MaxNodesPerTranslateBrowsePathsToNodeIds>
       <MaxMonitoredItemsPerCall>1000</MaxMonitoredItemsPerCall>
     </OperationLimits>
   </ServerConfiguration>

diff --git a/Applications/ReferenceServer/Quickstarts.ReferenceServer.Config.xml b/Applications/ReferenceServer/Quickstarts.ReferenceServer.Config.xml
@@ -258,10 +258,10 @@
     <OperationLimits>
       <MaxNodesPerRead>1000</MaxNodesPerRead>
       <MaxNodesPerWrite>1000</MaxNodesPerWrite>
-      <MaxNodesPerBrowse>2500</MaxNodesPerBrowse>
-      <MaxMonitoredItemsPerCall>500</MaxMonitoredItemsPerCall>
       <MaxNodesPerMethodCall>250</MaxNodesPerMethodCall>
+      <MaxNodesPerBrowse>2500</MaxNodesPerBrowse>
       <MaxNodesPerTranslateBrowsePathsToNodeIds>1000</MaxNodesPerTranslateBrowsePathsToNodeIds>
+      <MaxMonitoredItemsPerCall>1000</MaxMonitoredItemsPerCall>
     </OperationLimits>
   </ServerConfiguration>
 

diff --git a/Libraries/Opc.Ua.Server/Server/StandardServer.cs b/Libraries/Opc.Ua.Server/Server/StandardServer.cs
@@ -1747,9 +1747,15 @@ public virtual void CompletePublish(IEndpointIncomingRequest request)
 
             try
             {
-                ValidateOperationLimits(linksToAdd, OperationLimits.MaxMonitoredItemsPerCall);
-                ValidateOperationLimits(linksToRemove, OperationLimits.MaxMonitoredItemsPerCall);
-                ValidateOperationLimits(linksToAdd.Count + linksToRemove.Count, OperationLimits.MaxMonitoredItemsPerCall);
+                if ((linksToAdd == null || linksToAdd.Count == 0) && (linksToRemove == null || linksToRemove.Count == 0))
+                {
+                    throw new ServiceResultException(StatusCodes.BadNothingToDo);
+                }
+
+                int monitoredItemsCount = 0;
+                monitoredItemsCount += (linksToAdd?.Count) ?? 0;
+                monitoredItemsCount += (linksToRemove?.Count) ?? 0;
+                ValidateOperationLimits(monitoredItemsCount, OperationLimits.MaxMonitoredItemsPerCall);
 
                 ServerInternal.SubscriptionManager.SetTriggering(
                     context,