Preferer a higher SecurityMode over SecurityLevel in CoreClientUtils.…

…SelectEndpoint() (#1405)
OPCFoundation · May 20, 2021 · 6d23272 · 6d23272
1 parent af6b2b4
commit 6d23272
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Libraries/Opc.Ua.Client/CoreClientUtils.cs b/Libraries/Opc.Ua.Client/CoreClientUtils.cs
@@ -282,7 +282,11 @@ int discoverTimeout
                     // The security level is a relative measure assigned by the server to the 
                     // endpoints that it returns. Clients should always pick the highest level
                     // unless they have a reason not too.
-                    if (endpoint.SecurityLevel > selectedEndpoint.SecurityLevel)
+                    // Some servers however, mess this up a bit. So prefer a higher SecurityMode
+                    // over the SecurityLevel.
+                    if (endpoint.SecurityMode > selectedEndpoint.SecurityMode
+                        || (endpoint.SecurityMode == selectedEndpoint.SecurityMode
+                            && endpoint.SecurityLevel > selectedEndpoint.SecurityLevel))
                     {
                         selectedEndpoint = endpoint;
                     }