-/* Combine two dump files, either by appending or by merging by timestamp
+/* Combine dump files, either by appending or by merging by timestamp
*
- * $Id: mergecap.c,v 1.18 2004/02/20 20:36:13 gerald Exp $
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
*
- * Written by Scott Renfro <scott@renfro.org> based on
+ * 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.
+ *
+ * Mergecap written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris
*
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <stdio.h>
#include <stdlib.h>
+#include <errno.h>
#include <glib.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <string.h>
#include "wtap.h"
-#ifdef NEED_GETOPT_H
-#include "getopt.h"
+#ifndef HAVE_GETOPT
+#include <wsutil/wsgetopt.h>
#endif
-#include "cvsversion.h"
+#include <wsutil/strnatcmp.h>
+#include <wsutil/file_util.h>
-/*
- * Global variables
- */
-static int verbose = 0; /* Not so verbose */
+#include <wiretap/merge.h>
-/*
- * Structures to manage our files
- */
-typedef struct in_file_t {
- const char *filename;
- wtap *wth;
- int err;
- gchar *err_info;
- 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;
+#include "version.h"
-/*
- * 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)
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef _WIN32
+#include <wsutil/unicode-utils.h>
+#endif /* _WIN32 */
+
+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", 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;
- }
+ long number;
+ char *p;
- if (!wtap_dump(pdh, phdr, pseudo_header, buf, &err)) {
- fprintf(stderr, "mergecap: Error writing to %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);
}
-}
-
-
-/*
- * routine to concatenate files
- */
-static void
-append(int count, in_file_t in_files[], out_file_t *out_file)
-{
- int i;
- int err;
- gchar *err_info;
-
- for (i = 0; i < count; i++) {
- if (!wtap_loop(in_files[i].wth, 0, write_frame,
- (guchar*)out_file->pdh, &err, &err_info)) {
- fprintf(stderr, "mergecap: Error reading %s to append to %s: %s\n",
- in_files[i].filename, out_file->filename, 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);
- break;
- }
- }
+ if (number < 0) {
+ fprintf(stderr, "mergecap: The specified %s is a negative number\n", name);
+ exit(1);
}
-}
-
-
-/*
- * 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;
+ if (number > INT_MAX) {
+ fprintf(stderr, "mergecap: The specified %s is too large (greater than %d)\n",
+ name, INT_MAX);
+ exit(1);
}
- /* either one < two or one == two
- * either way, return one
- */
- return TRUE;
+ return (int)number;
}
-
-/*
- * 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};
+get_positive_int(const char *string, const char *name)
+{
+ int number;
- for (i = 0; i < count; i++) {
- struct wtap_pkthdr *phdr = wtap_phdr(in_files[i].wth);
+ number = get_natural_int(string, name);
- if (in_files[i].ok && is_earlier(&(phdr->ts), &tv)) {
- tv = phdr->ts;
- ei = i;
- }
+ if (number == 0) {
+ fprintf(stderr, "mergecap: The specified %s is zero\n", name);
+ exit(1);
}
- return ei;
+
+ return number;
}
-/*
- * actually merge the files
- */
static void
-merge(int count, in_file_t in_files[], out_file_t *out_file)
+print_version(FILE *output)
{
- 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].err_info),
- &(in_files[i].data_offset));
- }
-
- /* 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].err_info),
- &(in_files[i].data_offset));
- }
+ fprintf(output, "Mergecap %s"
+#ifdef GITVERSION
+ " (" GITVERSION " from " GITBRANCH ")"
+#endif
+ "\n", VERSION);
}
-
/*
- * 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.
+ * Show the usage
*/
-static int
-select_frame_type(int count, in_file_t files[])
+static void
+usage(gboolean is_error)
{
- 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;
- }
- }
+ FILE *output;
- if (verbose) {
- fprintf(stderr, "mergecap: selected frame_type %s (%s)\n",
- wtap_encap_string(selected_frame_type),
- wtap_encap_short_string(selected_frame_type));
+ if (!is_error) {
+ output = stdout;
}
-
- return selected_frame_type;
-}
-
-
-/*
- * 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));
- exit(1);
+ else {
+ output = stderr;
}
+
+ print_version(output);
+ fprintf(output, "Merge two or more capture files into one.\n");
+ fprintf(output, "See http://www.wireshark.org for more information.\n");
+ fprintf(output, "\n");
+ fprintf(output, "Usage: mergecap [options] -w <outfile>|- <infile> [<infile> ...]\n");
+ fprintf(output, "\n");
+ fprintf(output, "Output:\n");
+ fprintf(output, " -a concatenate rather than merge files.\n");
+ fprintf(output, " default is to merge based on frame timestamps.\n");
+ fprintf(output, " -s <snaplen> truncate packets to <snaplen> bytes of data.\n");
+ fprintf(output, " -w <outfile>|- set the output filename to <outfile> or '-' for stdout.\n");
+ fprintf(output, " -F <capture type> set the output file type; default is pcapng.\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 first 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");
}
+struct string_elem {
+ const char *sstr; /* The short string */
+ const char *lstr; /* The long string */
+};
-/*
- * 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)
+static gint
+string_compare(gconstpointer a, gconstpointer b)
{
- int err;
- if (!out_file) {
- fprintf(stderr, "mergecap: internal error (null out_file)\n");
- 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;
- }
- return TRUE;
+ return strcmp(((const struct string_elem *)a)->sstr,
+ ((const struct string_elem *)b)->sstr);
}
-
-/*
- * Scan through input files and find maximum snapshot length
- */
-static int
-max_snapshot_length(int count, in_file_t in_files[])
+static gint
+string_nat_compare(gconstpointer a, gconstpointer b)
{
- 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;
+ return strnatcmp(((const struct string_elem *)a)->sstr,
+ ((const struct string_elem *)b)->sstr);
}
-
-/*
- * Scan through and close each input file
- */
static void
-close_in_files(int count, in_file_t in_files[])
+string_elem_print(gpointer data, gpointer not_used _U_)
{
- int i;
- for (i = 0; i < count; i++) {
- wtap_close(in_files[i].wth);
- }
+ fprintf(stderr, " %s - %s\n", ((struct string_elem *)data)->sstr,
+ ((struct string_elem *)data)->lstr);
}
-
-/*
- * Scan through the arguments and open the input files
- */
-static int
-open_in_files(int argc, char *argv[], in_file_t *in_files[])
-{
+static void
+list_capture_types(void) {
int i;
- int count = 0;
- int err;
- gchar *err_info;
- in_file_t *files;
- int files_size = argc * sizeof(in_file_t);
+ struct string_elem *captypes;
+ GSList *list = NULL;
+ captypes = g_new(struct string_elem,WTAP_NUM_FILE_TYPES_SUBTYPES);
- files = malloc(files_size);
- if (!files) {
- fprintf(stderr, "mergecap: error allocating %d bytes of memory\n",
- files_size);
- 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, &err_info, 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));
- 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;
- }
- } else {
- if (verbose) {
- fprintf(stderr, "mergecap: %s is type %s.\n", argv[i],
- wtap_file_type_string(wtap_file_type(files[count].wth)));
- }
- count++;
+ fprintf(stderr, "mergecap: 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);
+ captypes[i].lstr = wtap_file_type_subtype_string(i);
+ list = g_slist_insert_sorted(list, &captypes[i], string_compare);
}
}
- if (verbose)
- fprintf(stderr, "mergecap: opened %d of %d input files\n", count,
- argc);
-
- return count;
+ g_slist_foreach(list, string_elem_print, NULL);
+ g_slist_free(list);
+ g_free(captypes);
}
-
-/*
- * Show the usage
- */
static void
-usage(void)
-{
+list_encap_types(void) {
int i;
- const char *string;
-
- 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");
+ struct string_elem *encaps;
+ GSList *list = NULL;
+
+ encaps = g_new(struct string_elem,WTAP_NUM_ENCAP_TYPES);
+ fprintf(stderr, "mergecap: The available encapsulation types for the \"-T\" flag are:\n");
for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) {
- string = wtap_encap_short_string(i);
- if (string != NULL)
- printf(" \t %s - %s\n",
- string, wtap_encap_string(i));
- }
- 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))
- printf(" \t %s - %s\n",
- wtap_file_type_short_string(i), wtap_file_type_string(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_nat_compare);
+ }
}
- printf(" \t default is libpcap\n");
+ g_slist_foreach(list, string_elem_print, NULL);
+ g_slist_free(list);
+ g_free(encaps);
}
-
-
int
main(int argc, char *argv[])
{
- extern char *optarg;
- extern int optind;
- int opt;
- char *p;
- gboolean do_append = 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 */
+ int opt;
+ static const struct option long_options[] = {
+ {(char *)"help", no_argument, NULL, 'h'},
+ {(char *)"version", no_argument, NULL, 'V'},
+ {0, 0, 0, 0 }
+ };
+ gboolean do_append = FALSE;
+ gboolean verbose = FALSE;
+ int in_file_count = 0;
+ guint snaplen = 0;
+#ifdef PCAP_NG_DEFAULT
+ int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; /* default to pcap format */
+#else
+ int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAP; /* default to pcapng format */
+#endif
+ int frame_type = -2;
+ int out_fd;
+ merge_in_file_t *in_files = NULL, *in_file;
+ int i;
+ struct wtap_pkthdr *phdr, snap_phdr;
+ wtap_dumper *pdh;
+ int open_err, read_err = 0, 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;
+
+#ifdef _WIN32
+ arg_list_utf_16to8(argc, argv);
+ create_app_running_mutex();
+#endif /* _WIN32 */
/* Process the options first */
- while ((opt = getopt(argc, argv, "hvas:T:F:w:")) != -1) {
+ while ((opt = getopt_long(argc, argv, "aF:hs:T:vVw:", long_options, NULL)) != -1) {
switch (opt) {
- case 'w':
- out_file.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",
- 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",
- optarg);
- exit(1);
+ file_type = wtap_short_string_to_file_type_subtype(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 */
+ case 'h':
+ usage(FALSE);
+ exit(0);
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 'T':
+ 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 'h':
- printf("mergecap version %s"
-#ifdef CVSVERSION
- " (" CVSVERSION ")"
-#endif
- "\n", VERSION);
- usage();
+ case 'v':
+ verbose = TRUE;
+ break;
+
+ case 'V':
+ print_version(stdout);
exit(0);
break;
+ case 'w':
+ out_filename = optarg;
+ break;
+
case '?': /* Bad options if GNU getopt */
- usage();
+ switch(optopt) {
+ case'F':
+ list_capture_types();
+ break;
+ case'T':
+ list_encap_types();
+ break;
+ default:
+ usage(TRUE);
+ }
exit(1);
break;
-
}
-
}
/* check for proper args; at a minimum, must have an output
* 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");
fprintf(stderr, " run with -h for help\n");
- exit(1);
+ 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_FILE:
+ 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_subtype_string(wtap_file_type_subtype(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 = ws_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, g_strerror(errno));
+ exit(1);
+ }
+ }
+
+ /* prepare the outfile */
+ if(file_type == WTAP_FILE_TYPE_SUBTYPE_PCAPNG ){
+ wtapng_section_t *shb_hdr;
+ GString *comment_gstr;
+
+ shb_hdr = g_new(wtapng_section_t,1);
+ comment_gstr = g_string_new("File created by merging: \n");
+
+ for (i = 0; i < in_file_count; i++) {
+ g_string_append_printf(comment_gstr, "File%d: %s \n",i+1,in_files[i].filename);
+ }
+ shb_hdr->section_length = -1;
+ /* options */
+ shb_hdr->opt_comment = comment_gstr->str; /* NULL if not available */
+ shb_hdr->shb_hardware = NULL; /* NULL if not available, UTF-8 string containing the description of the hardware used to create this section. */
+ shb_hdr->shb_os = NULL; /* NULL if not available, UTF-8 string containing the name of the operating system used to create this section. */
+ shb_hdr->shb_user_appl = "mergecap"; /* NULL if not available, UTF-8 string containing the name of the application used to create this section. */
+
+ pdh = wtap_dump_fdopen_ng(out_fd, file_type, frame_type, snaplen,
+ FALSE /* compressed */, shb_hdr, NULL /* wtapng_iface_descriptions_t *idb_inf */, &open_err);
+ g_string_free(comment_gstr, TRUE);
+ } else {
+ 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);
+ g_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)
+ in_file = merge_append_read_packet(in_file_count, in_files, &read_err,
+ &err_info);
+ else
+ in_file = merge_read_packet(in_file_count, in_files, &read_err,
+ &err_info);
+ if (in_file == NULL) {
+ /* EOF */
+ break;
+ }
+
+ if (read_err != 0) {
+ /* I/O error reading from in_file */
+ 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(in_file->wth);
+ if (snaplen != 0 && phdr->caplen > snaplen) {
+ snap_phdr = *phdr;
+ snap_phdr.caplen = snaplen;
+ phdr = &snap_phdr;
+ }
- close_in_files(in_file_count, in_files);
- close_outfile(&out_file);
+ if (!wtap_dump(pdh, phdr, wtap_buf_ptr(in_file->wth), &write_err)) {
+ got_write_error = TRUE;
+ break;
+ }
+ }
- free(in_files);
+ merge_close_in_files(in_file_count, in_files);
+ if (!got_write_error) {
+ if (!wtap_dump_close(pdh, &write_err))
+ got_write_error = TRUE;
+ } else {
+ /*
+ * We already got a write error; no need to report another
+ * write error on close.
+ *
+ * Don't overwrite the earlier write error.
+ */
+ (void)wtap_dump_close(pdh, &close_err);
+ }
- return 0;
+ 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_FILE:
+ fprintf(stderr, "(%s)\n", err_info);
+ g_free(err_info);
+ break;
+ }
+ }
+ }
+ }
+
+ if (got_write_error) {
+ switch (write_err) {
+
+ case WTAP_ERR_UNSUPPORTED_ENCAP:
+ /*
+ * This is a problem with the particular frame we're writing and
+ * the file type and subtype we're wwriting; note that, and
+ * report the frame number and file type/subtype.
+ */
+ fprintf(stderr, "mergecap: Frame %u of \"%s\" has a network type that can't be saved in a \"%s\" file.\n",
+ in_file ? in_file->packet_num : 0, in_file ? in_file->filename : "UNKNOWN",
+ wtap_file_type_subtype_string(file_type));
+ 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 wwriting; note that, and
+ * report the frame number and file type/subtype.
+ */
+ fprintf(stderr, "mergecap: Frame %u of \"%s\" is too large for a \"%s\" file\n.",
+ in_file ? in_file->packet_num : 0, in_file ? in_file->filename : "UNKNOWN",
+ wtap_file_type_subtype_string(file_type));
+ break;
+
+ default:
+ fprintf(stderr, "mergecap: Error writing to outfile: %s\n",
+ wtap_strerror(write_err));
+ break;
+ }
+ }
+
+ g_free(in_files);
+
+ return (!got_read_error && !got_write_error) ? 0 : 2;
}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */
+
git.samba.org / metze / wireshark / wip.git / blobdiff