/* dcerpc_stat.c
* dcerpc_stat 2002 Ronnie Sahlberg
*
- * $Id: dcerpc_stat.c,v 1.35 2003/12/16 18:43:33 oabad Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
# include "config.h"
#endif
-#include <gtk/gtk.h>
-#include <stdio.h>
#include <string.h>
-#include "epan/packet_info.h"
-#include "epan/epan.h"
-#include "menu.h"
+#include <gtk/gtk.h>
+
+#include <epan/packet_info.h>
+#include <epan/epan.h>
+
+#include "tap_menu.h"
#include "simple_dialog.h"
#include "dlg_utils.h"
#include "ui_util.h"
-#include "tap.h"
+#include <epan/tap.h>
#include "../register.h"
-#include "packet-dcerpc.h"
+#include <epan/dissectors/packet-dcerpc.h>
#include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
#include "compat_macros.h"
#include "service_response_time_table.h"
+#include "gtkglobals.h"
-extern GtkWidget *main_display_filter_widget;
-
/* 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;
{
char *title;
- title = g_strdup_printf("DCE-RPC Service Response Time statistics for %s version %u.%u: %s", rs->prog, rs->ver&0xff, rs->ver>>8, cf_get_display_name(&cfile));
+ title = g_strdup_printf("DCE-RPC Service Response Time statistics for %s major version %u: %s", rs->prog, rs->ver, cf_get_display_name(&cfile));
return title;
}
}
static void
-dcerpcstat_reset(rpcstat_t *rs)
+dcerpcstat_reset(void *rs_arg)
{
+ rpcstat_t *rs = rs_arg;
+
reset_srt_table_data(&rs->srt_table);
dcerpcstat_set_title(rs);
}
static int
-dcerpcstat_packet(rpcstat_t *rs, packet_info *pinfo, epan_dissect_t *edt _U_, dcerpc_info *ri)
+dcerpcstat_packet(void *rs_arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *ri_arg)
{
+ rpcstat_t *rs = rs_arg;
+ const dcerpc_info *ri = ri_arg;
+
if(!ri->call_data){
return 0;
}
}
/* we are only interested in reply packets */
- if(ri->request){
+ if(ri->ptype != PDU_RESP){
return 0;
}
}
static void
-dcerpcstat_draw(rpcstat_t *rs)
+dcerpcstat_draw(void *rs_arg)
{
+ rpcstat_t *rs = rs_arg;
+
draw_srt_table_data(&rs->srt_table);
}
/* 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)
{
rpcstat_t *rs;
guint32 i, max_procs;
GtkWidget *vbox;
GtkWidget *stat_label;
GtkWidget *filter_label;
+ GtkWidget *bbox;
+ GtkWidget *close_bt;
dcerpc_sub_dissector *procs;
e_uuid_t uuid;
- int d1,d2,d3,d40,d41,d42,d43,d44,d45,d46,d47;
+ 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;
+ /*
+ * XXX - DCE RPC statistics are maintained only by major version,
+ * not by major and minor version, so the minor version number is
+ * ignored.
+ *
+ * Should we just stop supporting minor version numbers here?
+ * Or should we allow it to be omitted? Or should we keep
+ * separate statistics for different minor version numbers,
+ * and allow the minor version number to be omitted, and
+ * report aggregate statistics for all minor version numbers
+ * if it's omitted?
+ */
if(sscanf(optarg,"dcerpc,srt,%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x,%d.%d,%n", &d1,&d2,&d3,&d40,&d41,&d42,&d43,&d44,&d45,&d46,&d47,&major,&minor,&pos)==13){
uuid.Data1=d1;
uuid.Data2=d2;
fprintf(stderr, "ethereal: invalid \"-z dcerpc,srt,<uuid>,<major version>.<minor version>[,<filter>]\" argument\n");
exit(1);
}
- if (major < 0 || major > 255) {
- fprintf(stderr,"ethereal: dcerpcstat_init() Major version number %d is invalid - must be positive and <= 255\n", major);
+ if (major < 0 || major > 65535) {
+ fprintf(stderr,"ethereal: dcerpcstat_init() Major version number %d is invalid - must be positive and <= 65535\n", major);
exit(1);
}
- if (minor < 0 || minor > 255) {
- fprintf(stderr,"ethereal: dcerpcstat_init() Minor version number %d is invalid - must be positive and <= 255\n", minor);
+ if (minor < 0 || minor > 65535) {
+ fprintf(stderr,"ethereal: dcerpcstat_init() Minor version number %d is invalid - must be positive and <= 65535\n", minor);
exit(1);
}
- ver = ((minor<<8)|(major&0xff));
-
+ ver = major;
rs=g_malloc(sizeof(rpcstat_t));
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.%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],major,minor);
+ 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);
exit(1);
}
hf_opnum=dcerpc_get_proto_hf_opnum(&uuid, ver);
rs->uuid=uuid;
rs->ver=ver;
- rs->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400);
+ rs->win=window_new(GTK_WINDOW_TOPLEVEL, "dcerpc-stat");
dcerpcstat_set_title(rs);
- SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs);
+ gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400);
- vbox=gtk_vbox_new(FALSE, 0);
+ vbox=gtk_vbox_new(FALSE, 3);
gtk_container_add(GTK_CONTAINER(rs->win), vbox);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
- gtk_widget_show(vbox);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
title_string=dcerpcstat_gen_title(rs);
stat_label=gtk_label_new(title_string);
g_free(title_string);
gtk_box_pack_start(GTK_BOX(vbox), stat_label, FALSE, FALSE, 0);
- gtk_widget_show(stat_label);
- snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+ g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
filter_label=gtk_label_new(filter_string);
gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
- gtk_widget_show(filter_label);
for(i=0,max_procs=0;procs[i].name;i++){
if(procs[i].num>max_procs){
rs->num_procedures=max_procs+1;
/* We must display TOP LEVEL Widget before calling init_srt_table() */
- gtk_widget_show(rs->win);
+ gtk_widget_show_all(rs->win);
if(hf_opnum!=-1){
init_srt_table(&rs->srt_table, max_procs+1, vbox, proto_registrar_get_nth(hf_opnum)->abbrev);
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, (void*)dcerpcstat_reset, (void*)dcerpcstat_packet, (void*)dcerpcstat_draw);
+ error_string=register_tap_listener("dcerpc", rs, filter, dcerpcstat_reset, dcerpcstat_packet, dcerpcstat_draw);
if(error_string){
/* error, we failed to attach to the tap. clean up */
- simple_dialog(ESD_TYPE_WARN, NULL, error_string->str);
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str);
g_string_free(error_string, TRUE);
free_srt_table_data(&rs->srt_table);
g_free(rs);
return;
}
+ /* Button row. */
+ 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);
+
+ SIGNAL_CONNECT(rs->win, "delete_event", window_delete_event_cb, NULL);
+ SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs);
gtk_widget_show_all(rs->win);
- redissect_packets(&cfile);
+ window_present(rs->win);
+
+ cf_retap_packets(&cfile);
}
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,
dcerpc_uuid_program->Data4[2], dcerpc_uuid_program->Data4[3],
dcerpc_uuid_program->Data4[4], dcerpc_uuid_program->Data4[5],
dcerpc_uuid_program->Data4[6], dcerpc_uuid_program->Data4[7],
- dcerpc_version&0xff, dcerpc_version>>8);
- filter=(char *)gtk_entry_get_text(GTK_ENTRY(filter_entry));
+ dcerpc_version, 0);
+ filter=gtk_entry_get_text(GTK_ENTRY(filter_entry));
if(filter[0]!=0){
g_string_sprintfa(str, ",%s", filter);
}
return NULL;
}
- sprintf(vs,"%u.%u",k->ver&0xff,k->ver>>8);
+ g_snprintf(vs, 5, "%u",k->ver);
menu_item=gtk_menu_item_new_with_label(vs);
SIGNAL_CONNECT(menu_item, "activate", dcerpcstat_version_select,
((int)k->ver));
static GtkWidget *program_submenu_item;
static GtkWidget *program_submenu_label;
static int program_subitem_index;
-static char *first_menu_name;
+static const char *first_menu_name;
static void
dcerpcstat_add_program_to_menu(dcerpc_uuid_key *k, dcerpc_uuid_value *v)
{
case 0:
first_menu_name=v->name;
- snprintf(str,63,"%s ...",v->name);
+ g_snprintf(str,63,"%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);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(program_submenu_item), program_submenu_menu);
break;
case 14:
- snprintf(str,63,"%s - %s",first_menu_name,v->name);
+ g_snprintf(str,63,"%s - %s",first_menu_name,v->name);
gtk_label_set_text(GTK_LABEL(program_submenu_label), str);
break;
/*qqq*/
}
-static void
-dlg_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w)
-{
- gtk_widget_destroy(GTK_WIDGET(parent_w));
-}
-
-
static void
gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
{
const char *filter;
static construct_args_t args = {
"Service Response Time Statistics Filter",
- TRUE,
+ FALSE,
FALSE
};
}
dlg=dlg_window_new("Ethereal: Compute DCE-RPC SRT statistics");
- SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
+ 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);
filter_box=gtk_hbox_new(FALSE, 3);
/* Filter label */
- 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);
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();
- WIDGET_SET_SIZE(filter_entry, 300, -2);
-
- /* Filter entry */
- filter_entry=gtk_entry_new();
- WIDGET_SET_SIZE(filter_entry, 300, -2);
-
+ SIGNAL_CONNECT(filter_entry, "changed", filter_te_syntax_check_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_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);
+
/* button box */
- bbox=gtk_hbutton_box_new();
- gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_DEFAULT_STYLE);
- gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
+ bbox = dlg_button_row_new(ETHEREAL_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);
- /* the start button */
- start_button=gtk_button_new_with_label("Create Stat");
+ start_button = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_CREATE_STAT);
SIGNAL_CONNECT_OBJECT(start_button, "clicked",
dcerpcstat_start_button_clicked, NULL);
- gtk_box_pack_start(GTK_BOX(bbox), start_button, TRUE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS(start_button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default(start_button);
- gtk_widget_show(start_button);
-
-#if GTK_MAJOR_VERSION < 2
- cancel_button=gtk_button_new_with_label("Cancel");
-#else
- cancel_button=gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
- SIGNAL_CONNECT(cancel_button, "clicked", dlg_cancel_cb, dlg);
- GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
- gtk_box_pack_start(GTK_BOX(bbox), cancel_button, TRUE, TRUE, 0);
- gtk_widget_show(cancel_button);
+
+ cancel_button = OBJECT_GET_DATA(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);
/* 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);
- /* 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(dlg, cancel_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);
}
void
register_tap_listener_gtkdcerpcstat(void)
{
- register_ethereal_tap("dcerpc,srt,", gtk_dcerpcstat_init);
-}
+ register_tap_listener_cmd_arg("dcerpc,srt,", gtk_dcerpcstat_init);
-void
-register_tap_menu_gtkdcerpcstat(void)
-{
- register_tap_menu_item("Statistics/Service Response Time/DCE-RPC...",
- gtk_dcerpcstat_cb, NULL, NULL);
+ register_tap_menu_item("DCE-RPC...", REGISTER_TAP_GROUP_RESPONSE_TIME,
+ gtk_dcerpcstat_cb, NULL, NULL, NULL);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff