diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2015-02-13 14:40:29 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-02-13 13:42:41 +0000 |
| commit | c1610c7bd8c9478e535acde6dc5eb9ef90e2dbb5 (patch) | |
| tree | 8af8ed55b44fd1bb05b66938a9a0cabae1e20520 /epan/dissectors/packet-eth.c | |
| parent | 91a6e5eb25e16893dd92e9d9cbba40d62eb38585 (diff) | |
Micro optimization, only do tvb_get_ptr() once for dst and src
respectivly.
Change-Id: I1cdc5742057830a47ea71769fb54ab8dfdd3de14
Reviewed-on: https://code.wireshark.org/review/7096
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-eth.c')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 7da82c67ee..fb98f9b4f4 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"); - src_addr = tvb_get_ptr(tvb, 6, 6); - src_addr_name = get_ether_name(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); - 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); + 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); + + 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); ehdr->type = tvb_get_ntohs(tvb, 12); |