steam-ihs: fix memleak on exception
[metze/wireshark/wip.git] / capinfos.c
index 1e6b5fece1985e08c0dbdb84b07dc341f0c5c46a..5f227e6afeb32452701590725fc4eb943da2a86c 100644 (file)
@@ -3,25 +3,11 @@
  *
  * Copyright 2004 Ian Schorr
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * 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
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
@@ -56,7 +42,7 @@
  */
 
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
 #include <errno.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
 #endif
 
 #include <glib.h>
 
-#include <wsutil/privileges.h>
+#include <wiretap/wtap.h>
+
+#include <wsutil/cmdarg_err.h>
+#include <wsutil/crash_info.h>
 #include <wsutil/filesystem.h>
+#include <wsutil/privileges.h>
+#include <version_info.h>
+#include <wiretap/wtap_opttypes.h>
 
 #ifdef HAVE_PLUGINS
 #include <wsutil/plugins.h>
 #endif
 
-#include "wtap.h"
-#include <wsutil/report_err.h>
-#include <wsutil/privileges.h>
+#include <wsutil/report_message.h>
 #include <wsutil/str_util.h>
+#include <wsutil/file_util.h>
 
-#ifdef HAVE_LIBGCRYPT
 #include <wsutil/wsgcrypt.h>
-#include <wsutil/file_util.h>
-#endif
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 
 #include <wsutil/unicode-utils.h>
 #endif /* _WIN32 */
 
-#include "svnversion.h"
+#include "ui/failure_message.h"
+
+#define INVALID_OPTION 1
+#define BAD_FLAG 1
 
 /*
  * By default capinfos now continues processing
@@ -143,6 +130,8 @@ 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    */
@@ -156,124 +145,20 @@ 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
 
-#ifdef USE_GOPTION
-static gboolean cap_help     = FALSE;
-static gboolean table_report = FALSE;
-
-static GOptionEntry general_entries[] =
-{
-  /* General */
-  { "type", 't', 0, G_OPTION_ARG_NONE, &cap_file_type,
-    "display the capture file type", NULL },
-  { "Encapsulation", 'E', 0, G_OPTION_ARG_NONE, &cap_file_encap,
-    "display the capture file encapsulation", NULL },
-#ifdef HAVE_LIBGCRYPT
-  { "Hash", 'H', 0, G_OPTION_ARG_NONE, &cap_file_hashes,
-    "display the SHA1, RMD160, and MD5 hashes of the file", NULL },
-#endif /* HAVE_LIBGCRYPT */
-  { "capture-comment", 'k', 0, G_OPTION_ARG_NONE, &cap_comment,
-    "display the capture comment ", NULL },
-  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
-};
-static GOptionEntry size_entries[] =
-{
-  /* Size */
-  { "packets", 'c', 0, G_OPTION_ARG_NONE, &cap_packet_count,
-    "display the number of packets", NULL },
-  { "size", 's', 0, G_OPTION_ARG_NONE, &cap_file_size,
-    "display the size of the file (in bytes)", NULL },
-  { "tot-len-of-pkts", 'd', 0, G_OPTION_ARG_NONE, &cap_data_size,
-    "display the total length of all packets (in bytes)", NULL },
-  { "snap", 'l', 0, G_OPTION_ARG_NONE, &cap_snaplen,
-    "display the packet size limit (snapshot length)", NULL },
-  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
-};
-static GOptionEntry time_entries[] =
-{
-  /* Time */
-  { "duration", 'u', 0, G_OPTION_ARG_NONE, &cap_duration,
-    "display the capture duration (in seconds)", NULL },
-  { "start", 'a', 0, G_OPTION_ARG_NONE, &cap_start_time,
-    "display the capture start time", NULL },
-  { "end", 'e', 0, G_OPTION_ARG_NONE, &cap_end_time,
-    "display the capture end time", NULL },
-  { "cron", 'o', 0, G_OPTION_ARG_NONE, &cap_order,
-    "display the capture file chronological status (True/False)", NULL },
-  { "start-end-time-sec", 'S', 0, G_OPTION_ARG_NONE, &time_as_secs,
-    "display start and end times as seconds", NULL },
-  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
-};
-
-static GOptionEntry stats_entries[] =
-{
-  /* Statistics */
-  { "bytes", 'y', 0, G_OPTION_ARG_NONE, &cap_data_rate_byte,
-    "display average data rate (in bytes/s)", NULL },
-  { "bits", 'i', 0, G_OPTION_ARG_NONE, &cap_data_rate_bit,
-    "display average data rate (in bits/s)", NULL },
-  { "packet-bytes", 'z', 0, G_OPTION_ARG_NONE, &cap_packet_size,
-    "display average packet size (in bytes)", NULL },
-  { "packets", 'x', 0, G_OPTION_ARG_NONE, &cap_packet_rate,
-    "display average packet rate (in packets/s)", NULL },
-  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
-};
-
-static GOptionEntry output_format_entries[] =
-{
-  /* Output format */
-  { "long", 'L', 0, G_OPTION_ARG_NONE, &long_report,
-    "generate long report (default)", NULL },
-  { "Table", 'T', 0, G_OPTION_ARG_NONE, &table_report,
-    "generate table report", NULL },
-  { "machine-readable", 'M', 0, G_OPTION_ARG_NONE, &machine_readable,
-    "display machine-readable (unabbreviated) values in long reports", NULL },
-  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
-};
-
-static GOptionEntry table_report_entries[] =
-{
-  /* Table report */
-  { "header-rec", 'R', 0, G_OPTION_ARG_NONE, &table_report_header,
-    "generate header record (default)", NULL },
-  { "no-table", 'r', 0, G_OPTION_ARG_NONE, &table_report_header,
-    "do not generate header record", NULL },
-  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
-};
-
-static GOptionEntry misc_entries[] =
-{
-  { "helpcompat", 'h', 0, G_OPTION_ARG_NONE, &cap_help,
-    "display help", NULL },
-  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
-};
-
-GOptionContext *ctx;
-GOptionGroup *general_grp, *size_grp, *time_grp, *stats_grp, *output_grp, *table_report_grp;
-GError *parse_err = NULL;
-
-#endif /* USE_GOPTION */
-
-#ifdef HAVE_LIBGCRYPT
-#define HASH_SIZE_SHA1   20
+// Strongest to weakest
+#define HASH_SIZE_SHA256 32
 #define HASH_SIZE_RMD160 20
