/* Combine two dump files, either by appending or by merging by timestamp
*
- * $Id: mergecap.c,v 1.1 2001/07/12 19:59:39 guy 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 <sys/time.h>
#endif
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
-
#include <string.h>
#include "wtap.h"
#include "getopt.h"
#endif
-#ifndef MAX
-# define MAX(a,b) ((a)>(b))?(a):(b)
-#endif
-
-/*
- * Some globals so we can pass things to various routines
- */
-static int count = 1;
-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 int do_append = 0; /* append, don't merge */
-static unsigned int snaplen = 0; /* No limit */
+#include "svnversion.h"
+#include "merge.h"
+#include "file_util.h"
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
-/*
- * Routine to write frame to output file
- */
-static void
-write_frame(u_char *user, const struct wtap_pkthdr *phdr, int offset,
- union wtap_pseudo_header *pseudo_header, const u_char *buf)
+static int
+get_natural_int(const char *string, const char *name)
{
- wtap_dumper *pdh = (wtap_dumper*)user;
- int err;
- struct wtap_pkthdr snap_phdr;
-
- if (verbose)
- printf("Record: %u\n", count++);
-
- /* We simply write it, perhaps after truncating it; we could do other
- * things, like modify it. */
- if (snaplen != 0 && phdr->caplen > snaplen) {
- snap_phdr = *phdr;
- snap_phdr.caplen = snaplen;
- phdr = &snap_phdr;
- }
+ long number;
+ char *p;
- if (!wtap_dump(pdh, phdr, pseudo_header, buf, &err)) {
- fprintf(stderr, "editcap: Error writing to output: %s\n",
- 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);
}
-}
-
-/*
- * routine to append file2 to file1
- */
-static void
-append(wtap *wth_1, wtap *wth_2, wtap_dumper *pdh)
-{
- int err;
-
- if (!wtap_loop(wth_1, 0, write_frame, (u_char*)pdh, &err)) {
- fprintf(stderr, "mergecap: Error appending: %s\n",
- wtap_strerror(err));
+ if (number < 0) {
+ fprintf(stderr, "mergecap: The specified %s is a negative number\n",
+ name);
+ exit(1);
}
- if (!wtap_loop(wth_2, 0, write_frame, (u_char*)pdh, &err)) {
- fprintf(stderr, "mergecap: Error appending: %s\n",
- wtap_strerror(err));
+ if (number > INT_MAX) {
+ fprintf(stderr, "mergecap: The specified %s is too large (greater than %d)\n",
+ name, INT_MAX);
+ exit(1);
}
+ return number;
}
-/*
- * judges whether the first argument has an earlier
- * timestamp than the second
- */
-static gboolean
-is_earlier(struct wtap_pkthdr *one, struct wtap_pkthdr *two)
+static int
+get_positive_int(const char *string, const char *name)
{
- if (one->ts.tv_sec > two->ts.tv_sec) {
- return FALSE;
- } else if (one->ts.tv_sec < two->ts.tv_sec) {
- return TRUE;
- } else if (one->ts.tv_usec > two->ts.tv_usec) {
- return FALSE;
+ long number;
+
+ number = get_natural_int(string, name);
+
+ if (number == 0) {
+ fprintf(stderr, "mergecap: The specified %s is zero\n",
+ name);
+ exit(1);
}
- /* either one < two or one == two
- * either way, return one
- */
- return TRUE;
+
+ return number;
}
/*
- * actually merge the files
+ * Show the usage
*/
static void
-merge(wtap *wth_1, wtap *wth_2, wtap_dumper *pdh)
+usage(void)
{
- int err;
- int data_offset_1, data_offset_2, loop = 0;
- gboolean ok_1, ok_2;
- ok_1 = wtap_read(wth_1, &err, &data_offset_1);
- ok_2 = wtap_read(wth_2, &err, &data_offset_2);
+ fprintf(stderr, "Mergecap %s"
+#ifdef SVNVERSION
+ " (" SVNVERSION ")"
+#endif
+ "\n", VERSION);
+ fprintf(stderr, "Merge two or more capture files into one.\n");
+ fprintf(stderr, "See http://www.wireshark.org for more information.\n");
+ fprintf(stderr, "\n");
+ fprintf(stderr, "Usage: mergecap [options] -w <outfile|-> <infile> ...\n");
+ fprintf(stderr, "\n");
+ fprintf(stderr, "Output:\n");
+ fprintf(stderr, " -a files should be concatenated, not merged\n");
+ fprintf(stderr, " Default merges based on frame timestamps\n");
+ fprintf(stderr, " -s <snaplen> truncate packets to <snaplen> bytes of data\n");
+ fprintf(stderr, " -w <outfile|-> set the output filename to <outfile> or '-' for stdout\n");
+ fprintf(stderr, " -F <capture type> set the output file type, default is libpcap\n");
+ fprintf(stderr, " an empty \"-F\" option will list the file types\n");
+ fprintf(stderr, " -T <encap type> set the output file encapsulation type,\n");
+ fprintf(stderr, " default is the same as the first input file\n");
+ fprintf(stderr, " an empty \"-T\" option will list the encapsulation types\n");
+ fprintf(stderr, "\n");
+ fprintf(stderr, "Miscellaneous:\n");
+ fprintf(stderr, " -h display this help and exit\n");
+ fprintf(stderr, " -v verbose output\n");
+}
- while (ok_1 && ok_2) {
+static void list_capture_types(void) {
+ int i;
- /* if wth_1 is earlier, then write it and fetch another
- * otherwise, write wth_2 and increment it
- */
- if (is_earlier(wtap_phdr(wth_1), wtap_phdr(wth_2))) {
- write_frame((u_char*)pdh, wtap_phdr(wth_1), data_offset_1,
- wtap_pseudoheader(wth_1), wtap_buf_ptr(wth_1));
- ok_1 = wtap_read(wth_1, &err, &data_offset_1);
- } else{
- write_frame((u_char*)pdh, wtap_phdr(wth_2), data_offset_2,
- wtap_pseudoheader(wth_2), wtap_buf_ptr(wth_2));
- ok_2 = wtap_read(wth_2, &err, &data_offset_2);
+ fprintf(stderr, "mergecap: The available capture file types for \"F\":\n");
+ for (i = 0; i < WTAP_NUM_FILE_TYPES; i++) {
+ if (wtap_dump_can_open(i))
+ fprintf(stderr, " %s - %s\n",
+ wtap_file_type_short_string(i), wtap_file_type_string(i));
}
- }
-
- while (ok_1) {
- write_frame((u_char*)pdh, wtap_phdr(wth_1), data_offset_1,
- wtap_pseudoheader(wth_1), wtap_buf_ptr(wth_1));
- ok_1 = wtap_read(wth_1, &err, &data_offset_1);
- }
- while (ok_2) {
- write_frame((u_char*)pdh, wtap_phdr(wth_2), data_offset_2,
- wtap_pseudoheader(wth_2), wtap_buf_ptr(wth_2));
- ok_2 = wtap_read(wth_2, &err, &data_offset_2);
- }
}
-/*
- * routine to open the input and output files, then call the merge
- */
-static void
-merge_files(const char *from1, const char *from2, const char *into)
-{
- int err;
- wtap *wth_1, *wth_2;
- wtap_dumper *pdh;
-
- /* open the input files */
- wth_1 = wtap_open_offline(from1, &err, FALSE);
- if (!wth_1) {
- fprintf(stderr, "mergecap: Can't open %s: %s\n", from1,
- wtap_strerror(err));
- exit(1);
- }
-
- wth_2 = wtap_open_offline(from2, &err, FALSE);
- if (!wth_2) {
- fprintf(stderr, "mergecap: Can't open %s: %s\n", from2,
- wtap_strerror(err));
- wtap_close(wth_1);
- exit(1);
- }
+static void list_encap_types(void) {
+ int i;
+ const char *string;
- if (verbose) {
- fprintf(stderr, "File %s is a %s capture file.\n", from1,
- wtap_file_type_string(wtap_file_type(wth_1)));
- fprintf(stderr, "File %s is a %s capture file.\n", from2,
- wtap_file_type_string(wtap_file_type(wth_2)));
- }
-
- /* open the output file */
- if (out_frame_type == -2)
- out_frame_type = wtap_file_encap(wth_1);
- pdh = wtap_dump_open(into, out_file_type, out_frame_type,
- MAX(wtap_snapshot_length(wth_1),
- wtap_snapshot_length(wth_2)), &err);
- if (!pdh) {
- fprintf(stderr, "mergecap: Can't open/create %s: %s\n", into,
- wtap_strerror(err));
- wtap_close(wth_1);
- wtap_close(wth_2);
- exit(1);
- }
-
- if (do_append)
- append(wth_1, wth_2, pdh);
- else
- merge(wth_1, wth_2, pdh);
-
- wtap_close(wth_1);
- wtap_close(wth_2);
- if (!wtap_dump_close(pdh, &err)) {
- fprintf(stderr, "mergecap: Error writing to %s: %s\n", into,
- wtap_strerror(err));
- exit(1);
- }
-}
-
-void usage()
-{
- int i;
- const char *string;
-
- fprintf(stderr, "Usage: mergecap [-v] [-a] [-s <snaplen>]\n");
- fprintf(stderr, " [-T <encap type>] [-F <capture type>]\n");
- fprintf(stderr, " <infile1> <infile2> <outfile>\n\n");
- fprintf(stderr, " where\t-a infile2 should be appended, not merged.\n");
- fprintf(stderr, " \t Default merges based on frame timestamps.\n");
- fprintf(stderr, " \t-s <snaplen> truncate packets to <snaplen>\n");
- fprintf(stderr, " \t bytes of data\n");
- fprintf(stderr, " \t-v verbose operation, default is silent\n");
- fprintf(stderr, " \t-h produces this help listing.\n");
- fprintf(stderr, " \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",
- 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");
- for (i = 0; i < WTAP_NUM_FILE_TYPES; i++) {
- if (wtap_dump_can_open(i))
- fprintf(stderr, " \t %s - %s\n",
- wtap_file_type_short_string(i), wtap_file_type_string(i));
- }
- fprintf(stderr, " \t default is libpcap\n");
+ fprintf(stderr, "mergecap: The available encapsulation types for \"T\":\n");
+ for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) {
+ string = wtap_encap_short_string(i);
+ if (string != NULL)
+ fprintf(stderr, " %s - %s\n",
+ string, wtap_encap_string(i));
+ }
}
int
main(int argc, char *argv[])
{
- wtap *wth;
- int i, err;
extern char *optarg;
- extern int optind;
- char opt;
- char *p;
+ extern int optind;
+ int opt;
+ gboolean do_append = FALSE;
+ gboolean verbose = FALSE;
+ int in_file_count = 0;
+ 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, "aT:F:vs:h")) != EOF) {
+ while ((opt = getopt(argc, argv, "hvas:T:F:w:")) != -1) {
switch (opt) {
+ case 'w':
+ out_filename = optarg;
+ break;
+
case 'a':
do_append = !do_append;
break;
-
+
case 'T':
- out_frame_type = wtap_short_string_to_encap(optarg);
- if (out_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);
+ list_encap_types();
exit(1);
}
break;
case 'F':
- out_file_type = wtap_short_string_to_file_type(optarg);
- if (out_file_type < 0) {
- fprintf(stderr, "editcap: \"%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);
+ list_capture_types();
exit(1);
}
break;
case 'v':
- verbose = !verbose; /* Just invert */
+ verbose = TRUE;
break;
case 's':
- snaplen = strtol(optarg, &p, 10);
- if (p == optarg || *p != '\0') {
- fprintf(stderr, "editcap: \"%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);
usage();
- exit(1);
+ exit(0);
break;
case '?': /* Bad options if GNU getopt */
- usage();
+ switch(optopt) {
+ case'F':
+ list_capture_types();
+ break;
+ case'T':
+ list_encap_types();
+ break;
+ default:
+ usage();
+ }
exit(1);
break;
}
- /* should now have three arguments left: infile1, infile2, outfile */
-#ifdef DEBUG
- printf("Optind = %i, argc = %i\n", optind, argc);
-#endif
+ /* check for proper args; at a minimum, must have an output
+ * filename and one input file
+ */
+ in_file_count = argc - optind;
+ if (!out_filename) {
+ fprintf(stderr, "mergecap: an output filename must be set with -w\n");
+ 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 */
+ 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);
+ }
- if ((argc - optind) < 3) {
- usage();
+ /* set the outfile frame type */
+ 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 (strncmp(out_filename, "-", 2) == 0) {
+ /* use stdout as the outfile */
+ out_fd = 1 /*stdout*/;
+ } else {
+ /* open the outfile */
+ out_fd = eth_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, FALSE /* compressed */, &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);
}
- merge_files(argv[optind], argv[optind+1], argv[optind+2]);
+ /* do the merge (or append) */
+ 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;
+ }
+ }
+ }
+ }
+
+ 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;
}
-
git.samba.org / obnox / wireshark / wip.git / blobdiff