Allow wtap_read() and wtap_seek_read() to return records other than packets.

Add a "record type" field to "struct wtap_pkthdr"; currently, it can be
REC_TYPE_PACKET, for a record containing a packet, or
REC_TYPE_FILE_TYPE_SPECIFIC, for records containing file-type-specific
data.

Modify code that reads packets to be able to handle non-packet records,
even if that just means ignoring them.

Rename some routines to indicate that they handle more than just
packets.

We don't yet have any libwiretap code that supplies records other than
REC_TYPE_PACKET or that supporting writing records other than
REC_TYPE_PACKET, or any code to support plugins for handling
REC_TYPE_FILE_TYPE_SPECIFIC records; this is just the first step for bug
8590.

Change-Id: Idb40b78f17c2c3aea72031bcd252abf9bc11c813
Reviewed-on: https://code.wireshark.org/review/1773
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 3 insertions, 3 deletions

diff --git a/ui/qt/packet_list_model.cpp b/ui/qt/packet_list_model.cpp
index a6b68f51bd..1d7a764561 100644
--- a/ui/qt/packet_list_model.cpp
+++ b/ui/qt/packet_list_model.cpp
@@ -221,9 +221,9 @@ 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_record_r(cap_file_, fdata, &phdr, &buf)) {
         /*
-         * Error reading the frame.
+         * Error reading the record.
          *
          * Don't set the color filter for now (we might want
          * to colorize it in some fashion to warn that the
@@ -247,7 +247,7 @@ QVariant PacketListModel::data(const QModelIndex &index, int role) const
             //            record->colorized = TRUE;
         }
         buffer_free(&buf);
-        return QVariant();	/* error reading the frame */
+        return QVariant();	/* error reading the record */
     }
 
     create_proto_tree = (color_filters_used() && enable_color_) ||