-/* Edit capture files. We can delete packets, adjust timestamps, or
+/* editcap.c
+ * Edit capture files. We can delete packets, adjust timestamps, or
* simply convert from one format to another format.
*
* Originally written by Richard Sharpe.
#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 <wiretap/wtap.h>
-#include "wtap.h"
+#include "epan/etypes.h"
-#ifndef HAVE_GETOPT
+#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
# include "wsutil/strptime.h"
#endif
-#include <wsutil/privileges.h>
+#include <wsutil/crash_info.h>
+#include <wsutil/clopts_common.h>
+#include <wsutil/cmdarg_err.h>
#include <wsutil/filesystem.h>
-#include <wsutil/report_err.h>
-#include <wsutil/strnatcmp.h>
-#include <wsutil/md5.h>
+#include <wsutil/file_util.h>
+#include <wsutil/wsgcrypt.h>
#include <wsutil/plugins.h>
-#include <wsutil/crash_info.h>
-#include <wsutil/copyright_info.h>
-#include <wsutil/os_version_info.h>
-#include <wsutil/ws_version_info.h>
+#include <wsutil/privileges.h>
+#include <wsutil/report_message.h>
+#include <wsutil/strnatcmp.h>
+#include <wsutil/str_util.h>
+#include <version_info.h>
+#include <wsutil/pint.h>
+#include <wsutil/strtoi.h>
+#include <wiretap/wtap_opttypes.h>
+#include <wiretap/pcapng.h>
-#include "version_info.h"
+#include "ui/failure_message.h"
#include "ringbuffer.h" /* For RINGBUFFER_MAX_NUM_FILES */
+#define INVALID_OPTION 1
+#define INVALID_FILE 2
+#define CANT_EXTRACT_PREFIX 2
+#define WRITE_ERROR 2
+#define DUMP_ERROR 2
+
/*
* Some globals so we can pass things to various routines
*/
struct select_item {
- int inclusive;
- int first, second;
+ gboolean inclusive;
+ guint first, second;
};
/*
* Duplicate frame detection
*/
typedef struct _fd_hash_t {
- md5_byte_t digest[16];
+ guint8 digest[16];
guint32 len;
- nstime_t time;
+ nstime_t frame_time;
} fd_hash_t;
#define DEFAULT_DUP_DEPTH 5 /* Used with -d */
static int dup_window = DEFAULT_DUP_DEPTH;
static int cur_dup_entry = 0;
-static int ignored_bytes = 0; /* Used with -I */
+static guint32 ignored_bytes = 0; /* Used with -I */
#define ONE_BILLION 1000000000
int off_end_neg;
} chop_t;
+
+/* Table of user comments */
+GTree *frames_user_comments = NULL;
+
#define MAX_SELECTIONS 512
static struct select_item selectfrm[MAX_SELECTIONS];
-static int max_selected = -1;
+static guint max_selected = 0;
static int keep_em = 0;
#ifdef PCAP_NG_DEFAULT
static int out_file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; /* default to pcapng */
static time_t starttime = 0;
static time_t stoptime = 0;
static gboolean check_startstop = FALSE;
+static gboolean rem_vlan = FALSE;
static gboolean dup_detect = FALSE;
static gboolean dup_detect_by_time = FALSE;
/* Add a selection item, a simple parser for now */
static gboolean
-add_selection(char *sel)
+add_selection(char *sel, guint* max_selection)
{
char *locn;
char *next;
- if (++max_selected >= MAX_SELECTIONS) {
+ if (max_selected >= MAX_SELECTIONS) {
/* Let the user know we stopped selecting */
- fprintf(stderr, "Out of room for packet selections!\n");
+ fprintf(stderr, "Out of room for packet selections.\n");
return(FALSE);
}
if (verbose)
fprintf(stderr, "Not inclusive ...");
- selectfrm[max_selected].inclusive = 0;
- selectfrm[max_selected].first = atoi(sel);
+ selectfrm[max_selected].inclusive = FALSE;
+ selectfrm[max_selected].first = get_guint32(sel, "packet number");
+ if (selectfrm[max_selected].first > *max_selection)
+ *max_selection = selectfrm[max_selected].first;
if (verbose)
- fprintf(stderr, " %i\n", selectfrm[max_selected].first);
+ fprintf(stderr, " %u\n", selectfrm[max_selected].first);
} else {
if (verbose)
fprintf(stderr, "Inclusive ...");
+ *locn = '\0'; /* split the range */
next = locn + 1;
- selectfrm[max_selected].inclusive = 1;
- selectfrm[max_selected].first = atoi(sel);
- selectfrm[max_selected].second = atoi(next);
+ selectfrm[max_selected].inclusive = TRUE;
+ selectfrm[max_selected].first = get_guint32(sel, "beginning of packet range");
+ selectfrm[max_selected].second = get_guint32(next, "end of packet range");
+
+ if (selectfrm[max_selected].second == 0)
+ {
+ /* Not a valid number, presume all */
+ selectfrm[max_selected].second = *max_selection = G_MAXUINT;
+ }
+ else if (selectfrm[max_selected].second > *max_selection)
+ *max_selection = selectfrm[max_selected].second;
if (verbose)
- fprintf(stderr, " %i, %i\n", selectfrm[max_selected].first,
+ fprintf(stderr, " %u, %u\n", selectfrm[max_selected].first,
selectfrm[max_selected].second);
}
+ max_selected++;
return(TRUE);
}
/* Was the packet selected? */
static int
-selected(int recno)
+selected(guint recno)
{
- int i;
+ guint i;
- for (i = 0; i <= max_selected; i++) {
+ for (i = 0; i < max_selected; i++) {
if (selectfrm[i].inclusive) {
if (selectfrm[i].first <= recno && selectfrm[i].second >= recno)
return 1;
return 0;
}
-static void
+static gboolean
set_time_adjustment(char *optarg_str_p)
{
char *frac, *end;
size_t frac_digits;
if (!optarg_str_p)
- return;
+ return TRUE;
/* skip leading whitespace */
while (*optarg_str_p == ' ' || *optarg_str_p == '\t')
|| val == LONG_MIN || val == LONG_MAX) {
fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
if (val < 0) { /* implies '--' since we caught '-' above */
fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
}
time_adj.tv.secs = val;
|| 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);
+ return FALSE;
}
} else {
- return; /* no fractional digits */
+ return TRUE; /* 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++;
- }
+ 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;
+ return TRUE;
}
-static void
+static gboolean
set_strict_time_adj(char *optarg_str_p)
{
char *frac, *end;
size_t frac_digits;
if (!optarg_str_p)
- return;
+ return TRUE;
/* skip leading whitespace */
while (*optarg_str_p == ' ' || *optarg_str_p == '\t')
|| val == LONG_MIN || val == LONG_MAX) {
fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
if (val < 0) { /* implies '--' since we caught '-' above */
fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
}
strict_time_adj.tv.secs = val;
|| 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);
+ return FALSE;
}
} else {
- return; /* no fractional digits */
+ return TRUE; /* 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++;
- }
+ 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;
+ return TRUE;
}
-static void
+static gboolean
set_rel_time(char *optarg_str_p)
{
char *frac, *end;
size_t frac_digits;
if (!optarg_str_p)
- return;
+ return TRUE;
/* skip leading whitespace */
while (*optarg_str_p == ' ' || *optarg_str_p == '\t')
|| val == LONG_MIN || val == LONG_MAX) {
fprintf(stderr, "1: editcap: \"%s\" isn't a valid rel time value\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
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);
+ return FALSE;
}
}
relative_time_window.secs = val;
|| 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);
+ return FALSE;
}
} else {
- return; /* no fractional digits */
+ return TRUE; /* 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++;
- }
+ 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 = (int)val;
+ return TRUE;
+}
+
+#define LINUX_SLL_OFFSETP 14
+#define VLAN_SIZE 4
+static void
+sll_remove_vlan_info(guint8* fd, guint32* len) {
+ if (pntoh16(fd + LINUX_SLL_OFFSETP) == ETHERTYPE_VLAN) {
+ int rest_len;
+ /* point to start of vlan */
+ fd = fd + LINUX_SLL_OFFSETP;
+ /* bytes to read after vlan info */
+ rest_len = *len - (LINUX_SLL_OFFSETP + VLAN_SIZE);
+ /* remove vlan info from packet */
+ memmove(fd, fd + VLAN_SIZE, rest_len);
+ *len -= 4;
+ }
+}
+
+static void
+remove_vlan_info(const struct wtap_pkthdr *phdr, guint8* fd, guint32* len) {
+ switch (phdr->pkt_encap) {
+ case WTAP_ENCAP_SLL:
+ sll_remove_vlan_info(fd, len);
+ break;
+ default:
+ /* no support for current pkt_encap */
+ break;
+ }
}
static gboolean
is_duplicate(guint8* fd, guint32 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 offset = ignored_bytes;
guint32 new_len;
guint8 *new_fd;
- new_fd = &fd[ignored_bytes];
- new_len = len - (ignored_bytes);
+ if (len <= ignored_bytes) {
+ offset = 0;
+ }
+
+ new_fd = &fd[offset];
+ new_len = len - (offset);
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);
+ gcry_md_hash_buffer(GCRY_MD_MD5, fd_hash[cur_dup_entry].digest, new_fd, new_len);
fd_hash[cur_dup_entry].len = len;
static gboolean
is_duplicate_rel_time(guint8* fd, guint32 len, const nstime_t *current) {
int i;
- md5_state_t ms;
/*Hint to ignore some bytes at the start of the frame for the digest calculation(-I option) */
+ guint32 offset = ignored_bytes;
guint32 new_len;
guint8 *new_fd;
- new_fd = &fd[ignored_bytes];
- new_len = len - (ignored_bytes);
+ if (len <= ignored_bytes) {
+ offset = 0;
+ }
+
+ new_fd = &fd[offset];
+ new_len = len - (offset);
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);
+ gcry_md_hash_buffer(GCRY_MD_MD5, fd_hash[cur_dup_entry].digest, new_fd, new_len);
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;
+ fd_hash[cur_dup_entry].frame_time.secs = current->secs;
+ fd_hash[cur_dup_entry].frame_time.nsecs = current->nsecs;
/*
* Look for relative time related duplicates.
break;
}
- if (nstime_is_unset(&(fd_hash[i].time))) {
+ if (nstime_is_unset(&(fd_hash[i].frame_time))) {
/*
* We've decremented to an unused fd_hash[] entry.
* Check no more!
break;
}
- nstime_delta(&delta, current, &fd_hash[i].time);
+ nstime_delta(&delta, current, &fd_hash[i].frame_time);
if (delta.secs < 0 || delta.nsecs < 0) {
/*
return FALSE;
}
-static void
-show_version(GString *comp_info_str, GString *runtime_info_str)
-{
- printf("Editcap (Wireshark) %s\n"
- "\n"
- "%s"
- "\n"
- "%s"
- "\n"
- "%s",
- get_ws_vcs_version_info(), get_copyright_info(),
- comp_info_str->str, runtime_info_str->str);
-}
-
static void
print_usage(FILE *output)
{
fprintf(output, " given time (format as YYYY-MM-DD hh:mm:ss).\n");
fprintf(output, "\n");
fprintf(output, "Duplicate packet removal:\n");
+ fprintf(output, " --novlan remove vlan info from packets before checking for duplicates.\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, " -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, " 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, " -a <framenum>:<comment> Add or replace comment for given frame number\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, " -I <bytes to ignore> ignore the specified number of bytes at the beginning\n");
+ fprintf(output, " of the frame during MD5 hash calculation, unless the\n");
+ fprintf(output, " frame is too short, then the full frame is used.\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, " several routers (different 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, " 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, " -L adjust the frame (i.e. reported) length when chopping\n");
+ fprintf(output, " 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, " -S <strict adjustment> adjust timestamp of packets if necessary to ensure\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, " 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, " -o <change offset> When used in conjunction with -E, skip some bytes from the\n");
+ fprintf(output, " beginning of the packet. This allows one to preserve some\n");
+ fprintf(output, " bytes, in order to have some headers untouched.\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, " 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 void
-string_elem_print(gpointer data, gpointer not_used _U_)
+string_elem_print(gpointer data, gpointer stream_ptr)
{
- fprintf(stderr, " %s - %s\n",
+ fprintf((FILE *) stream_ptr, " %s - %s\n",
((struct string_elem *)data)->sstr,
((struct string_elem *)data)->lstr);
}
static void
-list_capture_types(void) {
+list_capture_types(FILE *stream) {
int i;
struct string_elem *captypes;
GSList *list = NULL;
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");
+ fprintf(stream, "editcap: The available capture file types for the \"-F\" flag are:\n");
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);
list = g_slist_insert_sorted(list, &captypes[i], string_compare);
}
}
- g_slist_foreach(list, string_elem_print, NULL);
+ g_slist_foreach(list, string_elem_print, stream);
g_slist_free(list);
g_free(captypes);
}
static void
-list_encap_types(void) {
+list_encap_types(FILE *stream) {
int i;
struct string_elem *encaps;
GSList *list = NULL;
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");
+ fprintf(stream, "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) {
list = g_slist_insert_sorted(list, &encaps[i], string_nat_compare);
}
}
- g_slist_foreach(list, string_elem_print, NULL);
+ g_slist_foreach(list, string_elem_print, stream);
g_slist_free(list);
g_free(encaps);
}
-#ifdef HAVE_PLUGINS
+static int
+framenum_compare(gconstpointer a, gconstpointer b, gpointer user_data _U_)
+{
+ if (GPOINTER_TO_UINT(a) < GPOINTER_TO_UINT(b))
+ return -1;
+
+ if (GPOINTER_TO_UINT(a) > GPOINTER_TO_UINT(b))
+ return 1;
+
+ return 0;
+}
+
/*
- * Don't report failures to load plugins because most (non-wiretap) plugins
- * *should* fail to load (because we're not linked against libwireshark and
- * dissector plugins need libwireshark).
+ * General errors and warnings are reported with an console message
+ * in editcap.
*/
static void
-failure_message(const char *msg_format _U_, va_list ap _U_)
+failure_warning_message(const char *msg_format, va_list ap)
{
+ fprintf(stderr, "editcap: ");
+ vfprintf(stderr, msg_format, ap);
+ fprintf(stderr, "\n");
}
-#endif
+/*
+ * Report additional information for an error in command-line arguments.
+ */
static void
-get_editcap_compiled_info(GString *str)
+failure_message_cont(const char *msg_format, va_list ap)
{
- /* 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 */
+ vfprintf(stderr, msg_format, ap);
+ fprintf(stderr, "\n");
}
-static void
-get_editcap_runtime_info(GString *str)
+static wtap_dumper *
+editcap_dump_open(const char *filename, guint32 snaplen,
+ GArray* shb_hdrs,
+ wtapng_iface_descriptions_t *idb_inf,
+ GArray* nrb_hdrs, int *write_err)
{
- /* zlib */
-#if defined(HAVE_LIBZ) && !defined(_WIN32)
- g_string_append_printf(str, ", with libz %s", zlibVersion());
-#endif
+ wtap_dumper *pdh;
+
+ if (strcmp(filename, "-") == 0) {
+ /* Write to the standard output. */
+ pdh = wtap_dump_open_stdout_ng(out_file_type_subtype, out_frame_type,
+ snaplen, FALSE /* compressed */,
+ shb_hdrs, idb_inf, nrb_hdrs, write_err);
+ } else {
+ pdh = wtap_dump_open_ng(filename, out_file_type_subtype, out_frame_type,
+ snaplen, FALSE /* compressed */,
+ shb_hdrs, idb_inf, nrb_hdrs, write_err);
+ }
+ return pdh;
}
int
{
GString *comp_info_str;
GString *runtime_info_str;
- wtap *wth;
- int i, j, err;
- gchar *err_info;
+ char *init_progfile_dir_error;
+ wtap *wth = NULL;
+ int i, j, read_err, write_err;
+ gchar *read_err_info, *write_err_info;
int opt;
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'V'},
+ {"novlan", no_argument, NULL, 0x8100},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'V'},
{0, 0, 0, 0 }
};
int err_type;
guint8 *buf;
guint32 read_count = 0;
- int split_packet_count = 0;
+ guint32 split_packet_count = 0;
int written_count = 0;
char *filename = NULL;
gboolean ts_okay;
- int secs_per_block = 0;
+ guint32 secs_per_block = 0;
int block_cnt = 0;
nstime_t block_start;
gchar *fprefix = NULL;
gchar *fsuffix = NULL;
-
+ guint32 change_offset = 0;
+ guint max_packet_number = 0;
const struct wtap_pkthdr *phdr;
- struct wtap_pkthdr snap_phdr;
- wtapng_iface_descriptions_t *idb_inf;
- wtapng_section_t *shb_hdr;
+ struct wtap_pkthdr temp_phdr;
+ wtapng_iface_descriptions_t *idb_inf = NULL;
+ GArray *shb_hdrs = NULL;
+ GArray *nrb_hdrs = NULL;
+ char *shb_user_appl;
+ int ret = EXIT_SUCCESS;
-#ifdef HAVE_PLUGINS
- char* init_progfile_dir_error;
-#endif
+ cmdarg_err_init(failure_warning_message, failure_message_cont);
#ifdef _WIN32
arg_list_utf_16to8(argc, argv);
create_app_running_mutex();
#endif /* _WIN32 */
- /* Assemble the compile-time version information string */
- comp_info_str = g_string_new("Compiled ");
- get_compiled_version_info(comp_info_str, NULL, get_editcap_compiled_info);
+ /* Get the compile-time version information string */
+ comp_info_str = get_compiled_version_info(NULL, NULL);
- /* Assemble the run-time version information string */
- runtime_info_str = g_string_new("Running ");
- get_runtime_version_info(runtime_info_str, get_editcap_runtime_info);
+ /* Get the run-time version information string */
+ runtime_info_str = get_runtime_version_info(NULL);
/* Add it to the information to be reported on a crash. */
ws_add_crash_info("Editcap (Wireshark) %s\n"
"\n"
"%s",
get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str);
+ g_string_free(comp_info_str, TRUE);
+ g_string_free(runtime_info_str, TRUE);
/*
* Get credential information for later use.
*/
init_process_policies();
- init_open_routines();
+
+ /*
+ * Attempt to get the pathname of the directory containing the
+ * executable file.
+ */
+ init_progfile_dir_error = init_progfile_dir(argv[0], main);
+ if (init_progfile_dir_error != NULL) {
+ fprintf(stderr,
+ "editcap: Can't get pathname of directory containing the editcap program: %s.\n",
+ init_progfile_dir_error);
+ g_free(init_progfile_dir_error);
+ }
+
+ wtap_init();
#ifdef HAVE_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_message(failure_warning_message, failure_warning_message,
+ NULL, NULL, NULL);
- init_report_err(failure_message,NULL,NULL,NULL);
+ /* Scan for plugins. This does *not* call their registration routines;
+ that's done later.
- /* Scan for plugins. This does *not* call their registration routines;
- that's done later. */
- scan_plugins();
+ Don't report failures to load plugins because most (non-wiretap)
+ plugins *should* fail to load (because we're not linked against
+ libwireshark and dissector plugins need libwireshark). */
+ scan_plugins(DONT_REPORT_LOAD_FAILURE);
- /* Register all libwiretap plugin modules. */
- register_all_wiretap_modules();
- }
+ /* Register all libwiretap plugin modules. */
+ register_all_wiretap_modules();
#endif
/* 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) {
+ while ((opt = getopt_long(argc, argv, "a:A:B:c:C:dD:E:F:hi:I:Lo:rs:S:t:T:vVw:", long_options, NULL)) != -1) {
switch (opt) {
+ case 0x8100:
+ {
+ rem_vlan = TRUE;
+ break;
+ }
+
+ case 'a':
+ {
+ guint frame_number;
+ gint string_start_index = 0;
+
+ if ((sscanf(optarg, "%u:%n", &frame_number, &string_start_index) < 1) || (string_start_index == 0)) {
+ fprintf(stderr, "editcap: \"%s\" isn't a valid <frame>:<comment>\n\n",
+ optarg);
+ ret = INVALID_OPTION;
+ goto clean_exit;
+ }
+
+ /* Lazily create the table */
+ if (!frames_user_comments) {
+ frames_user_comments = g_tree_new_full(framenum_compare, NULL, NULL, g_free);
+ }
+
+ /* Insert this entry (framenum -> comment) */
+ g_tree_replace(frames_user_comments, GUINT_TO_POINTER(frame_number), g_strdup(optarg+string_start_index));
+ break;
+ }
+
case 'A':
{
struct tm starttm;
if (!strptime(optarg,"%Y-%m-%d %T", &starttm)) {
fprintf(stderr, "editcap: \"%s\" isn't a valid time format\n\n",
optarg);
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
check_startstop = TRUE;
if (!strptime(optarg,"%Y-%m-%d %T", &stoptm)) {
fprintf(stderr, "editcap: \"%s\" isn't a valid time format\n\n",
optarg);
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
check_startstop = TRUE;
stoptm.tm_isdst = -1;
}
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);
- }
+ split_packet_count = get_nonzero_guint32(optarg, "packet count");
break;
case 'C':
default:
fprintf(stderr, "editcap: \"%s\" isn't a valid chop length or offset:length\n",
optarg);
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
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) {
+ dup_window = get_guint32(optarg, "duplicate window");
+ if (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);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
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);
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
- srand( (unsigned int) (time(NULL) + getpid()) );
+ srand( (unsigned int) (time(NULL) + ws_getpid()) );
break;
case 'F':
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);
+ list_capture_types(stderr);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
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",
+ "See https://www.wireshark.org for more information.\n",
get_ws_vcs_version_info());
print_usage(stdout);
- exit(0);
+ goto clean_exit;
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);
- }
+ secs_per_block = get_nonzero_guint32(optarg, "time interval");
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);
- }
+ ignored_bytes = get_guint32(optarg, "number of bytes to ignore");
break;
case 'L':
adjlen = TRUE;
break;
+ case 'o':
+ change_offset = get_guint32(optarg, "change offset");
+ 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);
- }
+ snaplen = get_nonzero_guint32(optarg, "snapshot length");
break;
case 'S':
- set_strict_time_adj(optarg);
+ if (!set_strict_time_adj(optarg)) {
+ ret = INVALID_OPTION;
+ goto clean_exit;
+ }
do_strict_time_adjustment = TRUE;
break;
case 't':
- set_time_adjustment(optarg);
+ if (!set_time_adjustment(optarg)) {
+ ret = INVALID_OPTION;
+ goto clean_exit;
+ }
break;
case 'T':
if (out_frame_type < 0) {
fprintf(stderr, "editcap: \"%s\" isn't a valid encapsulation type\n\n",
optarg);
- list_encap_types();
- exit(1);
+ list_encap_types(stderr);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
break;
break;
case 'V':
- show_version(comp_info_str, runtime_info_str);
+ comp_info_str = get_compiled_version_info(NULL, NULL);
+ runtime_info_str = get_runtime_version_info(NULL);
+ 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);
+ goto clean_exit;
break;
case 'w':
dup_detect = FALSE;
dup_detect_by_time = TRUE;
dup_window = MAX_DUP_DEPTH;
- set_rel_time(optarg);
+ if (!set_rel_time(optarg)) {
+ ret = INVALID_OPTION;
+ goto clean_exit;
+ }
break;
case '?': /* Bad options if GNU getopt */
switch(optopt) {
case'F':
- list_capture_types();
+ list_capture_types(stdout);
break;
case'T':
- list_encap_types();
+ list_encap_types(stdout);
break;
default:
print_usage(stderr);
+ ret = INVALID_OPTION;
break;
}
- exit(1);
+ goto clean_exit;
break;
}
- }
+ } /* processing commmand-line options */
#ifdef DEBUG
fprintf(stderr, "Optind = %i, argc = %i\n", optind, argc);
if ((argc - optind) < 1) {
print_usage(stderr);
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
if (check_startstop && !stoptime) {
if (starttime > stoptime) {
fprintf(stderr, "editcap: start time is after the stop time\n");
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
- if (split_packet_count > 0 && secs_per_block > 0) {
+ 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);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
- wth = wtap_open_offline(argv[optind], WTAP_TYPE_AUTO, &err, &err_info, FALSE);
+ wth = wtap_open_offline(argv[optind], WTAP_TYPE_AUTO, &read_err, &read_err_info, FALSE);
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_BAD_FILE:
- fprintf(stderr, "(%s)\n", err_info);
- g_free(err_info);
- break;
- }
- exit(2);
+ cfile_open_failure_message("editcap", argv[optind], read_err,
+ read_err_info);
+ ret = INVALID_FILE;
+ goto clean_exit;
}
if (verbose) {
wtap_file_type_subtype_string(wtap_file_type_subtype(wth)));
}
- shb_hdr = wtap_file_get_shb_info(wth);
+ shb_hdrs = wtap_file_get_shb_for_new_file(wth);
idb_inf = wtap_file_get_idb_info(wth);
+ nrb_hdrs = wtap_file_get_nrb_for_new_file(wth);
/*
* Now, process the rest, if any ... we only write if there is an extra
out_frame_type = wtap_file_encap(wth);
for (i = optind + 2; i < argc; i++)
- if (add_selection(argv[i]) == FALSE)
+ if (add_selection(argv[i], &max_packet_number) == FALSE)
break;
+ if (keep_em == FALSE)
+ max_packet_number = G_MAXUINT;
+
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);
+ nstime_set_unset(&fd_hash[i].frame_time);
}
}
- while (wtap_read(wth, &err, &err_info, &data_offset)) {
+ /* Read all of the packets in turn */
+ while (wtap_read(wth, &read_err, &read_err_info, &data_offset)) {
+ if (max_packet_number <= read_count)
+ break;
+
read_count++;
phdr = wtap_phdr(wth);
- 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);
+ /* Extra actions for the first packet */
+ if (read_count == 1) {
+ if (split_packet_count != 0 || secs_per_block != 0) {
+ if (!fileset_extract_prefix_suffix(argv[optind+1], &fprefix, &fsuffix)) {
+ ret = CANT_EXTRACT_PREFIX;
+ goto clean_exit;
+ }
filename = fileset_get_filename_by_pattern(block_cnt++, phdr, fprefix, fsuffix);
} else {
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 = g_strdup("Editcap " VERSION);
+ if (wtap_block_get_string_option_value(g_array_index(shb_hdrs, wtap_block_t, 0), OPT_SHB_USERAPPL, &shb_user_appl) != WTAP_OPTTYPE_SUCCESS) {
+ wtap_block_add_string_option_format(g_array_index(shb_hdrs, wtap_block_t, 0), OPT_SHB_USERAPPL, "Editcap " VERSION);
}
- pdh = wtap_dump_open_ng(filename, out_file_type_subtype, out_frame_type,
+ pdh = editcap_dump_open(filename,
snaplen ? MIN(snaplen, wtap_snapshot_length(wth)) : wtap_snapshot_length(wth),
- FALSE /* compressed */, shb_hdr, idb_inf, &err);
+ shb_hdrs, idb_inf, nrb_hdrs, &write_err);
if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n",
- filename, wtap_strerror(err));
- exit(2);
+ cfile_dump_open_failure_message("editcap", filename,
+ write_err,
+ out_file_type_subtype);
+ ret = INVALID_FILE;
+ goto clean_exit;
}
- }
+ } /* first packet only handling */
+
buf = wtap_buf_ptr(wth);
*/
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;
+ block_start = phdr->ts;
}
-
- if (secs_per_block > 0) {
- while ((phdr->ts.secs - block_start.secs > secs_per_block)
- || (phdr->ts.secs - block_start.secs == secs_per_block
+ if (secs_per_block != 0) {
+ while (((guint32)(phdr->ts.secs - block_start.secs) > secs_per_block)
+ || ((guint32)(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);
+ if (!wtap_dump_close(pdh, &write_err)) {
+ cfile_close_failure_message(filename, write_err);
+ ret = WRITE_ERROR;
+ goto clean_exit;
}
block_start.secs = block_start.secs + secs_per_block; /* reset for next interval */
g_free(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,
+ pdh = editcap_dump_open(filename,
snaplen ? MIN(snaplen, wtap_snapshot_length(wth)) : wtap_snapshot_length(wth),
- FALSE /* compressed */, shb_hdr, idb_inf, &err);
+ shb_hdrs, idb_inf, nrb_hdrs, &write_err);
if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n",
- filename, wtap_strerror(err));
- exit(2);
+ cfile_dump_open_failure_message("editcap", filename,
+ write_err,
+ out_file_type_subtype);
+ ret = INVALID_FILE;
+ goto clean_exit;
}
}
}
- }
+ } /* time stamp handling */
- if (split_packet_count > 0) {
+ 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);
+ if (written_count > 0 && (written_count % split_packet_count) == 0) {
+ if (!wtap_dump_close(pdh, &write_err)) {
+ cfile_close_failure_message(filename, write_err);
+ ret = WRITE_ERROR;
+ goto clean_exit;
}
g_free(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,
+ pdh = editcap_dump_open(filename,
snaplen ? MIN(snaplen, wtap_snapshot_length(wth)) : wtap_snapshot_length(wth),
- FALSE /* compressed */, shb_hdr, idb_inf, &err);
+ shb_hdrs, idb_inf, nrb_hdrs, &write_err);
if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n",
- filename, wtap_strerror(err));
- exit(2);
+ cfile_dump_open_failure_message("editcap", filename,
+ write_err,
+ out_file_type_subtype);
+ ret = INVALID_FILE;
+ goto clean_exit;
}
}
- }
+ } /* split packet handling */
if (check_startstop) {
/*
phdr = wtap_phdr(wth);
if (snaplen != 0) {
+ /* Limit capture length to snaplen */
if (phdr->caplen > snaplen) {
- snap_phdr = *phdr;
- snap_phdr.caplen = snaplen;
- phdr = &snap_phdr;
+ /* Copy and change rather than modify returned phdr */
+ temp_phdr = *phdr;
+ temp_phdr.caplen = snaplen;
+ phdr = &temp_phdr;
}
+ /* If -L, also set reported length to snaplen */
if (adjlen && phdr->len > snaplen) {
- snap_phdr = *phdr;
- snap_phdr.len = snaplen;
- phdr = &snap_phdr;
+ /* Copy and change rather than modify returned phdr */
+ temp_phdr = *phdr;
+ temp_phdr.len = snaplen;
+ phdr = &temp_phdr;
}
}
/* CHOP */
- snap_phdr = *phdr;
- handle_chopping(chop, &snap_phdr, phdr, &buf, adjlen);
- phdr = &snap_phdr;
+ temp_phdr = *phdr;
+ handle_chopping(chop, &temp_phdr, phdr, &buf, adjlen);
+ phdr = &temp_phdr;
if (phdr->presence_flags & WTAP_HAS_TS) {
/* Do we adjust timestamps to ensure strict chronological
nstime_t current;
nstime_t delta;
- current.secs = phdr->ts.secs;
- current.nsecs = phdr->ts.nsecs;
+ current = phdr->ts;
nstime_delta(&delta, ¤t, &previous_time);
* 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) {
+ temp_phdr = *phdr;
+ temp_phdr.ts.secs = previous_time.secs + strict_time_adj.tv.secs;
+ temp_phdr.ts.nsecs = previous_time.nsecs;
+ if (temp_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;
+ temp_phdr.ts.secs++;
+ temp_phdr.ts.nsecs += strict_time_adj.tv.nsecs - ONE_BILLION;
} else {
- snap_phdr.ts.nsecs += strict_time_adj.tv.nsecs;
+ temp_phdr.ts.nsecs += strict_time_adj.tv.nsecs;
}
- phdr = &snap_phdr;
+ phdr = &temp_phdr;
}
} else {
/*
* 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) {
+ temp_phdr = *phdr;
+ temp_phdr.ts.secs = previous_time.secs + strict_time_adj.tv.secs;
+ temp_phdr.ts.nsecs = previous_time.nsecs;
+ if (temp_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;
+ temp_phdr.ts.secs++;
+ temp_phdr.ts.nsecs += strict_time_adj.tv.nsecs - ONE_BILLION;
} else {
- snap_phdr.ts.nsecs += strict_time_adj.tv.nsecs;
+ temp_phdr.ts.nsecs += strict_time_adj.tv.nsecs;
}
- phdr = &snap_phdr;
+ phdr = &temp_phdr;
}
}
- previous_time.secs = phdr->ts.secs;
- previous_time.nsecs = phdr->ts.nsecs;
+ previous_time = phdr->ts;
}
- /* 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.tv.secs != 0) {
+ temp_phdr = *phdr;
if (time_adj.is_negative)
- snap_phdr.ts.secs -= time_adj.tv.secs;
+ temp_phdr.ts.secs -= time_adj.tv.secs;
else
- snap_phdr.ts.secs += time_adj.tv.secs;
- phdr = &snap_phdr;
+ temp_phdr.ts.secs += time_adj.tv.secs;
+ phdr = &temp_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.tv.nsecs != 0) {
+ temp_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;
+ if (temp_phdr.ts.nsecs < time_adj.tv.nsecs) { /* borrow */
+ temp_phdr.ts.secs--;
+ temp_phdr.ts.nsecs += ONE_BILLION;
}
- snap_phdr.ts.nsecs -= time_adj.tv.nsecs;
+ temp_phdr.ts.nsecs -= time_adj.tv.nsecs;
} else { /* add */
- if (snap_phdr.ts.nsecs + time_adj.tv.nsecs > ONE_BILLION) {
+ if (temp_phdr.ts.nsecs + time_adj.tv.nsecs > ONE_BILLION) {
/* carry */
- snap_phdr.ts.secs++;
- snap_phdr.ts.nsecs += time_adj.tv.nsecs - ONE_BILLION;
+ temp_phdr.ts.secs++;
+ temp_phdr.ts.nsecs += time_adj.tv.nsecs - ONE_BILLION;
} else {
- snap_phdr.ts.nsecs += time_adj.tv.nsecs;
+ temp_phdr.ts.nsecs += time_adj.tv.nsecs;
}
}
- phdr = &snap_phdr;
+ phdr = &temp_phdr;
}
+ } /* time stamp adjustment */
+
+ /* remove vlan info */
+ if (rem_vlan) {
+ /* TODO: keep casting const like this? change pointer instead of value? */
+ remove_vlan_info(phdr, buf, (guint32 *) &phdr->caplen);
}
/* suppress duplicates by packet window */
fprintf(stderr, "\n");
}
}
- }
+ } /* suppression of duplicates */
if (phdr->presence_flags & WTAP_HAS_TS) {
/* suppress duplicates by time window */
}
}
}
+ } /* suppress duplicates by time window */
+
+ if (change_offset > phdr->caplen) {
+ fprintf(stderr, "change offset %u is longer than caplen %u in packet %u\n",
+ change_offset, phdr->caplen, count);
}
/* Random error mutation */
- if (err_prob > 0.0) {
+ if (err_prob > 0.0 && change_offset <= phdr->caplen) {
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);
+ real_data_start += change_offset;
+
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);
}
}
}
+ } /* random error mutation */
+
+ /* Find a packet comment we may need to write */
+ if (frames_user_comments) {
+ const char *comment =
+ (const char*)g_tree_lookup(frames_user_comments, GUINT_TO_POINTER(read_count));
+ /* XXX: What about comment changed to no comment? */
+ if (comment != NULL) {
+ /* Copy and change rather than modify returned phdr */
+ temp_phdr = *phdr;
+ temp_phdr.opt_comment = g_strdup(comment);
+ temp_phdr.has_comment_changed = TRUE;
+ phdr = &temp_phdr;
+ } else {
+ temp_phdr = *phdr;
+ temp_phdr.has_comment_changed = FALSE;
+ phdr = &temp_phdr;
+ }
}
- 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);
- g_free(err_info);
- break;
-
- default:
- fprintf(stderr, "editcap: Error writing to %s: %s\n",
- filename, wtap_strerror(err));
- break;
- }
- exit(2);
+ /* Attempt to dump out current frame to the output file */
+ if (!wtap_dump(pdh, phdr, buf, &write_err, &write_err_info)) {
+ cfile_write_failure_message("editcap", argv[optind],
+ filename,
+ write_err, write_err_info,
+ read_count,
+ out_file_type_subtype);
+ ret = DUMP_ERROR;
+ goto clean_exit;
}
written_count++;
}
g_free(fprefix);
g_free(fsuffix);
- if (err != 0) {
+ if (read_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_BAD_FILE:
- fprintf(stderr, "(%s)\n", err_info);
- g_free(err_info);
- break;
- }
+ cfile_read_failure_message("editcap", argv[optind], read_err,
+ read_err_info);
}
if (!pdh) {
g_free (filename);
filename = g_strdup(argv[optind+1]);
- pdh = wtap_dump_open_ng(filename, out_file_type_subtype, out_frame_type,
+ pdh = editcap_dump_open(filename,
snaplen ? MIN(snaplen, wtap_snapshot_length(wth)): wtap_snapshot_length(wth),
- FALSE /* compressed */, shb_hdr, idb_inf, &err);
+ shb_hdrs, idb_inf, nrb_hdrs, &write_err);
if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n",
- filename, wtap_strerror(err));
- exit(2);
+ cfile_dump_open_failure_message("editcap", filename,
+ write_err,
+ out_file_type_subtype);
+ ret = INVALID_FILE;
+ goto clean_exit;
}
}
- 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);
+ if (!wtap_dump_close(pdh, &write_err)) {
+ cfile_close_failure_message(filename, write_err);
+ ret = WRITE_ERROR;
+ goto clean_exit;
}
- g_free(shb_hdr);
g_free(filename);
+
+ if (frames_user_comments) {
+ g_tree_destroy(frames_user_comments);
+ }
}
if (dup_detect) {
(long int)relative_time_window.nsecs);
}
- return 0;
+clean_exit:
+ wtap_block_array_free(shb_hdrs);
+ wtap_block_array_free(nrb_hdrs);
+ g_free(idb_inf);
+ if (wth != NULL)
+ wtap_close(wth);
+ wtap_cleanup();
+ free_progdirs();
+#ifdef HAVE_PLUGINS
+ plugins_cleanup();
+#endif
+ return ret;
}
/* Skip meta-information read from file to return offset of real
* vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/
-
git.samba.org / metze / wireshark / wip.git / blobdiff