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-iser.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-iser.c')
| -rw-r--r-- | epan/dissectors/packet-iser.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-iser.c b/epan/dissectors/packet-iser.c index cb37af4d7d..3fc5b9646c 100644 --- a/epan/dissectors/packet-iser.c +++ b/epan/dissectors/packet-iser.c @@ -244,12 +244,12 @@ dissect_iser(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (gPREF_MAN_EN) { /* If the manual settings are enabled see if this fits - in which case we can skip the following checks entirely and go straight to dissecting */ - if ( (ADDRESSES_EQUAL(&pinfo->src, &manual_addr[0]) && - ADDRESSES_EQUAL(&pinfo->dst, &manual_addr[1]) && + if ( (addresses_equal(&pinfo->src, &manual_addr[0]) && + addresses_equal(&pinfo->dst, &manual_addr[1]) && (pinfo->srcport == 0xffffffff /* is unknown */ || pinfo->srcport == gPREF_QP[0]) && (pinfo->destport == 0xffffffff /* is unknown */ || pinfo->destport == gPREF_QP[1])) || - (ADDRESSES_EQUAL(&pinfo->src, &manual_addr[1]) && - ADDRESSES_EQUAL(&pinfo->dst, &manual_addr[0]) && + (addresses_equal(&pinfo->src, &manual_addr[1]) && + addresses_equal(&pinfo->dst, &manual_addr[0]) && (pinfo->srcport == 0xffffffff /* is unknown */ || pinfo->srcport == gPREF_QP[1]) && (pinfo->destport == 0xffffffff /* is unknown */ || pinfo->destport == gPREF_QP[0])) ) return dissect_packet(tvb, pinfo, tree); @@ -424,13 +424,13 @@ proto_reg_handoff_iser(void) if (errno || *not_parsed != '\0') { error_occured = TRUE; } else { - SET_ADDRESS(&manual_addr[i], AT_IB, sizeof(guint16), manual_addr_data[i]); + set_address(&manual_addr[i], AT_IB, sizeof(guint16), manual_addr_data[i]); } } else { /* GID */ if (!str_to_ip6(gPREF_ID[i], manual_addr_data[i]) ) { error_occured = TRUE; } else { - SET_ADDRESS(&manual_addr[i], AT_IB, GID_SIZE, manual_addr_data[i]); + set_address(&manual_addr[i], AT_IB, GID_SIZE, manual_addr_data[i]); } } |