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-l2tp.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-l2tp.c')
| -rw-r--r-- | epan/dissectors/packet-l2tp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index b6b0833ced..2e742dee17 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -840,7 +840,7 @@ static void md5_hmac_digest(l2tpv3_tunnel_t *tunnel, if (msg_type != MESSAGE_TYPE_SCCRQ) { if (tunnel->lcce1_nonce != NULL && tunnel->lcce2_nonce != NULL) { - if (ADDRESSES_EQUAL(&tunnel->lcce1, &pinfo->src)) { + if (addresses_equal(&tunnel->lcce1, &pinfo->src)) { md5_hmac_append(&ms, tunnel->lcce1_nonce, tunnel->lcce1_nonce_len); md5_hmac_append(&ms, tunnel->lcce2_nonce, tunnel->lcce2_nonce_len); } else { @@ -880,7 +880,7 @@ static void sha1_hmac_digest(l2tpv3_tunnel_t *tunnel, if (msg_type != MESSAGE_TYPE_SCCRQ) { if (tunnel->lcce1_nonce != NULL && tunnel->lcce2_nonce != NULL) { - if (ADDRESSES_EQUAL(&tunnel->lcce1, &pinfo->src)) { + if (addresses_equal(&tunnel->lcce1, &pinfo->src)) { sha1_hmac_update(&ms, tunnel->lcce1_nonce, tunnel->lcce1_nonce_len); sha1_hmac_update(&ms, tunnel->lcce2_nonce, tunnel->lcce2_nonce_len); } else { @@ -2021,7 +2021,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, idx += 4; if (tunnel) { - if (ADDRESSES_EQUAL(&tunnel->lcce1, &pinfo->dst)) { + if (addresses_equal(&tunnel->lcce1, &pinfo->dst)) { session = find_session(tunnel, sid, 0); if (session) lcce = &session->lcce1; |