/* Combine two dump files, either by appending or by merging by timestamp
*
- * $Id: mergecap.c,v 1.10 2002/08/02 23:35:46 jmayer Exp $
+ * $Id$
*
* Written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris
#include <stdio.h>
#include <stdlib.h>
+#include <errno.h>
#include <glib.h>
#ifdef HAVE_UNISTD_H
#include "getopt.h"
#endif
+#include "svnversion.h"
+#include "merge.h"
-/*
- * Global variables
- */
-static int verbose = 0; /* Not so verbose */
-
-/*
- * Structures to manage our files
- */
-typedef struct in_file_t {
- const char *filename;
- wtap *wth;
- int err;
- long data_offset;
- gboolean ok;
-} in_file_t;
-
-typedef struct out_file_t {
- const char *filename;
- wtap_dumper *pdh;
- int file_type;
- int frame_type;
- unsigned int snaplen;
- int count;
-} out_file_t;
-static out_file_t out_file;
-
-/*
- * Routine to write frame to output file
- */
-static void
-write_frame(guchar *user, const struct wtap_pkthdr *phdr, long offset _U_,
- union wtap_pseudo_header *pseudo_header, const guchar *buf)
-{
- wtap_dumper *pdh = (wtap_dumper*)user;
- int err;
- struct wtap_pkthdr snap_phdr;
-
- if (verbose)
- printf("Record: %u\n", out_file.count++);
-
- /* We simply write it, perhaps after truncating it; we could do other
- * things, like modify it. */
- if (out_file.snaplen != 0 && phdr->caplen > out_file.snaplen) {
- snap_phdr = *phdr;
- snap_phdr.caplen = out_file.snaplen;
- phdr = &snap_phdr;
- }
-
- if (!wtap_dump(pdh, phdr, pseudo_header, buf, &err)) {
- fprintf(stderr, "mergecap: Error writing to %s: %s\n",
- out_file.filename, wtap_strerror(err));
- exit(1);
- }
-}
-
-
-/*
- * routine to concatenate files
- */
-static void
-append(int count, in_file_t in_files[], out_file_t *out_file)
-{
- int i;
- int err;
-
- for (i = 0; i < count; i++) {
- if (!wtap_loop(in_files[i].wth, 0, write_frame,
- (guchar*)out_file->pdh, &err)) {
- fprintf(stderr, "mergecap: Error appending from %s to %s: %s\n",
- in_files[i].filename, out_file->filename, wtap_strerror(err));
- }
- }
-}
-
-
-/*
- * returns TRUE if first argument is earlier than second
- */
-static gboolean
-is_earlier(struct timeval *l, struct timeval *r) {
- if (l->tv_sec > r->tv_sec) { /* left is later */
- return FALSE;
- } else if (l->tv_sec < r->tv_sec) { /* left is earlier */
- return TRUE;
- } else if (l->tv_usec > r->tv_usec) { /* tv_sec equal, l.usec later */
- return FALSE;
- }
- /* either one < two or one == two
- * either way, return one
- */
- return TRUE;
-}
-
-
-/*
- * returns index of earliest timestamp in set of input files
- * or -1 if no valid files remain
- */
-static int
-earliest(int count, in_file_t in_files[]) {
- int i;
- int ei = -1;
- struct timeval tv = {LONG_MAX, LONG_MAX};
-
- for (i = 0; i < count; i++) {
- struct wtap_pkthdr *phdr = wtap_phdr(in_files[i].wth);
-
- if (in_files[i].ok && is_earlier(&(phdr->ts), &tv)) {
- tv = phdr->ts;
- ei = i;
- }
- }
- return ei;
-}
-
-/*
- * actually merge the files
- */
-static void
-merge(int count, in_file_t in_files[], out_file_t *out_file)
-{
- int i;
-
- /* prime the pump (read in first frame from each file) */
- for (i = 0; i < count; i++) {
- in_files[i].ok = wtap_read(in_files[i].wth, &(in_files[i].err),
- &(in_files[i].data_offset));
- }
+#ifdef HAVE_IO_H
+# include <io.h>
+#endif
- /* now keep writing the earliest frame until we're out of frames */
- while ( -1 != (i = earliest(count, in_files))) {
-
- /* write out earliest frame, and fetch another from its
- * input file
- */
- write_frame((guchar*)out_file->pdh,
- wtap_phdr(in_files[i].wth),
- in_files[i].data_offset,
- wtap_pseudoheader(in_files[i].wth),
- wtap_buf_ptr(in_files[i].wth));
- in_files[i].ok = wtap_read(in_files[i].wth, &(in_files[i].err),
- &(in_files[i].data_offset));
- }
-}
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+/* Win32 needs the O_BINARY flag for open() */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
-/*
- * Select an output frame type based on the input files
- * From Guy: If all files have the same frame type, then use that.
- * Otherwise select WTAP_ENCAP_PER_PACKET. If the selected
- * output file type doesn't support per packet frame types,
- * then the wtap_dump_open call will fail with a reasonable
- * error condition.
- */
static int
-select_frame_type(int count, in_file_t files[])
+get_natural_int(const char *string, const char *name)
{
- int i;
- int selected_frame_type;
-
- selected_frame_type = wtap_file_encap(files[0].wth);
-
- for (i = 1; i < count; i++) {
- int this_frame_type = wtap_file_encap(files[i].wth);
- if (selected_frame_type != this_frame_type) {
- selected_frame_type = WTAP_ENCAP_PER_PACKET;
- if (verbose) {
- fprintf(stderr, "mergecap: multiple frame encapsulation types detected\n");
- fprintf(stderr, " defaulting to WTAP_ENCAP_PER_PACKET\n");
- fprintf(stderr, " %s had type %s (%s)\n",
- files[0].filename,
- wtap_encap_string(selected_frame_type),
- wtap_encap_short_string(selected_frame_type));
- fprintf(stderr, " %s had type %s (%s)\n",
- files[i].filename,
- wtap_encap_string(this_frame_type),
- wtap_encap_short_string(this_frame_type));
- }
- break;
- }
- }
-
- if (verbose) {
- fprintf(stderr, "mergecap: selected frame_type %s (%s)\n",
- wtap_encap_string(selected_frame_type),
- wtap_encap_short_string(selected_frame_type));
- }
-
- return selected_frame_type;
-}
-
+ long number;
+ char *p;
-/*
- * Close the output file
- */
-static void
-close_outfile(out_file_t *out_file)
-{
- int err;
- if (!wtap_dump_close(out_file->pdh, &err)) {
- fprintf(stderr, "mergecap: Error closing file %s: %s\n",
- out_file->filename, wtap_strerror(err));
+ number = strtol(string, &p, 10);
+ if (p == string || *p != '\0') {
+ fprintf(stderr, "mergecap: The specified %s \"%s\" isn't a decimal number\n",
+ name, string);
exit(1);
}
-}
-
-
-/*
- * Open the output file
- *
- * Return FALSE if file cannot be opened (so caller can clean up)
- */
-static gboolean
-open_outfile(out_file_t *out_file, int snapshot_len)
-{
- int err;
- if (!out_file) {
- fprintf(stderr, "mergecap: internal error (null out_file)\n");
+ if (number < 0) {
+ fprintf(stderr, "mergecap: The specified %s is a negative number\n",
+ name);
exit(1);
}
-
- out_file->pdh = wtap_dump_open(out_file->filename, out_file->file_type,
- out_file->frame_type, snapshot_len, &err);
- if (!out_file->pdh) {
- fprintf(stderr, "mergecap: Can't open/create %s:\n", out_file->filename);
- fprintf(stderr, " %s\n", wtap_strerror(err));
- return FALSE;
+ if (number > INT_MAX) {
+ fprintf(stderr, "mergecap: The specified %s is too large (greater than %d)\n",
+ name, INT_MAX);
+ exit(1);
}
- return TRUE;
+ return number;
}
-
-/*
- * Scan through input files and find maximum snapshot length
- */
static int
-max_snapshot_length(int count, in_file_t in_files[])
+get_positive_int(const char *string, const char *name)
{
- int i;
- int max_snapshot = 0;
- int snapshot_length;
-
- for (i = 0; i < count; i++) {
- snapshot_length = wtap_snapshot_length(in_files[i].wth);
- if (snapshot_length == 0) {
- /* Snapshot length of input file not known. */
- snapshot_length = WTAP_MAX_PACKET_SIZE;
- }
- if (snapshot_length > max_snapshot)
- max_snapshot = snapshot_length;
- }
- return max_snapshot;
-}
+ long number;
+ number = get_natural_int(string, name);
-/*
- * Scan through and close each input file
- */
-static void
-close_in_files(int count, in_file_t in_files[])
-{
- int i;
- for (i = 0; i < count; i++) {
- wtap_close(in_files[i].wth);
- }
-}
-
-
-/*
- * Scan through the arguments and open the input files
- */
-static int
-open_in_files(int argc, char *argv[], in_file_t *in_files[])
-{
- int i;
- int count = 0;
- int err;
- in_file_t *files;
- int files_size = argc * sizeof(in_file_t);
-
-
- files = malloc(files_size);
- if (!files) {
- fprintf(stderr, "mergecap: error allocating %d bytes of memory\n",
- files_size);
+ if (number == 0) {
+ fprintf(stderr, "mergecap: The specified %s is zero\n",
+ name);
exit(1);
}
- *in_files = files;
-
- for (i = 0; i < argc; i++) {
- files[count].filename = argv[i];
- files[count].wth = wtap_open_offline(argv[i], &err, FALSE);
- files[count].err = 0;
- files[count].data_offset = 0;
- files[count].ok = TRUE;
- if (!files[count].wth) {
- fprintf(stderr, "mergecap: skipping %s: %s\n", argv[i],
- wtap_strerror(err));
- } else {
- if (verbose) {
- fprintf(stderr, "mergecap: %s is type %s.\n", argv[i],
- wtap_file_type_string(wtap_file_type(files[count].wth)));
- }
- count++;
- }
- }
- if (verbose)
- fprintf(stderr, "mergecap: opened %d of %d input files\n", count,
- argc);
- return count;
+ return number;
}
-
/*
* Show the usage
- */
+ */
static void
-usage()
+usage(void)
{
int i;
const char *string;
- fprintf(stderr, "Usage: mergecap [-hva] [-s <snaplen>] [-T <encap type>]\n");
- fprintf(stderr, " [-F <capture type>] -w <outfile> <infile> [...]\n\n");
- fprintf(stderr, " where\t-h produces this help listing.\n");
- fprintf(stderr, " \t-v verbose operation, default is silent\n");
- fprintf(stderr, " \t-a files should be concatenated, not merged\n");
- fprintf(stderr, " \t Default merges based on frame timestamps\n");
- fprintf(stderr, " \t-s <snaplen>: truncate packets to <snaplen> bytes of data\n");
- fprintf(stderr, " \t-w <outfile>: sets output filename to <outfile>\n");
- fprintf(stderr, " \t-T <encap type> encapsulation type to use:\n");
+ printf("Usage: mergecap [-hva] [-s <snaplen>] [-T <encap type>]\n");
+ printf(" [-F <capture type>] -w <outfile> <infile> [...]\n\n");
+ printf(" where\t-h produces this help listing.\n");
+ printf(" \t-v verbose operation, default is silent\n");
+ printf(" \t-a files should be concatenated, not merged\n");
+ printf(" \t Default merges based on frame timestamps\n");
+ printf(" \t-s <snaplen>: truncate packets to <snaplen> bytes of data\n");
+ printf(" \t-w <outfile>: sets output filename to <outfile>\n");
+ printf(" \t-T <encap type> encapsulation type to use:\n");
for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) {
string = wtap_encap_short_string(i);
if (string != NULL)
- fprintf(stderr, " \t %s - %s\n",
+ printf(" \t %s - %s\n",
string, wtap_encap_string(i));
}
- fprintf(stderr, " \t default is the same as the first input file\n");
- fprintf(stderr, " \t-F <capture type> capture file type to write:\n");
+ printf(" \t default is the same as the first input file\n");
+ printf(" \t-F <capture type> capture file type to write:\n");
for (i = 0; i < WTAP_NUM_FILE_TYPES; i++) {
if (wtap_dump_can_open(i))
- fprintf(stderr, " \t %s - %s\n",
+ printf(" \t %s - %s\n",
wtap_file_type_short_string(i), wtap_file_type_string(i));
}
- fprintf(stderr, " \t default is libpcap\n");
+ printf(" \t default is libpcap\n");
}
-
-
int
main(int argc, char *argv[])
{
extern char *optarg;
extern int optind;
int opt;
- char *p;
gboolean do_append = FALSE;
+ gboolean verbose = FALSE;
int in_file_count = 0;
- in_file_t *in_files = NULL;
-
- /* initialize out_file */
- out_file.filename = NULL;
- out_file.pdh = NULL; /* wiretap dumpfile */
- out_file.file_type = WTAP_FILE_PCAP; /* default to "libpcap" */
- out_file.frame_type = -2; /* leave type alone */
- out_file.snaplen = 0; /* no limit */
- out_file.count = 1; /* frames output */
+ guint snaplen = 0;
+ int file_type = WTAP_FILE_PCAP; /* default to libpcap format */
+ int frame_type = -2;
+ int out_fd;
+ merge_in_file_t *in_files = NULL;
+ int i;
+ wtap *wth;
+ struct wtap_pkthdr *phdr, snap_phdr;
+ wtap_dumper *pdh;
+ int open_err, read_err, write_err, close_err;
+ gchar *err_info;
+ int err_fileno;
+ char *out_filename = NULL;
+ gboolean got_read_error = FALSE, got_write_error = FALSE;
+ int count;
/* Process the options first */
while ((opt = getopt(argc, argv, "hvas:T:F:w:")) != -1) {
switch (opt) {
case 'w':
- out_file.filename = optarg;
+ out_filename = optarg;
break;
-
+
case 'a':
do_append = !do_append;
break;
-
+
case 'T':
- out_file.frame_type = wtap_short_string_to_encap(optarg);
- if (out_file.frame_type < 0) {
- fprintf(stderr, "mergecap: \"%s\" is not a valid encapsulation type\n",
+ frame_type = wtap_short_string_to_encap(optarg);
+ if (frame_type < 0) {
+ fprintf(stderr, "mergecap: \"%s\" isn't a valid encapsulation type\n",
optarg);
exit(1);
}
break;
case 'F':
- out_file.file_type = wtap_short_string_to_file_type(optarg);
- if (out_file.file_type < 0) {
- fprintf(stderr, "mergecap: \"%s\" is not a valid capture file type\n",
+ file_type = wtap_short_string_to_file_type(optarg);
+ if (file_type < 0) {
+ fprintf(stderr, "mergecap: \"%s\" isn't a valid capture file type\n",
optarg);
exit(1);
}
break;
case 'v':
- verbose = !verbose; /* Just invert */
+ verbose = TRUE;
break;
case 's':
- out_file.snaplen = strtol(optarg, &p, 10);
- if (p == optarg || *p != '\0') {
- fprintf(stderr, "mergecap: \"%s\" is not a valid snapshot length\n",
- optarg);
- exit(1);
- }
+ snaplen = get_positive_int(optarg, "snapshot length");
break;
case 'h':
- fprintf(stderr, "mergecap version %s\n", VERSION);
+ printf("mergecap version %s"
+#ifdef SVNVERSION
+ " (" SVNVERSION ")"
+#endif
+ "\n", VERSION);
usage();
- exit(1);
+ exit(0);
break;
case '?': /* Bad options if GNU getopt */
usage();
- exit(1);
+ return 1;
break;
}
* filename and one input file
*/
in_file_count = argc - optind;
- if (!out_file.filename) {
+ if (!out_filename) {
fprintf(stderr, "mergecap: an output filename must be set with -w\n");
- usage();
- exit(1);
+ fprintf(stderr, " run with -h for help\n");
+ return 1;
+ }
+ if (in_file_count < 1) {
+ fprintf(stderr, "mergecap: No input files were specified\n");
+ return 1;
}
/* open the input files */
- in_file_count = open_in_files(in_file_count, &argv[optind], &in_files);
- if (in_file_count < 1) {
- fprintf(stderr, "mergecap: No valid input files\n");
- exit(1);
+ if (!merge_open_in_files(in_file_count, &argv[optind], &in_files,
+ &open_err, &err_info, &err_fileno)) {
+ fprintf(stderr, "mergecap: Can't open %s: %s\n", argv[optind + err_fileno],
+ wtap_strerror(open_err));
+ switch (open_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;
+ }
+ return 2;
+ }
+
+ if (verbose) {
+ for (i = 0; i < in_file_count; i++)
+ fprintf(stderr, "mergecap: %s is type %s.\n", argv[optind + i],
+ wtap_file_type_string(wtap_file_type(in_files[i].wth)));
+ }
+
+ if (snaplen == 0) {
+ /*
+ * Snapshot length not specified - default to the maximum of the
+ * snapshot lengths of the input files.
+ */
+ snaplen = merge_max_snapshot_length(in_file_count, in_files);
}
/* set the outfile frame type */
- if (out_file.frame_type == -2)
- out_file.frame_type = select_frame_type(in_file_count, in_files);
-
+ if (frame_type == -2) {
+ /*
+ * Default to the appropriate frame type for the input files.
+ */
+ frame_type = merge_select_frame_type(in_file_count, in_files);
+ if (verbose) {
+ if (frame_type == WTAP_ENCAP_PER_PACKET) {
+ /*
+ * Find out why we had to choose WTAP_ENCAP_PER_PACKET.
+ */
+ int first_frame_type, this_frame_type;
+
+ first_frame_type = wtap_file_encap(in_files[0].wth);
+ for (i = 1; i < in_file_count; i++) {
+ this_frame_type = wtap_file_encap(in_files[i].wth);
+ if (first_frame_type != this_frame_type) {
+ fprintf(stderr, "mergecap: multiple frame encapsulation types detected\n");
+ fprintf(stderr, " defaulting to WTAP_ENCAP_PER_PACKET\n");
+ fprintf(stderr, " %s had type %s (%s)\n",
+ in_files[0].filename,
+ wtap_encap_string(first_frame_type),
+ wtap_encap_short_string(first_frame_type));
+ fprintf(stderr, " %s had type %s (%s)\n",
+ in_files[i].filename,
+ wtap_encap_string(this_frame_type),
+ wtap_encap_short_string(this_frame_type));
+ break;
+ }
+ }
+ }
+ fprintf(stderr, "mergecap: selected frame_type %s (%s)\n",
+ wtap_encap_string(frame_type),
+ wtap_encap_short_string(frame_type));
+ }
+ }
+
/* open the outfile */
- if (!open_outfile(&out_file, max_snapshot_length(in_file_count, in_files))) {
- close_in_files(in_file_count, in_files);
+ if (strncmp(out_filename, "-", 2) == 0) {
+ /* use stdout as the outfile */
+ out_fd = 1 /*stdout*/;
+ } else {
+ /* open the outfile */
+ out_fd = open(out_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
+ if (out_fd == -1) {
+ fprintf(stderr, "mergecap: Couldn't open output file %s: %s\n",
+ out_filename, strerror(errno));
+ exit(1);
+ }
+ }
+
+ /* prepare the outfile */
+ pdh = wtap_dump_fdopen(out_fd, file_type, frame_type, snaplen, &open_err);
+ if (pdh == NULL) {
+ merge_close_in_files(in_file_count, in_files);
+ free(in_files);
+ fprintf(stderr, "mergecap: Can't open or create %s: %s\n", out_filename,
+ wtap_strerror(open_err));
exit(1);
}
/* do the merge (or append) */
- if (do_append)
- append(in_file_count, in_files, &out_file);
- else
- merge(in_file_count, in_files, &out_file);
+ count = 1;
+ for (;;) {
+ if (do_append)
+ wth = merge_append_read_packet(in_file_count, in_files, &read_err,
+ &err_info);
+ else
+ wth = merge_read_packet(in_file_count, in_files, &read_err,
+ &err_info);
+ if (wth == NULL) {
+ if (read_err != 0)
+ got_read_error = TRUE;
+ break;
+ }
+
+ if (verbose)
+ fprintf(stderr, "Record: %u\n", count++);
+
+ /* We simply write it, perhaps after truncating it; we could do other
+ * things, like modify it. */
+ phdr = wtap_phdr(wth);
+ if (snaplen != 0 && phdr->caplen > snaplen) {
+ snap_phdr = *phdr;
+ snap_phdr.caplen = snaplen;
+ phdr = &snap_phdr;
+ }
+
+ if (!wtap_dump(pdh, phdr, wtap_pseudoheader(wth),
+ wtap_buf_ptr(wth), &write_err)) {
+ got_write_error = TRUE;
+ break;
+ }
+ }
+
+ merge_close_in_files(in_file_count, in_files);
+ if (!got_read_error && !got_write_error) {
+ if (!wtap_dump_close(pdh, &write_err))
+ got_write_error = TRUE;
+ } else
+ wtap_dump_close(pdh, &close_err);
+
+ if (got_read_error) {
+ /*
+ * Find the file on which we got the error, and report the error.
+ */
+ for (i = 0; i < in_file_count; i++) {
+ if (in_files[i].state == GOT_ERROR) {
+ fprintf(stderr, "mergecap: Error reading %s: %s\n",
+ in_files[i].filename, wtap_strerror(read_err));
+ switch (read_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;
+ }
+ }
+ }
+ }
- close_in_files(in_file_count, in_files);
- close_outfile(&out_file);
+ if (got_write_error) {
+ fprintf(stderr, "mergecap: Error writing to outfile: %s\n",
+ wtap_strerror(write_err));
+ }
free(in_files);
- return 0;
+ return (!got_read_error && !got_write_error) ? 0 : 2;
}