diff options
author | Guy Harris <guy@alum.mit.edu> | 2001-01-28 21:17:29 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2001-01-28 21:17:29 +0000 |
commit | cc74cc0a5ff013512ae2157f70d0a5d32c3302cc (patch) | |
tree | 96b4f79629bd08207bb9f39f42a01193b6b22f59 /gtk/plugins_dlg.c | |
parent | 7eaadf404879210df9e33309e3f3db2c72e56fc6 (diff) |
Get rid of support for old-style plugins (support for old-style plugins
requires that the dfilter code be initialized before the plugins are
added; this required us to *re*-initialize the dfilter code after
reading in all the plugins, as the plugins may themselves have added new
filterable fields - that was a bit of a mess), and make the
"Tools->Plugins" dialog box show the new-style plugins.
svn path=/trunk/; revision=2950
Diffstat (limited to 'gtk/plugins_dlg.c')
-rw-r--r-- | gtk/plugins_dlg.c | 260 |
1 files changed, 6 insertions, 254 deletions
diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c index 459f972fab..5f427fcd03 100644 --- a/gtk/plugins_dlg.c +++ b/gtk/plugins_dlg.c @@ -1,7 +1,7 @@ /* plugins_dlg.c * Dialog boxes for plugins * - * $Id: plugins_dlg.c,v 1.21 2000/11/18 09:59:04 grahamb Exp $ + * $Id: plugins_dlg.c,v 1.22 2001/01/28 21:17:29 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -39,31 +39,12 @@ #include "globals.h" #include "plugins.h" -#include "keys.h" #include "dlg_utils.h" -#include "prefs_dlg.h" -#include "simple_dialog.h" #ifdef HAVE_PLUGINS -static gint selected_row; -static gchar *selected_name; -static gchar *selected_version; -static gchar *selected_enabled; - static void plugins_close_cb(GtkWidget *, gpointer); -static void plugins_save_cb(GtkWidget *, gpointer); static void plugins_scan(GtkWidget *); -static void plugins_clist_select_cb(GtkWidget *, gint, gint, - GdkEventButton *, gpointer); -static void plugins_clist_unselect_cb(GtkWidget *, gint, gint, - GdkEventButton *, gpointer); -static void plugins_enable_cb(GtkWidget *, gpointer); -static void plugins_disable_cb(GtkWidget *, gpointer); -static void plugins_filter_cb(GtkWidget *, gpointer); -static void filter_ok_cb(GtkWidget *, gpointer); -static void filter_cancel_cb(GtkWidget *, gpointer); -static void filter_default_cb(GtkWidget *, gpointer); void tools_plugins_cmd_cb(GtkWidget *widget, gpointer data) @@ -75,13 +56,9 @@ tools_plugins_cmd_cb(GtkWidget *widget, gpointer data) GtkWidget *scrolledwindow; GtkWidget *plugins_clist; GtkWidget *frame_vbnbox; - GtkWidget *enable_bn; - GtkWidget *disable_bn; - GtkWidget *filter_bn; GtkWidget *main_hbnbox; GtkWidget *close_bn; - GtkWidget *save_bn; - gchar *titles[] = {"Name", "Description", "Version", "Enabled"}; + gchar *titles[] = {"Name", "Version"}; plugins_window = dlg_window_new("Ethereal: Plugins"); @@ -106,22 +83,15 @@ tools_plugins_cmd_cb(GtkWidget *widget, gpointer data) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_widget_show(scrolledwindow); - plugins_clist = gtk_clist_new_with_titles(4, titles); + plugins_clist = gtk_clist_new_with_titles(2, titles); gtk_container_add(GTK_CONTAINER(scrolledwindow), plugins_clist); gtk_clist_set_selection_mode(GTK_CLIST(plugins_clist), GTK_SELECTION_SINGLE); gtk_clist_column_titles_passive(GTK_CLIST(plugins_clist)); gtk_clist_column_titles_show(GTK_CLIST(plugins_clist)); gtk_clist_set_column_auto_resize(GTK_CLIST(plugins_clist), 0, TRUE); gtk_clist_set_column_auto_resize(GTK_CLIST(plugins_clist), 1, TRUE); - gtk_clist_set_column_auto_resize(GTK_CLIST(plugins_clist), 2, TRUE); - gtk_clist_set_column_auto_resize(GTK_CLIST(plugins_clist), 3, TRUE); plugins_scan(plugins_clist); - gtk_signal_connect(GTK_OBJECT(plugins_clist), "select_row", - GTK_SIGNAL_FUNC(plugins_clist_select_cb), NULL); - gtk_signal_connect(GTK_OBJECT(plugins_clist), "unselect_row", - GTK_SIGNAL_FUNC(plugins_clist_unselect_cb), NULL); gtk_widget_show(plugins_clist); - selected_row = -1; frame_vbnbox = gtk_vbutton_box_new(); gtk_box_pack_start(GTK_BOX(frame_hbox), frame_vbnbox, FALSE, TRUE, 0); @@ -129,34 +99,12 @@ tools_plugins_cmd_cb(GtkWidget *widget, gpointer data) gtk_button_box_set_layout(GTK_BUTTON_BOX(frame_vbnbox), GTK_BUTTONBOX_SPREAD); gtk_widget_show(frame_vbnbox); - enable_bn = gtk_button_new_with_label("Enable"); - gtk_container_add(GTK_CONTAINER(frame_vbnbox), enable_bn); - gtk_signal_connect(GTK_OBJECT(enable_bn), "clicked", - GTK_SIGNAL_FUNC(plugins_enable_cb), GTK_OBJECT(plugins_clist)); - gtk_widget_show(enable_bn); - disable_bn = gtk_button_new_with_label("Disable"); - gtk_container_add(GTK_CONTAINER(frame_vbnbox), disable_bn); - gtk_signal_connect(GTK_OBJECT(disable_bn), "clicked", - GTK_SIGNAL_FUNC(plugins_disable_cb), GTK_OBJECT(plugins_clist)); - gtk_widget_show(disable_bn); - filter_bn = gtk_button_new_with_label("Filter"); - gtk_container_add(GTK_CONTAINER(frame_vbnbox), filter_bn); - gtk_signal_connect(GTK_OBJECT(filter_bn), "clicked", - GTK_SIGNAL_FUNC(plugins_filter_cb), GTK_OBJECT(plugins_clist)); - gtk_widget_show(filter_bn); - main_hbnbox = gtk_hbutton_box_new(); gtk_box_pack_start(GTK_BOX(main_vbox), main_hbnbox, FALSE, TRUE, 0); gtk_container_set_border_width(GTK_CONTAINER(main_hbnbox), 10); gtk_button_box_set_layout(GTK_BUTTON_BOX(main_hbnbox), GTK_BUTTONBOX_SPREAD); gtk_widget_show(main_hbnbox); - save_bn = gtk_button_new_with_label("Save status"); - gtk_container_add(GTK_CONTAINER(main_hbnbox), save_bn); - gtk_widget_show(save_bn); - gtk_signal_connect(GTK_OBJECT(save_bn), "clicked", - GTK_SIGNAL_FUNC(plugins_save_cb), GTK_OBJECT(plugins_window)); - close_bn = gtk_button_new_with_label("Close"); gtk_container_add(GTK_CONTAINER(main_hbnbox), close_bn); gtk_widget_show(close_bn); @@ -168,42 +116,20 @@ tools_plugins_cmd_cb(GtkWidget *widget, gpointer data) } /* - * Scan - * - * /usr/lib/ethereal/plugins/0.8 - * - * /usr/local/lib/ethereal/plugins/0.8 - * - * PLUGIN_DIR, if it's different from both of the above - * - * ~/.ethereal/plugins - * - * and fill the clist widget. + * Fill the clist widget with a list of the plugin modules. */ static void plugins_scan(GtkWidget *clist) { plugin *pt_plug; - gchar *plugent[4]; /* new entry added in clist */ - gpointer symbol; + gchar *plugent[2]; /* new entry added in clist */ pt_plug = plugin_list; while (pt_plug) { plugent[0] = pt_plug->name; - - /* Get, from the string named "desc" in the module, the - description of the plugin. */ - if (g_module_symbol(pt_plug->handle, "desc", &symbol) == FALSE) { - /* This plugin fails; continue next plugin */ - goto NEXT_PLUGIN; - } - - plugent[1] = symbol; - plugent[2] = pt_plug->version; - plugent[3] = (pt_plug->enabled ? "Yes" : "No"); + plugent[1] = pt_plug->version; gtk_clist_append(GTK_CLIST(clist), plugent); - NEXT_PLUGIN: pt_plug = pt_plug->next; } } @@ -214,178 +140,4 @@ plugins_close_cb(GtkWidget *close_bt, gpointer parent_w) gtk_grab_remove(GTK_WIDGET(parent_w)); gtk_widget_destroy(GTK_WIDGET(parent_w)); } - -static void -plugins_save_cb(GtkWidget *close_bt, gpointer parent_w) -{ - if (save_plugin_status()) - simple_dialog(ESD_TYPE_WARN, NULL, "Can't open ~/.ethereal/plugins.status\n" - "for writing"); -} - -void plugins_clist_select_cb(GtkWidget *clist, gint row, gint column, - GdkEventButton *event, gpointer data) -{ - selected_row = row; - gtk_clist_get_text(GTK_CLIST(clist), selected_row, 0, &selected_name); - gtk_clist_get_text(GTK_CLIST(clist), selected_row, 2, &selected_version); - gtk_clist_get_text(GTK_CLIST(clist), selected_row, 3, &selected_enabled); -} - -void plugins_clist_unselect_cb(GtkWidget *clist, gint row, gint column, - GdkEventButton *event, gpointer data) -{ - selected_row = -1; -} - -static void -plugins_enable_cb(GtkWidget *button, gpointer clist) -{ - char *errmsg; - - /* nothing selected */ - if (selected_row == -1) return; - /* already enabled */ - if (strcmp(selected_enabled, "Yes") == 0) return; - - errmsg = enable_plugin(selected_name, selected_version); - if (errmsg != NULL) - { - simple_dialog(ESD_TYPE_CRIT, NULL, errmsg); - return; - } - - gtk_clist_set_text(GTK_CLIST(clist), selected_row, 3, "Yes"); -} - -static void -plugins_disable_cb(GtkWidget *button, gpointer clist) -{ - plugin *pt_plug; - - /* nothing selected */ - if (selected_row == -1) return; - /* already disabled */ - if (!strcmp(selected_enabled, "No")) return; - - if ((pt_plug = disable_plugin(selected_name, selected_version)) == NULL) - { - simple_dialog(ESD_TYPE_CRIT, NULL, "Plugin not found"); - return; - } - gtk_clist_set_text(GTK_CLIST(clist), selected_row, 3, "No"); -} - -static void -plugins_filter_cb(GtkWidget *button, gpointer clist) -{ - GtkWidget *filter_window; - GtkWidget *filter_vbox; - GtkWidget *filter_frame; - GtkWidget *filter_entry; - GtkWidget *filter_hbnbox; - GtkWidget *ok_bn; - GtkWidget *cancel_bn; - GtkWidget *default_bn; - plugin *pt_plug; - - if (selected_row == -1) return; - pt_plug = find_plugin(selected_name, selected_version); - - filter_window = dlg_window_new("Ethereal: Plugin Filter"); - gtk_window_set_modal(GTK_WINDOW(filter_window), TRUE); - - filter_vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(filter_window), filter_vbox); - gtk_widget_show(filter_vbox); - - filter_frame = gtk_frame_new("Plugin Filter"); - gtk_box_pack_start(GTK_BOX(filter_vbox), filter_frame, TRUE, TRUE, 0); - gtk_container_set_border_width(GTK_CONTAINER(filter_frame), 10); - gtk_widget_show(filter_frame); - - filter_entry = gtk_entry_new(); - gtk_object_set_data(GTK_OBJECT(filter_window), PLUGINS_DFILTER_TE, - filter_entry); - gtk_container_add(GTK_CONTAINER(filter_frame), filter_entry); - gtk_entry_set_text(GTK_ENTRY(filter_entry), pt_plug->filter_string); - if (!strcmp(selected_enabled, "Yes")) - gtk_entry_set_editable(GTK_ENTRY(filter_entry), TRUE); - else - gtk_entry_set_editable(GTK_ENTRY(filter_entry), FALSE); - gtk_widget_show(filter_entry); - - filter_hbnbox = gtk_hbutton_box_new(); - gtk_box_pack_start(GTK_BOX(filter_vbox), filter_hbnbox, FALSE, TRUE, 0); - gtk_container_set_border_width(GTK_CONTAINER(filter_hbnbox), 10); - gtk_widget_show(filter_hbnbox); - - ok_bn = gtk_button_new_with_label("Ok"); - gtk_container_add(GTK_CONTAINER(filter_hbnbox), ok_bn); - gtk_widget_show(ok_bn); - gtk_signal_connect(GTK_OBJECT(ok_bn), "clicked", - GTK_SIGNAL_FUNC(filter_ok_cb), GTK_OBJECT(filter_window)); - - cancel_bn = gtk_button_new_with_label("Cancel"); - gtk_container_add(GTK_CONTAINER(filter_hbnbox), cancel_bn); - gtk_widget_show(cancel_bn); - gtk_signal_connect(GTK_OBJECT(cancel_bn), "clicked", - GTK_SIGNAL_FUNC(filter_cancel_cb), GTK_OBJECT(filter_window)); - - default_bn = gtk_button_new_with_label("Default"); - gtk_container_add(GTK_CONTAINER(filter_hbnbox), default_bn); - gtk_widget_show(default_bn); - gtk_signal_connect(GTK_OBJECT(default_bn), "clicked", - GTK_SIGNAL_FUNC(filter_default_cb), GTK_OBJECT(filter_window)); - - gtk_widget_show(filter_window); -} - -static void -filter_ok_cb(GtkWidget *button, gpointer parent_w) -{ - GtkWidget *filter_entry; - gchar *filter_string; - dfilter *filter = NULL; - - if (!strcmp(selected_enabled, "Yes")) - { - filter_entry = gtk_object_get_data(GTK_OBJECT(parent_w), PLUGINS_DFILTER_TE); - filter_string = gtk_entry_get_text(GTK_ENTRY(filter_entry)); - if (dfilter_compile(filter_string, &filter) != 0) - { - simple_dialog(ESD_TYPE_CRIT, NULL, dfilter_error_msg); - } - else - plugin_replace_filter(selected_name, selected_version, - filter_string, filter); - } - gtk_grab_remove(GTK_WIDGET(parent_w)); - gtk_widget_destroy(GTK_WIDGET(parent_w)); -} - -static void -filter_cancel_cb(GtkWidget *button, gpointer parent_w) -{ - gtk_grab_remove(GTK_WIDGET(parent_w)); - gtk_widget_destroy(GTK_WIDGET(parent_w)); -} - -static void -filter_default_cb(GtkWidget *button, gpointer parent_w) -{ - GtkWidget *filter_entry; - gpointer symbol; - gchar *filter_string; - plugin *pt_plug; - - filter_entry = gtk_object_get_data(GTK_OBJECT(parent_w), PLUGINS_DFILTER_TE); - pt_plug = find_plugin(selected_name, selected_version); - - /* Get the display-filter string that specifies which packets should - be dissected by this module's dissector. */ - g_module_symbol(pt_plug->handle, "filter_string", &symbol); - filter_string = symbol; - gtk_entry_set_text(GTK_ENTRY(filter_entry), filter_string); -} #endif |