-#define HASH_SIZE_MD5    16
+#define HASH_SIZE_SHA1   20
 
-#define HASH_STR_SIZE (41) /* Max hash size * 2 + '\0' */
+#define HASH_STR_SIZE (65) /* Max hash size * 2 + '\0' */
 #define HASH_BUF_SIZE (1024 * 1024)
 
 
-static gchar file_sha1[HASH_STR_SIZE];
+static gchar file_sha256[HASH_STR_SIZE];
 static gchar file_rmd160[HASH_STR_SIZE];
-static gchar file_md5[HASH_STR_SIZE];
-
-#define FILE_HASH_OPT "H"
-#else
-#define FILE_HASH_OPT ""
-#endif /* HAVE_LIBGCRYPT */
+static gchar file_sha1[HASH_STR_SIZE];
 
 /*
  * If we have at least two packets with time stamps, and they're not in
@@ -296,13 +181,15 @@ typedef struct _capture_info {
   guint16        file_type;
   gboolean       iscompressed;
   int            file_encap;
+  int            file_tsprec;
   gint64         filesize;
-  gchar         *comment;
-
+  wtap_block_t   shb;
   guint64        packet_bytes;
   gboolean       times_known;
-  double         start_time;
-  double         stop_time;
+  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 */
@@ -311,7 +198,8 @@ typedef struct _capture_info {
   gboolean       drops_known;
   guint32        drop_count;
 
-  double         duration;
+  nstime_t       duration;
+  int            duration_tsprec;
   double         packet_rate;
   double         packet_size;
   double         data_rate;              /* in bytes */
@@ -319,8 +207,14 @@ typedef struct _capture_info {
   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_packet_counts array */
+  GArray        *interface_packet_counts;  /* 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 char *decimal_point;
 
 static void
 enable_all_infos(void)
@@ -333,6 +227,8 @@ enable_all_infos(void)
   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;
@@ -345,9 +241,7 @@ enable_all_infos(void)
   cap_packet_size    = TRUE;
   cap_packet_rate    = TRUE;
 
-#ifdef HAVE_LIBGCRYPT
   cap_file_hashes    = TRUE;
-#endif /* HAVE_LIBGCRYPT */
 }
 
 static void
@@ -361,6 +255,8 @@ disable_all_infos(void)
   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;
@@ -373,9 +269,7 @@ disable_all_infos(void)
   cap_packet_size    = FALSE;
   cap_packet_rate    = FALSE;
 
-#ifdef HAVE_LIBGCRYPT
   cap_file_hashes    = FALSE;
-#endif /* HAVE_LIBGCRYPT */
 }
 
 static const gchar *
@@ -398,44 +292,244 @@ order_string(order_t order)
 }
 
 static gchar *
-time_string(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[20];
-  char         *time_string_ctime;
+  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->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, 20, "%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%s%01d",
+                   (unsigned long)timer->secs,
+                   decimal_point,
+                   timer->nsecs / 100000000);
+        break;
+
+      case WTAP_TSPREC_CSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%lu%s%02d",
+                   (unsigned long)timer->secs,
+                   decimal_point,
+                   timer->nsecs / 10000000);
+        break;
+
+      case WTAP_TSPREC_MSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%lu%s%03d",
+                   (unsigned long)timer->secs,
+                   decimal_point,
+                   timer->nsecs / 1000000);
+        break;
+
+      case WTAP_TSPREC_USEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%lu%s%06d",
+                   (unsigned long)timer->secs,
+                   decimal_point,
+                   timer->nsecs / 1000);
+        break;
+
+      case WTAP_TSPREC_NSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%lu%s%09d",
+                   (unsigned long)timer->secs,
+                   decimal_point,
+                   timer->nsecs);
+        break;
+
+      default:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "Unknown precision %d",
+                   tsprecision);
+        break;
+      }
       return time_string_buf;
     } else {
-#if (defined _WIN32) && (_MSC_VER < 1500)
-      /* calling localtime(), and thus ctime(), on MSVC 2005 with huge values causes it to crash */
-      /* XXX - find the exact value that still does work */
-      /* XXX - using _USE_32BIT_TIME_T might be another way to circumvent this problem */
-      if (timer > 2000000000) {
-        time_string_ctime = NULL;
-      } else
-#endif
-        time_string_ctime = ctime(&timer);
-      if (time_string_ctime == NULL) {
-        g_snprintf(time_string_buf, 20, "Not representable%s", lf);
+      ti_tm = localtime(&timer->secs);
+      if (ti_tm == NULL) {
+        g_snprintf(time_string_buf, sizeof time_string_buf, "Not representable");
         return time_string_buf;
       }
-      if (!want_lf) {
-        /*
-         * The ctime() function returns a string formatted as:
-         *   "Www Mmm dd hh:mm:ss yyyy\n"
-         * The unwanted '\n' is the 24th character.
-         */
-        time_string_ctime[24] = '\0';
+      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%s%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,
+                   decimal_point,
+                   timer->nsecs / 100000000);
+        break;
+
+      case WTAP_TSPREC_CSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%04d-%02d-%02d %02d:%02d:%02d%s%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,
+                   decimal_point,
+                   timer->nsecs / 10000000);
+        break;
+
+      case WTAP_TSPREC_MSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%04d-%02d-%02d %02d:%02d:%02d%s%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,
+                   decimal_point,
+                   timer->nsecs / 1000000);
+        break;
+
+      case WTAP_TSPREC_USEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%04d-%02d-%02d %02d:%02d:%02d%s%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,
+                   decimal_point,
+                   timer->nsecs / 1000);
+        break;
+
+      case WTAP_TSPREC_NSEC:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "%04d-%02d-%02d %02d:%02d:%02d%s%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,
+                   decimal_point,
+                   timer->nsecs);
+        break;
+
+      default:
+        g_snprintf(time_string_buf, sizeof time_string_buf,
+                   "Unknown precision %d",
+                   tsprecision);
+        break;
       }
