Removed wildcard match for Device Instance since it is only done for ReadProperty and ReadPropertyMultiple services, and the match is done by substitution in those service handlers.

2012-07-09 21:52:19 +00:00
parent 7578b4ef06
commit b6b852ef08
11 changed files with 18 additions and 25 deletions
@@ -123,8 +123,7 @@ bool Device_Valid_Object_Instance_Number(
    uint32_t object_id)
 {
    /* BACnet allows for a wildcard instance number */
-    return ((Object_Instance_Number == object_id) ||
-        (object_id == BACNET_MAX_INSTANCE));
+    return (Object_Instance_Number == object_id);
 }

 BACNET_DEVICE_STATUS Device_System_Status(
@@ -89,6 +89,10 @@ void handler_read_property(
    error = true;
    switch (data.object_type) {
        case OBJECT_DEVICE:
+            /* Test for case of indefinite Device object instance */
+            if (data.object_instance == BACNET_MAX_INSTANCE) {
+                data.object_instance = Device_Object_Instance_Number();
+            }
            /* FIXME: probably need a length limitation sent with encode */
            if (Device_Valid_Object_Instance_Number(data.object_instance)) {
                len =