diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-26 22:03:12 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-03-01 12:54:33 +0000 |
| commit | 9c55903029ee0e6720597ef07e8a5b359cae068e (patch) | |
| tree | 251dddfa5de23777e225e128529b00a7a0143b76 /epan/dissectors/packet-eth.c | |
| parent | 5f2c8e9575eb6afb6c645d43a015cff035fcbeb0 (diff) | |
Use COPY_ADDRESS_SHALLOW instead of duplicating TVB_SET_ADDRESS and SET_ADDRESS calls for the same address.
Change-Id: I0c9cc5d574fdd73ecf1f8b32dbbf0ddb2b885116
Reviewed-on: https://code.wireshark.org/review/7437
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 13d44df877..9e03bc6365 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -314,14 +314,14 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, 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); + COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + COPY_ADDRESS_SHALLOW(&ehdr->dst, &pinfo->dl_dst); 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); + COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + COPY_ADDRESS_SHALLOW(&ehdr->src, &pinfo->dl_src); ehdr->type = tvb_get_ntohs(tvb, 12); |