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

Corrected RPM Handler for max APDU size.

Browse Source
This commit is contained in:
skarg
2010-12-23 05:59:09 +00:00
parent 1c560c27b9
commit aa045effaa
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_rpm.c
+15 -15
View File
@@ -243,7 +243,7 @@ void handler_read_property_multiple(
len = rpm_ack_encode_apdu_object_begin(&Temp_Buf[0], &rpmdata); len = rpm_ack_encode_apdu_object_begin(&Temp_Buf[0], &rpmdata);
copy_len = copy_len =
memcopy(&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0], apdu_len, memcopy(&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0], apdu_len,
len, sizeof(Handler_Transmit_Buffer)); len, MAX_APDU);
if (copy_len == 0) { if (copy_len == 0) {
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "RPM: Response too big!\r\n"); fprintf(stderr, "RPM: Response too big!\r\n");
@@ -285,9 +285,8 @@ void handler_read_property_multiple(
rpm_ack_encode_apdu_object_property(&Temp_Buf[0], rpm_ack_encode_apdu_object_property(&Temp_Buf[0],
rpmdata.object_property, rpmdata.array_index); rpmdata.object_property, rpmdata.array_index);
copy_len = copy_len =
memcopy(&Handler_Transmit_Buffer[0], &Temp_Buf[0], memcopy(&Handler_Transmit_Buffer[npdu_len],
npdu_len + apdu_len, len, &Temp_Buf[0], apdu_len, len, MAX_APDU);
sizeof(Handler_Transmit_Buffer));
if (copy_len == 0) { if (copy_len == 0) {
rpmdata.error_code = rpmdata.error_code =
ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
@@ -300,9 +299,8 @@ void handler_read_property_multiple(
ERROR_CLASS_PROPERTY, ERROR_CLASS_PROPERTY,
ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY); ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY);
copy_len = copy_len =
memcopy(&Handler_Transmit_Buffer[0], &Temp_Buf[0], memcopy(&Handler_Transmit_Buffer[npdu_len],
npdu_len + apdu_len, len, &Temp_Buf[0], apdu_len, len, MAX_APDU);
sizeof(Handler_Transmit_Buffer));
if (copy_len == 0) { if (copy_len == 0) {
rpmdata.error_code = rpmdata.error_code =
ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
@@ -320,8 +318,9 @@ void handler_read_property_multiple(
if (property_count == 0) { if (property_count == 0) {
/* handle the error code - but use the special property */ /* handle the error code - but use the special property */
len = len =
RPM_Encode_Property(&Handler_Transmit_Buffer[0], RPM_Encode_Property(
(uint16_t) (npdu_len + apdu_len), MAX_APDU, &Handler_Transmit_Buffer[npdu_len],
(uint16_t) apdu_len, MAX_APDU,
&rpmdata); &rpmdata);
if (len > 0) { if (len > 0) {
apdu_len += len; apdu_len += len;
@@ -335,8 +334,9 @@ void handler_read_property_multiple(
RPM_Object_Property(&property_list, RPM_Object_Property(&property_list,
special_object_property, index); special_object_property, index);
len = len =
RPM_Encode_Property(&Handler_Transmit_Buffer RPM_Encode_Property(
[0], (uint16_t) (npdu_len + apdu_len), &Handler_Transmit_Buffer[npdu_len],
(uint16_t) apdu_len,
MAX_APDU, &rpmdata); MAX_APDU, &rpmdata);
if (len > 0) { if (len > 0) {
apdu_len += len; apdu_len += len;
@@ -350,9 +350,9 @@ void handler_read_property_multiple(
} else { } else {
/* handle an individual property */ /* handle an individual property */
len = len =
RPM_Encode_Property(&Handler_Transmit_Buffer[0], RPM_Encode_Property(&Handler_Transmit_Buffer[npdu_len],
(uint16_t) (npdu_len + apdu_len), (uint16_t) apdu_len,
sizeof(Handler_Transmit_Buffer), &rpmdata); MAX_APDU, &rpmdata);
if (len > 0) { if (len > 0) {
apdu_len += len; apdu_len += len;
} else { } else {
@@ -366,7 +366,7 @@ void handler_read_property_multiple(
len = rpm_ack_encode_apdu_object_end(&Temp_Buf[0]); len = rpm_ack_encode_apdu_object_end(&Temp_Buf[0]);
copy_len = copy_len =
memcopy(&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0], memcopy(&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0],
apdu_len, len, sizeof(Handler_Transmit_Buffer)); apdu_len, len, MAX_APDU);
if (copy_len == 0) { if (copy_len == 0) {
rpmdata.error_code = rpmdata.error_code =
ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;