/* Edit capture files. We can delete packets, adjust timestamps, or
* simply convert from one format to another format.
*
- * $Id$
- *
* Originally written by Richard Sharpe.
* Improved by Guy Harris.
* Further improved by Richard Sharpe.
+ *
+ * Copyright 2013, Richard Sharpe <realrichardsharpe[AT]gmail.com>
+ *
+ * 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.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#endif
-
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
+#ifdef HAVE_LIBZ
+#include <zlib.h> /* to get the libz version number */
+#endif
+
#include "wtap.h"
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#else
+#ifndef HAVE_GETOPT_LONG
#include "wsutil/wsgetopt.h"
#endif
#ifdef _WIN32
+#include <wsutil/file_util.h>
#include <wsutil/unicode-utils.h>
#include <process.h> /* getpid */
#ifdef HAVE_WINSOCK2_H
#endif
#endif
-#ifdef NEED_STRPTIME_H
+#ifndef HAVE_STRPTIME
# include "wsutil/strptime.h"
#endif
-#include "epan/crypt/crypt-md5.h"
-#include "epan/plugins.h"
-#include "epan/report_err.h"
-#include "epan/filesystem.h"
#include <wsutil/privileges.h>
-#include "epan/nstime.h"
+#include <wsutil/filesystem.h>
+#include <wsutil/report_err.h>
+#include <wsutil/strnatcmp.h>
+#include <wsutil/md5.h>
+#include <wsutil/plugins.h>
+#include <wsutil/crash_info.h>
+#include <wsutil/ws_version_info.h>
-#include "svnversion.h"
+#include "ringbuffer.h" /* For RINGBUFFER_MAX_NUM_FILES */
/*
* Some globals so we can pass things to various routines
*/
struct select_item {
-
- int inclusive;
- int first, second;
-
+ int inclusive;
+ int first, second;
};
-
/*
* Duplicate frame detection
*/
typedef struct _fd_hash_t {
- md5_byte_t digest[16];
- guint32 len;
- nstime_t time;
+ md5_byte_t digest[16];
+ guint32 len;
+ nstime_t time;
} fd_hash_t;
-#define DEFAULT_DUP_DEPTH 5 /* Used with -d */
-#define MAX_DUP_DEPTH 1000000 /* the maximum window (and actual size of fd_hash[]) for de-duplication */
+#define DEFAULT_DUP_DEPTH 5 /* Used with -d */
+#define MAX_DUP_DEPTH 1000000 /* the maximum window (and actual size of fd_hash[]) for de-duplication */
+
+static fd_hash_t fd_hash[MAX_DUP_DEPTH];
+static int dup_window = DEFAULT_DUP_DEPTH;
+static int cur_dup_entry = 0;
-fd_hash_t fd_hash[MAX_DUP_DEPTH];
-int dup_window = DEFAULT_DUP_DEPTH;
-int cur_dup_entry = 0;
+static int ignored_bytes = 0; /* Used with -I */
-#define ONE_MILLION 1000000
#define ONE_BILLION 1000000000
/* Weights of different errors we can introduce */
/* We should probably make these command-line arguments */
/* XXX - Should we add a bit-level error? */
-#define ERR_WT_BIT 5 /* Flip a random bit */
-#define ERR_WT_BYTE 5 /* Substitute a random byte */
-#define ERR_WT_ALNUM 5 /* Substitute a random character in [A-Za-z0-9] */
-#define ERR_WT_FMT 2 /* Substitute "%s" */
-#define ERR_WT_AA 1 /* Fill the remainder of the buffer with 0xAA */
-#define ERR_WT_TOTAL (ERR_WT_BIT + ERR_WT_BYTE + ERR_WT_ALNUM + ERR_WT_FMT + ERR_WT_AA)
-
-#define ALNUM_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-#define ALNUM_LEN (sizeof(ALNUM_CHARS) - 1)
+#define ERR_WT_BIT 5 /* Flip a random bit */
+#define ERR_WT_BYTE 5 /* Substitute a random byte */
+#define ERR_WT_ALNUM 5 /* Substitute a random character in [A-Za-z0-9] */
+#define ERR_WT_FMT 2 /* Substitute "%s" */
+#define ERR_WT_AA 1 /* Fill the remainder of the buffer with 0xAA */
+#define ERR_WT_TOTAL (ERR_WT_BIT + ERR_WT_BYTE + ERR_WT_ALNUM + ERR_WT_FMT + ERR_WT_AA)
+#define ALNUM_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+#define ALNUM_LEN (sizeof(ALNUM_CHARS) - 1)
struct time_adjustment {
- struct timeval tv;
- int is_negative;
+ nstime_t tv;
+ int is_negative;
};
+typedef struct _chop_t {
+ int len_begin;
+ int off_begin_pos;
+ int off_begin_neg;
+ int len_end;
+ int off_end_pos;
+ int off_end_neg;
+} chop_t;
+
#define MAX_SELECTIONS 512
-static struct select_item selectfrm[MAX_SELECTIONS];
-static int max_selected = -1;
-static int keep_em = 0;
-static int out_file_type = WTAP_FILE_PCAP; /* default to "libpcap" */
-static int out_frame_type = -2; /* Leave frame type alone */
-static int verbose = 0; /* Not so verbose */
-static struct time_adjustment time_adj = {{0, 0}, 0}; /* no adjustment */
-static nstime_t relative_time_window = {0, 0}; /* de-dup time window */
-static double err_prob = 0.0;
-static time_t starttime = 0;
-static time_t stoptime = 0;
-static gboolean check_startstop = FALSE;
-static gboolean dup_detect = FALSE;
-static gboolean dup_detect_by_time = FALSE;
-
-static int do_strict_time_adjustment = FALSE;
-static struct time_adjustment strict_time_adj = {{0, 0}, 0}; /* strict time adjustment */
-static nstime_t previous_time = {0, 0}; /* previous time */
+static struct select_item selectfrm[MAX_SELECTIONS];
+static int max_selected = -1;
+static int keep_em = 0;
+#ifdef PCAP_NG_DEFAULT
+static int out_file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; /* default to pcapng */
+#else
+static int out_file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_PCAP; /* default to pcap */
+#endif
+static int out_frame_type = -2; /* Leave frame type alone */
+static int verbose = 0; /* Not so verbose */
+static struct time_adjustment time_adj = {{0, 0}, 0}; /* no adjustment */
+static nstime_t relative_time_window = {0, 0}; /* de-dup time window */
+static double err_prob = 0.0;
+static time_t starttime = 0;
+static time_t stoptime = 0;
+static gboolean check_startstop = FALSE;
+static gboolean dup_detect = FALSE;
+static gboolean dup_detect_by_time = FALSE;
+
+static int do_strict_time_adjustment = FALSE;
+static struct time_adjustment strict_time_adj = {{0, 0}, 0}; /* strict time adjustment */
+static nstime_t previous_time = {0, 0}; /* previous time */
static int find_dct2000_real_data(guint8 *buf);
+static void handle_chopping(chop_t chop, struct wtap_pkthdr *out_phdr,
+ const struct wtap_pkthdr *in_phdr, guint8 **buf,
+ gboolean adjlen);
static gchar *
-abs_time_to_str_with_sec_resolution(const struct wtap_nstime *abs_time)
+abs_time_to_str_with_sec_resolution(const nstime_t *abs_time)
{
struct tm *tmp;
- gchar *buf = g_malloc(16);
-
-#ifdef _MSC_VER
- /* calling localtime() 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(abs_time->secs > 2000000000) {
- tmp = NULL;
- } else
-#endif
+ gchar *buf = (gchar *)g_malloc(16);
+
tmp = localtime(&abs_time->secs);
+
if (tmp) {
g_snprintf(buf, 16, "%d%02d%02d%02d%02d%02d",
tmp->tm_year + 1900,
tmp->tm_hour,
tmp->tm_min,
tmp->tm_sec);
- } else
+ } else {
buf[0] = '\0';
+ }
return buf;
}
-static gchar*
-fileset_get_filename_by_pattern(guint idx, const struct wtap_nstime *time_val,
+static gchar *
+fileset_get_filename_by_pattern(guint idx, const struct wtap_pkthdr *phdr,
gchar *fprefix, gchar *fsuffix)
{
- gchar filenum[5+1];
+ 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);
- abs_str = g_strconcat(fprefix, "_", filenum, "_", timestr, fsuffix, NULL);
- g_free(timestr);
+ g_snprintf(filenum, sizeof(filenum), "%05u", idx % RINGBUFFER_MAX_NUM_FILES);
+ 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;
}
save_file = g_strdup(fname);
if (save_file == NULL) {
- fprintf(stderr, "editcap: Out of memory\n");
- return FALSE;
+ fprintf(stderr, "editcap: Out of memory\n");
+ return FALSE;
}
last_pathsep = strrchr(save_file, G_DIR_SEPARATOR);
pfx = strrchr(save_file,'.');
if (pfx != NULL && (last_pathsep == NULL || pfx > last_pathsep)) {
- /* The pathname has a "." in it, and it's in the last component
- of the pathname (because there is either only one component,
- i.e. last_pathsep is null as there are no path separators,
- or the "." is after the path separator before the last
- component.
-
- Treat it as a separator between the rest of the file name and
- the file name suffix, and arrange that the names given to the
- ring buffer files have the specified suffix, i.e. put the
- changing part of the name *before* the suffix. */
- pfx[0] = '\0';
- *fprefix = g_strdup(save_file);
- pfx[0] = '.'; /* restore capfile_name */
- *fsuffix = g_strdup(pfx);
+ /* The pathname has a "." in it, and it's in the last component
+ * of the pathname (because there is either only one component,
+ * i.e. last_pathsep is null as there are no path separators,
+ * or the "." is after the path separator before the last
+ * component.
+
+ * Treat it as a separator between the rest of the file name and
+ * the file name suffix, and arrange that the names given to the
+ * ring buffer files have the specified suffix, i.e. put the
+ * changing part of the name *before* the suffix. */
+ pfx[0] = '\0';
+ *fprefix = g_strdup(save_file);
+ pfx[0] = '.'; /* restore capfile_name */
+ *fsuffix = g_strdup(pfx);
} else {
- /* Either there's no "." in the pathname, or it's in a directory
- component, so the last component has no suffix. */
- *fprefix = g_strdup(save_file);
- *fsuffix = NULL;
+ /* Either there's no "." in the pathname, or it's in a directory
+ * component, so the last component has no suffix. */
+ *fprefix = g_strdup(save_file);
+ *fsuffix = NULL;
}
g_free(save_file);
return TRUE;
static gboolean
add_selection(char *sel)
{
- char *locn;
- char *next;
-
- if (++max_selected >= MAX_SELECTIONS) {
- /* Let the user know we stopped selecting */
- printf("Out of room for packet selections!\n");
- return(FALSE);
- }
-
- printf("Add_Selected: %s\n", sel);
-
- if ((locn = strchr(sel, '-')) == NULL) { /* No dash, so a single number? */
+ char *locn;
+ char *next;
- printf("Not inclusive ...");
-
- selectfrm[max_selected].inclusive = 0;
- selectfrm[max_selected].first = atoi(sel);
+ if (++max_selected >= MAX_SELECTIONS) {
+ /* Let the user know we stopped selecting */
+ fprintf(stderr, "Out of room for packet selections!\n");
+ return(FALSE);
+ }
- printf(" %i\n", selectfrm[max_selected].first);
+ if (verbose)
+ fprintf(stderr, "Add_Selected: %s\n", sel);
- }
- else {
+ if ((locn = strchr(sel, '-')) == NULL) { /* No dash, so a single number? */
+ if (verbose)
+ fprintf(stderr, "Not inclusive ...");
- printf("Inclusive ...");
+ selectfrm[max_selected].inclusive = 0;
+ selectfrm[max_selected].first = atoi(sel);
- next = locn + 1;
- selectfrm[max_selected].inclusive = 1;
- selectfrm[max_selected].first = atoi(sel);
- selectfrm[max_selected].second = atoi(next);
+ if (verbose)
+ fprintf(stderr, " %i\n", selectfrm[max_selected].first);
+ } else {
+ if (verbose)
+ fprintf(stderr, "Inclusive ...");
- printf(" %i, %i\n", selectfrm[max_selected].first, selectfrm[max_selected].second);
+ next = locn + 1;
+ selectfrm[max_selected].inclusive = 1;
+ selectfrm[max_selected].first = atoi(sel);
+ selectfrm[max_selected].second = atoi(next);
- }
+ if (verbose)
+ fprintf(stderr, " %i, %i\n", selectfrm[max_selected].first,
+ selectfrm[max_selected].second);
+ }
- return(TRUE);
+ return(TRUE);
}
/* Was the packet selected? */
static int
selected(int recno)
{
- int i = 0;
-
- for (i = 0; i<= max_selected; i++) {
+ int i;
- if (selectfrm[i].inclusive) {
- if (selectfrm[i].first <= recno && selectfrm[i].second >= recno)
- return 1;
- }
- else {
- if (recno == selectfrm[i].first)
- return 1;
+ for (i = 0; i <= max_selected; i++) {
+ if (selectfrm[i].inclusive) {
+ if (selectfrm[i].first <= recno && selectfrm[i].second >= recno)
+ return 1;
+ } else {
+ if (recno == selectfrm[i].first)
+ return 1;
+ }
}
- }
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)
{
- char *frac, *end;
- long val;
- size_t frac_digits;
-
- if (!optarg_str_p)
- return;
-
- /* skip leading whitespace */
- while (*optarg_str_p == ' ' || *optarg_str_p == '\t') {
- optarg_str_p++;
- }
-
- /* check for a negative adjustment */
- if (*optarg_str_p == '-') {
- time_adj.is_negative = 1;
- optarg_str_p++;
- }
-
- /* collect whole number of seconds, if any */
- if (*optarg_str_p == '.') { /* only fractional (i.e., .5 is ok) */
- val = 0;
- frac = optarg_str_p;
- } else {
- val = strtol(optarg_str_p, &frac, 10);
- if (frac == NULL || frac == optarg_str_p || val == LONG_MIN || val == LONG_MAX) {
- fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
- optarg_str_p);
- exit(1);
- }
- if (val < 0) { /* implies '--' since we caught '-' above */
- fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
- optarg_str_p);
- exit(1);
- }
- }
- time_adj.tv.tv_sec = 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 */
- val = strtol(&(frac[1]), &end, 10);
+ char *frac, *end;
+ long val;
+ size_t frac_digits;
+
+ if (!optarg_str_p)
+ return;
+
+ /* skip leading whitespace */
+ while (*optarg_str_p == ' ' || *optarg_str_p == '\t')
+ optarg_str_p++;
+
+ /* check for a negative adjustment */
+ if (*optarg_str_p == '-') {
+ time_adj.is_negative = 1;
+ optarg_str_p++;
}
- if (*frac != '.' || end == NULL || end == frac
- || val < 0 || val > ONE_MILLION || val == LONG_MIN || val == LONG_MAX) {
- fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
- optarg_str_p);
- exit(1);
+
+ /* collect whole number of seconds, if any */
+ if (*optarg_str_p == '.') { /* only fractional (i.e., .5 is ok) */
+ val = 0;
+ frac = optarg_str_p;
+ } else {
+ val = strtol(optarg_str_p, &frac, 10);
+ if (frac == NULL || frac == optarg_str_p
+ || val == LONG_MIN || val == LONG_MAX) {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
+ optarg_str_p);
+ exit(1);
+ }
+ if (val < 0) { /* implies '--' since we caught '-' above */
+ fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
+ optarg_str_p);
+ exit(1);
+ }
}
- }
- else {
- return; /* no fractional digits */
- }
-
- /* adjust fractional portion from fractional to numerator
- * e.g., in "1.5" from 5 to 500000 since .5*10^6 = 500000 */
- 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 */
- val *= 10;
- frac_digits++;
+ 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 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_BILLION || val == LONG_MIN || val == LONG_MAX) {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
+ optarg_str_p);
+ exit(1);
+ }
+ } else {
+ return; /* no fractional digits */
}
- }
- time_adj.tv.tv_usec = val;
+
+ /* adjust fractional portion from fractional to numerator
+ * 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 < 9) { /* this is frac of 10^9 */
+ val *= 10;
+ frac_digits++;
+ }
+ }
+ time_adj.tv.nsecs = (int)val;
}
static void
set_strict_time_adj(char *optarg_str_p)
{
- char *frac, *end;
- long val;
- size_t frac_digits;
-
- if (!optarg_str_p)
- return;
-
- /* skip leading whitespace */
- while (*optarg_str_p == ' ' || *optarg_str_p == '\t') {
- optarg_str_p++;
- }
-
- /*
- * check for a negative adjustment
- * A negative strict adjustment value is a flag
- * to adjust all frames by the specifed delta time.
- */
- if (*optarg_str_p == '-') {
- strict_time_adj.is_negative = 1;
- optarg_str_p++;
- }
-
- /* collect whole number of seconds, if any */
- if (*optarg_str_p == '.') { /* only fractional (i.e., .5 is ok) */
- val = 0;
- frac = optarg_str_p;
- } else {
- val = strtol(optarg_str_p, &frac, 10);
- if (frac == NULL || frac == optarg_str_p || val == LONG_MIN || val == LONG_MAX) {
- fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
- optarg_str_p);
- exit(1);
- }
- if (val < 0) { /* implies '--' since we caught '-' above */
- fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
- optarg_str_p);
- exit(1);
- }
- }
- strict_time_adj.tv.tv_sec = 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 */
- val = strtol(&(frac[1]), &end, 10);
+ char *frac, *end;
+ long val;
+ size_t frac_digits;
+
+ if (!optarg_str_p)
+ return;
+
+ /* skip leading whitespace */
+ while (*optarg_str_p == ' ' || *optarg_str_p == '\t')
+ optarg_str_p++;
+
+ /*
+ * check for a negative adjustment
+ * A negative strict adjustment value is a flag
+ * to adjust all frames by the specifed delta time.
+ */
+ if (*optarg_str_p == '-') {
+ strict_time_adj.is_negative = 1;
+ optarg_str_p++;
}
- if (*frac != '.' || end == NULL || end == frac
- || val < 0 || val > ONE_MILLION || val == LONG_MIN || val == LONG_MAX) {
- fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
- optarg_str_p);
- exit(1);
+
+ /* collect whole number of seconds, if any */
+ if (*optarg_str_p == '.') { /* only fractional (i.e., .5 is ok) */
+ val = 0;
+ frac = optarg_str_p;
+ } else {
+ val = strtol(optarg_str_p, &frac, 10);
+ if (frac == NULL || frac == optarg_str_p
+ || val == LONG_MIN || val == LONG_MAX) {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
+ optarg_str_p);
+ exit(1);
+ }
+ if (val < 0) { /* implies '--' since we caught '-' above */
+ fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
+ optarg_str_p);
+ exit(1);
+ }
}
- }
- else {
- return; /* no fractional digits */
- }
-
- /* adjust fractional portion from fractional to numerator
- * e.g., in "1.5" from 5 to 500000 since .5*10^6 = 500000 */
- 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 */
- val *= 10;
- frac_digits++;
+ 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 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_BILLION || val == LONG_MIN || val == LONG_MAX) {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
+ optarg_str_p);
+ exit(1);
+ }
+ } else {
+ return; /* no fractional digits */
}
- }
- strict_time_adj.tv.tv_usec = val;
+
+ /* adjust fractional portion from fractional to numerator
+ * 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 < 9) { /* this is frac of 10^9 */
+ val *= 10;
+ frac_digits++;
+ }
+ }
+ strict_time_adj.tv.nsecs = (int)val;
}
static void
set_rel_time(char *optarg_str_p)
{
- char *frac, *end;
- long val;
- size_t frac_digits;
-
- if (!optarg_str_p)
- return;
-
- /* skip leading whitespace */
- while (*optarg_str_p == ' ' || *optarg_str_p == '\t') {
- optarg_str_p++;
- }
-
- /* ignore negative adjustment */
- if (*optarg_str_p == '-') {
- optarg_str_p++;
- }
-
- /* collect whole number of seconds, if any */
- if (*optarg_str_p == '.') { /* only fractional (i.e., .5 is ok) */
- val = 0;
- frac = optarg_str_p;
- } else {
- val = strtol(optarg_str_p, &frac, 10);
- if (frac == NULL || frac == optarg_str_p || val == LONG_MIN || val == LONG_MAX) {
- fprintf(stderr, "1: editcap: \"%s\" isn't a valid rel time value\n",
- optarg_str_p);
- exit(1);
- }
- if (val < 0) { /* implies '--' since we caught '-' above */
- fprintf(stderr, "2: editcap: \"%s\" isn't a valid rel time value\n",
- optarg_str_p);
- exit(1);
- }
- }
- relative_time_window.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 9 fractional digits truncate to 9 */
- if((end - &(frac[1])) > 9) {
- frac[10] = 't'; /* 't' for truncate */
- val = strtol(&(frac[1]), &end, 10);
+ char *frac, *end;
+ long val;
+ size_t frac_digits;
+
+ if (!optarg_str_p)
+ return;
+
+ /* skip leading whitespace */
+ while (*optarg_str_p == ' ' || *optarg_str_p == '\t')
+ optarg_str_p++;
+
+ /* ignore negative adjustment */
+ if (*optarg_str_p == '-')
+ optarg_str_p++;
+
+ /* collect whole number of seconds, if any */
+ if (*optarg_str_p == '.') { /* only fractional (i.e., .5 is ok) */
+ val = 0;
+ frac = optarg_str_p;
+ } else {
+ val = strtol(optarg_str_p, &frac, 10);
+ if (frac == NULL || frac == optarg_str_p
+ || val == LONG_MIN || val == LONG_MAX) {
+ fprintf(stderr, "1: editcap: \"%s\" isn't a valid rel time value\n",
+ optarg_str_p);
+ exit(1);
+ }
+ if (val < 0) { /* implies '--' since we caught '-' above */
+ fprintf(stderr, "2: editcap: \"%s\" isn't a valid rel time value\n",
+ optarg_str_p);
+ exit(1);
+ }
}
- if (*frac != '.' || end == NULL || end == frac
- || val < 0 || val > ONE_BILLION || val == LONG_MIN || val == LONG_MAX) {
- fprintf(stderr, "3: editcap: \"%s\" isn't a valid rel time value\n",
- optarg_str_p);
- exit(1);
+ relative_time_window.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 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_BILLION || val == LONG_MIN || val == LONG_MAX) {
+ fprintf(stderr, "3: editcap: \"%s\" isn't a valid rel time value\n",
+ optarg_str_p);
+ exit(1);
+ }
+ } else {
+ return; /* no fractional digits */
}
- }
- else {
- return; /* no fractional digits */
- }
-
- /* adjust fractional portion from fractional to numerator
- * 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 < 9) { /* this is frac of 10^9 */
- val *= 10;
- frac_digits++;
+
+ /* adjust fractional portion from fractional to numerator
+ * 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 < 9) { /* this is frac of 10^9 */
+ val *= 10;
+ frac_digits++;
+ }
}
- }
- relative_time_window.nsecs = val;
+ relative_time_window.nsecs = (int)val;
}
static gboolean
is_duplicate(guint8* fd, guint32 len) {
- int i;
- md5_state_t ms;
+ 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;
- cur_dup_entry++;
- if (cur_dup_entry >= dup_window)
- cur_dup_entry = 0;
+ new_fd = &fd[ignored_bytes];
+ new_len = len - (ignored_bytes);
- /* Calculate our digest */
- md5_init(&ms);
- md5_append(&ms, fd, len);
- md5_finish(&ms, fd_hash[cur_dup_entry].digest);
+ cur_dup_entry++;
+ if (cur_dup_entry >= dup_window)
+ cur_dup_entry = 0;
- fd_hash[cur_dup_entry].len = len;
+ /* Calculate our digest */
+ md5_init(&ms);
+ md5_append(&ms, new_fd, new_len);
+ md5_finish(&ms, fd_hash[cur_dup_entry].digest);
- /* Look for duplicates */
- for (i = 0; i < dup_window; i++) {
- if (i == cur_dup_entry)
- continue;
+ fd_hash[cur_dup_entry].len = len;
+
+ /* Look for duplicates */
+ for (i = 0; i < dup_window; i++) {
+ if (i == cur_dup_entry)
+ continue;
- if (fd_hash[i].len == fd_hash[cur_dup_entry].len &&
- memcmp(fd_hash[i].digest, fd_hash[cur_dup_entry].digest, 16) == 0) {
- return TRUE;
+ if (fd_hash[i].len == fd_hash[cur_dup_entry].len
+ && memcmp(fd_hash[i].digest, fd_hash[cur_dup_entry].digest, 16) == 0) {
+ return TRUE;
+ }
}
- }
- return FALSE;
+ return FALSE;
}
static gboolean
is_duplicate_rel_time(guint8* fd, guint32 len, const nstime_t *current) {
- int i;
- md5_state_t ms;
-
- 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_finish(&ms, fd_hash[cur_dup_entry].digest);
-
- fd_hash[cur_dup_entry].len = len;
- fd_hash[cur_dup_entry].time.secs = current->secs;
- fd_hash[cur_dup_entry].time.nsecs = current->nsecs;
-
- /*
- * Look for relative time related duplicates.
- * This is hopefully a reasonably efficient mechanism for
- * finding duplicates by rel time in the fd_hash[] cache.
- * We check starting from the most recently added hash
- * entries and work backwards towards older packets.
- * This approach allows the dup test to be terminated
- * when the relative time of a cached entry is found to
- * be beyond the dup time window.
- *
- * Of course this assumes that the input trace file is
- * "well-formed" in the sense that the packet timestamps are
- * in strict chronologically increasing order (which is NOT
- * always the case!!).
- *
- * The fd_hash[] table was deliberatly created large (1,000,000).
- * Looking for time related duplicates in large trace files with
- * non-fractional dup time window values can potentially take
- * a long time to complete.
- */
-
- for (i = cur_dup_entry - 1;; i--) {
- nstime_t delta;
- int cmp;
-
- if (i < 0) {
- i = dup_window - 1;
- }
-
- if (i == cur_dup_entry) {
- /*
- * We've decremented back to where we started.
- * Check no more!
- */
- break;
- }
+ 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, new_fd, new_len);
+ md5_finish(&ms, fd_hash[cur_dup_entry].digest);
+
+ fd_hash[cur_dup_entry].len = len;
+ fd_hash[cur_dup_entry].time.secs = current->secs;
+ fd_hash[cur_dup_entry].time.nsecs = current->nsecs;
+
+ /*
+ * Look for relative time related duplicates.
+ * This is hopefully a reasonably efficient mechanism for
+ * finding duplicates by rel time in the fd_hash[] cache.
+ * We check starting from the most recently added hash
+ * entries and work backwards towards older packets.
+ * This approach allows the dup test to be terminated
+ * when the relative time of a cached entry is found to
+ * be beyond the dup time window.
+ *
+ * Of course this assumes that the input trace file is
+ * "well-formed" in the sense that the packet timestamps are
+ * in strict chronologically increasing order (which is NOT
+ * always the case!!).
+ *
+ * The fd_hash[] table was deliberately created large (1,000,000).
+ * Looking for time related duplicates in large trace files with
+ * non-fractional dup time window values can potentially take
+ * a long time to complete.
+ */
+
+ for (i = cur_dup_entry - 1;; i--) {
+ nstime_t delta;
+ int cmp;
+
+ if (i < 0)
+ i = dup_window - 1;
+
+ if (i == cur_dup_entry) {
+ /*
+ * We've decremented back to where we started.
+ * Check no more!
+ */
+ break;
+ }
- if (nstime_is_unset(&(fd_hash[i].time))) {
- /*
- * We've decremented to an unused fd_hash[] entry.
- * Check no more!
- */
- break;
- }
+ if (nstime_is_unset(&(fd_hash[i].time))) {
+ /*
+ * We've decremented to an unused fd_hash[] entry.
+ * Check no more!
+ */
+ break;
+ }
- nstime_delta(&delta, current, &fd_hash[i].time);
-
- if(delta.secs < 0 || delta.nsecs < 0)
- {
- /*
- * A negative delta implies that the current packet
- * has an absolute timestamp less than the cached 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).
- *
- * There are several possible ways to deal with this:
- * 1. 'continue' dup checking with the next cached frame.
- * 2. 'break' from looking for a duplicate of the current frame.
- * 3. Take the absolute value of the delta and see if that
- * falls within the specifed dup time window.
- *
- * Currently this code does option 1. But it would pretty
- * easy to add yet-another-editcap-option to select one of
- * the other behaviors for dealing with out-of-sequence
- * packets.
- */
- continue;
- }
+ nstime_delta(&delta, current, &fd_hash[i].time);
+
+ if (delta.secs < 0 || delta.nsecs < 0) {
+ /*
+ * A negative delta implies that the current packet
+ * has an absolute timestamp less than the cached 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).
+ *
+ * There are several possible ways to deal with this:
+ * 1. 'continue' dup checking with the next cached frame.
+ * 2. 'break' from looking for a duplicate of the current frame.
+ * 3. Take the absolute value of the delta and see if that
+ * falls within the specifed dup time window.
+ *
+ * Currently this code does option 1. But it would pretty
+ * easy to add yet-another-editcap-option to select one of
+ * the other behaviors for dealing with out-of-sequence
+ * packets.
+ */
+ continue;
+ }
- cmp = nstime_cmp(&delta, &relative_time_window);
-
- if(cmp > 0) {
- /*
- * The delta time indicates that we are now looking at
- * cached packets beyond the specified dup time window.
- * Check no more!
- */
- break;
- } else if (fd_hash[i].len == fd_hash[cur_dup_entry].len &&
- memcmp(fd_hash[i].digest, fd_hash[cur_dup_entry].digest, 16) == 0) {
- return TRUE;
+ cmp = nstime_cmp(&delta, &relative_time_window);
+
+ if (cmp > 0) {
+ /*
+ * The delta time indicates that we are now looking at
+ * cached packets beyond the specified dup time window.
+ * Check no more!
+ */
+ break;
+ } else if (fd_hash[i].len == fd_hash[cur_dup_entry].len
+ && memcmp(fd_hash[i].digest, fd_hash[cur_dup_entry].digest, 16) == 0) {
+ return TRUE;
+ }
}
- }
- return FALSE;
+ return FALSE;
}
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 SVNVERSION
- " (" SVNVERSION " from " SVNPATH ")"
-#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, "<infile> and <outfile> must both be present.\n");
- fprintf(output, "A single packet or a range of packets can be selected.\n");
- fprintf(output, "\n");
- fprintf(output, "Packet selection:\n");
- fprintf(output, " -r keep the selected packets; default is to delete them.\n");
- fprintf(output, " -A <start time> only output packets whose timestamp is after (or equal\n");
- fprintf(output, " to) the given time (format as YYYY-MM-DD hh:mm:ss).\n");
- fprintf(output, " -B <stop time> only output packets whose timestamp is before the\n");
- fprintf(output, " given time (format as YYYY-MM-DD hh:mm:ss).\n");
- fprintf(output, "\n");
- fprintf(output, "Duplicate packet removal:\n");
- fprintf(output, " -d remove packet if duplicate (window == %d).\n", DEFAULT_DUP_DEPTH);
- fprintf(output, " -D <dup window> remove packet if duplicate; configurable <dup window>\n");
- fprintf(output, " Valid <dup window> values are 0 to %d.\n", MAX_DUP_DEPTH);
- fprintf(output, " NOTE: A <dup window> of 0 with -v (verbose option) is\n");
- fprintf(output, " useful to print MD5 hashes.\n");
- fprintf(output, " -w <dup time window> remove packet if duplicate packet is found EQUAL TO OR\n");
- fprintf(output, " LESS THAN <dup time window> prior to current packet.\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, " 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");
- fprintf(output, " desired effect if combined with the -d, -D or -w.\n");
- fprintf(output, "\n");
- fprintf(output, "Packet manipulation:\n");
- fprintf(output, " -s <snaplen> truncate each packet to max. <snaplen> bytes of data.\n");
- fprintf(output, " -C <choplen> chop each packet by <choplen> bytes. Positive values\n");
- fprintf(output, " chop at the packet beginning, negative values at the\n");
- fprintf(output, " packet end.\n");
- fprintf(output, " -t <time adjustment> adjust the timestamp of each packet;\n");
- fprintf(output, " <time adjustment> is in relative seconds (e.g. -0.5).\n");
- fprintf(output, " -S <strict adjustment> adjust timestamp of packets if necessary to insure\n");
- fprintf(output, " strict chronological increasing order. The <strict\n");
- fprintf(output, " adjustment> is specified in relative seconds with\n");
- fprintf(output, " values of 0 or 0.000001 being the most reasonable.\n");
- fprintf(output, " A negative adjustment value will modify timestamps so\n");
- fprintf(output, " that each packet's delta time is the absolute value\n");
- fprintf(output, " of the adjustment specified. A value of -0 will set\n");
- fprintf(output, " all packets to the timestamp of the first packet.\n");
- fprintf(output, " -E <error probability> set the probability (between 0.0 and 1.0 incl.)\n");
- fprintf(output, " that a particular packet byte will be randomly changed.\n");
- fprintf(output, "\n");
- fprintf(output, "Output File(s):\n");
- fprintf(output, " -c <packets per file> split the packet output to different files\n");
- fprintf(output, " based on uniform packet counts\n");
- fprintf(output, " with a maximum of <packets per file> each.\n");
- fprintf(output, " -i <seconds per file> split the packet output to different files\n");
- fprintf(output, " based on uniform time intervals\n");
- fprintf(output, " with a maximum of <seconds per file> each.\n");
- fprintf(output, " -F <capture type> set the output file type; default is libpcap.\n");
- fprintf(output, " an empty \"-F\" option will list the file types.\n");
- fprintf(output, " -T <encap type> set the output file encapsulation type;\n");
- fprintf(output, " default is the same as the input file.\n");
- fprintf(output, " an empty \"-T\" option will list the encapsulation types.\n");
- fprintf(output, "\n");
- fprintf(output, "Miscellaneous:\n");
- fprintf(output, " -h display this help and exit.\n");
- fprintf(output, " -v verbose output.\n");
- fprintf(output, " If -v is used with any of the 'Duplicate Packet\n");
- fprintf(output, " Removal' options (-d, -D or -w) then Packet lengths\n");
- fprintf(output, " and MD5 hashes are printed to standard-out.\n");
- fprintf(output, "\n");
+ fprintf(output, "\n");
+ fprintf(output, "Usage: editcap [options] ... <infile> <outfile> [ <packet#>[-<packet#>] ... ]\n");
+ fprintf(output, "\n");
+ fprintf(output, "<infile> and <outfile> must both be present.\n");
+ fprintf(output, "A single packet or a range of packets can be selected.\n");
+ fprintf(output, "\n");
+ fprintf(output, "Packet selection:\n");
+ fprintf(output, " -r keep the selected packets; default is to delete them.\n");
+ fprintf(output, " -A <start time> only output packets whose timestamp is after (or equal\n");
+ fprintf(output, " to) the given time (format as YYYY-MM-DD hh:mm:ss).\n");
+ fprintf(output, " -B <stop time> only output packets whose timestamp is before the\n");
+ fprintf(output, " given time (format as YYYY-MM-DD hh:mm:ss).\n");
+ fprintf(output, "\n");
+ fprintf(output, "Duplicate packet removal:\n");
+ fprintf(output, " -d remove packet if duplicate (window == %d).\n", DEFAULT_DUP_DEPTH);
+ fprintf(output, " -D <dup window> remove packet if duplicate; configurable <dup window>\n");
+ fprintf(output, " Valid <dup window> values are 0 to %d.\n", MAX_DUP_DEPTH);
+ fprintf(output, " NOTE: A <dup window> of 0 with -v (verbose option) is\n");
+ fprintf(output, " useful to print MD5 hashes.\n");
+ fprintf(output, " -w <dup time window> remove packet if duplicate packet is found EQUAL TO OR\n");
+ fprintf(output, " LESS THAN <dup time window> prior to current packet.\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");
+ fprintf(output, " desired effect if combined with the -d, -D or -w.\n");
+ fprintf(output, "\n");
+ fprintf(output, "Packet manipulation:\n");
+ fprintf(output, " -s <snaplen> truncate each packet to max. <snaplen> bytes of data.\n");
+ fprintf(output, " -C [offset:]<choplen> chop each packet by <choplen> bytes. Positive values\n");
+ fprintf(output, " chop at the packet beginning, negative values at the\n");
+ fprintf(output, " packet end. If an optional offset precedes the length,\n");
+ fprintf(output, " then the bytes chopped will be offset from that value.\n");
+ fprintf(output, " Positive offsets are from the packet beginning,\n");
+ fprintf(output, " negative offsets are from the packet end. You can use\n");
+ fprintf(output, " this option more than once, allowing up to 2 chopping\n");
+ fprintf(output, " regions within a packet provided that at least 1\n");
+ fprintf(output, " choplen is positive and at least 1 is negative.\n");
+ fprintf(output, " -L adjust the frame length when chopping and/or snapping\n");
+ fprintf(output, " -t <time adjustment> adjust the timestamp of each packet;\n");
+ fprintf(output, " <time adjustment> is in relative seconds (e.g. -0.5).\n");
+ fprintf(output, " -S <strict adjustment> adjust timestamp of packets if necessary to insure\n");
+ fprintf(output, " strict chronological increasing order. The <strict\n");
+ fprintf(output, " adjustment> is specified in relative seconds with\n");
+ fprintf(output, " values of 0 or 0.000001 being the most reasonable.\n");
+ fprintf(output, " A negative adjustment value will modify timestamps so\n");
+ fprintf(output, " that each packet's delta time is the absolute value\n");
+ fprintf(output, " of the adjustment specified. A value of -0 will set\n");
+ fprintf(output, " all packets to the timestamp of the first packet.\n");
+ fprintf(output, " -E <error probability> set the probability (between 0.0 and 1.0 incl.) that\n");
+ fprintf(output, " a particular packet byte will be randomly changed.\n");
+ fprintf(output, "\n");
+ fprintf(output, "Output File(s):\n");
+ fprintf(output, " -c <packets per file> split the packet output to different files based on\n");
+ fprintf(output, " uniform packet counts with a maximum of\n");
+ fprintf(output, " <packets per file> each.\n");
+ fprintf(output, " -i <seconds per file> split the packet output to different files based on\n");
+ fprintf(output, " uniform time intervals with a maximum of\n");
+ fprintf(output, " <seconds per file> each.\n");
+ fprintf(output, " -F <capture type> set the output file type; default is pcapng. An empty\n");
+ fprintf(output, " \"-F\" option will list the file types.\n");
+ fprintf(output, " -T <encap type> set the output file encapsulation type; default is the\n");
+ fprintf(output, " same as the input file. An empty \"-T\" option will\n");
+ fprintf(output, " list the encapsulation types.\n");
+ fprintf(output, "\n");
+ fprintf(output, "Miscellaneous:\n");
+ fprintf(output, " -h display this help and exit.\n");
+ fprintf(output, " -v verbose output.\n");
+ fprintf(output, " If -v is used with any of the 'Duplicate Packet\n");
+ fprintf(output, " Removal' options (-d, -D or -w) then Packet lengths\n");
+ fprintf(output, " and MD5 hashes are printed to standard-error.\n");
+ fprintf(output, "\n");
}
struct string_elem {
static gint
string_compare(gconstpointer a, gconstpointer b)
{
- return strcmp(((struct string_elem *)a)->sstr,
- ((struct string_elem *)b)->sstr);
+ return strcmp(((const struct string_elem *)a)->sstr,
+ ((const struct string_elem *)b)->sstr);
+}
+
+static gint
+string_nat_compare(gconstpointer a, gconstpointer b)
+{
+ return ws_ascii_strnatcmp(((const struct string_elem *)a)->sstr,
+ ((const struct string_elem *)b)->sstr);
}
static void
struct string_elem *captypes;
GSList *list = NULL;
- captypes = g_malloc(sizeof(struct string_elem) * WTAP_NUM_FILE_TYPES);
+ captypes = g_new(struct string_elem,WTAP_NUM_FILE_TYPES_SUBTYPES);
fprintf(stderr, "editcap: The available capture file types for the \"-F\" flag are:\n");
- for (i = 0; i < WTAP_NUM_FILE_TYPES; i++) {
- if (wtap_dump_can_open(i)) {
- captypes[i].sstr = wtap_file_type_short_string(i);
- captypes[i].lstr = wtap_file_type_string(i);
- list = g_slist_insert_sorted(list, &captypes[i], string_compare);
- }
+ for (i = 0; i < WTAP_NUM_FILE_TYPES_SUBTYPES; i++) {
+ if (wtap_dump_can_open(i)) {
+ captypes[i].sstr = wtap_file_type_subtype_short_string(i);
+ captypes[i].lstr = wtap_file_type_subtype_string(i);
+ list = g_slist_insert_sorted(list, &captypes[i], string_compare);
+ }
}
g_slist_foreach(list, string_elem_print, NULL);
g_slist_free(list);
struct string_elem *encaps;
GSList *list = NULL;
- encaps = g_malloc(sizeof(struct string_elem) * WTAP_NUM_ENCAP_TYPES);
+ encaps = (struct string_elem *)g_malloc(sizeof(struct string_elem) * WTAP_NUM_ENCAP_TYPES);
fprintf(stderr, "editcap: The available encapsulation types for the \"-T\" flag are:\n");
for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) {
encaps[i].sstr = wtap_encap_short_string(i);
if (encaps[i].sstr != NULL) {
encaps[i].lstr = wtap_encap_string(i);
- list = g_slist_insert_sorted(list, &encaps[i], string_compare);
+ list = g_slist_insert_sorted(list, &encaps[i], string_nat_compare);
}
}
g_slist_foreach(list, string_elem_print, NULL);
static void
failure_message(const char *msg_format _U_, va_list ap _U_)
{
- return;
}
#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[])
{
- wtap *wth;
- int i, j, err;
- gchar *err_info;
- int opt;
-
- char *p;
- guint32 snaplen = 0; /* No limit */
- int choplen = 0; /* No chop */
- wtap_dumper *pdh = NULL;
- int count = 1;
- unsigned duplicate_count = 0;
- gint64 data_offset;
- struct wtap_pkthdr snap_phdr;
- const struct wtap_pkthdr *phdr;
- int err_type;
- guint8 *buf;
- int split_packet_count = 0;
- int written_count = 0;
- char *filename = NULL;
- gboolean ts_okay = TRUE;
- int secs_per_block = 0;
- int block_cnt = 0;
- nstime_t block_start;
- gchar *fprefix = NULL;
- gchar *fsuffix = NULL;
+ GString *comp_info_str;
+ GString *runtime_info_str;
+ wtap *wth;
+ int i, j, err;
+ gchar *err_info;
+ int opt;
+ static const struct option long_options[] = {
+ {(char *)"help", no_argument, NULL, 'h'},
+ {(char *)"version", no_argument, NULL, 'V'},
+ {0, 0, 0, 0 }
+ };
+
+ char *p;
+ guint32 snaplen = 0; /* No limit */
+ chop_t chop = {0, 0, 0, 0, 0, 0}; /* No chop */
+ gboolean adjlen = FALSE;
+ wtap_dumper *pdh = NULL;
+ unsigned int count = 1;
+ unsigned int duplicate_count = 0;
+ gint64 data_offset;
+ int err_type;
+ guint8 *buf;
+ guint32 read_count = 0;
+ int split_packet_count = 0;
+ int written_count = 0;
+ char *filename = NULL;
+ gboolean ts_okay;
+ int secs_per_block = 0;
+ int block_cnt = 0;
+ nstime_t block_start;
+ gchar *fprefix = NULL;
+ gchar *fsuffix = NULL;
+
+ const struct wtap_pkthdr *phdr;
+ struct wtap_pkthdr snap_phdr;
+ wtapng_iface_descriptions_t *idb_inf;
+ wtapng_section_t *shb_hdr;
#ifdef HAVE_PLUGINS
- char* init_progfile_dir_error;
+ char* init_progfile_dir_error;
#endif
#ifdef _WIN32
- arg_list_utf_16to8(argc, argv);
+ arg_list_utf_16to8(argc, argv);
+ create_app_running_mutex();
#endif /* _WIN32 */
- /*
- * Get credential information for later use.
- */
- init_process_policies();
+ /* 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))) {
- 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();
- }
+ /* Register wiretap plugins */
+ if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) {
+ g_warning("editcap: init_progfile_dir(): %s", 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 */
- while ((opt = getopt(argc, argv, "A:B:c:C:dD:E:F:hrs:i:t:S:T:vw:")) !=-1) {
+ /* Process the options */
+ 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':
+ {
+ struct tm starttm;
- switch (opt) {
+ memset(&starttm,0,sizeof(struct tm));
- case 'E':
- err_prob = 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);
- exit(1);
- }
- srand( (unsigned int) (time(NULL) + getpid()) );
- break;
-
- case 'F':
- out_file_type = wtap_short_string_to_file_type(optarg);
- if (out_file_type < 0) {
- fprintf(stderr, "editcap: \"%s\" isn't a valid capture file type\n\n",
- optarg);
- list_capture_types();
- exit(1);
- }
- break;
-
- case 'c':
- split_packet_count = strtol(optarg, &p, 10);
- if (p == optarg || *p != '\0') {
- fprintf(stderr, "editcap: \"%s\" isn't a valid packet count\n",
- optarg);
- exit(1);
- }
- if (split_packet_count <= 0) {
- fprintf(stderr, "editcap: \"%d\" packet count must be larger than zero\n",
- split_packet_count);
- exit(1);
- }
- break;
-
- case 'C':
- choplen = strtol(optarg, &p, 10);
- if (p == optarg || *p != '\0') {
- fprintf(stderr, "editcap: \"%s\" isn't a valid chop length\n",
- optarg);
- exit(1);
- }
- break;
-
- case 'd':
- dup_detect = TRUE;
- dup_detect_by_time = FALSE;
- dup_window = DEFAULT_DUP_DEPTH;
- break;
-
- case 'D':
- dup_detect = TRUE;
- dup_detect_by_time = FALSE;
- dup_window = strtol(optarg, &p, 10);
- if (p == optarg || *p != '\0') {
- fprintf(stderr, "editcap: \"%s\" isn't a valid duplicate window value\n",
- optarg);
- exit(1);
- }
- if (dup_window < 0 || dup_window > MAX_DUP_DEPTH) {
- fprintf(stderr, "editcap: \"%d\" duplicate window value must be between 0 and %d inclusive.\n",
- dup_window, MAX_DUP_DEPTH);
- exit(1);
- }
- break;
-
- case 'w':
- dup_detect = FALSE;
- dup_detect_by_time = TRUE;
- dup_window = MAX_DUP_DEPTH;
- set_rel_time(optarg);
- break;
-
- case '?': /* Bad options if GNU getopt */
- switch(optopt) {
- case'F':
- list_capture_types();
- break;
- case'T':
- list_encap_types();
- break;
- default:
- usage(TRUE);
- }
- exit(1);
- break;
-
- case 'h':
- usage(FALSE);
- exit(1);
- break;
-
- case 'r':
- keep_em = !keep_em; /* Just invert */
- break;
-
- case 's':
- snaplen = strtol(optarg, &p, 10);
- if (p == optarg || *p != '\0') {
- fprintf(stderr, "editcap: \"%s\" isn't a valid snapshot length\n",
- optarg);
- exit(1);
- }
- break;
-
- case 't':
- set_time_adjustment(optarg);
- break;
-
- case 'S':
- set_strict_time_adj(optarg);
- do_strict_time_adjustment = TRUE;
- break;
-
- case 'T':
- out_frame_type = wtap_short_string_to_encap(optarg);
- if (out_frame_type < 0) {
- fprintf(stderr, "editcap: \"%s\" isn't a valid encapsulation type\n\n",
- optarg);
- list_encap_types();
- exit(1);
- }
- break;
+ if (!strptime(optarg,"%Y-%m-%d %T", &starttm)) {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid time format\n\n",
+ optarg);
+ exit(1);
+ }
- case 'v':
- verbose = !verbose; /* Just invert */
- break;
+ check_startstop = TRUE;
+ starttm.tm_isdst = -1;
- case 'i': /* break capture file based on time interval */
- secs_per_block = atoi(optarg);
- if(secs_per_block <= 0) {
- fprintf(stderr, "editcap: \"%s\" isn't a valid time interval\n\n", optarg);
- exit(1);
+ starttime = mktime(&starttm);
+ break;
}
- break;
- case 'A':
- {
- struct tm starttm;
+ case 'B':
+ {
+ struct tm stoptm;
- memset(&starttm,0,sizeof(struct tm));
+ memset(&stoptm,0,sizeof(struct tm));
- if(!strptime(optarg,"%Y-%m-%d %T",&starttm)) {
- fprintf(stderr, "editcap: \"%s\" isn't a valid time format\n\n", optarg);
- exit(1);
- }
-
- check_startstop = TRUE;
- starttm.tm_isdst = -1;
+ if (!strptime(optarg,"%Y-%m-%d %T", &stoptm)) {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid time format\n\n",
+ optarg);
+ exit(1);
+ }
+ check_startstop = TRUE;
+ stoptm.tm_isdst = -1;
+ stoptime = mktime(&stoptm);
+ break;
+ }
- starttime = mktime(&starttm);
- break;
- }
+ case 'c':
+ split_packet_count = (int)strtol(optarg, &p, 10);
+ if (p == optarg || *p != '\0') {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid packet count\n",
+ optarg);
+ exit(1);
+ }
+ if (split_packet_count <= 0) {
+ fprintf(stderr, "editcap: \"%d\" packet count must be larger than zero\n",
+ split_packet_count);
+ exit(1);
+ }
+ break;
+
+ case 'C':
+ {
+ int choplen = 0, chopoff = 0;
+
+ switch (sscanf(optarg, "%d:%d", &chopoff, &choplen)) {
+ case 1: /* only the chop length was specififed */
+ choplen = chopoff;
+ chopoff = 0;
+ break;
+
+ case 2: /* both an offset and chop length was specified */
+ break;
+
+ default:
+ fprintf(stderr, "editcap: \"%s\" isn't a valid chop length or offset:length\n",
+ optarg);
+ exit(1);
+ break;
+ }
- case 'B':
- {
- struct tm stoptm;
+ if (choplen > 0) {
+ chop.len_begin += choplen;
+ if (chopoff > 0)
+ chop.off_begin_pos += chopoff;
+ else
+ chop.off_begin_neg += chopoff;
+ } else if (choplen < 0) {
+ chop.len_end += choplen;
+ if (chopoff > 0)
+ chop.off_end_pos += chopoff;
+ else
+ chop.off_end_neg += chopoff;
+ }
+ break;
+ }
- memset(&stoptm,0,sizeof(struct tm));
+ case 'd':
+ dup_detect = TRUE;
+ dup_detect_by_time = FALSE;
+ dup_window = DEFAULT_DUP_DEPTH;
+ break;
+
+ case 'D':
+ dup_detect = TRUE;
+ dup_detect_by_time = FALSE;
+ dup_window = (int)strtol(optarg, &p, 10);
+ if (p == optarg || *p != '\0') {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid duplicate window value\n",
+ optarg);
+ exit(1);
+ }
+ if (dup_window < 0 || dup_window > MAX_DUP_DEPTH) {
+ fprintf(stderr, "editcap: \"%d\" duplicate window value must be between 0 and %d inclusive.\n",
+ dup_window, MAX_DUP_DEPTH);
+ exit(1);
+ }
+ break;
+
+ case 'E':
+ err_prob = 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);
+ exit(1);
+ }
+ srand( (unsigned int) (time(NULL) + getpid()) );
+ break;
+
+ case 'F':
+ out_file_type_subtype = wtap_short_string_to_file_type_subtype(optarg);
+ if (out_file_type_subtype < 0) {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid capture file type\n\n",
+ optarg);
+ list_capture_types();
+ exit(1);
+ }
+ break;
+
+ case 'h':
+ 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;
+
+ case 'i': /* break capture file based on time interval */
+ secs_per_block = atoi(optarg);
+ if (secs_per_block <= 0) {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid time interval\n\n",
+ optarg);
+ exit(1);
+ }
+ break;
- if(!strptime(optarg,"%Y-%m-%d %T",&stoptm)) {
- fprintf(stderr, "editcap: \"%s\" isn't a valid time format\n\n", optarg);
- exit(1);
- }
- check_startstop = TRUE;
- stoptm.tm_isdst = -1;
- stoptime = mktime(&stoptm);
- 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;
+
+ case 'r':
+ keep_em = !keep_em; /* Just invert */
+ break;
+
+ case 's':
+ snaplen = (guint32)strtol(optarg, &p, 10);
+ if (p == optarg || *p != '\0') {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid snapshot length\n",
+ optarg);
+ exit(1);
+ }
+ break;
+
+ case 'S':
+ set_strict_time_adj(optarg);
+ do_strict_time_adjustment = TRUE;
+ break;
+
+ case 't':
+ set_time_adjustment(optarg);
+ break;
+
+ case 'T':
+ out_frame_type = wtap_short_string_to_encap(optarg);
+ if (out_frame_type < 0) {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid encapsulation type\n\n",
+ optarg);
+ list_encap_types();
+ exit(1);
+ }
+ break;
+
+ case 'v':
+ 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;
+ dup_window = MAX_DUP_DEPTH;
+ set_rel_time(optarg);
+ break;
+
+ case '?': /* Bad options if GNU getopt */
+ switch(optopt) {
+ case'F':
+ list_capture_types();
+ break;
+ case'T':
+ list_encap_types();
+ break;
+ default:
+ print_usage(stderr);
+ break;
+ }
+ exit(1);
+ break;
+ }
}
- }
-
#ifdef DEBUG
- printf("Optind = %i, argc = %i\n", optind, argc);
+ fprintf(stderr, "Optind = %i, argc = %i\n", optind, argc);
#endif
- if ((argc - optind) < 1) {
-
- usage(TRUE);
- exit(1);
+ if ((argc - optind) < 1) {
+ print_usage(stderr);
+ exit(1);
+ }
- }
+ if (check_startstop && !stoptime) {
+ struct tm stoptm;
- if (check_startstop && !stoptime) {
- struct tm stoptm;
- /* XXX: will work until 2035 */
- memset(&stoptm,0,sizeof(struct tm));
- stoptm.tm_year = 135;
- stoptm.tm_mday = 31;
- stoptm.tm_mon = 11;
+ /* XXX: will work until 2035 */
+ memset(&stoptm,0,sizeof(struct tm));
+ stoptm.tm_year = 135;
+ stoptm.tm_mday = 31;
+ stoptm.tm_mon = 11;
- stoptime = mktime(&stoptm);
- }
+ stoptime = mktime(&stoptm);
+ }
- nstime_set_unset(&block_start);
+ nstime_set_unset(&block_start);
- if (starttime > stoptime) {
- fprintf(stderr, "editcap: start time is after the stop time\n");
- exit(1);
- }
+ if (starttime > stoptime) {
+ fprintf(stderr, "editcap: start time is after the stop time\n");
+ exit(1);
+ }
- if (split_packet_count > 0 && secs_per_block > 0) {
- fprintf(stderr, "editcap: can't split on both packet count and time interval\n");
- fprintf(stderr, "editcap: at the same time\n");
- exit(1);
- }
+ if (split_packet_count > 0 && secs_per_block > 0) {
+ fprintf(stderr, "editcap: can't split on both packet count and time interval\n");
+ fprintf(stderr, "editcap: at the same time\n");
+ exit(1);
+ }
- wth = wtap_open_offline(argv[optind], &err, &err_info, FALSE);
+ wth = wtap_open_offline(argv[optind], WTAP_TYPE_AUTO, &err, &err_info, FALSE);
- if (!wth) {
- fprintf(stderr, "editcap: Can't open %s: %s\n", argv[optind],
- wtap_strerror(err));
- switch (err) {
+ if (!wth) {
+ fprintf(stderr, "editcap: Can't open %s: %s\n", argv[optind],
+ wtap_strerror(err));
+ if (err_info != NULL) {
+ fprintf(stderr, "(%s)\n", err_info);
+ g_free(err_info);
+ }
+ exit(2);
+ }
- case WTAP_ERR_UNSUPPORTED:
- case WTAP_ERR_UNSUPPORTED_ENCAP:
- case WTAP_ERR_BAD_RECORD:
- fprintf(stderr, "(%s)\n", err_info);
- g_free(err_info);
- break;
+ if (verbose) {
+ fprintf(stderr, "File %s is a %s capture file.\n", argv[optind],
+ wtap_file_type_subtype_string(wtap_file_type_subtype(wth)));
}
- exit(2);
- }
+ shb_hdr = wtap_file_get_shb_info(wth);
+ idb_inf = wtap_file_get_idb_info(wth);
- if (verbose) {
- fprintf(stderr, "File %s is a %s capture file.\n", argv[optind],
- wtap_file_type_string(wtap_file_type(wth)));
- }
+ /*
+ * Now, process the rest, if any ... we only write if there is an extra
+ * argument or so ...
+ */
- /*
- * Now, process the rest, if any ... we only write if there is an extra
- * argument or so ...
- */
+ if ((argc - optind) >= 2) {
+ if (out_frame_type == -2)
+ out_frame_type = wtap_file_encap(wth);
- if ((argc - optind) >= 2) {
+ for (i = optind + 2; i < argc; i++)
+ if (add_selection(argv[i]) == FALSE)
+ break;
- if (out_frame_type == -2)
- out_frame_type = wtap_file_encap(wth);
+ if (dup_detect || dup_detect_by_time) {
+ for (i = 0; i < dup_window; i++) {
+ memset(&fd_hash[i].digest, 0, 16);
+ fd_hash[i].len = 0;
+ nstime_set_unset(&fd_hash[i].time);
+ }
+ }
- for (i = optind + 2; i < argc; i++)
- if (add_selection(argv[i]) == FALSE)
- break;
+ while (wtap_read(wth, &err, &err_info, &data_offset)) {
+ read_count++;
- if (dup_detect || dup_detect_by_time) {
- for (i = 0; i < dup_window; i++) {
- memset(&fd_hash[i].digest, 0, 16);
- fd_hash[i].len = 0;
- nstime_set_unset(&fd_hash[i].time);
- }
- }
+ phdr = wtap_phdr(wth);
- while (wtap_read(wth, &err, &err_info, &data_offset)) {
- 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 (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);
- } else
- filename = g_strdup(argv[optind+1]);
-
- pdh = wtap_dump_open(filename, out_file_type, out_frame_type,
- snaplen ? MIN(snaplen, wtap_snapshot_length(wth)) : wtap_snapshot_length(wth),
- FALSE /* compressed */, &err);
- if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n", filename,
- wtap_strerror(err));
- exit(2);
- }
- }
+ 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);
- g_assert(filename);
+ filename = fileset_get_filename_by_pattern(block_cnt++, phdr, fprefix, fsuffix);
+ } else {
+ filename = g_strdup(argv[optind+1]);
+ }
+ 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 we don't have an application name add Editcap */
+ if (shb_hdr->shb_user_appl == NULL) {
+ shb_hdr->shb_user_appl = g_strdup("Editcap " VERSION);
+ }
- 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);
-
- if (verbose) {
- fprintf(stderr, "Continuing writing in file %s\n", filename);
- }
-
- pdh = wtap_dump_open(filename, out_file_type, out_frame_type,
- snaplen ? MIN(snaplen, wtap_snapshot_length(wth)) : wtap_snapshot_length(wth),
- FALSE /* compressed */, &err);
-
- if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n", filename,
- wtap_strerror(err));
- exit(2);
- }
- }
- }
+ 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 (split_packet_count > 0) {
+ if (pdh == NULL) {
+ fprintf(stderr, "editcap: Can't open or create %s: %s\n",
+ filename, wtap_strerror(err));
+ exit(2);
+ }
+ }
- /* time for the next file? */
- if (written_count > 0 &&
- written_count % split_packet_count == 0) {
- if (!wtap_dump_close(pdh, &err)) {
- fprintf(stderr, "editcap: Error writing to %s: %s\n", filename,
- wtap_strerror(err));
- exit(2);
- }
+ buf = wtap_buf_ptr(wth);
- g_free(filename);
- filename = fileset_get_filename_by_pattern(block_cnt++, &phdr->ts, fprefix, fsuffix);
- g_assert(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;
+ }
- if (verbose) {
- fprintf(stderr, "Continuing writing in file %s\n", 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, 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);
+ }
+ }
+ }
+ }
- pdh = wtap_dump_open(filename, out_file_type, out_frame_type,
- snaplen ? MIN(snaplen, wtap_snapshot_length(wth)) : wtap_snapshot_length(wth),
- FALSE /* compressed */, &err);
- if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n", filename,
- wtap_strerror(err));
- exit(2);
- }
- }
- }
+ if (split_packet_count > 0) {
+ /* time for the next file? */
+ if (written_count > 0 && written_count % split_packet_count == 0) {
+ if (!wtap_dump_close(pdh, &err)) {
+ fprintf(stderr, "editcap: Error writing to %s: %s\n",
+ filename, wtap_strerror(err));
+ exit(2);
+ }
+
+ 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);
+ }
+ }
+ }
- 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)) ) {
+ if (ts_okay && ((!selected(count) && !keep_em)
+ || (selected(count) && keep_em))) {
- if (verbose && !dup_detect && !dup_detect_by_time)
- printf("Packet: %u\n", count);
+ if (verbose && !dup_detect && !dup_detect_by_time)
+ fprintf(stderr, "Packet: %u\n", count);
- /* We simply write it, perhaps after truncating it; we could do other
- things, like modify it. */
+ /* We simply write it, perhaps after truncating it; we could
+ * do other things, like modify it. */
- phdr = wtap_phdr(wth);
+ phdr = wtap_phdr(wth);
- if (snaplen != 0 && phdr->caplen > snaplen) {
- snap_phdr = *phdr;
- snap_phdr.caplen = snaplen;
- phdr = &snap_phdr;
- }
+ if (snaplen != 0) {
+ if (phdr->caplen > snaplen) {
+ snap_phdr = *phdr;
+ snap_phdr.caplen = snaplen;
+ phdr = &snap_phdr;
+ }
+ if (adjlen && phdr->len > snaplen) {
+ snap_phdr = *phdr;
+ snap_phdr.len = snaplen;
+ phdr = &snap_phdr;
+ }
+ }
- if (choplen < 0) {
- snap_phdr = *phdr;
- if (((signed int) phdr->caplen + choplen) > 0)
- snap_phdr.caplen += choplen;
- else
- snap_phdr.caplen = 0;
- phdr = &snap_phdr;
- } else if (choplen > 0) {
- snap_phdr = *phdr;
- if (phdr->caplen > (unsigned int) choplen) {
- snap_phdr.caplen -= choplen;
- buf += choplen;
- } else
- snap_phdr.caplen = 0;
- phdr = &snap_phdr;
- }
+ /* CHOP */
+ snap_phdr = *phdr;
+ handle_chopping(chop, &snap_phdr, phdr, &buf, adjlen);
+ phdr = &snap_phdr;
- /*
- * Do we adjust timestamps to insure strict chronologically order?
- */
+ 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 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.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;
+ }
+ }
+ 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.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.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;
+ }
+ }
- if (do_strict_time_adjustment) {
- if (previous_time.secs || previous_time.nsecs) {
- if (!strict_time_adj.is_negative) {
- nstime_t current;
- nstime_t delta;
+ /* suppress duplicates by packet window */
+ if (dup_detect) {
+ if (is_duplicate(buf, phdr->caplen)) {
+ 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");
+ }
+ }
+ }
- current.secs = phdr->ts.secs;
- current.nsecs = phdr->ts.nsecs;
+ 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");
+ }
+ }
+ }
+ }
- nstime_delta(&delta, ¤t, &previous_time);
+ /* Random error mutation */
+ if (err_prob > 0.0) {
+ int real_data_start = 0;
+
+ /* Protect non-protocol data */
+ if (wtap_file_type_subtype(wth) == WTAP_FILE_TYPE_SUBTYPE_CATAPULT_DCT2000)
+ real_data_start = find_dct2000_real_data(buf);
+
+ for (i = real_data_start; i < (int) phdr->caplen; i++) {
+ if (rand() <= err_prob * RAND_MAX) {
+ err_type = rand() / (RAND_MAX / ERR_WT_TOTAL + 1);
+
+ if (err_type < ERR_WT_BIT) {
+ buf[i] ^= 1 << (rand() / (RAND_MAX / 8 + 1));
+ err_type = ERR_WT_TOTAL;
+ } else {
+ err_type -= ERR_WT_BYTE;
+ }
+
+ if (err_type < ERR_WT_BYTE) {
+ buf[i] = rand() / (RAND_MAX / 255 + 1);
+ err_type = ERR_WT_TOTAL;
+ } else {
+ err_type -= ERR_WT_BYTE;
+ }
+
+ if (err_type < ERR_WT_ALNUM) {
+ buf[i] = ALNUM_CHARS[rand() / (RAND_MAX / ALNUM_LEN + 1)];
+ err_type = ERR_WT_TOTAL;
+ } else {
+ err_type -= ERR_WT_ALNUM;
+ }
+
+ if (err_type < ERR_WT_FMT) {
+ if ((unsigned int)i < phdr->caplen - 2)
+ g_strlcpy((char*) &buf[i], "%s", 2);
+ err_type = ERR_WT_TOTAL;
+ } else {
+ err_type -= ERR_WT_FMT;
+ }
+
+ if (err_type < ERR_WT_AA) {
+ for (j = i; j < (int) phdr->caplen; j++)
+ buf[j] = 0xAA;
+ i = phdr->caplen;
+ }
+ }
+ }
+ }
- 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).
- */
- /* printf("++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.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;
+ if (!wtap_dump(pdh, phdr, buf, &err, &err_info)) {
+ switch (err) {
+ case WTAP_ERR_UNWRITABLE_ENCAP:
+ /*
+ * This is a problem with the particular frame we're
+ * writing and the file type and subtype we're
+ * writing; note that, and report the frame number
+ * 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",
+ read_count, argv[optind],
+ wtap_file_type_subtype_string(out_file_type_subtype));
+ break;
+
+ case WTAP_ERR_PACKET_TOO_LARGE:
+ /*
+ * This is a problem with the particular frame we're
+ * writing and the file type and subtype we're
+ * writing; note that, and report the frame number
+ * and file type/subtype.
+ */
+ fprintf(stderr,
+ "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));
+ break;
+ }
+ exit(2);
}
- 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;
+ written_count++;
}
- }
- previous_time.secs = phdr->ts.secs;
- previous_time.nsecs = phdr->ts.nsecs;
+ count++;
}
- /* 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;
+ g_free(fprefix);
+ g_free(fsuffix);
+
+ if (err != 0) {
+ /* Print a message noting that the read failed somewhere along the
+ * line. */
+ fprintf(stderr,
+ "editcap: An error occurred while reading \"%s\": %s.\n",
+ argv[optind], wtap_strerror(err));
+ if (err_info != NULL) {
+ fprintf(stderr, "(%s)\n", err_info);
+ g_free(err_info);
+ }
}
- /* 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;
+ if (!pdh) {
+ /* No valid packages found, open the outfile so we can write an
+ * empty header */
+ g_free (filename);
+ filename = g_strdup(argv[optind+1]);
+
+ 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);
}
- 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;
- }
- }
- phdr = &snap_phdr;
}
- /* suppress duplicates by packet window */
- if (dup_detect) {
- if (is_duplicate(buf, phdr->caplen)) {
- if (verbose) {
- fprintf(stdout, "Skipped: %u, Len: %u, MD5 Hash: ", count, phdr->caplen);
- for (i = 0; i < 16; i++) {
- fprintf(stdout, "%02x", (unsigned char)fd_hash[cur_dup_entry].digest[i]);
- }
- fprintf(stdout, "\n");
- }
- duplicate_count++;
- count++;
- continue;
- } else {
- if (verbose) {
- fprintf(stdout, "Packet: %u, Len: %u, MD5 Hash: ", count, phdr->caplen);
- for (i = 0; i < 16; i++) {
- fprintf(stdout, "%02x", (unsigned char)fd_hash[cur_dup_entry].digest[i]);
- }
- fprintf(stdout, "\n");
- }
- }
+ g_free(idb_inf);
+ idb_inf = NULL;
+
+ if (!wtap_dump_close(pdh, &err)) {
+ fprintf(stderr, "editcap: Error writing to %s: %s\n", filename,
+ wtap_strerror(err));
+ exit(2);
}
+ g_free(shb_hdr);
+ g_free(filename);
+ }
- /* suppress duplicates by time window */
- if (dup_detect_by_time) {
- nstime_t current;
+ if (dup_detect) {
+ fprintf(stderr, "%u packet%s seen, %u packet%s skipped with duplicate window of %i packets.\n",
+ count - 1, plurality(count - 1, "", "s"), duplicate_count,
+ plurality(duplicate_count, "", "s"), dup_window);
+ } else if (dup_detect_by_time) {
+ fprintf(stderr, "%u packet%s seen, %u packet%s skipped with duplicate time window equal to or less than %ld.%09ld seconds.\n",
+ count - 1, plurality(count - 1, "", "s"), duplicate_count,
+ plurality(duplicate_count, "", "s"),
+ (long)relative_time_window.secs,
+ (long int)relative_time_window.nsecs);
+ }
- current.secs = phdr->ts.secs;
- current.nsecs = phdr->ts.nsecs;
+ return 0;
+}
- if (is_duplicate_rel_time(buf, phdr->caplen, ¤t)) {
- if (verbose) {
- fprintf(stdout, "Skipped: %u, Len: %u, MD5 Hash: ", count, phdr->caplen);
- for (i = 0; i < 16; i++) {
- fprintf(stdout, "%02x", (unsigned char)fd_hash[cur_dup_entry].digest[i]);
- }
- fprintf(stdout, "\n");
- }
- duplicate_count++;
- count++;
- continue;
- } else {
- if (verbose) {
- fprintf(stdout, "Packet: %u, Len: %u, MD5 Hash: ", count, phdr->caplen);
- for (i = 0; i < 16; i++) {
- fprintf(stdout, "%02x", (unsigned char)fd_hash[cur_dup_entry].digest[i]);
- }
- fprintf(stdout, "\n");
- }
- }
- }
+/* Skip meta-information read from file to return offset of real
+ * protocol data */
+static int
+find_dct2000_real_data(guint8 *buf)
+{
+ int n = 0;
+
+ for (n = 0; buf[n] != '\0'; n++); /* Context name */
+ n++;
+ n++; /* Context port number */
+ for (; buf[n] != '\0'; n++); /* Timestamp */
+ n++;
+ for (; buf[n] != '\0'; n++); /* Protocol name */
+ n++;
+ for (; buf[n] != '\0'; n++); /* Variant number (as string) */
+ n++;
+ for (; buf[n] != '\0'; n++); /* Outhdr (as string) */
+ n++;
+ n += 2; /* Direction & encap */
+
+ return n;
+}
- /* Random error mutation */
- if (err_prob > 0.0) {
- int real_data_start = 0;
- /* Protect non-protocol data */
- if (wtap_file_type(wth) == WTAP_FILE_CATAPULT_DCT2000) {
- real_data_start = find_dct2000_real_data(buf);
- }
- for (i = real_data_start; i < (int) phdr->caplen; i++) {
- if (rand() <= err_prob * RAND_MAX) {
- err_type = rand() / (RAND_MAX / ERR_WT_TOTAL + 1);
-
- if (err_type < ERR_WT_BIT) {
- buf[i] ^= 1 << (rand() / (RAND_MAX / 8 + 1));
- err_type = ERR_WT_TOTAL;
- } else {
- err_type -= ERR_WT_BYTE;
- }
-
- if (err_type < ERR_WT_BYTE) {
- buf[i] = rand() / (RAND_MAX / 255 + 1);
- err_type = ERR_WT_TOTAL;
- } else {
- err_type -= ERR_WT_BYTE;
- }
-
- if (err_type < ERR_WT_ALNUM) {
- buf[i] = ALNUM_CHARS[rand() / (RAND_MAX / ALNUM_LEN + 1)];
- err_type = ERR_WT_TOTAL;
- } else {
- err_type -= ERR_WT_ALNUM;
- }
-
- if (err_type < ERR_WT_FMT) {
- if ((unsigned int)i < phdr->caplen - 2)
- strncpy((char*) &buf[i], "%s", 2);
- err_type = ERR_WT_TOTAL;
- } else {
- err_type -= ERR_WT_FMT;
- }
-
- if (err_type < ERR_WT_AA) {
- for (j = i; j < (int) phdr->caplen; j++) {
- buf[j] = 0xAA;
- }
- i = phdr->caplen;
- }
- }
- }
- }
+/*
+ * We support up to 2 chopping regions in a single pass: one specified by the
+ * positive chop length, and one by the negative chop length.
+ */
+static void
+handle_chopping(chop_t chop, struct wtap_pkthdr *out_phdr,
+ 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)
+ chop.off_begin_pos = chop.off_begin_neg = 0;
+ if (chop.len_end == 0)
+ chop.off_end_pos = chop.off_end_neg = 0;
+
+ if (chop.off_begin_neg < 0) {
+ chop.off_begin_pos += in_phdr->caplen + chop.off_begin_neg;
+ chop.off_begin_neg = 0;
+ }
+ if (chop.off_end_pos > 0) {
+ chop.off_end_neg += chop.off_end_pos - in_phdr->caplen;
+ chop.off_end_pos = 0;
+ }
- if(phdr->caplen > wtap_snapshot_length(wth)) {
- fprintf(stderr, "Warning: packet %d too big for file type, skipping it...\n", count);
- count++;
- continue;
- }
+ /* If we've crossed chopping regions, swap them */
+ if (chop.len_begin && chop.len_end) {
+ if (chop.off_begin_pos > ((int)in_phdr->caplen + chop.off_end_neg)) {
+ int tmp_len, tmp_off;
+
+ tmp_off = in_phdr->caplen + chop.off_end_neg + chop.len_end;
+ tmp_len = -chop.len_end;
+
+ chop.off_end_neg = chop.len_begin + chop.off_begin_pos - in_phdr->caplen;
+ chop.len_end = -chop.len_begin;
- if (!wtap_dump(pdh, phdr, wtap_pseudoheader(wth), buf, &err)) {
- fprintf(stderr, "editcap: Error writing to %s: %s\n",
- filename, wtap_strerror(err));
- exit(2);
+ chop.len_begin = tmp_len;
+ chop.off_begin_pos = tmp_off;
}
- written_count++;
- }
- count++;
}
- g_free(fprefix);
- g_free(fsuffix);
-
- if (err != 0) {
- /* Print a message noting that the read failed somewhere along the line. */
- 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_RECORD:
- fprintf(stderr, "(%s)\n", err_info);
- g_free(err_info);
- break;
- }
+ /* Make sure we don't chop off more than we have available */
+ if (in_phdr->caplen < (guint32)(chop.off_begin_pos - chop.off_end_neg)) {
+ chop.len_begin = 0;
+ chop.len_end = 0;
+ }
+ if ((guint32)(chop.len_begin - chop.len_end) >
+ (in_phdr->caplen - (guint32)(chop.off_begin_pos - chop.off_end_neg))) {
+ chop.len_begin = in_phdr->caplen - (chop.off_begin_pos - chop.off_end_neg);
+ chop.len_end = 0;
}
- if (!pdh) {
- /* No valid packages found, open the outfile so we can write an empty header */
- g_free (filename);
- filename = g_strdup(argv[optind+1]);
-
- pdh = wtap_dump_open(filename, out_file_type, out_frame_type,
- snaplen ? MIN(snaplen, wtap_snapshot_length(wth)): wtap_snapshot_length(wth),
- FALSE /* compressed */, &err);
- if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n", filename,
- wtap_strerror(err));
- exit(2);
- }
+ /* Handle chopping from the beginning. Note that if a beginning offset
+ * was specified, we need to keep that piece */
+ if (chop.len_begin > 0) {
+ *out_phdr = *in_phdr;
+
+ if (chop.off_begin_pos > 0) {
+ memmove(*buf + chop.off_begin_pos,
+ *buf + chop.off_begin_pos + chop.len_begin,
+ out_phdr->caplen - chop.len_begin);
+ } else {
+ *buf += chop.len_begin;
+ }
+ out_phdr->caplen -= chop.len_begin;
+
+ if (adjlen) {
+ if (in_phdr->len > (guint32)chop.len_begin)
+ out_phdr->len -= chop.len_begin;
+ else
+ out_phdr->len = 0;
+ }
+ in_phdr = out_phdr;
}
- if (!wtap_dump_close(pdh, &err)) {
+ /* Handle chopping from the end. Note that if an ending offset was
+ * specified, we need to keep that piece */
+ if (chop.len_end < 0) {
+ *out_phdr = *in_phdr;
- fprintf(stderr, "editcap: Error writing to %s: %s\n", filename,
- wtap_strerror(err));
- exit(2);
+ if (chop.off_end_neg < 0) {
+ memmove(*buf + (gint)out_phdr->caplen + (chop.len_end + chop.off_end_neg),
+ *buf + (gint)out_phdr->caplen + chop.off_end_neg,
+ -chop.off_end_neg);
+ }
+ out_phdr->caplen += chop.len_end;
+ if (adjlen) {
+ if (((signed int) in_phdr->len + chop.len_end) > 0)
+ out_phdr->len += chop.len_end;
+ else
+ out_phdr->len = 0;
+ }
+ /*in_phdr = out_phdr;*/
}
- g_free(filename);
- }
-
- if (dup_detect) {
- fprintf(stdout, "%u packet%s seen, %u packet%s skipped with duplicate window of %u packets.\n",
- count - 1, plurality(count - 1, "", "s"),
- duplicate_count, plurality(duplicate_count, "", "s"), dup_window);
- } else if (dup_detect_by_time) {
- fprintf(stdout, "%u packet%s seen, %u packet%s skipped with duplicate time window equal to or less than %ld.%09ld seconds.\n",
- count - 1, plurality(count - 1, "", "s"),
- duplicate_count, plurality(duplicate_count, "", "s"),
- (long)relative_time_window.secs, (long int)relative_time_window.nsecs);
- }
-
- return 0;
}
-/* Skip meta-information read from file to return offset of real
- protocol data */
-static int find_dct2000_real_data(guint8 *buf)
-{
- int n=0;
-
- for (n=0; buf[n] != '\0'; n++); /* Context name */
- n++;
- n++; /* Context port number */
- for (; buf[n] != '\0'; n++); /* Timestamp */
- n++;
- for (; buf[n] != '\0'; n++); /* Protocol name */
- n++;
- for (; buf[n] != '\0'; n++); /* Variant number (as string) */
- n++;
- for (; buf[n] != '\0'; n++); /* Outhdr (as string) */
- n++;
- n += 2; /* Direction & encap */
-
- return n;
-}
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
+
git.samba.org / metze / wireshark / wip.git / blobdiff