#include <wsutil/file_util.h>
#endif
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#else
+#ifndef HAVE_GETOPT
#include "wsutil/wsgetopt.h"
#endif
#ifdef _WIN32
-#include <shellapi.h>
+#include <wsutil/unicode-utils.h>
#endif /* _WIN32 */
#include "svnversion.h"
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
#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)
-{
- gchar *time_string;
- time_string = ctime(timer);
- time_string[24] = '\0';
- return(time_string);
-}
-
-static gchar *
-time_string(const time_t *timer, capture_info *cf_info, gboolean want_lf)
+time_string(time_t timer, capture_info *cf_info, gboolean want_lf)
{
const gchar *lf = want_lf ? "\n" : "";
- static gchar time_string_buf[15];
+ static gchar time_string_buf[20];
+ char *time_string_ctime;
if (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);
+ g_snprintf(time_string_buf, 20, "%lu%s", (unsigned long)timer, lf);
return time_string_buf;
- } else if (want_lf) {
- return ctime(timer);
} else {
- return ctime_no_lf(timer);
+#ifdef _MSC_VER
+ /* 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);
+ 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';
+ }
+ return time_string_ctime;
}
}
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)
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_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);
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_in_order) printf ("Strict time order: %s\n", (cf_info->in_order) ? "True" : "False");
}
static void
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();
if (cap_start_time) {
putsep();
putquote();
- printf("%s", time_string(&start_time_t, cf_info, FALSE));
+ printf("%s", time_string(start_time_t, cf_info, FALSE));
putquote();
}
if (cap_end_time) {
putsep();
putquote();
- printf("%s", time_string(&stop_time_t, cf_info, FALSE));
+ printf("%s", time_string(stop_time_t, cf_info, FALSE));
putquote();
}
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);
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_BAD_FILE:
+ case WTAP_ERR_DECOMPRESS:
fprintf(stderr, "(%s)\n", err_info);
g_free(err_info);
break;
}
+ g_free(cf_info.encap_counts);
return 1;
}
if (size == -1) {
fprintf(stderr,
"capinfos: Can't get size of \"%s\": %s.\n",
- filename, strerror(err));
+ filename, g_strerror(err));
+ g_free(cf_info.encap_counts);
return 1;
}
print_stats_table(filename, &cf_info);
}
+ g_free(cf_info.encap_counts);
+
return 0;
}
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 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;
#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? */
+ arg_list_utf_16to8(argc, argv);
#endif /* _WIN32 */
/*
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");
case WTAP_ERR_UNSUPPORTED:
case WTAP_ERR_UNSUPPORTED_ENCAP:
- case WTAP_ERR_BAD_RECORD:
+ case WTAP_ERR_BAD_FILE:
fprintf(stderr, "(%s)\n", err_info);
g_free(err_info);
break;
}
return overall_error_status;
}
-
git.samba.org / obnox / wireshark / wip.git / blobdiff