diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-03-01 23:03:27 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-03-03 09:02:25 +0000 |
| commit | b7ef891af868b6026391d3473c0b43e7229e5b31 (patch) | |
| tree | 073d847595f777447f804937957324fcbae9c653 /epan/dissectors/packet-eth.c | |
| parent | 599dd4ffcc31bb03e44fd4ed72db4d6b8fbc38f0 (diff) | |
Replace tvb_get_ptr calls with a better API choice.
Just reduces the overall tvb_get_ptr usage count in the dissector directory.
Change-Id: I455dc4cc9b082ecccdd254a2e5121f3353b5a812
Reviewed-on: https://code.wireshark.org/review/7491
Reviewed-by: Anders Broman <a.broman58@gmail.com>
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 9e03bc6365..8fbe22caa0 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -311,17 +311,17 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, col_set_str(pinfo->cinfo, COL_PROTOCOL, "Ethernet"); - 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); + TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, 0, 6); COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); COPY_ADDRESS_SHALLOW(&ehdr->dst, &pinfo->dl_dst); + dst_addr = (const guint8*)pinfo->dst.data; + dst_addr_name = get_ether_name(dst_addr); - 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); + TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, 6, 6); COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); COPY_ADDRESS_SHALLOW(&ehdr->src, &pinfo->dl_src); + src_addr = (const guint8*)pinfo->src.data; + src_addr_name = get_ether_name(src_addr); ehdr->type = tvb_get_ntohs(tvb, 12); |