/* find_dlg.c
* Routines for "find frame" window
*
- * $Id: find_dlg.c,v 1.38 2003/10/07 09:30:34 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
#include <epan/proto.h>
#include <epan/dfilter/dfilter.h>
+#include <epan/strutil.h>
#include "globals.h"
#include "ui_util.h"
#include "find_dlg.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
+#include "alert_box.h"
#include "simple_dialog.h"
#include "dlg_utils.h"
#include "compat_macros.h"
-#include "prefs.h"
+#include <epan/prefs.h>
#include "prefs_dlg.h"
#include "keys.h"
+#include "help_dlg.h"
/* Capture callback data keys */
#define E_FIND_FILT_KEY "find_filter_te"
#define E_FIND_BACKWARD_KEY "find_backward"
#define E_FIND_HEXDATA_KEY "find_hex"
-#define E_FIND_ASCIIDATA_KEY "find_ascii"
+#define E_FIND_STRINGDATA_KEY "find_string"
#define E_FIND_FILTERDATA_KEY "find_filter"
#define E_FIND_STRINGTYPE_KEY "find_string_type"
+#define E_FIND_STRINGTYPE_LABEL_KEY "find_string_type_label"
#define E_CASE_SEARCH_KEY "case_insensitive_search"
#define E_SOURCE_HEX_KEY "hex_data_source"
#define E_SOURCE_DECODE_KEY "decode_data_source"
static gboolean summary_data = FALSE;
static gboolean decode_data = FALSE;
+static void
+find_filter_te_syntax_check_cb(GtkWidget *w, gpointer parent_w);
+
static void
find_frame_ok_cb(GtkWidget *ok_bt, gpointer parent_w);
find_frame_destroy_cb(GtkWidget *win, gpointer user_data);
static void
-ascii_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w);
+hex_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w);
+
+static void
+string_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w);
static void
filter_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w);
/*
- * Keep a static pointer to the current "Find Frame" window, if any, so
- * that if somebody tries to do "Find Frame" while there's already a
- * "Find Frame" window up, we just pop up the existing one, rather than
+ * Keep a static pointer to the current "Find Packet" window, if any, so
+ * that if somebody tries to do "Find Packet" while there's already a
+ * "Find Packet" window up, we just pop up the existing one, rather than
* creating a new one.
*/
static GtkWidget *find_frame_w;
void
find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
{
- GtkWidget *main_vb, *filter_hb, *filter_bt,
- *direction_hb, *forward_rb, *backward_rb,
- *hex_hb, *hex_rb, *ascii_rb, *filter_rb,
- *data_hb, *hex_data_rb, *decode_data_rb, *summary_data_rb,
- *combo_cb,
- *bbox, *ok_bt, *cancel_bt, *case_cb,
- *direction_frame, *find_type_frame, *string_window_frame,
- *string_char_frame, *string_opt_frame;
+ GtkWidget *main_vb, *main_find_hb, *main_options_hb,
+
+ *find_type_frame, *find_type_vb,
+ *find_type_hb, *find_type_lb, *hex_rb, *string_rb, *filter_rb,
+ *filter_hb, *filter_bt,
+
+ *direction_frame, *direction_vb,
+ *up_rb, *down_rb,
+
+ *data_frame, *data_vb,
+ *hex_data_rb, *decode_data_rb, *summary_data_rb,
+
+ *string_opt_frame, *string_opt_vb,
+ *case_cb, *combo_lb, *combo_cb,
+
+ *bbox, *ok_bt, *cancel_bt, *help_bt;
GtkTooltips *tooltips;
#if GTK_MAJOR_VERSION < 2
GtkAccelGroup *accel_group;
};
if (find_frame_w != NULL) {
- /* There's already a "Find Frame" dialog box; reactivate it. */
+ /* There's already a "Find Packet" dialog box; reactivate it. */
reactivate_window(find_frame_w);
return;
}
- find_frame_w = dlg_window_new("Ethereal: Find Frame");
- SIGNAL_CONNECT(find_frame_w, "destroy", find_frame_destroy_cb, NULL);
+ find_frame_w = dlg_window_new("Ethereal: Find Packet");
tooltips = gtk_tooltips_new ();
gtk_container_add(GTK_CONTAINER(find_frame_w), main_vb);
gtk_widget_show(main_vb);
+
+ /* */
+ main_find_hb = gtk_hbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(main_vb), main_find_hb);
+ gtk_widget_show(main_find_hb);
+
+
+ /* find frame */
+ find_type_frame = gtk_frame_new("Find");
+ gtk_box_pack_start(GTK_BOX(main_find_hb), find_type_frame, TRUE, TRUE, 0);
+ gtk_widget_show(find_type_frame);
+
+ find_type_vb = gtk_vbox_new(FALSE, 3);
+ gtk_container_border_width(GTK_CONTAINER(find_type_vb), 3);
+ gtk_container_add(GTK_CONTAINER(find_type_frame), find_type_vb);
+ gtk_widget_show(find_type_vb);
+
+ /* find type row */
+ find_type_hb = gtk_hbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(find_type_vb), find_type_hb);
+ gtk_widget_show(find_type_hb);
+
+ find_type_lb = gtk_label_new("By:");
+ gtk_box_pack_start(GTK_BOX(find_type_hb), find_type_lb, FALSE, FALSE, 0);
+ gtk_widget_show(find_type_lb);
+
+ /* Filter */
+ filter_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(NULL,
+ "_Display filter", accel_group);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(filter_rb), !cfile.hex && !cfile.string);
+ gtk_box_pack_start(GTK_BOX(find_type_hb), filter_rb, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tooltips, filter_rb, ("Search for data by display filter syntax.\ne.g. ip.addr==10.1.1.1"), NULL);
+ gtk_widget_show(filter_rb);
+
+ /* Hex */
+ hex_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(filter_rb,
+ "_Hex value", accel_group);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hex_rb), cfile.hex);
+ gtk_box_pack_start(GTK_BOX(find_type_hb), hex_rb, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tooltips, hex_rb, ("Search for data by hex string.\ne.g. fffffda5"), NULL);
+ gtk_widget_show(hex_rb);
+
+ /* ASCII Search */
+ string_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(filter_rb,
+ "_String", accel_group);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(string_rb), cfile.string);
+ gtk_box_pack_start(GTK_BOX(find_type_hb), string_rb, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tooltips, string_rb, ("Search for data by string value.\ne.g. My String"), NULL);
+ gtk_widget_show(string_rb);
+
/* Filter row */
filter_hb = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(main_vb), filter_hb);
+ gtk_box_pack_start(GTK_BOX(find_type_vb), filter_hb, FALSE, FALSE, 0);
gtk_widget_show(filter_hb);
- filter_bt = gtk_button_new_with_label("Filter:");
+ filter_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL);
OBJECT_SET_DATA(filter_bt, E_FILT_TE_BUTTON_KEY, filter_bt);
filter_text_box = gtk_entry_new();
if (cfile.sfilter) gtk_entry_set_text(GTK_ENTRY(filter_text_box), cfile.sfilter);
OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_text_box);
+ OBJECT_SET_DATA(find_frame_w, E_FILT_TE_PTR_KEY, filter_text_box);
gtk_box_pack_start(GTK_BOX(filter_hb), filter_text_box, TRUE, TRUE, 0);
+ SIGNAL_CONNECT(filter_text_box, "changed", find_filter_te_syntax_check_cb, find_frame_w);
gtk_widget_show(filter_text_box);
- direction_frame = gtk_frame_new("Direction");
- gtk_box_pack_start(GTK_BOX(main_vb), direction_frame, TRUE, TRUE, 0);
- gtk_container_border_width(GTK_CONTAINER(direction_frame), 5);
- gtk_widget_show(direction_frame);
-
- /* Misc row: Forward and reverse radio buttons */
- direction_hb = gtk_hbox_new(FALSE, 3);
- gtk_container_border_width(GTK_CONTAINER(direction_hb), 1);
- gtk_container_add(GTK_CONTAINER(direction_frame), direction_hb);
- gtk_widget_show(direction_hb);
-
-#if GTK_MAJOR_VERSION < 2
- forward_rb = dlg_radio_button_new_with_label_with_mnemonic(NULL, "_Forward",
- accel_group);
-#else
- forward_rb = gtk_radio_button_new_with_mnemonic(NULL, "_Forward");
-#endif
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(forward_rb), !cfile.sbackward);
- gtk_box_pack_start(GTK_BOX(direction_hb), forward_rb, TRUE, TRUE, 0);
- gtk_widget_show(forward_rb);
+ /* */
+ main_options_hb = gtk_hbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(main_vb), main_options_hb);
+ gtk_widget_show(main_options_hb);
-#if GTK_MAJOR_VERSION < 2
- backward_rb = dlg_radio_button_new_with_label_with_mnemonic(
- gtk_radio_button_group(GTK_RADIO_BUTTON(forward_rb)),
- "_Backward", accel_group);
-#else
- backward_rb = gtk_radio_button_new_with_mnemonic_from_widget(
- GTK_RADIO_BUTTON(forward_rb), "_Backward");
-#endif
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(backward_rb), cfile.sbackward);
- gtk_box_pack_start(GTK_BOX(direction_hb), backward_rb, TRUE, TRUE, 0);
- gtk_widget_show(backward_rb);
+ /* search in frame */
+ data_frame = gtk_frame_new("Search In");
+ gtk_box_pack_start(GTK_BOX(main_options_hb), data_frame, TRUE, TRUE, 0);
+ gtk_widget_show(data_frame);
- find_type_frame = gtk_frame_new("Find syntax");
- gtk_box_pack_start(GTK_BOX(main_vb), find_type_frame, TRUE, TRUE, 0);
- gtk_container_border_width(GTK_CONTAINER(find_type_frame), 5);
- gtk_widget_show(find_type_frame);
+ /* search in row */
+ data_vb = gtk_vbox_new(TRUE, 0);
+ gtk_container_border_width(GTK_CONTAINER(data_vb), 3);
+ gtk_container_add(GTK_CONTAINER(data_frame), data_vb);
+ gtk_widget_show(data_vb);
- /* Filter/Hex/Ascii Search */
- /* Filter */
- hex_hb = gtk_hbox_new(FALSE, 3);
- gtk_container_border_width(GTK_CONTAINER(hex_hb), 1);
- gtk_container_add(GTK_CONTAINER(find_type_frame), hex_hb);
- gtk_widget_show(hex_hb);
-
-#if GTK_MAJOR_VERSION < 2
- filter_rb = dlg_radio_button_new_with_label_with_mnemonic(NULL, "_Display Filter",
- accel_group);
-#else
- filter_rb = gtk_radio_button_new_with_mnemonic(NULL, "_Display Filter");
-#endif
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(filter_rb), !cfile.hex && !cfile.ascii);
- gtk_box_pack_start(GTK_BOX(hex_hb), filter_rb, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, filter_rb, ("Search for data by display filter syntax.\ne.g. ip.addr==10.1.1.1"), NULL);
- gtk_widget_show(filter_rb);
-
- /* Hex */
-#if GTK_MAJOR_VERSION < 2
- hex_rb = dlg_radio_button_new_with_label_with_mnemonic(
- gtk_radio_button_group(GTK_RADIO_BUTTON(filter_rb)),
- "_Hex", accel_group);
-#else
- hex_rb = gtk_radio_button_new_with_mnemonic_from_widget(
- GTK_RADIO_BUTTON(filter_rb), "_Hex");
-#endif
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hex_rb), cfile.hex);
- gtk_box_pack_start(GTK_BOX(hex_hb), hex_rb, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, hex_rb, ("Search for data by hex string.\ne.g. fffffda5"), NULL);
- gtk_widget_show(hex_rb);
-
- /* ASCII Search */
-
-#if GTK_MAJOR_VERSION < 2
- ascii_rb = dlg_radio_button_new_with_label_with_mnemonic(
- gtk_radio_button_group(GTK_RADIO_BUTTON(filter_rb)),
- "_String", accel_group);
-#else
- ascii_rb = gtk_radio_button_new_with_mnemonic_from_widget(
- GTK_RADIO_BUTTON(filter_rb), "_String");
-#endif
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ascii_rb), cfile.ascii);
- gtk_box_pack_start(GTK_BOX(hex_hb), ascii_rb, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, ascii_rb, ("Search for data by string value.\ne.g. My String"), NULL);
- gtk_widget_show(ascii_rb);
-
- string_window_frame = gtk_frame_new("Search in");
- gtk_box_pack_start(GTK_BOX(main_vb), string_window_frame, TRUE, TRUE, 0);
- gtk_container_border_width(GTK_CONTAINER(string_window_frame), 5);
- gtk_widget_show(string_window_frame);
-
- /* Hex, Decode, or Summary Data Search */
- /* Source Hex Data Search Window*/
- data_hb = gtk_hbox_new(TRUE, 0);
- gtk_container_border_width(GTK_CONTAINER(data_hb), 1);
- gtk_container_add(GTK_CONTAINER(string_window_frame), data_hb);
- gtk_widget_show(data_hb);
-
-#if GTK_MAJOR_VERSION < 2
- hex_data_rb = dlg_radio_button_new_with_label_with_mnemonic(NULL, "Frame data",
- accel_group);
-#else
- hex_data_rb = gtk_radio_button_new_with_mnemonic(NULL, "Frame data");
-#endif
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hex_data_rb), !decode_data && !summary_data);
- gtk_box_pack_start(GTK_BOX(data_hb), hex_data_rb, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, hex_data_rb, ("Search for string in the frame data"), NULL);
- gtk_widget_show(hex_data_rb);
+ /* Packet list */
+ summary_data_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(NULL,
+ "Packet list", accel_group);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(summary_data_rb), summary_data);
+ gtk_box_pack_start(GTK_BOX(data_vb), summary_data_rb, TRUE, TRUE, 0);
+ gtk_tooltips_set_tip (tooltips, summary_data_rb, ("Search for string in the Info column of the packet summary (top pane)"), NULL);
+ gtk_widget_show(summary_data_rb);
- /* Search Decode Window */
-#if GTK_MAJOR_VERSION < 2
- decode_data_rb = dlg_radio_button_new_with_label_with_mnemonic(
- gtk_radio_button_group(GTK_RADIO_BUTTON(hex_data_rb)),
- "Decoded packet", accel_group);
-#else
- decode_data_rb = gtk_radio_button_new_with_mnemonic_from_widget(
- GTK_RADIO_BUTTON(hex_data_rb), "Decoded packet");
-#endif
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(decode_data_rb), decode_data);
- gtk_box_pack_start(GTK_BOX(data_hb), decode_data_rb, TRUE, TRUE, 0);
+ /* Packet details */
+ decode_data_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(summary_data_rb,
+ "Packet details", accel_group);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_data_rb), decode_data);
+ gtk_box_pack_start(GTK_BOX(data_vb), decode_data_rb, TRUE, TRUE, 0);
gtk_tooltips_set_tip (tooltips, decode_data_rb, ("Search for string in the decoded packet display (middle pane)"), NULL);
gtk_widget_show(decode_data_rb);
- /* Search Summary Window */
+ /* Packet bytes */
+ hex_data_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(summary_data_rb,
+ "Packet bytes", accel_group);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hex_data_rb), !decode_data && !summary_data);
+ gtk_box_pack_start(GTK_BOX(data_vb), hex_data_rb, TRUE, TRUE, 0);
+ gtk_tooltips_set_tip (tooltips, hex_data_rb, ("Search for string in the packet data"), NULL);
+ gtk_widget_show(hex_data_rb);
-#if GTK_MAJOR_VERSION < 2
- summary_data_rb = dlg_radio_button_new_with_label_with_mnemonic(
- gtk_radio_button_group(GTK_RADIO_BUTTON(hex_data_rb)),
- "Packet summary", accel_group);
-#else
- summary_data_rb = gtk_radio_button_new_with_mnemonic_from_widget(
- GTK_RADIO_BUTTON(hex_data_rb), "Packet summary");
-#endif
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(summary_data_rb), summary_data);
- gtk_box_pack_start(GTK_BOX(data_hb), summary_data_rb, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, summary_data_rb, ("Search for string in the Info column of the packet summary (top pane)"), NULL);
- gtk_widget_show(summary_data_rb);
+ /* string options frame */
+ string_opt_frame = gtk_frame_new("String Options");
+ gtk_box_pack_start(GTK_BOX(main_options_hb), string_opt_frame, TRUE, TRUE, 0);
+ gtk_widget_show(string_opt_frame);
+ string_opt_vb = gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(string_opt_frame), string_opt_vb);
+ gtk_container_border_width(GTK_CONTAINER(string_opt_vb), 3);
+ gtk_widget_show(string_opt_vb);
- string_char_frame = gtk_frame_new("Character Set");
- gtk_box_pack_start(GTK_BOX(main_vb), string_char_frame, TRUE, TRUE, 0);
- gtk_container_border_width(GTK_CONTAINER(string_char_frame), 5);
- gtk_widget_show(string_char_frame);
+ case_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
+ "Case sensitive", accel_group);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(case_cb), !case_type);
+ gtk_container_add(GTK_CONTAINER(string_opt_vb), case_cb);
+ gtk_tooltips_set_tip (tooltips, case_cb, ("Search by mixed upper/lower case?"), NULL);
+ gtk_widget_show(case_cb);
- /* String Type Selection Dropdown Box
+ combo_lb = gtk_label_new("Character set:");
+ gtk_container_add(GTK_CONTAINER(string_opt_vb), combo_lb);
+ gtk_misc_set_alignment(GTK_MISC(combo_lb), 0.0, 0.5);
+ gtk_widget_show(combo_lb);
+
+ /* String Type Selection Dropdown Box
These only apply to the Hex Window search option */
/* Create Combo Box */
combo_cb = gtk_combo_new();
gtk_combo_set_popdown_strings(GTK_COMBO(combo_cb), glist);
/* You only get to choose from the options we offer */
gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(combo_cb)->entry), FALSE);
- gtk_container_border_width(GTK_CONTAINER(combo_cb), 1);
- gtk_container_add(GTK_CONTAINER(string_char_frame), combo_cb);
+ gtk_container_add(GTK_CONTAINER(string_opt_vb), combo_cb);
gtk_widget_show(combo_cb);
- string_opt_frame = gtk_frame_new("Options");
- gtk_box_pack_start(GTK_BOX(main_vb), string_opt_frame, TRUE, TRUE, 0);
- gtk_container_border_width(GTK_CONTAINER(string_opt_frame), 5);
- gtk_widget_show(string_opt_frame);
-#if GTK_MAJOR_VERSION < 2
- case_cb = dlg_check_button_new_with_label_with_mnemonic(
- "Case Insensitive Search", accel_group);
-#else
- case_cb = gtk_check_button_new_with_mnemonic(
- "Case Insensitive Search");
-#endif
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(case_cb),
- case_type);
- gtk_container_border_width(GTK_CONTAINER(case_cb), 1);
- gtk_container_add(GTK_CONTAINER(string_opt_frame), case_cb);
- gtk_tooltips_set_tip (tooltips, case_cb, ("Search by mixed upper/lower case?"), NULL);
- gtk_widget_show(case_cb);
+ /* direction frame */
+ direction_frame = gtk_frame_new("Direction");
+ gtk_box_pack_start(GTK_BOX(main_options_hb), direction_frame, FALSE, FALSE, 0);
+ gtk_widget_show(direction_frame);
+
+ /* Direction row: Forward and reverse radio buttons */
+ direction_vb = gtk_vbox_new(FALSE, 0);
+ gtk_container_border_width(GTK_CONTAINER(direction_vb), 3);
+ gtk_container_add(GTK_CONTAINER(direction_frame), direction_vb);
+ gtk_widget_show(direction_vb);
+
+ up_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(NULL, "_Up", accel_group);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(up_rb), cfile.sbackward);
+ gtk_box_pack_start(GTK_BOX(direction_vb), up_rb, FALSE, FALSE, 0);
+ gtk_widget_show(up_rb);
- /* Button row: OK and cancel buttons */
- bbox = gtk_hbutton_box_new();
- gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
- gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
- gtk_container_add(GTK_CONTAINER(main_vb), bbox);
+ down_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(up_rb, "_Down", accel_group);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(down_rb), !cfile.sbackward);
+ gtk_box_pack_start(GTK_BOX(direction_vb), down_rb, FALSE, FALSE, 0);
+ gtk_widget_show(down_rb);
+
+
+ /* Button row */
+ if(topic_available(HELP_FIND_DIALOG)) {
+ bbox = dlg_button_row_new(GTK_STOCK_FIND, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
+ } else {
+ bbox = dlg_button_row_new(GTK_STOCK_FIND, GTK_STOCK_CANCEL, NULL);
+ }
+ gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
gtk_widget_show(bbox);
-#if GTK_MAJOR_VERSION < 2
- ok_bt = gtk_button_new_with_label ("OK");
-#else
- ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+ ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_FIND);
SIGNAL_CONNECT(ok_bt, "clicked", find_frame_ok_cb, find_frame_w);
- GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, ok_bt, ("Perform search"), NULL);
- gtk_widget_grab_default(ok_bt);
- gtk_widget_show(ok_bt);
-#if GTK_MAJOR_VERSION < 2
- cancel_bt = gtk_button_new_with_label ("Cancel");
-#else
- cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+ cancel_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
SIGNAL_CONNECT(cancel_bt, "clicked", find_frame_close_cb, find_frame_w);
- GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, cancel_bt, ("Cancel search and exit"), NULL);
- gtk_widget_show(cancel_bt);
+
+ if(topic_available(HELP_FIND_DIALOG)) {
+ help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
+ SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_FIND_DIALOG);
+ }
/* Attach pointers to needed widgets to the capture prefs window/object */
OBJECT_SET_DATA(find_frame_w, E_FIND_FILT_KEY, filter_text_box);
- OBJECT_SET_DATA(find_frame_w, E_FIND_BACKWARD_KEY, backward_rb);
+ OBJECT_SET_DATA(find_frame_w, E_FIND_BACKWARD_KEY, up_rb);
OBJECT_SET_DATA(find_frame_w, E_FIND_FILTERDATA_KEY, filter_rb);
OBJECT_SET_DATA(find_frame_w, E_FIND_HEXDATA_KEY, hex_rb);
- OBJECT_SET_DATA(find_frame_w, E_FIND_ASCIIDATA_KEY, ascii_rb);
+ OBJECT_SET_DATA(find_frame_w, E_FIND_STRINGDATA_KEY, string_rb);
+ OBJECT_SET_DATA(find_frame_w, E_FIND_STRINGTYPE_LABEL_KEY, combo_lb);
OBJECT_SET_DATA(find_frame_w, E_FIND_STRINGTYPE_KEY, combo_cb);
OBJECT_SET_DATA(find_frame_w, E_CASE_SEARCH_KEY, case_cb);
OBJECT_SET_DATA(find_frame_w, E_SOURCE_HEX_KEY, hex_data_rb);
OBJECT_SET_DATA(find_frame_w, E_SOURCE_DECODE_KEY, decode_data_rb);
OBJECT_SET_DATA(find_frame_w, E_SOURCE_SUMMARY_KEY, summary_data_rb);
OBJECT_SET_DATA(find_frame_w, E_FILT_TE_BUTTON_KEY, filter_bt);
-
+
/*
* Now that we've attached the pointers, connect the signals - if
* we do so before we've attached the pointers, the signals may
* be delivered before the pointers are attached; the signal
* handlers expect the pointers to be attached, and won't be happy.
*/
- SIGNAL_CONNECT(ascii_rb, "clicked", ascii_selected_cb, find_frame_w);
+ SIGNAL_CONNECT(hex_rb, "clicked", hex_selected_cb, find_frame_w);
+ SIGNAL_CONNECT(string_rb, "clicked", string_selected_cb, find_frame_w);
SIGNAL_CONNECT(filter_rb, "clicked", filter_selected_cb, find_frame_w);
- ascii_selected_cb(NULL, find_frame_w);
+ string_selected_cb(NULL, find_frame_w);
filter_selected_cb(NULL, find_frame_w);
+
+ window_set_cancel_button(find_frame_w, cancel_bt, window_cancel_button_cb);
+
+ gtk_widget_grab_default(ok_bt);
+
/* Catch the "activate" signal on the filter text entry, so that
if the user types Return there, we act as if the "OK" button
had been selected, as happens if Return is typed if some widget
that *doesn't* handle the Return key has the input focus. */
dlg_set_activate(filter_text_box, ok_bt);
- /* 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(find_frame_w, cancel_bt);
-
/* Give the initial focus to the "Filter" entry box. */
gtk_widget_grab_focus(filter_text_box);
+ SIGNAL_CONNECT(find_frame_w, "delete_event", window_delete_event_cb, NULL);
+ SIGNAL_CONNECT(find_frame_w, "destroy", find_frame_destroy_cb, NULL);
+
gtk_widget_show(find_frame_w);
+ window_present(find_frame_w);
}
/* this function opens the find frame dialogue and sets the filter string */
-void
+void
find_frame_with_filter(char *filter)
{
find_frame_cb(NULL, NULL);
gtk_entry_set_text(GTK_ENTRY(filter_text_box), filter);
}
-/*
+/*
+ * Check the filter syntax based on the type of search we're doing.
+ */
+static void
+find_filter_te_syntax_check_cb(GtkWidget *w, gpointer parent_w)
+{
+ const gchar *strval;
+ GtkWidget *hex_rb, *string_rb;
+ guint8 *bytes = NULL;
+ size_t nbytes;
+
+ hex_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_HEXDATA_KEY);
+ string_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_STRINGDATA_KEY);
+
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (hex_rb))) {
+ /*
+ * Hex search - scan the search string to make sure it's valid hex.
+ */
+ strval = gtk_entry_get_text(GTK_ENTRY(w));
+ if (strval == NULL) {
+ /* XXX - can this happen? */
+ colorize_filter_te_as_invalid(w);
+ } else {
+ bytes = convert_string_to_hex(strval, &nbytes);
+ if (bytes == NULL)
+ colorize_filter_te_as_invalid(w);
+ else {
+ g_free(bytes);
+ colorize_filter_te_as_valid(w);
+ }
+ }
+ } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (string_rb))) {
+ /*
+ * String search. Make sure the string isn't empty.
+ */
+ strval = gtk_entry_get_text(GTK_ENTRY(w));
+ if (strval == NULL) {
+ /* XXX - can this happen? */
+ colorize_filter_te_as_invalid(w);
+ } else {
+ if (strcmp(strval, "") == 0)
+ colorize_filter_te_as_invalid(w);
+ else
+ colorize_filter_te_as_valid(w);
+ }
+ } else {
+ /*
+ * Display filter search; check it with "filter_te_syntax_check_cb()".
+ */
+ filter_te_syntax_check_cb(w);
+ }
+}
+
+/*
+ * This function will re-check the search text syntax.
+ */
+static void
+hex_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w)
+{
+ GtkWidget *filter_text_box;
+
+ filter_text_box = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_FILT_TE_PTR_KEY);
+
+ /* Re-check the display filter. */
+ find_filter_te_syntax_check_cb(filter_text_box, parent_w);
+ return;
+}
+
+/*
* This function will disable the string options until
* the string search is selected.
- */
+ */
static void
-ascii_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w)
+string_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w)
{
- GtkWidget *ascii_rb, *hex_data_rb, *decode_data_rb, *summary_data_rb,
- *data_combo_cb, *data_case_cb;
+ GtkWidget *string_rb, *hex_data_rb, *decode_data_rb, *summary_data_rb,
+ *data_combo_lb, *data_combo_cb, *data_case_cb, *filter_text_box;
- ascii_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_ASCIIDATA_KEY);
+ string_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_STRINGDATA_KEY);
hex_data_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_SOURCE_HEX_KEY);
decode_data_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_SOURCE_DECODE_KEY);
summary_data_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_SOURCE_SUMMARY_KEY);
+
+ data_combo_lb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_STRINGTYPE_LABEL_KEY);
data_combo_cb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_STRINGTYPE_KEY);
data_case_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CASE_SEARCH_KEY);
-
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ascii_rb))) {
- gtk_widget_set_sensitive(GTK_WIDGET(hex_data_rb), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(decode_data_rb), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(summary_data_rb), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(data_combo_cb), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(data_case_cb), TRUE);
+ filter_text_box = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_FILT_TE_PTR_KEY);
+
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(string_rb))) {
+ gtk_widget_set_sensitive(GTK_WIDGET(hex_data_rb), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(decode_data_rb), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(summary_data_rb), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(data_combo_lb), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(data_combo_cb), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(data_case_cb), TRUE);
} else {
gtk_widget_set_sensitive(GTK_WIDGET(hex_data_rb), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(decode_data_rb), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(summary_data_rb), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(data_combo_lb), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(data_combo_cb), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(data_case_cb), FALSE);
}
+ /* Re-check the display filter. */
+ find_filter_te_syntax_check_cb(filter_text_box, parent_w);
return;
}
-/*
+/*
* This function will disable the filter button until
* the filter search is selected.
- */
+ */
static void
filter_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w)
{
filter_bt = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FILT_TE_BUTTON_KEY);
filter_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_FILTERDATA_KEY);
-
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(filter_rb)))
{
gtk_widget_set_sensitive(GTK_WIDGET(filter_bt), TRUE);
return;
}
-static guint8 *
-convert_string_to_hex(const char *string, size_t *nbytes)
-{
- size_t n_bytes;
- const char *p;
- guchar c;
- guint8 *bytes, *q, byte_val;
-
- n_bytes = 0;
- p = &string[0];
- for (;;) {
- c = *p++;
- if (c == '\0')
- break;
- if (isspace(c))
- continue; /* allow white space */
- if (c==':' || c=='.' || c=='-')
- continue; /* skip any ':', '.', or '-' between bytes */
- if (!isxdigit(c)) {
- /* Not a valid hex digit - fail */
- return NULL;
- }
-
- /*
- * We can only match bytes, not nibbles; we must have a valid
- * hex digit immediately after that hex digit.
- */
- c = *p++;
- if (!isxdigit(c))
- return NULL;
-
- /* 2 hex digits = 1 byte */
- n_bytes++;
- }
-
- /*
- * Were we given any hex digits?
- */
- if (n_bytes == 0) {
- /* No. */
- return NULL;
- }
-
- /*
- * OK, it's valid, and it generates "n_bytes" bytes; generate the
- * raw byte array.
- */
- bytes = g_malloc(n_bytes);
- p = &string[0];
- q = &bytes[0];
- for (;;) {
- c = *p++;
- if (c == '\0')
- break;
- if (isspace(c))
- continue; /* allow white space */
- if (c==':' || c=='.' || c=='-')
- continue; /* skip any ':', '.', or '-' between bytes */
- /* From the loop above, we know this is a hex digit */
- if (isdigit(c))
- byte_val = c - '0';
- else if (c >= 'a')
- byte_val = (c - 'a') + 10;
- else
- byte_val = (c - 'A') + 10;
- byte_val <<= 4;
-
- /* We also know this is a hex digit */
- c = *p++;
- if (isdigit(c))
- byte_val |= c - '0';
- else if (c >= 'a')
- byte_val |= (c - 'a') + 10;
- else if (c >= 'A')
- byte_val |= (c - 'A') + 10;
-
- *q++ = byte_val;
- }
- *nbytes = n_bytes;
- return bytes;
-}
-
-static char *
-convert_string_case(const char *string, gboolean case_insensitive)
-{
- char *out_string;
- const char *p;
- char c;
- char *q;
-
- /*
- * Copy if if it's a case-sensitive search; uppercase it if it's
- * a case-insensitive search.
- */
- if (case_insensitive) {
- out_string = g_malloc(strlen(string) + 1);
- for (p = &string[0], q = &out_string[0]; (c = *p) != '\0'; p++, q++)
- *q = toupper((unsigned char)*p);
- *q = '\0';
- } else
- out_string = g_strdup(string);
- return out_string;
-}
-
static void
find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
{
- GtkWidget *filter_te, *backward_rb, *hex_rb, *ascii_rb, *combo_cb,
+ GtkWidget *filter_te, *up_rb, *hex_rb, *string_rb, *combo_cb,
*case_cb, *decode_data_rb, *summary_data_rb;
- gchar *filter_text, *string_type;
+ const gchar *filter_text, *string_type;
search_charset_t scs_type = SCS_ASCII_AND_UNICODE;
guint8 *bytes = NULL;
size_t nbytes;
gboolean found_packet;
filter_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_FILT_KEY);
- backward_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_BACKWARD_KEY);
+ up_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_BACKWARD_KEY);
hex_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_HEXDATA_KEY);
- ascii_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_ASCIIDATA_KEY);
+ string_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_STRINGDATA_KEY);
combo_cb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_STRINGTYPE_KEY);
case_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CASE_SEARCH_KEY);
decode_data_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_SOURCE_DECODE_KEY);
filter_text = gtk_entry_get_text(GTK_ENTRY(filter_te));
string_type = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo_cb)->entry));
- case_type = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(case_cb));
+ case_type = !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(case_cb));
decode_data = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(decode_data_rb));
summary_data = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(summary_data_rb));
*/
bytes = convert_string_to_hex(filter_text, &nbytes);
if (bytes == NULL) {
- simple_dialog(ESD_TYPE_CRIT, NULL,
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"You didn't specify a valid hex string.");
return;
}
- } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (ascii_rb))) {
+ } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (string_rb))) {
/*
* String search.
- * Get the character set type.
+ * Make sure we're searching for something, first.
+ */
+ if (strcmp(filter_text, "") == 0) {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "You didn't specify any text for which to search.");
+ return;
+ }
+
+ /*
+ * We are - get the character set type.
*/
if (strcmp(string_type, "ASCII Unicode & Non-Unicode") == 0)
scs_type = SCS_ASCII_AND_UNICODE;
else if (strcmp(string_type, "ASCII Unicode") == 0)
scs_type = SCS_UNICODE;
else {
- simple_dialog(ESD_TYPE_CRIT, NULL, "You didn't choose a valid character set.");
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "You didn't choose a valid character set.");
return;
}
string = convert_string_case(filter_text, case_type);
*/
if (!dfilter_compile(filter_text, &sfcode)) {
/* The attempt failed; report an error. */
- simple_dialog(ESD_TYPE_CRIT, NULL, dfilter_error_msg);
+ bad_dfilter_alert_box(filter_text);
return;
}
/* Was it empty? */
if (sfcode == NULL) {
/* Yes - complain. */
- simple_dialog(ESD_TYPE_CRIT, NULL,
- "You didn't specify a valid filter expression.");
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "You specified a filter that doesn't test anything.");
return;
}
}
if (cfile.sfilter)
g_free(cfile.sfilter);
cfile.sfilter = g_strdup(filter_text);
- cfile.sbackward = GTK_TOGGLE_BUTTON (backward_rb)->active;
+ cfile.sbackward = GTK_TOGGLE_BUTTON (up_rb)->active;
cfile.hex = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (hex_rb));
- cfile.ascii = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (ascii_rb));
+ cfile.string = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (string_rb));
cfile.scs_type = scs_type;
cfile.case_type = case_type;
cfile.decode_data = decode_data;
cfile.summary_data = summary_data;
if (cfile.hex) {
- found_packet = find_packet_data(&cfile, bytes, nbytes);
+ found_packet = cf_find_packet_data(&cfile, bytes, nbytes);
g_free(bytes);
if (!found_packet) {
/* We didn't find a packet */
- simple_dialog(ESD_TYPE_CRIT, NULL, "No packet contained those bytes.");
- g_free(bytes);
+ simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK,
+ "%sFound no match!%s\n\n"
+ "No packet contained those bytes.",
+ simple_dialog_primary_start(), simple_dialog_primary_end());
return;
}
- } else if (cfile.ascii) {
+ } else if (cfile.string) {
/* OK, what are we searching? */
if (cfile.decode_data) {
/* The text in the protocol tree */
- found_packet = find_packet_protocol_tree(&cfile, string);
+ found_packet = cf_find_packet_protocol_tree(&cfile, string);
g_free(string);
if (!found_packet) {
/* We didn't find the packet. */
- simple_dialog(ESD_TYPE_CRIT, NULL, "No packet contained that string in its dissected display.");
+ simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK,
+ "%sFound no match!%s\n\n"
+ "No packet contained that string in its dissected display.",
+ simple_dialog_primary_start(), simple_dialog_primary_end());
return;
}
} else if (cfile.summary_data) {
/* The text in the summary line */
- found_packet = find_packet_summary_line(&cfile, string);
+ found_packet = cf_find_packet_summary_line(&cfile, string);
g_free(string);
if (!found_packet) {
/* We didn't find the packet. */
- simple_dialog(ESD_TYPE_CRIT, NULL, "No packet contained that string in its Info column.");
+ simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK,
+ "%sFound no match!%s\n\n"
+ "No packet contained that string in its Info column.",
+ simple_dialog_primary_start(), simple_dialog_primary_end());
return;
}
} else {
/* The raw packet data */
- found_packet = find_packet_data(&cfile, string, strlen(string));
+ found_packet = cf_find_packet_data(&cfile, string, strlen(string));
g_free(string);
if (!found_packet) {
/* We didn't find the packet. */
- simple_dialog(ESD_TYPE_CRIT, NULL, "No packet contained that string in its data.");
+ simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK,
+ "%sFound no match!%s\n\n"
+ "No packet contained that string in its data.",
+ simple_dialog_primary_start(), simple_dialog_primary_end());
return;
}
}
} else {
- found_packet = find_packet_dfilter(&cfile, sfcode);
+ found_packet = cf_find_packet_dfilter(&cfile, sfcode);
dfilter_free(sfcode);
if (!found_packet) {
/* We didn't find a packet */
- simple_dialog(ESD_TYPE_CRIT, NULL, "No packet matched that filter.");
+ simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK,
+ "%sFound no match!%s\n\n"
+ "No packet matched that filter.",
+ simple_dialog_primary_start(), simple_dialog_primary_end());
g_free(bytes);
return;
}
}
- gtk_widget_destroy(GTK_WIDGET(parent_w));
+ window_destroy(GTK_WIDGET(parent_w));
}
static void
find_frame_close_cb(GtkWidget *close_bt _U_, gpointer parent_w)
{
gtk_grab_remove(GTK_WIDGET(parent_w));
- gtk_widget_destroy(GTK_WIDGET(parent_w));
+ window_destroy(GTK_WIDGET(parent_w));
}
static void
find_frame_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
{
- /* Note that we no longer have a "Find Frame" dialog box. */
+ /* Note that we no longer have a "Find Packet" dialog box. */
find_frame_w = NULL;
}
*/
return;
}
- find_packet_data(&cfile, bytes, nbytes);
+ cf_find_packet_data(&cfile, bytes, nbytes);
g_free(bytes);
- } else if (cfile.ascii) {
+ } else if (cfile.string) {
string = convert_string_case(cfile.sfilter, cfile.case_type);
/* OK, what are we searching? */
if (cfile.decode_data) {
/* The text in the protocol tree */
- find_packet_protocol_tree(&cfile, string);
+ cf_find_packet_protocol_tree(&cfile, string);
} else if (cfile.summary_data) {
/* The text in the summary line */
- find_packet_summary_line(&cfile, string);
+ cf_find_packet_summary_line(&cfile, string);
} else {
/* The raw packet data */
- find_packet_data(&cfile, string, strlen(string));
+ cf_find_packet_data(&cfile, string, strlen(string));
}
g_free(string);
} else {
*/
return;
}
- find_packet_dfilter(&cfile, sfcode);
+ cf_find_packet_dfilter(&cfile, sfcode);
dfilter_free(sfcode);
}
} else
}
/* this function jumps to the next packet matching the filter */
-void
-find_previous_next_frame_with_filter(char *filter, gboolean backwards)
+void
+find_previous_next_frame_with_filter(const char *filter, gboolean backwards)
{
dfilter_t *sfcode;
gboolean sbackwards_saved;
*/
return;
}
- find_packet_dfilter(&cfile, sfcode);
+ cf_find_packet_dfilter(&cfile, sfcode);
dfilter_free(sfcode);
cfile.sbackward=sbackwards_saved;
}
git.samba.org / obnox / wireshark / wip.git / blobdiff