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-lapd.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-lapd.c')
| -rw-r--r-- | epan/dissectors/packet-lapd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index 2a5efc5c6d..23ec1f7e70 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -254,15 +254,15 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else if (conversation) { convo_data = (lapd_convo_data_t*)conversation_get_proto_data(conversation, proto_lapd); if (NULL != convo_data) { - if (ADDRESSES_EQUAL(&convo_data->addr_a, &pinfo->src) - && ADDRESSES_EQUAL(&convo_data->addr_b, &pinfo->dst) + if (addresses_equal(&convo_data->addr_a, &pinfo->src) + && addresses_equal(&convo_data->addr_b, &pinfo->dst) && convo_data-> port_a == pinfo->srcport && convo_data-> port_b == pinfo->destport) { /* "forward" direction */ forward_stream = TRUE; prev_byte_state = convo_data->byte_state_a; - } else if (ADDRESSES_EQUAL(&convo_data-> addr_b, &pinfo->src) - && ADDRESSES_EQUAL(&convo_data->addr_a, &pinfo->dst) + } else if (addresses_equal(&convo_data-> addr_b, &pinfo->src) + && addresses_equal(&convo_data->addr_a, &pinfo->dst) && convo_data-> port_b == pinfo->srcport && convo_data-> port_a == pinfo->destport) { /* "backward" direction */ @@ -391,8 +391,8 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) lapd_byte_state = wmem_new(wmem_file_scope(), lapd_byte_state_t); fill_lapd_byte_state(lapd_byte_state, state, full_byte, bit_offset, ones, data, data_len); convo_data = wmem_new(wmem_file_scope(), lapd_convo_data_t); - COPY_ADDRESS(&convo_data->addr_a, &pinfo->src); - COPY_ADDRESS(&convo_data->addr_b, &pinfo->dst); + copy_address(&convo_data->addr_a, &pinfo->src); + copy_address(&convo_data->addr_b, &pinfo->dst); convo_data->port_a = pinfo->srcport; convo_data->port_b = pinfo->destport; convo_data->byte_state_a = lapd_byte_state; |