diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-05-22 20:01:31 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-05-23 03:02:32 +0000 |
| commit | c0c480d08c175eed4524ea9e73ec86298f468cf4 (patch) | |
| tree | 1234cd09094dcc8447e3fb2b13671f12aba5ae69 /ui/qt/packet_list_model.cpp | |
| parent | 6287efb9c05482531ea675bb5a3d23b03b5715ab (diff) | |
| download | wireshark-c0c480d08c175eed4524ea9e73ec86298f468cf4.tar.gz | |
Allow wtap_read() and wtap_seek_read() to return non-packet records.
This is the first step towards implementing the mechanisms requestd in
bug 8590; currently, we don't return any records other than packet
records from libwiretap, and just ignore non-packet records in the rest
of Wireshark, but this at least gets the ball rolling.
Change-Id: I34a45b54dd361f69fdad1a758d8ca4f42d67d574
Reviewed-on: https://code.wireshark.org/review/1736
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt/packet_list_model.cpp')
| -rw-r--r-- | ui/qt/packet_list_model.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/packet_list_model.cpp b/ui/qt/packet_list_model.cpp index a6b68f51bd..805da14c8f 100644 --- a/ui/qt/packet_list_model.cpp +++ b/ui/qt/packet_list_model.cpp @@ -221,7 +221,7 @@ QVariant PacketListModel::data(const QModelIndex &index, int role) const memset(&phdr, 0, sizeof(struct wtap_pkthdr)); buffer_init(&buf, 1500); - if (!cap_file_ || !cf_read_frame_r(cap_file_, fdata, &phdr, &buf)) { + if (!cap_file_ || cf_read_frame_r(cap_file_, fdata, &phdr, &buf) == -1) { /* * Error reading the frame. * |