diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-10-21 12:04:16 -0700 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-10-22 11:45:56 +0000 |
commit | 86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd (patch) | |
tree | 4aca52419f6ee7dc9a58ca8e4cd79fbeaa8d3387 /epan/dissectors/packet-eth.c | |
parent | 9eda98dec91931588a003a6f707c4e2097369ba1 (diff) |
Use address functions instead of ADDRESS macros in asn1 and epan
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the asn1 and epan directories.
Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4
Reviewed-on: https://code.wireshark.org/review/11200
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
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 67cbd76bb2..c7a9c76e5e 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -313,14 +313,14 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, col_set_str(pinfo->cinfo, COL_PROTOCOL, "Ethernet"); 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); + 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); 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); + 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); |