-/* Combine two dump files, either by appending or by merging by timestamp
+/* Combine dump files, either by appending or by merging by timestamp
*
- * $Id$
+ * 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 <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <glib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
#endif
#include <string.h>
-#include "wtap.h"
-#ifdef NEED_GETOPT_H
-#include "getopt.h"
-#endif
+#include <wiretap/wtap.h>
-#include "svnversion.h"
-#include "merge.h"
-#include "file_util.h"
+#ifndef HAVE_GETOPT_LONG
+#include <wsutil/wsgetopt.h>
+#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
+#include <wsutil/clopts_common.h>
+#include <wsutil/cmdarg_err.h>
+#include <wsutil/crash_info.h>
+#include <wsutil/filesystem.h>
+#include <wsutil/file_util.h>
+#include <wsutil/privileges.h>
+#include <wsutil/strnatcmp.h>
+#include <ws_version_info.h>
+
+#ifdef HAVE_PLUGINS
+#include <wsutil/plugins.h>
#endif
-static int
-get_natural_int(const char *string, const char *name)
+#include <wsutil/report_err.h>
+
+#include <wiretap/merge.h>
+
+#ifdef _WIN32
+#include <wsutil/unicode-utils.h>
+#endif /* _WIN32 */
+
+/*
+ * Show the usage
+ */
+static void
+print_usage(FILE *output)
{
- long number;
- char *p;
-
- 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);
- }
- if (number < 0) {
- fprintf(stderr, "mergecap: The specified %s is a negative number\n",
- name);
- exit(1);
- }
- if (number > INT_MAX) {
- fprintf(stderr, "mergecap: The specified %s is too large (greater than %d)\n",
- name, INT_MAX);
- exit(1);
- }
- return number;
+ 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, " -I <IDB merge mode> set the merge mode for Interface Description Blocks; default is 'all'.\n");
+ fprintf(output, " an empty \"-I\" option will list the merge modes.\n");
+ fprintf(output, "\n");
+ fprintf(output, "Miscellaneous:\n");
+ fprintf(output, " -h display this help and exit.\n");
+ fprintf(output, " -v verbose output.\n");
}
-static int
-get_positive_int(const char *string, const char *name)
+/*
+ * Report an error in command-line arguments.
+ */
+static void
+mergecap_cmdarg_err(const char *fmt, va_list ap)
{
- long number;
+ fprintf(stderr, "mergecap: ");
+ vfprintf(stderr, fmt, ap);
+ fprintf(stderr, "\n");
+}
- number = get_natural_int(string, name);
+/*
+ * Report additional information for an error in command-line arguments.
+ */
+static void
+mergecap_cmdarg_err_cont(const char *fmt, va_list ap)
+{
+ vfprintf(stderr, fmt, ap);
+ fprintf(stderr, "\n");
+}
- if (number == 0) {
- fprintf(stderr, "mergecap: The specified %s is zero\n",
- name);
- exit(1);
- }
+struct string_elem {
+ const char *sstr; /* The short string */
+ const char *lstr; /* The long string */
+};
- return number;
+static gint
+string_compare(gconstpointer a, gconstpointer b)
+{
+ return strcmp(((const struct string_elem *)a)->sstr,
+ ((const struct string_elem *)b)->sstr);
+}
+
+static void
+string_elem_print(gpointer data, gpointer not_used _U_)
+{
+ fprintf(stderr, " %s - %s\n", ((struct string_elem *)data)->sstr,
+ ((struct string_elem *)data)->lstr);
}
+#ifdef HAVE_PLUGINS
/*
- * Show the usage
+ * 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).
*/
static void
-usage(void)
+failure_message(const char *msg_format _U_, va_list ap _U_)
{
-
- fprintf(stderr, "Mergecap %s"
-#ifdef SVNVERSION
- " (" SVNVERSION ")"
+ return;
+}
#endif
- "\n", VERSION);
- fprintf(stderr, "Merge two or more capture files into one.\n");
- fprintf(stderr, "See http://www.ethereal.com 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");
+
+static void
+list_capture_types(void) {
+ int i;
+ struct string_elem *captypes;
+ GSList *list = NULL;
+
+ captypes = g_new(struct string_elem,WTAP_NUM_FILE_TYPES_SUBTYPES);
+
+ 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);
+ }
+ }
+ g_slist_foreach(list, string_elem_print, NULL);
+ g_slist_free(list);
+ g_free(captypes);
}
-static void list_capture_types(void) {
- int i;
+static void
+list_idb_merge_modes(void) {
+ int i;
- 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));
- }
+ fprintf(stderr, "mergecap: The available IDB merge modes for the \"-I\" flag are:\n");
+ for (i = 0; i < IDB_MERGE_MODE_MAX; i++) {
+ fprintf(stderr, " %s\n", merge_idb_merge_mode_to_string(i));
+ }
}
-static void list_encap_types(void) {
- int i;
- const char *string;
+static gboolean
+merge_callback(merge_event event, int num,
+ const merge_in_file_t in_files[], const guint in_file_count,
+ void *data _U_)
+{
+ guint i;
- 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));
- }
+ switch (event) {
+
+ case MERGE_EVENT_INPUT_FILES_OPENED:
+ for (i = 0; i < in_file_count; i++) {
+ fprintf(stderr, "mergecap: %s is type %s.\n", in_files[i].filename,
+ wtap_file_type_subtype_string(wtap_file_type_subtype(in_files[i].wth)));
+ }
+ break;
+
+ case MERGE_EVENT_FRAME_TYPE_SELECTED:
+ /* for this event, num = frame_type */
+ if (num == 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(num),
+ wtap_encap_short_string(num));
+ break;
+
+ case MERGE_EVENT_READY_TO_MERGE:
+ fprintf(stderr, "mergecap: ready to merge records\n");
+ break;
+
+ case MERGE_EVENT_PACKET_WAS_READ:
+ /* for this event, num = count */
+ fprintf(stderr, "Record: %d\n", num);
+ break;
+
+ case MERGE_EVENT_DONE:
+ fprintf(stderr, "mergecap: merging complete\n");
+ break;
+ }
+
+ /* false = do not stop merging */
+ return FALSE;
}
+
int
main(int argc, char *argv[])
{
- extern char *optarg;
- 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;
+ GString *comp_info_str;
+ GString *runtime_info_str;
+ int opt;
+ static const struct option long_options[] = {
+ {"help", no_argument, NULL, 'h'},
+ {"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 out_fd;
+ int err = 0;
+ gchar *err_info = NULL;
+ int err_fileno;
+ char *out_filename = NULL;
+ merge_result status;
+ idb_merge_mode mode = IDB_MERGE_MODE_MAX;
+ gboolean use_stdout = FALSE;
+ merge_progress_callback_t cb;
+
+#ifdef HAVE_PLUGINS
+ char *init_progfile_dir_error;
+#endif
+
+ cmdarg_err_init(mergecap_cmdarg_err, mergecap_cmdarg_err_cont);
+
+#ifdef _WIN32
+ arg_list_utf_16to8(argc, argv);
+ create_app_running_mutex();
+#endif /* _WIN32 */
+
+ /* Get the compile-time version information string */
+ comp_info_str = get_compiled_version_info(NULL, NULL);
+
+ /* 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("Mergecap (Wireshark) %s\n"
+ "\n"
+ "%s"
+ "\n"
+ "%s",
+ get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str);
+
+ /*
+ * Get credential information for later use.
+ */
+ init_process_policies();
+ init_open_routines();
+
+#ifdef HAVE_PLUGINS
+ /* Register wiretap plugins */
+ if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) {
+ g_warning("mergecap: init_progfile_dir(): %s", init_progfile_dir_error);
+ g_free(init_progfile_dir_error);
+ } else {
+ /* Register all the plugin types we have. */
+ wtap_register_plugin_types(); /* Types known to libwiretap */
+
+ init_report_err(failure_message,NULL,NULL,NULL);
+
+ /* Scan for plugins. This does *not* call their registration routines;
+ that's done later. */
+ scan_plugins();
+
+ /* Register all libwiretap plugin modules. */
+ register_all_wiretap_modules();
+ }
+#endif
/* Process the options first */
- while ((opt = getopt(argc, argv, "hvas:T:F:w:")) != -1) {
+ while ((opt = getopt_long(argc, argv, "aF:hI:s:vVw:", long_options, NULL)) != -1) {
switch (opt) {
- case 'w':
- out_filename = optarg;
- break;
-
case 'a':
do_append = !do_append;
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 'F':
- file_type = wtap_short_string_to_file_type(optarg);
+ 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);
+ fprintf(stderr, "mergecap: \"%s\" isn't a valid capture file type\n",
+ optarg);
list_capture_types();
- exit(1);
+ exit(1);
}
break;
- case 'v':
- verbose = TRUE;
+ case 'h':
+ printf("Mergecap (Wireshark) %s\n"
+ "Merge two or more capture files into one.\n"
+ "See https://www.wireshark.org for more information.\n",
+ get_ws_vcs_version_info());
+ print_usage(stdout);
+ exit(0);
+ break;
+
+ case 'I':
+ mode = merge_string_to_idb_merge_mode(optarg);
+ if (mode == IDB_MERGE_MODE_MAX) {
+ fprintf(stderr, "mergecap: \"%s\" isn't a valid IDB merge mode\n",
+ optarg);
+ list_idb_merge_modes();
+ exit(1);
+ }
break;
case 's':
snaplen = get_positive_int(optarg, "snapshot length");
break;
- case 'h':
- usage();
+ case 'v':
+ verbose = TRUE;
+ break;
+
+ case 'V':
+ show_version("Mergecap (Wireshark)", comp_info_str, runtime_info_str);
+ g_string_free(comp_info_str, TRUE);
+ g_string_free(runtime_info_str, TRUE);
exit(0);
break;
+ case 'w':
+ out_filename = optarg;
+ break;
+
case '?': /* Bad options if GNU getopt */
switch(optopt) {
case'F':
list_capture_types();
break;
- case'T':
- list_encap_types();
+ case'I':
+ list_idb_merge_modes();
break;
default:
- usage();
+ print_usage(stderr);
}
exit(1);
break;
-
}
-
}
+ cb.callback_func = merge_callback;
+ cb.data = NULL;
+
/* check for proper args; at a minimum, must have an output
* filename and one input file
*/
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);
+ /* setting IDB merge mode must use PCAPNG output */
+ if (mode != IDB_MERGE_MODE_MAX && file_type != WTAP_FILE_TYPE_SUBTYPE_PCAPNG) {
+ fprintf(stderr, "The IDB merge mode can only be used with PCAPNG output format\n");
+ return 1;
}
- /* 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));
- }
+ /* if they didn't set IDB merge mode, set it to our default */
+ if (mode == IDB_MERGE_MODE_MAX) {
+ mode = IDB_MERGE_MODE_ALL_SAME;
}
/* open the outfile */
- if (strncmp(out_filename, "-", 2) == 0) {
+ if (strcmp(out_filename, "-") == 0) {
/* use stdout as the outfile */
+ use_stdout = TRUE;
out_fd = 1 /*stdout*/;
} else {
/* open the outfile */
- out_fd = eth_open(out_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
+ 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, strerror(errno));
+ out_filename, g_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);
}
- /* 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;
- }
+ /* merge the files */
+ status = merge_files(out_fd, out_filename, file_type,
+ (const char *const *) &argv[optind], in_file_count,
+ do_append, mode, snaplen, "mergecap", verbose ? &cb : NULL,
+ &err, &err_info, &err_fileno);
- if (verbose)
- fprintf(stderr, "Record: %u\n", count++);
+ switch (status) {
+ case MERGE_OK:
+ break;
- /* 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;
- }
+ case MERGE_USER_ABORTED:
+ /* we don't catch SIGINT/SIGTERM (yet?), so we couldn't have aborted */
+ g_assert(FALSE);
+ break;
- if (!wtap_dump(pdh, phdr, wtap_pseudoheader(wth),
- wtap_buf_ptr(wth), &write_err)) {
- got_write_error = TRUE;
+ case MERGE_ERR_CANT_OPEN_INFILE:
+ fprintf(stderr, "mergecap: Can't open %s: %s (%s)\n", argv[optind + err_fileno],
+ wtap_strerror(err), err_info ? err_info : "no more information");
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;
- }
- }
- }
- }
+ case MERGE_ERR_CANT_OPEN_OUTFILE:
+ fprintf(stderr, "mergecap: Can't open or create %s: %s\n", out_filename,
+ wtap_strerror(err));
+ if (!use_stdout)
+ ws_close(out_fd);
+ break;
- if (got_write_error) {
- fprintf(stderr, "mergecap: Error writing to outfile: %s\n",
- wtap_strerror(write_err));
+ case MERGE_ERR_CANT_READ_INFILE: /* fall through */
+ case MERGE_ERR_BAD_PHDR_INTERFACE_ID:
+ case MERGE_ERR_CANT_WRITE_OUTFILE:
+ case MERGE_ERR_CANT_CLOSE_OUTFILE:
+ default:
+ fprintf(stderr, "mergecap: %s\n", err_info ? err_info : "unknown error");
+ break;
}
- free(in_files);
+ g_free(err_info);
- return (!got_read_error && !got_write_error) ? 0 : 2;
+ return (status == MERGE_OK) ? 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