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>

1 files changed, 9 insertions, 7 deletions

diff --git a/wiretap/logcat.c b/wiretap/logcat.c
index a1a41c0689..022b6a2308 100644
--- a/wiretap/logcat.c
+++ b/wiretap/logcat.c
@@ -214,29 +214,31 @@ static gboolean logcat_read_packet(struct logcat_phdr *logcat, FILE_T fh,
     return TRUE;
 }
 
-static gboolean logcat_read(wtap *wth, int *err, gchar **err_info,
+static int logcat_read(wtap *wth, int *err, gchar **err_info,
     gint64 *data_offset)
 {
     *data_offset = file_tell(wth->fh);
 
-    return logcat_read_packet((struct logcat_phdr *) wth->priv, wth->fh,
-        &wth->phdr, wth->frame_buffer, err, err_info);
+    if (!logcat_read_packet((struct logcat_phdr *) wth->priv, wth->fh,
+        &wth->phdr, wth->frame_buffer, err, err_info))
+        return -1;
+    return REC_TYPE_PACKET;
 }
 
-static gboolean logcat_seek_read(wtap *wth, gint64 seek_off,
+static int logcat_seek_read(wtap *wth, gint64 seek_off,
     struct wtap_pkthdr *phdr, Buffer *buf,
     int *err, gchar **err_info)
 {
     if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
-        return FALSE;
+        return -1;
 
     if (!logcat_read_packet((struct logcat_phdr *) wth->priv, wth->random_fh,
          phdr, buf, err, err_info)) {
         if (*err == 0)
             *err = WTAP_ERR_SHORT_READ;
-        return FALSE;
+        return -1;
     }
-    return TRUE;
+    return REC_TYPE_PACKET;
 }
 
 int logcat_open(wtap *wth, int *err, gchar **err_info _U_)