-      return time_string_ctime;
+      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 gchar *
+relative_time_string(nstime_t *timer, int tsprecision, capture_info *cf_info, gboolean want_seconds)
+{
+  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%s%01d%s%s",
+                 (unsigned long)timer->secs,
+                 decimal_point,
+                 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%s%02d%s%s",
+                 (unsigned long)timer->secs,
+                 decimal_point,
+                 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%s%03d%s%s",
+                 (unsigned long)timer->secs,
+                 decimal_point,
+                 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%s%06d%s%s",
+                 (unsigned long)timer->secs,
+                 decimal_point,
+                 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%s%09d%s%s",
+                 (unsigned long)timer->secs,
+                 decimal_point,
+                 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;
 }
 
@@ -446,32 +540,70 @@ static void print_value(const gchar *text_p1, gint width, const gchar *text_p2,
     printf("%sn/a\n", text_p1);
 }
 
+/* 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 void
+show_option_string(const char *prefix, const char *option_str)
+{
+  char *str;
+
+  if (option_str != NULL && option_str[0] != '\0') {
+    str = g_strdup(option_str);
+    string_replace_newlines(str);
+    printf("%s%s\n", prefix, str);
+    g_free(str);
+  }
+}
+
 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_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%s\n",
       file_type_string,
       cf_info->iscompressed ? " (gzip compressed)" : "");
-  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_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)
@@ -515,13 +647,13 @@ print_stats(const gchar *filename, capture_info *cf_info)
   }
   if (cf_info->times_known) {
     if (cap_duration) /* XXX - shorten to hh:mm:ss */
-                          print_value("Capture duration:    ", 0, " seconds",   cf_info->duration);
+                          printf("Capture duration:    %s\n", relative_time_string(&cf_info->duration, cf_info->duration_tsprec, cf_info, TRUE));
     if (cap_start_time)
-                          printf     ("Start time:          %s", time_string(start_time_t, cf_info, TRUE));
+                          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     ("End time:            %s", time_string(stop_time_t, cf_info, TRUE));
+                          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:      ");
+                          printf("Data byte rate:      ");
       if (machine_readable) {
         print_value("", 2, " bytes/sec",   cf_info->data_rate);
       } else {
@@ -531,7 +663,7 @@ print_stats(const gchar *filename, capture_info *cf_info)
       }
     }
     if (cap_data_rate_bit) {
-                          printf     ("Data bit rate:       ");
+                          printf("Data bit rate:       ");
       if (machine_readable) {
         print_value("", 2, " bits/sec",    cf_info->data_rate*8);
       } else {
@@ -541,29 +673,61 @@ print_stats(const gchar *filename, capture_info *cf_info)
       }
     }
   }
-  if (cap_packet_size)    printf     ("Average packet size: %.2f bytes\n",        cf_info->packet_size);
+  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: ");
+                          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_none);
-        printf ("%spackets/sec\n", size_string);
+        size_string = format_size((gint64)cf_info->packet_rate, format_size_unit_packets_s);
+        printf ("%s\n", size_string);
         g_free(size_string);
       }
     }
   }
-#ifdef HAVE_LIBGCRYPT
   if (cap_file_hashes) {
-    printf     ("SHA1:                %s\n", file_sha1);
+    printf     ("SHA256:              %s\n", file_sha256);
     printf     ("RIPEMD160:           %s\n", file_rmd160);
-    printf     ("MD5:                 %s\n", file_md5);
+    printf     ("SHA1:                %s\n", file_sha1);
   }
