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-eth.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-eth.c')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index ea18ac1a30..7da82c67ee 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -313,15 +313,15 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, src_addr = tvb_get_ptr(tvb, 6, 6); src_addr_name = get_ether_name(src_addr); - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, src_addr); - SET_ADDRESS(&pinfo->src, AT_ETHER, 6, src_addr); - SET_ADDRESS(&ehdr->src, AT_ETHER, 6, src_addr); + TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, 6, 6); + TVB_SET_ADDRESS(&pinfo->src, AT_ETHER, tvb, 6, 6); + TVB_SET_ADDRESS(&ehdr->src, AT_ETHER, tvb, 6, 6); dst_addr = tvb_get_ptr(tvb, 0, 6); dst_addr_name = get_ether_name(dst_addr); - SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, dst_addr); - SET_ADDRESS(&pinfo->dst, AT_ETHER, 6, dst_addr); - SET_ADDRESS(&ehdr->dst, AT_ETHER, 6, dst_addr); + TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, 0, 6); + TVB_SET_ADDRESS(&pinfo->dst, AT_ETHER, tvb, 0, 6); + TVB_SET_ADDRESS(&ehdr->dst, AT_ETHER, tvb, 0, 6); ehdr->type = tvb_get_ntohs(tvb, 12); |