From 273cc883f89c60ad00629880ccae4479cf2bb1b4 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Wed, 24 Aug 2011 12:24:54 +0000
Subject: [PATCH] Added and corrected debugging messages.

---
 bacnet-stack/demo/handler/h_rp.c  | 15 ++++++++++++++-
 bacnet-stack/demo/handler/h_rpm.c | 27 ++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/bacnet-stack/demo/handler/h_rp.c b/bacnet-stack/demo/handler/h_rp.c
index 07c57df8..bdd1389f 100644
--- a/bacnet-stack/demo/handler/h_rp.c
+++ b/bacnet-stack/demo/handler/h_rp.c
@@ -126,7 +126,7 @@ void handler_read_property(
         apdu_len += len;
         if (apdu_len > service_data->max_resp) {
             /* 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 */
             rpdata.error_code = ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
             len = BACNET_STATUS_ABORT;
@@ -139,6 +139,19 @@ void handler_read_property(
 #endif
             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:
diff --git a/bacnet-stack/demo/handler/h_rpm.c b/bacnet-stack/demo/handler/h_rpm.c
index fdc0df20..030f1e0e 100644
--- a/bacnet-stack/demo/handler/h_rpm.c
+++ b/bacnet-stack/demo/handler/h_rpm.c
@@ -289,6 +289,9 @@ void handler_read_property_multiple(
                         memcopy(&Handler_Transmit_Buffer[npdu_len],
                         &Temp_Buf[0], apdu_len, len, MAX_APDU);
                     if (copy_len == 0) {
+#if PRINT_ENABLED
+                        fprintf(stderr, "RPM: Too full to encode property!\r\n");
+#endif
                         rpmdata.error_code =
                             ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
                         error = BACNET_STATUS_ABORT;
@@ -303,6 +306,9 @@ void handler_read_property_multiple(
                         memcopy(&Handler_Transmit_Buffer[npdu_len],
                         &Temp_Buf[0], apdu_len, len, MAX_APDU);
                     if (copy_len == 0) {
+#if PRINT_ENABLED
+                        fprintf(stderr, "RPM: Too full to encode error!\r\n");
+#endif
                         rpmdata.error_code =
                             ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
                         error = BACNET_STATUS_ABORT;
@@ -325,6 +331,10 @@ void handler_read_property_multiple(
                         if (len > 0) {
                             apdu_len += len;
                         } else {
+#if PRINT_ENABLED
+                            fprintf(stderr,
+                                "RPM: Too full for special property!\r\n");
+#endif
                             error = len;
                             goto RPM_FAILURE;
                         }
@@ -340,6 +350,10 @@ void handler_read_property_multiple(
                             if (len > 0) {
                                 apdu_len += len;
                             } else {
+#if PRINT_ENABLED
+                                fprintf(stderr,
+                                    "RPM: Too full for property!\r\n");
+#endif
                                 error = len;
                                 goto RPM_FAILURE;
                             }
@@ -354,6 +368,10 @@ void handler_read_property_multiple(
                 if (len > 0) {
                     apdu_len += len;
                 } else {
+#if PRINT_ENABLED
+                    fprintf(stderr,
+                        "RPM: Too full for individual property!\r\n");
+#endif
                     error = len;
                     goto RPM_FAILURE;
                 }
@@ -366,6 +384,9 @@ void handler_read_property_multiple(
                     memcopy(&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0],
                     apdu_len, len, MAX_APDU);
                 if (copy_len == 0) {
+#if PRINT_ENABLED
+                    fprintf(stderr, "RPM: Too full to encode object end!\r\n");
+#endif
                     rpmdata.error_code =
                         ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
                     error = BACNET_STATUS_ABORT;
@@ -400,7 +421,7 @@ void handler_read_property_multiple(
                 service_data->invoke_id,
                 abort_convert_error_code(rpmdata.error_code), true);
 #if PRINT_ENABLED
-            fprintf(stderr, "RP: Sending Abort!\n");
+            fprintf(stderr, "RPM: Sending Abort!\n");
 #endif
         } else if (error == BACNET_STATUS_ERROR) {
             apdu_len =
@@ -408,7 +429,7 @@ void handler_read_property_multiple(
                 service_data->invoke_id, SERVICE_CONFIRMED_READ_PROP_MULTIPLE,
                 rpmdata.error_class, rpmdata.error_code);
 #if PRINT_ENABLED
-            fprintf(stderr, "RP: Sending Error!\n");
+            fprintf(stderr, "RPM: Sending Error!\n");
 #endif
         } else if (error == BACNET_STATUS_REJECT) {
             apdu_len =
@@ -416,7 +437,7 @@ void handler_read_property_multiple(
                 service_data->invoke_id,
                 reject_convert_error_code(rpmdata.error_code));
 #if PRINT_ENABLED
-            fprintf(stderr, "RP: Sending Reject!\n");
+            fprintf(stderr, "RPM: Sending Reject!\n");
 #endif
         }
     }