-#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 (cf_info->shb != NULL) {
+    if (cap_file_more_info) {
+      char *str;
+
+      if (wtap_block_get_string_option_value(cf_info->shb, OPT_SHB_HARDWARE, &str) == WTAP_OPTTYPE_SUCCESS)
+        show_option_string("Capture hardware:    ", str);
+      if (wtap_block_get_string_option_value(cf_info->shb, OPT_SHB_OS, &str) == WTAP_OPTTYPE_SUCCESS)
+        show_option_string("Capture oper-sys:    ", str);
+      if (wtap_block_get_string_option_value(cf_info->shb, OPT_SHB_USERAPPL, &str) == WTAP_OPTTYPE_SUCCESS)
+        show_option_string("Capture application: ", str);
+    }
+    if (cap_comment) {
+      unsigned int i;
+      char *str;
+
+      for (i = 0; wtap_block_get_nth_string_option_value(cf_info->shb, OPT_COMMENT, i, &str) == WTAP_OPTTYPE_SUCCESS; i++) {
+        show_option_string("Capture comment:     ", str);
+      }
+    }
+
+    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);
+        guint32 packet_count = 0;
+        if (i < cf_info->interface_packet_counts->len)
+          packet_count = g_array_index(cf_info->interface_packet_counts, guint32, i);
+        printf   ("Interface #%u info:\n", i);
+        printf   ("%s", s);
+        printf   ("                     Number of packets = %u\n", packet_count);
+      }
+    }
+  }
 }
 
 static void
@@ -596,6 +760,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)");
@@ -609,14 +774,17 @@ print_stats_table_header(void)
   if (cap_data_rate_bit)  print_stats_table_header_label("Data bit rate (bits/sec)");
   if (cap_packet_size)    print_stats_table_header_label("Average packet size (bytes)");
   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("SHA256");
     print_stats_table_header_label("RIPEMD160");
-    print_stats_table_header_label("MD5");
+    print_stats_table_header_label("SHA1");
   }
-#endif /* HAVE_LIBGCRYPT */
   if (cap_order)          print_stats_table_header_label("Strict time order");
+  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");
+  }
   if (cap_comment)        print_stats_table_header_label("Capture comment");
 
   printf("\n");
@@ -626,14 +794,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_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();
@@ -660,6 +824,13 @@ 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();
@@ -714,24 +885,21 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
   if (cap_duration) {
     putsep();
     putquote();
-    if (cf_info->times_known)
-      printf("%f", cf_info->duration);
-    else
-      printf("n/a");
+    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();
   }
 
@@ -772,11 +940,10 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
     putquote();
   }
 
-#ifdef HAVE_LIBGCRYPT
   if (cap_file_hashes) {
     putsep();
     putquote();
-    printf("%s", file_sha1);
+    printf("%s", file_sha256);
     putquote();
 
     putsep();
@@ -786,10 +953,9 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
 
     putsep();
     putquote();
-    printf("%s", file_md5);
+    printf("%s", file_sha1);
     putquote();
   }
-#endif /* HAVE_LIBGCRYPT */
 
   if (cap_order) {
     putsep();
@@ -798,17 +964,90 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
     putquote();
   }
 
-  if (cap_comment) {
-    putsep();
-    putquote();
-    printf("%s", cf_info->comment);
-    putquote();
-  }
+  if (cf_info->shb != NULL) {
+    if (cap_file_more_info) {
+      char *str;
+
+      putsep();
+      putquote();
+      if (wtap_block_get_string_option_value(cf_info->shb, OPT_SHB_HARDWARE, &str) == WTAP_OPTTYPE_SUCCESS) {
+        printf("%s", str);
+      }
+      putquote();
+
+      putsep();
+      putquote();
+      if (wtap_block_get_string_option_value(cf_info->shb, OPT_SHB_OS, &str) == WTAP_OPTTYPE_SUCCESS) {
+        printf("%s", str);
+      }
+      putquote();
+
+      putsep();
+      putquote();
+      if (wtap_block_get_string_option_value(cf_info->shb, OPT_SHB_USERAPPL, &str) == WTAP_OPTTYPE_SUCCESS) {
+        printf("%s", str);
+      }
+      putquote();
+    }
+
+    /*
+     * One might argue that the following is silly to put into a table format,
+     * but oh well note that there may be *more than one* of each of these types
+     * of options.  To mitigate some of the potential silliness the if(cap_comment)
+     * block is moved AFTER the if(cap_file_more_info) block.  This will make any
+     * comments the last item(s) in each row.  We now have a new -K option to
+     * disable cap_comment to more easily manage the potential silliness.
+     * Potential silliness includes multiple comments (therefore resulting in
+     * more than one additional column and/or comments with embeded newlines
+     * and/or possible delimiters).
+     */
+    if (cap_comment) {
+      unsigned int i;
+      char *opt_comment;
+      gboolean have_cap = FALSE;
+
+      for (i = 0; wtap_block_get_nth_string_option_value(cf_info->shb, OPT_COMMENT, i, &opt_comment) == WTAP_OPTTYPE_SUCCESS; i++) {
+        have_cap = TRUE;
+        putsep();
+        putquote();
+        printf("%s", opt_comment);
+        putquote();
+      }
+      if(!have_cap) {
+        /* Maintain column alignment when we have no OPT_COMMENT */
+        putsep();
+        putquote();
+        putquote();
+      }
+    }
 
+  }
 
   printf("\n");
 }
 
