github/open62541
7
0
Fork 0
mirror of https://github.com/open62541/open62541.git synced 2025-06-03 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): Reading a range when using ValueBackend External failed

Browse Source 
Changed to first read the complete DataValue to get timestamps and
status. Then if a range is requested the requested range of
the variant is copied into the DataValue.
This commit is contained in:
Jonas Green 2022-06-16 14:49:19 +02:00 committed by Julius Pfrommer
parent b30001429d
commit d542e2cc9c
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/open62541/types.h
View File

@ -913,6 +913,18 @@ typedef struct {
UA_Boolean hasServerPicoseconds : 1; UA_Boolean hasServerPicoseconds : 1;
} UA_DataValue; } UA_DataValue;
/* Copy the DataValue, but use only a subset of the (multidimensional) array of
* of the variant of the source DataValue. Returns an error code if the variant
* of the DataValue is not an array or if the indicated range does not fit.
*
* @param src The source DataValue
* @param dst The target DataValue
* @param range The range of the variant of the DataValue to copy
* @return Returns UA_STATUSCODE_GOOD or an error code */
UA_StatusCode UA_EXPORT
UA_DataValue_copyVariantRange(const UA_DataValue *src, UA_DataValue * UA_RESTRICT dst,
const UA_NumericRange range);
/** /**
* DiagnosticInfo * DiagnosticInfo
* ^^^^^^^^^^^^^^ * ^^^^^^^^^^^^^^

8
src/server/ua_services_attribute.c
View File

@ -216,10 +216,10 @@ readValueAttributeComplete(UA_Server *server, UA_Session *session,
} }
/* Set the result */ /* Set the result */
if(rangeptr) if(rangeptr)
return UA_Variant_copyRange( retval = UA_DataValue_copyVariantRange(
(const UA_Variant *)&vn->valueBackend.backend.external.value, *vn->valueBackend.backend.external.value, v, *rangeptr);
&v->value, *rangeptr); else
retval = UA_DataValue_copy(*vn->valueBackend.backend.external.value, v); retval = UA_DataValue_copy(*vn->valueBackend.backend.external.value, v);
break; break;
case UA_VALUEBACKENDTYPE_NONE: case UA_VALUEBACKENDTYPE_NONE:
/* Read the value */ /* Read the value */

11
src/ua_types.c
View File

@ -947,6 +947,17 @@ DataValue_copy(UA_DataValue const *src, UA_DataValue *dst,
return retval; return retval;
} }
UA_StatusCode
UA_DataValue_copyVariantRange(const UA_DataValue *src, UA_DataValue * UA_RESTRICT dst,
const UA_NumericRange range) {
memcpy(dst, src, sizeof(UA_DataValue));
UA_Variant_init(&dst->value);
UA_StatusCode retval = UA_Variant_copyRange(&src->value, &dst->value, range);
if(retval != UA_STATUSCODE_GOOD)
DataValue_clear(dst, NULL);
return retval;
}
/* DiagnosticInfo */ /* DiagnosticInfo */
static void static void
DiagnosticInfo_clear(UA_DiagnosticInfo *p, const UA_DataType *_) { DiagnosticInfo_clear(UA_DiagnosticInfo *p, const UA_DataType *_) {