*
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <getopt.h>
#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
#ifdef HAVE_LIBZ
-#include <zlib.h> /* to get the libz version number */
+#include <zlib.h> /* to get the libz version number */
#endif
#include <string.h>
#include "wtap.h"
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
#include <wsutil/wsgetopt.h>
#endif
-#include <wsutil/strnatcmp.h>
-#include <wsutil/file_util.h>
+#include <wsutil/clopts_common.h>
+#include <wsutil/cmdarg_err.h>
#include <wsutil/crash_info.h>
-#include <wsutil/copyright_info.h>
-#include <wsutil/os_version_info.h>
+#include <wsutil/file_util.h>
+#include <wsutil/strnatcmp.h>
+#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#include <wiretap/merge.h>
-#include "version_info.h"
-
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
#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;
-}
-
-static void
-show_version(GString *comp_info_str, GString *runtime_info_str)
-{
- printf("Mergecap (Wireshark) %s\n"
- "\n"
- "%s"
- "\n"
- "%s"
- "\n"
- "%s",
- get_ws_vcs_version_info(), get_copyright_info(),
- comp_info_str->str, runtime_info_str->str);
-}
-
/*
* Show the usage
*/
fprintf(output, " -v verbose output.\n");
}
+/*
+ * Report an error in command-line arguments.
+ */
+static void
+mergecap_cmdarg_err(const char *fmt, va_list ap)
+{
+ fprintf(stderr, "mergecap: ");
+ vfprintf(stderr, fmt, ap);
+ fprintf(stderr, "\n");
+}
+
+/*
+ * 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");
+}
+
struct string_elem {
const char *sstr; /* The short string */
const char *lstr; /* The long string */
static gint
string_nat_compare(gconstpointer a, gconstpointer b)
{
- return strnatcmp(((const struct string_elem *)a)->sstr,
- ((const struct string_elem *)b)->sstr);
+ return ws_ascii_strnatcmp(((const struct string_elem *)a)->sstr,
+ ((const struct string_elem *)b)->sstr);
}
static void
GString *comp_info_str;
GString *runtime_info_str;
int opt;
+DIAG_OFF(cast-qual)
static const struct option long_options[] = {
{(char *)"help", no_argument, NULL, 'h'},
{(char *)"version", no_argument, NULL, 'V'},
{0, 0, 0, 0 }
};
+DIAG_ON(cast-qual)
gboolean do_append = FALSE;
gboolean verbose = FALSE;
int in_file_count = 0;
struct wtap_pkthdr *phdr, snap_phdr;
wtap_dumper *pdh;
int open_err, read_err = 0, write_err, close_err;
- gchar *err_info;
+ gchar *err_info, *write_err_info = NULL;
int err_fileno;
char *out_filename = NULL;
gboolean got_read_error = FALSE, got_write_error = FALSE;
int count;
+ cmdarg_err_init(mergecap_cmdarg_err, mergecap_cmdarg_err_cont);
+
#ifdef _WIN32
arg_list_utf_16to8(argc, argv);
create_app_running_mutex();
#endif /* _WIN32 */
- /* Assemble the compile-time version information string */
- comp_info_str = g_string_new("Compiled ");
- get_compiled_version_info(comp_info_str, NULL, get_mergecap_compiled_info);
+ /* Get the compile-time version information string */
+ comp_info_str = get_compiled_version_info(NULL, get_mergecap_compiled_info);
- /* Assemble the run-time version information string */
- runtime_info_str = g_string_new("Running ");
- get_runtime_version_info(runtime_info_str, get_mergecap_runtime_info);
+ /* Get the run-time version information string */
+ runtime_info_str = get_runtime_version_info(get_mergecap_runtime_info);
/* Add it to the information to be reported on a crash. */
ws_add_crash_info("Mergecap (Wireshark) %s\n"
break;
case 'V':
- show_version(comp_info_str, runtime_info_str);
+ 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);
&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:
+ if (err_info != NULL) {
fprintf(stderr, "(%s)\n", err_info);
g_free(err_info);
- break;
}
return 2;
}
if(file_type == WTAP_FILE_TYPE_SUBTYPE_PCAPNG ){
wtapng_section_t *shb_hdr;
GString *comment_gstr;
+ wtapng_iface_descriptions_t *idb_inf = NULL, *idb_inf_merge_file;
+ wtapng_if_descr_t int_data, *file_int_data;
+ guint itf_count, itf_id = 0;
shb_hdr = g_new(wtapng_section_t,1);
comment_gstr = g_string_new("File created by merging: \n");
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->shb_user_appl = g_strdup("mergecap"); /* NULL if not available, UTF-8 string containing the name of the application used to create this section. */
+
+ if (frame_type == WTAP_ENCAP_PER_PACKET) {
+ /* create fake IDB info */
+ idb_inf = g_new(wtapng_iface_descriptions_t,1);
+ /* TODO make this the number of DIFFERENT encapsulation types
+ * check that snaplength is the same too?
+ */
+ idb_inf->interface_data = g_array_new(FALSE, FALSE, sizeof(wtapng_if_descr_t));
+
+ for (i = 0; i < in_file_count; i++) {
+ idb_inf_merge_file = wtap_file_get_idb_info(in_files[i].wth);
+ for (itf_count = 0; itf_count < idb_inf_merge_file->interface_data->len; itf_count++) {
+ /* read the interface data from the in file to our combined interface data */
+ file_int_data = &g_array_index (idb_inf_merge_file->interface_data, wtapng_if_descr_t, itf_count);
+ int_data.wtap_encap = file_int_data->wtap_encap;
+ int_data.time_units_per_second = file_int_data->time_units_per_second;
+ int_data.link_type = file_int_data->link_type;
+ int_data.snap_len = file_int_data->snap_len;
+ int_data.if_name = g_strdup(file_int_data->if_name);
+ int_data.opt_comment = NULL;
+ int_data.if_description = NULL;
+ int_data.if_speed = 0;
+ int_data.if_tsresol = 6;
+ int_data.if_filter_str = NULL;
+ int_data.bpf_filter_len = 0;
+ int_data.if_filter_bpf_bytes = NULL;
+ int_data.if_os = NULL;
+ int_data.if_fcslen = -1;
+ int_data.num_stat_entries = 0; /* Number of ISB:s */
+ int_data.interface_statistics = NULL;
+
+ g_array_append_val(idb_inf->interface_data, int_data);
+ }
+ g_free(idb_inf_merge_file);
+
+ /* Set fake interface Id in per file data */
+ in_files[i].interface_id = itf_id;
+ itf_id += itf_count;
+ }
+ }
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);
+ FALSE /* compressed */, shb_hdr, 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 (verbose)
- fprintf(stderr, "Record: %u\n", count++);
+ fprintf(stderr, "Record: %d\n", count++);
/* We simply write it, perhaps after truncating it; we could do other
* things, like modify it. */
snap_phdr.caplen = snaplen;
phdr = &snap_phdr;
}
+ if ((file_type == WTAP_FILE_TYPE_SUBTYPE_PCAPNG) && (frame_type == WTAP_ENCAP_PER_PACKET)) {
+ if (phdr->presence_flags & WTAP_HAS_INTERFACE_ID) {
+ phdr->interface_id += in_file->interface_id;
+ } else {
+ phdr->interface_id = in_file->interface_id;
+ phdr->presence_flags = phdr->presence_flags | WTAP_HAS_INTERFACE_ID;
+ }
+ }
- if (!wtap_dump(pdh, phdr, wtap_buf_ptr(in_file->wth), &write_err)) {
+ if (!wtap_dump(pdh, phdr, wtap_buf_ptr(in_file->wth), &write_err, &write_err_info)) {
got_write_error = TRUE;
break;
}
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:
+ if (err_info != NULL) {
fprintf(stderr, "(%s)\n", err_info);
g_free(err_info);
- break;
}
}
}
if (got_write_error) {
switch (write_err) {
- case WTAP_ERR_UNSUPPORTED_ENCAP:
+ case WTAP_ERR_UNWRITABLE_ENCAP:
/*
* This is a problem with the particular frame we're writing and
* the file type and subtype we're wwriting; note that, 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.",
+ 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;
+
+ case WTAP_ERR_UNWRITABLE_REC_TYPE:
+ /*
+ * This is a problem with the particular record we're writing and
+ * the file type and subtype we're wwriting; note that, and
+ * report the record number and file type/subtype.
+ */
+ fprintf(stderr, "mergecap: Record %u of \"%s\" has a record 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_UNWRITABLE_REC_DATA:
+ /*
+ * This is a problem with the particular record we're writing and
+ * the file type and subtype we're wwriting; note that, and
+ * report the record number and file type/subtype.
+ */
+ fprintf(stderr, "mergecap: Record %u of \"%s\" has data that can't be saved in a \"%s\" file.\n(%s)\n",
+ in_file ? in_file->packet_num : 0, in_file ? in_file->filename : "UNKNOWN",
+ wtap_file_type_subtype_string(file_type),
+ write_err_info != NULL ? write_err_info : "no information supplied");
+ g_free(write_err_info);
+ break;
+
default:
fprintf(stderr, "mergecap: Error writing to outfile: %s\n",
wtap_strerror(write_err));
git.samba.org / metze / wireshark / wip.git / blobdiff