+static void
+cleanup_capture_info(capture_info *cf_info)
+{
+  guint i;
+  g_assert(cf_info != NULL);
+
+  g_free(cf_info->encap_counts);
+  cf_info->encap_counts = NULL;
+
+  g_array_free(cf_info->interface_packet_counts, TRUE);
+  cf_info->interface_packet_counts = 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;
+}
+
 static int
 process_cap_file(wtap *wth, const char *filename)
 {
@@ -822,40 +1061,69 @@ process_cap_file(wtap *wth, const char *filename)
   gint64                bytes  = 0;
   guint32               snaplen_min_inferred = 0xffffffff;
   guint32               snaplen_max_inferred =          0;
-  const struct wtap_pkthdr *phdr;
+  wtap_rec             *rec;
   capture_info          cf_info;
   gboolean              have_times = TRUE;
-  double                start_time = 0;
-  double                stop_time  = 0;
-  double                cur_time   = 0;
-  double                prev_time = 0;
+  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;
-  wtapng_section_t     *shb_inf;
-  gchar                *p;
+  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.shb = wtap_file_get_shb(wth);
 
   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_packet_counts  = g_array_sized_new(FALSE, TRUE, sizeof(guint32), cf_info.num_interfaces);
+  g_array_set_size(cf_info.interface_packet_counts, cf_info.num_interfaces);
+  cf_info.pkt_interface_id_unknown = 0;
+
+  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);
-    if (phdr->presence_flags & WTAP_HAS_TS) {
+    rec = wtap_get_rec(wth);
+    if (rec->presence_flags & WTAP_HAS_TS) {
       prev_time = cur_time;
-      cur_time = nstime_to_sec(&phdr->ts);
+      cur_time = rec->ts;
       if (packet == 0) {
-        start_time = cur_time;
-        stop_time  = cur_time;
-        prev_time  = cur_time;
+        start_time = rec->ts;
+        start_time_tsprec = rec->tsprec;
+        stop_time  = rec->ts;
+        stop_time_tsprec = rec->tsprec;
+        prev_time  = rec->ts;
       }
-      if (cur_time < prev_time) {
+      if (nstime_cmp(&cur_time, &prev_time) < 0) {
         order = NOT_IN_ORDER;
       }
-      if (cur_time < start_time) {
+      if (nstime_cmp(&cur_time, &start_time) < 0) {
         start_time = cur_time;
+        start_time_tsprec = rec->tsprec;
       }
-      if (cur_time > stop_time) {
+      if (nstime_cmp(&cur_time, &stop_time) > 0) {
         stop_time = cur_time;
+        stop_time_tsprec = rec->tsprec;
       }
     } else {
       have_times = FALSE; /* at least one packet has no time stamp */
@@ -863,53 +1131,98 @@ process_cap_file(wtap *wth, const char *filename)
         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 (rec->rec_type == REC_TYPE_PACKET) {
+      bytes += rec->rec_header.packet_header.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 (rec->rec_header.packet_header.caplen < rec->rec_header.packet_header.len) {
+        if (rec->rec_header.packet_header.caplen < snaplen_min_inferred)
+          snaplen_min_inferred = rec->rec_header.packet_header.caplen;
+        if (rec->rec_header.packet_header.caplen > snaplen_max_inferred)
+          snaplen_max_inferred = rec->rec_header.packet_header.caplen;
+      }
 
-    /* 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;
+      if ((rec->rec_header.packet_header.pkt_encap > 0) &&
+          (rec->rec_header.packet_header.pkt_encap < WTAP_NUM_ENCAP_TYPES)) {
+        cf_info.encap_counts[rec->rec_header.packet_header.pkt_encap] += 1;
       } else {
-        fprintf(stderr, "capinfos: Unknown per-packet encapsulation: %d [frame number: %d]\n", phdr->pkt_encap, packet);
+        fprintf(stderr, "capinfos: Unknown packet encapsulation %d in frame %u of file \"%s\"\n",
+                rec->rec_header.packet_header.pkt_encap, packet, filename);
+      }
+
+      /* Packet interface_id info */
+      if (rec->presence_flags & WTAP_HAS_INTERFACE_ID) {
+        /* cf_info.num_interfaces is size, not index, so it's one more than max index */
+        if (rec->rec_header.packet_header.interface_id >= cf_info.num_interfaces) {
+          /*
+           * OK, re-fetch the number of interfaces, as there might have
+           * been an interface that was in the middle of packets, and
+           * grow the array to be big enough for the new number of
+           * interfaces.
+           */
+          idb_info = wtap_file_get_idb_info(wth);
+
+          cf_info.num_interfaces = idb_info->interface_data->len;
+          g_array_set_size(cf_info.interface_packet_counts, cf_info.num_interfaces);
+
+          g_free(idb_info);
+          idb_info = NULL;
+        }
+        if (rec->rec_header.packet_header.interface_id < cf_info.num_interfaces) {
+          g_array_index(cf_info.interface_packet_counts, guint32,
+                        rec->rec_header.packet_header.interface_id) += 1;
+        }
+        else {
+          cf_info.pkt_interface_id_unknown += 1;
+        }
+      }
+      else {
+        /* it's for interface_id 0 */
+        if (cf_info.num_interfaces != 0) {
+          g_array_index(cf_info.interface_packet_counts, guint32, 0) += 1;
+        }
+        else {
+          cf_info.pkt_interface_id_unknown += 1;
+        }
       }
     }
 
   } /* while */
 
+  /*
+   * Get IDB info strings.
+   * We do this at the end, so we can get information for all IDBs in
+   * the file, even those that come after packet records.
+   */
+  idb_info = wtap_file_get_idb_info(wth);
+
+  cf_info.idb_info_strings = g_array_sized_new(FALSE, FALSE, sizeof(gchar*), cf_info.num_interfaces);
+  cf_info.num_interfaces = idb_info->interface_data->len;
+  for (i = 0; i < cf_info.num_interfaces; i++) {
+    const wtap_block_t if_descr = g_array_index(idb_info->interface_data, wtap_block_t, i);
+    gchar *s = wtap_get_debug_if_descr(if_descr, 21, "\n");
+    g_array_append_val(cf_info.idb_info_strings, s);
+  }
+
+  g_free(idb_info);
+  idb_info = NULL;
+
   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_SHORT_READ:
+        "capinfos: An error occurred after reading %u packets from \"%s\".\n",
+        packet, filename);
+    cfile_read_failure_message("capinfos", filename, err, err_info);
+    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");
-        break;
-
-      case WTAP_ERR_UNSUPPORTED:
-      case WTAP_ERR_UNSUPPORTED_ENCAP:
-      case WTAP_ERR_BAD_FILE:
-      case WTAP_ERR_DECOMPRESS:
-        fprintf(stderr, "(%s)\n", err_info);
-        g_free(err_info);
-        /* fallthrough */
-
-      default:
-        g_free(cf_info.encap_counts);
+    } else {
+        cleanup_capture_info(&cf_info);
         return 1;
     }
   }
@@ -920,7 +1233,7 @@ process_cap_file(wtap *wth, const char *filename)
     fprintf(stderr,
         "capinfos: Can't get size of \"%s\": %s.\n",
         filename, g_strerror(err));
-    g_free(cf_info.encap_counts);
+    cleanup_capture_info(&cf_info);
     return 1;
   }
 
