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/reassemble.c | |
parent | 9eda98dec91931588a003a6f707c4e2097369ba1 (diff) | |
download | wireshark-86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd.tar.gz |
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/reassemble.c')
-rw-r--r-- | epan/reassemble.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/reassemble.c b/epan/reassemble.c index 16abe70918..76a6500ff3 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -77,8 +77,8 @@ fragment_addresses_equal(gconstpointer k1, gconstpointer k2) * the comparison of addresses. */ return (key1->id == key2->id) && - (ADDRESSES_EQUAL(&key1->src, &key2->src)) && - (ADDRESSES_EQUAL(&key1->dst, &key2->dst)); + (addresses_equal(&key1->src, &key2->src)) && + (addresses_equal(&key1->dst, &key2->dst)); } /* @@ -115,8 +115,8 @@ fragment_addresses_persistent_key(const packet_info *pinfo, const guint32 id, /* * Do a deep copy of the addresses. */ - COPY_ADDRESS(&key->src, &pinfo->src); - COPY_ADDRESS(&key->dst, &pinfo->dst); + copy_address(&key->src, &pinfo->src); + copy_address(&key->dst, &pinfo->dst); key->id = id; return (gpointer)key; @@ -209,8 +209,8 @@ fragment_addresses_ports_equal(gconstpointer k1, gconstpointer k2) * the comparison of addresses and ports. */ return (key1->id == key2->id) && - (ADDRESSES_EQUAL(&key1->src_addr, &key2->src_addr)) && - (ADDRESSES_EQUAL(&key1->dst_addr, &key2->dst_addr)) && + (addresses_equal(&key1->src_addr, &key2->src_addr)) && + (addresses_equal(&key1->dst_addr, &key2->dst_addr)) && (key1->src_port == key2->src_port) && (key1->dst_port == key2->dst_port); } @@ -251,8 +251,8 @@ fragment_addresses_ports_persistent_key(const packet_info *pinfo, /* * Do a deep copy of the addresses. */ - COPY_ADDRESS(&key->src_addr, &pinfo->src); - COPY_ADDRESS(&key->dst_addr, &pinfo->dst); + copy_address(&key->src_addr, &pinfo->src); + copy_address(&key->dst_addr, &pinfo->dst); key->src_port = pinfo->srcport; key->dst_port = pinfo->destport; key->id = id; |