/* file.c
* File I/O routines
*
- * $Id: file.c,v 1.153 2000/01/15 00:22:30 gram Exp $
+ * $Id: file.c,v 1.234 2001/03/24 02:07:20 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include <gtk/gtk.h>
-#include <stdio.h>
-
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#endif
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
-#include <sys/stat.h>
#include <errno.h>
-#include <fcntl.h>
#include <signal.h>
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
# include <netinet/in.h>
#endif
+#include <epan.h>
+
#include "gtk/main.h"
+#include "color.h"
+#include "gtk/color_utils.h"
#include "column.h"
#include "packet.h"
#include "print.h"
#include "menu.h"
#include "util.h"
#include "simple_dialog.h"
+#include "progress_dlg.h"
#include "ui_util.h"
+#include "prefs.h"
#include "gtk/proto_draw.h"
-#include "dfilter.h"
+#include "dfilter/dfilter.h"
#include "conversation.h"
#include "globals.h"
+#include "gtk/colors.h"
-#include "plugins.h"
-
-extern GtkWidget *packet_list, *prog_bar, *info_bar, *byte_view, *tree_view;
+extern GtkWidget *packet_list, *info_bar, *byte_nb_ptr, *tree_view;
extern guint file_ctx;
gboolean auto_scroll_live = FALSE;
static guint32 firstsec, firstusec;
static guint32 prevsec, prevusec;
-static void wtap_dispatch_cb(u_char *, const struct wtap_pkthdr *, int,
- const u_char *);
+static void read_packet(capture_file *cf, int offset);
+
+static void rescan_packets(capture_file *cf, const char *action,
+ gboolean refilter, gboolean redissect);
+
+static void set_selected_row(int row);
static void freeze_clist(capture_file *cf);
static void thaw_clist(capture_file *cf);
static char *file_rename_error_message(int err);
static char *file_close_error_message(int err);
+static gboolean copy_binary_file(char *from_filename, char *to_filename);
/* Update the progress bar this many times when reading a file. */
#define N_PROGBAR_UPDATES 100
+/* Number of "frame_data" structures per memory chunk.
+ XXX - is this the right number? */
+#define FRAME_DATA_CHUNK_SIZE 1024
+
int
open_cap_file(char *fname, gboolean is_tempfile, capture_file *cf)
{
int fd;
struct stat cf_stat;
- wth = wtap_open_offline(fname, &err);
+ wth = wtap_open_offline(fname, &err, TRUE);
if (wth == NULL)
goto fail;
close_cap_file(cf, info_bar);
/* Initialize the table of conversations. */
- conversation_init();
+ epan_conversation_init();
/* Initialize protocol-specific variables */
init_all_protocols();
+ /* We're about to start reading the file. */
+ cf->state = FILE_READ_IN_PROGRESS;
+
cf->wth = wth;
- cf->fh = fh;
cf->filed = fd;
cf->f_len = cf_stat.st_size;
cf->cd_t = wtap_file_type(cf->wth);
cf->count = 0;
+ cf->drops_known = FALSE;
cf->drops = 0;
cf->esec = 0;
cf->eusec = 0;
cf->snap = wtap_snapshot_length(cf->wth);
- cf->update_progbar = FALSE;
cf->progbar_quantum = 0;
cf->progbar_nextstep = 0;
firstsec = 0, firstusec = 0;
prevsec = 0, prevusec = 0;
+ cf->plist_chunk = g_mem_chunk_new("frame_data_chunk",
+ sizeof(frame_data),
+ FRAME_DATA_CHUNK_SIZE * sizeof(frame_data),
+ G_ALLOC_AND_FREE);
+ g_assert(cf->plist_chunk);
+
return (0);
fail:
- simple_dialog(ESD_TYPE_WARN, NULL,
+ simple_dialog(ESD_TYPE_CRIT, NULL,
file_open_error_message(err, FALSE), fname);
return (err);
}
void
close_cap_file(capture_file *cf, void *w)
{
- frame_data *fd, *fd_next;
+ /* Die if we're in the middle of reading a file. */
+ g_assert(cf->state != FILE_READ_IN_PROGRESS);
+
+ /* Destroy all popup packet windows, as they refer to packets in the
+ capture file we're closing. */
+ destroy_packet_wins();
- if (cf->fh) {
- file_close(cf->fh);
- cf->fh = NULL;
- }
if (cf->wth) {
wtap_close(cf->wth);
cf->wth = NULL;
/* ...which means we have nothing to save. */
cf->user_saved = FALSE;
- for (fd = cf->plist; fd != NULL; fd = fd_next) {
- fd_next = fd->next;
- g_free(fd);
+ if (cf->plist_chunk != NULL) {
+ g_mem_chunk_destroy(cf->plist_chunk);
+ cf->plist_chunk = NULL;
}
if (cf->rfcode != NULL) {
- dfilter_destroy(cf->rfcode);
+ dfilter_free(cf->rfcode);
cf->rfcode = NULL;
}
cf->plist = NULL;
cf->plist_end = NULL;
unselect_packet(cf); /* nothing to select */
+ cf->first_displayed = NULL;
+ cf->last_displayed = NULL;
/* Clear the packet list. */
gtk_clist_freeze(GTK_CLIST(packet_list));
set_menus_for_unsaved_capture_file(FALSE);
set_menus_for_captured_packets(FALSE);
set_menus_for_selected_packet(FALSE);
+ set_menus_for_capture_in_progress(FALSE);
+ set_menus_for_selected_tree_row(FALSE);
+
+ /* We have no file open. */
+ cf->state = FILE_CLOSED;
}
/* Set the file name in the status line, in the name for the main window,
{
gchar *name_ptr;
size_t msg_len;
- gchar *done_fmt = " File: %s Drops: %u";
+ static const gchar done_fmt_nodrops[] = " File: %s";
+ static const gchar done_fmt_drops[] = " File: %s Drops: %u";
gchar *done_msg;
gchar *win_name_fmt = "%s - Ethereal";
gchar *win_name;
if (!cf->is_tempfile) {
/* Get the last component of the file name, and put that in the
status bar. */
- if ((name_ptr = (gchar *) strrchr(cf->filename, '/')) == NULL)
- name_ptr = cf->filename;
- else
- name_ptr++;
+ name_ptr = get_basename(cf->filename);
} else {
/* The file we read is a temporary file from a live capture;
we don't mention its name in the status bar. */
name_ptr = "<capture>";
}
- msg_len = strlen(name_ptr) + strlen(done_fmt) + 64;
- done_msg = g_malloc(msg_len);
- snprintf(done_msg, msg_len, done_fmt, name_ptr, cf->drops);
+ if (cf->drops_known) {
+ msg_len = strlen(name_ptr) + strlen(done_fmt_drops) + 64;
+ done_msg = g_malloc(msg_len);
+ snprintf(done_msg, msg_len, done_fmt_drops, name_ptr, cf->drops);
+ } else {
+ msg_len = strlen(name_ptr) + strlen(done_fmt_nodrops);
+ done_msg = g_malloc(msg_len);
+ snprintf(done_msg, msg_len, done_fmt_nodrops, name_ptr);
+ }
gtk_statusbar_push(GTK_STATUSBAR(info_bar), file_ctx, done_msg);
g_free(done_msg);
g_free(win_name);
}
-int
-read_cap_file(capture_file *cf)
+read_status_t
+read_cap_file(capture_file *cf, int *err)
{
- gchar *name_ptr, *load_msg, *load_fmt = " Loading: %s...";
- int success;
- int err;
- size_t msg_len;
- char *errmsg;
- char errmsg_errno[1024+1];
- gchar err_str[2048+1];
-
- if ((name_ptr = (gchar *) strrchr(cf->filename, '/')) == NULL)
- name_ptr = cf->filename;
- else
- name_ptr++;
+ gchar *name_ptr, *load_msg, *load_fmt = " Loading: %s...";
+ size_t msg_len;
+ char *errmsg;
+ char errmsg_errno[1024+1];
+ gchar err_str[2048+1];
+ int data_offset;
+ progdlg_t *progbar;
+ gboolean stop_flag;
+ int file_pos;
+ float prog_val;
+
+ name_ptr = get_basename(cf->filename);
msg_len = strlen(name_ptr) + strlen(load_fmt) + 2;
load_msg = g_malloc(msg_len);
snprintf(load_msg, msg_len, load_fmt, name_ptr);
gtk_statusbar_push(GTK_STATUSBAR(info_bar), file_ctx, load_msg);
- g_free(load_msg);
- cf->update_progbar = TRUE;
/* Update the progress bar when it gets to this value. */
cf->progbar_nextstep = 0;
/* When we reach the value that triggers a progress bar update,
bump that value by this amount. */
cf->progbar_quantum = cf->f_len/N_PROGBAR_UPDATES;
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
freeze_clist(cf);
- proto_tree_is_visible = FALSE;
- success = wtap_loop(cf->wth, 0, wtap_dispatch_cb, (u_char *) cf, &err);
+
+ stop_flag = FALSE;
+ progbar = create_progress_dlg(load_msg, "Stop", &stop_flag);
+ g_free(load_msg);
+
+ while ((wtap_read(cf->wth, err, &data_offset))) {
+ /* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
+ when we update it, we have to run the GTK+ main loop to get it
+ to repaint what's pending, and doing so may involve an "ioctl()"
+ to see if there's any pending input from an X server, and doing
+ that for every packet can be costly, especially on a big file. */
+ if (data_offset >= cf->progbar_nextstep) {
+ file_pos = lseek(cf->filed, 0, SEEK_CUR);
+ prog_val = (gfloat) file_pos / (gfloat) cf->f_len;
+ update_progress_dlg(progbar, prog_val);
+ cf->progbar_nextstep += cf->progbar_quantum;
+ }
+
+ if (stop_flag) {
+ /* Well, the user decided to abort the read. Destroy the progress
+ bar, close the capture file, and return READ_ABORTED so our caller
+ can do whatever is appropriate when that happens. */
+ destroy_progress_dlg(progbar);
+ cf->state = FILE_READ_ABORTED; /* so that we're allowed to close it */
+ gtk_clist_thaw(GTK_CLIST(packet_list)); /* undo our freeze */
+ close_cap_file(cf, info_bar);
+ return (READ_ABORTED);
+ }
+ read_packet(cf, data_offset);
+ }
+
+ /* We're done reading the file; destroy the progress bar. */
+ destroy_progress_dlg(progbar);
+
+ /* We're done reading sequentially through the file. */
+ cf->state = FILE_READ_DONE;
+
+ /* Close the sequential I/O side, to free up memory it requires. */
+ wtap_sequential_close(cf->wth);
+
/* Set the file encapsulation type now; we don't know what it is until
we've looked at all the packets, as we don't know until then whether
there's more than one type (and thus whether it's
WTAP_ENCAP_PER_PACKET). */
cf->lnk_t = wtap_file_encap(cf->wth);
- wtap_close(cf->wth);
- cf->wth = NULL;
- cf->filed = open(cf->filename, O_RDONLY);
- cf->fh = filed_open(cf->filed, "r");
+
cf->current_frame = cf->first_displayed;
- /* Make the first row the selected row. */
- gtk_clist_select_row(GTK_CLIST(packet_list), 0, -1);
thaw_clist(cf);
- gtk_progress_set_activity_mode(GTK_PROGRESS(prog_bar), FALSE);
- gtk_progress_set_value(GTK_PROGRESS(prog_bar), 0);
-
gtk_statusbar_pop(GTK_STATUSBAR(info_bar), file_ctx);
set_display_filename(cf);
/* Enable menu items that make sense if you have some captured packets. */
set_menus_for_captured_packets(TRUE);
- if (!success) {
+ /* If we have any displayed packets to select, select the first of those
+ packets by making the first row the selected row. */
+ if (cf->first_displayed != NULL)
+ gtk_signal_emit_by_name(GTK_OBJECT(packet_list), "select_row", 0);
+
+ if (*err != 0) {
/* Put up a message box noting that the read failed somewhere along
the line. Don't throw out the stuff we managed to read, though,
if any. */
- switch (err) {
+ switch (*err) {
+
+ case WTAP_ERR_UNSUPPORTED_ENCAP:
+ errmsg = "The capture file is for a network type that Ethereal doesn't support.";
+ break;
case WTAP_ERR_CANT_READ:
errmsg = "An attempt to read from the file failed for"
break;
default:
- sprintf(errmsg_errno, "An error occurred while reading the"
- " capture file: %s.", wtap_strerror(err));
+ snprintf(errmsg_errno, sizeof(errmsg_errno),
+ "An error occurred while reading the"
+ " capture file: %s.", wtap_strerror(*err));
errmsg = errmsg_errno;
break;
}
snprintf(err_str, sizeof err_str, errmsg);
- simple_dialog(ESD_TYPE_WARN, NULL, err_str);
- return (err);
+ simple_dialog(ESD_TYPE_CRIT, NULL, err_str);
+ return (READ_ERROR);
} else
- return (0);
+ return (READ_SUCCESS);
}
#ifdef HAVE_LIBPCAP
}
}
- /* Yes, "open_cap_file()" set this - but it set it to a file handle
- from Wiretap, which will be closed when we close the file; we
- want it to remain open even after that, so that we can read
- packet data from it. */
- cf->fh = file_open(fname, "r");
-
gtk_statusbar_push(GTK_STATUSBAR(info_bar), file_ctx,
" <live capture in progress>");
}
return err;
}
-int
-continue_tail_cap_file(capture_file *cf, int to_read)
+read_status_t
+continue_tail_cap_file(capture_file *cf, int to_read, int *err)
{
- int err;
+ int data_offset = 0;
gtk_clist_freeze(GTK_CLIST(packet_list));
- wtap_loop(cf->wth, to_read, wtap_dispatch_cb, (u_char *) cf, &err);
+ while (to_read != 0 && (wtap_read(cf->wth, err, &data_offset))) {
+ if (cf->state == FILE_READ_ABORTED) {
+ /* Well, the user decided to exit Ethereal. Break out of the
+ loop, and let the code below (which is called even if there
+ aren't any packets left to read) exit. */
+ break;
+ }
+ read_packet(cf, data_offset);
+ to_read--;
+ }
gtk_clist_thaw(GTK_CLIST(packet_list));
+
+ /* XXX - this cheats and looks inside the packet list to find the final
+ row number. */
if (auto_scroll_live && cf->plist_end != NULL)
gtk_clist_moveto(GTK_CLIST(packet_list),
- cf->plist_end->row, -1, 1.0, 1.0);
- return err;
+ GTK_CLIST(packet_list)->rows - 1, -1, 1.0, 1.0);
+
+ if (cf->state == FILE_READ_ABORTED) {
+ /* Well, the user decided to exit Ethereal. Return READ_ABORTED
+ so that our caller can kill off the capture child process;
+ this will cause an EOF on the pipe from the child, so
+ "finish_tail_cap_file()" will be called, and it will clean up
+ and exit. */
+ return READ_ABORTED;
+ } else if (*err != 0) {
+ /* We got an error reading the capture file.
+ XXX - pop up a dialog box? */
+ return (READ_ERROR);
+ } else
+ return (READ_SUCCESS);
}
-int
-finish_tail_cap_file(capture_file *cf)
+read_status_t
+finish_tail_cap_file(capture_file *cf, int *err)
{
- int err;
+ int data_offset;
gtk_clist_freeze(GTK_CLIST(packet_list));
- wtap_loop(cf->wth, 0, wtap_dispatch_cb, (u_char *) cf, &err);
+ while ((wtap_read(cf->wth, err, &data_offset))) {
+ if (cf->state == FILE_READ_ABORTED) {
+ /* Well, the user decided to abort the read. Break out of the
+ loop, and let the code below (which is called even if there
+ aren't any packets left to read) exit. */
+ break;
+ }
+ read_packet(cf, data_offset);
+ }
+
+ if (cf->state == FILE_READ_ABORTED) {
+ /* Well, the user decided to abort the read. We're only called
+ when the child capture process closes the pipe to us (meaning
+ it's probably exited), so we can just close the capture
+ file; we return READ_ABORTED so our caller can do whatever
+ is appropriate when that happens. */
+ close_cap_file(cf, info_bar);
+ return READ_ABORTED;
+ }
thaw_clist(cf);
if (auto_scroll_live && cf->plist_end != NULL)
+ /* XXX - this cheats and looks inside the packet list to find the final
+ row number. */
gtk_clist_moveto(GTK_CLIST(packet_list),
- cf->plist_end->row, -1, 1.0, 1.0);
+ GTK_CLIST(packet_list)->rows - 1, -1, 1.0, 1.0);
+
+ /* We're done reading sequentially through the file. */
+ cf->state = FILE_READ_DONE;
+
+ /* We're done reading sequentially through the file; close the
+ sequential I/O side, to free up memory it requires. */
+ wtap_sequential_close(cf->wth);
/* Set the file encapsulation type now; we don't know what it is until
we've looked at all the packets, as we don't know until then whether
WTAP_ENCAP_PER_PACKET). */
cf->lnk_t = wtap_file_encap(cf->wth);
- /* There's nothing more to read from the capture file - close it. */
- wtap_close(cf->wth);
- cf->wth = NULL;
-
/* Pop the "<live capture in progress>" message off the status bar. */
gtk_statusbar_pop(GTK_STATUSBAR(info_bar), file_ctx);
set_menus_for_capture_file(TRUE);
set_menus_for_unsaved_capture_file(!cf->user_saved);
- return err;
+ if (*err != 0) {
+ /* We got an error reading the capture file.
+ XXX - pop up a dialog box? */
+ return (READ_ERROR);
+ } else
+ return (READ_SUCCESS);
}
#endif /* HAVE_LIBPCAP */
typedef struct {
color_filter_t *colorf;
- proto_tree *protocol_tree;
- guint8 *pd;
+ epan_dissect_t *edt;
} apply_color_filter_args;
/*
apply_color_filter_args *args = argp;
if (colorf->c_colorfilter != NULL && args->colorf == NULL) {
- if (dfilter_apply(colorf->c_colorfilter, args->protocol_tree, args->pd))
+ if (dfilter_apply_edt(colorf->c_colorfilter, args->edt))
args->colorf = colorf;
}
}
-static void
-add_packet_to_packet_list(frame_data *fdata, capture_file *cf, const u_char *buf)
+static int
+add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
+ union wtap_pseudo_header *pseudo_header, const u_char *buf,
+ gboolean refilter)
{
apply_color_filter_args args;
gint i, row;
proto_tree *protocol_tree = NULL;
+ epan_dissect_t *edt;
+ GdkColor fg, bg;
/* We don't yet have a color filter to apply. */
args.colorf = NULL;
firstusec = fdata->abs_usecs;
}
- /* Get the time elapsed between the first packet and this packet. */
- cf->esec = fdata->abs_secs - firstsec;
- if (firstusec <= fdata->abs_usecs) {
- cf->eusec = fdata->abs_usecs - firstusec;
- } else {
- cf->eusec = (fdata->abs_usecs + 1000000) - firstusec;
- cf->esec--;
- }
-
fdata->cinfo = &cf->cinfo;
for (i = 0; i < fdata->cinfo->num_cols; i++) {
- fdata->cinfo->col_data[i][0] = '\0';
+ fdata->cinfo->col_buf[i][0] = '\0';
+ fdata->cinfo->col_data[i] = fdata->cinfo->col_buf[i];
}
- /* Apply the filters */
- if (cf->dfcode != NULL || filter_list != NULL) {
+ /* If either
+
+ we have a display filter and are re-applying it;
+
+ we have a list of color filters;
+
+ allocate a protocol tree root node, so that we'll construct
+ a protocol tree against which a filter expression can be
+ evaluated. */
+ if ((cf->dfcode != NULL && refilter) || filter_list != NULL)
protocol_tree = proto_tree_create_root();
- dissect_packet(buf, fdata, protocol_tree);
- if (cf->dfcode != NULL)
- fdata->passed_dfilter = dfilter_apply(cf->dfcode, protocol_tree, cf->pd);
- else
- fdata->passed_dfilter = TRUE;
- /* Apply color filters, if we have any. */
+ /* Dissect the frame. */
+ edt = epan_dissect_new(pseudo_header, buf, fdata, protocol_tree);
+
+ /* If we have a display filter, apply it if we're refiltering, otherwise
+ leave the "passed_dfilter" flag alone.
+
+ If we don't have a display filter, set "passed_dfilter" to 1. */
+ if (cf->dfcode != NULL) {
+ if (refilter) {
+ if (cf->dfcode != NULL)
+ fdata->flags.passed_dfilter = dfilter_apply_edt(cf->dfcode, edt) ? 1 : 0;
+ else
+ fdata->flags.passed_dfilter = 1;
+ }
+ } else
+ fdata->flags.passed_dfilter = 1;
+
+ /* If we have color filters, and the frame is to be displayed, apply
+ the color filters. */
+ if (fdata->flags.passed_dfilter) {
if (filter_list != NULL) {
- args.protocol_tree = protocol_tree;
- args.pd = cf->pd;
+ args.edt = edt;
g_slist_foreach(filter_list, apply_color_filter, &args);
}
- proto_tree_free(protocol_tree);
- }
- else {
-#ifdef HAVE_PLUGINS
- if (plugin_list)
- protocol_tree = proto_tree_create_root();
-#endif
- dissect_packet(buf, fdata, protocol_tree);
- fdata->passed_dfilter = TRUE;
-#ifdef HAVE_PLUGINS
- if (protocol_tree)
- proto_tree_free(protocol_tree);
-#endif
}
- if (fdata->passed_dfilter) {
- /* XXX - if a GtkCList's selection mode is GTK_SELECTION_BROWSE, when
- the first entry is added to it by "real_insert_row()", that row
- is selected (see "real_insert_row()", in "gtk/gtkclist.c", in both
- our version and the vanilla GTK+ version).
-
- This means that a "select-row" signal is emitted; this causes
- "packet_list_select_cb()" to be called, which causes "select_packet()"
- to be called.
-
- "select_packet()" searches the list of frames for a frame with the
- row number passed into it; however, as "gtk_clist_append()", which
- called "real_insert_row()", hasn't yet returned, we don't know what
- the row number is, so we can't correctly set "fd->row" for that frame
- yet.
-
- This means that we won't find the frame for that row.
+ /* There are no more filters to apply, so we don't need any protocol
+ tree; free it if we created it. */
+ if (protocol_tree != NULL)
+ proto_tree_free(protocol_tree);
- We can't assume that there's only one frame in the frame list,
- either, as we may be filtering the display.
+ epan_dissect_free(edt);
- Therefore, we set "fdata->row" to 0, under the assumption that
- the row number passed to "select_packet()" will be 0 (as we're
- adding the first row to the list; it gets set to the proper
- value later. */
- fdata->row = 0;
+ if (fdata->flags.passed_dfilter) {
+ /* This frame passed the display filter, so add it to the clist. */
/* If we don't have the time stamp of the previous displayed packet,
it's because this is the first displayed packet. Save the time
}
/* Get the time elapsed between the first packet and this packet. */
- fdata->rel_secs = cf->esec;
- fdata->rel_usecs = cf->eusec;
+ compute_timestamp_diff(&fdata->rel_secs, &fdata->rel_usecs,
+ fdata->abs_secs, fdata->abs_usecs, firstsec, firstusec);
+
+ /* If it's greater than the current elapsed time, set the elapsed time
+ to it (we check for "greater than" so as not to be confused by
+ time moving backwards). */
+ if (cf->esec < fdata->rel_secs
+ || (cf->esec == fdata->rel_secs && cf->eusec < fdata->rel_usecs)) {
+ cf->esec = fdata->rel_secs;
+ cf->eusec = fdata->rel_usecs;
+ }
/* Get the time elapsed between the previous displayed packet and
this packet. */
- fdata->del_secs = fdata->abs_secs - prevsec;
- if (prevusec <= fdata->abs_usecs) {
- fdata->del_usecs = fdata->abs_usecs - prevusec;
- } else {
- fdata->del_usecs = (fdata->abs_usecs + 1000000) - prevusec;
- fdata->del_secs--;
- }
+ compute_timestamp_diff(&fdata->del_secs, &fdata->del_usecs,
+ fdata->abs_secs, fdata->abs_usecs, prevsec, prevusec);
prevsec = fdata->abs_secs;
prevusec = fdata->abs_usecs;
fill_in_columns(fdata);
- row = gtk_clist_append(GTK_CLIST(packet_list), fdata->cinfo->col_data);
- fdata->row = row;
+ /* If we haven't yet seen the first frame, this is it.
- if (filter_list != NULL && (args.colorf != NULL)) {
- gtk_clist_set_background(GTK_CLIST(packet_list), row,
- &args.colorf->bg_color);
- gtk_clist_set_foreground(GTK_CLIST(packet_list), row,
- &args.colorf->fg_color);
- } else {
- gtk_clist_set_background(GTK_CLIST(packet_list), row, &WHITE);
- gtk_clist_set_foreground(GTK_CLIST(packet_list), row, &BLACK);
- }
+ XXX - we must do this before we add the row to the display,
+ as, if the display's GtkCList's selection mode is
+ GTK_SELECTION_BROWSE, when the first entry is added to it,
+ "select_packet()" will be called, and it will fetch the row
+ data for the 0th row, and will get a null pointer rather than
+ "fdata", as "gtk_clist_append()" won't yet have returned and
+ thus "gtk_clist_set_row_data()" won't yet have been called.
- /* If we haven't yet seen the first frame, this is it. */
+ We thus need to leave behind bread crumbs so that
+ "select_packet()" can find this frame. See the comment
+ in "select_packet()". */
if (cf->first_displayed == NULL)
cf->first_displayed = fdata;
/* This is the last frame we've seen so far. */
cf->last_displayed = fdata;
- /* If this was the current frame, remember the row it's in, so
- we can arrange that it's on the screen when we're done. */
- if (cf->current_frame == fdata)
- cf->current_row = row;
- } else
- fdata->row = -1; /* not in the display */
+ row = gtk_clist_append(GTK_CLIST(packet_list), fdata->cinfo->col_data);
+ gtk_clist_set_row_data(GTK_CLIST(packet_list), row, fdata);
+
+ if (fdata->flags.marked) {
+ color_t_to_gdkcolor(&bg, &prefs.gui_marked_bg);
+ color_t_to_gdkcolor(&fg, &prefs.gui_marked_fg);
+ } else if (filter_list != NULL && (args.colorf != NULL)) {
+ bg = args.colorf->bg_color;
+ fg = args.colorf->fg_color;
+ } else {
+ bg = WHITE;
+ fg = BLACK;
+ }
+ gtk_clist_set_background(GTK_CLIST(packet_list), row, &bg);
+ gtk_clist_set_foreground(GTK_CLIST(packet_list), row, &fg);
+ } else {
+ /* This frame didn't pass the display filter, so it's not being added
+ to the clist, and thus has no row. */
+ row = -1;
+ }
fdata->cinfo = NULL;
+ return row;
}
static void
-wtap_dispatch_cb(u_char *user, const struct wtap_pkthdr *phdr, int offset,
- const u_char *buf) {
+read_packet(capture_file *cf, int offset)
+{
+ const struct wtap_pkthdr *phdr = wtap_phdr(cf->wth);
+ union wtap_pseudo_header *pseudo_header = wtap_pseudoheader(cf->wth);
+ const u_char *buf = wtap_buf_ptr(cf->wth);
frame_data *fdata;
- capture_file *cf = (capture_file *) user;
int passed;
proto_tree *protocol_tree;
frame_data *plist_end;
- int file_pos;
- float prog_val;
-
- /* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
- when we update it, we have to run the GTK+ main loop to get it
- to repaint what's pending, and doing so may involve an "ioctl()"
- to see if there's any pending input from an X server, and doing
- that for every packet can be costly, especially on a big file.
-
- Do so only if we were told to do so; when reading a capture file
- being updated by a live capture, we don't do so (as we're not
- "done" until the capture stops, so we don't know how close to
- "done" we are. */
-
- if (cf->update_progbar && offset >= cf->progbar_nextstep) {
- file_pos = lseek(cf->filed, 0, SEEK_CUR);
- prog_val = (gfloat) file_pos / (gfloat) cf->f_len;
- gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar), prog_val);
- cf->progbar_nextstep += cf->progbar_quantum;
- while (gtk_events_pending())
- gtk_main_iteration();
- }
+ epan_dissect_t *edt;
/* Allocate the next list entry, and add it to the list. */
- fdata = (frame_data *) g_malloc(sizeof(frame_data));
+ fdata = g_mem_chunk_alloc(cf->plist_chunk);
fdata->next = NULL;
fdata->prev = NULL;
+ fdata->pfd = NULL;
+ fdata->data_src = NULL;
fdata->pkt_len = phdr->len;
fdata->cap_len = phdr->caplen;
fdata->file_off = offset;
fdata->lnk_t = phdr->pkt_encap;
fdata->abs_secs = phdr->ts.tv_sec;
fdata->abs_usecs = phdr->ts.tv_usec;
- fdata->encoding = CHAR_ASCII;
- fdata->pseudo_header = phdr->pseudo_header;
+ fdata->flags.encoding = CHAR_ASCII;
+ fdata->flags.visited = 0;
+ fdata->flags.marked = 0;
fdata->cinfo = NULL;
passed = TRUE;
if (cf->rfcode) {
protocol_tree = proto_tree_create_root();
- dissect_packet(buf, fdata, protocol_tree);
- passed = dfilter_apply(cf->rfcode, protocol_tree, cf->pd);
+ edt = epan_dissect_new(pseudo_header, buf, fdata, protocol_tree);
+ passed = dfilter_apply_edt(cf->rfcode, edt);
proto_tree_free(protocol_tree);
+ epan_dissect_free(edt);
}
if (passed) {
plist_end = cf->plist_end;
cf->count++;
fdata->num = cf->count;
- add_packet_to_packet_list(fdata, cf, buf);
- } else
- g_free(fdata);
+ add_packet_to_packet_list(fdata, cf, pseudo_header, buf, TRUE);
+ } else {
+ /* XXX - if we didn't have read filters, or if we could avoid
+ allocating the "frame_data" structure until we knew whether
+ the frame passed the read filter, we could use a G_ALLOC_ONLY
+ memory chunk...
+
+ ...but, at least in one test I did, where I just made the chunk
+ a G_ALLOC_ONLY chunk and read in a huge capture file, it didn't
+ seem to save a noticeable amount of time or space. */
+ g_mem_chunk_free(cf->plist_chunk, fdata);
+ }
}
int
filter_packets(capture_file *cf, gchar *dftext)
{
- dfilter *dfcode;
+ dfilter_t *dfcode;
if (dftext == NULL) {
/* The new filter is an empty filter (i.e., display all packets). */
/*
* We have a filter; try to compile it.
*/
- if (dfilter_compile(dftext, &dfcode) != 0) {
+ if (!dfilter_compile(dftext, &dfcode)) {
/* The attempt failed; report an error. */
- simple_dialog(ESD_TYPE_WARN, NULL, dfilter_error_msg);
+ simple_dialog(ESD_TYPE_CRIT, NULL, dfilter_error_msg);
return 0;
}
g_free(cf->dfilter);
cf->dfilter = dftext;
if (cf->dfcode != NULL)
- dfilter_destroy(cf->dfcode);
+ dfilter_free(cf->dfcode);
cf->dfcode = dfcode;
- /* Now go through the list of packets we've read from the capture file,
- applying the current display filter, and, if the packet passes the
- display filter, add it to the summary display, appropriately
- colored. (That's how we colorize the display - it's like filtering
- the display, only we don't install a new filter.) */
- colorize_packets(cf);
+ /* Now rescan the packet list, applying the new filter, but not
+ throwing away information constructed on a previous pass. */
+ rescan_packets(cf, "Filtering", TRUE, FALSE);
return 1;
}
void
colorize_packets(capture_file *cf)
{
- frame_data *fd;
- guint32 progbar_quantum;
- guint32 progbar_nextstep;
- int count;
+ rescan_packets(cf, "Colorizing", FALSE, FALSE);
+}
- /* We need to re-initialize all the state information that protocols
- keep, because we're making a fresh pass through all the packets. */
+void
+redissect_packets(capture_file *cf)
+{
+ rescan_packets(cf, "Reprocessing", TRUE, TRUE);
+}
- /* Initialize the table of conversations. */
- conversation_init();
+/* Rescan the list of packets, reconstructing the CList.
- /* Initialize protocol-specific variables */
- init_all_protocols();
+ "action" describes why we're doing this; it's used in the progress
+ dialog box.
+
+ "refilter" is TRUE if we need to re-evaluate the filter expression.
- gtk_progress_set_activity_mode(GTK_PROGRESS(prog_bar), FALSE);
+ "redissect" is TRUE if we need to make the dissectors reconstruct
+ any state information they have (because a preference that affects
+ some dissector has changed, meaning some dissector might construct
+ its state differently from the way it was constructed the last time). */
+static void
+rescan_packets(capture_file *cf, const char *action, gboolean refilter,
+ gboolean redissect)
+{
+ frame_data *fdata;
+ progdlg_t *progbar;
+ gboolean stop_flag;
+ guint32 progbar_quantum;
+ guint32 progbar_nextstep;
+ int count;
+ frame_data *selected_frame;
+ int selected_row;
+ int row;
+
+ /* Which frame, if any, is the currently selected frame?
+ XXX - should the selected frame or the focus frame be the "current"
+ frame, that frame being the one from which "Find Frame" searches
+ start? */
+ selected_frame = cf->current_frame;
+
+ /* We don't yet know what row that frame will be on, if any, after we
+ rebuild the clist, however. */
+ selected_row = -1;
+
+ if (redissect) {
+ /* We need to re-initialize all the state information that protocols
+ keep, because some preference that controls a dissector has changed,
+ which might cause the state information to be constructed differently
+ by that dissector. */
+
+ /* Initialize the table of conversations. */
+ epan_conversation_init();
+
+ /* Initialize protocol-specific variables */
+ init_all_protocols();
+ }
/* Freeze the packet list while we redo it, so we don't get any
screen updates while it happens. */
cf->first_displayed = NULL;
cf->last_displayed = NULL;
- /* If a packet was selected, we don't know yet what row, if any, it'll
- get. */
- cf->current_row = -1;
-
- /* Iterate through the list of packets, calling a routine
- to run the filter on the packet, see if it matches, and
- put it in the display list if so. */
+ /* Iterate through the list of frames. Call a routine for each frame
+ to check whether it should be displayed and, if so, add it to
+ the display list. */
firstsec = 0;
firstusec = 0;
prevsec = 0;
prevusec = 0;
- proto_tree_is_visible = FALSE;
-
/* Update the progress bar when it gets to this value. */
progbar_nextstep = 0;
/* When we reach the value that triggers a progress bar update,
/* Count of packets at which we've looked. */
count = 0;
- gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(prog_bar), GTK_PROGRESS_LEFT_TO_RIGHT);
+ stop_flag = FALSE;
+ progbar = create_progress_dlg(action, "Stop", &stop_flag);
- for (fd = cf->plist; fd != NULL; fd = fd->next) {
+ for (fdata = cf->plist; fdata != NULL; fdata = fdata->next) {
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
when we update it, we have to run the GTK+ main loop to get it
to repaint what's pending, and doing so may involve an "ioctl()"
*/
g_assert(cf->count > 0);
- gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar),
- (gfloat) count / cf->count);
+ update_progress_dlg(progbar, (gfloat) count / cf->count);
progbar_nextstep += progbar_quantum;
- while (gtk_events_pending())
- gtk_main_iteration();
+ }
+
+ if (stop_flag) {
+ /* Well, the user decided to abort the filtering. Just stop.
+
+ XXX - go back to the previous filter? Users probably just
+ want not to wait for a filtering operation to finish;
+ unless we cancel by having no filter, reverting to the
+ previous filter will probably be even more expensive than
+ continuing the filtering, as it involves going back to the
+ beginning and filtering, and even with no filter we currently
+ have to re-generate the entire clist, which is also expensive.
+
+ I'm not sure what Network Monitor does, but it doesn't appear
+ to give you an unfiltered display if you cancel. */
+ break;
}
count++;
- wtap_seek_read (cf->cd_t, cf->fh, fd->file_off, cf->pd, fd->cap_len);
+ if (redissect) {
+ /* Since all state for the frame was destroyed, mark the frame
+ * as not visited, free the GSList referring to the state
+ * data (the per-frame data itself was freed by
+ * "init_all_protocols()"), and null out the GSList pointer. */
+ fdata->flags.visited = 0;
+ if (fdata->pfd) {
+ g_slist_free(fdata->pfd);
+ }
+ fdata->pfd = NULL;
+ if (fdata->data_src) { /* release data source list */
+ g_slist_free(fdata->data_src);
+ }
+ fdata->data_src = NULL;
+ }
+
+ wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header,
+ cf->pd, fdata->cap_len);
- add_packet_to_packet_list(fd, cf, cf->pd);
+ row = add_packet_to_packet_list(fdata, cf, &cf->pseudo_header, cf->pd,
+ refilter);
+ if (fdata == selected_frame)
+ selected_row = row;
}
- gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar), 0);
-
- if (cf->current_row != -1) {
- /* The current frame passed the filter; make sure it's visible. */
- if (!gtk_clist_row_is_visible(GTK_CLIST(packet_list), cf->current_row))
- gtk_clist_moveto(GTK_CLIST(packet_list), cf->current_row, -1, 0.0, 0.0);
- if (cf->current_frame_is_selected) {
- /* It was selected, so re-select it. */
- gtk_clist_select_row(GTK_CLIST(packet_list), cf->current_row, -1);
+ if (redissect) {
+ /* Clear out what remains of the visited flags and per-frame data
+ pointers.
+
+ XXX - that may cause various forms of bogosity when dissecting
+ these frames, as they won't have been seen by this sequential
+ pass, but the only alternative I see is to keep scanning them
+ even though the user requested that the scan stop, and that
+ would leave the user stuck with an Ethereal grinding on
+ until it finishes. Should we just stick them with that? */
+ for (; fdata != NULL; fdata = fdata->next) {
+ fdata->flags.visited = 0;
+ if (fdata->pfd) {
+ g_slist_free(fdata->pfd);
+ }
+ fdata->pfd = NULL;
+ if (fdata->data_src) {
+ g_slist_free(fdata->data_src);
+ }
+ fdata->data_src = NULL;
}
+ }
+
+ /* We're done filtering the packets; destroy the progress bar. */
+ destroy_progress_dlg(progbar);
+
+ /* Unfreeze the packet list. */
+ gtk_clist_thaw(GTK_CLIST(packet_list));
+
+ if (selected_row != -1) {
+ /* The frame that was selected passed the filter; select it, make it
+ the focus row, and make it visible. */
+ set_selected_row(selected_row);
finfo_selected = NULL;
} else {
- /* The current frame didn't pass the filter; make the first frame
+ /* The selected frame didn't pass the filter; make the first frame
the current frame, and leave it unselected. */
unselect_packet(cf);
cf->current_frame = cf->first_displayed;
}
-
- /* Unfreeze the packet list. */
- gtk_clist_thaw(GTK_CLIST(packet_list));
}
-#define MAX_LINE_LENGTH 256
-
int
print_packets(capture_file *cf, print_args_t *print_args)
{
int i;
- frame_data *fd;
+ frame_data *fdata;
+ progdlg_t *progbar;
+ gboolean stop_flag;
guint32 progbar_quantum;
guint32 progbar_nextstep;
guint32 count;
gint *col_widths = NULL;
gint data_width;
gboolean print_separator;
- char line_buf[MAX_LINE_LENGTH+1]; /* static-sized buffer! */
+ char *line_buf = NULL;
+ int line_buf_len = 256;
char *cp;
- int sprintf_len;
+ int column_len;
+ int line_len;
+ epan_dissect_t *edt = NULL;
cf->print_fh = open_print_dest(print_args->to_file, print_args->dest);
if (cf->print_fh == NULL)
print_preamble(cf->print_fh, print_args->format);
if (print_args->print_summary) {
- /* We're printing packet summaries.
+ /* We're printing packet summaries. Allocate the line buffer at
+ its initial length. */
+ line_buf = g_malloc(line_buf_len + 1);
- Find the widths for each of the columns - maximum of the
+ /* Find the widths for each of the columns - maximum of the
width of the title and the width of the data - and print
the column titles. */
col_widths = (gint *) g_malloc(sizeof(gint) * cf->cinfo.num_cols);
cp = &line_buf[0];
+ line_len = 0;
for (i = 0; i < cf->cinfo.num_cols; i++) {
/* Don't pad the last column. */
if (i == cf->cinfo.num_cols - 1)
col_widths[i] = data_width;
}
+ /* Find the length of the string for this column. */
+ column_len = strlen(cf->cinfo.col_title[i]);
+ if (col_widths[i] > column_len)
+ column_len = col_widths[i];
+
+ /* Make sure there's room in the line buffer for the column; if not,
+ double its length. */
+ line_len += column_len + 1; /* "+1" for space or \n */
+ if (line_len > line_buf_len) {
+ line_buf_len *= 2;
+ line_buf = g_realloc(line_buf, line_buf_len + 1);
+ }
+
/* Right-justify the packet number column. */
if (cf->cinfo.col_fmt[i] == COL_NUMBER)
- sprintf_len = sprintf(cp, "%*s", col_widths[i], cf->cinfo.col_title[i]);
+ sprintf(cp, "%*s", col_widths[i], cf->cinfo.col_title[i]);
else
- sprintf_len = sprintf(cp, "%-*s", col_widths[i], cf->cinfo.col_title[i]);
- cp += sprintf_len;
+ sprintf(cp, "%-*s", col_widths[i], cf->cinfo.col_title[i]);
+ cp += column_len;
if (i == cf->cinfo.num_cols - 1)
*cp++ = '\n';
else
}
print_separator = FALSE;
- proto_tree_is_visible = TRUE;
+
+ /* The protocol tree will be "visible", i.e., printed, only if we're
+ not printing a summary. */
+ proto_tree_is_visible = !print_args->print_summary;
/* Update the progress bar when it gets to this value. */
progbar_nextstep = 0;
/* Count of packets at which we've looked. */
count = 0;
- gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(prog_bar), GTK_PROGRESS_LEFT_TO_RIGHT);
+ stop_flag = FALSE;
+ progbar = create_progress_dlg("Printing", "Stop", &stop_flag);
/* Iterate through the list of packets, printing the packets that
were selected by the current display filter. */
- for (fd = cf->plist; fd != NULL; fd = fd->next) {
+ for (fdata = cf->plist; fdata != NULL; fdata = fdata->next) {
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
when we update it, we have to run the GTK+ main loop to get it
to repaint what's pending, and doing so may involve an "ioctl()"
*/
g_assert(cf->count > 0);
- gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar),
- (gfloat) count / cf->count);
+ update_progress_dlg(progbar, (gfloat) count / cf->count);
+
progbar_nextstep += progbar_quantum;
- while (gtk_events_pending())
- gtk_main_iteration();
}
+
+ if (stop_flag) {
+ /* Well, the user decided to abort the printing. Just stop.
+
+ XXX - note that what got generated before they did that
+ will get printed, as we're piping to a print program; we'd
+ have to write to a file and then hand that to the print
+ program to make it actually not print anything. */
+ break;
+ }
+
count++;
- if (fd->passed_dfilter) {
- wtap_seek_read (cf->cd_t, cf->fh, fd->file_off, cf->pd, fd->cap_len);
+ if (fdata->flags.passed_dfilter) {
+ wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header,
+ cf->pd, fdata->cap_len);
if (print_args->print_summary) {
/* Fill in the column information, but don't bother creating
the logical protocol tree. */
- fd->cinfo = &cf->cinfo;
- for (i = 0; i < fd->cinfo->num_cols; i++) {
- fd->cinfo->col_data[i][0] = '\0';
+ fdata->cinfo = &cf->cinfo;
+ for (i = 0; i < fdata->cinfo->num_cols; i++) {
+ fdata->cinfo->col_buf[i][0] = '\0';
+ fdata->cinfo->col_data[i] = fdata->cinfo->col_buf[i];
}
- dissect_packet(cf->pd, fd, NULL);
- fill_in_columns(fd);
+ edt = epan_dissect_new(&cf->pseudo_header, cf->pd, fdata, NULL);
+ fill_in_columns(fdata);
cp = &line_buf[0];
+ line_len = 0;
for (i = 0; i < cf->cinfo.num_cols; i++) {
+ /* Find the length of the string for this column. */
+ column_len = strlen(cf->cinfo.col_data[i]);
+ if (col_widths[i] > column_len)
+ column_len = col_widths[i];
+
+ /* Make sure there's room in the line buffer for the column; if not,
+ double its length. */
+ line_len += column_len + 1; /* "+1" for space or \n */
+ if (line_len > line_buf_len) {
+ line_buf_len *= 2;
+ line_buf = g_realloc(line_buf, line_buf_len + 1);
+ }
+
/* Right-justify the packet number column. */
if (cf->cinfo.col_fmt[i] == COL_NUMBER)
- sprintf_len = sprintf(cp, "%*s", col_widths[i], cf->cinfo.col_data[i]);
+ sprintf(cp, "%*s", col_widths[i], cf->cinfo.col_data[i]);
else
- sprintf_len = sprintf(cp, "%-*s", col_widths[i], cf->cinfo.col_data[i]);
- cp += sprintf_len;
+ sprintf(cp, "%-*s", col_widths[i], cf->cinfo.col_data[i]);
+ cp += column_len;
if (i == cf->cinfo.num_cols - 1)
*cp++ = '\n';
else
/* Create the logical protocol tree. */
protocol_tree = proto_tree_create_root();
- dissect_packet(cf->pd, fd, protocol_tree);
+ edt = epan_dissect_new(&cf->pseudo_header, cf->pd, fdata, protocol_tree);
/* Print the information in that tree. */
proto_tree_print(FALSE, print_args, (GNode *)protocol_tree,
- cf->pd, fd, cf->print_fh);
+ cf->pd, fdata, cf->print_fh);
proto_tree_free(protocol_tree);
if (print_args->print_hex) {
/* Print the full packet data as hex. */
- print_hex_data(cf->print_fh, print_args->format, cf->pd,
- fd->cap_len, fd->encoding);
+ print_hex_data(cf->print_fh, print_args->format, fdata);
}
/* Print a blank line if we print anything after this. */
print_separator = TRUE;
}
+ epan_dissect_free(edt);
}
}
+ /* We're done printing the packets; destroy the progress bar. */
+ destroy_progress_dlg(progbar);
+
if (col_widths != NULL)
g_free(col_widths);
+ if (line_buf != NULL)
+ g_free(line_buf);
print_finale(cf->print_fh, print_args->format);
close_print_dest(print_args->to_file, cf->print_fh);
- gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar), 0);
-
cf->print_fh = NULL;
+
+ proto_tree_is_visible = FALSE;
+
return TRUE;
}
void
change_time_formats(capture_file *cf)
{
- frame_data *fd;
+ frame_data *fdata;
+ progdlg_t *progbar;
+ gboolean stop_flag;
+ guint32 progbar_quantum;
+ guint32 progbar_nextstep;
+ int count;
+ int row;
int i;
GtkStyle *pl_style;
screen updates while it happens. */
freeze_clist(cf);
+ /* Update the progress bar when it gets to this value. */
+ progbar_nextstep = 0;
+ /* When we reach the value that triggers a progress bar update,
+ bump that value by this amount. */
+ progbar_quantum = cf->count/N_PROGBAR_UPDATES;
+ /* Count of packets at which we've looked. */
+ count = 0;
+
+ stop_flag = FALSE;
+ progbar = create_progress_dlg("Changing time display", "Stop", &stop_flag);
+
/* Iterate through the list of packets, checking whether the packet
is in a row of the summary list and, if so, whether there are
any columns that show the time in the "command-line-specified"
format and, if so, update that row. */
- for (fd = cf->plist; fd != NULL; fd = fd->next) {
- if (fd->row != -1) {
- /* This packet is in the summary list, on row "fd->row". */
+ for (fdata = cf->plist; fdata != NULL; fdata = fdata->next) {
+ /* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
+ when we update it, we have to run the GTK+ main loop to get it
+ to repaint what's pending, and doing so may involve an "ioctl()"
+ to see if there's any pending input from an X server, and doing
+ that for every packet can be costly, especially on a big file. */
+ if (count >= progbar_nextstep) {
+ /* let's not divide by zero. I should never be started
+ * with count == 0, so let's assert that
+ */
+ g_assert(cf->count > 0);
+
+ update_progress_dlg(progbar, (gfloat) count / cf->count);
+
+ progbar_nextstep += progbar_quantum;
+ }
+
+ if (stop_flag) {
+ /* Well, the user decided to abort the redisplay. Just stop.
+
+ XXX - this leaves the time field in the old format in
+ frames we haven't yet processed. So it goes; should we
+ simply not offer them the option of stopping? */
+ break;
+ }
+
+ count++;
+
+ /* Find what row this packet is in. */
+ row = gtk_clist_find_row_from_data(GTK_CLIST(packet_list), fdata);
+
+ if (row != -1) {
+ /* This packet is in the summary list, on row "row". */
/* XXX - there really should be a way of checking "cf->cinfo" for this;
the answer isn't going to change from packet to packet, so we should
simply skip all the "change_time_formats()" work if we're not
changing anything. */
- fd->cinfo = &cf->cinfo;
- if (check_col(fd, COL_CLS_TIME)) {
+ fdata->cinfo = &cf->cinfo;
+ if (check_col(fdata, COL_CLS_TIME)) {
/* There are columns that show the time in the "command-line-specified"
format; update them. */
for (i = 0; i < cf->cinfo.num_cols; i++) {
if (cf->cinfo.fmt_matx[i][COL_CLS_TIME]) {
/* This is one of the columns that shows the time in
"command-line-specified" format; update it. */
- cf->cinfo.col_data[i][0] = '\0';
- col_set_cls_time(fd, i);
- gtk_clist_set_text(GTK_CLIST(packet_list), fd->row, i,
+ cf->cinfo.col_buf[i][0] = '\0';
+ col_set_cls_time(fdata, i);
+ gtk_clist_set_text(GTK_CLIST(packet_list), row, i,
cf->cinfo.col_data[i]);
}
}
}
}
+ /* We're done redisplaying the packets; destroy the progress bar. */
+ destroy_progress_dlg(progbar);
+
/* Set the column widths of those columns that show the time in
"command-line-specified" format. */
pl_style = gtk_widget_get_style(packet_list);
clear_tree_and_hex_views(void)
{
/* Clear the hex dump. */
- gtk_text_freeze(GTK_TEXT(byte_view));
- gtk_text_set_point(GTK_TEXT(byte_view), 0);
- gtk_text_forward_delete(GTK_TEXT(byte_view),
- gtk_text_get_length(GTK_TEXT(byte_view)));
- gtk_text_thaw(GTK_TEXT(byte_view));
+ GtkWidget *byte_view;
+ int i;
+
+/* Get the current tab scroll window, then get the text widget */
+/* from the E_BYTE_VIEW_TEXT_INFO_KEY data field */
+
+ i = gtk_notebook_get_current_page( GTK_NOTEBOOK(byte_nb_ptr));
+
+ if ( i >= 0){
+ byte_view = gtk_notebook_get_nth_page( GTK_NOTEBOOK(byte_nb_ptr), i);
+ byte_view = gtk_object_get_data(GTK_OBJECT(byte_view), E_BYTE_VIEW_TEXT_INFO_KEY);
+
+ gtk_text_freeze(GTK_TEXT(byte_view));
+ gtk_text_set_point(GTK_TEXT(byte_view), 0);
+ gtk_text_forward_delete(GTK_TEXT(byte_view),
+ gtk_text_get_length(GTK_TEXT(byte_view)));
+ gtk_text_thaw(GTK_TEXT(byte_view));
+ }
/* Remove all nodes in ctree. This is how it's done in testgtk.c in GTK+ */
gtk_clist_clear ( GTK_CLIST(tree_view) );
}
gboolean
-find_packet(capture_file *cf, dfilter *sfcode)
+find_packet(capture_file *cf, dfilter_t *sfcode)
{
frame_data *start_fd;
- frame_data *fd;
+ frame_data *fdata;
frame_data *new_fd = NULL;
+ progdlg_t *progbar;
+ gboolean stop_flag;
guint32 progbar_quantum;
guint32 progbar_nextstep;
int count;
proto_tree *protocol_tree;
+ gboolean frame_matched;
+ int row;
+ epan_dissect_t *edt;
start_fd = cf->current_frame;
if (start_fd != NULL) {
- gtk_progress_set_activity_mode(GTK_PROGRESS(prog_bar), FALSE);
-
/* Iterate through the list of packets, starting at the packet we've
picked, calling a routine to run the filter on the packet, see if
it matches, and stop if so. */
count = 0;
- fd = start_fd;
-
- proto_tree_is_visible = FALSE;
+ fdata = start_fd;
/* Update the progress bar when it gets to this value. */
progbar_nextstep = 0;
/* When we reach the value that triggers a progress bar update,
bump that value by this amount. */
progbar_quantum = cf->count/N_PROGBAR_UPDATES;
- gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(prog_bar), GTK_PROGRESS_LEFT_TO_RIGHT);
- fd = start_fd;
+ stop_flag = FALSE;
+ progbar = create_progress_dlg("Searching", "Cancel", &stop_flag);
+
+ fdata = start_fd;
for (;;) {
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
when we update it, we have to run the GTK+ main loop to get it
*/
g_assert(cf->count > 0);
- gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar),
- (gfloat) count / cf->count);
+ update_progress_dlg(progbar, (gfloat) count / cf->count);
progbar_nextstep += progbar_quantum;
- while (gtk_events_pending())
- gtk_main_iteration();
+ }
+
+ if (stop_flag) {
+ /* Well, the user decided to abort the search. Go back to the
+ frame where we started. */
+ new_fd = start_fd;
+ break;
}
/* Go past the current frame. */
if (cf->sbackward) {
/* Go on to the previous frame. */
- fd = fd->prev;
- if (fd == NULL)
- fd = cf->plist_end; /* wrap around */
+ fdata = fdata->prev;
+ if (fdata == NULL)
+ fdata = cf->plist_end; /* wrap around */
} else {
/* Go on to the next frame. */
- fd = fd->next;
- if (fd == NULL)
- fd = cf->plist; /* wrap around */
- }
-
- if (fd == start_fd) {
- /* We're back to the frame we were on originally. The search
- failed. */
- break;
+ fdata = fdata->next;
+ if (fdata == NULL)
+ fdata = cf->plist; /* wrap around */
}
count++;
/* Is this packet in the display? */
- if (fd->passed_dfilter) {
+ if (fdata->flags.passed_dfilter) {
/* Yes. Does it match the search filter? */
protocol_tree = proto_tree_create_root();
- wtap_seek_read(cf->cd_t, cf->fh, fd->file_off, cf->pd, fd->cap_len);
- dissect_packet(cf->pd, fd, protocol_tree);
- if (dfilter_apply(sfcode, protocol_tree, cf->pd)) {
- new_fd = fd;
+ wtap_seek_read(cf->wth, fdata->file_off, &cf->pseudo_header,
+ cf->pd, fdata->cap_len);
+ edt = epan_dissect_new(&cf->pseudo_header, cf->pd, fdata, protocol_tree);
+ frame_matched = dfilter_apply_edt(sfcode, edt);
+ proto_tree_free(protocol_tree);
+ epan_dissect_free(edt);
+ if (frame_matched) {
+ new_fd = fdata;
break; /* found it! */
}
}
+
+ if (fdata == start_fd) {
+ /* We're back to the frame we were on originally, and that frame
+ doesn't match the search filter. The search failed. */
+ break;
+ }
}
- gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar), 0);
+ /* We're done scanning the packets; destroy the progress bar. */
+ destroy_progress_dlg(progbar);
}
if (new_fd != NULL) {
- /* We found a frame. Make it visible, and select it. */
- if (!gtk_clist_row_is_visible(GTK_CLIST(packet_list), new_fd->row))
- gtk_clist_moveto(GTK_CLIST(packet_list), new_fd->row, -1, 0.0, 0.0);
-
- /* XXX - why is there no "gtk_clist_set_focus_row()", so that we
- can make the row for the frame we found the focus row?
-
- See
+ /* We found a frame. Find what row it's in. */
+ row = gtk_clist_find_row_from_data(GTK_CLIST(packet_list), new_fd);
+ g_assert(row != -1);
- http://www.gnome.org/mailing-lists/archives/gtk-list/2000-January/0038.shtml
-
- */
- GTK_CLIST(packet_list)->focus_row = new_fd->row;
- gtk_clist_select_row(GTK_CLIST(packet_list), new_fd->row, -1);
+ /* Select that row, make it the focus row, and make it visible. */
+ set_selected_row(row);
return TRUE; /* success */
} else
return FALSE; /* failure */
goto_result_t
goto_frame(capture_file *cf, guint fnumber)
{
- frame_data *fd;
+ frame_data *fdata;
+ int row;
- for (fd = cf->plist; fd != NULL && fd->num < fnumber; fd = fd->next)
+ for (fdata = cf->plist; fdata != NULL && fdata->num < fnumber; fdata = fdata->next)
;
- if (fd == NULL)
+ if (fdata == NULL)
return NO_SUCH_FRAME; /* we didn't find that frame */
- if (!fd->passed_dfilter)
+ if (!fdata->flags.passed_dfilter)
return FRAME_NOT_DISPLAYED; /* the frame with that number isn't displayed */
/* We found that frame, and it's currently being displayed.
- Make it visible, and select it. */
- if (!gtk_clist_row_is_visible(GTK_CLIST(packet_list), fd->row))
- gtk_clist_moveto(GTK_CLIST(packet_list), fd->row, -1, 0.0, 0.0);
+ Find what row it's in. */
+ row = gtk_clist_find_row_from_data(GTK_CLIST(packet_list), fdata);
+ g_assert(row != -1);
- /* See above complaint about the lack of "gtk_clist_set_focus_row()". */
- GTK_CLIST(packet_list)->focus_row = fd->row;
- gtk_clist_select_row(GTK_CLIST(packet_list), fd->row, -1);
+ /* Select that row, make it the focus row, and make it visible. */
+ set_selected_row(row);
return FOUND_FRAME;
}
void
select_packet(capture_file *cf, int row)
{
- frame_data *fd;
+ frame_data *fdata;
+ tvbuff_t *bv_tvb;
int i;
- /* Search through the list of frames to see which one is in
- this row. */
- for (fd = cf->plist, i = 0; fd != NULL; fd = fd->next, i++) {
- if (fd->row == row)
- break;
- }
+ /* Get the frame data struct pointer for this frame */
+ fdata = (frame_data *) gtk_clist_get_row_data(GTK_CLIST(packet_list), row);
+
+ if (fdata == NULL) {
+ /* XXX - if a GtkCList's selection mode is GTK_SELECTION_BROWSE, when
+ the first entry is added to it by "real_insert_row()", that row
+ is selected (see "real_insert_row()", in "gtk/gtkclist.c", in both
+ our version and the vanilla GTK+ version).
- g_assert(fd != NULL);
+ This means that a "select-row" signal is emitted; this causes
+ "packet_list_select_cb()" to be called, which causes "select_packet()"
+ to be called.
+
+ "select_packet()" fetches, above, the data associated with the
+ row that was selected; however, as "gtk_clist_append()", which
+ called "real_insert_row()", hasn't yet returned, we haven't yet
+ associated any data with that row, so we get back a null pointer.
+
+ We can't assume that there's only one frame in the frame list,
+ either, as we may be filtering the display.
+
+ We therefore assume that, if "row" is 0, i.e. the first row
+ is being selected, and "cf->first_displayed" equals
+ "cf->last_displayed", i.e. there's only one frame being
+ displayed, that frame is the frame we want.
+
+ This means we have to set "cf->first_displayed" and
+ "cf->last_displayed" before adding the row to the
+ GtkCList; see the comment in "add_packet_to_packet_list()". */
+
+ if (row == 0 && cf->first_displayed == cf->last_displayed)
+ fdata = cf->first_displayed;
+ }
- /* Record that this frame is the current frame, and that it's selected. */
- cf->current_frame = fd;
- cf->current_frame_is_selected = TRUE;
+ /* Record that this frame is the current frame. */
+ cf->current_frame = fdata;
/* Get the data in that frame. */
- wtap_seek_read (cf->cd_t, cf->fh, fd->file_off, cf->pd, fd->cap_len);
+ wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header,
+ cf->pd, fdata->cap_len);
/* Create the logical protocol tree. */
if (cf->protocol_tree)
proto_tree_free(cf->protocol_tree);
cf->protocol_tree = proto_tree_create_root();
proto_tree_is_visible = TRUE;
- dissect_packet(cf->pd, cf->current_frame, cf->protocol_tree);
+ cf->edt = epan_dissect_new(&cf->pseudo_header, cf->pd, cf->current_frame,
+ cf->protocol_tree);
+ proto_tree_is_visible = FALSE;
/* Display the GUI protocol tree and hex dump. */
clear_tree_and_hex_views();
+
+ i = 0;
+ while((bv_tvb = g_slist_nth_data ( cf->current_frame->data_src, i++))){
+ add_byte_view( tvb_get_name( bv_tvb), tvb_get_ptr(bv_tvb, 0, -1), tvb_length(bv_tvb));
+ }
+
proto_tree_draw(cf->protocol_tree, tree_view);
- packet_hex_print(GTK_TEXT(byte_view), cf->pd, cf->current_frame->cap_len,
- -1, -1, cf->current_frame->encoding);
+
+ set_notebook_page( byte_nb_ptr, 0);
/* A packet is selected. */
set_menus_for_selected_packet(TRUE);
void
unselect_packet(capture_file *cf)
{
- cf->current_frame_is_selected = FALSE;
-
/* Destroy the protocol tree for that packet. */
if (cf->protocol_tree != NULL) {
proto_tree_free(cf->protocol_tree);
cf->protocol_tree = NULL;
+ epan_dissect_free(cf->edt);
}
finfo_selected = NULL;
set_menus_for_selected_packet(FALSE);
}
+/* Set the selected row and the focus row of the packet list to the specified
+ row, and make it visible if it's not currently visible. */
+static void
+set_selected_row(int row)
+{
+ if (gtk_clist_row_is_visible(GTK_CLIST(packet_list), row) != GTK_VISIBILITY_FULL)
+ gtk_clist_moveto(GTK_CLIST(packet_list), row, -1, 0.0, 0.0);
+
+ /* XXX - why is there no "gtk_clist_set_focus_row()", so that we
+ can make the row for the frame we found the focus row?
+
+ See
+
+ http://www.gnome.org/mailing-lists/archives/gtk-list/2000-January/0038.shtml
+
+ */
+ GTK_CLIST(packet_list)->focus_row = row;
+
+ gtk_clist_select_row(GTK_CLIST(packet_list), row, -1);
+}
+
static void
freeze_clist(capture_file *cf)
{
}
int
-save_cap_file(char *fname, capture_file *cf, gboolean save_filtered,
+save_cap_file(char *fname, capture_file *cf, gboolean save_filtered, gboolean save_marked,
guint save_format)
{
gchar *from_filename;
size_t msg_len;
int err;
gboolean do_copy;
- int from_fd, to_fd, nread, nwritten;
wtap_dumper *pdh;
- frame_data *fd;
+ frame_data *fdata;
struct wtap_pkthdr hdr;
+ union wtap_pseudo_header pseudo_header;
guint8 pd[65536];
- if ((name_ptr = (gchar *) strrchr(fname, '/')) == NULL)
- name_ptr = fname;
- else
- name_ptr++;
+ name_ptr = get_basename(fname);
msg_len = strlen(name_ptr) + strlen(save_fmt) + 2;
save_msg = g_malloc(msg_len);
snprintf(save_msg, msg_len, save_fmt, name_ptr);
gtk_statusbar_push(GTK_STATUSBAR(info_bar), file_ctx, save_msg);
g_free(save_msg);
- if (!save_filtered && save_format == cf->cd_t) {
+ if (!save_filtered && !save_marked && save_format == cf->cd_t) {
/* We're not filtering packets, and we're saving it in the format
it's already in, so we can just move or copy the raw data. */
/* The file being saved is a temporary file from a live
capture, so it doesn't need to stay around under that name;
first, try renaming the capture buffer file to the new name. */
+#ifndef WIN32
if (rename(cf->filename, fname) == 0) {
/* That succeeded - there's no need to copy the source file. */
from_filename = NULL;
the temporary directory, and that might be fixable - but
is it worth requiring the user to go off and fix it?) */
err = errno;
- simple_dialog(ESD_TYPE_WARN, NULL,
+ simple_dialog(ESD_TYPE_CRIT, NULL,
file_rename_error_message(err), fname);
goto done;
}
}
+#else
+ do_copy = TRUE;
+ from_filename = cf->filename;
+#endif
} else {
/* It's a permanent file, so we should copy it, and not remove the
original. */
do_copy = TRUE;
from_filename = cf->filename;
}
-
/* Copy the file, if we haven't moved it. */
if (do_copy) {
- /* Copy the raw bytes of the file. */
- from_fd = open(from_filename, O_RDONLY);
- if (from_fd < 0) {
- err = errno;
- simple_dialog(ESD_TYPE_WARN, NULL,
- file_open_error_message(err, TRUE), from_filename);
- goto done;
- }
-
- to_fd = creat(fname, 0644);
- if (to_fd < 0) {
- err = errno;
- simple_dialog(ESD_TYPE_WARN, NULL,
- file_open_error_message(err, TRUE), fname);
- close(from_fd);
- goto done;
- }
-
- while ((nread = read(from_fd, pd, sizeof pd)) > 0) {
- nwritten = write(to_fd, pd, nread);
- if (nwritten < nread) {
- if (nwritten < 0)
- err = errno;
- else
- err = WTAP_ERR_SHORT_WRITE;
- simple_dialog(ESD_TYPE_WARN, NULL,
- file_write_error_message(err), fname);
- close(from_fd);
- close(to_fd);
- goto done;
- }
- }
- if (nread < 0) {
- err = errno;
- simple_dialog(ESD_TYPE_WARN, NULL,
- file_read_error_message(err), from_filename);
- close(from_fd);
- close(to_fd);
- goto done;
- }
- close(from_fd);
- if (close(to_fd) < 0) {
- err = errno;
- simple_dialog(ESD_TYPE_WARN, NULL,
- file_close_error_message(err), fname);
- goto done;
- }
+ if (!copy_binary_file(from_filename, fname)) {
+ goto done;
+ }
}
} else {
/* Either we're filtering packets, or we're saving in a different
we have to do it by writing the packets out in Wiretap. */
pdh = wtap_dump_open(fname, save_format, cf->lnk_t, cf->snap, &err);
if (pdh == NULL) {
- simple_dialog(ESD_TYPE_WARN, NULL,
+ simple_dialog(ESD_TYPE_CRIT, NULL,
file_open_error_message(err, TRUE), fname);
goto done;
}
/* XXX - have a way to save only the packets currently selected by
- the display filter.
+ the display filter or the marked ones.
If we do that, should we make that file the current file? If so,
it means we can no longer get at the other packets. What does
NetMon do? */
- for (fd = cf->plist; fd != NULL; fd = fd->next) {
+ for (fdata = cf->plist; fdata != NULL; fdata = fdata->next) {
/* XXX - do a progress bar */
- if (!save_filtered || fd->passed_dfilter) {
- /* Either we're saving all frames, or we're saving filtered frames
- and this one passed the display filter - save it. */
- hdr.ts.tv_sec = fd->abs_secs;
- hdr.ts.tv_usec = fd->abs_usecs;
- hdr.caplen = fd->cap_len;
- hdr.len = fd->pkt_len;
- hdr.pkt_encap = fd->lnk_t;
- hdr.pseudo_header = fd->pseudo_header;
- wtap_seek_read(cf->cd_t, cf->fh, fd->file_off, pd, fd->cap_len);
-
- if (!wtap_dump(pdh, &hdr, pd, &err)) {
- simple_dialog(ESD_TYPE_WARN, NULL,
+ if ((!save_filtered && !save_marked) ||
+ (save_filtered && fdata->flags.passed_dfilter && !save_marked) ||
+ (save_marked && fdata->flags.marked && !save_filtered) ||
+ (save_filtered && save_marked && fdata->flags.passed_dfilter &&
+ fdata->flags.marked)) {
+ /* Either :
+ - we're saving all frames, or
+ - we're saving filtered frames and this one passed the display filter or
+ - we're saving marked frames (and it has been marked) or
+ - we're saving filtered _and_ marked frames,
+ save it. */
+ hdr.ts.tv_sec = fdata->abs_secs;
+ hdr.ts.tv_usec = fdata->abs_usecs;
+ hdr.caplen = fdata->cap_len;
+ hdr.len = fdata->pkt_len;
+ hdr.pkt_encap = fdata->lnk_t;
+ wtap_seek_read(cf->wth, fdata->file_off, &pseudo_header,
+ pd, fdata->cap_len);
+
+ if (!wtap_dump(pdh, &hdr, &pseudo_header, pd, &err)) {
+ simple_dialog(ESD_TYPE_CRIT, NULL,
file_write_error_message(err), fname);
wtap_dump_close(pdh, &err);
goto done;
/* Pop the "Saving:" message off the status bar. */
gtk_statusbar_pop(GTK_STATUSBAR(info_bar), file_ctx);
if (err == 0) {
- if (!save_filtered) {
+ if (!save_filtered && !save_marked) {
/* We saved the entire capture, not just some packets from it.
Open and read the file we saved it to.
if ((err = open_cap_file(fname, FALSE, cf)) == 0) {
/* XXX - report errors if this fails? */
- err = read_cap_file(cf);
+ switch (read_cap_file(cf, &err)) {
+
+ case READ_SUCCESS:
+ case READ_ERROR:
+ /* Just because we got an error, that doesn't mean we were unable
+ to read any of the file; we handle what we could get from the
+ file. */
+ break;
+
+ case READ_ABORTED:
+ /* The user bailed out of re-reading the capture file; the
+ capture file has been closed - just return (without
+ changing any menu settings; "close_cap_file()" set them
+ correctly for the "no capture file open" state). */
+ return 0;
+ }
set_menus_for_unsaved_capture_file(FALSE);
}
}
}
char *
-file_open_error_message(int err, int for_writing)
+file_open_error_message(int err, gboolean for_writing)
{
char *errmsg;
static char errmsg_errno[1024+1];
switch (err) {
case WTAP_ERR_NOT_REGULAR_FILE:
- errmsg = "The file \"%s\" is invalid.";
+ errmsg = "The file \"%s\" is a \"special file\" or socket or other non-regular file.";
break;
case WTAP_ERR_FILE_UNKNOWN_FORMAT:
case WTAP_ERR_UNSUPPORTED_ENCAP:
case WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED:
- /* Seen only when opening a capture file for writing. */
- errmsg = "Ethereal cannot save this capture in that format.";
+ if (for_writing)
+ errmsg = "Ethereal cannot save this capture in that format.";
+ else
+ errmsg = "The file \"%s\" is a capture for a network type that Ethereal doesn't support.";
break;
case WTAP_ERR_BAD_RECORD:
errmsg = "You do not have permission to read the file \"%s\".";
break;
+ case EISDIR:
+ errmsg = "\"%s\" is a directory (folder), not a file.";
+ break;
+
default:
- sprintf(errmsg_errno, "The file \"%%s\" could not be opened: %s.",
+ snprintf(errmsg_errno, sizeof(errmsg_errno),
+ "The file \"%%s\" could not be opened: %s.",
wtap_strerror(err));
errmsg = errmsg_errno;
break;
break;
default:
- sprintf(errmsg_errno, "The file \"%%s\" could not be moved: %s.",
+ snprintf(errmsg_errno, sizeof(errmsg_errno),
+ "The file \"%%s\" could not be moved: %s.",
wtap_strerror(err));
errmsg = errmsg_errno;
break;
{
static char errmsg_errno[1024+1];
- sprintf(errmsg_errno, "An error occurred while reading from the file \"%%s\": %s.",
+ snprintf(errmsg_errno, sizeof(errmsg_errno),
+ "An error occurred while reading from the file \"%%s\": %s.",
wtap_strerror(err));
return errmsg_errno;
}
#endif
default:
- sprintf(errmsg_errno, "An error occurred while writing to the file \"%%s\": %s.",
+ snprintf(errmsg_errno, sizeof(errmsg_errno),
+ "An error occurred while writing to the file \"%%s\": %s.",
wtap_strerror(err));
errmsg = errmsg_errno;
break;
break;
case WTAP_ERR_SHORT_WRITE:
- errmsg = "Not all the data could be written to the file \"%s\".";
+ errmsg = "Not all the packets could be written to the file \"%s\".";
break;
case ENOSPC:
#endif
default:
- sprintf(errmsg_errno, "An error occurred while closing the file \"%%s\": %s.",
+ snprintf(errmsg_errno, sizeof(errmsg_errno),
+ "An error occurred while closing the file \"%%s\": %s.",
wtap_strerror(err));
errmsg = errmsg_errno;
break;
}
return errmsg;
}
+
+
+/* Copies a file in binary mode, for those operating systems that care about
+ * such things.
+ * Returns TRUE on success, FALSE on failure. If a failure, it also
+ * displays a simple dialog window with the error message.
+ */
+static gboolean
+copy_binary_file(char *from_filename, char *to_filename)
+{
+ int from_fd, to_fd, nread, nwritten, err;
+ guint8 pd[65536]; /* XXX - Hmm, 64K here, 64K in save_cap_file(),
+ perhaps we should make just one 64K buffer. */
+
+ /* Copy the raw bytes of the file. */
+ from_fd = open(from_filename, O_RDONLY | O_BINARY);
+ if (from_fd < 0) {
+ err = errno;
+ simple_dialog(ESD_TYPE_CRIT, NULL,
+ file_open_error_message(err, TRUE), from_filename);
+ goto done;
+ }
+
+ /* Use open() instead of creat() so that we can pass the O_BINARY
+ flag, which is relevant on Win32; it appears that "creat()"
+ may open the file in text mode, not binary mode, but we want
+ to copy the raw bytes of the file, so we need the output file
+ to be open in binary mode. */
+ to_fd = open(to_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
+ if (to_fd < 0) {
+ err = errno;
+ simple_dialog(ESD_TYPE_CRIT, NULL,
+ file_open_error_message(err, TRUE), to_filename);
+ close(from_fd);
+ goto done;
+ }
+
+ while ((nread = read(from_fd, pd, sizeof pd)) > 0) {
+ nwritten = write(to_fd, pd, nread);
+ if (nwritten < nread) {
+ if (nwritten < 0)
+ err = errno;
+ else
+ err = WTAP_ERR_SHORT_WRITE;
+ simple_dialog(ESD_TYPE_CRIT, NULL,
+ file_write_error_message(err), to_filename);
+ close(from_fd);
+ close(to_fd);
+ goto done;
+ }
+ }
+ if (nread < 0) {
+ err = errno;
+ simple_dialog(ESD_TYPE_CRIT, NULL,
+ file_read_error_message(err), from_filename);
+ close(from_fd);
+ close(to_fd);
+ goto done;
+ }
+ close(from_fd);
+ if (close(to_fd) < 0) {
+ err = errno;
+ simple_dialog(ESD_TYPE_CRIT, NULL,
+ file_close_error_message(err), to_filename);
+ goto done;
+ }
+
+ return TRUE;
+
+ done:
+ return FALSE;
+}
git.samba.org / obnox / wireshark / wip.git / blobdiff