@@ -933,6 +1246,8 @@ process_cap_file(wtap *wth, const char *filename)
   /* 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)
@@ -949,8 +1264,15 @@ process_cap_file(wtap *wth, const char *filename)
   /* 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.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;
 
@@ -962,72 +1284,37 @@ 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      */
   }
 
-  cf_info.comment = NULL;
-  shb_inf = wtap_file_get_shb_info(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);
-  }
-  g_free(shb_inf);
-  if (cf_info.comment) {
-    /* multi-line comments would conflict with the formatting that capinfos uses
-       we replace linefeeds with spaces */
-    p = cf_info.comment;
-    while (*p != '\0') {
-      if (*p == '\n')
-        *p = ' ';
-      p++;
-    }
-  }
-
   if (long_report) {
     print_stats(filename, &cf_info);
   } else {
     print_stats_table(filename, &cf_info);
   }
 
-  g_free(cf_info.encap_counts);
-  g_free(cf_info.comment);
+  cleanup_capture_info(&cf_info);
 
   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");
-#ifdef HAVE_LIBGCRYPT
-  fprintf(output, "  -H display the SHA1, RMD160, and MD5 hashes of the file\n");
-#endif
+  fprintf(output, "  -I display the capture file interface information\n");
+  fprintf(output, "  -F display additional capture file information\n");
+  fprintf(output, "  -H display the SHA256, RMD160, and SHA1 hashes of the file\n");
   fprintf(output, "  -k display the capture comment\n");
   fprintf(output, "\n");
   fprintf(output, "Size infos:\n");
@@ -1070,31 +1357,37 @@ usage(gboolean is_error)
   fprintf(output, "  -h display this help and exit\n");
   fprintf(output, "  -C cancel processing if file open fails (default is to continue)\n");
   fprintf(output, "  -A generate all infos (default)\n");
+  fprintf(output, "  -K disable displaying the capture comment\n");
   fprintf(output, "\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");
   fprintf(output, "output format.\n");
-#ifndef HAVE_LIBGCRYPT
-  fprintf(output, "\nFile hashing support (-H) is not present.\n");
-#endif
 }
 
-#ifdef HAVE_PLUGINS
 /*
- *  Don't report failures to load plugins because most (non-wiretap) plugins
- *  *should* fail to load (because we're not linked against libwireshark and
- *  dissector plugins need libwireshark).
+ * General errors and warnings are reported with an console message
+ * in capinfos.
  */
 static void
-failure_message(const char *msg_format _U_, va_list ap _U_)
+failure_warning_message(const char *msg_format, va_list ap)
 {
-  return;
+  fprintf(stderr, "capinfos: ");
+  vfprintf(stderr, msg_format, ap);
+  fprintf(stderr, "\n");
+}
+
+/*
+ * Report additional information for an error in command-line arguments.
+ */
+static void
+failure_message_cont(const char *msg_format, va_list ap)
+{
+  vfprintf(stderr, msg_format, ap);
+  fprintf(stderr, "\n");
 }
-#endif
 
-#ifdef HAVE_LIBGCRYPT
 static void
 hash_to_str(const unsigned char *hash, size_t length, char *str) {
   int i;
@@ -1103,30 +1396,55 @@ hash_to_str(const unsigned char *hash, size_t length, char *str) {
     g_snprintf(str+(i*2), 3, "%02x", hash[i]);
   }
 }
-#endif /* HAVE_LIBGCRYPT */
 
