/* smb_stat.c
* smb_stat 2003 Ronnie Sahlberg
*
- * $Id: smb_stat.c,v 1.4 2003/04/23 05:37:23 guy Exp $
+ * $Id: smb_stat.c,v 1.21 2003/09/28 00:00:36 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* 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.
#include <gtk/gtk.h>
#include <string.h>
-#include "menu.h"
#include "../epan/packet_info.h"
+#include "../epan/epan.h"
+#include "menu.h"
#include "../tap.h"
#include "../epan/value_string.h"
#include "../smb.h"
#include "../register.h"
+#include "../timestats.h"
#include "compat_macros.h"
#include "../simple_dialog.h"
+#include "dlg_utils.h"
#include "../file.h"
#include "../globals.h"
+#include "service_response_time_table.h"
-typedef struct _smb_procedure_t {
- int num;
- nstime_t min;
- nstime_t max;
- nstime_t tot;
-} smb_procedure_t;
+extern GtkWidget *main_display_filter_widget;
/* used to keep track of the statistics for an entire program interface */
typedef struct _smbstat_t {
GtkWidget *win;
- GtkWidget *vbox;
- char *filter;
- GtkWidget *table;
- int table_height;
- GtkWidget *table_widgets[768];
- smb_procedure_t proc[256];
- smb_procedure_t trans2[256];
- smb_procedure_t nt_trans[256];
+ srt_stat_table smb_srt_table;
+ srt_stat_table trans2_srt_table;
+ srt_stat_table nt_trans_srt_table;
} smbstat_t;
-
-
-
static void
-add_table_entry(smbstat_t *ss, char *str, int x, int y)
+smbstat_set_title(smbstat_t *ss)
{
- GtkWidget *tmp;
+ char *title;
- if(y>=ss->table_height){
- ss->table_height=y+1;
- gtk_table_resize(GTK_TABLE(ss->table), ss->table_height, 5);
- }
- tmp=gtk_label_new(str);
- gtk_table_attach_defaults(GTK_TABLE(ss->table), tmp, x, x+1, y, y+1);
- gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_LEFT);
- gtk_widget_show(tmp);
+ title = g_strdup_printf("SMB Service Response Time statistics: %s",
+ cf_get_display_name(&cfile));
+ gtk_window_set_title(GTK_WINDOW(ss->win), title);
+ g_free(title);
}
-
static void
smbstat_reset(void *pss)
{
smbstat_t *ss=(smbstat_t *)pss;
- guint32 i;
- for(i=0;i<256;i++){
- ss->proc[i].num=0;
- ss->proc[i].min.secs=0;
- ss->proc[i].min.nsecs=0;
- ss->proc[i].max.secs=0;
- ss->proc[i].max.nsecs=0;
- ss->proc[i].tot.secs=0;
- ss->proc[i].tot.nsecs=0;
-
- ss->trans2[i].num=0;
- ss->trans2[i].min.secs=0;
- ss->trans2[i].min.nsecs=0;
- ss->trans2[i].max.secs=0;
- ss->trans2[i].max.nsecs=0;
- ss->trans2[i].tot.secs=0;
- ss->trans2[i].tot.nsecs=0;
-
- ss->nt_trans[i].num=0;
- ss->nt_trans[i].min.secs=0;
- ss->nt_trans[i].min.nsecs=0;
- ss->nt_trans[i].max.secs=0;
- ss->nt_trans[i].max.nsecs=0;
- ss->nt_trans[i].tot.secs=0;
- ss->nt_trans[i].tot.nsecs=0;
- }
+ reset_srt_table_data(&ss->smb_srt_table);
+ reset_srt_table_data(&ss->trans2_srt_table);
+ reset_srt_table_data(&ss->nt_trans_srt_table);
+ smbstat_set_title(ss);
}
static int
{
smbstat_t *ss=(smbstat_t *)pss;
smb_info_t *si=psi;
- nstime_t delta;
- smb_procedure_t *sp;
/* we are only interested in reply packets */
if(si->request){
return 0;
}
+ add_srt_table_data(&ss->smb_srt_table, si->cmd, &si->sip->req_time, pinfo);
+
if(si->cmd==0xA0){
smb_nt_transact_info_t *sti=(smb_nt_transact_info_t *)si->sip->extra_info;
- /*nt transaction*/
- sp=&(ss->nt_trans[sti->subcmd]);
+ if(sti){
+ add_srt_table_data(&ss->nt_trans_srt_table, sti->subcmd, &si->sip->req_time, pinfo);
+ }
} else if(si->cmd==0x32){
smb_transact2_info_t *st2i=(smb_transact2_info_t *)si->sip->extra_info;
- /*transaction2*/
- sp=&(ss->trans2[st2i->subcmd]);
- } else {
- sp=&(ss->proc[si->cmd]);
- }
-
- /* calculate time delta between request and reply */
- delta.secs=pinfo->fd->abs_secs-si->sip->req_time.secs;
- delta.nsecs=pinfo->fd->abs_usecs*1000-si->sip->req_time.nsecs;
- if(delta.nsecs<0){
- delta.nsecs+=1000000000;
- delta.secs--;
- }
-
- if((sp->max.secs==0)
- && (sp->max.nsecs==0) ){
- sp->max.secs=delta.secs;
- sp->max.nsecs=delta.nsecs;
- }
-
- if((sp->min.secs==0)
- && (sp->min.nsecs==0) ){
- sp->min.secs=delta.secs;
- sp->min.nsecs=delta.nsecs;
- }
-
- if( (delta.secs<sp->min.secs)
- ||( (delta.secs==sp->min.secs)
- &&(delta.nsecs<sp->min.nsecs) ) ){
- sp->min.secs=delta.secs;
- sp->min.nsecs=delta.nsecs;
- }
-
- if( (delta.secs>sp->max.secs)
- ||( (delta.secs==sp->max.secs)
- &&(delta.nsecs>sp->max.nsecs) ) ){
- sp->max.secs=delta.secs;
- sp->max.nsecs=delta.nsecs;
- }
-
- sp->tot.secs += delta.secs;
- sp->tot.nsecs += delta.nsecs;
- if(sp->tot.nsecs>1000000000){
- sp->tot.nsecs-=1000000000;
- sp->tot.secs++;
+ if(st2i){
+ add_srt_table_data(&ss->trans2_srt_table, st2i->subcmd, &si->sip->req_time, pinfo);
+ }
}
- sp->num++;
return 1;
}
+
+
static void
smbstat_draw(void *pss)
{
smbstat_t *ss=(smbstat_t *)pss;
- guint32 i;
- int pos;
- char str[256];
-#ifdef G_HAVE_UINT64
- guint64 td;
-#else
- guint32 td;
-#endif
- gtk_widget_destroy(ss->table);
- ss->table_height=5;
- ss->table=gtk_table_new(ss->table_height, 5, TRUE);
- gtk_container_add(GTK_CONTAINER(ss->vbox), ss->table);
-
- pos=0;
- add_table_entry(ss, "Command", 0, pos);
- add_table_entry(ss, "Calls", 1, pos);
- add_table_entry(ss, "Min RTT", 2, pos);
- add_table_entry(ss, "Max RTT", 3, pos);
- add_table_entry(ss, "Avg RTT", 4, pos);
- pos++;
-
- for(i=0;i<256;i++){
- /* nothing seen, nothing to do */
- if(ss->proc[i].num==0){
- continue;
- }
-
- /* we deal with transaction2 later */
- if(i==0x32){
- continue;
- }
-
- /* we deal with nt transaction later */
- if(i==0xA0){
- continue;
- }
-
- /* scale it to units of 10us.*/
- /* for long captures with a large tot time, this can overflow on 32bit */
- td=(int)ss->proc[i].tot.secs;
- td=td*100000+(int)ss->proc[i].tot.nsecs/10000;
- if(ss->proc[i].num){
- td/=ss->proc[i].num;
- } else {
- td=0;
- }
-
- sprintf(str, "%s", val_to_str(i, smb_cmd_vals, "Unknown (0x%02x)"));
- add_table_entry(ss, str, 0, pos);
- sprintf(str, "%d", ss->proc[i].num);
- add_table_entry(ss, str, 1, pos);
- sprintf(str, "%3d.%05d", (int)ss->proc[i].min.secs,ss->proc[i].min.nsecs/10000);
- add_table_entry(ss, str, 2, pos);
- sprintf(str, "%3d.%05d", (int)ss->proc[i].max.secs,ss->proc[i].max.nsecs/10000);
- add_table_entry(ss, str, 3, pos);
- sprintf(str, "%3d.%05d", td/100000, td%100000);
- add_table_entry(ss, str, 4, pos);
- pos++;
- }
-
-
- add_table_entry(ss, "", 0, pos);
- add_table_entry(ss, "", 1, pos);
- add_table_entry(ss, "", 2, pos);
- add_table_entry(ss, "", 3, pos);
- add_table_entry(ss, "", 4, pos);
- pos++;
-
- add_table_entry(ss, "Transaction2 Command", 0, pos);
- add_table_entry(ss, "Calls", 1, pos);
- add_table_entry(ss, "Min RTT", 2, pos);
- add_table_entry(ss, "Max RTT", 3, pos);
- add_table_entry(ss, "Avg RTT", 4, pos);
- pos++;
-
- for(i=0;i<256;i++){
- /* nothing seen, nothing to do */
- if(ss->trans2[i].num==0){
- continue;
- }
-
- /* scale it to units of 10us.*/
- /* for long captures with a large tot time, this can overflow on 32bit */
- td=(int)ss->trans2[i].tot.secs;
- td=td*100000+(int)ss->trans2[i].tot.nsecs/10000;
- if(ss->trans2[i].num){
- td/=ss->trans2[i].num;
- } else {
- td=0;
- }
-
- sprintf(str, "%s", val_to_str(i, trans2_cmd_vals, "Unknown (0x%02x)"));
- add_table_entry(ss, str, 0, pos);
- sprintf(str, "%d", ss->trans2[i].num);
- add_table_entry(ss, str, 1, pos);
- sprintf(str, "%3d.%05d", (int)ss->trans2[i].min.secs,ss->trans2[i].min.nsecs/10000);
- add_table_entry(ss, str, 2, pos);
- sprintf(str, "%3d.%05d", (int)ss->trans2[i].max.secs,ss->trans2[i].max.nsecs/10000);
- add_table_entry(ss, str, 3, pos);
- sprintf(str, "%3d.%05d", td/100000, td%100000);
- add_table_entry(ss, str, 4, pos);
- pos++;
- }
-
- add_table_entry(ss, "", 0, pos);
- add_table_entry(ss, "", 1, pos);
- add_table_entry(ss, "", 2, pos);
- add_table_entry(ss, "", 3, pos);
- add_table_entry(ss, "", 4, pos);
- pos++;
-
- add_table_entry(ss, "NT Transaction Command", 0, pos);
- add_table_entry(ss, "Calls", 1, pos);
- add_table_entry(ss, "Min RTT", 2, pos);
- add_table_entry(ss, "Max RTT", 3, pos);
- add_table_entry(ss, "Avg RTT", 4, pos);
- pos++;
-
- for(i=0;i<256;i++){
- /* nothing seen, nothing to do */
- if(ss->nt_trans[i].num==0){
- continue;
- }
-
- /* scale it to units of 10us.*/
- /* for long captures with a large tot time, this can overflow on 32bit */
- td=(int)ss->nt_trans[i].tot.secs;
- td=td*100000+(int)ss->nt_trans[i].tot.nsecs/10000;
- if(ss->nt_trans[i].num){
- td/=ss->nt_trans[i].num;
- } else {
- td=0;
- }
-
- sprintf(str, "%s", val_to_str(i, nt_cmd_vals, "Unknown (0x%02x)"));
- add_table_entry(ss, str, 0, pos);
- sprintf(str, "%d", ss->nt_trans[i].num);
- add_table_entry(ss, str, 1, pos);
- sprintf(str, "%3d.%05d", (int)ss->nt_trans[i].min.secs,ss->nt_trans[i].min.nsecs/10000);
- add_table_entry(ss, str, 2, pos);
- sprintf(str, "%3d.%05d", (int)ss->nt_trans[i].max.secs,ss->nt_trans[i].max.nsecs/10000);
- add_table_entry(ss, str, 3, pos);
- sprintf(str, "%3d.%05d", td/100000, td%100000);
- add_table_entry(ss, str, 4, pos);
- pos++;
- }
- gtk_widget_show(ss->table);
+ draw_srt_table_data(&ss->smb_srt_table);
+ draw_srt_table_data(&ss->trans2_srt_table);
+ draw_srt_table_data(&ss->nt_trans_srt_table);
}
remove_tap_listener(ss);
unprotect_thread_critical_region();
- if(ss->filter){
- g_free(ss->filter);
- ss->filter=NULL;
- }
+ free_srt_table_data(&ss->smb_srt_table);
+ free_srt_table_data(&ss->trans2_srt_table);
+ free_srt_table_data(&ss->nt_trans_srt_table);
g_free(ss);
}
gtk_smbstat_init(char *optarg)
{
smbstat_t *ss;
- guint32 i;
char *filter=NULL;
- GtkWidget *stat_label;
- GtkWidget *filter_label;
+ GtkWidget *label;
char filter_string[256];
+ GString *error_string;
+ int i;
+ GtkWidget *vbox;
- if(!strncmp(optarg,"smb,rtt,",8)){
+ if(!strncmp(optarg,"smb,srt,",8)){
filter=optarg+8;
} else {
filter=NULL;
}
ss=g_malloc(sizeof(smbstat_t));
- if(filter){
- ss->filter=g_malloc(strlen(filter)+1);
- strcpy(ss->filter, filter);
- } else {
- ss->filter=NULL;
- }
-
- for(i=0;i<256;i++){
- ss->proc[i].num=0;
- ss->proc[i].min.secs=0;
- ss->proc[i].min.nsecs=0;
- ss->proc[i].max.secs=0;
- ss->proc[i].max.nsecs=0;
- ss->proc[i].tot.secs=0;
- ss->proc[i].tot.nsecs=0;
-
- ss->trans2[i].num=0;
- ss->trans2[i].min.secs=0;
- ss->trans2[i].min.nsecs=0;
- ss->trans2[i].max.secs=0;
- ss->trans2[i].max.nsecs=0;
- ss->trans2[i].tot.secs=0;
- ss->trans2[i].tot.nsecs=0;
-
- ss->nt_trans[i].num=0;
- ss->nt_trans[i].min.secs=0;
- ss->nt_trans[i].min.nsecs=0;
- ss->nt_trans[i].max.secs=0;
- ss->nt_trans[i].max.nsecs=0;
- ss->nt_trans[i].tot.secs=0;
- ss->nt_trans[i].tot.nsecs=0;
- }
ss->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(ss->win), "SMB RTT Statistics");
+ gtk_window_set_default_size(GTK_WINDOW(ss->win), 550, 600);
+ smbstat_set_title(ss);
SIGNAL_CONNECT(ss->win, "destroy", win_destroy_cb, ss);
- ss->vbox=gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(ss->win), ss->vbox);
- gtk_container_set_border_width(GTK_CONTAINER(ss->vbox), 10);
- gtk_widget_show(ss->vbox);
+ vbox=gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(ss->win), vbox);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
+ gtk_widget_show(vbox);
- stat_label=gtk_label_new("SMB RTT Statistics");
- gtk_box_pack_start(GTK_BOX(ss->vbox), stat_label, FALSE, FALSE, 0);
- gtk_widget_show(stat_label);
+ label=gtk_label_new("SMB Service Response Time statistics");
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ gtk_widget_show(label);
snprintf(filter_string,255,"Filter:%s",filter?filter:"");
- filter_label=gtk_label_new(filter_string);
- gtk_box_pack_start(GTK_BOX(ss->vbox), filter_label, FALSE, FALSE, 0);
- gtk_widget_show(filter_label);
+ label=gtk_label_new(filter_string);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ gtk_widget_show(label);
+
+
+ label=gtk_label_new("SMB Commands");
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ gtk_widget_show(label);
+
+ /* We must display TOP LEVEL Widget before calling init_srt_table() */
+ gtk_widget_show(ss->win);
+
+ init_srt_table(&ss->smb_srt_table, 256, vbox, "smb.cmd");
+ for(i=0;i<256;i++){
+ init_srt_table_row(&ss->smb_srt_table, i, val_to_str(i, smb_cmd_vals, "Unknown(0x%02x)"));
+ }
+
+
+ label=gtk_label_new("Transaction2 Sub-Commands");
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ gtk_widget_show(label);
+ init_srt_table(&ss->trans2_srt_table, 256, vbox, "smb.trans2.cmd");
+ for(i=0;i<256;i++){
+ init_srt_table_row(&ss->trans2_srt_table, i, val_to_str(i, trans2_cmd_vals, "Unknown(0x%02x)"));
+ }
- ss->table_height=5;
- ss->table=gtk_table_new(ss->table_height, 5, TRUE);
- gtk_container_add(GTK_CONTAINER(ss->vbox), ss->table);
-
- add_table_entry(ss, "Command", 0, 0);
- add_table_entry(ss, "Calls", 1, 0);
- add_table_entry(ss, "Min RTT", 2, 0);
- add_table_entry(ss, "Max RTT", 3, 0);
- add_table_entry(ss, "Avg RTT", 4, 0);
-
- add_table_entry(ss, "", 0, 1);
- add_table_entry(ss, "", 1, 1);
- add_table_entry(ss, "", 2, 1);
- add_table_entry(ss, "", 3, 1);
- add_table_entry(ss, "", 4, 1);
-
- add_table_entry(ss, "Transaction2 Commands", 0, 2);
- add_table_entry(ss, "Calls", 1, 2);
- add_table_entry(ss, "Min RTT", 2, 2);
- add_table_entry(ss, "Max RTT", 3, 2);
- add_table_entry(ss, "Avg RTT", 4, 2);
-
- add_table_entry(ss, "", 0, 3);
- add_table_entry(ss, "", 1, 3);
- add_table_entry(ss, "", 2, 3);
- add_table_entry(ss, "", 3, 3);
- add_table_entry(ss, "", 4, 3);
-
- add_table_entry(ss, "NT Transaction Commands", 0, 4);
- add_table_entry(ss, "Calls", 1, 4);
- add_table_entry(ss, "Min RTT", 2, 4);
- add_table_entry(ss, "Max RTT", 3, 4);
- add_table_entry(ss, "Avg RTT", 4, 4);
-
- gtk_widget_show(ss->table);
-
- if(register_tap_listener("smb", ss, filter, smbstat_reset, smbstat_packet, smbstat_draw)){
- char str[256];
- /* error, we failed to attach to the tap. clean up */
- snprintf(str,255,"Could not attach to tap using filter:%s\nMaybe the filter string is invalid?",filter?filter:"");
- simple_dialog(ESD_TYPE_WARN, NULL, str);
- g_free(ss->filter);
+ label=gtk_label_new("NT Transaction Sub-Commands");
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ gtk_widget_show(label);
+ init_srt_table(&ss->nt_trans_srt_table, 256, vbox, "smb.nt.function");
+ for(i=0;i<256;i++){
+ init_srt_table_row(&ss->nt_trans_srt_table, i, val_to_str(i, nt_cmd_vals, "Unknown(0x%02x)"));
+ }
+
+
+ error_string=register_tap_listener("smb", ss, filter, smbstat_reset, smbstat_packet, smbstat_draw);
+ if(error_string){
+ simple_dialog(ESD_TYPE_WARN, NULL, error_string->str);
+ g_string_free(error_string, TRUE);
g_free(ss);
return;
}
-static GtkWidget *dlg=NULL, *dlg_box;
-static GtkWidget *filter_box;
-static GtkWidget *filter_label, *filter_entry;
-static GtkWidget *start_button;
+static GtkWidget *dlg=NULL;
+static GtkWidget *filter_entry;
static void
dlg_destroy_cb(void)
dlg=NULL;
}
+static void
+dlg_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w)
+{
+ gtk_widget_destroy(GTK_WIDGET(parent_w));
+}
+
static void
smbstat_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
{
+ GString *str;
char *filter;
- char str[256];
+ str = g_string_new("smb,srt");
filter=(char *)gtk_entry_get_text(GTK_ENTRY(filter_entry));
- if(filter[0]==0){
- gtk_smbstat_init("smb,rtt");
- } else {
- sprintf(str,"smb,rtt,%s", filter);
- gtk_smbstat_init(str);
+ if(filter[0]!=0){
+ g_string_sprintfa(str,",%s", filter);
}
+ gtk_smbstat_init(str->str);
+ g_string_free(str, TRUE);
}
static void
gtk_smbstat_cb(GtkWidget *w _U_, gpointer d _U_)
{
+ GtkWidget *dlg_box;
+ GtkWidget *filter_box, *filter_label;
+ GtkWidget *bbox, *start_button, *cancel_button;
+ char *filter;
+
/* if the window is already open, bring it to front */
if(dlg){
gdk_window_raise(dlg->window);
return;
}
- dlg=gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(dlg), "SMB RTT Statistics");
+ dlg=dlg_window_new("Ethereal: Compute SMB SRT statistics");
SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
- dlg_box=gtk_vbox_new(FALSE, 0);
+
+ dlg_box=gtk_vbox_new(FALSE, 10);
+ gtk_container_border_width(GTK_CONTAINER(dlg_box), 10);
gtk_container_add(GTK_CONTAINER(dlg), dlg_box);
gtk_widget_show(dlg_box);
+ /* Filter box */
+ filter_box=gtk_hbox_new(FALSE, 3);
- /* filter box */
- filter_box=gtk_hbox_new(FALSE, 10);
/* Filter label */
- gtk_container_set_border_width(GTK_CONTAINER(filter_box), 10);
filter_label=gtk_label_new("Filter:");
gtk_box_pack_start(GTK_BOX(filter_box), filter_label, FALSE, FALSE, 0);
gtk_widget_show(filter_label);
- filter_entry=gtk_entry_new_with_max_length(250);
- gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, FALSE, FALSE, 0);
+ /* Filter entry */
+ filter_entry=gtk_entry_new();
+ gtk_widget_set_usize(filter_entry, 300, -2);
+ 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);
+ }
gtk_widget_show(filter_entry);
-
+
gtk_box_pack_start(GTK_BOX(dlg_box), filter_box, TRUE, TRUE, 0);
gtk_widget_show(filter_box);
+ /* 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);
+ gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0);
+ gtk_widget_show(bbox);
/* the start button */
start_button=gtk_button_new_with_label("Create Stat");
SIGNAL_CONNECT_OBJECT(start_button, "clicked",
smbstat_start_button_clicked, NULL);
- gtk_box_pack_start(GTK_BOX(dlg_box), start_button, TRUE, TRUE, 0);
+ 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);
+
+ /* Catch the "activate" signal on the filter text entry, so that
+ if the user types Return there, we act as if the "Create Stat"
+ 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_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);
+
+ /* Give the initial focus to the "Filter" entry box. */
+ gtk_widget_grab_focus(filter_entry);
+
gtk_widget_show_all(dlg);
}
void
register_tap_listener_gtksmbstat(void)
{
- register_ethereal_tap("smb,rtt", gtk_smbstat_init);
+ register_ethereal_tap("smb,srt", gtk_smbstat_init);
}
void
register_tap_menu_gtksmbstat(void)
{
- register_tap_menu_item("SMB/RTT", gtk_smbstat_cb);
+ register_tap_menu_item("Statistics/Service Response Time/SMB...",
+ gtk_smbstat_cb, NULL, NULL);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff