From 0b5e336b0c2012b990f84b2db84bf3899b442295 Mon Sep 17 00:00:00 2001
From: petermcs <petermcs@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Mon, 16 Feb 2015 10:58:31 +0000
Subject: [PATCH] Simplified code for PROP_LOG_DEVICE_OBJECT_PROPERTY Write
 Property service by using existing bacapp_decode_device_obj_property_ref()
 routine instead of long winded code which didn't handle optional fields
 correctly anyway. Added test in case non zero sub 1 second interval is set as
 this would otherwise result in 0 being stored as we truncate to 1 second
 resolution.

---
 bacnet-stack/demo/object/trendlog.c | 90 ++++-------------------------
 1 file changed, 10 insertions(+), 80 deletions(-)

diff --git a/bacnet-stack/demo/object/trendlog.c b/bacnet-stack/demo/object/trendlog.c
index 98daa70c..267891d9 100644
--- a/bacnet-stack/demo/object/trendlog.c
+++ b/bacnet-stack/demo/object/trendlog.c
@@ -705,94 +705,22 @@ bool Trend_Log_Write_Property(
             break;
 
         case PROP_LOG_DEVICE_OBJECT_PROPERTY:
-            memset(&TempSource, 0, sizeof(TempSource)); /* Start with clean sheet */
-            TempSource.arrayIndex = BACNET_ARRAY_ALL;   /* Need this so if no array index set we read properties in full */
-
-            /* First up is the object ID */
-            len =
-                bacapp_decode_context_data(wp_data->application_data,
-                wp_data->application_data_len, &value,
-                PROP_LOG_DEVICE_OBJECT_PROPERTY);
-            if ((len == 0) || (value.context_tag != 0) ||
-                ((wp_data->application_data_len - len) == 0)) {
-                /* Bad decode, wrong tag or following required parameter missing */
+	        len = bacapp_decode_device_obj_property_ref(wp_data->application_data, &TempSource);
+            if((len < 0) || (len > wp_data->application_data_len)) // Hmm, that didn't go as planned...
+                {
                 wp_data->error_class = ERROR_CLASS_PROPERTY;
                 wp_data->error_code = ERROR_CODE_OTHER;
                 break;
-            }
+                }
 
-            TempSource.objectIdentifier = value.type.Object_Id;
-            wp_data->application_data_len -= len;
-            iOffset = len;
-            /* Second up is the property id */
-            len =
-                bacapp_decode_context_data(&wp_data->application_data[iOffset],
-                wp_data->application_data_len, &value,
-                PROP_LOG_DEVICE_OBJECT_PROPERTY);
-            if ((len == 0) || (value.context_tag != 1)) {
-                /* Bad decode or wrong tag */
-                wp_data->error_class = ERROR_CLASS_PROPERTY;
-                wp_data->error_code = ERROR_CODE_OTHER;
-                break;
-            }
-
-            TempSource.propertyIdentifier = value.type.Enumerated;
-            wp_data->application_data_len -= len;
-
-            /* If there is still more to come */
-            if (wp_data->application_data_len != 0) {
-                iOffset += len;
-                len =
-                    bacapp_decode_context_data(&wp_data->application_data
-                    [iOffset], wp_data->application_data_len, &value,
-                    PROP_LOG_DEVICE_OBJECT_PROPERTY);
-                if ((len == 0) || ((value.context_tag != 2) &&
-                        (value.context_tag != 3))) {
-                    /* Bad decode or wrong tag */
+            // We only support references to objects in ourself for now
+            if((TempSource.deviceIndentifier.type == OBJECT_DEVICE) && (TempSource.deviceIndentifier.instance != Device_Object_Instance_Number()))
+                	{
                     wp_data->error_class = ERROR_CLASS_PROPERTY;
-                    wp_data->error_code = ERROR_CODE_OTHER;
+                    wp_data->error_code = ERROR_CODE_OPTIONAL_FUNCTIONALITY_NOT_SUPPORTED;
                     break;
-                }
-
-                if (value.context_tag == 2) {
-                    /* Got an index so deal with it */
-                    TempSource.arrayIndex = value.type.Unsigned_Int;
-                    wp_data->application_data_len -= len;
-                    /* Still some remaining so fetch potential device ID */
-                    if (wp_data->application_data_len != 0) {
-                        iOffset += len;
-                        len =
-                            bacapp_decode_context_data
-                            (&wp_data->application_data[iOffset],
-                            wp_data->application_data_len, &value,
-                            PROP_LOG_DEVICE_OBJECT_PROPERTY);
-                        if ((len == 0) || (value.context_tag != 3)) {
-                            /* Bad decode or wrong tag */
-                            wp_data->error_class = ERROR_CLASS_PROPERTY;
-                            wp_data->error_code = ERROR_CODE_OTHER;
-                            break;
-                        }
                     }
-                }
 
-                if (value.context_tag == 3) {
-                    /* Got a device ID so deal with it */
-                    TempSource.deviceIndentifier = value.type.Object_Id;
-                    if ((TempSource.deviceIndentifier.instance !=
-                            Device_Object_Instance_Number()) ||
-                        (TempSource.deviceIndentifier.type != OBJECT_DEVICE)) {
-                        /* Not our ID so can't handle it at the moment */
-                        wp_data->error_class = ERROR_CLASS_PROPERTY;
-                        wp_data->error_code =
-                            ERROR_CODE_OPTIONAL_FUNCTIONALITY_NOT_SUPPORTED;
-                        break;
-                    }
-                }
-            }
-            /* Make sure device ID is set to ours in case not supplied */
-            TempSource.deviceIndentifier.type = OBJECT_DEVICE;
-            TempSource.deviceIndentifier.instance =
-                Device_Object_Instance_Number();
             /* Quick comparison if structures are packed ... */
             if (memcmp(&TempSource, &CurrentLog->Source,
                     sizeof(BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE)) != 0) {
@@ -828,6 +756,8 @@ bool Trend_Log_Write_Property(
                 } else {
                     /* We only log to 1 sec accuracy so must divide by 100 before passing it on */
                     CurrentLog->ulLogInterval = value.type.Unsigned_Int / 100;
+					if(0 == CurrentLog->ulLogInterval)
+						CurrentLog->ulLogInterval = 1; /* Interval of 0 is not a good idea */
                 }
             }
             break;