*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/* This module provides rpc call/reply SRT statistics to ethereal,
+/* This module provides rpc call/reply SRT statistics to Wireshark,
* and displays them graphically.
- * It is only used by ethereal and not tethereal
+ * It is only used by Wireshark and not tshark
*
* It serves as an example on how to use the tap api.
*/
# include "config.h"
#endif
+#include <stdio.h>
#include <string.h>
#include <gtk/gtk.h>
#include <epan/packet_info.h>
#include <epan/epan.h>
+#include <epan/stat_cmd_args.h>
+#include <epan/tap.h>
+#include <epan/dissectors/packet-dcerpc.h>
-#include "tap_menu.h"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
-#include "ui_util.h"
-#include "tap.h"
+#include "../stat_menu.h"
+#include "../simple_dialog.h"
#include "../register.h"
-#include <epan/dissectors/packet-dcerpc.h>
#include "../globals.h"
-#include "filter_dlg.h"
-#include "compat_macros.h"
-#include "service_response_time_table.h"
-#include "gtkglobals.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/stock_icons.h"
+#include "gtk/service_response_time_table.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/main.h"
+#include "gtk/filter_autocomplete.h"
/* used to keep track of the statistics for an entire program interface */
typedef struct _rpcstat_t {
GtkWidget *win;
srt_stat_table srt_table;
- char *prog;
+ const char *prog;
e_uuid_t uuid;
guint16 ver;
int num_procedures;
static int
-dcerpcstat_packet(void *rs_arg, packet_info *pinfo, epan_dissect_t *edt _U_, void *ri_arg)
+dcerpcstat_packet(void *rs_arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *ri_arg)
{
rpcstat_t *rs = rs_arg;
- dcerpc_info *ri = ri_arg;
+ const dcerpc_info *ri = ri_arg;
if(!ri->call_data){
return 0;
*
* there should not be any other critical regions in gtk2
*/
-void protect_thread_critical_region(void);
-void unprotect_thread_critical_region(void);
static void
win_destroy_cb(GtkWindow *win _U_, gpointer data)
{
/* When called, this function will create a new instance of gtk-dcerpcstat.
*/
static void
-gtk_dcerpcstat_init(char *optarg)
+gtk_dcerpcstat_init(const char *optarg, void* userdata _U_)
{
rpcstat_t *rs;
guint32 i, max_procs;
char *title_string;
- char filter_string[256];
+ char *filter_string;
GtkWidget *vbox;
GtkWidget *stat_label;
GtkWidget *filter_label;
- GtkWidget *bbox;
- GtkWidget *close_bt;
+ GtkWidget *bbox;
+ GtkWidget *close_bt;
dcerpc_sub_dissector *procs;
e_uuid_t uuid;
guint d1,d2,d3,d40,d41,d42,d43,d44,d45,d46,d47;
int major, minor;
guint16 ver;
int pos=0;
- char *filter=NULL;
+ const char *filter=NULL;
GString *error_string;
int hf_opnum;
filter=NULL;
}
} else {
- fprintf(stderr, "ethereal: invalid \"-z dcerpc,srt,<uuid>,<major version>.<minor version>[,<filter>]\" argument\n");
+ fprintf(stderr, "wireshark: invalid \"-z dcerpc,srt,<uuid>,<major version>.<minor version>[,<filter>]\" argument\n");
exit(1);
}
if (major < 0 || major > 65535) {
- fprintf(stderr,"ethereal: dcerpcstat_init() Major version number %d is invalid - must be positive and <= 65535\n", major);
+ fprintf(stderr,"wireshark: dcerpcstat_init() Major version number %d is invalid - must be positive and <= 65535\n", major);
exit(1);
}
if (minor < 0 || minor > 65535) {
- fprintf(stderr,"ethereal: dcerpcstat_init() Minor version number %d is invalid - must be positive and <= 65535\n", minor);
+ fprintf(stderr,"wireshark: dcerpcstat_init() Minor version number %d is invalid - must be positive and <= 65535\n", minor);
exit(1);
}
ver = major;
rs->prog=dcerpc_get_proto_name(&uuid, ver);
if(!rs->prog){
g_free(rs);
- fprintf(stderr,"ethereal: dcerpcstat_init() Protocol with uuid:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x v%u not supported\n",uuid.Data1,uuid.Data2,uuid.Data3,uuid.Data4[0],uuid.Data4[1],uuid.Data4[2],uuid.Data4[3],uuid.Data4[4],uuid.Data4[5],uuid.Data4[6],uuid.Data4[7],ver);
+ fprintf(stderr,"wireshark: dcerpcstat_init() Protocol with uuid:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x v%u not supported\n",uuid.Data1,uuid.Data2,uuid.Data3,uuid.Data4[0],uuid.Data4[1],uuid.Data4[2],uuid.Data4[3],uuid.Data4[4],uuid.Data4[5],uuid.Data4[6],uuid.Data4[7],ver);
exit(1);
}
hf_opnum=dcerpc_get_proto_hf_opnum(&uuid, ver);
rs->uuid=uuid;
rs->ver=ver;
- rs->win=window_new(GTK_WINDOW_TOPLEVEL, "dcerpc-stat");
+ rs->win = dlg_window_new("dcerpc-stat"); /* transient_for top_level */
+ gtk_window_set_destroy_with_parent (GTK_WINDOW(rs->win), TRUE);
+
dcerpcstat_set_title(rs);
gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400);
g_free(title_string);
gtk_box_pack_start(GTK_BOX(vbox), stat_label, FALSE, FALSE, 0);
- g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+ filter_string = g_strdup_printf("Filter: %s",filter ? filter : "");
filter_label=gtk_label_new(filter_string);
+ g_free(filter_string);
+ gtk_label_set_line_wrap(GTK_LABEL(filter_label), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
for(i=0,max_procs=0;procs[i].name;i++){
for(i=0;i<(max_procs+1);i++){
int j;
- char *proc_name;
+ const char *proc_name;
proc_name="unknown";
for(j=0;procs[j].name;j++){
}
- error_string=register_tap_listener("dcerpc", rs, filter, dcerpcstat_reset, dcerpcstat_packet, dcerpcstat_draw);
+ error_string=register_tap_listener("dcerpc", rs, filter, 0, dcerpcstat_reset, dcerpcstat_packet, dcerpcstat_draw);
if(error_string){
/* error, we failed to attach to the tap. clean up */
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str);
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
g_string_free(error_string, TRUE);
free_srt_table_data(&rs->srt_table);
g_free(rs);
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
- close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
- window_set_cancel_button(rs->win, close_bt, window_cancel_button_cb);
+ close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
+ window_set_cancel_button(rs->win, close_bt, window_cancel_button_cb);
- SIGNAL_CONNECT(rs->win, "delete_event", window_delete_event_cb, NULL);
- SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs);
+ g_signal_connect(rs->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
+ g_signal_connect(rs->win, "destroy", G_CALLBACK(win_destroy_cb), rs);
- gtk_widget_show_all(rs->win);
- window_present(rs->win);
+ gtk_widget_show_all(rs->win);
+ window_present(rs->win);
- retap_packets(&cfile);
+ cf_retap_packets(&cfile);
+ gdk_window_raise(rs->win->window);
}
dcerpcstat_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
{
GString *str;
- char *filter;
+ const char *filter;
str = g_string_new("dcerpc,srt");
- g_string_sprintfa(str,
+ g_string_append_printf(str,
",%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x,%u.%u",
dcerpc_uuid_program->Data1, dcerpc_uuid_program->Data2,
dcerpc_uuid_program->Data3,
dcerpc_uuid_program->Data4[4], dcerpc_uuid_program->Data4[5],
dcerpc_uuid_program->Data4[6], dcerpc_uuid_program->Data4[7],
dcerpc_version, 0);
- filter=(char *)gtk_entry_get_text(GTK_ENTRY(filter_entry));
+ filter=gtk_entry_get_text(GTK_ENTRY(filter_entry));
if(filter[0]!=0){
- g_string_sprintfa(str, ",%s", filter);
+ g_string_append_printf(str, ",%s", filter);
}
- gtk_dcerpcstat_init(str->str);
+ gtk_dcerpcstat_init(str->str,NULL);
g_string_free(str, TRUE);
}
static void
dcerpcstat_version_select(GtkWidget *item _U_, gpointer key)
{
- int vers=(int)key;
+ int vers=(long)key;
dcerpc_version=vers;
}
return NULL;
}
- g_snprintf(vs, 5, "%u",k->ver);
+ g_snprintf(vs, sizeof(vs), "%u",k->ver);
menu_item=gtk_menu_item_new_with_label(vs);
- SIGNAL_CONNECT(menu_item, "activate", dcerpcstat_version_select,
- ((int)k->ver));
+ g_signal_connect(menu_item, "activate", G_CALLBACK(dcerpcstat_version_select),
+ (gpointer)((long)k->ver));
gtk_widget_show(menu_item);
- gtk_menu_append(GTK_MENU(vers_menu), menu_item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(vers_menu), menu_item);
if(dcerpc_version==0xffff){
dcerpc_version=k->ver;
static GtkWidget *program_submenu_item;
static GtkWidget *program_submenu_label;
static int program_subitem_index;
-static char *first_menu_name;
-static void
+static const char *first_menu_name;
+static void
dcerpcstat_add_program_to_menu(dcerpc_uuid_key *k, dcerpc_uuid_value *v)
{
GtkWidget *program_menu_item;
case 0:
first_menu_name=v->name;
- g_snprintf(str,63,"%s ...",v->name);
+ g_snprintf(str,sizeof(str),"%s ...",v->name);
program_submenu_item=gtk_menu_item_new();
box=gtk_hbox_new(TRUE,0);
gtk_container_add(GTK_CONTAINER(program_submenu_item), box);
-
+
program_submenu_label=gtk_label_new(str);
gtk_box_pack_start(GTK_BOX(box), program_submenu_label, TRUE, TRUE, 0);
gtk_widget_show(program_submenu_label);
gtk_widget_show(box);
- gtk_menu_append(GTK_MENU(prog_menu), program_submenu_item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(prog_menu), program_submenu_item);
gtk_widget_show(program_submenu_item);
program_submenu_menu=gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(program_submenu_item), program_submenu_menu);
break;
case 14:
- g_snprintf(str,63,"%s - %s",first_menu_name,v->name);
+ g_snprintf(str,sizeof(str),"%s - %s",first_menu_name,v->name);
gtk_label_set_text(GTK_LABEL(program_submenu_label), str);
break;
/*qqq*/
}
- program_subitem_index++;
+ program_subitem_index++;
program_menu_item=gtk_menu_item_new_with_label(v->name);
- SIGNAL_CONNECT(program_menu_item, "activate", dcerpcstat_program_select, k);
+ g_signal_connect(program_menu_item, "activate", G_CALLBACK(dcerpcstat_program_select), k);
gtk_widget_show(program_menu_item);
- gtk_menu_append(GTK_MENU(program_submenu_menu), program_menu_item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(program_submenu_menu), program_menu_item);
if(!dcerpc_uuid_program){
dcerpc_uuid_program=&k->uuid;
static construct_args_t args = {
"Service Response Time Statistics Filter",
FALSE,
- FALSE
+ FALSE,
+ FALSE
};
/* if the window is already open, bring it to front and
return;
}
- dlg=dlg_window_new("Ethereal: Compute DCE-RPC SRT statistics");
+ dlg=dlg_window_new("Wireshark: Compute DCE-RPC SRT statistics");
gtk_window_set_default_size(GTK_WINDOW(dlg), 400, -1);
dlg_box=gtk_vbox_new(FALSE, 10);
- gtk_container_border_width(GTK_CONTAINER(dlg_box), 10);
+ gtk_container_set_border_width(GTK_CONTAINER(dlg_box), 10);
gtk_container_add(GTK_CONTAINER(dlg), dlg_box);
gtk_widget_show(dlg_box);
filter_box=gtk_hbox_new(FALSE, 3);
/* Filter label */
- filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
- SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
+ filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
+ g_signal_connect(filter_bt, "clicked", G_CALLBACK(display_filter_construct_cb), &args);
gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0);
gtk_widget_show(filter_bt);
/* Filter entry */
filter_entry=gtk_entry_new();
- SIGNAL_CONNECT(filter_entry, "changed", filter_te_syntax_check_cb, NULL);
+ g_signal_connect(filter_entry, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
+ g_object_set_data(G_OBJECT(filter_box), E_FILT_AUTOCOMP_PTR_KEY, NULL);
+ g_signal_connect(filter_entry, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
+ g_signal_connect(dlg, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
if(filter){
gtk_entry_set_text(GTK_ENTRY(filter_entry), filter);
+ } else {
+ colorize_filter_te_as_empty(filter_entry);
}
gtk_widget_show(filter_entry);
-
+
gtk_box_pack_start(GTK_BOX(dlg_box), filter_box, TRUE, TRUE, 0);
gtk_widget_show(filter_box);
- OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_entry);
+ g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_entry);
/* button box */
- bbox = dlg_button_row_new(ETHEREAL_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
+ bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0);
- gtk_widget_show(bbox);
+ gtk_widget_show(bbox);
- start_button = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_CREATE_STAT);
- SIGNAL_CONNECT_OBJECT(start_button, "clicked",
- dcerpcstat_start_button_clicked, NULL);
+ start_button = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CREATE_STAT);
+ g_signal_connect_swapped(start_button, "clicked",
+ G_CALLBACK(dcerpcstat_start_button_clicked), NULL);
- cancel_button = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
- window_set_cancel_button(dlg, cancel_button, window_cancel_button_cb);
+ cancel_button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
+ window_set_cancel_button(dlg, cancel_button, window_cancel_button_cb);
- SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL);
- SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
+ g_signal_connect(dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
+ g_signal_connect(dlg, "destroy", dlg_destroy_cb, NULL);
/* Catch the "activate" signal on the filter text entry, so that
if the user types Return there, we act as if the "Create Stat"
focus. */
dlg_set_activate(filter_entry, start_button);
- gtk_widget_grab_default(start_button );
+ gtk_widget_grab_default(start_button );
/* Give the initial focus to the "Filter" entry box. */
gtk_widget_grab_focus(filter_entry);
gtk_widget_show_all(dlg);
- window_present(dlg);
+ window_present(dlg);
}
void
register_tap_listener_gtkdcerpcstat(void)
{
- register_ethereal_tap("dcerpc,srt,", gtk_dcerpcstat_init);
+ register_stat_cmd_arg("dcerpc,srt,", gtk_dcerpcstat_init,NULL);
- register_tap_menu_item("DCE-RPC...", REGISTER_TAP_GROUP_RESPONSE_TIME,
+ register_stat_menu_item("DCE-RPC...", REGISTER_STAT_GROUP_RESPONSE_TIME,
gtk_dcerpcstat_cb, NULL, NULL, NULL);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff