*
* $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
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-
#include <string.h>
#include <gtk/gtk.h>
#include <epan/packet_info.h>
#include <epan/epan.h>
#include <epan/value_string.h>
+#include <epan/tap.h>
+#include <epan/dissectors/packet-smb.h>
-#include "tap_menu.h"
-#include "../tap.h"
-#include "../smb.h"
-#include "../register.h"
#include "../timestats.h"
-#include "compat_macros.h"
#include "../simple_dialog.h"
-#include "ui_util.h"
-#include "dlg_utils.h"
#include "../file.h"
#include "../globals.h"
-#include "filter_prefs.h"
-#include "service_response_time_table.h"
-#include "gtkglobals.h"
+#include "../stat_menu.h"
+
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/service_response_time_table.h"
+#include "gtk/tap_param_dlg.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/main.h"
/* used to keep track of the statistics for an entire program interface */
}
static int
-smbstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, void *psi)
+smbstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi)
{
smbstat_t *ss=(smbstat_t *)pss;
- smb_info_t *si=psi;
+ const smb_info_t *si=psi;
/* we are only interested in reply packets */
if(si->request){
add_srt_table_data(&ss->smb_srt_table, si->cmd, &si->sip->req_time, pinfo);
- if(si->cmd==0xA0){
+ if(si->cmd==0xA0 && si->sip->extra_info_type == SMB_EI_NTI){
smb_nt_transact_info_t *sti=(smb_nt_transact_info_t *)si->sip->extra_info;
if(sti){
add_srt_table_data(&ss->nt_trans_srt_table, sti->subcmd, &si->sip->req_time, pinfo);
}
- } else if(si->cmd==0x32){
+ } else if(si->cmd==0x32 && si->sip->extra_info_type == SMB_EI_T2I){
smb_transact2_info_t *st2i=(smb_transact2_info_t *)si->sip->extra_info;
if(st2i){
}
-void protect_thread_critical_region(void);
-void unprotect_thread_critical_region(void);
static void
win_destroy_cb(GtkWindow *win _U_, gpointer data)
{
static void
-gtk_smbstat_init(char *optarg)
+gtk_smbstat_init(const char *optarg, void *userdata _U_)
{
smbstat_t *ss;
- char *filter=NULL;
+ const char *filter=NULL;
GtkWidget *label;
- char filter_string[256];
+ char *filter_string;
GString *error_string;
int i;
GtkWidget *vbox;
- GtkWidget *bbox;
- GtkWidget *close_bt;
+ GtkWidget *bbox;
+ GtkWidget *close_bt;
if(!strncmp(optarg,"smb,srt,",8)){
filter=optarg+8;
ss=g_malloc(sizeof(smbstat_t));
- ss->win=window_new(GTK_WINDOW_TOPLEVEL, "smb-stat");
+ ss->win = dlg_window_new("smb-stat"); /* transient_for top_level */
+ gtk_window_set_destroy_with_parent (GTK_WINDOW(ss->win), TRUE);
gtk_window_set_default_size(GTK_WINDOW(ss->win), 550, 600);
smbstat_set_title(ss);
label=gtk_label_new("SMB Service Response Time statistics");
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
- g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+ filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
label=gtk_label_new(filter_string);
+ g_free(filter_string);
+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
label=gtk_label_new("SMB Commands");
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)"));
+ init_srt_table_row(&ss->smb_srt_table, i, val_to_str_ext(i, &smb_cmd_vals_ext, "Unknown(0x%02x)"));
}
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
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)"));
+ init_srt_table_row(&ss->trans2_srt_table, i, val_to_str_ext(i, &trans2_cmd_vals_ext, "Unknown(0x%02x)"));
}
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
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)"));
+ init_srt_table_row(&ss->nt_trans_srt_table, i, val_to_str_ext(i, &nt_cmd_vals_ext, "Unknown(0x%02x)"));
}
- error_string=register_tap_listener("smb", ss, filter, smbstat_reset, smbstat_packet, smbstat_draw);
+ error_string=register_tap_listener("smb", ss, filter, 0, smbstat_reset, smbstat_packet, smbstat_draw);
if(error_string){
- 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);
g_free(ss);
return;
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(ss->win, close_bt, window_cancel_button_cb);
-
- SIGNAL_CONNECT(ss->win, "delete_event", window_delete_event_cb, NULL);
- SIGNAL_CONNECT(ss->win, "destroy", win_destroy_cb, ss);
-
- gtk_widget_show_all(ss->win);
- window_present(ss->win);
-
- retap_packets(&cfile);
-}
-
-
+ close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
+ window_set_cancel_button(ss->win, close_bt, window_cancel_button_cb);
-static GtkWidget *dlg=NULL;
-static GtkWidget *filter_entry;
+ g_signal_connect(ss->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
+ g_signal_connect(ss->win, "destroy", G_CALLBACK(win_destroy_cb), ss);
-static void
-dlg_destroy_cb(void)
-{
- dlg=NULL;
-}
-
-static void
-smbstat_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
-{
- GString *str;
- char *filter;
+ gtk_widget_show_all(ss->win);
+ window_present(ss->win);
- str = g_string_new("smb,srt");
- filter=(char *)gtk_entry_get_text(GTK_ENTRY(filter_entry));
- if(filter[0]!=0){
- g_string_sprintfa(str,",%s", filter);
- }
- gtk_smbstat_init(str->str);
- g_string_free(str, TRUE);
+ cf_retap_packets(&cfile);
+ gdk_window_raise(ss->win->window);
}
-static void
-gtk_smbstat_cb(GtkWidget *w _U_, gpointer d _U_)
-{
- GtkWidget *dlg_box;
- GtkWidget *filter_box, *filter_bt;
- GtkWidget *bbox, *start_button, *cancel_button;
- const char *filter;
- static construct_args_t args = {
- "Service Response Time Statistics Filter",
- TRUE,
- FALSE
- };
-
- /* if the window is already open, bring it to front */
- if(dlg){
- gdk_window_raise(dlg->window);
- return;
- }
+static tap_param smb_stat_params[] = {
+ { PARAM_FILTER, "Filter", NULL }
+};
- dlg=dlg_window_new("Ethereal: Compute SMB SRT statistics");
- gtk_window_set_default_size(GTK_WINDOW(dlg), 300, -1);
-
- 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 button */
- 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, TRUE, 0);
- gtk_widget_show(filter_bt);
-
- /* Filter entry */
- filter_entry=gtk_entry_new();
- SIGNAL_CONNECT(filter_entry, "changed", filter_te_syntax_check_cb, NULL);
-
- /* filter prefs dialog */
- OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_entry);
- /* filter prefs dialog */
-
- 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 = 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);
-
- start_button = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_CREATE_STAT);
- SIGNAL_CONNECT_OBJECT(start_button, "clicked",
- smbstat_start_button_clicked, NULL);
-
- cancel_button = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
- window_set_cancel_button(dlg, cancel_button, window_cancel_button_cb);
-
- /* 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);
-
- gtk_widget_grab_default(start_button );
-
- /* Give the initial focus to the "Filter" entry box. */
- gtk_widget_grab_focus(filter_entry);
-
- SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL);
- SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
-
- gtk_widget_show_all(dlg);
- window_present(dlg);
-}
+static tap_param_dlg smb_stat_dlg = {
+ "SMB SRT Statistics",
+ "smb,srt",
+ gtk_smbstat_init,
+ -1,
+ G_N_ELEMENTS(smb_stat_params),
+ smb_stat_params
+};
void
register_tap_listener_gtksmbstat(void)
{
- register_ethereal_tap("smb,srt", gtk_smbstat_init);
-
- register_tap_menu_item("SMB...", REGISTER_TAP_GROUP_RESPONSE_TIME,
- gtk_smbstat_cb, NULL, NULL, NULL);
+ register_dfilter_stat(&smb_stat_dlg, "SMB",
+ REGISTER_STAT_GROUP_RESPONSE_TIME);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff