Again, some warnings removed.
[obnox/wireshark/wip.git] / gtk / rpc_stat.c
index 5b756a0245d93e055493d6eee724c0e339186b54..31f58edd23824e9ba49418bcc9df90cc965bda85 100644 (file)
@@ -1,7 +1,7 @@
 /* rpc_stat.c
  * rpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: rpc_stat.c,v 1.4 2002/10/23 23:17:11 guy Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* This module provides rpc call/reply RTT statistics to tethereal.
- * It is only used by tethereal and not ethereal
+/* This module provides rpc call/reply SRT (Server Response Time) statistics 
+ * to ethereal.
  *
  * It serves as an example on how to use the tap api.
  */
 #endif
 
 #include <gtk/gtk.h>
-#include "epan/packet_info.h"
+
+#include <epan/packet_info.h>
+#include <epan/epan.h>
+
+#include "tap_menu.h"
 #include "simple_dialog.h"
-#include "tap.h"
-#include "rpc_stat.h"
-#include "packet-rpc.h"
+#include "ui_util.h"
+#include "dlg_utils.h"
+#include <epan/tap.h>
+#include "../register.h"
+#include <epan/dissectors/packet-rpc.h>
 #include "../globals.h"
+#include "filter_dlg.h"
+#include "compat_macros.h"
+#include "service_response_time_table.h"
+#include "gtkglobals.h"
 
-/* used to keep track of statistics for a specific procedure */
-typedef struct _rpc_procedure_t {
-       GtkWidget *wnum;
-       GtkWidget *wmin;
-       GtkWidget *wmax;
-       GtkWidget *wavg;
-       gchar snum[8];
-       gchar smin[16];
-       gchar smax[16];
-       gchar savg[16];
-       int num;
-       nstime_t min;
-       nstime_t max;
-       nstime_t tot;
-} rpc_procedure_t;
 
 /* used to keep track of the statistics for an entire program interface */
 typedef struct _rpcstat_t {
        GtkWidget *win;
-       GtkWidget *table;
+       srt_stat_table srt_table;
        char *prog;
        guint32 program;
        guint32 version;
        guint32 num_procedures;
-       rpc_procedure_t *procedures;
 } rpcstat_t;
 
+static char *
+rpcstat_gen_title(rpcstat_t *rs)
+{
+       char *title;
 
+       title = g_strdup_printf("ONC-RPC Service Response Time statistics for %s version %d: %s",
+           rs->prog, rs->version, cf_get_display_name(&cfile));
+       return title;
+}
 
+static void
+rpcstat_set_title(rpcstat_t *rs)
+{
+       char *title;
+
+       title = rpcstat_gen_title(rs);
+       gtk_window_set_title(GTK_WINDOW(rs->win), title);
+       g_free(title);
+}
 
 static void
 rpcstat_reset(rpcstat_t *rs)
 {
-       guint32 i;
-
-       for(i=0;i<rs->num_procedures;i++){
-               rs->procedures[i].num=0;        
-               rs->procedures[i].min.secs=0;
-               rs->procedures[i].min.nsecs=0;
-               rs->procedures[i].max.secs=0;
-               rs->procedures[i].max.nsecs=0;
-               rs->procedures[i].tot.secs=0;
-               rs->procedures[i].tot.nsecs=0;
-       }
+       reset_srt_table_data(&rs->srt_table);
+       rpcstat_set_title(rs);
 }
 
 
 static int
 rpcstat_packet(rpcstat_t *rs, packet_info *pinfo, epan_dissect_t *edt _U_, rpc_call_info_value *ri)
 {
-       nstime_t delta;
-       rpc_procedure_t *rp;
-
-       if(ri->proc>=rs->num_procedures){
-               /* dont handle this since its outside of known table */
-               return 0;
-       }
        /* we are only interested in reply packets */
        if(ri->request){
                return 0;
@@ -105,50 +100,24 @@ rpcstat_packet(rpcstat_t *rs, packet_info *pinfo, epan_dissect_t *edt _U_, rpc_c
        if( (ri->prog!=rs->program) || (ri->vers!=rs->version) ){
                return 0;
        }
-
-       rp=&(rs->procedures[ri->proc]);
-
-       /* calculate time delta between request and reply */
-       delta.secs=pinfo->fd->abs_secs-ri->req_time.secs;
-       delta.nsecs=pinfo->fd->abs_usecs*1000-ri->req_time.nsecs;
-       if(delta.nsecs<0){
-               delta.nsecs+=1000000000;
-               delta.secs--;
-       }
-
-       if((rp->max.secs==0)
-       && (rp->max.nsecs==0) ){
-               rp->max.secs=delta.secs;
-               rp->max.nsecs=delta.nsecs;
-       }
-
-       if((rp->min.secs==0)
-       && (rp->min.nsecs==0) ){
-               rp->min.secs=delta.secs;
-               rp->min.nsecs=delta.nsecs;
-       }
-
-       if( (delta.secs<rp->min.secs)
-       ||( (delta.secs==rp->min.secs)
-         &&(delta.nsecs<rp->min.nsecs) ) ){
-               rp->min.secs=delta.secs;
-               rp->min.nsecs=delta.nsecs;
-       }
-
-       if( (delta.secs>rp->max.secs)
-       ||( (delta.secs==rp->max.secs)
-         &&(delta.nsecs>rp->max.nsecs) ) ){
-               rp->max.secs=delta.secs;
-               rp->max.nsecs=delta.nsecs;
-       }
-       
-       rp->tot.secs += delta.secs;
-       rp->tot.nsecs += delta.nsecs;
-       if(rp->tot.nsecs>1000000000){
-               rp->tot.nsecs-=1000000000;
-               rp->tot.secs++;
+       /* maybe we have discovered a new procedure? 
+        * then we might need to extend our tables 
+        */
+       if(ri->proc>=rs->num_procedures){
+               guint32 i;
+               if(ri->proc>256){
+                       /* no program have probably ever more than this many 
+                        * procedures anyway and it prevent us from allocating
+                        * infinite memory if passed a garbage procedure id 
+                        */
+                       return 0;
+               }
+               for(i=rs->num_procedures;i<=ri->proc;i++){
+                       init_srt_table_row(&rs->srt_table, i, rpc_proc_name(rs->program, rs->version, i));
+               }
+               rs->num_procedures=ri->proc+1;
        }
-       rp->num++;
+       add_srt_table_data(&rs->srt_table, ri->proc, &ri->req_time, pinfo);
 
        return 1;
 }
@@ -156,37 +125,7 @@ rpcstat_packet(rpcstat_t *rs, packet_info *pinfo, epan_dissect_t *edt _U_, rpc_c
 static void
 rpcstat_draw(rpcstat_t *rs)
 {
-       guint32 i;
-#ifdef G_HAVE_UINT64
-       guint64 td;
-#else
-       guint32 td;
-#endif
-
-       for(i=0;i<rs->num_procedures;i++){
-               /* scale it to units of 10us.*/
-               /* for long captures with a large tot time, this can overflow on 32bit */
-               td=(int)rs->procedures[i].tot.secs;
-               td=td*100000+(int)rs->procedures[i].tot.nsecs/10000;
-               if(rs->procedures[i].num){
-                       td/=rs->procedures[i].num;
-               } else {
-                       td=0;
-               }
-
-               sprintf(rs->procedures[i].snum,"%d", rs->procedures[i].num);
-               gtk_label_set_text(GTK_LABEL(rs->procedures[i].wnum), rs->procedures[i].snum);
-
-               sprintf(rs->procedures[i].smin,"%3d.%05d", (int)rs->procedures[i].min.secs,rs->procedures[i].min.nsecs/10000);
-               gtk_label_set_text(GTK_LABEL(rs->procedures[i].wmin), rs->procedures[i].smin);
-
-               sprintf(rs->procedures[i].smax,"%3d.%05d", (int)rs->procedures[i].max.secs,rs->procedures[i].max.nsecs/10000);
-               gtk_label_set_text(GTK_LABEL(rs->procedures[i].wmax), rs->procedures[i].smax);
-
-               sprintf(rs->procedures[i].savg,"%3d.%05d", td/100000, td%100000);
-               gtk_label_set_text(GTK_LABEL(rs->procedures[i].wavg), rs->procedures[i].savg);
-
-       }
+       draw_srt_table_data(&rs->srt_table);
 }
 
 
@@ -262,23 +201,41 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data)
        remove_tap_listener(rs);
        unprotect_thread_critical_region();
 
-       g_free(rs->procedures);
+       free_srt_table_data(&rs->srt_table);
        g_free(rs);
 }
 
 /* When called, this function will create a new instance of gtk2-rpcstat.
  */
-void
-gtk_rpcstat_init(guint32 program, guint32 version, char *filter)
+static void
+gtk_rpcstat_init(char *optarg)
 {
        rpcstat_t *rs;
        guint32 i;
-       char title_string[60];
+       char *title_string;
        char filter_string[256];
        GtkWidget *vbox;
        GtkWidget *stat_label;
        GtkWidget *filter_label;
-       GtkWidget *tmp;
+    GtkWidget *bbox;
+    GtkWidget *close_bt;
+       int program, version, pos;
+       char *filter=NULL;
+       GString *error_string;
+       int hf_index;
+       header_field_info *hfi;
+
+       pos=0;
+       if(sscanf(optarg,"rpc,srt,%d,%d,%n",&program,&version,&pos)==2){
+               if(pos){
+                       filter=optarg+pos;
+               } else {
+                       filter=NULL;
+               }
+       } else {
+               fprintf(stderr, "ethereal: invalid \"-z rpc,srt,<program>,<version>[,<filter>]\" argument\n");
+               exit(1);
+       }
 
        rpc_program=program;
        rpc_version=version;
@@ -286,138 +243,90 @@ gtk_rpcstat_init(guint32 program, guint32 version, char *filter)
        rs->prog=rpc_prog_name(rpc_program);
        rs->program=rpc_program;
        rs->version=rpc_version;
+       hf_index=rpc_prog_hf(rpc_program, rpc_version);
+       hfi=proto_registrar_get_nth(hf_index);
 
-       rs->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       sprintf(title_string,"ONC-RPC RTT Stat for %s version %d", rs->prog, rs->version);
-       gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
-       gtk_signal_connect(GTK_OBJECT(rs->win), "destroy", GTK_SIGNAL_FUNC(win_destroy_cb), rs);
+       rs->win=window_new(GTK_WINDOW_TOPLEVEL, "rpc-stat");
+       gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400);
+       rpcstat_set_title(rs);
 
-       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 = rpcstat_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);
-
 
        rpc_min_proc=-1;
        rpc_max_proc=-1;
        g_hash_table_foreach(rpc_procs, (GHFunc)rpcstat_find_procs, NULL);
        rs->num_procedures=rpc_max_proc+1;
 
-       rs->table=gtk_table_new(rs->num_procedures+1, 5, TRUE);
-       gtk_container_add(GTK_CONTAINER(vbox), rs->table);
-
-       tmp=gtk_label_new("Procedure");
-       gtk_table_attach_defaults(GTK_TABLE(rs->table), tmp, 0,1,0,1);
-       gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_LEFT);
-       gtk_widget_show(tmp);
-
-       tmp=gtk_label_new("Calls");
-       gtk_table_attach_defaults(GTK_TABLE(rs->table), tmp, 1,2,0,1);
-       gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_RIGHT);
-       gtk_widget_show(tmp);
-
-       tmp=gtk_label_new("Min RTT");
-       gtk_table_attach_defaults(GTK_TABLE(rs->table), tmp, 2,3,0,1);
-       gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_RIGHT);
-       gtk_widget_show(tmp);
-
-       tmp=gtk_label_new("Max RTT");
-       gtk_table_attach_defaults(GTK_TABLE(rs->table), tmp, 3,4,0,1);
-       gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_RIGHT);
-       gtk_widget_show(tmp);
+       /* We must display TOP LEVEL Widget before calling init_srt_table() */
+       gtk_widget_show_all(rs->win);
 
