/* follow_dlg.c
*
- * $Id: follow_dlg.c,v 1.47 2004/02/22 18:44:01 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
#include <stdio.h>
#include <string.h>
-#ifdef HAVE_IO_H
-#include <io.h> /* open/close on win32 */
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
#include <ctype.h>
+#include "isprint.h"
+
+#include "file_util.h"
#include "color.h"
-#include "color_utils.h"
+#include "colors.h"
#include "file.h"
#include "follow_dlg.h"
-#include "follow.h"
+#include <epan/follow.h>
#include "dlg_utils.h"
#include "keys.h"
#include "globals.h"
-#include "gtkglobals.h"
#include "main.h"
#include "alert_box.h"
#include "simple_dialog.h"
-#include "packet-ipv6.h"
-#include "prefs.h"
-#include <epan/resolv.h>
-#include "util.h"
-#include "ui_util.h"
+#include <epan/dissectors/packet-ipv6.h>
+#include <epan/prefs.h>
+#include <epan/addr_resolv.h>
+#include <epan/charsets.h>
+#include "tempfile.h"
+#include "gui_utils.h"
#include <epan/epan_dissect.h>
#include <epan/filesystem.h>
#include "compat_macros.h"
-#include "ipproto.h"
-#include "tap_menu.h"
+#include <epan/ipproto.h>
+#include "print_mswin.h"
+#include "font_utils.h"
+#include "help_dlg.h"
+
+/* This is backwards-compatibility code for old versions of GTK+ (2.2.1 and
+ * earlier). It defines the new wrap behavior (unknown in earlier versions)
+ * as the old (slightly buggy) wrap behavior.
+ */
+#ifndef GTK_WRAP_WORD_CHAR
+#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
+#endif
/* Show Stream */
typedef enum {
SHOW_ASCII,
SHOW_EBCDIC,
SHOW_HEXDUMP,
- SHOW_CARRAY
+ SHOW_CARRAY,
+ SHOW_RAW
} show_type_t;
typedef struct {
GtkWidget *ebcdic_bt;
GtkWidget *hexdump_bt;
GtkWidget *carray_bt;
+ GtkWidget *raw_bt;
GtkWidget *follow_save_as_w;
gboolean is_ipv6;
char *filter_out_filter;
static void follow_filter_out_stream(GtkWidget * w, gpointer parent_w);
static void follow_print_stream(GtkWidget * w, gpointer parent_w);
static void follow_save_as_cmd_cb(GtkWidget * w, gpointer data);
-static void follow_save_as_ok_cb(GtkWidget * w, GtkFileSelection * fs);
+static void follow_save_as_ok_cb(GtkWidget * w, gpointer fs);
static void follow_save_as_destroy_cb(GtkWidget * win, gpointer user_data);
static void follow_stream_om_both(GtkWidget * w, gpointer data);
static void follow_stream_om_client(GtkWidget * w, gpointer data);
static void follow_stream_om_server(GtkWidget * w, gpointer data);
-extern FILE *data_out_file;
-
+/* With MSVC and a libethereal.dll, we need a special declaration. */
+ETH_VAR_IMPORT FILE *data_out_file;
#define E_FOLLOW_INFO_KEY "follow_info_key"
follow_stream_cb(GtkWidget * w, gpointer data _U_)
{
GtkWidget *streamwindow, *vbox, *txt_scrollw, *text, *filter_te;
- GtkWidget *hbox, *button, *radio_bt;
+ GtkWidget *hbox, *bbox, *button, *radio_bt;
+ GtkWidget *stream_fr, *stream_vb;
GtkWidget *stream_om, *stream_menu, *stream_mi;
- int tmp_fd;
+ GtkTooltips *tooltips;
+ int tmp_fd;
gchar *follow_filter;
const gchar *previous_filter;
+ int filter_out_filter_len;
const char *hostname0, *hostname1;
char *port0, *port1;
char string[128];
follow_info_t *follow_info;
/* we got tcp so we can follow */
- if (cfile.edt->pi.ipproto != 6) {
+ if (cfile.edt->pi.ipproto != IP_PROTO_TCP) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"Error following stream. Please make\n"
"sure you have a TCP packet selected.");
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"Could not create temporary file %s: %s",
follow_info->data_out_filename, strerror(errno));
- close(tmp_fd);
+ eth_close(tmp_fd);
unlink(follow_info->data_out_filename);
g_free(follow_info);
return;
/* allocate our new filter. API claims g_malloc terminates program on failure */
/* my calc for max alloc needed is really +10 but when did a few extra bytes hurt ? */
- follow_info->filter_out_filter =
- (gchar *)g_malloc(strlen(follow_filter) + strlen(previous_filter) + 16);
+ filter_out_filter_len = strlen(follow_filter) + strlen(previous_filter) + 16;
+ follow_info->filter_out_filter = (gchar *)g_malloc(filter_out_filter_len);
/* append the negation */
if(strlen(previous_filter)) {
- sprintf(follow_info->filter_out_filter, "%s and !(%s)", previous_filter, follow_filter);
+ g_snprintf(follow_info->filter_out_filter, filter_out_filter_len,
+ "%s and !(%s)", previous_filter, follow_filter);
} else {
- sprintf(follow_info->filter_out_filter, "!(%s)", follow_filter);
+ g_snprintf(follow_info->filter_out_filter, filter_out_filter_len,
+ "!(%s)", follow_filter);
}
+
gtk_entry_set_text(GTK_ENTRY(filter_te), follow_filter);
- /* Run the display filter so it goes in effect. */
- main_filter_packets(&cfile, follow_filter);
+ /* Run the display filter so it goes in effect - even if it's the
+ same as the previous display filter. */
+ main_filter_packets(&cfile, follow_filter, TRUE);
/* Free the filter string, as we're done with it. */
g_free(follow_filter);
fclose(data_out_file);
/* The data_out_filename file now has all the text that was in the session */
- if (incomplete_tcp_stream) {
- streamwindow = window_new(GTK_WINDOW_TOPLEVEL,
- "Contents of TCP stream (incomplete)");
- } else {
- streamwindow = window_new(GTK_WINDOW_TOPLEVEL,
- "Contents of TCP stream");
- }
+ streamwindow = dlg_window_new("Follow TCP Stream");
/* needed in follow_filter_out_stream(), is there a better way? */
follow_info->streamwindow = streamwindow;
gtk_widget_set_name(streamwindow, "TCP stream window");
-
- SIGNAL_CONNECT(streamwindow, "destroy", follow_destroy_cb, NULL);
- WIDGET_SET_SIZE(streamwindow, DEF_WIDTH, DEF_HEIGHT);
- gtk_container_border_width(GTK_CONTAINER(streamwindow), 2);
+ gtk_window_set_default_size(GTK_WINDOW(streamwindow), DEF_WIDTH, DEF_HEIGHT);
+ gtk_container_border_width(GTK_CONTAINER(streamwindow), 6);
/* setup the container */
- vbox = gtk_vbox_new(FALSE, 0);
+ tooltips = gtk_tooltips_new ();
+
+ vbox = gtk_vbox_new(FALSE, 6);
gtk_container_add(GTK_CONTAINER(streamwindow), vbox);
+ /* content frame */
+ if (incomplete_tcp_stream) {
+ stream_fr = gtk_frame_new("Stream Content (incomplete)");
+ } else {
+ stream_fr = gtk_frame_new("Stream Content");
+ }
+ gtk_container_add(GTK_CONTAINER(vbox), stream_fr);
+ gtk_widget_show(stream_fr);
+
+ stream_vb = gtk_vbox_new(FALSE, 6);
+ gtk_container_set_border_width( GTK_CONTAINER(stream_vb) , 6);
+ gtk_container_add(GTK_CONTAINER(stream_fr), stream_vb);
+
/* create a scrolled window for the text */
txt_scrollw = scrolled_window_new(NULL, NULL);
#if GTK_MAJOR_VERSION >= 2
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw),
- GTK_SHADOW_IN);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw),
+ GTK_SHADOW_IN);
#endif
- gtk_box_pack_start(GTK_BOX(vbox), txt_scrollw, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(stream_vb), txt_scrollw, TRUE, TRUE, 0);
/* create a text box */
#if GTK_MAJOR_VERSION < 2
#else
text = gtk_text_view_new();
gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD_CHAR);
#endif
gtk_container_add(GTK_CONTAINER(txt_scrollw), text);
follow_info->text = text;
- /* Create hbox */
+
+ /* stream hbox */
hbox = gtk_hbox_new(FALSE, 1);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(stream_vb), hbox, FALSE, FALSE, 0);
+ /* Create Save As Button */
+ button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE_AS);
+ SIGNAL_CONNECT(button, "clicked", follow_save_as_cmd_cb, follow_info);
+ gtk_tooltips_set_tip (tooltips, button, "Save the content as currently displayed ", NULL);
+ gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+
+ /* Create Print Button */
+ button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_PRINT);
+ SIGNAL_CONNECT(button, "clicked", follow_print_stream, follow_info);
+ gtk_tooltips_set_tip (tooltips, button, "Print the content as currently displayed", NULL);
+ gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
/* Stream to show */
follow_tcp_stats(&stats);
stream_om = gtk_option_menu_new();
stream_menu = gtk_menu_new();
- /* Both Hosts */
- snprintf(string, sizeof(string),
+ /* Both Stream Directions */
+ g_snprintf(string, sizeof(string),
"Entire conversation (%u bytes)",
stats.bytes_written[0] + stats.bytes_written[1]);
stream_mi = gtk_menu_item_new_with_label(string);
follow_info->show_stream = BOTH_HOSTS;
/* Host 0 --> Host 1 */
- snprintf(string, sizeof(string), "%s:%s --> %s:%s (%u bytes)",
+ g_snprintf(string, sizeof(string), "%s:%s --> %s:%s (%u bytes)",
hostname0, port0, hostname1, port1,
stats.bytes_written[0]);
stream_mi = gtk_menu_item_new_with_label(string);
gtk_widget_show(stream_mi);
/* Host 1 --> Host 0 */
- snprintf(string, sizeof(string), "%s:%s --> %s:%s (%u bytes)",
+ g_snprintf(string, sizeof(string), "%s:%s --> %s:%s (%u bytes)",
hostname1, port1, hostname0, port0,
stats.bytes_written[1]);
stream_mi = gtk_menu_item_new_with_label(string);
gtk_option_menu_set_menu(GTK_OPTION_MENU(stream_om), stream_menu);
/* Set history to 0th item, i.e., the first item. */
gtk_option_menu_set_history(GTK_OPTION_MENU(stream_om), 0);
+ gtk_tooltips_set_tip (tooltips, stream_om,
+ "Select the stream direction to display", NULL);
gtk_box_pack_start(GTK_BOX(hbox), stream_om, FALSE, FALSE, 0);
/* ASCII radio button */
radio_bt = gtk_radio_button_new_with_label(NULL, "ASCII");
+ gtk_tooltips_set_tip (tooltips, radio_bt, "Stream data output in \"ASCII\" format", NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_bt), TRUE);
gtk_box_pack_start(GTK_BOX(hbox), radio_bt, FALSE, FALSE, 0);
SIGNAL_CONNECT(radio_bt, "toggled", follow_charset_toggle_cb,
radio_bt = gtk_radio_button_new_with_label(gtk_radio_button_group
(GTK_RADIO_BUTTON(radio_bt)),
"EBCDIC");
+ gtk_tooltips_set_tip (tooltips, radio_bt, "Stream data output in \"EBCDIC\" format", NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_bt), FALSE);
gtk_box_pack_start(GTK_BOX(hbox), radio_bt, FALSE, FALSE, 0);
SIGNAL_CONNECT(radio_bt, "toggled", follow_charset_toggle_cb,
radio_bt = gtk_radio_button_new_with_label(gtk_radio_button_group
(GTK_RADIO_BUTTON(radio_bt)),
"Hex Dump");
+ gtk_tooltips_set_tip (tooltips, radio_bt, "Stream data output in \"Hexdump\" format", NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_bt), FALSE);
gtk_box_pack_start(GTK_BOX(hbox), radio_bt, FALSE, FALSE, 0);
SIGNAL_CONNECT(radio_bt, "toggled", follow_charset_toggle_cb,
radio_bt = gtk_radio_button_new_with_label(gtk_radio_button_group
(GTK_RADIO_BUTTON(radio_bt)),
"C Arrays");
+ gtk_tooltips_set_tip (tooltips, radio_bt, "Stream data output in \"C Array\" format", NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_bt), FALSE);
gtk_box_pack_start(GTK_BOX(hbox), radio_bt, FALSE, FALSE, 0);
SIGNAL_CONNECT(radio_bt, "toggled", follow_charset_toggle_cb,
follow_info);
follow_info->carray_bt = radio_bt;
- /* Create Close Button */
- button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
- SIGNAL_CONNECT_OBJECT(button, "clicked", gtk_widget_destroy,
- streamwindow);
- gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-
- /* Catch the "key_press_event" signal in the window, so that we can catch
- the ESC key being pressed and act as if the "Cancel" button had
- been selected. */
- dlg_set_cancel(streamwindow, button);
+ /* Raw radio button */
+ radio_bt = gtk_radio_button_new_with_label(gtk_radio_button_group
+ (GTK_RADIO_BUTTON(radio_bt)),
+ "Raw");
+ gtk_tooltips_set_tip (tooltips, radio_bt, "Stream data output in \"Raw\" (binary) format. "
+ "As this contains non printable characters, the screen output will be in ASCII format", NULL);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_bt), FALSE);
+ gtk_box_pack_start(GTK_BOX(hbox), radio_bt, FALSE, FALSE, 0);
+ SIGNAL_CONNECT(radio_bt, "toggled", follow_charset_toggle_cb,
+ follow_info);
+ follow_info->raw_bt = radio_bt;
- /* Create exclude stream button */
- button = gtk_button_new_with_label("Filter out this stream");
- SIGNAL_CONNECT(button, "clicked", follow_filter_out_stream, follow_info);
+ /* Button row: (help), filter out, close button */
+ if(topic_available(HELP_FILESET_DIALOG)) {
+ bbox = dlg_button_row_new(ETHEREAL_STOCK_FILTER_OUT_STREAM, GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
+ } else {
+ bbox = dlg_button_row_new(ETHEREAL_STOCK_FILTER_OUT_STREAM, GTK_STOCK_CLOSE, NULL);
+ }
+ gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 5);
- gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
- /* Create Save As Button */
- button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE_AS);
- SIGNAL_CONNECT(button, "clicked", follow_save_as_cmd_cb, follow_info);
- gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+ button = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_FILTER_OUT_STREAM);
+ gtk_tooltips_set_tip (tooltips, button,
+ "Build a display filter which cuts this stream from the capture", NULL);
+ SIGNAL_CONNECT(button, "clicked", follow_filter_out_stream, follow_info);
- /* Create Print Button */
- button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_PRINT);
- SIGNAL_CONNECT(button, "clicked", follow_print_stream, follow_info);
- gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+ button = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
+ window_set_cancel_button(streamwindow, button, window_cancel_button_cb);
+ gtk_tooltips_set_tip (tooltips, button,
+ "Close the dialog and keep the current display filter", NULL);
+ gtk_widget_grab_default(button);
+ if(topic_available(HELP_FILESET_DIALOG)) {
+ button = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
+ SIGNAL_CONNECT(button, "clicked", topic_cb, HELP_FOLLOW_TCP_STREAM_DIALOG);
+ }
/* Tuck away the follow_info object into the window */
OBJECT_SET_DATA(streamwindow, E_FOLLOW_INFO_KEY, follow_info);
data_out_file = NULL;
+ SIGNAL_CONNECT(streamwindow, "delete_event", window_delete_event_cb, NULL);
+ SIGNAL_CONNECT(streamwindow, "destroy", follow_destroy_cb, NULL);
+
/* Make sure this widget gets destroyed if we quit the main loop,
so that if we exit, we clean up any temporary files we have
for "Follow TCP Stream" windows. */
gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(streamwindow));
+
gtk_widget_show_all(streamwindow);
+ window_present(streamwindow);
}
/* The destroy call back has the responsibility of
follow_destroy_cb(GtkWidget *w, gpointer data _U_)
{
follow_info_t *follow_info;
+ int i;
follow_info = OBJECT_GET_DATA(w, E_FOLLOW_INFO_KEY);
- unlink(follow_info->data_out_filename);
+ i = unlink(follow_info->data_out_filename);
+ if(i != 0) {
+ g_warning("Follow: Couldn't remove temporary file: \"%s\", errno: %s (%u)",
+ follow_info->data_out_filename, strerror(errno), errno);
+ }
g_free(follow_info->filter_out_filter);
- gtk_widget_destroy(w);
forget_follow_info(follow_info);
g_free(follow_info);
}
/* XXX - can I emulate follow_charset_toggle_cb() instead of having
- * 3 different functions here? */
+ * 3 different functions here?
+ * That might not be a bad idea, as it might mean we only reload
+ * the window once, not twice - see follow_charset_toggle_cb()
+ * for an explanation. */
static void
follow_stream_om_both(GtkWidget *w _U_, gpointer data)
{
}
-/* Handles the ASCII/EBCDIC toggling */
+/* Handles the display style toggling */
static void
follow_charset_toggle_cb(GtkWidget * w _U_, gpointer data)
{
follow_info_t *follow_info = data;
- if (GTK_TOGGLE_BUTTON(follow_info->ebcdic_bt)->active)
- follow_info->show_type = SHOW_EBCDIC;
- else if (GTK_TOGGLE_BUTTON(follow_info->hexdump_bt)->active)
- follow_info->show_type = SHOW_HEXDUMP;
- else if (GTK_TOGGLE_BUTTON(follow_info->carray_bt)->active)
- follow_info->show_type = SHOW_CARRAY;
- else if (GTK_TOGGLE_BUTTON(follow_info->ascii_bt)->active)
- follow_info->show_type = SHOW_ASCII;
- else
- g_assert_not_reached();
-
- follow_load_text(follow_info);
+ /*
+ * A radio button toggles when it goes on and when it goes
+ * off, so when you click a radio button two signals are
+ * delivered. We only want to reprocess the display once,
+ * so we do it only when the button goes on.
+ */
+ if (GTK_TOGGLE_BUTTON(w)->active) {
+ if (w == follow_info->ebcdic_bt)
+ follow_info->show_type = SHOW_EBCDIC;
+ else if (w == follow_info->hexdump_bt)
+ follow_info->show_type = SHOW_HEXDUMP;
+ else if (w == follow_info->carray_bt)
+ follow_info->show_type = SHOW_CARRAY;
+ else if (w == follow_info->ascii_bt)
+ follow_info->show_type = SHOW_ASCII;
+ else if (w == follow_info->raw_bt)
+ follow_info->show_type = SHOW_RAW;
+ follow_load_text(follow_info);
+ }
}
#define FLT_BUF_SIZE 1024
FRS_PRINT_ERROR
} frs_return_t;
+/*
+ * XXX - the routine pointed to by "print_line" doesn't get handed lines,
+ * it gets handed bufferfuls. That's fine for "follow_write_raw()"
+ * and "follow_add_to_gtk_text()", but, as "follow_print_text()" calls
+ * the "print_line()" routine from "print.c", and as that routine might
+ * genuinely expect to be handed a line (if, for example, it's using
+ * some OS or desktop environment's printing API, and that API expects
+ * to be handed lines), "follow_print_text()" should probably accumulate
+ * lines in a buffer and hand them "print_line()". (If there's a
+ * complete line in a buffer - i.e., there's nothing of the line in
+ * the previous buffer or the next buffer - it can just hand that to
+ * "print_line()" after filtering out non-printables, as an
+ * optimization.)
+ *
+ * This might or might not be the reason why C arrays display
+ * correctly but get extra blank lines very other line when printed.
+ */
static frs_return_t
follow_read_stream(follow_info_t *follow_info,
- gboolean (*print_line) (char *, int, gboolean, void *),
+ gboolean (*print_line) (char *, size_t, gboolean, void *),
void *arg)
{
tcp_stream_chunk sc;
guint8 client_addr[MAX_IPADDR_LEN];
guint16 client_port = 0;
gboolean is_server;
- guint16 current_pos, global_client_pos = 0, global_server_pos = 0;
- guint16 *global_pos;
+ guint32 current_pos, global_client_pos = 0, global_server_pos = 0;
+ guint32 *global_pos;
gboolean skip;
gchar initbuf[256];
guint32 server_packet_count = 0;
guint32 client_packet_count = 0;
char buffer[FLT_BUF_SIZE];
- int nchars;
+ size_t nchars;
+ static const gchar hexchars[16] = "0123456789abcdef";
iplen = (follow_info->is_ipv6) ? 16 : 4;
- data_out_file = fopen(follow_info->data_out_filename, "rb");
+ data_out_file = eth_fopen(follow_info->data_out_filename, "rb");
if (data_out_file == NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"Could not open temporary file %s: %s", follow_info->data_out_filename,
nchars = fread(buffer, 1, bcount, data_out_file);
if (nchars == 0)
break;
- sc.dlen -= bcount;
+ sc.dlen -= nchars;
+
if (!skip) {
switch (follow_info->show_type) {
goto print_error;
break;
+ case SHOW_RAW:
+ /* Don't translate, no matter what the native arch
+ * is.
+ */
+ if (!(*print_line) (buffer, nchars, is_server, arg))
+ goto print_error;
+ break;
+
case SHOW_HEXDUMP:
current_pos = 0;
while (current_pos < nchars) {
gchar hexbuf[256];
- gchar hexchars[] = "0123456789abcdef";
- int i, cur;
+ int i;
+ gchar *cur = hexbuf, *ascii_start;
- /* is_server indentation : put 63 spaces at the
+ /* is_server indentation : put 78 spaces at the
* beginning of the string */
- sprintf(hexbuf, (is_server &&
- follow_info->show_stream == BOTH_HOSTS) ?
- " "
- " %08X " :
- "%08X ", *global_pos);
- cur = strlen(hexbuf);
+ if (is_server && follow_info->show_stream == BOTH_HOSTS) {
+ memset(cur, ' ', 78);
+ cur += 78;
+ }
+ cur += g_snprintf(cur, 20, "%08X ", *global_pos);
+ /* 49 is space consumed by hex chars */
+ ascii_start = cur + 49;
for (i = 0; i < 16 && current_pos + i < nchars; i++) {
- hexbuf[cur++] =
+ *cur++ =
hexchars[(buffer[current_pos + i] & 0xf0) >> 4];
- hexbuf[cur++] =
+ *cur++ =
hexchars[buffer[current_pos + i] & 0x0f];
- if (i == 7) {
- hexbuf[cur++] = ' ';
- hexbuf[cur++] = ' ';
- } else if (i != 15)
- hexbuf[cur++] = ' ';
+ *cur++ = ' ';
+ if (i == 7)
+ *cur++ = ' ';
}
/* Fill it up if column isn't complete */
- if (i < 16) {
- int j;
-
- for (j = i; j < 16; j++) {
- if (j == 7)
- hexbuf[cur++] = ' ';
- hexbuf[cur++] = ' ';
- hexbuf[cur++] = ' ';
- hexbuf[cur++] = ' ';
- }
- } else
- hexbuf[cur++] = ' ';
+ while (cur < ascii_start)
+ *cur++ = ' ';
/* Now dump bytes as text */
for (i = 0; i < 16 && current_pos + i < nchars; i++) {
- hexbuf[cur++] =
+ *cur++ =
(isprint((guchar)buffer[current_pos + i]) ?
buffer[current_pos + i] : '.' );
if (i == 7) {
- hexbuf[cur++] = ' ';
+ *cur++ = ' ';
}
}
current_pos += i;
(*global_pos) += i;
- hexbuf[cur++] = '\n';
- hexbuf[cur] = 0;
+ *cur++ = '\n';
+ *cur = 0;
if (!(*print_line) (hexbuf, strlen(hexbuf), is_server, arg))
goto print_error;
}
case SHOW_CARRAY:
current_pos = 0;
- sprintf(initbuf, "char peer%d_%d[] = {\n", is_server ? 1 : 0,
+ g_snprintf(initbuf, sizeof(initbuf), "char peer%d_%d[] = {\n",
+ is_server ? 1 : 0,
is_server ? server_packet_count++ : client_packet_count++);
if (!(*print_line) (initbuf, strlen(initbuf), is_server, arg))
goto print_error;
while (current_pos < nchars) {
gchar hexbuf[256];
- gchar hexchars[] = "0123456789abcdef";
int i, cur;
cur = 0;
return FRS_READ_ERROR;
}
+ fclose(data_out_file);
+ data_out_file = NULL;
return FRS_OK;
print_error:
/*
* XXX - for text printing, we probably want to wrap lines at 80 characters;
- * for PostScript printing, we probably want to wrap them at the appropriate
- * width, and perhaps put some kind of dingbat (to use the technical term)
- * to indicate a wrapped line, along the lines of what's done when displaying
- * this in a window, as per Warren Young's suggestion.
- *
- * For now, we support only text printing.
+ * (PostScript printing is doing this already), and perhaps put some kind of
+ * dingbat (to use the technical term) to indicate a wrapped line, along the
+ * lines of what's done when displaying this in a window, as per Warren Young's
+ * suggestion.
*/
static gboolean
-follow_print_text(char *buffer, int nchars, gboolean is_server _U_, void *arg)
+follow_print_text(char *buffer, size_t nchars, gboolean is_server _U_, void *arg)
+{
+ print_stream_t *stream = arg;
+ size_t i;
+ char *str;
+
+ /* convert non printable characters */
+ for (i = 0; i < nchars; i++) {
+ if (buffer[i] == '\n' || buffer[i] == '\r')
+ continue;
+ if (! isprint((guchar)buffer[i])) {
+ buffer[i] = '.';
+ }
+ }
+
+ /* convert unterminated char array to a zero terminated string */
+ str = g_malloc(nchars + 1);
+ memcpy(str, buffer, nchars);
+ str[nchars] = 0;
+ print_line(stream, /*indent*/ 0, str);
+ g_free(str);
+
+ return TRUE;
+}
+
+static gboolean
+follow_write_raw(char *buffer, size_t nchars, gboolean is_server _U_, void *arg)
{
FILE *fh = arg;
+ size_t nwritten;
+
+ nwritten = fwrite(buffer, 1, nchars, fh);
+ if (nwritten != nchars)
+ return FALSE;
- if (fwrite(buffer, nchars, 1, fh) != 1)
- return FALSE;
return TRUE;
}
static void
-follow_filter_out_stream(GtkWidget * w _U_, gpointer data)
+follow_filter_out_stream(GtkWidget * w _U_, gpointer data)
{
follow_info_t *follow_info = data;
gtk_entry_set_text(GTK_ENTRY(follow_info->filter_te), follow_info->filter_out_filter);
/* Run the display filter so it goes in effect. */
- main_filter_packets(&cfile, follow_info->filter_out_filter);
+ main_filter_packets(&cfile, follow_info->filter_out_filter, FALSE);
/* we force a subsequent close */
- gtk_widget_destroy(follow_info->streamwindow);
-
+ window_destroy(follow_info->streamwindow);
+
return;
}
static void
follow_print_stream(GtkWidget * w _U_, gpointer data)
{
- FILE *fh;
+ print_stream_t *stream;
gboolean to_file;
char *print_dest;
follow_info_t *follow_info = data;
+#ifdef _WIN32
+ gboolean win_printer = FALSE;
+#endif
switch (prefs.pr_dest) {
case PR_DEST_CMD:
- print_dest = prefs.pr_cmd;
- to_file = FALSE;
- break;
-
+#ifdef _WIN32
+ win_printer = TRUE;
+ /*XXX should use temp file stuff in util routines */
+ print_dest = g_strdup(tmpnam(NULL));
+ to_file = TRUE;
+#else
+ print_dest = prefs.pr_cmd;
+ to_file = FALSE;
+#endif
+ break;
case PR_DEST_FILE:
- print_dest = prefs.pr_file;
- to_file = TRUE;
- break;
+ print_dest = prefs.pr_file;
+ to_file = TRUE;
+ break;
default: /* "Can't happen" */
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- "Couldn't figure out where to send the print "
- "job. Check your preferences.");
- return;
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Couldn't figure out where to send the print "
+ "job. Check your preferences.");
+ return;
}
- fh = open_print_dest(to_file, print_dest);
- if (fh == NULL) {
- if (to_file)
- open_failure_alert_box(prefs.pr_file, errno, TRUE);
- else {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- "Couldn't run print command %s.", prefs.pr_cmd);
- }
- return;
+ switch (prefs.pr_format) {
+
+ case PR_FMT_TEXT:
+ stream = print_stream_text_new(to_file, print_dest);
+ break;
+
+ case PR_FMT_PS:
+ stream = print_stream_ps_new(to_file, print_dest);
+ break;
+
+ default:
+ g_assert_not_reached();
+ stream = NULL;
+ }
+ if (stream == NULL) {
+ if (to_file) {
+ open_failure_alert_box(prefs.pr_file, errno, TRUE);
+ } else {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Couldn't run print command %s.", prefs.pr_cmd);
+ }
+ return;
}
- print_preamble(fh, PR_FMT_TEXT);
- if (ferror(fh))
- goto print_error;
- switch (follow_read_stream(follow_info, follow_print_text, fh)) {
+ if (!print_preamble(stream, cfile.filename))
+ goto print_error;
+ switch (follow_read_stream(follow_info, follow_print_text, stream)) {
case FRS_OK:
- break;
-
+ break;
case FRS_OPEN_ERROR:
case FRS_READ_ERROR:
- /* XXX - cancel printing? */
- close_print_dest(to_file, fh);
- return;
-
+ /* XXX - cancel printing? */
+ destroy_print_stream(stream);
+ return;
case FRS_PRINT_ERROR:
- goto print_error;
+ goto print_error;
}
- print_finale(fh, PR_FMT_TEXT);
- if (ferror(fh))
- goto print_error;
- if (!close_print_dest(to_file, fh)) {
- if (to_file)
- write_failure_alert_box(prefs.pr_file, errno);
- else {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+
+ if (!print_finale(stream))
+ goto print_error;
+
+ if (!destroy_print_stream(stream)) {
+ if (to_file) {
+ write_failure_alert_box(prefs.pr_file, errno);
+ } else {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"Error closing print destination.");
- }
+ }
}
+#ifdef _WIN32
+ if (win_printer) {
+ print_mswin(print_dest);
+
+ /* trash temp file */
+ eth_remove(print_dest);
+ }
+#endif
return;
print_error:
- if (to_file)
- write_failure_alert_box(prefs.pr_file, errno);
- else {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- "Error writing to print command: %s", strerror(errno));
+ if (to_file) {
+ write_failure_alert_box(prefs.pr_file, errno);
+ } else {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Error writing to print command: %s", strerror(errno));
}
/* XXX - cancel printing? */
- close_print_dest(to_file, fh);
+ destroy_print_stream(stream);
+
+#ifdef _WIN32
+ if (win_printer) {
+ /* trash temp file */
+ eth_remove(print_dest);
+ }
+#endif
}
+/* static variable declarations to speed up the performance
+ * of follow_load_text and follow_add_to_gtk_text
+ */
+static GdkColor server_fg, server_bg;
+static GdkColor client_fg, client_bg;
+#if GTK_MAJOR_VERSION >= 2
+static GtkTextTag *server_tag, *client_tag;
+#endif
+
static gboolean
-follow_add_to_gtk_text(char *buffer, int nchars, gboolean is_server,
+follow_add_to_gtk_text(char *buffer, size_t nchars, gboolean is_server,
void *arg)
{
GtkWidget *text = arg;
- GdkColor fg, bg;
#if GTK_MAJOR_VERSION >= 2
GtkTextBuffer *buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
GtkTextIter iter;
- GtkTextTag *tag;
- gsize outbytes;
- gchar *convbuf;
#endif
#if GTK_MAJOR_VERSION >= 2 || GTK_MINOR_VERSION >= 3
+ gboolean line_break = FALSE;
/* While our isprint() hack is in place, we
* have to use convert some chars to '.' in order
* to be able to see the data we *should* see
* in the GtkText widget.
*/
- int i;
+ size_t i;
for (i = 0; i < nchars; i++) {
if (buffer[i] == '\n' || buffer[i] == '\r')
+ {
+ line_break = TRUE;
continue;
+ }
if (! isprint(buffer[i])) {
buffer[i] = '.';
}
}
+
+ /* XXX - workaround for bug 852
+ * Force a line break so that the text view
+ * doesn't blow up on excessive long lines.
+ */
+ if (line_break == FALSE)
+ buffer[--i] = '\n';
#endif
+#if GTK_MAJOR_VERSION < 2
if (is_server) {
- color_t_to_gdkcolor(&fg, &prefs.st_server_fg);
- color_t_to_gdkcolor(&bg, &prefs.st_server_bg);
+ gtk_text_insert(GTK_TEXT(text), user_font_get_regular(), &server_fg,
+ &server_bg, buffer, nchars);
} else {
- color_t_to_gdkcolor(&fg, &prefs.st_client_fg);
- color_t_to_gdkcolor(&bg, &prefs.st_client_bg);
+ gtk_text_insert(GTK_TEXT(text), user_font_get_regular(), &client_fg,
+ &client_bg, buffer, nchars);
}
-#if GTK_MAJOR_VERSION < 2
- gtk_text_insert(GTK_TEXT(text), m_r_font, &fg, &bg, buffer, nchars);
#else
gtk_text_buffer_get_end_iter(buf, &iter);
- tag = gtk_text_buffer_create_tag(buf, NULL, "foreground-gdk", &fg,
- "background-gdk", &bg, "font-desc",
- m_r_font, NULL);
- convbuf = g_locale_to_utf8(buffer, nchars, NULL, &outbytes, NULL);
- gtk_text_buffer_insert_with_tags(buf, &iter, convbuf, outbytes, tag,
- NULL);
- g_free(convbuf);
+ if (is_server) {
+ gtk_text_buffer_insert_with_tags(buf, &iter, buffer, nchars,
+ server_tag, NULL);
+ } else {
+ gtk_text_buffer_insert_with_tags(buf, &iter, buffer, nchars,
+ client_tag, NULL);
+ }
#endif
return TRUE;
}
int bytes_already;
#else
GtkTextBuffer *buf;
-
+
buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(follow_info->text));
#endif
+ /* prepare colors one time for repeated use by follow_add_to_gtk_text */
+ color_t_to_gdkcolor(&server_fg, &prefs.st_server_fg);
+ color_t_to_gdkcolor(&server_bg, &prefs.st_server_bg);
+ color_t_to_gdkcolor(&client_fg, &prefs.st_client_fg);
+ color_t_to_gdkcolor(&client_bg, &prefs.st_client_bg);
+
/* Delete any info already in text box */
#if GTK_MAJOR_VERSION < 2
bytes_already = gtk_text_get_length(GTK_TEXT(follow_info->text));
/* stop the updates while we fill the text box */
gtk_text_freeze(GTK_TEXT(follow_info->text));
#else
+ /* prepare tags one time for repeated use by follow_add_to_gtk_text */
+ server_tag = gtk_text_buffer_create_tag(buf, NULL, "foreground-gdk", &server_fg,
+ "background-gdk", &server_bg, "font-desc",
+ user_font_get_regular(), NULL);
+ client_tag = gtk_text_buffer_create_tag(buf, NULL, "foreground-gdk", &client_fg,
+ "background-gdk", &client_bg, "font-desc",
+ user_font_get_regular(), NULL);
+
gtk_text_buffer_set_text(buf, "", -1);
#endif
follow_read_stream(follow_info, follow_add_to_gtk_text, follow_info->text);
static void
follow_save_as_cmd_cb(GtkWidget *w _U_, gpointer data)
{
- GtkWidget *ok_bt, *new_win;
+ GtkWidget *new_win;
follow_info_t *follow_info = data;
if (follow_info->follow_save_as_w != NULL) {
return;
}
- new_win = gtk_file_selection_new("Ethereal: Save TCP Follow Stream As");
+ new_win = file_selection_new("Ethereal: Save TCP Follow Stream As",
+ FILE_SELECTION_SAVE);
follow_info->follow_save_as_w = new_win;
- SIGNAL_CONNECT(new_win, "destroy", follow_save_as_destroy_cb, follow_info);
/* Tuck away the follow_info object into the window */
OBJECT_SET_DATA(new_win, E_FOLLOW_INFO_KEY, follow_info);
- /* If we've opened a file, start out by showing the files in the directory
- in which that file resided. */
- if (last_open_dir)
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(new_win),
- last_open_dir);
+ SIGNAL_CONNECT(new_win, "destroy", follow_save_as_destroy_cb, follow_info);
+#if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2
+ if (gtk_dialog_run(GTK_DIALOG(new_win)) == GTK_RESPONSE_ACCEPT)
+ {
+ follow_save_as_ok_cb(new_win, new_win);
+ } else {
+ window_destroy(new_win);
+ }
+#else
/* Connect the ok_button to file_save_as_ok_cb function and pass along a
pointer to the file selection box widget */
- ok_bt = GTK_FILE_SELECTION(new_win)->ok_button;
- SIGNAL_CONNECT(ok_bt, "clicked", follow_save_as_ok_cb, new_win);
+ SIGNAL_CONNECT(GTK_FILE_SELECTION(new_win)->ok_button,
+ "clicked", follow_save_as_ok_cb, new_win);
- /* Connect the cancel_button to destroy the widget */
- SIGNAL_CONNECT_OBJECT(GTK_FILE_SELECTION(new_win)->cancel_button, "clicked",
- gtk_widget_destroy, new_win);
-
- /* Catch the "key_press_event" signal in the window, so that we can catch
- the ESC key being pressed and act as if the "Cancel" button had
- been selected. */
- dlg_set_cancel(new_win,
- GTK_FILE_SELECTION(new_win)->cancel_button);
+ window_set_cancel_button(new_win,
+ GTK_FILE_SELECTION(new_win)->cancel_button, window_cancel_button_cb);
gtk_file_selection_set_filename(GTK_FILE_SELECTION(new_win), "");
+
+ SIGNAL_CONNECT(new_win, "delete_event", window_delete_event_cb, NULL);
+
gtk_widget_show_all(new_win);
+ window_present(new_win);
+#endif
}
static void
-follow_save_as_ok_cb(GtkWidget * w _U_, GtkFileSelection * fs)
+follow_save_as_ok_cb(GtkWidget * w _U_, gpointer fs)
{
- gchar *to_name;
- follow_info_t *follow_info;
- FILE *fh;
- gchar *dirname;
-
- to_name = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs)));
-
- /* Perhaps the user specified a directory instead of a file.
- Check whether they did. */
- if (test_for_directory(to_name) == EISDIR) {
- /* It's a directory - set the file selection box to display that
- directory, and leave the selection box displayed. */
- set_last_open_dir(to_name);
- g_free(to_name);
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(fs),
- last_open_dir);
- return;
- }
-
- fh = fopen(to_name, "wb");
- if (fh == NULL) {
- open_failure_alert_box(to_name, errno, TRUE);
- g_free(to_name);
- return;
- }
-
- gtk_widget_hide(GTK_WIDGET(fs));
- follow_info = OBJECT_GET_DATA(fs, E_FOLLOW_INFO_KEY);
- gtk_widget_destroy(GTK_WIDGET(fs));
+ gchar *to_name;
+ follow_info_t *follow_info;
+ FILE *fh;
+ print_stream_t *stream = NULL;
+ gchar *dirname;
- switch (follow_read_stream(follow_info, follow_print_text, fh)) {
+#if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2
+ to_name = g_strdup(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs)));
+#else
+ to_name = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs)));
+#endif
- case FRS_OK:
- if (fclose(fh) == EOF)
- write_failure_alert_box(to_name, errno);
- break;
+ /* Perhaps the user specified a directory instead of a file.
+ Check whether they did. */
+ if (test_for_directory(to_name) == EISDIR) {
+ /* It's a directory - set the file selection box to display that
+ directory, and leave the selection box displayed. */
+ set_last_open_dir(to_name);
+ g_free(to_name);
+ file_selection_set_current_folder(fs, get_last_open_dir());
+ return;
+ }
- case FRS_OPEN_ERROR:
- case FRS_READ_ERROR:
- fclose(fh);
- break;
+ follow_info = OBJECT_GET_DATA(fs, E_FOLLOW_INFO_KEY);
+ if (follow_info->show_type == SHOW_RAW) {
+ /* Write the data out as raw binary data */
+ fh = eth_fopen(to_name, "wb");
+ } else {
+ /* Write it out as text */
+ fh = eth_fopen(to_name, "w");
+ }
+ if (fh == NULL) {
+ open_failure_alert_box(to_name, errno, TRUE);
+ g_free(to_name);
+ return;
+ }
- case FRS_PRINT_ERROR:
- write_failure_alert_box(to_name, errno);
- fclose(fh);
- break;
- }
+ gtk_widget_hide(GTK_WIDGET(fs));
+ window_destroy(GTK_WIDGET(fs));
+
+ if (follow_info->show_type == SHOW_RAW) {
+ switch (follow_read_stream(follow_info, follow_write_raw, fh)) {
+ case FRS_OK:
+ if (fclose(fh) == EOF)
+ write_failure_alert_box(to_name, errno);
+ break;
+
+ case FRS_OPEN_ERROR:
+ case FRS_READ_ERROR:
+ fclose(fh);
+ break;
+
+ case FRS_PRINT_ERROR:
+ write_failure_alert_box(to_name, errno);
+ fclose(fh);
+ break;
+ }
+ } else {
+ stream = print_stream_text_stdio_new(fh);
+ switch (follow_read_stream(follow_info, follow_print_text, stream)) {
+ case FRS_OK:
+ if (!destroy_print_stream(stream))
+ write_failure_alert_box(to_name, errno);
+ break;
+
+ case FRS_OPEN_ERROR:
+ case FRS_READ_ERROR:
+ destroy_print_stream(stream);
+ break;
+
+ case FRS_PRINT_ERROR:
+ write_failure_alert_box(to_name, errno);
+ destroy_print_stream(stream);
+ break;
+ }
+ }
- /* Save the directory name for future file dialogs. */
- dirname = get_dirname(to_name); /* Overwrites to_name */
- set_last_open_dir(dirname);
- g_free(to_name);
+ /* Save the directory name for future file dialogs. */
+ dirname = get_dirname(to_name); /* Overwrites to_name */
+ set_last_open_dir(dirname);
+ g_free(to_name);
}
static void
/* Note that we no longer have a dialog box. */
follow_info->follow_save_as_w = NULL;
}
-
-
-
-gboolean follow_stream_selected_packet_enabled(frame_data *current_frame, epan_dissect_t *edt)
-{
- return current_frame != NULL ? (edt->pi.ipproto == IP_PROTO_TCP) : FALSE;
-}
-
-
-void
-register_tap_listener_follow_stream(void)
-{
- register_tap_menu_item("TCP/Follow Stream", REGISTER_TAP_LAYER_TRANSPORT,
- follow_stream_cb, follow_stream_selected_packet_enabled, NULL, NULL);
-}
-
-
git.samba.org / obnox / wireshark / wip.git / blobdiff