* 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
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 */
} 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;
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;
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_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 ("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 */
}
print_stats_table_header_label("MD5");
}
#endif /* HAVE_LIBGCRYPT */
+ if (cap_in_order) print_stats_table_header_label("Strict time order");
printf("\n");
}
putquote();
}
+ /* ToDo: If WTAP_ENCAP_PER_PACKET, show the list of encapsulations encountered;
+ * Output a line for each different encap with all fields repeated except
+ * the encapsulation field which has "Per Packet: ..." for each
+ * encapsulation type seen ?
+ */
if (cap_file_encap) {
putsep();
putquote();
}
#endif /* HAVE_LIBGCRYPT */
+ if (cap_in_order) {
+ putsep();
+ putquote();
+ printf("%s", (cf_info->in_order) ? "True" : "False");
+ putquote();
+ }
+
printf("\n");
}
double start_time = 0;
double stop_time = 0;
double cur_time = 0;
+ double prev_time = 0;
+ gboolean in_order = TRUE;
+
+ cf_info.encap_counts = g_malloc0(WTAP_NUM_ENCAP_TYPES * sizeof(int));
/* 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;
snaplen_max_inferred = phdr->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;
+ } else {
+ fprintf(stderr, "capinfos: Unknown per-packet encapsulation: %d [frame number: %d]\n", phdr->pkt_encap, packet);
+ }
+ }
+
+ } /* while */
if (err != 0) {
fprintf(stderr,
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;
}
+ g_free(cf_info.encap_counts);
return 1;
}
fprintf(stderr,
"capinfos: Can't get size of \"%s\": %s.\n",
filename, strerror(err));
+ g_free(cf_info.encap_counts);
return 1;
}
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;
print_stats_table(filename, &cf_info);
}
+ g_free(cf_info.encap_counts);
+
return 0;
}
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");
int i;
for (i = 0; i < (int) length; i++) {
- sprintf(str+(i*2), "%02x", hash[i]);
+ g_snprintf(str+(i*2), 3, "%02x", hash[i]);
}
}
#endif /* HAVE_LIBGCRYPT */
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 */
/* 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
- strcpy(file_sha1, "<unknown>");
- strcpy(file_rmd160, "<unknown>");
- strcpy(file_md5, "<unknown>");
+ g_strlcpy(file_sha1, "<unknown>", HASH_STR_SIZE);
+ g_strlcpy(file_rmd160, "<unknown>", HASH_STR_SIZE);
+ g_strlcpy(file_md5, "<unknown>", HASH_STR_SIZE);
if (cap_file_hashes) {
fh = ws_fopen(argv[opt], "rb");
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