-/* Combine two dump files, either by appending or by merging by timestamp
+/* Combine dump files, either by appending or by merging by timestamp
*
* $Id$
*
#include "wtap.h"
#ifndef HAVE_GETOPT
-#include "wsutil/wsgetopt.h"
+#include <wsutil/wsgetopt.h>
#endif
-#define WS_BUILD_DLL
-#define RESET_SYMBOL_EXPORT /* wsutil/wsgetopt.h set export behavior above. */
-#include "epan/strnatcmp.h"
-#undef WS_BUILD_DLL
-#define RESET_SYMBOL_EXPORT
+#include <wsutil/strnatcmp.h>
+#include <wsutil/file_util.h>
+
+#include <wiretap/merge.h>
#include "svnversion.h"
-#include "merge.h"
-#include "wsutil/file_util.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
static int
get_natural_int(const char *string, const char *name)
{
- long number;
+ 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);
+ name, string);
exit(1);
}
if (number < 0) {
- fprintf(stderr, "mergecap: The specified %s is a negative number\n",
- name);
+ 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);
+ name, INT_MAX);
exit(1);
}
return (int)number;
number = get_natural_int(string, name);
if (number == 0) {
- fprintf(stderr, "mergecap: The specified %s is zero\n",
- name);
+ fprintf(stderr, "mergecap: The specified %s is zero\n", name);
exit(1);
}
* Show the usage
*/
static void
-usage(void)
+usage(gboolean is_error)
{
+ FILE *output;
+
+ if (!is_error) {
+ output = stdout;
+ }
+ else {
+ output = stderr;
+ }
- fprintf(stderr, "Mergecap %s"
+ fprintf(output, "Mergecap %s"
#ifdef SVNVERSION
- " (" SVNVERSION " from " SVNPATH ")"
+ " (" SVNVERSION " from " SVNPATH ")"
#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> [<infile> ...]\n");
- fprintf(stderr, "\n");
- fprintf(stderr, "Output:\n");
- fprintf(stderr, " -a concatenate rather than merge files.\n");
- fprintf(stderr, " default is to merge 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 pcapng.\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");
+ "\n", VERSION);
+ 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 */
+ const char *sstr; /* The short string */
+ const char *lstr; /* The long string */
};
static gint
string_compare(gconstpointer a, gconstpointer b)
{
- return strcmp(((const struct string_elem *)a)->sstr,
- ((const struct string_elem *)b)->sstr);
+ return strcmp(((const struct string_elem *)a)->sstr,
+ ((const struct string_elem *)b)->sstr);
}
static gint
string_nat_compare(gconstpointer a, gconstpointer b)
{
- return strnatcmp(((const struct string_elem *)a)->sstr,
- ((const struct string_elem *)b)->sstr);
+ return strnatcmp(((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);
+ fprintf(stderr, " %s - %s\n", ((struct string_elem *)data)->sstr,
+ ((struct string_elem *)data)->lstr);
}
static void
struct string_elem *captypes;
GSList *list = NULL;
- captypes = g_new(struct string_elem,WTAP_NUM_FILE_TYPES);
+ 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; i++) {
+ for (i = 0; i < WTAP_NUM_FILE_TYPES_SUBTYPES; i++) {
if (wtap_dump_can_open(i)) {
- captypes[i].sstr = wtap_file_type_short_string(i);
- captypes[i].lstr = wtap_file_type_string(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);
}
}
static void
list_encap_types(void) {
- int i;
- 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++) {
- 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);
- }
+ int i;
+ 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++) {
+ 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);
}
- g_slist_foreach(list, string_elem_print, NULL);
- g_slist_free(list);
- g_free(encaps);
+ }
+ g_slist_foreach(list, string_elem_print, NULL);
+ g_slist_free(list);
+ g_free(encaps);
}
int
main(int argc, char *argv[])
{
- int opt;
-
- gboolean do_append = FALSE;
- gboolean verbose = FALSE;
- int in_file_count = 0;
- guint snaplen = 0;
+ int opt;
+ gboolean do_append = FALSE;
+ gboolean verbose = FALSE;
+ int in_file_count = 0;
+ guint snaplen = 0;
#ifdef PCAP_NG_DEFAULT
- int file_type = WTAP_FILE_PCAPNG; /* default to pcap format */
+ int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; /* default to pcap format */
#else
- int file_type = WTAP_FILE_PCAP; /* default to pcapng format */
+ 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;
+ 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;
+ 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);
#endif /* _WIN32 */
/* Process the options first */
- while ((opt = getopt(argc, argv, "hvas:T:F:w:")) != -1) {
+ while ((opt = getopt(argc, argv, "aF:hs:T:vw:")) != -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':
+ usage(FALSE);
+ exit(0);
break;
case 's':
snaplen = get_positive_int(optarg, "snapshot length");
break;
- case 'h':
- usage();
- exit(0);
+ 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 'v':
+ verbose = TRUE;
+ break;
+
+ case 'w':
+ out_filename = optarg;
break;
case '?': /* Bad options if GNU getopt */
list_encap_types();
break;
default:
- usage();
+ usage(TRUE);
}
exit(1);
break;
-
}
-
}
/* check for proper args; at a minimum, must have an output
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));
+ wtap_strerror(open_err));
switch (open_err) {
case WTAP_ERR_UNSUPPORTED:
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)));
+ wtap_file_type_subtype_string(wtap_file_type_subtype(in_files[i].wth)));
}
if (snaplen == 0) {
}
/* prepare the outfile */
- if(file_type == WTAP_FILE_PCAPNG ){
- wtapng_section_t *shb_hdr;
+ 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);
+ 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. */
+ 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);
+ } 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);
}
merge_close_in_files(in_file_count, in_files);
- if (!got_read_error && !got_write_error) {
+ if (!got_write_error) {
if (!wtap_dump_close(pdh, &write_err))
got_write_error = TRUE;
- } else
- wtap_dump_close(pdh, &close_err);
+ } 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);
+ }
if (got_read_error) {
/*
case WTAP_ERR_UNSUPPORTED_ENCAP:
/*
- * This is a problem with the particular frame we're writing;
- * note that, and give the frame number.
+ * 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 file with that format\n.",
- in_file->packet_num, in_file->filename);
+ fprintf(stderr, "mergecap: Frame %u of \"%s\" has a network type that can't be saved in a \"%s\" file.\n",
+ in_file->packet_num, in_file->filename,
+ 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->packet_num, in_file->filename,
+ wtap_file_type_subtype_string(file_type));
break;
default:
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