-       tmp=gtk_label_new("Avg RTT");
-       gtk_table_attach_defaults(GTK_TABLE(rs->table), tmp, 4,5,0,1);
-       gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_RIGHT);
-       gtk_widget_show(tmp);
+       init_srt_table(&rs->srt_table, rpc_max_proc+1, vbox, hfi->abbrev);
 
-       
-       rs->procedures=g_malloc(sizeof(rpc_procedure_t)*(rs->num_procedures+1));
        for(i=0;i<rs->num_procedures;i++){
-               GtkWidget *tmp;
-               
-               tmp=gtk_label_new(rpc_proc_name(rpc_program, rpc_version, i));
-               gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_LEFT);
-               gtk_table_attach_defaults(GTK_TABLE(rs->table), tmp, 0,1,i+1,i+2);
-               gtk_widget_show(tmp);
-
-               rs->procedures[i].wnum=gtk_label_new("0");
-               gtk_table_attach_defaults(GTK_TABLE(rs->table), rs->procedures[i].wnum, 1,2,i+1,i+2);
-               gtk_label_set_justify(GTK_LABEL(rs->procedures[i].wnum), GTK_JUSTIFY_RIGHT);
-               gtk_widget_show(rs->procedures[i].wnum);
-
-               rs->procedures[i].wmin=gtk_label_new("0");
-               gtk_table_attach_defaults(GTK_TABLE(rs->table), rs->procedures[i].wmin, 2,3,i+1,i+2);
-               gtk_label_set_justify(GTK_LABEL(rs->procedures[i].wmin), GTK_JUSTIFY_RIGHT);
-               gtk_widget_show(rs->procedures[i].wmin);
-
-               rs->procedures[i].wmax=gtk_label_new("0");
-               gtk_table_attach_defaults(GTK_TABLE(rs->table), rs->procedures[i].wmax, 3,4,i+1,i+2);
-               gtk_label_set_justify(GTK_LABEL(rs->procedures[i].wmax), GTK_JUSTIFY_RIGHT);
-               gtk_widget_show(rs->procedures[i].wmax);
-
-               rs->procedures[i].wavg=gtk_label_new("0");
-               gtk_table_attach_defaults(GTK_TABLE(rs->table), rs->procedures[i].wavg, 4,5,i+1,i+2);
-               gtk_label_set_justify(GTK_LABEL(rs->procedures[i].wavg), GTK_JUSTIFY_RIGHT);
-               gtk_widget_show(rs->procedures[i].wavg);
-
-               rs->procedures[i].num=0;        
-               rs->procedures[i].min.secs=0;
-               rs->procedures[i].min.nsecs=0;
-               rs->procedures[i].max.secs=0;
-               rs->procedures[i].max.nsecs=0;
-               rs->procedures[i].tot.secs=0;
-               rs->procedures[i].tot.nsecs=0;
+               init_srt_table_row(&rs->srt_table, i, rpc_proc_name(rpc_program, rpc_version, i));
        }
 
