* Continue processing additional files after
* a wiretap open failure. The new -C option
* reverts to capinfos' original behavior which
- * is to cancels any further file processing at
+ * is to cancel any further file processing at
* first file open failure.
*
* Change the behavior of how the default display
* into a tab delimited text file, or to a comma
* separated variables file (*.csv) instead of the
* original "long" format.
+ *
+ * 2011-04-05: wmeier
+ * behaviour changed: Upon exit capinfos will return
+ * an error status if an error occurred at any
+ * point during "continuous" file processing.
+ * (Previously a success status was always
+ * returned if the -C option was not used).
+ *
+
*/
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#else
-#include "wsgetopt.h"
+#include "wsutil/wsgetopt.h"
#endif
+#ifdef _WIN32
+#include <shellapi.h>
+#endif /* _WIN32 */
+
#include "svnversion.h"
/*
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) */
+
#ifdef HAVE_LIBGCRYPT
static gboolean cap_file_hashes = TRUE; /* Calculate file hashes */
#endif
#endif /* HAVE_LIBGCRYPT */
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;
- guint32 snaplen;
- gboolean drops_known;
- guint32 drop_count;
-
- double duration;
- double packet_rate;
- double packet_size;
- double data_rate; /* in bytes */
+ 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;
} capture_info;
static void
cap_duration = TRUE;
cap_start_time = TRUE;
cap_end_time = TRUE;
+ cap_in_order = TRUE;
cap_data_rate_byte = TRUE;
cap_data_rate_bit = TRUE;
static void
disable_all_infos(void)
{
- report_all_infos = FALSE;
+ report_all_infos = FALSE;
- cap_file_type = FALSE;
- cap_file_encap = FALSE;
- cap_snaplen = FALSE;
- cap_packet_count = FALSE;
- cap_file_size = FALSE;
+ cap_file_type = FALSE;
+ cap_file_encap = FALSE;
+ cap_snaplen = FALSE;
+ cap_packet_count = FALSE;
+ cap_file_size = FALSE;
- cap_data_size = FALSE;
- cap_duration = FALSE;
- cap_start_time = FALSE;
- cap_end_time = FALSE;
+ cap_data_size = FALSE;
+ cap_duration = FALSE;
+ cap_start_time = FALSE;
+ cap_end_time = FALSE;
+ cap_in_order = FALSE;
cap_data_rate_byte = FALSE;
- cap_data_rate_bit = FALSE;
- cap_packet_size = FALSE;
- cap_packet_rate = FALSE;
+ cap_data_rate_bit = FALSE;
+ cap_packet_size = FALSE;
+ cap_packet_rate = FALSE;
#ifdef HAVE_LIBGCRYPT
cap_file_hashes = FALSE;
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;
+ 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);
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_snaplen && cf_info->snap_set)
- printf ("Packet size limit: %u bytes\n", cf_info->snaplen);
+ printf ("Packet size limit: file hdr: %u bytes\n", cf_info->snaplen);
else if(cap_snaplen && !cf_info->snap_set)
- printf ("Packet size limit: (not set)\n");
+ 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);
+ else
+ 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: %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);
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_file_type) print_stats_table_header_label("File type");
if (cap_file_encap) print_stats_table_header_label("File encapsulation");
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)");
if (cap_packet_count) print_stats_table_header_label("Number of packets");
if (cap_file_size) print_stats_table_header_label("File size (bytes)");
if (cap_data_size) print_stats_table_header_label("Data size (bytes)");
print_stats_table_header_label("MD5");
}
#endif /* HAVE_LIBGCRYPT */
+ if (cap_in_order) print_stats_table_header_label("Strict time order");
printf("\n");
}
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;
+ 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);
printf("%u", cf_info->snaplen);
else
printf("(not set)");
+ putquote();
+ if (cf_info->snaplen_max_inferred > 0) {
+ putsep();
+ putquote();
+ printf("%u", cf_info->snaplen_min_inferred);
+ putquote();
+ putsep();
+ putquote();
+ printf("%u", cf_info->snaplen_max_inferred);
+ putquote();
+ }
+ else {
+ putsep();
+ putquote();
+ printf("n/a");
+ putquote();
+ putsep();
+ putquote();
+ printf("n/a");
+ putquote();
+ }
}
if (cap_packet_count) {
}
#endif /* HAVE_LIBGCRYPT */
+ if (cap_in_order) {
+ putsep();
+ putquote();
+ printf("%s", (cf_info->in_order) ? "True" : "False");
+ putquote();
+ }
+
printf("\n");
}
static int
process_cap_file(wtap *wth, const char *filename)
{
- int err;
- gchar *err_info;
- gint64 size;
- gint64 data_offset;
-
- guint32 packet = 0;
- gint64 bytes = 0;
+ int err;
+ gchar *err_info;
+ gint64 size;
+ gint64 data_offset;
+
+ guint32 packet = 0;
+ gint64 bytes = 0;
+ guint32 snaplen_min_inferred = 0xffffffff;
+ 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;
+ capture_info cf_info;
+ double start_time = 0;
+ double stop_time = 0;
+ double cur_time = 0;
+ double prev_time = 0;
+ gboolean in_order = TRUE;
/* 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;
+ 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;
}
+
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 (err != 0) {
fprintf(stderr,
"capinfos: An error occurred after reading %u packets from \"%s\": %s.\n",
- packet, filename, wtap_strerror(err));
+ packet, filename, wtap_strerror(err));
switch (err) {
case WTAP_ERR_UNSUPPORTED:
if (size == -1) {
fprintf(stderr,
"capinfos: Can't get size of \"%s\": %s.\n",
- filename, strerror(err));
+ filename, strerror(err));
return 1;
}
else
cf_info.snap_set = FALSE;
+ cf_info.snaplen_min_inferred = snaplen_min_inferred;
+ cf_info.snaplen_max_inferred = snaplen_max_inferred;
+
/* # of packets */
cf_info.packet_count = packet;
cf_info.start_time = start_time;
cf_info.stop_time = stop_time;
cf_info.duration = stop_time-start_time;
+ cf_info.in_order = in_order;
/* Number of packet bytes */
cf_info.packet_bytes = bytes;
fprintf(output, "Capinfos %s"
#ifdef SVNVERSION
- " (" SVNVERSION " from " SVNPATH ")"
+ " (" SVNVERSION " from " SVNPATH ")"
#endif
- "\n", VERSION);
+ "\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, " -u display the capture duration (in seconds)\n");
fprintf(output, " -a display the capture start time\n");
fprintf(output, " -e display the capture end time\n");
+ fprintf(output, " -o display the capture file chronological status (True/False)\n");
fprintf(output, " -S display start and end times as seconds\n");
fprintf(output, "\n");
fprintf(output, "Statistic infos:\n");
static void
failure_message(const char *msg_format _U_, va_list ap _U_)
{
- return;
+ return;
}
#endif
int
main(int argc, char *argv[])
{
- wtap *wth;
- int err;
+ wtap *wth;
+ int err;
gchar *err_info;
- int opt;
+ int opt;
+ int overall_error_status;
+
+#ifdef _WIN32
+ LPWSTR *wc_argv;
+ int wc_argc, i;
+#endif /* _WIN32 */
+
int status = 0;
#ifdef HAVE_PLUGINS
- char* init_progfile_dir_error;
+ char *init_progfile_dir_error;
#endif
#ifdef HAVE_LIBGCRYPT
- FILE *fh;
- char *hash_buf = NULL;
+ FILE *fh;
+ char *hash_buf = NULL;
gcry_md_hd_t hd = NULL;
size_t hash_bytes;
#endif
+#ifdef _WIN32
+ /* Convert our arg list to UTF-8. */
+ wc_argv = CommandLineToArgvW(GetCommandLineW(), &wc_argc);
+ if (wc_argv && wc_argc == argc) {
+ for (i = 0; i < argc; i++) {
+ argv[i] = g_utf16_to_utf8(wc_argv[i], -1, NULL, NULL, NULL);
+ }
+ } /* XXX else bail because something is horribly, horribly wrong? */
+#endif /* _WIN32 */
+
/*
* Get credential information for later use.
*/
- get_credential_info();
+ init_process_policies();
#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();
- }
+ 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();
+ }
#endif
/* Process the options */
- while ((opt = getopt(argc, argv, "tEcs" FILE_HASH_OPT "dluaeyizvhxCALTRrSNqQBmb")) !=-1) {
+ while ((opt = getopt(argc, argv, "tEcs" FILE_HASH_OPT "dluaeyizvhxoCALTRrSNqQBmb")) !=-1) {
switch (opt) {
break;
#endif
+ case 'o':
+ if (report_all_infos) disable_all_infos();
+ cap_in_order = TRUE;
+ break;
+
case 'C':
continue_after_wtap_open_offline_failure = FALSE;
break;
}
#endif
+ overall_error_status = 0;
+
for (opt = optind; opt < argc; opt++) {
#ifdef HAVE_LIBGCRYPT
if (!wth) {
fprintf(stderr, "capinfos: Can't open %s: %s\n", argv[opt],
- wtap_strerror(err));
+ wtap_strerror(err));
switch (err) {
case WTAP_ERR_UNSUPPORTED:
g_free(err_info);
break;
}
+ overall_error_status = 1; /* remember that an error has occurred */
if(!continue_after_wtap_open_offline_failure)
- exit(1);
+ exit(1); /* error status */
}
if(wth) {
exit(status);
}
}
- return 0;
+ return overall_error_status;
}
git.samba.org / obnox / wireshark / wip.git / blobdiff