static GSList *status_messages = NULL;
+#ifdef USE_THREADS
static GMutex *recent_mtx = NULL;
+#endif
/* The "scroll box dynamic" is a (complicated) pseudo widget to */
/* place a vertically list of widgets in (currently the interfaces and recent files). */
* most OSes use.
*/
err = ws_stat64(ri_stat->filename, &stat_buf);
+#ifdef USE_THREADS
g_mutex_lock(recent_mtx);
+#endif
ri_stat->err = err;
if(err == 0) {
if (stat_buf.st_size/1024/1024/1024 > 10) {
} else {
ri_stat->stat_done = TRUE;
}
+#ifdef USE_THREADS
g_mutex_unlock(recent_mtx);
+#endif
return NULL;
}
return FALSE;
}
+#ifdef USE_THREADS
g_mutex_lock(recent_mtx);
-
+#endif
if (ri_stat->stat_done) {
again = FALSE;
gtk_label_set_markup(GTK_LABEL(ri_stat->label), ri_stat->str->str);
ri_stat->timer = 0;
}
/* Else append some sort of Unicode or ASCII animation to the label? */
+#ifdef USE_THREADS
g_mutex_unlock(recent_mtx);
-
+#endif
return again;
}
return;
}
+#ifdef USE_THREADS
g_mutex_lock(recent_mtx);
+#endif
if (ri_stat->timer) {
g_source_remove(ri_stat->timer);
ri_stat->timer = 0;
} else {
ri_stat->label = NULL;
}
+#ifdef USE_THREADS
g_mutex_unlock(recent_mtx);
+#endif
}
/* create a "file link widget" */
#ifdef HAVE_LIBPCAP
static gboolean select_current_ifaces(GtkTreeModel *model,
- GtkTreePath *path _U_,
+ GtkTreePath *path,
GtkTreeIter *iter,
gpointer userdata)
{
guint i;
gchar *if_name;
+ gboolean found = FALSE;
GtkTreeSelection *selection = (GtkTreeSelection *)userdata;
- gtk_tree_model_get (model, iter, 2, &if_name, -1);
- if (global_capture_opts.ifaces->len > 0) {
- for (i = 0; i < global_capture_opts.ifaces->len; i++) {
- if (strcmp(g_array_index(global_capture_opts.ifaces, interface_options, i).name, if_name) == 0) {
- gtk_tree_selection_select_iter(selection, iter);
- break;
+ gtk_tree_model_get (model, iter, IFACE_NAME, &if_name, -1);
+ for (i = 0; i < global_capture_opts.ifaces->len; i++) {
+ if (strcmp(g_array_index(global_capture_opts.ifaces, interface_options, i).name, if_name) == 0) {
+ if (!gtk_tree_selection_path_is_selected(selection, path)) {
+ gtk_tree_selection_select_iter(selection, iter);
}
+ found = TRUE;
+ break;
}
}
+ if (!found) {
+ gtk_tree_selection_unselect_iter(selection, iter);
+ }
return FALSE;
}
+
+gboolean on_selection_changed(GtkTreeSelection *selection _U_,
+ GtkTreeModel *model,
+ GtkTreePath *path,
+ gboolean path_currently_selected,
+ gpointer data _U_)
+{
+ GtkTreeIter iter;
+ gchar *if_name;
+ interface_options interface_opts;
+ guint i;
+ cap_settings_t cap_settings;
+ gboolean found = FALSE;
+
+ gtk_tree_model_get_iter (model, &iter, path);
+ gtk_tree_model_get (model, &iter, IFACE_NAME, &if_name, -1);
+ for (i = 0; i < global_capture_opts.ifaces->len; i++) {
+ if (strcmp(g_array_index(global_capture_opts.ifaces, interface_options, i).name, if_name) == 0) {
+ found = TRUE;
+ if (path_currently_selected) {
+ interface_opts = g_array_index(global_capture_opts.ifaces, interface_options, i);
+ global_capture_opts.ifaces = g_array_remove_index(global_capture_opts.ifaces, i);
+ if (gtk_widget_is_focus(g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES)) && get_interfaces_dialog_window()) {
+ update_selected_interface(strdup(interface_opts.name), FALSE);
+ }
+ g_free(interface_opts.name);
+ g_free(interface_opts.descr);
+ g_free(interface_opts.cfilter);
+#ifdef HAVE_PCAP_REMOTE
+ g_free(interface_opts.remote_host);
+ g_free(interface_opts.remote_port);
+ g_free(interface_opts.auth_username);
+ g_free(interface_opts.auth_password);
+#endif
+ break;
+ }
+ }
+ }
+ if (!found && !path_currently_selected) {
+ interface_opts.name = g_strdup(if_name);
+ interface_opts.descr = get_interface_descriptive_name(interface_opts.name);
+ interface_opts.linktype = capture_dev_user_linktype_find(interface_opts.name);
+ interface_opts.cfilter = g_strdup(global_capture_opts.default_options.cfilter);
+ interface_opts.has_snaplen = global_capture_opts.default_options.has_snaplen;
+ interface_opts.snaplen = global_capture_opts.default_options.snaplen;
+ cap_settings = capture_get_cap_settings (interface_opts.name);;
+ interface_opts.promisc_mode = global_capture_opts.default_options.promisc_mode;
+#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
+ interface_opts.buffer_size = global_capture_opts.default_options.buffer_size;
+#endif
+ interface_opts.monitor_mode = cap_settings.monitor_mode;
+#ifdef HAVE_PCAP_REMOTE
+ interface_opts.src_type = global_capture_opts.default_options.src_type;
+ interface_opts.remote_host = g_strdup(global_capture_opts.default_options.remote_host);
+ interface_opts.remote_port = g_strdup(global_capture_opts.default_options.remote_port);
+ interface_opts.auth_type = global_capture_opts.default_options.auth_type;
+ interface_opts.auth_username = g_strdup(global_capture_opts.default_options.auth_username);
+ interface_opts.auth_password = g_strdup(global_capture_opts.default_options.auth_password);
+ interface_opts.datatx_udp = global_capture_opts.default_options.datatx_udp;
+ interface_opts.nocap_rpcap = global_capture_opts.default_options.nocap_rpcap;
+ interface_opts.nocap_local = global_capture_opts.default_options.nocap_local;
+#endif
+#ifdef HAVE_PCAP_SETSAMPLING
+ interface_opts.sampling_method = global_capture_opts.default_options.sampling_method;
+ interface_opts.sampling_param = global_capture_opts.default_options.sampling_param;
+#endif
+ g_array_append_val(global_capture_opts.ifaces, interface_opts);
+ if (gtk_widget_is_focus(g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES)) && get_interfaces_dialog_window()) {
+ update_selected_interface(strdup(interface_opts.name), TRUE);
+ }
+ }
+ return TRUE;
+}
+
+static gboolean activate_ifaces(GtkTreeModel *model,
+ GtkTreePath *path _U_,
+ GtkTreeIter *iter,
+ gpointer userdata)
+{
+ gchar *if_name;
+ GtkWidget *view;
+ GtkTreeSelection *selection;
+ selected_name_t *entry = (selected_name_t *)userdata;
+
+ view = g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES);
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
+ gtk_tree_model_get (model, iter, IFACE_NAME, &if_name, -1);
+ if (strcmp(if_name, entry->name) == 0) {
+ if (entry->activate) {
+ gtk_tree_selection_select_iter(selection, iter);
+ } else {
+ gtk_tree_selection_unselect_iter(selection, iter);
+ }
+ return TRUE;
+ }
+ return FALSE;
+}
+
+void change_interface_selection(gchar* name, gboolean activate)
+{
+ GtkWidget *view;
+ GtkTreeModel *model;
+ selected_name_t entry;
+
+ view = g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES);
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+ entry.name = strdup(name);
+ entry.activate = activate;
+ gtk_tree_model_foreach(GTK_TREE_MODEL(model), (GtkTreeModelForeachFunc)(activate_ifaces), (gpointer) &entry);
+}
#endif
+void
+select_ifaces(void)
+{
+#ifdef HAVE_LIBPCAP
+ GtkWidget *view;
+ GtkTreeModel *model;
+ GtkTreeSelection *entry;
+
+ if (global_capture_opts.ifaces->len > 0) {
+ view = g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES);
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+ entry = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
+ gtk_tree_model_foreach(GTK_TREE_MODEL(model), select_current_ifaces, (gpointer) entry);
+ gtk_widget_grab_focus(view);
+ }
+#endif
+}
+
/* list the interfaces */
void
welcome_if_tree_load(void)
view = g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES);
entry = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
gtk_tree_selection_unselect_all(entry);
- store = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
+ store = gtk_list_store_new(NUMCOLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
/* List the interfaces */
for (curr = g_list_first(if_list); curr; curr = g_list_next(curr)) {
if_info = curr->data;
user_descr = g_strdup_printf("%s (%s)", comment, if_info->name);
g_free (comment);
#endif
- gtk_list_store_set(store, &iter, 0, gtk_image_get_pixbuf(GTK_IMAGE(icon)), 1, user_descr, 2, if_info->name, -1);
+ gtk_list_store_set(store, &iter, ICON, gtk_image_get_pixbuf(GTK_IMAGE(icon)), IFACE_DESCR, user_descr, IFACE_NAME, if_info->name, -1);
g_free (user_descr);
} else if (if_info->description) {
- gtk_list_store_set (store, &iter, 0, gtk_image_get_pixbuf(GTK_IMAGE(icon)), 1, if_info->description, 2, if_info->name, -1);
+ gtk_list_store_set (store, &iter, ICON, gtk_image_get_pixbuf(GTK_IMAGE(icon)), IFACE_DESCR, if_info->description, IFACE_NAME, if_info->name, -1);
} else {
- gtk_list_store_set (store, &iter, 0, gtk_image_get_pixbuf(GTK_IMAGE(icon)), 1, if_info->name, 2, if_info->name, -1);
+ gtk_list_store_set (store, &iter, ICON, gtk_image_get_pixbuf(GTK_IMAGE(icon)), IFACE_DESCR, if_info->name, IFACE_NAME, if_info->name, -1);
}
}
gtk_tree_view_set_model(GTK_TREE_VIEW(if_view), GTK_TREE_MODEL (store));
gtk_tree_model_foreach(GTK_TREE_MODEL(store), select_current_ifaces, (gpointer) entry);
gtk_widget_grab_focus(view);
}
+ gtk_tree_selection_set_select_function(entry, on_selection_changed, NULL, NULL);
}
free_interface_list(if_list);
#endif /* HAVE_LIBPCAP */
GList* child_list;
GList* child_list_item;
-
if(welcome_if_panel_vb) {
child_box = scroll_box_dynamic_reset(welcome_if_panel_vb);
child_list = gtk_container_get_children(GTK_CONTAINER(child_box));
}
#ifdef HAVE_LIBPCAP
-static void make_selections_array(GtkTreeModel *model,
- GtkTreePath *path _U_,
- GtkTreeIter *iter,
- gpointer userdata _U_)
+static void capture_if_start(GtkWidget *w _U_, gpointer data _U_)
{
- gchar *if_name;
+#ifdef HAVE_AIRPCAP
interface_options interface_opts;
- cap_settings_t cap_settings;
- GList *if_list;
- GList *curr;
- int err;
- if_info_t *if_info;
-
- gtk_tree_model_get (model, iter, 2, &if_name, -1);
-
- if_list = capture_interface_list(&err, NULL);
- if_list = g_list_sort (if_list, if_list_comparator_alph);
- if (g_list_length(if_list) > 0) {
- for (curr = g_list_first(if_list); curr; curr = g_list_next(curr)) {
- if_info = curr->data;
- /* Continue if capture device is hidden */
- if (prefs_is_capture_device_hidden(if_info->name)) {
- continue;
- }
- if (strcmp(if_info->name, if_name) == 0) {
- interface_opts.name = g_strdup(if_name);
- interface_opts.descr = get_interface_descriptive_name(interface_opts.name);
- break;
- }
- }
- free_interface_list(if_list);
- } else {
- free_interface_list(if_list);
- return;
- }
-
- interface_opts.linktype = capture_dev_user_linktype_find(interface_opts.name);
- interface_opts.cfilter = g_strdup(global_capture_opts.default_options.cfilter);
- interface_opts.has_snaplen = global_capture_opts.default_options.has_snaplen;
- interface_opts.snaplen = global_capture_opts.default_options.snaplen;
- cap_settings = capture_get_cap_settings (interface_opts.name);;
- interface_opts.promisc_mode = global_capture_opts.default_options.promisc_mode;
-#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
- interface_opts.buffer_size = global_capture_opts.default_options.buffer_size;
-#endif
- interface_opts.monitor_mode = cap_settings.monitor_mode;
-#ifdef HAVE_PCAP_REMOTE
- interface_opts.src_type = global_capture_opts.default_options.src_type;
- interface_opts.remote_host = g_strdup(global_capture_opts.default_options.remote_host);
- interface_opts.remote_port = g_strdup(global_capture_opts.default_options.remote_port);
- interface_opts.auth_type = global_capture_opts.default_options.auth_type;
- interface_opts.auth_username = g_strdup(global_capture_opts.default_options.auth_username);
- interface_opts.auth_password = g_strdup(global_capture_opts.default_options.auth_password);
- interface_opts.datatx_udp = global_capture_opts.default_options.datatx_udp;
- interface_opts.nocap_rpcap = global_capture_opts.default_options.nocap_rpcap;
- interface_opts.nocap_local = global_capture_opts.default_options.nocap_local;
#endif
-#ifdef HAVE_PCAP_SETSAMPLING
- interface_opts.sampling_method = global_capture_opts.default_options.sampling_method;
- interface_opts.sampling_param = global_capture_opts.default_options.sampling_param;
-#endif
- g_array_append_val(global_capture_opts.ifaces, interface_opts);
-}
-static void capture_if_start(GtkWidget *w _U_, gpointer data _U_)
-{
- GtkTreeSelection *entry;
- GtkWidget* view;
- gint len;
- interface_options interface_opts;
-
- view = g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES);
- entry = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
- len = gtk_tree_selection_count_selected_rows(entry);
- if (!entry || len==0) {
+ if (global_capture_opts.ifaces->len == 0) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"You didn't specify an interface on which to capture packets.");
return;
}
- while (global_capture_opts.ifaces->len > 0) {
- interface_opts = g_array_index(global_capture_opts.ifaces, interface_options, 0);
- global_capture_opts.ifaces = g_array_remove_index(global_capture_opts.ifaces, 0);
- g_free(interface_opts.name);
- g_free(interface_opts.descr);
- g_free(interface_opts.cfilter);
-#ifdef HAVE_PCAP_REMOTE
- g_free(interface_opts.remote_host);
- g_free(interface_opts.remote_port);
- g_free(interface_opts.auth_username);
- g_free(interface_opts.auth_password);
-#endif
+#ifndef USE_THREADS
+ if (global_capture_opts.ifaces->len > 1) {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "You specified multiple interfaces for capturing which this version of Wireshark doesn't support.");
+ return;
}
- gtk_tree_selection_selected_foreach(entry, make_selections_array, NULL);
+#endif
/* XXX - remove this? */
if (global_capture_opts.save_file) {
#endif
capture_start_cb(NULL, NULL);
}
-
-void capture_if_cb_prep(GtkWidget *w _U_, gpointer d _U_)
-{
- GtkTreeSelection *entry;
- GtkWidget* view;
-
- view = g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES);
- entry = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
- if (entry) {
- /* global_capture_opts.number_of_ifaces = gtk_tree_selection_count_selected_rows(entry);*/
- gtk_tree_selection_selected_foreach(entry, make_selections_array, NULL);
- }
- capture_if_cb(NULL, NULL);
-}
-
-void capture_opts_cb_prep(GtkWidget *w _U_, gpointer d _U_)
-{
- GtkTreeSelection *entry;
- GtkWidget* view;
-
- view = g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES);
- entry = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
- if (entry) {
- gtk_tree_selection_selected_foreach(entry, make_selections_array, NULL);
- }
- capture_prep_cb(NULL, NULL);
-}
#endif
/* create the welcome page */
"Interface List",
"Live list of the capture interfaces\n(counts incoming packets)",
"Same as Capture/Interfaces menu or toolbar item",
- welcome_button_callback_helper, capture_if_cb_prep);
+ welcome_button_callback_helper, capture_if_cb);
gtk_box_pack_start(GTK_BOX(topic_to_fill), item_hb, FALSE, FALSE, 5);
swindow = gtk_scrolled_window_new (NULL, NULL);
renderer = gtk_cell_renderer_pixbuf_new();
column = gtk_tree_view_column_new_with_attributes ("",
GTK_CELL_RENDERER(renderer),
- "pixbuf", 0,
+ "pixbuf", ICON,
NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(if_view), column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes ("",
GTK_CELL_RENDERER(renderer),
- "text", 1,
+ "text", IFACE_DESCR,
NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(if_view), column);
gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(if_view), 0), TRUE);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes ("",
GTK_CELL_RENDERER(renderer),
- "text", 2,
+ "text", IFACE_NAME,
NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(if_view), column);
gtk_tree_view_column_set_visible(column, FALSE);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(if_view));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
+#ifdef USE_THREADS
item_hb = welcome_button(WIRESHARK_STOCK_CAPTURE_START,
"Start",
"Choose one or more interfaces to capture from, then <b>Start</b>",
"Same as Capture/Interfaces with default options",
(welcome_button_callback_t)capture_if_start, (gpointer)if_view);
+#else
+ item_hb = welcome_button(WIRESHARK_STOCK_CAPTURE_START,
+ "Start",
+ "Choose exactly one interface to capture from, then <b>Start</b>",
+ "Same as Capture/Interfaces with default options",
+ (welcome_button_callback_t)capture_if_start, (gpointer)if_view);
+#endif
gtk_box_pack_start(GTK_BOX(topic_to_fill), item_hb, FALSE, FALSE, 5);
welcome_if_tree_load();
gtk_container_add (GTK_CONTAINER (swindow), if_view);
welcome_eb);
gtk_widget_show_all(welcome_scrollw);
+#ifdef USE_THREADS
recent_mtx = g_mutex_new();
+#endif
return welcome_scrollw;
}
+
+GtkWidget* get_welcome_window(void)
+{
+ return welcome_hb;
+}
+
git.samba.org / obnox / wireshark / wip.git / blobdiff