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-ip.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-ip.c')
| -rw-r--r-- | epan/dissectors/packet-ip.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index f1f0428ea8..48764e4592 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -2283,8 +2283,8 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } src32 = tvb_get_ntohl(tvb, offset + IPH_SRC); TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv4, tvb, offset + IPH_SRC, 4); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); - COPY_ADDRESS_SHALLOW(&iph->ip_src, &pinfo->src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); + copy_address_shallow(&iph->ip_src, &pinfo->src); if (tree) { const char *src_host; @@ -2325,8 +2325,8 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) dst32 = tvb_get_ntohl(tvb, offset + IPH_DST + dst_off); TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv4, tvb, offset + IPH_DST + dst_off, 4); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); - COPY_ADDRESS_SHALLOW(&iph->ip_dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); + copy_address_shallow(&iph->ip_dst, &pinfo->net_dst); /* If an IP is destined for an IP address in the Local Network Control Block * (e.g. 224.0.0.0/24), the packet should never be routed and the TTL would |