#include <wsutil/cmdarg_err.h>
#include <wsutil/filesystem.h>
#include <wsutil/file_util.h>
-#include <wsutil/md5.h>
+#include <wsutil/wsgcrypt.h>
#include <wsutil/plugins.h>
#include <wsutil/privileges.h>
-#include <wsutil/report_err.h>
+#include <wsutil/report_message.h>
#include <wsutil/strnatcmp.h>
#include <wsutil/str_util.h>
-#include <ws_version_info.h>
+#include <version_info.h>
#include <wsutil/pint.h>
#include <wsutil/strtoi.h>
#include <wiretap/wtap_opttypes.h>
#include <wiretap/pcapng.h>
+#include "ui/failure_message.h"
+
#include "ringbuffer.h" /* For RINGBUFFER_MAX_NUM_FILES */
+#define INVALID_OPTION 1
+#define INVALID_FILE 2
+#define CANT_EXTRACT_PREFIX 2
+#define WRITE_ERROR 2
+#define DUMP_ERROR 2
+
/*
* Some globals so we can pass things to various routines
*/
* Duplicate frame detection
*/
typedef struct _fd_hash_t {
- md5_byte_t digest[16];
+ guint8 digest[16];
guint32 len;
nstime_t frame_time;
} fd_hash_t;
if (max_selected >= MAX_SELECTIONS) {
/* Let the user know we stopped selecting */
- fprintf(stderr, "Out of room for packet selections!\n");
+ fprintf(stderr, "Out of room for packet selections.\n");
return(FALSE);
}
if (verbose)
fprintf(stderr, "Inclusive ...");
+ *locn = '\0'; /* split the range */
next = locn + 1;
selectfrm[max_selected].inclusive = TRUE;
selectfrm[max_selected].first = get_guint32(sel, "beginning of packet range");
return 0;
}
-static void
+static gboolean
set_time_adjustment(char *optarg_str_p)
{
char *frac, *end;
size_t frac_digits;
if (!optarg_str_p)
- return;
+ return TRUE;
/* skip leading whitespace */
while (*optarg_str_p == ' ' || *optarg_str_p == '\t')
|| val == LONG_MIN || val == LONG_MAX) {
fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
if (val < 0) { /* implies '--' since we caught '-' above */
fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
}
time_adj.tv.secs = val;
|| val > ONE_BILLION || val == LONG_MIN || val == LONG_MAX) {
fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
} else {
- return; /* no fractional digits */
+ return TRUE; /* no fractional digits */
}
/* adjust fractional portion from fractional to numerator
}
time_adj.tv.nsecs = (int)val;
+ return TRUE;
}
-static void
+static gboolean
set_strict_time_adj(char *optarg_str_p)
{
char *frac, *end;
size_t frac_digits;
if (!optarg_str_p)
- return;
+ return TRUE;
/* skip leading whitespace */
while (*optarg_str_p == ' ' || *optarg_str_p == '\t')
|| val == LONG_MIN || val == LONG_MAX) {
fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
if (val < 0) { /* implies '--' since we caught '-' above */
fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
}
strict_time_adj.tv.secs = val;
|| val > ONE_BILLION || val == LONG_MIN || val == LONG_MAX) {
fprintf(stderr, "editcap: \"%s\" isn't a valid time adjustment\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
} else {
- return; /* no fractional digits */
+ return TRUE; /* no fractional digits */
}
/* adjust fractional portion from fractional to numerator
}
strict_time_adj.tv.nsecs = (int)val;
+ return TRUE;
}
-static void
+static gboolean
set_rel_time(char *optarg_str_p)
{
char *frac, *end;
size_t frac_digits;
if (!optarg_str_p)
- return;
+ return TRUE;
/* skip leading whitespace */
while (*optarg_str_p == ' ' || *optarg_str_p == '\t')
|| val == LONG_MIN || val == LONG_MAX) {
fprintf(stderr, "1: editcap: \"%s\" isn't a valid rel time value\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
if (val < 0) { /* implies '--' since we caught '-' above */
fprintf(stderr, "2: editcap: \"%s\" isn't a valid rel time value\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
}
relative_time_window.secs = val;
|| val > ONE_BILLION || val == LONG_MIN || val == LONG_MAX) {
fprintf(stderr, "3: editcap: \"%s\" isn't a valid rel time value\n",
optarg_str_p);
- exit(1);
+ return FALSE;
}
} else {
- return; /* no fractional digits */
+ return TRUE; /* no fractional digits */
}
/* adjust fractional portion from fractional to numerator
}
relative_time_window.nsecs = (int)val;
+ return TRUE;
}
#define LINUX_SLL_OFFSETP 14
static gboolean
is_duplicate(guint8* fd, guint32 len) {
int i;
- md5_state_t ms;
/*Hint to ignore some bytes at the start of the frame for the digest calculation(-I option) */
+ guint32 offset = ignored_bytes;
guint32 new_len;
guint8 *new_fd;
- new_fd = &fd[ignored_bytes];
- new_len = len - (ignored_bytes);
+ if (len <= ignored_bytes) {
+ offset = 0;
+ }
+
+ new_fd = &fd[offset];
+ new_len = len - (offset);
cur_dup_entry++;
if (cur_dup_entry >= dup_window)
cur_dup_entry = 0;
/* Calculate our digest */
- md5_init(&ms);
- md5_append(&ms, new_fd, new_len);
- md5_finish(&ms, fd_hash[cur_dup_entry].digest);
+ gcry_md_hash_buffer(GCRY_MD_MD5, fd_hash[cur_dup_entry].digest, new_fd, new_len);
fd_hash[cur_dup_entry].len = len;
static gboolean
is_duplicate_rel_time(guint8* fd, guint32 len, const nstime_t *current) {
int i;
- md5_state_t ms;
/*Hint to ignore some bytes at the start of the frame for the digest calculation(-I option) */
+ guint32 offset = ignored_bytes;
guint32 new_len;
guint8 *new_fd;
- new_fd = &fd[ignored_bytes];
- new_len = len - (ignored_bytes);
+ if (len <= ignored_bytes) {
+ offset = 0;
+ }
+
+ new_fd = &fd[offset];
+ new_len = len - (offset);
cur_dup_entry++;
if (cur_dup_entry >= dup_window)
cur_dup_entry = 0;
/* Calculate our digest */
- md5_init(&ms);
- md5_append(&ms, new_fd, new_len);
- md5_finish(&ms, fd_hash[cur_dup_entry].digest);
+ gcry_md_hash_buffer(GCRY_MD_MD5, fd_hash[cur_dup_entry].digest, new_fd, new_len);
fd_hash[cur_dup_entry].len = len;
fd_hash[cur_dup_entry].frame_time.secs = current->secs;
fprintf(output, " (e.g. 0.000001).\n");
fprintf(output, " -a <framenum>:<comment> Add or replace comment for given frame number\n");
fprintf(output, "\n");
- fprintf(output, " -I <bytes to ignore> ignore the specified bytes at the beginning of\n");
- fprintf(output, " the frame during MD5 hash calculation.\n");
+ fprintf(output, " -I <bytes to ignore> ignore the specified number of bytes at the beginning\n");
+ fprintf(output, " of the frame during MD5 hash calculation, unless the\n");
+ fprintf(output, " frame is too short, then the full frame is used.\n");
fprintf(output, " Useful to remove duplicated packets taken on\n");
fprintf(output, " several routers (different mac addresses for\n");
fprintf(output, " example).\n");
fprintf(output, " If -v is used with any of the 'Duplicate Packet\n");
fprintf(output, " Removal' options (-d, -D or -w) then Packet lengths\n");
fprintf(output, " and MD5 hashes are printed to standard-error.\n");
- fprintf(output, "\n");
}
struct string_elem {
}
static void
-string_elem_print(gpointer data, gpointer not_used _U_)
+string_elem_print(gpointer data, gpointer stream_ptr)
{
- fprintf(stderr, " %s - %s\n",
+ fprintf((FILE *) stream_ptr, " %s - %s\n",
((struct string_elem *)data)->sstr,
((struct string_elem *)data)->lstr);
}
static void
-list_capture_types(void) {
+list_capture_types(FILE *stream) {
int i;
struct string_elem *captypes;
GSList *list = NULL;
captypes = g_new(struct string_elem,WTAP_NUM_FILE_TYPES_SUBTYPES);
- fprintf(stderr, "editcap: The available capture file types for the \"-F\" flag are:\n");
+ fprintf(stream, "editcap: 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);
list = g_slist_insert_sorted(list, &captypes[i], string_compare);
}
}
- g_slist_foreach(list, string_elem_print, NULL);
+ g_slist_foreach(list, string_elem_print, stream);
g_slist_free(list);
g_free(captypes);
}
static void
-list_encap_types(void) {
+list_encap_types(FILE *stream) {
int i;
struct string_elem *encaps;
GSList *list = NULL;
encaps = (struct string_elem *)g_malloc(sizeof(struct string_elem) * WTAP_NUM_ENCAP_TYPES);
- fprintf(stderr, "editcap: The available encapsulation types for the \"-T\" flag are:\n");
+ fprintf(stream, "editcap: 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) {
list = g_slist_insert_sorted(list, &encaps[i], string_nat_compare);
}
}
- g_slist_foreach(list, string_elem_print, NULL);
+ g_slist_foreach(list, string_elem_print, stream);
g_slist_free(list);
g_free(encaps);
}
}
/*
- * General errors are reported with an console message in editcap.
+ * General errors and warnings are reported with an console message
+ * in editcap.
*/
static void
-failure_message(const char *msg_format, va_list ap)
+failure_warning_message(const char *msg_format, va_list ap)
{
fprintf(stderr, "editcap: ");
vfprintf(stderr, msg_format, ap);
static void
failure_message_cont(const char *msg_format, va_list ap)
{
- vfprintf(stderr, msg_format, ap);
- fprintf(stderr, "\n");
+ vfprintf(stderr, msg_format, ap);
+ fprintf(stderr, "\n");
}
static wtap_dumper *
{
GString *comp_info_str;
GString *runtime_info_str;
- wtap *wth;
+ char *init_progfile_dir_error;
+ wtap *wth = NULL;
int i, j, read_err, write_err;
gchar *read_err_info, *write_err_info;
int opt;
GArray *shb_hdrs = NULL;
GArray *nrb_hdrs = NULL;
char *shb_user_appl;
+ int ret = EXIT_SUCCESS;
-#ifdef HAVE_PLUGINS
- char* init_progfile_dir_error;
-#endif
-
- cmdarg_err_init(failure_message, failure_message_cont);
+ cmdarg_err_init(failure_warning_message, failure_message_cont);
#ifdef _WIN32
arg_list_utf_16to8(argc, argv);
* 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("editcap: init_progfile_dir(): %s", init_progfile_dir_error);
+ /*
+ * Attempt to get the pathname of the directory containing the
+ * executable file.
+ */
+ init_progfile_dir_error = init_progfile_dir(argv[0], main);
+ if (init_progfile_dir_error != NULL) {
+ fprintf(stderr,
+ "editcap: Can't get pathname of directory containing the editcap program: %s.\n",
+ 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);
+ wtap_init();
- /* Scan for plugins. This does *not* call their registration routines;
- that's done later.
+#ifdef HAVE_PLUGINS
+ /* Register wiretap plugins */
+ init_report_message(failure_warning_message, failure_warning_message,
+ NULL, NULL, NULL);
- 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). */
- scan_plugins(DONT_REPORT_LOAD_FAILURE);
+ /* Scan for plugins. This does *not* call their registration routines;
+ that's done later.
- /* Register all libwiretap plugin modules. */
- register_all_wiretap_modules();
- }
+ 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). */
+ scan_plugins(DONT_REPORT_LOAD_FAILURE);
+
+ /* Register all libwiretap plugin modules. */
+ register_all_wiretap_modules();
#endif
/* Process the options */
if ((sscanf(optarg, "%u:%n", &frame_number, &string_start_index) < 1) || (string_start_index == 0)) {
fprintf(stderr, "editcap: \"%s\" isn't a valid <frame>:<comment>\n\n",
optarg);
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
/* Lazily create the table */
if (!strptime(optarg,"%Y-%m-%d %T", &starttm)) {
fprintf(stderr, "editcap: \"%s\" isn't a valid time format\n\n",
optarg);
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
check_startstop = TRUE;
if (!strptime(optarg,"%Y-%m-%d %T", &stoptm)) {
fprintf(stderr, "editcap: \"%s\" isn't a valid time format\n\n",
optarg);
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
check_startstop = TRUE;
stoptm.tm_isdst = -1;
default:
fprintf(stderr, "editcap: \"%s\" isn't a valid chop length or offset:length\n",
optarg);
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
break;
}
if (dup_window > MAX_DUP_DEPTH) {
fprintf(stderr, "editcap: \"%d\" duplicate window value must be between 0 and %d inclusive.\n",
dup_window, MAX_DUP_DEPTH);
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
break;
if (p == optarg || err_prob < 0.0 || err_prob > 1.0) {
fprintf(stderr, "editcap: probability \"%s\" must be between 0.0 and 1.0\n",
optarg);
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
srand( (unsigned int) (time(NULL) + ws_getpid()) );
break;
if (out_file_type_subtype < 0) {
fprintf(stderr, "editcap: \"%s\" isn't a valid capture file type\n\n",
optarg);
- list_capture_types();
- exit(1);
+ list_capture_types(stderr);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
break;
"See https://www.wireshark.org for more information.\n",
get_ws_vcs_version_info());
print_usage(stdout);
- exit(0);
+ goto clean_exit;
break;
case 'i': /* break capture file based on time interval */
- secs_per_block = get_positive_int(optarg, "time interval");
+ secs_per_block = get_nonzero_guint32(optarg, "time interval");
break;
case 'I': /* ignored_bytes at the beginning of the frame for duplications removal */
- ignored_bytes = get_positive_int(optarg, "number of bytes to ignore");
+ ignored_bytes = get_guint32(optarg, "number of bytes to ignore");
break;
case 'L':
break;
case 'S':
- set_strict_time_adj(optarg);
+ if (!set_strict_time_adj(optarg)) {
+ ret = INVALID_OPTION;
+ goto clean_exit;
+ }
do_strict_time_adjustment = TRUE;
break;
case 't':
- set_time_adjustment(optarg);
+ if (!set_time_adjustment(optarg)) {
+ ret = INVALID_OPTION;
+ goto clean_exit;
+ }
break;
case 'T':
if (out_frame_type < 0) {
fprintf(stderr, "editcap: \"%s\" isn't a valid encapsulation type\n\n",
optarg);
- list_encap_types();
- exit(1);
+ list_encap_types(stderr);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
break;
show_version("Editcap (Wireshark)", comp_info_str, runtime_info_str);
g_string_free(comp_info_str, TRUE);
g_string_free(runtime_info_str, TRUE);
- exit(0);
+ goto clean_exit;
break;
case 'w':
dup_detect = FALSE;
dup_detect_by_time = TRUE;
dup_window = MAX_DUP_DEPTH;
- set_rel_time(optarg);
+ if (!set_rel_time(optarg)) {
+ ret = INVALID_OPTION;
+ goto clean_exit;
+ }
break;
case '?': /* Bad options if GNU getopt */
switch(optopt) {
case'F':
- list_capture_types();
+ list_capture_types(stdout);
break;
case'T':
- list_encap_types();
+ list_encap_types(stdout);
break;
default:
print_usage(stderr);
+ ret = INVALID_OPTION;
break;
}
- exit(1);
+ goto clean_exit;
break;
}
} /* processing commmand-line options */
if ((argc - optind) < 1) {
print_usage(stderr);
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
if (check_startstop && !stoptime) {
if (starttime > stoptime) {
fprintf(stderr, "editcap: start time is after the stop time\n");
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
if (split_packet_count != 0 && secs_per_block != 0) {
fprintf(stderr, "editcap: can't split on both packet count and time interval\n");
fprintf(stderr, "editcap: at the same time\n");
- exit(1);
+ ret = INVALID_OPTION;
+ goto clean_exit;
}
wth = wtap_open_offline(argv[optind], WTAP_TYPE_AUTO, &read_err, &read_err_info, FALSE);
if (!wth) {
- fprintf(stderr, "editcap: Can't open %s: %s\n", argv[optind],
- wtap_strerror(read_err));
- if (read_err_info != NULL) {
- fprintf(stderr, "(%s)\n", read_err_info);
- g_free(read_err_info);
- }
- exit(2);
+ cfile_open_failure_message("editcap", argv[optind], read_err,
+ read_err_info);
+ ret = INVALID_FILE;
+ goto clean_exit;
}
if (verbose) {
/* Extra actions for the first packet */
if (read_count == 1) {
if (split_packet_count != 0 || secs_per_block != 0) {
- if (!fileset_extract_prefix_suffix(argv[optind+1], &fprefix, &fsuffix))
- goto error_on_exit;
+ if (!fileset_extract_prefix_suffix(argv[optind+1], &fprefix, &fsuffix)) {
+ ret = CANT_EXTRACT_PREFIX;
+ goto clean_exit;
+ }
filename = fileset_get_filename_by_pattern(block_cnt++, phdr, fprefix, fsuffix);
} else {
shb_hdrs, idb_inf, nrb_hdrs, &write_err);
if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n",
- filename, wtap_strerror(write_err));
- goto error_on_exit;
+ cfile_dump_open_failure_message("editcap", filename,
+ write_err,
+ out_file_type_subtype);
+ ret = INVALID_FILE;
+ goto clean_exit;
}
} /* first packet only handling */
block_start = phdr->ts;
}
if (secs_per_block != 0) {
- while ((phdr->ts.secs - block_start.secs > secs_per_block)
- || (phdr->ts.secs - block_start.secs == secs_per_block
+ while (((guint32)(phdr->ts.secs - block_start.secs) > secs_per_block)
+ || ((guint32)(phdr->ts.secs - block_start.secs) == secs_per_block
&& phdr->ts.nsecs >= block_start.nsecs )) { /* time for the next file */
if (!wtap_dump_close(pdh, &write_err)) {
- fprintf(stderr, "editcap: Error writing to %s: %s\n",
- filename, wtap_strerror(write_err));
- goto error_on_exit;
+ cfile_close_failure_message(filename, write_err);
+ ret = WRITE_ERROR;
+ goto clean_exit;
}
block_start.secs = block_start.secs + secs_per_block; /* reset for next interval */
g_free(filename);
shb_hdrs, idb_inf, nrb_hdrs, &write_err);
if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n",
- filename, wtap_strerror(write_err));
- goto error_on_exit;
+ cfile_dump_open_failure_message("editcap", filename,
+ write_err,
+ out_file_type_subtype);
+ ret = INVALID_FILE;
+ goto clean_exit;
}
}
}
/* time for the next file? */
if (written_count > 0 && (written_count % split_packet_count) == 0) {
if (!wtap_dump_close(pdh, &write_err)) {
- fprintf(stderr, "editcap: Error writing to %s: %s\n",
- filename, wtap_strerror(write_err));
- goto error_on_exit;
+ cfile_close_failure_message(filename, write_err);
+ ret = WRITE_ERROR;
+ goto clean_exit;
}
g_free(filename);
snaplen ? MIN(snaplen, wtap_snapshot_length(wth)) : wtap_snapshot_length(wth),
shb_hdrs, idb_inf, nrb_hdrs, &write_err);
if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n",
- filename, wtap_strerror(write_err));
- goto error_on_exit;
+ cfile_dump_open_failure_message("editcap", filename,
+ write_err,
+ out_file_type_subtype);
+ ret = INVALID_FILE;
+ goto clean_exit;
}
}
} /* split packet handling */
if (frames_user_comments) {
const char *comment =
(const char*)g_tree_lookup(frames_user_comments, GUINT_TO_POINTER(read_count));
+ /* XXX: What about comment changed to no comment? */
if (comment != NULL) {
/* Copy and change rather than modify returned phdr */
temp_phdr = *phdr;
temp_phdr.opt_comment = g_strdup(comment);
+ temp_phdr.has_comment_changed = TRUE;
+ phdr = &temp_phdr;
+ } else {
+ temp_phdr = *phdr;
+ temp_phdr.has_comment_changed = FALSE;
phdr = &temp_phdr;
}
}
/* Attempt to dump out current frame to the output file */
if (!wtap_dump(pdh, phdr, buf, &write_err, &write_err_info)) {
- switch (write_err) {
- case WTAP_ERR_UNWRITABLE_ENCAP:
- /*
- * This is a problem with the particular frame we're
- * writing and the file type and subtype we're
- * writing; note that, and report the frame number
- * and file type/subtype.
- */
- fprintf(stderr,
- "editcap: Frame %u of \"%s\" has a network type that can't be saved in a \"%s\" file.\n",
- read_count, argv[optind],
- wtap_file_type_subtype_string(out_file_type_subtype));
- 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
- * writing; note that, and report the frame number
- * and file type/subtype.
- */
- fprintf(stderr,
- "editcap: Frame %u of \"%s\" is too large for a \"%s\" file.\n",
- read_count, argv[optind],
- wtap_file_type_subtype_string(out_file_type_subtype));
- 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
- * writing; note that, and report the record number
- * and file type/subtype.
- */
- fprintf(stderr,
- "editcap: Record %u of \"%s\" has a record type that can't be saved in a \"%s\" file.\n",
- read_count, argv[optind],
- wtap_file_type_subtype_string(out_file_type_subtype));
- 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
- * writing; note that, and report the record number
- * and file type/subtype.
- */
- fprintf(stderr,
- "editcap: Record %u of \"%s\" has data that can't be saved in a \"%s\" file.\n(%s)\n",
- read_count, argv[optind],
- wtap_file_type_subtype_string(out_file_type_subtype),
- write_err_info != NULL ? write_err_info : "no information supplied");
- g_free(write_err_info);
- break;
-
- default:
- fprintf(stderr, "editcap: Error writing to %s: %s\n",
- filename, wtap_strerror(write_err));
- break;
- }
- goto error_on_exit;
+ cfile_write_failure_message("editcap", argv[optind],
+ filename,
+ write_err, write_err_info,
+ read_count,
+ out_file_type_subtype);
+ ret = DUMP_ERROR;
+ goto clean_exit;
}
written_count++;
}
if (read_err != 0) {
/* Print a message noting that the read failed somewhere along the
* line. */
- fprintf(stderr,
- "editcap: An error occurred while reading \"%s\": %s.\n",
- argv[optind], wtap_strerror(read_err));
- if (read_err_info != NULL) {
- fprintf(stderr, "(%s)\n", read_err_info);
- g_free(read_err_info);
- }
+ cfile_read_failure_message("editcap", argv[optind], read_err,
+ read_err_info);
}
if (!pdh) {
snaplen ? MIN(snaplen, wtap_snapshot_length(wth)): wtap_snapshot_length(wth),
shb_hdrs, idb_inf, nrb_hdrs, &write_err);
if (pdh == NULL) {
- fprintf(stderr, "editcap: Can't open or create %s: %s\n",
- filename, wtap_strerror(write_err));
- goto error_on_exit;
+ cfile_dump_open_failure_message("editcap", filename,
+ write_err,
+ out_file_type_subtype);
+ ret = INVALID_FILE;
+ goto clean_exit;
}
}
if (!wtap_dump_close(pdh, &write_err)) {
- fprintf(stderr, "editcap: Error writing to %s: %s\n", filename,
- wtap_strerror(write_err));
- goto error_on_exit;
+ cfile_close_failure_message(filename, write_err);
+ ret = WRITE_ERROR;
+ goto clean_exit;
}
g_free(filename);
(long int)relative_time_window.nsecs);
}
+clean_exit:
wtap_block_array_free(shb_hdrs);
wtap_block_array_free(nrb_hdrs);
g_free(idb_inf);
- wtap_close(wth);
-
- return 0;
-
-error_on_exit:
- wtap_block_array_free(shb_hdrs);
- wtap_block_array_free(nrb_hdrs);
- g_free(idb_inf);
- exit(2);
+ if (wth != NULL)
+ wtap_close(wth);
+ wtap_cleanup();
+ free_progdirs();
+#ifdef HAVE_PLUGINS
+ plugins_cleanup();
+#endif
+ return ret;
}
/* Skip meta-information read from file to return offset of real
git.samba.org / metze / wireshark / wip.git / blobdiff