-int
-main(int argc, char *argv[])
+static int
+real_main(int argc, char *argv[])
 {
+  GString *comp_info_str;
+  GString *runtime_info_str;
+  char  *init_progfile_dir_error;
   wtap  *wth;
   int    err;
   gchar *err_info;
   int    opt;
-  int    overall_error_status;
+  int    overall_error_status = EXIT_SUCCESS;
+  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
-  char  *init_progfile_dir_error;
-#endif
-#ifdef HAVE_LIBGCRYPT
   FILE  *fh;
   char  *hash_buf = NULL;
   gcry_md_hd_t hd = NULL;
   size_t hash_bytes;
-#endif
+
+  /* Set the C-language locale to the native environment. */
+  setlocale(LC_ALL, "");
+
+  cmdarg_err_init(failure_warning_message, failure_message_cont);
+
+  /* Get the decimal point. */
+  decimal_point = g_strdup(localeconv()->decimal_point);
+
+  /* Get the compile-time version information string */
+  comp_info_str = get_compiled_version_info(NULL, NULL);
+
+  /* Get the run-time version information string */
+  runtime_info_str = get_runtime_version_info(NULL);
+
+  /* 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);
+  g_string_free(comp_info_str, TRUE);
+  g_string_free(runtime_info_str, TRUE);
 
 #ifdef _WIN32
-  arg_list_utf_16to8(argc, argv);
   create_app_running_mutex();
 #endif /* _WIN32 */
 
@@ -1135,84 +1453,25 @@ main(int argc, char *argv[])
    */
   init_process_policies();
 
-#ifdef HAVE_PLUGINS
-  if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) {
-    g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
+  /*
+   * Attempt to get the pathname of the directory containing the
+   * executable file.
+   */
+  init_progfile_dir_error = init_progfile_dir(argv[0]);
+  if (init_progfile_dir_error != NULL) {
+    fprintf(stderr,
+            "capinfos: Can't get pathname of directory containing the capinfos program: %s.\n",
+            init_progfile_dir_error);
     g_free(init_progfile_dir_error);
-  } else {
-    /* 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 */
-#ifdef USE_GOPTION
-  ctx = g_option_context_new(" <infile> ... - print information about capture file(s)");
-  general_grp = g_option_group_new("gen", "General infos:",
-      "Show general options", NULL, NULL);
-  size_grp = g_option_group_new("size", "Size infos:",
-      "Show size options", NULL, NULL);
-  time_grp = g_option_group_new("time", "Time infos:",
-      "Show time options", NULL, NULL);
-  stats_grp = g_option_group_new("stats", "Statistics infos:",
-      "Show statistics options", NULL, NULL);
-  output_grp = g_option_group_new("output", "Output format:",
-      "Show output format options", NULL, NULL);
-  table_report_grp = g_option_group_new("table", "Table report options:",
-      "Show table report options", NULL, NULL);
-  g_option_group_add_entries(general_grp, general_entries);
-  g_option_group_add_entries(size_grp, size_entries);
-  g_option_group_add_entries(time_grp, time_entries);
-  g_option_group_add_entries(stats_grp, stats_entries);
-  g_option_group_add_entries(output_grp, output_format_entries);
-  g_option_group_add_entries(table_report_grp, table_report_entries);
-  g_option_context_add_main_entries(ctx, misc_entries, NULL);
-  g_option_context_add_group(ctx, general_grp);
-  g_option_context_add_group(ctx, size_grp);
-  g_option_context_add_group(ctx, time_grp);
-  g_option_context_add_group(ctx, stats_grp);
-  g_option_context_add_group(ctx, output_grp);
-  g_option_context_add_group(ctx, table_report_grp);
-  /* There's probably a better way to do this, but this works for now.
-     GOptions displays the name in argv[0] as the name of the
-     application.  This is reasonable, but because we actually have a
-     script wrapper that calls the executable.  The name that gets
-     displayed is not exactly the same as the command the user used
-     ran.
-   */
-  argv[0] = (char *)"capinfos";
 
-  /* if we have at least one cmdline option, we disable printing all infos */
-  if (argc > 2 && report_all_infos)
-    disable_all_infos();
+  init_report_message(failure_warning_message, failure_warning_message,
+                      NULL, NULL, NULL);
 
-  if ( !g_option_context_parse(ctx, &argc, &argv, &parse_err) ) {
-    if (parse_err)
-      g_printerr ("option parsing failed: %s\n", parse_err->message);
-    g_printerr("%s", g_option_context_get_help (ctx, TRUE, NULL));
-    exit(1);
-  }
-  if ( cap_help ) {
-    g_print("%s", g_option_context_get_help (ctx, FALSE, NULL));
-    exit(0);
-  }
-  if ( argc < 2 ) {
-    g_printerr("%s", g_option_context_get_help (ctx, FALSE, NULL));
-    exit(1);
-  }
-  g_option_context_free(ctx);
+  wtap_init(TRUE);
 
-#endif /* USE_GOPTION */
-  while ((opt = getopt(argc, argv, "tEcs" FILE_HASH_OPT "dluaeyizvhxokCALTMRrSNqQBmb")) !=-1) {
+  /* Process the options */
+  while ((opt = getopt_long(argc, argv, "abcdehiklmoqrstuvxyzABCEFHIKLMNQRST", long_options, NULL)) !=-1) {
 
     switch (opt) {
 
@@ -1285,12 +1544,10 @@ main(int argc, char *argv[])
         cap_packet_rate = TRUE;
         break;
 
-#ifdef HAVE_LIBGCRYPT
       case 'H':
         if (report_all_infos) disable_all_infos();
         cap_file_hashes = TRUE;
         break;
-#endif
 
       case 'o':
         if (report_all_infos) disable_all_infos();
@@ -1302,6 +1559,20 @@ main(int argc, char *argv[])
         cap_comment = TRUE;
         break;
 
+      case 'K':
+        cap_comment = FALSE;
+        break;
+
+      case 'F':
+        if (report_all_infos) disable_all_infos();
+        cap_file_more_info = TRUE;
+        break;
+
+      case 'I':
+        if (report_all_infos) disable_all_infos();
+        cap_file_idb = TRUE;
+        break;
+
       case 'C':
         continue_after_wtap_open_offline_failure = FALSE;
         break;
@@ -1355,49 +1626,58 @@ main(int argc, char *argv[])
         break;
 
       case 'h':
-        usage(FALSE);
-        exit(0);
+        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);
+        goto exit;
+        break;
+
+      case 'v':
+        comp_info_str = get_compiled_version_info(NULL, NULL);
+        runtime_info_str = get_runtime_version_info(NULL);
+        show_version("Capinfos (Wireshark)", comp_info_str, runtime_info_str);
+        g_string_free(comp_info_str, TRUE);
+        g_string_free(runtime_info_str, TRUE);
+        goto exit;
         break;
 
       case '?':              /* Bad flag - print usage message */
-        usage(TRUE);
-        exit(1);
+        print_usage(stderr);
+        overall_error_status = BAD_FLAG;
+        goto exit;
         break;
     }
   }
 
-  /* Set the C-language locale to the native environment. */
-  setlocale(LC_ALL, "");
-
   if ((argc - optind) < 1) {
-    usage(TRUE);
-    exit(1);
+    print_usage(stderr);
+    overall_error_status = INVALID_OPTION;
+    goto exit;
   }
 
   if (!long_report && table_report_header) {
     print_stats_table_header();
   }
 
-#ifdef HAVE_LIBGCRYPT
   if (cap_file_hashes) {
     gcry_check_version(NULL);
-    gcry_md_open(&hd, GCRY_MD_SHA1, 0);
+    gcry_md_open(&hd, GCRY_MD_SHA256, 0);
     if (hd) {
       gcry_md_enable(hd, GCRY_MD_RMD160);
-      gcry_md_enable(hd, GCRY_MD_MD5);
+      gcry_md_enable(hd, GCRY_MD_SHA1);
     }
     hash_buf = (char *)g_malloc(HASH_BUF_SIZE);
   }
-#endif
 
   overall_error_status = 0;
 
   for (opt = optind; opt < argc; opt++) {
 
-#ifdef HAVE_LIBGCRYPT
-    g_strlcpy(file_sha1, "<unknown>", HASH_STR_SIZE);
+    g_strlcpy(file_sha256, "<unknown>", HASH_STR_SIZE);
     g_strlcpy(file_rmd160, "<unknown>", HASH_STR_SIZE);
-    g_strlcpy(file_md5, "<unknown>", HASH_STR_SIZE);
+    g_strlcpy(file_sha1, "<unknown>", HASH_STR_SIZE);
 
     if (cap_file_hashes) {
       fh = ws_fopen(argv[opt], "rb");
@@ -1406,32 +1686,21 @@ main(int argc, char *argv[])
           gcry_md_write(hd, hash_buf, hash_bytes);
         }
         gcry_md_final(hd);
-        hash_to_str(gcry_md_read(hd, GCRY_MD_SHA1), HASH_SIZE_SHA1, file_sha1);
+        hash_to_str(gcry_md_read(hd, GCRY_MD_SHA256), HASH_SIZE_SHA256, file_sha256);
         hash_to_str(gcry_md_read(hd, GCRY_MD_RMD160), HASH_SIZE_RMD160, file_rmd160);
-        hash_to_str(gcry_md_read(hd, GCRY_MD_MD5), HASH_SIZE_MD5, file_md5);
+        hash_to_str(gcry_md_read(hd, GCRY_MD_SHA1), HASH_SIZE_SHA1, file_sha1);
       }
       if (fh) fclose(fh);
       if (hd) gcry_md_reset(hd);
     }
-#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_FILE:
-          fprintf(stderr, "(%s)\n", err_info);
-          g_free(err_info);
-          break;
-      }
-      overall_error_status = 1; /* remember that an error has occurred */
+      cfile_open_failure_message("capinfos", argv[opt], err, err_info);
+      overall_error_status = 2; /* remember that an error has occurred */
       if (!continue_after_wtap_open_offline_failure)
-        exit(1); /* error status */
+        goto exit;
     }
 
     if (wth) {
@@ -1440,14 +1709,38 @@ main(int argc, char *argv[])
       status = process_cap_file(wth, argv[opt]);
 
       wtap_close(wth);
-      if (status)
-        exit(status);
+      if (status) {
+        overall_error_status = status;
+        goto exit;
+      }
     }
   }
 
+exit:
+  g_free(hash_buf);
+  gcry_md_close(hd);
+  wtap_cleanup();
+  free_progdirs();
   return overall_error_status;
 }
 
+#ifdef _WIN32
+int
+wmain(int argc, wchar_t *wc_argv[])
+{
+  char **argv;
+
+  argv = arg_list_utf_16to8(argc, wc_argv);
+  return real_main(argc, argv);
+}
+#else
+int
+main(int argc, char *argv[])
+{
+  return real_main(argc, argv);
+}
+#endif
+
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *