Add "Editor modelines"; Adjust whitespace as needed.

[metze/wireshark/wip.git] / wiretap / ber.c

diff --git a/wiretap/ber.c b/wiretap/ber.c
index 93ae4bac1f1e489f13266825c496ff3e3c885692..c147f543fc2c2e18335f1100d968a21b2313762f 100644 (file)
--- a/wiretap/ber.c
+++ b/wiretap/ber.c
@@ -2,8 +2,6 @@
  *
  * Basic Encoding Rules (BER) file reading
  *
- * $Id$
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -29,16 +27,16 @@
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include "buffer.h"
+#include <wsutil/buffer.h>
 #include "ber.h"
 
 
-#define BER_CLASS_UNI  0
-#define BER_CLASS_APP  1
-#define BER_CLASS_CON  2
+#define BER_CLASS_UNI   0
+#define BER_CLASS_APP   1
+#define BER_CLASS_CON   2
 
-#define BER_UNI_TAG_SEQ        16      /* SEQUENCE, SEQUENCE OF */
-#define BER_UNI_TAG_SET        17      /* SET, SET OF */
+#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)
@@ -56,11 +54,12 @@ 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);
+                                file_size, WTAP_MAX_PACKET_SIZE);
     return FALSE;
   }
   packet_size = (int)file_size;
 
+  phdr->rec_type = REC_TYPE_PACKET;
   phdr->presence_flags = 0; /* yes, we have no bananas^Wtime stamp */
 
   phdr->caplen = packet_size;
@@ -90,7 +89,7 @@ static gboolean ber_read(wtap *wth, int *err, gchar **err_info, gint64 *data_off
 }
 
 static gboolean ber_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr _U_,
-                             Buffer *buf, int *err, gchar **err_info)
+                              Buffer *buf, int *err, gchar **err_info)
 {
   /* there is only one packet */
   if(seek_off > 0) {
@@ -104,11 +103,10 @@ static gboolean ber_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *ph
   return ber_read_file(wth, wth->random_fh, phdr, buf, err, err_info);
 }
 
-int ber_open(wtap *wth, int *err, gchar **err_info)
+wtap_open_return_val ber_open(wtap *wth, int *err, gchar **err_info)
 {
 #define BER_BYTES_TO_CHECK 8
   guint8 bytes[BER_BYTES_TO_CHECK];
-  int bytes_read;
   guint8 ber_id;
   gint8 ber_class;
   gint8 ber_tag;
@@ -118,12 +116,10 @@ int ber_open(wtap *wth, int *err, gchar **err_info)
   gint64 file_size;
   int offset = 0, i;
 
-  bytes_read = file_read(&bytes, BER_BYTES_TO_CHECK, wth->fh);
-  if (bytes_read != BER_BYTES_TO_CHECK) {
-    *err = file_error(wth->fh, err_info);
-    if (*err != 0 && *err != WTAP_ERR_SHORT_READ)
-      return -1;
-    return 0;
+  if (!wtap_read_bytes(wth->fh, &bytes, BER_BYTES_TO_CHECK, err, err_info)) {
+    if (*err != WTAP_ERR_SHORT_READ)
+      return WTAP_OPEN_ERROR;
+    return WTAP_OPEN_NOT_MINE;
   }
 
   ber_id = bytes[offset++];
@@ -137,8 +133,8 @@ int ber_open(wtap *wth, int *err, gchar **err_info)
   /* XXX: do we also want to allow APPLICATION */
   if(!(ber_pc &&
        (((ber_class == BER_CLASS_UNI) && ((ber_tag == BER_UNI_TAG_SET) || (ber_tag == BER_UNI_TAG_SEQ))) ||
-       ((ber_class == BER_CLASS_CON) && (ber_tag < 32)))))
-    return 0;
+        ((ber_class == BER_CLASS_CON) && (ber_tag < 32)))))
+    return WTAP_OPEN_NOT_MINE;
 
   /* now check the length */
   oct = bytes[offset++];
@@ -153,12 +149,12 @@ int ber_open(wtap *wth, int *err, gchar **err_info)
       nlb = oct & 0x7F; /* number of length bytes */
 
       if((nlb > 0) && (nlb <= (BER_BYTES_TO_CHECK - 2))) {
-       /* not indefinite length and we have read enough bytes to compute the length */
-       i = nlb;
-       while(i--) {
-         oct = bytes[offset++];
-         len = (len<<8) + oct;
-       }
+        /* not indefinite length and we have read enough bytes to compute the length */
+        i = nlb;
+        while(i--) {
+          oct = bytes[offset++];
+          len = (len<<8) + oct;
+        }
       }
     }
 
@@ -166,7 +162,7 @@ int ber_open(wtap *wth, int *err, gchar **err_info)
     file_size = wtap_file_size(wth, err);
 
     if(len != file_size) {
-      return 0; /* not ASN.1 */
+      return WTAP_OPEN_NOT_MINE; /* not ASN.1 */
     }
   } else {
     /* Indefinite length encoded - assume it is BER */
@@ -174,7 +170,7 @@ int ber_open(wtap *wth, int *err, gchar **err_info)
 
   /* seek back to the start of the file  */
   if (file_seek(wth->fh, 0, SEEK_SET, err) == -1)
-    return -1;
+    return WTAP_OPEN_ERROR;
 
   wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_BER;
   wth->file_encap = WTAP_ENCAP_BER;
@@ -182,7 +178,20 @@ int ber_open(wtap *wth, int *err, gchar **err_info)
 
   wth->subtype_read = ber_read;
   wth->subtype_seek_read = ber_seek_read;
-  wth->tsprecision = WTAP_FILE_TSPREC_SEC;
+  wth->file_tsprec = WTAP_TSPREC_SEC;
 
-  return 1;
+  return WTAP_OPEN_MINE;
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */