Generate randpkt_core/doxygen.cfg.
[metze/wireshark/wip.git] / capinfos.c
index 88af0b5237d253ccc7cbf734ef66c4f5940b1f7d..5a3e2b3f5626ab82d70db148369578eb03db4284 100644 (file)
@@ -3,8 +3,6 @@
  *
  * Copyright 2004 Ian Schorr
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -21,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /*
  */
 
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <locale.h>
 #include <errno.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
 #endif
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+#include <glib.h>
+
+#ifdef HAVE_LIBZ
+#include <zlib.h>     /* to get the libz version number */
 #endif
 
-#include <glib.h>
+#include <wiretap/wtap.h>
 
-#include <epan/packet.h>
-#include <epan/filesystem.h>
-#include <epan/plugins.h>
-#include <epan/report_err.h>
-#include "wtap.h"
+#include <wsutil/crash_info.h>
+#include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
+#include <wsutil/ws_diag_control.h>
+#include <wsutil/ws_version_info.h>
 
-#ifdef HAVE_LIBGCRYPT
-#include <gcrypt.h>
+#ifdef HAVE_PLUGINS
+#include <wsutil/plugins.h>
+#endif
+
+#include <wsutil/report_err.h>
+#include <wsutil/str_util.h>
 #include <wsutil/file_util.h>
+
+#ifdef HAVE_LIBGCRYPT
+#include <wsutil/wsgcrypt.h>
 #endif
 
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#else
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 
 #include <wsutil/unicode-utils.h>
 #endif /* _WIN32 */
 
-#include "svnversion.h"
-
 /*
  * By default capinfos now continues processing
  * the next filename if and when wiretap detects
@@ -116,10 +117,11 @@ static gboolean continue_after_wtap_open_offline_failure = TRUE;
  * table report variables
  */
 
-static gboolean long_report = TRUE;         /* By default generate long report       */
-static gchar table_report_header = TRUE;    /* Generate column header by default     */
-static gchar field_separator = '\t';        /* Use TAB as field separator by default */
-static gchar quote_char = '\0';             /* Do NOT quote fields by default        */
+static gboolean long_report        = TRUE;  /* By default generate long report       */
+static gchar table_report_header   = TRUE;  /* Generate column header by default     */
+static gchar field_separator       = '\t';  /* Use TAB as field separator by default */
+static gchar quote_char            = '\0';  /* Do NOT quote fields by default        */
+static gboolean machine_readable   = FALSE; /* Display machine-readable numbers      */
 
 /*
  * capinfos has the ability to report on a number of
@@ -132,34 +134,35 @@ static gchar quote_char = '\0';             /* Do NOT quote fields by default
  * individual options.
  */
 
-static gboolean report_all_infos = TRUE;    /* Report all infos           */
+static gboolean report_all_infos   = TRUE;  /* Report all infos           */
 
-static gboolean cap_file_type = TRUE;       /* Report capture type        */
-static gboolean cap_file_encap = TRUE;      /* Report encapsulation       */
-static gboolean cap_snaplen = TRUE;         /* Packet size limit (snaplen)*/
-static gboolean cap_packet_count = TRUE;    /* Report packet count        */
-static gboolean cap_file_size = TRUE;       /* Report file size           */
+static gboolean cap_file_type      = TRUE;  /* Report capture type        */
+static gboolean cap_file_encap     = TRUE;  /* Report encapsulation       */
+static gboolean cap_snaplen        = TRUE;  /* Packet size limit (snaplen)*/
+static gboolean cap_packet_count   = TRUE;  /* Report packet count        */
+static gboolean cap_file_size      = TRUE;  /* Report file size           */
+static gboolean cap_comment        = TRUE;  /* Display the capture comment */
+static gboolean cap_file_more_info = TRUE;  /* Report more file info      */
+static gboolean cap_file_idb       = TRUE;  /* Report Interface info      */
 
-static gboolean cap_data_size = TRUE;       /* Report packet byte size    */
-static gboolean cap_duration = TRUE;        /* Report capture duration    */
-static gboolean cap_start_time = TRUE;      /* Report capture start time  */
-static gboolean cap_end_time = TRUE;        /* Report capture end time    */
-static gboolean time_as_secs = FALSE;       /* Report time values as raw seconds */
+static gboolean cap_data_size      = TRUE;  /* Report packet byte size    */
+static gboolean cap_duration       = TRUE;  /* Report capture duration    */
+static gboolean cap_start_time     = TRUE;  /* Report capture start time  */
+static gboolean cap_end_time       = TRUE;  /* Report capture end time    */
+static gboolean time_as_secs       = FALSE; /* Report time values as raw seconds */
 
 static gboolean cap_data_rate_byte = TRUE;  /* Report data rate bytes/sec */
-static gboolean cap_data_rate_bit = TRUE;   /* Report data rate bites/sec */
-static gboolean cap_packet_size = TRUE;     /* Report average packet size */
-static gboolean cap_packet_rate = TRUE;     /* Report average packet rate */
-static gboolean cap_in_order = TRUE;        /* Report if packets are in chronological order (True/False) */
+static gboolean cap_data_rate_bit  = TRUE;  /* Report data rate bites/sec */
+static gboolean cap_packet_size    = TRUE;  /* Report average packet size */
+static gboolean cap_packet_rate    = TRUE;  /* Report average packet rate */
+static gboolean cap_order          = TRUE;  /* Report if packets are in chronological order (True/False) */
 
 #ifdef HAVE_LIBGCRYPT
-static gboolean cap_file_hashes = TRUE;     /* Calculate file hashes */
-#endif
+static gboolean cap_file_hashes    = TRUE;  /* Calculate file hashes */
 
-#ifdef HAVE_LIBGCRYPT
-#define HASH_SIZE_SHA1 20
+#define HASH_SIZE_SHA1   20
 #define HASH_SIZE_RMD160 20
-#define HASH_SIZE_MD5 16
+#define HASH_SIZE_MD5    16
 
 #define HASH_STR_SIZE (41) /* Max hash size * 2 + '\0' */
 #define HASH_BUF_SIZE (1024 * 1024)
@@ -174,56 +177,92 @@ static gchar file_md5[HASH_STR_SIZE];
 #define FILE_HASH_OPT ""
 #endif /* HAVE_LIBGCRYPT */
 
+/*
+ * If we have at least two packets with time stamps, and they're not in
+ * order - i.e., the later packet has a time stamp older than the earlier
+ * packet - the time stamps are known not to be in order.
+ *
+ * If every packet has a time stamp, and they're all in order, the time
+ * stamp is known to be in order.
+ *
+ * Otherwise, we have no idea.
+ */
+typedef enum {
+  IN_ORDER,
+  NOT_IN_ORDER,
+  ORDER_UNKNOWN
+} order_t;
+
 typedef struct _capture_info {
   const char    *filename;
-  guint16       file_type;
-  int           file_encap;
-  gint64        filesize;
-
-  guint64       packet_bytes;
-  double        start_time;
-  double        stop_time;
-  guint32       packet_count;
-  gboolean      snap_set;                /* If set in capture file header      */
-  guint32       snaplen;                 /* value from the capture file header */
-  guint32       snaplen_min_inferred;    /* If caplen < len for 1 or more rcds */
-  guint32       snaplen_max_inferred;    /*  ...                               */
-  gboolean      drops_known;
-  guint32       drop_count;
-
-  double        duration;
-  double        packet_rate;
-  double        packet_size;
-  double        data_rate;              /* in bytes */
-  gboolean      in_order;
-
-  int          *encap_counts;           /* array of per_packet encap counts; array has one entry per wtap_encap type */
+  guint16        file_type;
+  gboolean       iscompressed;
+  int            file_encap;
+  int            file_tsprec;
+  gint64         filesize;
+  gchar         *comment;
+  gchar         *hardware;
+  gchar         *os;
+  gchar         *usr_appl;
+
+  guint64        packet_bytes;
+  gboolean       times_known;
+  nstime_t       start_time;
+  int            start_time_tsprec;
+  nstime_t       stop_time;
+  int            stop_time_tsprec;
+  guint32        packet_count;
+  gboolean       snap_set;                /* If set in capture file header      */
+  guint32        snaplen;                 /* value from the capture file header */
+  guint32        snaplen_min_inferred;    /* If caplen < len for 1 or more rcds */
+  guint32        snaplen_max_inferred;    /*  ...                               */
+  gboolean       drops_known;
+  guint32        drop_count;
+
+  nstime_t       duration;
+  int            duration_tsprec;
+  double         packet_rate;
+  double         packet_size;
+  double         data_rate;              /* in bytes */
+  gboolean       know_order;
+  order_t        order;
+
+  int           *encap_counts;           /* array of per_packet encap counts; array has one entry per wtap_encap type */
+
+  guint          num_interfaces;         /* number of IDBs, and thus size of interface_ids array */
+  guint32       *interface_ids;          /* array of per_packet interface_id counts; one entry per file IDB */
+  guint32        pkt_interface_id_unknown; /* counts if packet interface_id didn't match a known one */
+  GArray        *idb_info_strings;       /* array of IDB info strings */
 } capture_info;
 
+
 static void
 enable_all_infos(void)
 {
-  report_all_infos = TRUE;
-
-  cap_file_type = TRUE;
-  cap_file_encap = TRUE;
-  cap_snaplen = TRUE;
-  cap_packet_count = TRUE;
-  cap_file_size = TRUE;
-
-  cap_data_size = TRUE;
-  cap_duration = TRUE;
-  cap_start_time = TRUE;
-  cap_end_time = TRUE;
-  cap_in_order = TRUE;
+  report_all_infos   = TRUE;
+
+  cap_file_type      = TRUE;
+  cap_file_encap     = TRUE;
+  cap_snaplen        = TRUE;
+  cap_packet_count   = TRUE;
+  cap_file_size      = TRUE;
+  cap_comment        = TRUE;
+  cap_file_more_info = TRUE;
+  cap_file_idb       = TRUE;
+
+  cap_data_size      = TRUE;
+  cap_duration       = TRUE;
+  cap_start_time     = TRUE;
+  cap_end_time       = TRUE;
+  cap_order          = TRUE;
 
   cap_data_rate_byte = TRUE;
-  cap_data_rate_bit = TRUE;
-  cap_packet_size = TRUE;
-  cap_packet_rate = TRUE;
+  cap_data_rate_bit  = TRUE;
+  cap_packet_size    = TRUE;
+  cap_packet_rate    = TRUE;
 
 #ifdef HAVE_LIBGCRYPT
-  cap_file_hashes = TRUE;
+  cap_file_hashes    = TRUE;
 #endif /* HAVE_LIBGCRYPT */
 }
 
@@ -237,12 +276,15 @@ disable_all_infos(void)
   cap_snaplen        = FALSE;
   cap_packet_count   = FALSE;
   cap_file_size      = FALSE;
+  cap_comment        = FALSE;
+  cap_file_more_info = FALSE;
+  cap_file_idb       = FALSE;
 
   cap_data_size      = FALSE;
   cap_duration       = FALSE;
   cap_start_time     = FALSE;
   cap_end_time       = FALSE;
-  cap_in_order       = FALSE;
+  cap_order          = FALSE;
 
   cap_data_rate_byte = FALSE;
   cap_data_rate_bit  = FALSE;
@@ -250,57 +292,254 @@ disable_all_infos(void)
   cap_packet_rate    = FALSE;
 
 #ifdef HAVE_LIBGCRYPT
-  cap_file_hashes = FALSE;
+  cap_file_hashes    = FALSE;
 #endif /* HAVE_LIBGCRYPT */
 }
 
-/*
- * ctime_no_lf()
- *
- * This function simply truncates the string returned
- * from the ctime() function to remove the trailing
- * '\n' character.
- *
- * The ctime() function returns a string formatted as:
- *   "Www Mmm dd hh:mm:ss yyyy\n"
- * The unwanted '\n' is the 24th character.
- */
-
-static gchar *
-ctime_no_lf(const time_t* timer)
+static const gchar *
+order_string(order_t order)
 {
-  gchar *time_string;
-  time_string = ctime(timer);
-  time_string[24] = '\0';
-  return(time_string);
+  switch (order) {
+
+    case IN_ORDER:
+      return "True";
+
+    case NOT_IN_ORDER:
+      return "False";
+
+    case ORDER_UNKNOWN:
+      return "Unknown";
+
+    default:
+      return "???";  /* "cannot happen" (the next step is "Profit!") */
+  }
 }
 
 static gchar *
-time_string(const time_t *timer, capture_info *cf_info, gboolean want_lf)
+absolute_time_string(nstime_t *timer, int tsprecision, capture_info *cf_info)
 {
-  const gchar *lf = want_lf ? "\n" : "";
-  static gchar time_string_buf[15];
+  static gchar  time_string_buf[4+1+2+1+2+1+2+1+2+1+2+1+9+1+1];
+  struct tm *ti_tm;
 
-  if (cf_info->packet_count > 0) {
+  if (cf_info->times_known && cf_info->packet_count > 0) {
     if (time_as_secs) {
-      /* XXX - Would it be useful to show sub-second precision? */
-      g_snprintf(time_string_buf, 15, "%lu%s", (unsigned long) *timer, lf);
+      switch (tsprecision) {
+
+      case WTAP_TSPREC_SEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%lu",
+                   (unsigned long)timer->secs);
+        break;
+
+      case WTAP_TSPREC_DSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%lu.%01d",
+                   (unsigned long)timer->secs,
+                   timer->nsecs / 100000000);
+        break;
+
+      case WTAP_TSPREC_CSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%lu.%02d",
+                   (unsigned long)timer->secs,
+                   timer->nsecs / 10000000);
+        break;
+
+      case WTAP_TSPREC_MSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%lu.%03d",
+                   (unsigned long)timer->secs,
+                   timer->nsecs / 1000000);
+        break;
+
+      case WTAP_TSPREC_USEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%lu.%06d",
+                   (unsigned long)timer->secs,
+                   timer->nsecs / 1000);
+        break;
+
+      case WTAP_TSPREC_NSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%lu.%09d",
+                   (unsigned long)timer->secs,
+                   timer->nsecs);
+        break;
+
+      default:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "Unknown precision %d",
+                   tsprecision);
+        break;
+      }
       return time_string_buf;
-    } else if (want_lf) {
-      return ctime(timer);
     } else {
-      return ctime_no_lf(timer);
+      ti_tm = localtime(&timer->secs);
+      if (ti_tm == NULL) {
+        g_snprintf(time_string_buf, sizeof time_string_buf, "Not representable");
+        return time_string_buf;
+      }
+      switch (tsprecision) {
+
+      case WTAP_TSPREC_SEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%04d-%02d-%02d %02d:%02d:%02d",
+                   ti_tm->tm_year + 1900,
+                   ti_tm->tm_mon + 1,
+                   ti_tm->tm_mday,
+                   ti_tm->tm_hour,
+                   ti_tm->tm_min,
+                   ti_tm->tm_sec);
+        break;
+
+      case WTAP_TSPREC_DSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%04d-%02d-%02d %02d:%02d:%02d.%01d",
+                   ti_tm->tm_year + 1900,
+                   ti_tm->tm_mon + 1,
+                   ti_tm->tm_mday,
+                   ti_tm->tm_hour,
+                   ti_tm->tm_min,
+                   ti_tm->tm_sec,
+                   timer->nsecs / 100000000);
+        break;
+
+      case WTAP_TSPREC_CSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%04d-%02d-%02d %02d:%02d:%02d.%02d",
+                   ti_tm->tm_year + 1900,
+                   ti_tm->tm_mon + 1,
+                   ti_tm->tm_mday,
+                   ti_tm->tm_hour,
+                   ti_tm->tm_min,
+                   ti_tm->tm_sec,
+                   timer->nsecs / 10000000);
+        break;
+
+      case WTAP_TSPREC_MSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%04d-%02d-%02d %02d:%02d:%02d.%03d",
+                   ti_tm->tm_year + 1900,
+                   ti_tm->tm_mon + 1,
+                   ti_tm->tm_mday,
+                   ti_tm->tm_hour,
+                   ti_tm->tm_min,
+                   ti_tm->tm_sec,
+                   timer->nsecs / 1000000);
+        break;
+
+      case WTAP_TSPREC_USEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%04d-%02d-%02d %02d:%02d:%02d.%06d",
+                   ti_tm->tm_year + 1900,
+                   ti_tm->tm_mon + 1,
+                   ti_tm->tm_mday,
+                   ti_tm->tm_hour,
+                   ti_tm->tm_min,
+                   ti_tm->tm_sec,
+                   timer->nsecs / 1000);
+        break;
+
+      case WTAP_TSPREC_NSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%04d-%02d-%02d %02d:%02d:%02d.%09d",
+                   ti_tm->tm_year + 1900,
+                   ti_tm->tm_mon + 1,
+                   ti_tm->tm_mday,
+                   ti_tm->tm_hour,
+                   ti_tm->tm_min,
+                   ti_tm->tm_sec,
+                   timer->nsecs);
+        break;
+
+      default:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "Unknown precision %d",
+                   tsprecision);
+        break;
+      }
+      return time_string_buf;
     }
   }
 
-  g_snprintf(time_string_buf, 15, "n/a%s", lf);
+  g_snprintf(time_string_buf, sizeof time_string_buf, "n/a");
   return time_string_buf;
 }
 
-static double
-secs_nsecs(const struct wtap_nstime * nstime)
+static gchar *
+relative_time_string(nstime_t *timer, int tsprecision, capture_info *cf_info, gboolean want_seconds)
 {
-  return (nstime->nsecs / 1000000000.0) + (double)nstime->secs;
+  const gchar  *second = want_seconds ? " second" : "";
+  const gchar  *plural = want_seconds ? "s" : "";
+  static gchar  time_string_buf[4+1+2+1+2+1+2+1+2+1+2+1+1];
+
+  if (cf_info->times_known && cf_info->packet_count > 0) {
+    switch (tsprecision) {
+
+    case WTAP_TSPREC_SEC:
+      g_snprintf(time_string_buf, sizeof time_string_buf,
+                 "%lu%s%s",
+                 (unsigned long)timer->secs,
+                 second,
+                 timer->secs == 1 ? "" : plural);
+      break;
+
+    case WTAP_TSPREC_DSEC:
+      g_snprintf(time_string_buf, sizeof time_string_buf,
+                 "%lu.%01d%s%s",
+                 (unsigned long)timer->secs,
+                 timer->nsecs / 100000000,
+                 second,
+                 (timer->secs == 1 && timer->nsecs == 0) ? "" : plural);
+      break;
+
+    case WTAP_TSPREC_CSEC:
+      g_snprintf(time_string_buf, sizeof time_string_buf,
+                 "%lu.%02d%s%s",
+                 (unsigned long)timer->secs,
+                 timer->nsecs / 10000000,
+                 second,
+                 (timer->secs == 1 && timer->nsecs == 0) ? "" : plural);
+      break;
+
+    case WTAP_TSPREC_MSEC:
+      g_snprintf(time_string_buf, sizeof time_string_buf,
+                 "%lu.%03d%s%s",
+                 (unsigned long)timer->secs,
+                 timer->nsecs / 1000000,
+                 second,
+                 (timer->secs == 1 && timer->nsecs == 0) ? "" : plural);
+      break;
+
+    case WTAP_TSPREC_USEC:
+      g_snprintf(time_string_buf, sizeof time_string_buf,
+                 "%lu.%06d%s%s",
+                 (unsigned long)timer->secs,
+                 timer->nsecs / 1000,
+                 second,
+                 (timer->secs == 1 && timer->nsecs == 0) ? "" : plural);
+      break;
+
+    case WTAP_TSPREC_NSEC:
+      g_snprintf(time_string_buf, sizeof time_string_buf,
+                 "%lu.%09d%s%s",
+                 (unsigned long)timer->secs,
+                 timer->nsecs,
+                 second,
+                 (timer->secs == 1 && timer->nsecs == 0) ? "" : plural);
+      break;
+
+    default:
+      g_snprintf(time_string_buf, sizeof time_string_buf,
+                 "Unknown precision %d",
+                 tsprecision);
+      break;
+    }
+    return time_string_buf;
+  }
+
+  g_snprintf(time_string_buf, sizeof time_string_buf, "n/a");
+  return time_string_buf;
 }
 
 static void print_value(const gchar *text_p1, gint width, const gchar *text_p2, double value) {
@@ -314,54 +553,146 @@ static void
 print_stats(const gchar *filename, capture_info *cf_info)
 {
   const gchar           *file_type_string, *file_encap_string;
-  time_t                start_time_t;
-  time_t                stop_time_t;
+  gchar                 *size_string;
 
   /* Build printable strings for various stats */
-  file_type_string = wtap_file_type_string(cf_info->file_type);
+  file_type_string = wtap_file_type_subtype_string(cf_info->file_type);
   file_encap_string = wtap_encap_string(cf_info->file_encap);
-  start_time_t = (time_t)cf_info->start_time;
-  stop_time_t = (time_t)cf_info->stop_time;
 
   if (filename)           printf     ("File name:           %s\n", filename);
-  if (cap_file_type)      printf     ("File type:           %s\n", file_type_string);
-  if (cap_file_encap)     printf     ("File encapsulation:  %s\n", file_encap_string);
-  if (cap_file_encap && (cf_info->file_encap == WTAP_ENCAP_PER_PACKET)) {
-    int i;
-    for (i=0; i<WTAP_NUM_ENCAP_TYPES; i++) {
-      if (cf_info->encap_counts[i] > 0)
-        printf("                       %s\n", wtap_encap_string(i));
+  if (cap_file_type)      printf     ("File type:           %s%s\n",
+      file_type_string,
+      cf_info->iscompressed ? " (gzip compressed)" : "");
+
+  if (cap_file_encap) {
+    printf      ("File encapsulation:  %s\n", file_encap_string);
+    if (cf_info->file_encap == WTAP_ENCAP_PER_PACKET) {
+      int i;
+      printf    ("Encapsulation in use by packets (# of pkts):\n");
+      for (i=0; i<WTAP_NUM_ENCAP_TYPES; i++) {
+        if (cf_info->encap_counts[i] > 0)
+          printf("                     %s (%d)\n",
+                 wtap_encap_string(i), cf_info->encap_counts[i]);
+      }
     }
   }
+  if (cap_file_more_info) {
+    printf      ("File timestamp precision:  %s (%d)\n",
+      wtap_tsprec_string(cf_info->file_tsprec), cf_info->file_tsprec);
+  }
+
   if (cap_snaplen && cf_info->snap_set)
-                          printf     ("Packet size limit:   file hdr: %u bytes\n", cf_info->snaplen);
-  else if(cap_snaplen && !cf_info->snap_set)
-                          printf     ("Packet size limit:   file hdr: (not set)\n");
+    printf     ("Packet size limit:   file hdr: %u bytes\n", cf_info->snaplen);
+  else if (cap_snaplen && !cf_info->snap_set)
+    printf     ("Packet size limit:   file hdr: (not set)\n");
   if (cf_info->snaplen_max_inferred > 0) {
     if (cf_info->snaplen_min_inferred == cf_info->snaplen_max_inferred)
-                          printf     ("Packet size limit:   inferred: %u bytes\n", cf_info->snaplen_min_inferred);
+      printf     ("Packet size limit:   inferred: %u bytes\n", cf_info->snaplen_min_inferred);
     else
-                          printf     ("Packet size limit:   inferred: %u bytes - %u bytes (range)\n",
-                                      cf_info->snaplen_min_inferred, cf_info->snaplen_max_inferred);
+      printf     ("Packet size limit:   inferred: %u bytes - %u bytes (range)\n",
+          cf_info->snaplen_min_inferred, cf_info->snaplen_max_inferred);
+  }
+  if (cap_packet_count) {
+    printf     ("Number of packets:   ");
+    if (machine_readable) {
+      printf ("%u\n", cf_info->packet_count);
+    } else {
+      size_string = format_size(cf_info->packet_count, format_size_unit_none);
+      printf ("%s\n", size_string);
+      g_free(size_string);
+    }
+  }
+  if (cap_file_size) {
+    printf     ("File size:           ");
+    if (machine_readable) {
+      printf     ("%" G_GINT64_MODIFIER "d bytes\n", cf_info->filesize);
+    } else {
+      size_string = format_size(cf_info->filesize, format_size_unit_bytes);
+      printf ("%s\n", size_string);
+      g_free(size_string);
+    }
+  }
+  if (cap_data_size) {
+    printf     ("Data size:           ");
+    if (machine_readable) {
+      printf     ("%" G_GINT64_MODIFIER "u bytes\n", cf_info->packet_bytes);
+    } else {
+      size_string = format_size(cf_info->packet_bytes, format_size_unit_bytes);
+      printf ("%s\n", size_string);
+      g_free(size_string);
+    }
+  }
+  if (cf_info->times_known) {
+    if (cap_duration) /* XXX - shorten to hh:mm:ss */
+                          printf("Capture duration:    %s\n", relative_time_string(&cf_info->duration, cf_info->duration_tsprec, cf_info, TRUE));
+    if (cap_start_time)
+                          printf("First packet time:   %s\n", absolute_time_string(&cf_info->start_time, cf_info->start_time_tsprec, cf_info));
+    if (cap_end_time)
+                          printf("Last packet time:    %s\n", absolute_time_string(&cf_info->stop_time, cf_info->stop_time_tsprec, cf_info));
+    if (cap_data_rate_byte) {
+                          printf("Data byte rate:      ");
+      if (machine_readable) {
+        print_value("", 2, " bytes/sec",   cf_info->data_rate);
+      } else {
+        size_string = format_size((gint64)cf_info->data_rate, format_size_unit_bytes_s);
+        printf ("%s\n", size_string);
+        g_free(size_string);
+      }
+    }
+    if (cap_data_rate_bit) {
+                          printf("Data bit rate:       ");
+      if (machine_readable) {
+        print_value("", 2, " bits/sec",    cf_info->data_rate*8);
+      } else {
+        size_string = format_size((gint64)(cf_info->data_rate*8), format_size_unit_bits_s);
+        printf ("%s\n", size_string);
+        g_free(size_string);
+      }
+    }
+  }
+  if (cap_packet_size)    printf("Average packet size: %.2f bytes\n",        cf_info->packet_size);
+  if (cf_info->times_known) {
+    if (cap_packet_rate) {
+                          printf("Average packet rate: ");
+      if (machine_readable) {
+        print_value("", 2, " packets/sec", cf_info->packet_rate);
+      } else {
+        size_string = format_size((gint64)cf_info->packet_rate, format_size_unit_packets_s);
+        printf ("%s\n", size_string);
+        g_free(size_string);
+      }
+    }
   }
-  if (cap_packet_count)   printf     ("Number of packets:   %u\n", cf_info->packet_count);
-  if (cap_file_size)      printf     ("File size:           %" G_GINT64_MODIFIER "d bytes\n", cf_info->filesize);
-  if (cap_data_size)      printf     ("Data size:           %" G_GINT64_MODIFIER "u bytes\n", cf_info->packet_bytes);
-  if (cap_duration)       print_value("Capture duration:    ", 0, " seconds",   cf_info->duration);
-  if (cap_start_time)     printf     ("Start time:          %s", time_string(&start_time_t, cf_info, TRUE));
-  if (cap_end_time)       printf     ("End time:            %s", time_string(&stop_time_t, cf_info, TRUE));
-  if (cap_data_rate_byte) print_value("Data byte rate:      ", 2, " bytes/sec",   cf_info->data_rate);
-  if (cap_data_rate_bit)  print_value("Data bit rate:       ", 2, " bits/sec",    cf_info->data_rate*8);
-  if (cap_packet_size)    printf     ("Average packet size: %.2f bytes\n",        cf_info->packet_size);
-  if (cap_packet_rate)    print_value("Average packet rate: ", 2, " packets/sec", cf_info->packet_rate);
 #ifdef HAVE_LIBGCRYPT
   if (cap_file_hashes) {
-                          printf     ("SHA1:                %s\n", file_sha1);
-                          printf     ("RIPEMD160:           %s\n", file_rmd160);
-                          printf     ("MD5:                 %s\n", file_md5);
+    printf     ("SHA1:                %s\n", file_sha1);
+    printf     ("RIPEMD160:           %s\n", file_rmd160);
+    printf     ("MD5:                 %s\n", file_md5);
   }
-  if (cap_in_order)       printf     ("Strict time order:   %s\n", (cf_info->in_order) ? "True" : "False");
 #endif /* HAVE_LIBGCRYPT */
+  if (cap_order)          printf     ("Strict time order:   %s\n", order_string(cf_info->order));
+  if (cap_comment && cf_info->comment)
+    printf     ("Capture comment:     %s\n", cf_info->comment);
+  if (cap_file_more_info) {
+    if (cf_info->hardware)
+      printf   ("Capture hardware:    %s\n", cf_info->hardware);
+    if (cf_info->os)
+      printf   ("Capture oper-sys:    %s\n", cf_info->os);
+    if (cf_info->usr_appl)
+      printf   ("Capture application: %s\n", cf_info->usr_appl);
+  }
+
+  if (cap_file_idb && cf_info->num_interfaces != 0) {
+    guint i;
+    g_assert(cf_info->num_interfaces == cf_info->idb_info_strings->len);
+    printf     ("Number of interfaces in file: %u\n", cf_info->num_interfaces);
+    for (i = 0; i < cf_info->idb_info_strings->len; i++) {
+      gchar *s = g_array_index(cf_info->idb_info_strings, gchar*, i);
+      printf   ("Interface #%u info:\n", i);
+      printf   ("%s", s);
+      printf   ("                     Number of packets = %u\n", cf_info->interface_ids[i]);
+    }
+  }
 }
 
 static void
@@ -394,6 +725,7 @@ print_stats_table_header(void)
 
   if (cap_file_type)      print_stats_table_header_label("File type");
   if (cap_file_encap)     print_stats_table_header_label("File encapsulation");
+  if (cap_file_more_info) print_stats_table_header_label("File time precision");
   if (cap_snaplen)        print_stats_table_header_label("Packet size limit");
   if (cap_snaplen)        print_stats_table_header_label("Packet size limit min (inferred)");
   if (cap_snaplen)        print_stats_table_header_label("Packet size limit max (inferred)");
@@ -409,12 +741,18 @@ print_stats_table_header(void)
   if (cap_packet_rate)    print_stats_table_header_label("Average packet rate (packets/sec)");
 #ifdef HAVE_LIBGCRYPT
   if (cap_file_hashes) {
-                          print_stats_table_header_label("SHA1");
-                          print_stats_table_header_label("RIPEMD160");
-                          print_stats_table_header_label("MD5");
+    print_stats_table_header_label("SHA1");
+    print_stats_table_header_label("RIPEMD160");
+    print_stats_table_header_label("MD5");
   }
 #endif /* HAVE_LIBGCRYPT */
-  if (cap_in_order)       print_stats_table_header_label("Strict time order");
+  if (cap_order)          print_stats_table_header_label("Strict time order");
+  if (cap_comment)        print_stats_table_header_label("Capture comment");
+  if (cap_file_more_info) {
+    print_stats_table_header_label("Capture hardware");
+    print_stats_table_header_label("Capture oper-sys");
+    print_stats_table_header_label("Capture application");
+  }
 
   printf("\n");
 }
@@ -423,14 +761,10 @@ static void
 print_stats_table(const gchar *filename, capture_info *cf_info)
 {
   const gchar           *file_type_string, *file_encap_string;
-  time_t                start_time_t;
-  time_t                stop_time_t;
 
   /* Build printable strings for various stats */
-  file_type_string = wtap_file_type_string(cf_info->file_type);
+  file_type_string = wtap_file_type_subtype_string(cf_info->file_type);
   file_encap_string = wtap_encap_string(cf_info->file_encap);
-  start_time_t = (time_t)cf_info->start_time;
-  stop_time_t = (time_t)cf_info->stop_time;
 
   if (filename) {
     putquote();
@@ -457,10 +791,17 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
     putquote();
   }
 
+  if (cap_file_more_info) {
+    putsep();
+    putquote();
+    printf("%s", wtap_tsprec_string(cf_info->file_tsprec));
+    putquote();
+  }
+
   if (cap_snaplen) {
     putsep();
     putquote();
-    if(cf_info->snap_set)
+    if (cf_info->snap_set)
       printf("%u", cf_info->snaplen);
     else
       printf("(not set)");
@@ -511,35 +852,41 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
   if (cap_duration) {
     putsep();
     putquote();
-    printf("%f", cf_info->duration);
+    printf("%s", relative_time_string(&cf_info->duration, cf_info->duration_tsprec, cf_info, FALSE));
     putquote();
   }
 
   if (cap_start_time) {
     putsep();
     putquote();
-    printf("%s", time_string(&start_time_t, cf_info, FALSE));
+    printf("%s", absolute_time_string(&cf_info->start_time, cf_info->start_time_tsprec, cf_info));
     putquote();
   }
 
   if (cap_end_time) {
     putsep();
     putquote();
-    printf("%s", time_string(&stop_time_t, cf_info, FALSE));
+    printf("%s", absolute_time_string(&cf_info->stop_time, cf_info->stop_time_tsprec, cf_info));
     putquote();
   }
 
   if (cap_data_rate_byte) {
     putsep();
     putquote();
-    printf("%.2f", cf_info->data_rate);
+    if (cf_info->times_known)
+      printf("%.2f", cf_info->data_rate);
+    else
+      printf("n/a");
     putquote();
   }
 
   if (cap_data_rate_bit) {
     putsep();
     putquote();
-    printf("%.2f", cf_info->data_rate*8);
+    if (cf_info->times_known)
+      printf("%.2f", cf_info->data_rate*8);
+    else
+      printf("n/a");
     putquote();
   }
 
@@ -553,7 +900,10 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
   if (cap_packet_rate) {
     putsep();
     putquote();
-    printf("%.2f", cf_info->packet_rate);
+    if (cf_info->times_known)
+      printf("%.2f", cf_info->packet_rate);
+    else
+      printf("n/a");
     putquote();
   }
 
@@ -576,21 +926,101 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
   }
 #endif /* HAVE_LIBGCRYPT */
 
-  if (cap_in_order) {
+  if (cap_order) {
     putsep();
     putquote();
-    printf("%s", (cf_info->in_order) ? "True" : "False");
+    printf("%s", order_string(cf_info->order));
+    putquote();
+  }
+
+  /* this is silly to put into a table format, but oh well */
+  if (cap_comment) {
+    putsep();
+    putquote();
+    printf("%s", cf_info->comment);
+    putquote();
+  }
+
+  if (cap_file_more_info) {
+    putsep();
+    putquote();
+    printf("%s", cf_info->hardware);
+    putquote();
+
+    putsep();
+    putquote();
+    printf("%s", cf_info->os);
+    putquote();
+
+    putsep();
+    putquote();
+    printf("%s", cf_info->usr_appl);
     putquote();
   }
 
   printf("\n");
 }
 
+static void
+cleanup_capture_info(capture_info *cf_info)
+{
+  guint i;
+  g_assert(cf_info != NULL);
+
+  g_free(cf_info->comment);
+  cf_info->comment = NULL;
+
+  g_free(cf_info->hardware);
+  cf_info->hardware = NULL;
+
+  g_free(cf_info->os);
+  cf_info->os = NULL;
+
+  g_free(cf_info->usr_appl);
+  cf_info->usr_appl = NULL;
+
+  g_free(cf_info->encap_counts);
+  cf_info->encap_counts = NULL;
+
+  g_free(cf_info->interface_ids);
+  cf_info->interface_ids = NULL;
+
+  if (cf_info->idb_info_strings) {
+    for (i = 0; i < cf_info->idb_info_strings->len; i++) {
+      gchar *s = g_array_index(cf_info->idb_info_strings, gchar*, i);
+      g_free(s);
+    }
+    g_array_free(cf_info->idb_info_strings, TRUE);
+  }
+  cf_info->idb_info_strings = NULL;
+}
+
+/* multi-line comments would conflict with the formatting that capinfos uses
+   we replace linefeeds with spaces */
+static void
+string_replace_newlines(gchar *str)
+{
+  gchar *p;
+
+  if (str) {
+    p = str;
+    while (*p != '\0') {
+      if (*p == '\n')
+        *p = ' ';
+      if (*p == '\r')
+        *p = ' ';
+      p++;
+    }
+  }
+}
+
+
 static int
 process_cap_file(wtap *wth, const char *filename)
 {
+  int                   status = 0;
   int                   err;
-  gchar                 *err_info;
+  gchar                *err_info;
   gint64                size;
   gint64                data_offset;
 
@@ -600,98 +1030,178 @@ process_cap_file(wtap *wth, const char *filename)
   guint32               snaplen_max_inferred =          0;
   const struct wtap_pkthdr *phdr;
   capture_info          cf_info;
-  double                start_time = 0;
-  double                stop_time  = 0;
-  double                cur_time   = 0;
-  double               prev_time = 0;
-  gboolean             in_order = TRUE;
+  gboolean              have_times = TRUE;
+  nstime_t              start_time;
+  int                   start_time_tsprec;
+  nstime_t              stop_time;
+  int                   stop_time_tsprec;
+  nstime_t              cur_time;
+  nstime_t              prev_time;
+  gboolean              know_order = FALSE;
+  order_t               order = IN_ORDER;
+  const wtapng_section_t *shb_inf;
+  guint                 i;
+  wtapng_iface_descriptions_t *idb_info;
+
+  g_assert(wth != NULL);
+  g_assert(filename != NULL);
+
+  nstime_set_zero(&start_time);
+  start_time_tsprec = WTAP_TSPREC_UNKNOWN;
+  nstime_set_zero(&stop_time);
+  stop_time_tsprec = WTAP_TSPREC_UNKNOWN;
+  nstime_set_zero(&cur_time);
+  nstime_set_zero(&prev_time);
+
+  cf_info.comment  = NULL;
+  cf_info.hardware = NULL;
+  cf_info.os       = NULL;
+  cf_info.usr_appl = NULL;
+
+  cf_info.encap_counts = g_new0(int,WTAP_NUM_ENCAP_TYPES);
+
+  idb_info = wtap_file_get_idb_info(wth);
+
+  g_assert(idb_info->interface_data != NULL);
+
+  cf_info.num_interfaces = idb_info->interface_data->len;
+  cf_info.interface_ids  = g_new0(guint32, cf_info.num_interfaces);
+  cf_info.pkt_interface_id_unknown = 0;
+
+  cf_info.idb_info_strings = g_array_sized_new(FALSE, FALSE, sizeof(gchar*), cf_info.num_interfaces);
+
+  /* get IDB info strings */
+  for (i = 0; i < cf_info.num_interfaces; i++) {
+    const wtapng_if_descr_t *if_descr = &g_array_index(idb_info->interface_data, wtapng_if_descr_t, i);
+    gchar *s = wtap_get_debug_if_descr(if_descr, 21, "\n");
+    g_array_append_val(cf_info.idb_info_strings, s);
+  }
 
-  cf_info.encap_counts = g_malloc0(WTAP_NUM_ENCAP_TYPES * sizeof(int));
+  g_free(idb_info);
+  idb_info = NULL;
 
   /* Tally up data that we need to parse through the file to find */
   while (wtap_read(wth, &err, &err_info, &data_offset))  {
     phdr = wtap_phdr(wth);
-    prev_time = cur_time;
-    cur_time = secs_nsecs(&phdr->ts);
-    if(packet==0) {
-      start_time = cur_time;
-      stop_time = cur_time;
+    if (phdr->presence_flags & WTAP_HAS_TS) {
       prev_time = cur_time;
-    }
-    if (cur_time < prev_time) {
-      in_order = FALSE;
-    }
-    if (cur_time < start_time) {
-      start_time = cur_time;
-    }
-    if (cur_time > stop_time) {
-      stop_time = cur_time;
+      cur_time = phdr->ts;
+      if (packet == 0) {
+        start_time = phdr->ts;
+        start_time_tsprec = phdr->pkt_tsprec;
+        stop_time  = phdr->ts;
+        stop_time_tsprec = phdr->pkt_tsprec;
+        prev_time  = phdr->ts;
+      }
+      if (nstime_cmp(&cur_time, &prev_time) < 0) {
+        order = NOT_IN_ORDER;
+      }
+      if (nstime_cmp(&cur_time, &start_time) < 0) {
+        start_time = cur_time;
+        start_time_tsprec = phdr->pkt_tsprec;
+      }
+      if (nstime_cmp(&cur_time, &stop_time) > 0) {
+        stop_time = cur_time;
+        stop_time_tsprec = phdr->pkt_tsprec;
+      }
+    } else {
+      have_times = FALSE; /* at least one packet has no time stamp */
+      if (order != NOT_IN_ORDER)
+        order = ORDER_UNKNOWN;
     }
 
-    bytes+=phdr->len;
-    packet++;
-
-    /* If caplen < len for a rcd, then presumably           */
-    /* 'Limit packet capture length' was done for this rcd. */
-    /* Keep track as to the min/max actual snapshot lengths */
-    /*  seen for this file.                                 */
-    if (phdr->caplen < phdr->len) {
-      if (phdr->caplen < snaplen_min_inferred)
-        snaplen_min_inferred = phdr->caplen;
-      if (phdr->caplen > snaplen_max_inferred)
-        snaplen_max_inferred = phdr->caplen;
-    }
+    if (phdr->rec_type == REC_TYPE_PACKET) {
+      bytes+=phdr->len;
+      packet++;
+
+      /* If caplen < len for a rcd, then presumably           */
+      /* 'Limit packet capture length' was done for this rcd. */
+      /* Keep track as to the min/max actual snapshot lengths */
+      /*  seen for this file.                                 */
+      if (phdr->caplen < phdr->len) {
+        if (phdr->caplen < snaplen_min_inferred)
+          snaplen_min_inferred = phdr->caplen;
+        if (phdr->caplen > snaplen_max_inferred)
+          snaplen_max_inferred = phdr->caplen;
+      }
 
-    /* Per-packet encapsulation */
-    if (wtap_file_encap(wth) == WTAP_ENCAP_PER_PACKET) {
+      /* Per-packet encapsulation */
+      if (wtap_file_encap(wth) == WTAP_ENCAP_PER_PACKET) {
         if ((phdr->pkt_encap > 0) && (phdr->pkt_encap < WTAP_NUM_ENCAP_TYPES)) {
-            cf_info.encap_counts[phdr->pkt_encap] += 1;
+          cf_info.encap_counts[phdr->pkt_encap] += 1;
         } else {
-            fprintf(stderr, "capinfos: Unknown per-packet encapsulation: %d [frame number: %d]\n", phdr->pkt_encap, packet);
+          fprintf(stderr, "capinfos: Unknown per-packet encapsulation %d in frame %u of file \"%s\"\n",
+                  phdr->pkt_encap, packet, filename);
+        }
+      }
+
+      /* Packet interface_id info */
+      if (phdr->presence_flags & WTAP_HAS_INTERFACE_ID) {
+        /* cf_info.num_interfaces is size, not index, so it's one more than max index */
+        if (phdr->interface_id < cf_info.num_interfaces) {
+          cf_info.interface_ids[phdr->interface_id] += 1;
+        }
+        else {
+          cf_info.pkt_interface_id_unknown += 1;
         }
+      }
+      else {
+        /* it's for interface_id 0 */
+        if (cf_info.num_interfaces != 0) {
+          cf_info.interface_ids[0] += 1;
+        }
+        else {
+          cf_info.pkt_interface_id_unknown += 1;
+        }
+      }
     }
 
   } /* while */
 
   if (err != 0) {
     fprintf(stderr,
-            "capinfos: An error occurred after reading %u packets from \"%s\": %s.\n",
-            packet, filename, wtap_strerror(err));
-    switch (err) {
-
-    case WTAP_ERR_UNSUPPORTED:
-    case WTAP_ERR_UNSUPPORTED_ENCAP:
-    case WTAP_ERR_BAD_RECORD:
-    case WTAP_ERR_DECOMPRESS:
-      fprintf(stderr, "(%s)\n", err_info);
-      g_free(err_info);
-      break;
+        "capinfos: An error occurred after reading %u packets from \"%s\": %s.\n",
+        packet, filename, wtap_strerror(err));
+    if (err == WTAP_ERR_SHORT_READ) {
+        /* Don't give up completely with this one. */
+        status = 1;
+        fprintf(stderr,
+          "  (will continue anyway, checksums might be incorrect)\n");
+    } else {
+        if (err_info != NULL) {
+            fprintf(stderr, "(%s)\n", err_info);
+            g_free(err_info);
+        }
+
+        cleanup_capture_info(&cf_info);
+        return 1;
     }
-    g_free(cf_info.encap_counts);
-    return 1;
   }
 
   /* File size */
   size = wtap_file_size(wth, &err);
   if (size == -1) {
     fprintf(stderr,
-            "capinfos: Can't get size of \"%s\": %s.\n",
-            filename, strerror(err));
-    g_free(cf_info.encap_counts);
+        "capinfos: Can't get size of \"%s\": %s.\n",
+        filename, g_strerror(err));
+    cleanup_capture_info(&cf_info);
     return 1;
   }
 
   cf_info.filesize = size;
 
   /* File Type */
-  cf_info.file_type = wtap_file_type(wth);
+  cf_info.file_type = wtap_file_type_subtype(wth);
+  cf_info.iscompressed = wtap_iscompressed(wth);
 
   /* File Encapsulation */
   cf_info.file_encap = wtap_file_encap(wth);
 
+  cf_info.file_tsprec = wtap_file_tsprec(wth);
+
   /* Packet size limit (snaplen) */
   cf_info.snaplen = wtap_snapshot_length(wth);
-  if(cf_info.snaplen > 0)
+  if (cf_info.snaplen > 0)
     cf_info.snap_set = TRUE;
   else
     cf_info.snap_set = FALSE;
@@ -703,10 +1213,19 @@ process_cap_file(wtap *wth, const char *filename)
   cf_info.packet_count = packet;
 
   /* File Times */
+  cf_info.times_known = have_times;
   cf_info.start_time = start_time;
+  cf_info.start_time_tsprec = start_time_tsprec;
   cf_info.stop_time = stop_time;
-  cf_info.duration = stop_time-start_time;
-  cf_info.in_order = in_order;
+  cf_info.stop_time_tsprec = stop_time_tsprec;
+  nstime_delta(&cf_info.duration, &stop_time, &start_time);
+  /* Duration precision is the higher of the start and stop time precisions. */
+  if (cf_info.stop_time_tsprec > cf_info.start_time_tsprec)
+    cf_info.duration_tsprec = cf_info.stop_time_tsprec;
+  else
+    cf_info.duration_tsprec = cf_info.start_time_tsprec;
+  cf_info.know_order = know_order;
+  cf_info.order = order;
 
   /* Number of packet bytes */
   cf_info.packet_bytes = bytes;
@@ -716,53 +1235,54 @@ process_cap_file(wtap *wth, const char *filename)
   cf_info.packet_size = 0.0;
 
   if (packet > 0) {
-    if (cf_info.duration > 0.0) {
-      cf_info.data_rate   = (double)bytes  / (stop_time-start_time); /* Data rate per second */
-      cf_info.packet_rate = (double)packet / (stop_time-start_time); /* packet rate per second */
+    double delta_time = nstime_to_sec(&stop_time) - nstime_to_sec(&start_time);
+    if (delta_time > 0.0) {
+      cf_info.data_rate   = (double)bytes  / delta_time; /* Data rate per second */
+      cf_info.packet_rate = (double)packet / delta_time; /* packet rate per second */
     }
     cf_info.packet_size = (double)bytes / packet;                  /* Avg packet size      */
   }
 
-  if(long_report) {
+  shb_inf = wtap_file_get_shb(wth);
+  if (shb_inf) {
+    /* opt_comment is always 0-terminated by pcapng_read_section_header_block */
+    cf_info.comment  = g_strdup(shb_inf->opt_comment);
+    cf_info.hardware = g_strdup(shb_inf->shb_hardware);
+    cf_info.os       = g_strdup(shb_inf->shb_os);
+    cf_info.usr_appl = g_strdup(shb_inf->shb_user_appl);
+  }
+
+  string_replace_newlines(cf_info.comment);
+  string_replace_newlines(cf_info.hardware);
+  string_replace_newlines(cf_info.os);
+  string_replace_newlines(cf_info.usr_appl);
+
+  if (long_report) {
     print_stats(filename, &cf_info);
   } else {
     print_stats_table(filename, &cf_info);
   }
 
-  g_free(cf_info.encap_counts);
+  cleanup_capture_info(&cf_info);
 
-  return 0;
+  return status;
 }
 
 static void
-usage(gboolean is_error)
+print_usage(FILE *output)
 {
-  FILE *output;
-
-  if (!is_error) {
-    output = stdout;
-    /* XXX - add capinfos header info here */
-  }
-  else {
-    output = stderr;
-  }
-
-  fprintf(output, "Capinfos %s"
-#ifdef SVNVERSION
-          " (" SVNVERSION " from " SVNPATH ")"
-#endif
-          "\n", VERSION);
-  fprintf(output, "Prints various information (infos) about capture files.\n");
-  fprintf(output, "See http://www.wireshark.org for more information.\n");
   fprintf(output, "\n");
   fprintf(output, "Usage: capinfos [options] <infile> ...\n");
   fprintf(output, "\n");
   fprintf(output, "General infos:\n");
   fprintf(output, "  -t display the capture file type\n");
   fprintf(output, "  -E display the capture file encapsulation\n");
+  fprintf(output, "  -I display the capture file interface information\n");
+  fprintf(output, "  -F display additional capture file information\n");
 #ifdef HAVE_LIBGCRYPT
   fprintf(output, "  -H display the SHA1, RMD160, and MD5 hashes of the file\n");
 #endif
+  fprintf(output, "  -k display the capture comment\n");
   fprintf(output, "\n");
   fprintf(output, "Size infos:\n");
   fprintf(output, "  -c display the number of packets\n");
@@ -786,6 +1306,7 @@ usage(gboolean is_error)
   fprintf(output, "Output format:\n");
   fprintf(output, "  -L generate long report (default)\n");
   fprintf(output, "  -T generate table report\n");
+  fprintf(output, "  -M display machine-readable values in long reports\n");
   fprintf(output, "\n");
   fprintf(output, "Table report options:\n");
   fprintf(output, "  -R generate header record (default)\n");
@@ -804,7 +1325,7 @@ usage(gboolean is_error)
   fprintf(output, "  -C cancel processing if file open fails (default is to continue)\n");
   fprintf(output, "  -A generate all infos (default)\n");
   fprintf(output, "\n");
-  fprintf(output, "Options are processed from left to right order with later options superceeding\n");
+  fprintf(output, "Options are processed from left to right order with later options superceding\n");
   fprintf(output, "or adding to earlier options.\n");
   fprintf(output, "\n");
   fprintf(output, "If no options are given the default is to display all infos in long report\n");
@@ -838,14 +1359,47 @@ hash_to_str(const unsigned char *hash, size_t length, char *str) {
 }
 #endif /* HAVE_LIBGCRYPT */
 
+static void
+get_capinfos_compiled_info(GString *str)
+{
+  /* LIBZ */
+  g_string_append(str, ", ");
+#ifdef HAVE_LIBZ
+  g_string_append(str, "with libz ");
+#ifdef ZLIB_VERSION
+  g_string_append(str, ZLIB_VERSION);
+#else /* ZLIB_VERSION */
+  g_string_append(str, "(version unknown)");
+#endif /* ZLIB_VERSION */
+#else /* HAVE_LIBZ */
+  g_string_append(str, "without libz");
+#endif /* HAVE_LIBZ */
+}
+
+static void
+get_capinfos_runtime_info(GString *str)
+{
+  /* zlib */
+#if defined(HAVE_LIBZ) && !defined(_WIN32)
+  g_string_append_printf(str, ", with libz %s", zlibVersion());
+#endif
+}
+
 int
 main(int argc, char *argv[])
 {
+  GString *comp_info_str;
+  GString *runtime_info_str;
   wtap  *wth;
   int    err;
   gchar *err_info;
   int    opt;
   int    overall_error_status;
+  static const struct option long_options[] = {
+      {"help", no_argument, NULL, 'h'},
+      {"version", no_argument, NULL, 'v'},
+      {0, 0, 0, 0 }
+  };
 
   int status = 0;
 #ifdef HAVE_PLUGINS
@@ -858,180 +1412,236 @@ main(int argc, char *argv[])
   size_t hash_bytes;
 #endif
 
+  /* Set the C-language locale to the native environment. */
+  setlocale(LC_ALL, "");
+
+  /* Get the compile-time version information string */
+  comp_info_str = get_compiled_version_info(NULL, get_capinfos_compiled_info);
+
+  /* Get the run-time version information string */
+  runtime_info_str = get_runtime_version_info(get_capinfos_runtime_info);
+
+  /* Add it to the information to be reported on a crash. */
+  ws_add_crash_info("Capinfos (Wireshark) %s\n"
+         "\n"
+         "%s"
+         "\n"
+         "%s",
+      get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str);
+
 #ifdef _WIN32
   arg_list_utf_16to8(argc, argv);
+  create_app_running_mutex();
 #endif /* _WIN32 */
 
   /*
    * Get credential information for later use.
    */
   init_process_policies();
+  init_open_routines();
 
 #ifdef HAVE_PLUGINS
-  /* Register wiretap plugins */
-
   if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) {
     g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
     g_free(init_progfile_dir_error);
   } else {
-    init_report_err(failure_message,NULL,NULL,NULL);
-    init_plugins();
+    /* Register all the plugin types we have. */
+    wtap_register_plugin_types(); /* Types known to libwiretap */
+
+    init_report_err(failure_message, NULL, NULL, NULL);
+
+    /* Scan for plugins.  This does *not* call their registration routines;
+       that's done later. */
+    scan_plugins();
+
+    /* Register all libwiretap plugin modules. */
+    register_all_wiretap_modules();
   }
 #endif
 
   /* Process the options */
-
-  while ((opt = getopt(argc, argv, "tEcs" FILE_HASH_OPT "dluaeyizvhxoCALTRrSNqQBmb")) !=-1) {
+  /* FILE_HASH_OPT will be "H" if libgcrypt is compiled in, so don't use "H" */
+  while ((opt = getopt_long(argc, argv, "abcdehiklmoqrstuvxyzABCEF" FILE_HASH_OPT "ILMNQRST", long_options, NULL)) !=-1) {
 
     switch (opt) {
 
-    case 't':
-      if (report_all_infos) disable_all_infos();
-      cap_file_type = TRUE;
-      break;
+      case 't':
+        if (report_all_infos) disable_all_infos();
+        cap_file_type = TRUE;
+        break;
 
-    case 'E':
-      if (report_all_infos) disable_all_infos();
-      cap_file_encap = TRUE;
-      break;
+      case 'E':
+        if (report_all_infos) disable_all_infos();
+        cap_file_encap = TRUE;
+        break;
 
-    case 'l':
-      if (report_all_infos) disable_all_infos();
-      cap_snaplen = TRUE;
-      break;
+      case 'l':
+        if (report_all_infos) disable_all_infos();
+        cap_snaplen = TRUE;
+        break;
 
-    case 'c':
-      if (report_all_infos) disable_all_infos();
-      cap_packet_count = TRUE;
-      break;
+      case 'c':
+        if (report_all_infos) disable_all_infos();
+        cap_packet_count = TRUE;
+        break;
 
-    case 's':
-      if (report_all_infos) disable_all_infos();
-      cap_file_size = TRUE;
-      break;
+      case 's':
+        if (report_all_infos) disable_all_infos();
+        cap_file_size = TRUE;
+        break;
 
-    case 'd':
-      if (report_all_infos) disable_all_infos();
-      cap_data_size = TRUE;
-      break;
+      case 'd':
+        if (report_all_infos) disable_all_infos();
+        cap_data_size = TRUE;
+        break;
 
-    case 'u':
-      if (report_all_infos) disable_all_infos();
-      cap_duration = TRUE;
-      break;
+      case 'u':
+        if (report_all_infos) disable_all_infos();
+        cap_duration = TRUE;
+        break;
 
-    case 'a':
-      if (report_all_infos) disable_all_infos();
-      cap_start_time = TRUE;
-      break;
+      case 'a':
+        if (report_all_infos) disable_all_infos();
+        cap_start_time = TRUE;
+        break;
 
-    case 'e':
-      if (report_all_infos) disable_all_infos();
-      cap_end_time = TRUE;
-      break;
+      case 'e':
+        if (report_all_infos) disable_all_infos();
+        cap_end_time = TRUE;
+        break;
 
-    case 'S':
-      time_as_secs = TRUE;
-      break;
+      case 'S':
+        time_as_secs = TRUE;
+        break;
 
-    case 'y':
-      if (report_all_infos) disable_all_infos();
-      cap_data_rate_byte = TRUE;
-      break;
+      case 'y':
+        if (report_all_infos) disable_all_infos();
+        cap_data_rate_byte = TRUE;
+        break;
 
-    case 'i':
-      if (report_all_infos) disable_all_infos();
-      cap_data_rate_bit = TRUE;
-      break;
+      case 'i':
+        if (report_all_infos) disable_all_infos();
+        cap_data_rate_bit = TRUE;
+        break;
 
-    case 'z':
-      if (report_all_infos) disable_all_infos();
-      cap_packet_size = TRUE;
-      break;
+      case 'z':
+        if (report_all_infos) disable_all_infos();
+        cap_packet_size = TRUE;
+        break;
 
-    case 'x':
-      if (report_all_infos) disable_all_infos();
-      cap_packet_rate = TRUE;
-      break;
+      case 'x':
+        if (report_all_infos) disable_all_infos();
+        cap_packet_rate = TRUE;
+        break;
 
 #ifdef HAVE_LIBGCRYPT
-    case 'H':
-      if (report_all_infos) disable_all_infos();
-      cap_file_hashes = TRUE;
-      break;
+      case 'H':
+        if (report_all_infos) disable_all_infos();
+        cap_file_hashes = TRUE;
+        break;
 #endif
 
-    case 'o':
-      if (report_all_infos) disable_all_infos();
-      cap_in_order = TRUE;
-      break;
+      case 'o':
+        if (report_all_infos) disable_all_infos();
+        cap_order = TRUE;
+        break;
 
-    case 'C':
-      continue_after_wtap_open_offline_failure = FALSE;
-      break;
+      case 'k':
+        if (report_all_infos) disable_all_infos();
+        cap_comment = TRUE;
+        break;
 
-    case 'A':
-      enable_all_infos();
-      break;
+      case 'F':
+        if (report_all_infos) disable_all_infos();
+        cap_file_more_info = TRUE;
+        break;
 
-    case 'L':
-      long_report = TRUE;
-      break;
+      case 'I':
+        if (report_all_infos) disable_all_infos();
+        cap_file_idb = TRUE;
+        break;
 
-    case 'T':
-      long_report = FALSE;
-      break;
+      case 'C':
+        continue_after_wtap_open_offline_failure = FALSE;
+        break;
 
-    case 'R':
-      table_report_header = TRUE;
-      break;
+      case 'A':
+        enable_all_infos();
+        break;
 
-    case 'r':
-      table_report_header = FALSE;
-      break;
+      case 'L':
+        long_report = TRUE;
+        break;
 
-    case 'N':
-      quote_char = '\0';
-      break;
+      case 'T':
+        long_report = FALSE;
+        break;
 
-    case 'q':
-      quote_char = '\'';
-      break;
+      case 'M':
+        machine_readable = TRUE;
+        break;
 
-    case 'Q':
-      quote_char = '"';
-      break;
+      case 'R':
+        table_report_header = TRUE;
+        break;
 
-    case 'B':
-      field_separator = '\t';
-      break;
+      case 'r':
+        table_report_header = FALSE;
+        break;
 
-    case 'm':
-      field_separator = ',';
-      break;
+      case 'N':
+        quote_char = '\0';
+        break;
 
-    case 'b':
-      field_separator = ' ';
-      break;
+      case 'q':
+        quote_char = '\'';
+        break;
 
-    case 'h':
-      usage(FALSE);
-      exit(1);
-      break;
+      case 'Q':
+        quote_char = '"';
+        break;
 
-    case '?':              /* Bad flag - print usage message */
-      usage(TRUE);
-      exit(1);
-      break;
+      case 'B':
+        field_separator = '\t';
+        break;
+
+      case 'm':
+        field_separator = ',';
+        break;
+
+      case 'b':
+        field_separator = ' ';
+        break;
+
+      case 'h':
+        printf("Capinfos (Wireshark) %s\n"
+               "Print various information (infos) about capture files.\n"
+               "See https://www.wireshark.org for more information.\n",
+               get_ws_vcs_version_info());
+        print_usage(stdout);
+        exit(0);
+        break;
+
+      case 'v':
+        show_version("Capinfos (Wireshark)", comp_info_str, runtime_info_str);
+        g_string_free(comp_info_str, TRUE);
+        g_string_free(runtime_info_str, TRUE);
+        exit(0);
+        break;
+
+      case '?':              /* Bad flag - print usage message */
+        print_usage(stderr);
+        exit(1);
+        break;
     }
   }
 
   if ((argc - optind) < 1) {
-    usage(TRUE);
+    print_usage(stderr);
     exit(1);
   }
 
-  if(!long_report && table_report_header) {
+  if (!long_report && table_report_header) {
     print_stats_table_header();
   }
 
@@ -1072,26 +1682,21 @@ main(int argc, char *argv[])
     }
 #endif /* HAVE_LIBGCRYPT */
 
-    wth = wtap_open_offline(argv[opt], &err, &err_info, FALSE);
+    wth = wtap_open_offline(argv[opt], WTAP_TYPE_AUTO, &err, &err_info, FALSE);
 
     if (!wth) {
       fprintf(stderr, "capinfos: Can't open %s: %s\n", argv[opt],
-        wtap_strerror(err));
-      switch (err) {
-
-      case WTAP_ERR_UNSUPPORTED:
-      case WTAP_ERR_UNSUPPORTED_ENCAP:
-      case WTAP_ERR_BAD_RECORD:
+          wtap_strerror(err));
+      if (err_info != NULL) {
         fprintf(stderr, "(%s)\n", err_info);
         g_free(err_info);
-        break;
       }
       overall_error_status = 1; /* remember that an error has occurred */
-      if(!continue_after_wtap_open_offline_failure)
+      if (!continue_after_wtap_open_offline_failure)
         exit(1); /* error status */
     }
 
-    if(wth) {
+    if (wth) {
       if ((opt > optind) && (long_report))
         printf("\n");
       status = process_cap_file(wth, argv[opt]);
@@ -1101,5 +1706,19 @@ main(int argc, char *argv[])
         exit(status);
     }
   }
+
   return overall_error_status;
 }
+
+/*
+ * 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:
+ */