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, 13 insertions, 11 deletions

diff --git a/wiretap/ber.c b/wiretap/ber.c
index 59e7e28f39..1a3f4e6bf6 100644
--- a/wiretap/ber.c
+++ b/wiretap/ber.c
@@ -38,14 +38,14 @@
 #define BER_UNI_TAG_SEQ	16	/* SEQUENCE, SEQUENCE OF */
 #define BER_UNI_TAG_SET	17	/* SET, SET OF */
 
-static gboolean ber_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
-                              Buffer *buf, int *err, gchar **err_info)
+static int ber_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) {
     /*
@@ -55,7 +55,7 @@ static gboolean ber_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
     *err = WTAP_ERR_BAD_FILE;
     *err_info = g_strdup_printf("ber: 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;
 
@@ -67,10 +67,12 @@ static gboolean ber_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 ber_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
+static int ber_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
 {
   gint64 offset;
 
@@ -80,24 +82,24 @@ static gboolean ber_read(wtap *wth, int *err, gchar **err_info, gint64 *data_off
 
   /* there is only ever one packet */
   if (offset != 0)
-    return FALSE;
+    return -1;
 
   *data_offset = offset;
 
   return ber_read_file(wth, wth->fh, &wth->phdr, wth->frame_buffer, err, err_info);
 }
 
-static gboolean ber_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr _U_,
-			      Buffer *buf, int *err, gchar **err_info)
+static int ber_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr _U_,
+			 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 ber_read_file(wth, wth->random_fh, phdr, buf, err, err_info);
 }