diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-29 17:00:12 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-29 21:18:04 +0000 |
| commit | dd63ae2b8c889aa91577efe4621e6d0fe5432a99 (patch) | |
| tree | da25c2914161eba08b579a96a533b482f225c067 /epan/dissectors/packet-lmp.c | |
| parent | e39e44df246c89c31d708923a181f99810240731 (diff) | |
proto_tree_add_subtree[_format]
Change-Id: Id00f456479415adf0a219af6c9a2108d4b3642d0
Reviewed-on: https://code.wireshark.org/review/2702
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-lmp.c')
| -rw-r--r-- | epan/dissectors/packet-lmp.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 8e96ad3b0e..9d4f43ea5d 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -703,11 +703,10 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) ti = proto_tree_add_item(tree, proto_lmp, tvb, offset, msg_length, ENC_NA); lmp_tree = proto_item_add_subtree(ti, lmp_subtree[LMP_TREE_MAIN]); - ti = proto_tree_add_text(lmp_tree, tvb, offset, 12, "LMP Header. %s", - val_to_str(message_type, message_type_vals, - "Unknown Message (%u). ")); - lmp_header_tree = proto_item_add_subtree(ti, lmp_subtree[LMP_TREE_HEADER]); - proto_tree_add_text(lmp_header_tree, tvb, offset, 1, "LMP Version: %u", + lmp_header_tree = proto_tree_add_subtree_format(lmp_tree, tvb, offset, 12, + lmp_subtree[LMP_TREE_HEADER], NULL, "LMP Header. %s", + val_to_str(message_type, message_type_vals, "Unknown Message (%u). ")); + proto_tree_add_text(lmp_header_tree, tvb, offset, 1, "LMP Version: %u", version); ti = proto_tree_add_text(lmp_header_tree, tvb, offset+2, 1, "Flags: %02x", flags); @@ -785,14 +784,12 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) } lmp_object_tree = proto_item_add_subtree(ti, lmp_class_to_subtree(lmp_class)); - ti2 = proto_tree_add_text(lmp_object_tree, tvb, offset, 4, - "Header. Class %d, C-Type %d, Length %d, %s", + lmp_object_header_tree = proto_tree_add_subtree_format(lmp_object_tree, tvb, offset, 4, + lmp_subtree[LMP_TREE_OBJECT_HEADER], &ti2, + "Header. Class %d, C-Type %d, Length %d, %s", lmp_class, type, obj_length, negotiable ? "Negotiable" : "Not Negotiable"); - lmp_object_header_tree = - proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_OBJECT_HEADER]); - proto_tree_add_text(lmp_object_header_tree, tvb, offset, 1, negotiable ? "Negotiable" : "Not Negotiable"); proto_tree_add_text(lmp_object_header_tree, tvb, offset+2, 2, @@ -1306,10 +1303,8 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) for (l=0; l<obj_length - 4; ) { - ti2 = proto_tree_add_text(lmp_object_tree, tvb, offset2+l, k, - "Interface-Id"); - lmp_subobj_tree = proto_item_add_subtree(ti2, - lmp_subtree[LMP_TREE_CHANNEL_STATUS_ID]); + lmp_subobj_tree = proto_tree_add_subtree(lmp_object_tree, tvb, offset2+l, k, + lmp_subtree[LMP_TREE_CHANNEL_STATUS_ID], &ti2, "Interface-Id"); switch(type) { case 1: |