-       gtk_widget_show(rs->table);
 
-       if(register_tap_listener("rpc", rs, filter, (void*)rpcstat_reset, (void*)rpcstat_packet, (void*)rpcstat_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",filter?filter:"");
-               simple_dialog(ESD_TYPE_WARN, NULL, str);
-               g_free(rs->procedures);
+       error_string=register_tap_listener("rpc", rs, filter, (void*)rpcstat_reset, (void*)rpcstat_packet, (void*)rpcstat_draw);
+       if(error_string){
+               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);
 
-       gtk_widget_show_all(rs->win);
-       redissect_packets(&cfile);
+       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);
+    window_present(rs->win);
+
+    retap_packets(&cfile);
 }
 
 
 
 
-static GtkWidget *dlg=NULL, *dlg_box;
-static GtkWidget *prog_box;
-static GtkWidget *prog_label, *prog_opt, *prog_menu;
-static GtkWidget *vers_label, *vers_opt, *vers_menu;
-static GtkWidget *filter_box;
-static GtkWidget *filter_label, *filter_entry;
-static GtkWidget *start_button;
+static GtkWidget *dlg=NULL;
+static GtkWidget *prog_menu;
+static GtkWidget *vers_opt, *vers_menu;
+static GtkWidget *filter_entry;
 
 
 static void
 rpcstat_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
 {
+       GString *str;
        char *filter;
 
+       str = g_string_new("rpc,srt");
+       g_string_sprintfa(str, ",%d,%d", rpc_program, rpc_version);
        filter=(char *)gtk_entry_get_text(GTK_ENTRY(filter_entry));
-       if(filter[0]==0){
-               filter=NULL;
+       if(filter[0]!=0){
+               g_string_sprintfa(str, ",%s", filter);
        }
-       gtk_rpcstat_init(rpc_program, rpc_version, filter);
+
+       gtk_rpcstat_init(str->str);
+       g_string_free(str, TRUE);
 }
 
 
@@ -450,10 +359,10 @@ rpcstat_program_select(GtkWidget *item _U_, gpointer key)
        for(i=rpc_min_vers;i<=rpc_max_vers;i++){
                GtkWidget *menu_item;
                char vs[5];
-               sprintf(vs,"%d",i);
+               g_snprintf(vs, 5, "%d",i);
                menu_item=gtk_menu_item_new_with_label(vs);
-               gtk_signal_connect(GTK_OBJECT(menu_item), "activate", 
-                               GTK_SIGNAL_FUNC(rpcstat_version_select), (gpointer)i);
+               SIGNAL_CONNECT(menu_item, "activate", rpcstat_version_select,
+                               i);
 
                gtk_widget_show(menu_item);
                gtk_menu_append(GTK_MENU(vers_menu), menu_item);
@@ -469,8 +378,7 @@ rpcstat_list_programs(gpointer *key, gpointer *value, gpointer *user_data _U_)
        GtkWidget *menu_item;
 
        menu_item=gtk_menu_item_new_with_label(v->progname);
-       gtk_signal_connect(GTK_OBJECT(menu_item), "activate", 
-                       GTK_SIGNAL_FUNC(rpcstat_program_select), (gpointer)k);
+       SIGNAL_CONNECT(menu_item, "activate", rpcstat_program_select, k);
 
        gtk_widget_show(menu_item);
        gtk_menu_append(GTK_MENU(prog_menu), menu_item);
@@ -488,10 +396,21 @@ dlg_destroy_cb(void)
        dlg=NULL;
 }
 
-void
+static void
 gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 {
+       GtkWidget *dlg_box;
+       GtkWidget *prog_box, *prog_label, *prog_opt;
+       GtkWidget *vers_label;
+       GtkWidget *filter_box, *filter_bt;
+       GtkWidget *bbox, *start_button, *cancel_button;
        int i;
+       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){
@@ -499,15 +418,17 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
                return;
        }
 
-       dlg=gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_title(GTK_WINDOW(dlg), "ONC-RPC RTT Statistics");
-       gtk_signal_connect(GTK_OBJECT(dlg), "destroy", GTK_SIGNAL_FUNC(dlg_destroy_cb), NULL);
-       dlg_box=gtk_vbox_new(FALSE, 0);
+       dlg=dlg_window_new("Ethereal: Compute ONC-RPC 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);
 
-
+       /* Program box */
        prog_box=gtk_hbox_new(FALSE, 10);
+
        /* Program label */
        gtk_container_set_border_width(GTK_CONTAINER(prog_box), 10);
        prog_label=gtk_label_new("Program:");
@@ -538,15 +459,14 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
        for(i=rpc_min_vers;i<=rpc_max_vers;i++){
                GtkWidget *menu_item;
                char vs[5];
-               sprintf(vs,"%d",i);
+               g_snprintf(vs, 5, "%d",i);
                menu_item=gtk_menu_item_new_with_label(vs);
-               gtk_signal_connect(GTK_OBJECT(menu_item), "activate", 
-                               GTK_SIGNAL_FUNC(rpcstat_version_select), (gpointer)i);
+               SIGNAL_CONNECT(menu_item, "activate", rpcstat_version_select,
+                               i);
 
                gtk_widget_show(menu_item);
                gtk_menu_append(GTK_MENU(vers_menu), menu_item);
        }
-
        gtk_option_menu_set_menu(GTK_OPTION_MENU(vers_opt), vers_menu);
        gtk_box_pack_start(GTK_BOX(prog_box), vers_opt, TRUE, TRUE, 0);
        gtk_widget_show(vers_opt);
@@ -554,32 +474,64 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
        gtk_box_pack_start(GTK_BOX(dlg_box), prog_box, TRUE, TRUE, 0);
        gtk_widget_show(prog_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_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();
+    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",
+                              rpcstat_start_button_clicked, NULL);
+
+    cancel_button = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
+    window_set_cancel_button(dlg, cancel_button, window_cancel_button_cb);
+
+       /* Give the initial focus to the "Filter" entry box. */
+       gtk_widget_grab_focus(filter_entry);
+
+    gtk_widget_grab_default(start_button );
 
-       /* the start button */
-       start_button=gtk_button_new_with_label("Create Stat");
-       gtk_signal_connect_object(GTK_OBJECT(start_button), "clicked", 
-                       GTK_SIGNAL_FUNC(rpcstat_start_button_clicked),
-                       NULL);
-       gtk_box_pack_start(GTK_BOX(dlg_box), start_button, TRUE, TRUE, 0);
-       gtk_widget_show(start_button);
+    SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL);
+       SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
 
-       gtk_widget_show_all(dlg);
+    gtk_widget_show_all(dlg);
+    window_present(dlg);
 }
 
 
+void
+register_tap_listener_gtkrpcstat(void)
+{
+       register_ethereal_tap("rpc,srt,", gtk_rpcstat_init);
+
+       register_tap_menu_item("ONC-RPC...", REGISTER_TAP_GROUP_RESPONSE_TIME,
+           gtk_rpcstat_cb, NULL, NULL, NULL);
+}
+