diff options
author | Michael Mann <mmann78@netscape.net> | 2016-01-03 00:58:31 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-01-06 13:35:45 +0000 |
commit | 57acc227f08fd05fb20b577568780deff77f972f (patch) | |
tree | 2edda647a9f7c0c7af8ceef3580b10520d1467c0 /ui/qt/follow_stream_dialog.h | |
parent | aede5c0c412caad92ce4e4982d17f1b2b85d0e59 (diff) |
KISS the Follow TCP functionality.
[KISS - Keep It Simple, Stupid]
Convert the Follow TCP functionality to use a tap from the TCP dissector that passes the tvb of the payload. This makes things A LOT simpler, but relies on the TCP dissector to make all decisions.
The "tap" logic passes tvb data
1. Before calls to process_tcp_payload
2. Before hf_tcp_segment_data fields (that aren't retransmissions or otherwise handled)
Follow up patches will be necessary to clean up all of the supporting "follow" functionality that is now useless.
Bug: 6925
Bug: 9780
Change-Id: I4e7f5d453519be839de39a109bafa899b9987139
Reviewed-on: https://code.wireshark.org/review/13038
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/qt/follow_stream_dialog.h')
-rw-r--r-- | ui/qt/follow_stream_dialog.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/qt/follow_stream_dialog.h b/ui/qt/follow_stream_dialog.h index 2d82a83ea7..da0457175c 100644 --- a/ui/qt/follow_stream_dialog.h +++ b/ui/qt/follow_stream_dialog.h @@ -110,10 +110,8 @@ private: guint32 packet_num, guint32 *global_pos); frs_return_t readStream(); - frs_return_t readTcpStream(); - frs_return_t readUdpStream(); + frs_return_t readFollowStream(); frs_return_t readSslStream(); - frs_return_t readHttpStream(); void followStream(); void addText(QString text, gboolean is_from_server, guint32 packet_num); |