dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected ReadPropertyMultiple for some objects. Added catch for case where malformed RPM-Ack is received.

Browse Source
This commit is contained in:
skarg
2009-05-12 20:23:01 +00:00
parent bbc87574b9
commit fa3607d948
4 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_rpm.c
+5 -4
View File
@@ -235,6 +235,7 @@ int RPM_Encode_Property(
int32_t array_index)
{
int len = 0;
size_t copy_len = 0;
int apdu_len = 0;
BACNET_ERROR_CLASS error_class = ERROR_CLASS_OBJECT;
BACNET_ERROR_CODE error_code = ERROR_CODE_UNKNOWN_OBJECT;
@@ -242,8 +243,8 @@ int RPM_Encode_Property(
len =
rpm_ack_encode_apdu_object_property(&Temp_Buf[0], object_property,
array_index);
len = memcopy(&apdu[0], &Temp_Buf[0], offset, len, max_apdu);
if (!len) {
copy_len = memcopy(&apdu[0], &Temp_Buf[0], offset, len, max_apdu);
if (copy_len == 0) {
return 0;
}
apdu_len += len;
@@ -255,9 +256,9 @@ int RPM_Encode_Property(
len =
rpm_ack_encode_apdu_object_property_error(&Temp_Buf[0],
error_class, error_code);
len =
copy_len =
memcopy(&apdu[0], &Temp_Buf[0], offset + apdu_len, len, max_apdu);
if (!len) {
if (copy_len == 0) {
return 0;
}
} else if ((offset + apdu_len + 1 + len + 1) < max_apdu) {