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

Added and corrected debugging messages.

Browse Source
This commit is contained in:
skarg
2011-08-24 12:24:54 +00:00
parent c40b355694
commit 273cc883f8
2 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_rp.c
+14 -1
View File
@@ -126,7 +126,7 @@ void handler_read_property(
apdu_len += len; apdu_len += len;
if (apdu_len > service_data->max_resp) { if (apdu_len > service_data->max_resp) {
/* too big for the sender - send an abort /* too big for the sender - send an abort
* Setting of error code needed here as read property processing may * Setting of error code needed here as read property processing may
* have overriden the default set at start */ * have overriden the default set at start */
rpdata.error_code = ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; rpdata.error_code = ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
len = BACNET_STATUS_ABORT; len = BACNET_STATUS_ABORT;
@@ -139,6 +139,19 @@ void handler_read_property(
#endif #endif
error = false; error = false;
} }
} else {
#if PRINT_ENABLED
fprintf(stderr, "RP: Device_Read_Property: ");
if (len == BACNET_STATUS_ABORT) {
fprintf(stderr, "Abort!\n");
} else if (len == BACNET_STATUS_ERROR) {
fprintf(stderr, "Error!\n");
} else if (len == BACNET_STATUS_REJECT) {
fprintf(stderr, "Reject!\n");
} else {
fprintf(stderr, "Unknown Len=%d\n", len);
}
#endif
} }
RP_FAILURE: RP_FAILURE:
bacnet-stack/demo/handler/h_rpm.c
+24 -3
View File
@@ -289,6 +289,9 @@ void handler_read_property_multiple(
memcopy(&Handler_Transmit_Buffer[npdu_len], memcopy(&Handler_Transmit_Buffer[npdu_len],
&Temp_Buf[0], apdu_len, len, MAX_APDU); &Temp_Buf[0], apdu_len, len, MAX_APDU);
if (copy_len == 0) { if (copy_len == 0) {
#if PRINT_ENABLED
fprintf(stderr, "RPM: Too full to encode property!\r\n");
#endif
rpmdata.error_code = rpmdata.error_code =
ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
error = BACNET_STATUS_ABORT; error = BACNET_STATUS_ABORT;
@@ -303,6 +306,9 @@ void handler_read_property_multiple(
memcopy(&Handler_Transmit_Buffer[npdu_len], memcopy(&Handler_Transmit_Buffer[npdu_len],
&Temp_Buf[0], apdu_len, len, MAX_APDU); &Temp_Buf[0], apdu_len, len, MAX_APDU);
if (copy_len == 0) { if (copy_len == 0) {
#if PRINT_ENABLED
fprintf(stderr, "RPM: Too full to encode error!\r\n");
#endif
rpmdata.error_code = rpmdata.error_code =
ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
error = BACNET_STATUS_ABORT; error = BACNET_STATUS_ABORT;
@@ -325,6 +331,10 @@ void handler_read_property_multiple(
if (len > 0) { if (len > 0) {
apdu_len += len; apdu_len += len;
} else { } else {
#if PRINT_ENABLED
fprintf(stderr,
"RPM: Too full for special property!\r\n");
#endif
error = len; error = len;
goto RPM_FAILURE; goto RPM_FAILURE;
} }
@@ -340,6 +350,10 @@ void handler_read_property_multiple(
if (len > 0) { if (len > 0) {
apdu_len += len; apdu_len += len;
} else { } else {
#if PRINT_ENABLED
fprintf(stderr,
"RPM: Too full for property!\r\n");
#endif
error = len; error = len;
goto RPM_FAILURE; goto RPM_FAILURE;
} }
@@ -354,6 +368,10 @@ void handler_read_property_multiple(
if (len > 0) { if (len > 0) {
apdu_len += len; apdu_len += len;
} else { } else {
#if PRINT_ENABLED
fprintf(stderr,
"RPM: Too full for individual property!\r\n");
#endif
error = len; error = len;
goto RPM_FAILURE; goto RPM_FAILURE;
} }
@@ -366,6 +384,9 @@ void handler_read_property_multiple(
memcopy(&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0], memcopy(&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0],
apdu_len, len, MAX_APDU); apdu_len, len, MAX_APDU);
if (copy_len == 0) { if (copy_len == 0) {
#if PRINT_ENABLED
fprintf(stderr, "RPM: Too full to encode object end!\r\n");
#endif
rpmdata.error_code = rpmdata.error_code =
ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED; ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
error = BACNET_STATUS_ABORT; error = BACNET_STATUS_ABORT;
@@ -400,7 +421,7 @@ void handler_read_property_multiple(
service_data->invoke_id, service_data->invoke_id,
abort_convert_error_code(rpmdata.error_code), true); abort_convert_error_code(rpmdata.error_code), true);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "RP: Sending Abort!\n"); fprintf(stderr, "RPM: Sending Abort!\n");
#endif #endif
} else if (error == BACNET_STATUS_ERROR) { } else if (error == BACNET_STATUS_ERROR) {
apdu_len = apdu_len =
@@ -408,7 +429,7 @@ void handler_read_property_multiple(
service_data->invoke_id, SERVICE_CONFIRMED_READ_PROP_MULTIPLE, service_data->invoke_id, SERVICE_CONFIRMED_READ_PROP_MULTIPLE,
rpmdata.error_class, rpmdata.error_code); rpmdata.error_class, rpmdata.error_code);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "RP: Sending Error!\n"); fprintf(stderr, "RPM: Sending Error!\n");
#endif #endif
} else if (error == BACNET_STATUS_REJECT) { } else if (error == BACNET_STATUS_REJECT) {
apdu_len = apdu_len =
@@ -416,7 +437,7 @@ void handler_read_property_multiple(
service_data->invoke_id, service_data->invoke_id,
reject_convert_error_code(rpmdata.error_code)); reject_convert_error_code(rpmdata.error_code));
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "RP: Sending Reject!\n"); fprintf(stderr, "RPM: Sending Reject!\n");
#endif #endif
} }
} }