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/follow.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/follow.c')
| -rw-r--r-- | epan/follow.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/follow.c b/epan/follow.c index 73fe541b17..75ddc020f1 100644 --- a/epan/follow.c +++ b/epan/follow.c @@ -242,8 +242,8 @@ follow_addr(stream_type stream, const address *addr0, guint port0, if (stream == TCP_STREAM) { find_index[TCP_STREAM] = TRUE; - SET_ADDRESS(&tcp_addr[0], addr0->type, addr0->len, ip_address[0]); - SET_ADDRESS(&tcp_addr[1], addr1->type, addr1->len, ip_address[1]); + set_address(&tcp_addr[0], addr0->type, addr0->len, ip_address[0]); + set_address(&tcp_addr[1], addr1->type, addr1->len, ip_address[1]); } return TRUE; @@ -295,12 +295,12 @@ reassemble_tcp( guint32 tcp_stream, guint32 sequence, guint32 acknowledgement, /* First, check if this packet should be processed. */ if (find_index[TCP_STREAM]) { if ((port[0] == srcport && port[1] == dstport && - ADDRESSES_EQUAL(&tcp_addr[0], net_src) && - ADDRESSES_EQUAL(&tcp_addr[1], net_dst)) + addresses_equal(&tcp_addr[0], net_src) && + addresses_equal(&tcp_addr[1], net_dst)) || (port[1] == srcport && port[0] == dstport && - ADDRESSES_EQUAL(&tcp_addr[1], net_src) && - ADDRESSES_EQUAL(&tcp_addr[0], net_dst))) { + addresses_equal(&tcp_addr[1], net_src) && + addresses_equal(&tcp_addr[0], net_dst))) { find_index[TCP_STREAM] = FALSE; stream_to_follow[TCP_STREAM] = tcp_stream; } |