diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2014-07-08 18:34:04 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-07-10 11:00:11 +0000 |
| commit | 1bf4efd85046b7f1d323ac8f809863cbcdd200f8 (patch) | |
| tree | 66ea0b6acac6129f70a41f946d9bbf238409915a /epan/dissectors/packet-ssl.c | |
| parent | e1bad3cd9b72fe3792d01917a1793caa4f69f4db (diff) | |
ssl,dtls: convert from tvb_length
Every occurrence of tvb_length* has been converted to
tvb_reported_length* except some dtls lines.
Change-Id: I0faac315cdf5d17c0af18be177aacd076ff86cff
Reviewed-on: https://code.wireshark.org/review/2977
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ssl.c')
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index c69cfa5548..6be9e805df 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -799,7 +799,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) /* looks like something unknown, so lump into * continuation data */ - offset = tvb_length(tvb); + offset = tvb_reported_length(tvb); col_append_str(pinfo->cinfo, COL_INFO, "Continuation Data"); @@ -972,7 +972,7 @@ again: */ if (msp->flags & MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT) { /* The dissector asked for the entire segment */ - len = MAX(0, tvb_length_remaining(tvb, offset)); + len = MAX(0, tvb_reported_length_remaining(tvb, offset)); } else { len = MIN(nxtseq, msp->nxtpdu) - seq; } @@ -1423,7 +1423,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, ti = NULL; ssl_record_tree = NULL; - available_bytes = tvb_length_remaining(tvb, offset); + available_bytes = tvb_reported_length_remaining(tvb, offset); /* TLS 1.0/1.1 just ignores unknown records - RFC 2246 chapter 6. The TLS Record Protocol */ if ((session->version==SSL_VER_TLS || session->version==SSL_VER_TLSv1DOT1 || session->version==SSL_VER_TLSv1DOT2) && @@ -1665,7 +1665,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, /* add desegmented data to the data source list */ add_new_data_source(pinfo, decrypted, "Decrypted SSL record"); dissect_ssl3_handshake(decrypted, pinfo, ssl_record_tree, 0, - tvb_length(decrypted), session, + tvb_reported_length(decrypted), session, is_from_server, ssl, content_type); } else { dissect_ssl3_handshake(tvb, pinfo, ssl_record_tree, offset, @@ -1719,7 +1719,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, decrypted = ssl_get_record_info(tvb, proto_ssl, pinfo, offset); if (decrypted) { add_new_data_source(pinfo, decrypted, "Decrypted SSL record"); - dissect_ssl3_heartbeat(decrypted, pinfo, ssl_record_tree, 0, session, tvb_length (decrypted), TRUE); + dissect_ssl3_heartbeat(decrypted, pinfo, ssl_record_tree, 0, session, tvb_reported_length (decrypted), TRUE); } else { gboolean plaintext = TRUE; /* heartbeats before ChangeCipherSpec are unencrypted */ @@ -2909,7 +2909,7 @@ dissect_ssl2_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, byte = tvb_get_guint8(tvb, offset); record_length_length = (byte & 0x80) ? 2 : 3; - available_bytes = tvb_length_remaining(tvb, offset); + available_bytes = tvb_reported_length_remaining(tvb, offset); /* * Is the record header split across segment boundaries? |