diff options
author | Michael Mann <mmann78@netscape.net> | 2015-01-06 14:54:03 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-01-07 12:37:52 +0000 |
commit | 4088a8286d9e2dfd8f2b1c316472d768cbefec8e (patch) | |
tree | e089464bdc1b9603db474bad8f974d9df362c8bc /epan/dissectors/packet-btbnep.c | |
parent | 6252074a249278fffc7e4897087564d951dc67b5 (diff) |
SET_ADDRESS -> TVB_SET_ADDRESS to "hide" some of the tvb_get_ptr use.
Not all changes were able to remove their corresponding tvb_get_ptr, because there are other API dependent on the (tvb_get)pointer, but future iterations optimizing those other APIs will then be able to remove it.
Change-Id: Id7cefd440b81834de1d1aace7cd0789b1c871a22
Reviewed-on: https://code.wireshark.org/review/6358
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-btbnep.c')
-rw-r--r-- | epan/dissectors/packet-btbnep.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index 7e9ec08886..1aa98cb0c3 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.c @@ -286,8 +286,6 @@ dissect_btbnep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ guint type = 0; proto_item *addr_item; proto_tree *addr_tree = NULL; - const guint8 *src_addr; - const guint8 *dst_addr; pi = proto_tree_add_item(tree, proto_btbnep, tvb, offset, -1, ENC_NA); btbnep_tree = proto_item_add_subtree(pi, ett_btbnep); @@ -319,32 +317,28 @@ dissect_btbnep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ if (extension_flag) col_append_str(pinfo->cinfo, COL_INFO, "+E"); if (bnep_type == BNEP_TYPE_GENERAL_ETHERNET || bnep_type == BNEP_TYPE_COMPRESSED_ETHERNET_DESTINATION_ONLY) { - dst_addr = tvb_get_ptr(tvb, offset, 6); - SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, dst_addr); - SET_ADDRESS(&pinfo->dst, AT_ETHER, 6, dst_addr); + TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, offset, 6); + TVB_SET_ADDRESS(&pinfo->dst, AT_ETHER, tvb, offset, 6); - addr_item = proto_tree_add_ether(btbnep_tree, hf_btbnep_dst, tvb, offset, 6, dst_addr); - if (addr_item) addr_tree = proto_item_add_subtree(addr_item, ett_addr); - proto_tree_add_ether(addr_tree, hf_btbnep_addr, tvb, offset, 6, dst_addr); + addr_item = proto_tree_add_item(btbnep_tree, hf_btbnep_dst, tvb, offset, 6, ENC_NA); + addr_tree = proto_item_add_subtree(addr_item, ett_addr); + proto_tree_add_item(addr_tree, hf_btbnep_addr, tvb, offset, 6, ENC_NA); proto_tree_add_item(addr_tree, hf_btbnep_lg, tvb, offset, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_btbnep_ig, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 6; } if (bnep_type == BNEP_TYPE_GENERAL_ETHERNET || bnep_type == BNEP_TYPE_COMPRESSED_ETHERNET_SOURCE_ONLY) { - src_addr = tvb_get_ptr(tvb, offset, 6); - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, src_addr); - SET_ADDRESS(&pinfo->src, AT_ETHER, 6, src_addr); + TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, offset, 6); + TVB_SET_ADDRESS(&pinfo->src, AT_ETHER, tvb, offset, 6); - - addr_item = proto_tree_add_ether(btbnep_tree, hf_btbnep_src, tvb, offset, 6, src_addr); - if (addr_item) { - addr_tree = proto_item_add_subtree(addr_item, ett_addr); - if (tvb_get_guint8(tvb, offset) & 0x01) { - expert_add_info(pinfo, addr_item, &ei_btbnep_src_not_group_address); - } + addr_item = proto_tree_add_item(btbnep_tree, hf_btbnep_src, tvb, offset, 6, ENC_NA); + addr_tree = proto_item_add_subtree(addr_item, ett_addr); + if (tvb_get_guint8(tvb, offset) & 0x01) { + expert_add_info(pinfo, addr_item, &ei_btbnep_src_not_group_address); } - proto_tree_add_ether(addr_tree, hf_btbnep_addr, tvb, offset, 6, src_addr); + + proto_tree_add_item(addr_tree, hf_btbnep_addr, tvb, offset, 6, ENC_NA); proto_tree_add_item(addr_tree, hf_btbnep_lg, tvb, offset, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_btbnep_ig, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 6; |