* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
+#ifdef HAVE_LIBZ
+#include <zlib.h> /* to get the libz version number */
#endif
#include "wtap.h"
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
#include "wsutil/wsgetopt.h"
#endif
#endif
#endif
-#ifdef NEED_STRPTIME_H
+#ifndef HAVE_STRPTIME
# include "wsutil/strptime.h"
#endif
-#include <wsutil/privileges.h>
+#include <wsutil/crash_info.h>
#include <wsutil/filesystem.h>
-#include <wsutil/report_err.h>
-#include <wsutil/strnatcmp.h>
#include <wsutil/md5.h>
#include <wsutil/plugins.h>
-
-#include "version.h"
+#include <wsutil/privileges.h>
+#include <wsutil/report_err.h>
+#include <wsutil/strnatcmp.h>
+#include <wsutil/ws_diag_control.h>
+#include <wsutil/ws_version_info.h>
#include "ringbuffer.h" /* For RINGBUFFER_MAX_NUM_FILES */
static int dup_window = DEFAULT_DUP_DEPTH;
static int cur_dup_entry = 0;
-#define ONE_MILLION 1000000
+static int ignored_bytes = 0; /* Used with -I */
+
#define ONE_BILLION 1000000000
/* Weights of different errors we can introduce */
#define ALNUM_LEN (sizeof(ALNUM_CHARS) - 1)
struct time_adjustment {
- struct timeval tv;
+ nstime_t tv;
int is_negative;
};
}
static gchar *
-fileset_get_filename_by_pattern(guint idx, const nstime_t *time_val,
+fileset_get_filename_by_pattern(guint idx, const struct wtap_pkthdr *phdr,
gchar *fprefix, gchar *fsuffix)
{
gchar filenum[5+1];
gchar *timestr;
gchar *abs_str;
- timestr = abs_time_to_str_with_sec_resolution(time_val);
g_snprintf(filenum, sizeof(filenum), "%05u", idx % RINGBUFFER_MAX_NUM_FILES);
- abs_str = g_strconcat(fprefix, "_", filenum, "_", timestr, fsuffix, NULL);
- g_free(timestr);
+ if (phdr->presence_flags & WTAP_HAS_TS) {
+ timestr = abs_time_to_str_with_sec_resolution(&phdr->ts);
+ abs_str = g_strconcat(fprefix, "_", filenum, "_", timestr, fsuffix, NULL);
+ g_free(timestr);
+ } else
+ abs_str = g_strconcat(fprefix, "_", filenum, fsuffix, NULL);
return abs_str;
}
return 0;
}
-/* is the packet in the selected timeframe */
-static gboolean
-check_timestamp(wtap *wth)
-{
- struct wtap_pkthdr *pkthdr = wtap_phdr(wth);
-
- return (pkthdr->ts.secs >= starttime) && (pkthdr->ts.secs < stoptime);
-}
-
static void
set_time_adjustment(char *optarg_str_p)
{
exit(1);
}
}
- time_adj.tv.tv_sec = val;
+ time_adj.tv.secs = val;
/* now collect the partial seconds, if any */
if (*frac != '\0') { /* chars left, so get fractional part */
val = strtol(&(frac[1]), &end, 10);
- /* if more than 6 fractional digits truncate to 6 */
- if ((end - &(frac[1])) > 6) {
- frac[7] = 't'; /* 't' for truncate */
+ /* if more than 9 fractional digits truncate to 9 */
+ if ((end - &(frac[1])) > 9) {
+ frac[10] = 't'; /* 't' for truncate */
val = strtol(&(frac[1]), &end, 10);
}
if (*frac != '.' || end == NULL || end == frac || val < 0
- || val > ONE_MILLION || val == LONG_MIN || val == LONG_MAX) {
+ || val > ONE_BILLION || val == LONG_MIN || val == LONG_MAX) {
fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
optarg_str_p);
exit(1);
}
/* adjust fractional portion from fractional to numerator
- * e.g., in "1.5" from 5 to 500000 since .5*10^6 = 500000 */
+ * e.g., in "1.5" from 5 to 500000000 since .5*10^9 = 500000000 */
if (frac && end) { /* both are valid */
frac_digits = end - frac - 1; /* fractional digit count (remember '.') */
- while(frac_digits < 6) { /* this is frac of 10^6 */
+ while(frac_digits < 9) { /* this is frac of 10^9 */
val *= 10;
frac_digits++;
}
}
- time_adj.tv.tv_usec = (int)val;
+ time_adj.tv.nsecs = (int)val;
}
static void
exit(1);
}
}
- strict_time_adj.tv.tv_sec = val;
+ strict_time_adj.tv.secs = val;
/* now collect the partial seconds, if any */
if (*frac != '\0') { /* chars left, so get fractional part */
val = strtol(&(frac[1]), &end, 10);
- /* if more than 6 fractional digits truncate to 6 */
- if ((end - &(frac[1])) > 6) {
- frac[7] = 't'; /* 't' for truncate */
+ /* if more than 9 fractional digits truncate to 9 */
+ if ((end - &(frac[1])) > 9) {
+ frac[10] = 't'; /* 't' for truncate */
val = strtol(&(frac[1]), &end, 10);
}
if (*frac != '.' || end == NULL || end == frac || val < 0
- || val > ONE_MILLION || val == LONG_MIN || val == LONG_MAX) {
+ || val > ONE_BILLION || val == LONG_MIN || val == LONG_MAX) {
fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
optarg_str_p);
exit(1);
}
/* adjust fractional portion from fractional to numerator
- * e.g., in "1.5" from 5 to 500000 since .5*10^6 = 500000 */
+ * e.g., in "1.5" from 5 to 500000000 since .5*10^9 = 500000000 */
if (frac && end) { /* both are valid */
frac_digits = end - frac - 1; /* fractional digit count (remember '.') */
- while(frac_digits < 6) { /* this is frac of 10^6 */
+ while(frac_digits < 9) { /* this is frac of 10^9 */
val *= 10;
frac_digits++;
}
}
- strict_time_adj.tv.tv_usec = (int)val;
+ strict_time_adj.tv.nsecs = (int)val;
}
static void
int i;
md5_state_t ms;
+ /*Hint to ignore some bytes at the start of the frame for the digest calculation(-I option) */
+ guint32 new_len;
+ guint8 *new_fd;
+
+ new_fd = &fd[ignored_bytes];
+ new_len = len - (ignored_bytes);
+
cur_dup_entry++;
if (cur_dup_entry >= dup_window)
cur_dup_entry = 0;
/* Calculate our digest */
md5_init(&ms);
- md5_append(&ms, fd, len);
+ md5_append(&ms, new_fd, new_len);
md5_finish(&ms, fd_hash[cur_dup_entry].digest);
fd_hash[cur_dup_entry].len = len;
int i;
md5_state_t ms;
+ /*Hint to ignore some bytes at the start of the frame for the digest calculation(-I option) */
+ guint32 new_len;
+ guint8 *new_fd;
+
+ new_fd = &fd[ignored_bytes];
+ new_len = len - (ignored_bytes);
+
cur_dup_entry++;
if (cur_dup_entry >= dup_window)
cur_dup_entry = 0;
/* Calculate our digest */
md5_init(&ms);
- md5_append(&ms, fd, len);
+ md5_append(&ms, new_fd, new_len);
md5_finish(&ms, fd_hash[cur_dup_entry].digest);
fd_hash[cur_dup_entry].len = len;
}
static void
-usage(gboolean is_error)
+print_usage(FILE *output)
{
- FILE *output;
-
- if (!is_error)
- output = stdout;
- else
- output = stderr;
-
- fprintf(output, "Editcap %s"
-#ifdef GITVERSION
- " (" GITVERSION " from " GITBRANCH ")"
-#endif
- "\n", VERSION);
- fprintf(output, "Edit and/or translate the format of capture files.\n");
- fprintf(output, "See http://www.wireshark.org for more information.\n");
fprintf(output, "\n");
fprintf(output, "Usage: editcap [options] ... <infile> <outfile> [ <packet#>[-<packet#>] ... ]\n");
fprintf(output, "\n");
fprintf(output, " A <dup time window> is specified in relative seconds\n");
fprintf(output, " (e.g. 0.000001).\n");
fprintf(output, "\n");
+ fprintf(output, " -I <bytes to ignore> ignore the specified bytes at the beginning of\n");
+ fprintf(output, " the frame during MD5 hash calculation\n");
+ fprintf(output, " Useful to remove duplicated packets taken on\n");
+ fprintf(output, " several routers(differents mac addresses for \n");
+ fprintf(output, " example)\n");
+ fprintf(output, " e.g. -I 26 in case of Ether/IP/ will ignore \n");
+ fprintf(output, " ether(14) and IP header(20 - 4(src ip) - 4(dst ip)).\n");
+ fprintf(output, "\n");
fprintf(output, " NOTE: The use of the 'Duplicate packet removal' options with\n");
fprintf(output, " other editcap options except -v may not always work as expected.\n");
fprintf(output, " Specifically the -r, -t or -S options will very likely NOT have the\n");
static gint
string_nat_compare(gconstpointer a, gconstpointer b)
{
- return strnatcmp(((const struct string_elem *)a)->sstr,
+ return ws_ascii_strnatcmp(((const struct string_elem *)a)->sstr,
((const struct string_elem *)b)->sstr);
}
}
#endif
+static void
+get_editcap_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_editcap_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 i, j, err;
gchar *err_info;
int opt;
+DIAG_OFF(cast-qual)
+ static const struct option long_options[] = {
+ {(char *)"help", no_argument, NULL, 'h'},
+ {(char *)"version", no_argument, NULL, 'V'},
+ {0, 0, 0, 0 }
+ };
+DIAG_ON(cast-qual)
char *p;
guint32 snaplen = 0; /* No limit */
int split_packet_count = 0;
int written_count = 0;
char *filename = NULL;
- gboolean ts_okay = TRUE;
+ gboolean ts_okay;
int secs_per_block = 0;
int block_cnt = 0;
nstime_t block_start;
create_app_running_mutex();
#endif /* _WIN32 */
- /*
- * Get credential information for later use.
- */
+ /* Get the compile-time version information string */
+ comp_info_str = get_compiled_version_info(NULL, get_editcap_compiled_info);
+
+ /* Get the run-time version information string */
+ runtime_info_str = get_runtime_version_info(get_editcap_runtime_info);
+
+ /* Add it to the information to be reported on a crash. */
+ ws_add_crash_info("Editcap (Wireshark) %s\n"
+ "\n"
+ "%s"
+ "\n"
+ "%s",
+ get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str);
+
+ /*
+ * 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))) {
+ if ((init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main))) {
g_warning("editcap: init_progfile_dir(): %s", init_progfile_dir_error);
g_free(init_progfile_dir_error);
} else {
#endif
/* Process the options */
- while ((opt = getopt(argc, argv, "A:B:c:C:dD:E:F:hi:Lrs:S:t:T:vw:")) != -1) {
+ while ((opt = getopt_long(argc, argv, "A:B:c:C:dD:E:F:hi:I:Lrs:S:t:T:vVw:", long_options, NULL)) != -1) {
switch (opt) {
case 'A':
{
break;
case 'E':
- err_prob = strtod(optarg, &p);
+ err_prob = g_ascii_strtod(optarg, &p);
if (p == optarg || err_prob < 0.0 || err_prob > 1.0) {
fprintf(stderr, "editcap: probability \"%s\" must be between 0.0 and 1.0\n",
optarg);
break;
case 'h':
- usage(FALSE);
+ printf("Editcap (Wireshark) %s\n"
+ "Edit and/or translate the format of capture files.\n"
+ "See http://www.wireshark.org for more information.\n",
+ get_ws_vcs_version_info());
+ print_usage(stdout);
exit(0);
break;
}
break;
+ case 'I': /* ignored_bytes at the beginning of the frame for duplications removal */
+ ignored_bytes = atoi(optarg);
+ if(ignored_bytes <= 0) {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid number of bytes to ignore\n", optarg);
+ exit(1);
+ }
+ break;
+
case 'L':
adjlen = TRUE;
break;
verbose = !verbose; /* Just invert */
break;
+ case 'V':
+ show_version("Editcap (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 'w':
dup_detect = FALSE;
dup_detect_by_time = TRUE;
list_encap_types();
break;
default:
- usage(TRUE);
+ print_usage(stderr);
break;
}
exit(1);
#endif
if ((argc - optind) < 1) {
- usage(TRUE);
+ print_usage(stderr);
exit(1);
}
if (!wth) {
fprintf(stderr, "editcap: Can't open %s: %s\n", argv[optind],
wtap_strerror(err));
- switch (err) {
- case WTAP_ERR_UNSUPPORTED:
- case WTAP_ERR_UNSUPPORTED_ENCAP:
- case WTAP_ERR_BAD_FILE:
+ if (err_info != NULL) {
fprintf(stderr, "(%s)\n", err_info);
g_free(err_info);
- break;
}
exit(2);
}
read_count++;
phdr = wtap_phdr(wth);
- buf = wtap_buf_ptr(wth);
-
- if (nstime_is_unset(&block_start)) { /* should only be the first packet */
- block_start.secs = phdr->ts.secs;
- block_start.nsecs = phdr->ts.nsecs;
+ if (read_count == 1) { /* the first packet */
if (split_packet_count > 0 || secs_per_block > 0) {
if (!fileset_extract_prefix_suffix(argv[optind+1], &fprefix, &fsuffix))
exit(2);
- filename = fileset_get_filename_by_pattern(block_cnt++, &phdr->ts, fprefix, fsuffix);
+ filename = fileset_get_filename_by_pattern(block_cnt++, phdr, fprefix, fsuffix);
} else {
filename = g_strdup(argv[optind+1]);
}
+ g_assert(filename);
/* If we don't have an application name add Editcap */
if (shb_hdr->shb_user_appl == NULL) {
- shb_hdr->shb_user_appl = "Editcap " VERSION;
+ shb_hdr->shb_user_appl = g_strdup("Editcap " VERSION);
}
pdh = wtap_dump_open_ng(filename, out_file_type_subtype, out_frame_type,
}
}
- g_assert(filename);
-
- if (secs_per_block > 0) {
- while ((phdr->ts.secs - block_start.secs > secs_per_block)
- || (phdr->ts.secs - block_start.secs == secs_per_block
- && phdr->ts.nsecs >= block_start.nsecs )) { /* time for the next file */
-
- if (!wtap_dump_close(pdh, &err)) {
- fprintf(stderr, "editcap: Error writing to %s: %s\n",
- filename, wtap_strerror(err));
- exit(2);
- }
- block_start.secs = block_start.secs + secs_per_block; /* reset for next interval */
- g_free(filename);
- filename = fileset_get_filename_by_pattern(block_cnt++, &phdr->ts, fprefix, fsuffix);
- g_assert(filename);
+ buf = wtap_buf_ptr(wth);
- if (verbose)
- fprintf(stderr, "Continuing writing in file %s\n", filename);
+ /*
+ * Not all packets have time stamps. Only process the time
+ * stamp if we have one.
+ */
+ if (phdr->presence_flags & WTAP_HAS_TS) {
+ if (nstime_is_unset(&block_start)) {
+ block_start.secs = phdr->ts.secs;
+ block_start.nsecs = phdr->ts.nsecs;
+ }
- pdh = wtap_dump_open_ng(filename, out_file_type_subtype, out_frame_type,
- snaplen ? MIN(snaplen, wtap_snapshot_length(wth)) : wtap_snapshot_length(wth),
- FALSE /* compressed */, shb_hdr, idb_inf, &err);
+ if (secs_per_block > 0) {
+ while ((phdr->ts.secs - block_start.secs > secs_per_block)
+ || (phdr->ts.secs - block_start.secs == secs_per_block
+ && phdr->ts.nsecs >= block_start.nsecs )) { /* time for the next file */
- if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n",
- filename, wtap_strerror(err));
- exit(2);
+ if (!wtap_dump_close(pdh, &err)) {
+ fprintf(stderr, "editcap: Error writing to %s: %s\n",
+ filename, wtap_strerror(err));
+ exit(2);
+ }
+ block_start.secs = block_start.secs + secs_per_block; /* reset for next interval */
+ g_free(filename);
+ filename = fileset_get_filename_by_pattern(block_cnt++, phdr, fprefix, fsuffix);
+ g_assert(filename);
+
+ if (verbose)
+ fprintf(stderr, "Continuing writing in file %s\n", filename);
+
+ pdh = wtap_dump_open_ng(filename, out_file_type_subtype, out_frame_type,
+ snaplen ? MIN(snaplen, wtap_snapshot_length(wth)) : wtap_snapshot_length(wth),
+ FALSE /* compressed */, shb_hdr, idb_inf, &err);
+
+ if (pdh == NULL) {
+ fprintf(stderr, "editcap: Can't open or create %s: %s\n",
+ filename, wtap_strerror(err));
+ exit(2);
+ }
}
}
}
}
g_free(filename);
- filename = fileset_get_filename_by_pattern(block_cnt++, &phdr->ts, fprefix, fsuffix);
+ filename = fileset_get_filename_by_pattern(block_cnt++, phdr, fprefix, fsuffix);
g_assert(filename);
if (verbose)
}
}
- if (check_startstop)
- ts_okay = check_timestamp(wth);
+ if (check_startstop) {
+ /*
+ * Is the packet in the selected timeframe?
+ * If the packet has no time stamp, the answer is "no".
+ */
+ if (phdr->presence_flags & WTAP_HAS_TS)
+ ts_okay = (phdr->ts.secs >= starttime) && (phdr->ts.secs < stoptime);
+ else
+ ts_okay = FALSE;
+ } else {
+ /*
+ * No selected timeframe, so all packets are "in the
+ * selected timeframe".
+ */
+ ts_okay = TRUE;
+ }
if (ts_okay && ((!selected(count) && !keep_em)
|| (selected(count) && keep_em))) {
handle_chopping(chop, &snap_phdr, phdr, &buf, adjlen);
phdr = &snap_phdr;
- /* Do we adjust timestamps to ensure strict chronological
- * order? */
- if (do_strict_time_adjustment) {
- if (previous_time.secs || previous_time.nsecs) {
- if (!strict_time_adj.is_negative) {
- nstime_t current;
- nstime_t delta;
-
- current.secs = phdr->ts.secs;
- current.nsecs = phdr->ts.nsecs;
-
- nstime_delta(&delta, ¤t, &previous_time);
-
- if (delta.secs < 0 || delta.nsecs < 0) {
+ if (phdr->presence_flags & WTAP_HAS_TS) {
+ /* Do we adjust timestamps to ensure strict chronological
+ * order? */
+ if (do_strict_time_adjustment) {
+ if (previous_time.secs || previous_time.nsecs) {
+ if (!strict_time_adj.is_negative) {
+ nstime_t current;
+ nstime_t delta;
+
+ current.secs = phdr->ts.secs;
+ current.nsecs = phdr->ts.nsecs;
+
+ nstime_delta(&delta, ¤t, &previous_time);
+
+ if (delta.secs < 0 || delta.nsecs < 0) {
+ /*
+ * A negative delta indicates that the current packet
+ * has an absolute timestamp less than the previous packet
+ * that it is being compared to. This is NOT a normal
+ * situation since trace files usually have packets in
+ * chronological order (oldest to newest).
+ */
+ /* fprintf(stderr, "++out of order, need to adjust this packet!\n"); */
+ snap_phdr = *phdr;
+ snap_phdr.ts.secs = previous_time.secs + strict_time_adj.tv.secs;
+ snap_phdr.ts.nsecs = previous_time.nsecs;
+ if (snap_phdr.ts.nsecs + strict_time_adj.tv.nsecs > ONE_BILLION) {
+ /* carry */
+ snap_phdr.ts.secs++;
+ snap_phdr.ts.nsecs += strict_time_adj.tv.nsecs - ONE_BILLION;
+ } else {
+ snap_phdr.ts.nsecs += strict_time_adj.tv.nsecs;
+ }
+ phdr = &snap_phdr;
+ }
+ } else {
/*
- * A negative delta indicates that the current packet
- * has an absolute timestamp less than the previous packet
- * that it is being compared to. This is NOT a normal
- * situation since trace files usually have packets in
- * chronological order (oldest to newest).
+ * A negative strict time adjustment is requested.
+ * Unconditionally set each timestamp to previous
+ * packet's timestamp plus delta.
*/
- /* fprintf(stderr, "++out of order, need to adjust this packet!\n"); */
snap_phdr = *phdr;
- snap_phdr.ts.secs = previous_time.secs + strict_time_adj.tv.tv_sec;
+ snap_phdr.ts.secs = previous_time.secs + strict_time_adj.tv.secs;
snap_phdr.ts.nsecs = previous_time.nsecs;
- if (snap_phdr.ts.nsecs + strict_time_adj.tv.tv_usec * 1000 > ONE_MILLION * 1000) {
+ if (snap_phdr.ts.nsecs + strict_time_adj.tv.nsecs > ONE_BILLION) {
/* carry */
snap_phdr.ts.secs++;
- snap_phdr.ts.nsecs += (strict_time_adj.tv.tv_usec - ONE_MILLION) * 1000;
+ snap_phdr.ts.nsecs += strict_time_adj.tv.nsecs - ONE_BILLION;
} else {
- snap_phdr.ts.nsecs += strict_time_adj.tv.tv_usec * 1000;
+ snap_phdr.ts.nsecs += strict_time_adj.tv.nsecs;
}
phdr = &snap_phdr;
}
- } else {
- /*
- * A negative strict time adjustment is requested.
- * Unconditionally set each timestamp to previous
- * packet's timestamp plus delta.
- */
- snap_phdr = *phdr;
- snap_phdr.ts.secs = previous_time.secs + strict_time_adj.tv.tv_sec;
- snap_phdr.ts.nsecs = previous_time.nsecs;
- if (snap_phdr.ts.nsecs + strict_time_adj.tv.tv_usec * 1000 > ONE_MILLION * 1000) {
- /* carry */
- snap_phdr.ts.secs++;
- snap_phdr.ts.nsecs += (strict_time_adj.tv.tv_usec - ONE_MILLION) * 1000;
- } else {
- snap_phdr.ts.nsecs += strict_time_adj.tv.tv_usec * 1000;
- }
- phdr = &snap_phdr;
}
+ previous_time.secs = phdr->ts.secs;
+ previous_time.nsecs = phdr->ts.nsecs;
}
- previous_time.secs = phdr->ts.secs;
- previous_time.nsecs = phdr->ts.nsecs;
- }
- /* assume that if the frame's tv_sec is 0, then
- * the timestamp isn't supported */
- if (phdr->ts.secs > 0 && time_adj.tv.tv_sec != 0) {
- snap_phdr = *phdr;
- if (time_adj.is_negative)
- snap_phdr.ts.secs -= time_adj.tv.tv_sec;
- else
- snap_phdr.ts.secs += time_adj.tv.tv_sec;
- phdr = &snap_phdr;
- }
+ /* assume that if the frame's tv_sec is 0, then
+ * the timestamp isn't supported */
+ if (phdr->ts.secs > 0 && time_adj.tv.secs != 0) {
+ snap_phdr = *phdr;
+ if (time_adj.is_negative)
+ snap_phdr.ts.secs -= time_adj.tv.secs;
+ else
+ snap_phdr.ts.secs += time_adj.tv.secs;
+ phdr = &snap_phdr;
+ }
- /* assume that if the frame's tv_sec is 0, then
- * the timestamp isn't supported */
- if (phdr->ts.secs > 0 && time_adj.tv.tv_usec != 0) {
- snap_phdr = *phdr;
- if (time_adj.is_negative) { /* subtract */
- if (snap_phdr.ts.nsecs/1000 < time_adj.tv.tv_usec) { /* borrow */
- snap_phdr.ts.secs--;
- snap_phdr.ts.nsecs += ONE_MILLION * 1000;
- }
- snap_phdr.ts.nsecs -= time_adj.tv.tv_usec * 1000;
- } else { /* add */
- if (snap_phdr.ts.nsecs + time_adj.tv.tv_usec * 1000 > ONE_MILLION * 1000) {
- /* carry */
- snap_phdr.ts.secs++;
- snap_phdr.ts.nsecs += (time_adj.tv.tv_usec - ONE_MILLION) * 1000;
- } else {
- snap_phdr.ts.nsecs += time_adj.tv.tv_usec * 1000;
+ /* assume that if the frame's tv_sec is 0, then
+ * the timestamp isn't supported */
+ if (phdr->ts.secs > 0 && time_adj.tv.nsecs != 0) {
+ snap_phdr = *phdr;
+ if (time_adj.is_negative) { /* subtract */
+ if (snap_phdr.ts.nsecs < time_adj.tv.nsecs) { /* borrow */
+ snap_phdr.ts.secs--;
+ snap_phdr.ts.nsecs += ONE_BILLION;
+ }
+ snap_phdr.ts.nsecs -= time_adj.tv.nsecs;
+ } else { /* add */
+ if (snap_phdr.ts.nsecs + time_adj.tv.nsecs > ONE_BILLION) {
+ /* carry */
+ snap_phdr.ts.secs++;
+ snap_phdr.ts.nsecs += time_adj.tv.nsecs - ONE_BILLION;
+ } else {
+ snap_phdr.ts.nsecs += time_adj.tv.nsecs;
+ }
}
+ phdr = &snap_phdr;
}
- phdr = &snap_phdr;
}
/* suppress duplicates by packet window */
}
}
- /* suppress duplicates by time window */
- if (dup_detect_by_time) {
- nstime_t current;
-
- current.secs = phdr->ts.secs;
- current.nsecs = phdr->ts.nsecs;
-
- if (is_duplicate_rel_time(buf, phdr->caplen, ¤t)) {
- if (verbose) {
- fprintf(stderr, "Skipped: %u, Len: %u, MD5 Hash: ",
- count, phdr->caplen);
- for (i = 0; i < 16; i++)
- fprintf(stderr, "%02x",
- (unsigned char)fd_hash[cur_dup_entry].digest[i]);
- fprintf(stderr, "\n");
- }
- duplicate_count++;
- count++;
- continue;
- } else {
- if (verbose) {
- fprintf(stderr, "Packet: %u, Len: %u, MD5 Hash: ",
- count, phdr->caplen);
- for (i = 0; i < 16; i++)
- fprintf(stderr, "%02x",
- (unsigned char)fd_hash[cur_dup_entry].digest[i]);
- fprintf(stderr, "\n");
+ if (phdr->presence_flags & WTAP_HAS_TS) {
+ /* suppress duplicates by time window */
+ if (dup_detect_by_time) {
+ nstime_t current;
+
+ current.secs = phdr->ts.secs;
+ current.nsecs = phdr->ts.nsecs;
+
+ if (is_duplicate_rel_time(buf, phdr->caplen, ¤t)) {
+ if (verbose) {
+ fprintf(stderr, "Skipped: %u, Len: %u, MD5 Hash: ",
+ count, phdr->caplen);
+ for (i = 0; i < 16; i++)
+ fprintf(stderr, "%02x",
+ (unsigned char)fd_hash[cur_dup_entry].digest[i]);
+ fprintf(stderr, "\n");
+ }
+ duplicate_count++;
+ count++;
+ continue;
+ } else {
+ if (verbose) {
+ fprintf(stderr, "Packet: %u, Len: %u, MD5 Hash: ",
+ count, phdr->caplen);
+ for (i = 0; i < 16; i++)
+ fprintf(stderr, "%02x",
+ (unsigned char)fd_hash[cur_dup_entry].digest[i]);
+ fprintf(stderr, "\n");
+ }
}
}
}
}
}
- if (!wtap_dump(pdh, phdr, buf, &err)) {
+ if (!wtap_dump(pdh, phdr, buf, &err, &err_info)) {
switch (err) {
- case WTAP_ERR_UNSUPPORTED_ENCAP:
+ case WTAP_ERR_UNWRITABLE_ENCAP:
/*
* This is a problem with the particular frame we're
* writing and the file type and subtype we're
* and file type/subtype.
*/
fprintf(stderr,
- "editcap: Frame %u of \"%s\" has a network type that can't be saved in a \"%s\" file\n.",
+ "editcap: Frame %u of \"%s\" has a network type that can't be saved in a \"%s\" file.\n",
read_count, argv[optind],
wtap_file_type_subtype_string(out_file_type_subtype));
break;
* and file type/subtype.
*/
fprintf(stderr,
- "editcap: Frame %u of \"%s\" is too large for a \"%s\" file\n.",
+ "editcap: Frame %u of \"%s\" is too large for a \"%s\" file.\n",
+ read_count, argv[optind],
+ wtap_file_type_subtype_string(out_file_type_subtype));
+ break;
+
+ case WTAP_ERR_UNWRITABLE_REC_TYPE:
+ /*
+ * This is a problem with the particular record we're
+ * writing and the file type and subtype we're
+ * writing; note that, and report the record number
+ * and file type/subtype.
+ */
+ fprintf(stderr,
+ "editcap: Record %u of \"%s\" has a record type that can't be saved in a \"%s\" file.\n",
read_count, argv[optind],
wtap_file_type_subtype_string(out_file_type_subtype));
break;
+ case WTAP_ERR_UNWRITABLE_REC_DATA:
+ /*
+ * This is a problem with the particular record we're
+ * writing and the file type and subtype we're
+ * writing; note that, and report the record number
+ * and file type/subtype.
+ */
+ fprintf(stderr,
+ "editcap: Record %u of \"%s\" has data that can't be saved in a \"%s\" file.\n(%s)\n",
+ read_count, argv[optind],
+ wtap_file_type_subtype_string(out_file_type_subtype),
+ err_info != NULL ? err_info : "no information supplied");
+ g_free(err_info);
+ break;
+
default:
fprintf(stderr, "editcap: Error writing to %s: %s\n",
filename, wtap_strerror(err));
fprintf(stderr,
"editcap: An error occurred while reading \"%s\": %s.\n",
argv[optind], wtap_strerror(err));
- switch (err) {
- case WTAP_ERR_UNSUPPORTED:
- case WTAP_ERR_UNSUPPORTED_ENCAP:
- case WTAP_ERR_BAD_FILE:
+ if (err_info != NULL) {
fprintf(stderr, "(%s)\n", err_info);
g_free(err_info);
- break;
}
}
const struct wtap_pkthdr *in_phdr, guint8 **buf,
gboolean adjlen)
{
+ /* Only packets can be chopped. */
+ if (in_phdr->rec_type != REC_TYPE_PACKET)
+ return;
+
/* If we're not chopping anything from one side, then the offset for that
* side is meaningless. */
if (chop.len_begin == 0)
git.samba.org / metze / wireshark / wip.git / blobdiff