diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-09 21:21:32 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-07-10 01:51:21 +0000 |
| commit | e6c87fe6b13f43d0c74ea8516d83a38ea4317688 (patch) | |
| tree | 27eb9cf5e28b7fdb4fd99477b64e1062b7102cf6 /plugins/ethercat | |
| parent | 9b182b7097e339501977f595903c2e837055fb1d (diff) | |
convert to proto_tree_add_subtree[_format] for plugin dissectors
Change-Id: I13924c5a2f056688a42cdee25654d82c056b5f97
Reviewed-on: https://code.wireshark.org/review/2974
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins/ethercat')
| -rw-r--r-- | plugins/ethercat/packet-ecatmb.c | 3 | ||||
| -rw-r--r-- | plugins/ethercat/packet-ethercat-datagram.c | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c index 24e18cdf1e..2e123dbe40 100644 --- a/plugins/ethercat/packet-ecatmb.c +++ b/plugins/ethercat/packet-ecatmb.c @@ -1315,8 +1315,7 @@ static void dissect_ecat_mailbox(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ecat_mailbox_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox); /* Create a mailbox header subtree */ - anItem = proto_tree_add_text(ecat_mailbox_tree, tvb, offset, ETHERCAT_MBOX_HEADER_LEN, "Header"); - ecat_mailbox_header_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_header); + ecat_mailbox_header_tree = proto_tree_add_subtree(ecat_mailbox_tree, tvb, offset, ETHERCAT_MBOX_HEADER_LEN, ett_ecat_mailbox_header, NULL, "Header"); /* Add length information to the mailbox header */ proto_tree_add_item(ecat_mailbox_header_tree, hf_ecat_mailboxlength, tvb, offset, sizeof(hdr.Length), ENC_LITTLE_ENDIAN); diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index db945f3781..c201c68ec3 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -542,12 +542,10 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree { /* Create the sub tree for the current datagram */ EcSubFormatter(tvb, suboffset, szText, nMax); - aitem = proto_tree_add_text(ecat_datagrams_tree, tvb, suboffset, subsize, "%s", szText); - ecat_datagram_tree = proto_item_add_subtree(aitem, ett_ecat_datagram_subtree); + ecat_datagram_tree = proto_tree_add_subtree(ecat_datagrams_tree, tvb, suboffset, subsize, ett_ecat_datagram_subtree, NULL, szText); /* Create a subtree placeholder for the Header */ - aitem = proto_tree_add_text(ecat_datagram_tree, tvb, offset, EcParserHDR_Len, "Header"); - ecat_header_tree = proto_item_add_subtree(aitem, ett_ecat_header); + ecat_header_tree = proto_tree_add_subtree(ecat_datagram_tree, tvb, offset, EcParserHDR_Len, ett_ecat_header, NULL, "Header"); EcCmdFormatter(ecHdr.cmd, szText, nMax); aitem = proto_tree_add_item(ecat_header_tree, hf_ecat_cmd, tvb, suboffset, sizeof(ecHdr.cmd), ENC_LITTLE_ENDIAN); @@ -601,10 +599,9 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Add information about the length field (11 bit length, 3 bits reserved, 1 bit circulating frame and 1 bit more in a sub tree */ - aitem = proto_tree_add_text(ecat_header_tree, tvb, suboffset, sizeof(ecHdr.len), - "Length : %d (0x%x) - %s - %s", + length_sub_tree = proto_tree_add_subtree_format(ecat_header_tree, tvb, suboffset, sizeof(ecHdr.len), + ett_ecat_length, NULL, "Length : %d (0x%x) - %s - %s", len, len, ecHdr.len & 0x4000 ? "Roundtrip" : "No Roundtrip", ecHdr.len & 0x8000 ? "More Follows..." : "Last Sub Command"); - length_sub_tree = proto_item_add_subtree(aitem, ett_ecat_length); proto_tree_add_item(length_sub_tree, hf_ecat_length_len, tvb, suboffset, sizeof(ecHdr.len), ENC_LITTLE_ENDIAN); proto_tree_add_item(length_sub_tree, hf_ecat_length_r, tvb, suboffset, sizeof(ecHdr.len), ENC_LITTLE_ENDIAN); |