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, 14 insertions, 12 deletions

diff --git a/wiretap/tnef.c b/wiretap/tnef.c
index 5bd2fa1463..a08d42fb2c 100644
--- a/wiretap/tnef.c
+++ b/wiretap/tnef.c
@@ -30,14 +30,14 @@
 #include "buffer.h"
 #include "tnef.h"
 
-static gboolean tnef_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
-                               Buffer *buf, int *err, gchar **err_info)
+static int tnef_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
+                          Buffer *buf, int *err, gchar **err_info)
 {
   gint64 file_size;
   int packet_size;
 
   if ((file_size = wtap_file_size(wth, err)) == -1)
-    return FALSE;
+    return -1;
 
   if (file_size > WTAP_MAX_PACKET_SIZE) {
     /*
@@ -47,7 +47,7 @@ static gboolean tnef_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
     *err = WTAP_ERR_BAD_FILE;
     *err_info = g_strdup_printf("tnef: File has %" G_GINT64_MODIFIER "d-byte packet, bigger than maximum of %u",
 				file_size, WTAP_MAX_PACKET_SIZE);
-    return FALSE;
+    return -1;
   }
   packet_size = (int)file_size;
 
@@ -59,10 +59,12 @@ static gboolean tnef_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
   phdr->ts.secs = 0;
   phdr->ts.nsecs = 0;
 
-  return wtap_read_packet_bytes(fh, buf, packet_size, err, err_info);
+  if (!wtap_read_packet_bytes(fh, buf, packet_size, err, err_info))
+    return -1;
+  return REC_TYPE_PACKET;
 }
 
-static gboolean tnef_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
+static int tnef_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
 {
   gint64 offset;
 
@@ -72,25 +74,25 @@ static gboolean tnef_read(wtap *wth, int *err, gchar **err_info, gint64 *data_of
 
   /* there is only ever one packet */
   if (offset)
-    return FALSE;
+    return -1;
 
   *data_offset = offset;
 
   return tnef_read_file(wth, wth->fh, &wth->phdr, wth->frame_buffer, err, err_info);
 }
 
-static gboolean tnef_seek_read(wtap *wth, gint64 seek_off,
-                               struct wtap_pkthdr *phdr,
-                               Buffer *buf, int *err, gchar **err_info)
+static int tnef_seek_read(wtap *wth, gint64 seek_off,
+                          struct wtap_pkthdr *phdr,
+                          Buffer *buf, int *err, gchar **err_info)
 {
   /* there is only one packet */
   if(seek_off > 0) {
     *err = 0;
-    return FALSE;
+    return -1;
   }
 
   if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
-    return FALSE;
+    return -1;
 
   return tnef_read_file(wth, wth->random_fh, phdr, buf, err, err_info);
 }