diff options
| author | Evan Huus <eapache@gmail.com> | 2012-12-12 00:02:34 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2012-12-12 00:02:34 +0000 |
| commit | 48c653481a6928472e7d1cce2c9e99ad932d8147 (patch) | |
| tree | 7b229ade2f3680a839b2d0471b0b7a00e72634b7 | |
| parent | b0f4c129f06f89c093a0d27deeb5819d1683b419 (diff) | |
Use the complete fragment length to reassembly SSL frames. The old method
of picking them up one at a time failed on jumbo frames.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8075
svn path=/trunk/; revision=46510
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 2aa9c3cff0..622cbb26cb 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -1504,14 +1504,13 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, pinfo->desegment_offset = offset; /* Don't use: - * pinfo->desegment_len = (record_length + 5) - available_bytes; - * as it will display two SSL subtrees when a frame contains + * pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT; + * it avoids some minor display glitches when a frame contains * the continuation of a previous PDU together with a full new - * PDU (and the info column would not show the message type - * of the second PDU) + * PDU, but it completely breaks dissection for jumbo SSL frames */ - pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT; + pinfo->desegment_len = (record_length + 5) - available_bytes; *need_desegmentation = TRUE; return offset; } else { |