aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Boye Petersen <martinboyepetersen@gmail.com>2017-09-21 23:46:33 +0200
committerMichael Mann <mmann78@netscape.net>2017-09-22 11:21:16 +0000
commitb4fc86d2d5cd293c19b8c1e9db3d50e5fe0283ab (patch)
treec3c2d7eecaf07ca78faf9d02e79262cfc256d786
parented1ecfb39cf0f3344810fabb7a1b855d373aa0a8 (diff)
ZigBee ZCL Attributes: Set length of attribute subtrees
Set length of attribute subtree by setting the end after the attribute has been dissected Change-Id: Ic8bb66206658525635c08f807651a37369d16f6a Reviewed-on: https://code.wireshark.org/review/23651 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-zbee-zcl.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c
index 10961711ed..e2c2dbdcf8 100644
--- a/epan/dissectors/packet-zbee-zcl.c
+++ b/epan/dissectors/packet-zbee-zcl.c
@@ -1017,6 +1017,9 @@ void dissect_zcl_read_attr_resp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
/* Dissect the attribute data type and data */
dissect_zcl_attr_data_type_val(tvb, sub_tree, offset, attr_id, cluster_id);
}
+
+ /* Set end for subtree */
+ proto_item_set_end(proto_tree_get_parent(sub_tree), tvb, *offset);
}
} /* dissect_zcl_read_attr_resp */
@@ -1050,6 +1053,9 @@ void dissect_zcl_write_attr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
/* Dissect the attribute data type and data */
dissect_zcl_attr_data_type_val(tvb, sub_tree, offset, attr_id, cluster_id);
+
+ /* Set end for subtree */
+ proto_item_set_end(proto_tree_get_parent(sub_tree), tvb, *offset);
}
} /* dissect_zcl_write_attr */
@@ -1083,6 +1089,9 @@ static void dissect_zcl_write_attr_resp(tvbuff_t *tvb, packet_info *pinfo _U_, p
/* Dissect the failed attribute identifier */
dissect_zcl_attr_id(tvb, sub_tree, offset, cluster_id);
}
+
+ /* Set end for subtree */
+ proto_item_set_end(proto_tree_get_parent(sub_tree), tvb, *offset);
}
} /* dissect_zcl_write_attr_resp */