GithubStar/UA-.NETStandard
1
0
Fork 0
mirror of https://github.com/OPCFoundation/UA-.NETStandard.git synced 2026-10-29 07:07:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1684 from mrsuciu/1.4.367roleset

Browse Source 
Initialize well known nodes to default values
ctt fixes (OPCFoundation#1685) 
Assign a default value to any variable in namespace 0
Set status code Good for all BaseVariableState in namespace 0
This commit is contained in:
Suciu Mircea Adrian
2022-01-27 16:44:19 +02:00
committed by GitHub
parent 03c99360ef f9a65094b9
commit cc7fded998
9 changed files with 123 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Opc.Ua.Server/Diagnostics/CustomNodeManager.cs
+11
View File
@@ -583,6 +583,17 @@ namespace Opc.Ua.Server
m_predefinedNodes = new NodeIdDictionary<NodeState>();
}
// assign a default value to any variable in namespace 0
if (node is BaseVariableState nodeStateVar)
{
if (nodeStateVar.NodeId.NamespaceIndex == 0 && nodeStateVar.Value == null)
{
nodeStateVar.Value = TypeInfo.GetDefaultValue(nodeStateVar.DataType,
nodeStateVar.ValueRank,
Server.TypeTree);
}
}
NodeState activeNode = AddBehaviourToPredefinedNode(context, node);
m_predefinedNodes[activeNode.NodeId] = activeNode;
Libraries/Opc.Ua.Server/Diagnostics/DiagnosticsNodeManager.cs
+21 -3
View File
@@ -141,9 +141,9 @@ namespace Opc.Ua.Server
Server.CoreNodeManager.ImportNodes(SystemContext, PredefinedNodes.Values, true);
// hook up the server GetMonitoredItems method.
MethodState getMonitoredItems = (MethodState)FindPredefinedNode(
GetMonitoredItemsMethodState getMonitoredItems = (GetMonitoredItemsMethodState)FindPredefinedNode(
MethodIds.Server_GetMonitoredItems,
typeof(MethodState));
typeof(GetMonitoredItemsMethodState));
if (getMonitoredItems != null)
{
@@ -169,11 +169,29 @@ namespace Opc.Ua.Server
getMonitoredItemsOutputArguments.ClearChangeMasks(SystemContext, false);
}
}
// Subscription Durable mode not supported by the server.
ServerObjectState serverObject = (ServerObjectState)FindPredefinedNode(
ObjectIds.Server,
typeof(ServerObjectState));
if (serverObject != null)
{
NodeState setSubscriptionDurableNode = serverObject.FindChild(
SystemContext,
BrowseNames.SetSubscriptionDurable);
if (setSubscriptionDurableNode != null)
{
DeleteNode(SystemContext, MethodIds.Server_SetSubscriptionDurable);
serverObject.SetSubscriptionDurable = null;
}
}
}
}
/// <summary>
/// Called when a client locks the server.
/// Called when a client gets the monitored items of a subscription.
/// </summary>
public ServiceResult OnGetMonitoredItems(
ISystemContext context,
Libraries/Opc.Ua.Server/Server/ServerInternalData.cs
+14
View File
@@ -602,6 +602,20 @@ namespace Opc.Ua.Server
operationLimits.MaxMonitoredItemsPerCall = null;
}
// setup PublishSubscribe Status State value
PubSubState pubSubState = PubSubState.Disabled;
var default_PubSubState = (BaseVariableState)m_diagnosticsNodeManager.FindPredefinedNode(
VariableIds.PublishSubscribe_Status_State,
typeof(BaseVariableState));
default_PubSubState.Value = pubSubState;
// setup value for SupportedTransportProfiles
var default_SupportedTransportProfiles = (BaseVariableState)m_diagnosticsNodeManager.FindPredefinedNode(
VariableIds.PublishSubscribe_SupportedTransportProfiles,
typeof(BaseVariableState));
default_SupportedTransportProfiles.Value = "uadp";
// setup callbacks for dynamic values.
serverObject.NamespaceArray.OnSimpleReadValue = OnReadNamespaceArray;
serverObject.NamespaceArray.MinimumSamplingInterval = 1000;
Libraries/Opc.Ua.Server/Subscription/SubscriptionManager.cs
+2 -2
View File
@@ -435,10 +435,10 @@ namespace Opc.Ua.Server
if (!NodeId.IsNull(sessionId))
{
// check that the subscrition is the owner.
// check that the subscription is the owner.
if (context != null && !Object.ReferenceEquals(context.Session, subscription.Session))
{
throw new ServiceResultException(StatusCodes.BadSessionIdInvalid);
throw new ServiceResultException(StatusCodes.BadSubscriptionIdInvalid);
}
SessionPublishQueue queue = null;
Stack/Opc.Ua.Core/Stack/Server/ServerBase.cs
+7 -15
View File
@@ -1075,6 +1075,12 @@ namespace Opc.Ua
continue;
}
if (endpointUrl.Port != baseAddress.Url.Port)
{
continue;
}
EndpointDescription translation = new EndpointDescription();
translation.EndpointUrl = baseAddress.Url.ToString();
@@ -1094,22 +1100,8 @@ namespace Opc.Ua
translation.UserIdentityTokens = endpoint.UserIdentityTokens;
translation.Server = application;
// skip duplicates.
bool duplicateFound = false;
translations.Add(translation);
foreach (EndpointDescription existingTranslation in translations)
{
if (existingTranslation.IsEqual(translation))
{
duplicateFound = true;
break;
}
}
if (!duplicateFound)
{
translations.Add(translation);
}
}
}
Stack/Opc.Ua.Core/Stack/State/MethodState.cs
+6 -1
View File
@@ -612,11 +612,16 @@ namespace Opc.Ua
expectedCount = InputArguments.Value.Length;
}
if (expectedCount != inputArguments.Count)
if (expectedCount > inputArguments.Count)
{
return StatusCodes.BadArgumentsMissing;
}
if (expectedCount < inputArguments.Count)
{
return StatusCodes.BadTooManyArguments;
}
// validate individual arguements.
bool error = false;
Stack/Opc.Ua.Core/Stack/State/NodeState.cs
+18 -3
View File
@@ -3454,7 +3454,12 @@ namespace Opc.Ua
value = description;
}
return result;
if (value != null)
{
return result;
}
break;
}
case Attributes.WriteMask:
@@ -3505,7 +3510,12 @@ namespace Opc.Ua
value = rolePermissions;
}
return result;
if (value != null)
{
return result;
}
break;
}
case Attributes.UserRolePermissions:
@@ -3522,7 +3532,12 @@ namespace Opc.Ua
value = userRolePermissions;
}
return result;
if (value != null)
{
return result;
}
break;
}
case Attributes.AccessRestrictions:
Stack/Opc.Ua.Core/Types/BuiltIn/Variant.cs
+43 -12
View File
@@ -861,6 +861,24 @@ namespace Opc.Ua
throw new FormatException(Utils.Format("Invalid format string: '{0}'.", format));
}
/// <summary>
/// Append a ByteString as a hex string.
/// </summary>
private void AppendByteString(StringBuilder buffer, byte[] bytes, IFormatProvider formatProvider)
{
if (bytes != null)
{
for (int ii = 0; ii < bytes.Length; ii++)
{
buffer.AppendFormat(formatProvider, "{0:X2}", bytes[ii]);
}
}
else
{
buffer.Append("(null)");
}
}
/// <summary>
/// Formats a value as a string.
/// </summary>
@@ -877,12 +895,7 @@ namespace Opc.Ua
if (m_typeInfo.BuiltInType == BuiltInType.ByteString && m_typeInfo.ValueRank < 0)
{
byte[] bytes = (byte[])value;
for (int ii = 0; ii < bytes.Length; ii++)
{
buffer.AppendFormat(formatProvider, "{0:X2}", bytes[ii]);
}
AppendByteString(buffer, bytes, formatProvider);
return;
}
@@ -901,15 +914,33 @@ namespace Opc.Ua
{
buffer.Append('{');
if (array.Length > 0)
if (m_typeInfo.BuiltInType == BuiltInType.ByteString)
{
AppendFormat(buffer, array.GetValue(0), formatProvider);
}
if (array.Length > 0)
{
byte[] bytes = (byte[])array.GetValue(0);
AppendByteString(buffer, bytes, formatProvider);
}
for (int ii = 1; ii < array.Length; ii++)
for (int ii = 1; ii < array.Length; ii++)
{
buffer.Append('|');
byte[] bytes = (byte[])array.GetValue(ii);
AppendByteString(buffer, bytes, formatProvider);
}
}
else
{
buffer.Append(" |");
AppendFormat(buffer, array.GetValue(ii), formatProvider);
if (array.Length > 0)
{
AppendFormat(buffer, array.GetValue(0), formatProvider);
}
for (int ii = 1; ii < array.Length; ii++)
{
buffer.Append('|');
AppendFormat(buffer, array.GetValue(ii), formatProvider);
}
}
buffer.Append('}');
Stack/Opc.Ua.Core/Types/Encoders/BinaryDecoder.cs
+1 -1
View File
@@ -2206,7 +2206,7 @@ namespace Opc.Ua
}
else
{
value = new Variant(array);
value = new Variant(array, new TypeInfo(builtInType, 1));
}
}
}