a1b1c8bed5
This reverts commit 1abeb277f5
.
This isn't building, and looks as if it requires significant work to fix.
Change-Id: I622b1bb243e353e874883a302ab419532b7601f2
Reviewed-on: https://code.wireshark.org/review/1568
Reviewed-by: Guy Harris <guy@alum.mit.edu>
553 lines
16 KiB
C
553 lines
16 KiB
C
/* Combine dump files, either by appending or by merging by timestamp
|
|
*
|
|
* Wireshark - Network traffic analyzer
|
|
* By Gerald Combs <gerald@wireshark.org>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
* 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
|
|
*
|
|
*/
|
|
|
|
#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>
|
|
#endif
|
|
|
|
#include <string.h>
|
|
#include "wtap.h"
|
|
|
|
#ifndef HAVE_GETOPT
|
|
#include <wsutil/wsgetopt.h>
|
|
#endif
|
|
|
|
#include <wsutil/strnatcmp.h>
|
|
#include <wsutil/file_util.h>
|
|
|
|
#include <wiretap/merge.h>
|
|
|
|
#include "version.h"
|
|
|
|
#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)
|
|
{
|
|
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 (int)number;
|
|
}
|
|
|
|
static int
|
|
get_positive_int(const char *string, const char *name)
|
|
{
|
|
int number;
|
|
|
|
number = get_natural_int(string, name);
|
|
|
|
if (number == 0) {
|
|
fprintf(stderr, "mergecap: The specified %s is zero\n", name);
|
|
exit(1);
|
|
}
|
|
|
|
return number;
|
|
}
|
|
|
|
/*
|
|
* Show the usage
|
|
*/
|
|
static void
|
|
usage(gboolean is_error)
|
|
{
|
|
FILE *output;
|
|
|
|
if (!is_error) {
|
|
output = stdout;
|
|
}
|
|
else {
|
|
output = stderr;
|
|
}
|
|
|
|
fprintf(output, "Mergecap %s"
|
|
#ifdef GITVERSION
|
|
" (" GITVERSION " from " GITBRANCH ")"
|
|
#endif
|
|
"\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 */
|
|
};
|
|
|
|
static gint
|
|
string_compare(gconstpointer a, gconstpointer b)
|
|
{
|
|
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);
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
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_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);
|
|
}
|
|
}
|
|
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;
|
|
#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, "aF:hs:T:vw:")) != -1) {
|
|
|
|
switch (opt) {
|
|
case 'a':
|
|
do_append = !do_append;
|
|
break;
|
|
|
|
case 'F':
|
|
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 'h':
|
|
usage(FALSE);
|
|
exit(0);
|
|
break;
|
|
|
|
case 's':
|
|
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 'v':
|
|
verbose = TRUE;
|
|
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();
|
|
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_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_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 (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 = 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) */
|
|
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;
|
|
}
|
|
|
|
if (!wtap_dump(pdh, phdr, wtap_buf_ptr(in_file->wth), &write_err)) {
|
|
got_write_error = TRUE;
|
|
break;
|
|
}
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
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:
|
|
*/
|
|
|