From Lori Tribble via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8306

Fix decoding the Loop Object Setpoint-Reference property in BACapp packets.

svn path=/trunk/; revision=47577

diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 1fa9cf43645217eca7a4ef2d0a1aaf766f140ba9..304b647e4028bfbe28d1c98d0fe2cb3cdfccbf31 100644 (file)
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -6636,10 +6636,15 @@ fAbstractSyntaxNType (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint
             break;
         case 19:  /* controlled-variable-reference */
         case 60:  /* manipulated-variable-reference */
-        case 109: /* Setpoint-Reference */
         case 132: /* log-device-object-property */
             offset = fDeviceObjectPropertyReference (tvb, pinfo, tree, offset);
             break;
+        case 109: /* Setpoint-Reference */
+            /* setpoint-Reference is actually BACnetSetpointReference which is a SEQ of [0] */
+            offset += fTagHeaderTree(tvb, pinfo, tree, offset, &tag_no, &tag_info, &lvt);
+            offset = fBACnetObjectPropertyReference (tvb, pinfo, tree, offset);
+            offset += fTagHeaderTree(tvb, pinfo, tree, offset, &tag_no, &tag_info, &lvt);
+            break;
         case 123:   /* weekly-schedule -- accessed as a BACnetARRAY */
             if (object_type < 128) {
                 if (propertyArrayIndex == 0) {