Make the signatures of functions passed to "register_tap_listener()"
[obnox/wireshark/wip.git] / gtk / rpc_progs.c
index 8d05eb8936f99159d58228fb4f37c94fcc0f1e21..2567b8b898f248f767d29d6cef911f6513949e8d 100644 (file)
@@ -1,7 +1,7 @@
 /* rpc_progs.c
  * rpc_progs   2002 Ronnie Sahlberg
  *
- * $Id: rpc_progs.c,v 1.15 2003/12/17 22:13:07 guy Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* This module provides rpc call/reply RTT statistics to tethereal.
+/* This module provides rpc call/reply SRT statistics to tethereal.
  * It is only used by tethereal and not ethereal
  *
  * It serves as an example on how to use the tap api.
 #endif
 
 #include <gtk/gtk.h>
-#include <stdio.h>
 
-#include "epan/packet_info.h"
-#include "epan/epan.h"
-#include "menu.h"
-#include "tap.h"
+#include <epan/packet_info.h>
+#include <epan/epan.h>
+
+#include "tap_menu.h"
+#include <epan/tap.h>
 #include "../register.h"
-#include "packet-rpc.h"
+#include <epan/dissectors/packet-rpc.h>
 #include "../globals.h"
+#include "ui_util.h"
+#include "dlg_utils.h"
 #include "compat_macros.h"
 
 static GtkWidget *win=NULL;
@@ -79,6 +81,16 @@ typedef struct _rpc_program_t {
 static rpc_program_t *prog_list=NULL;
 
 
+static char *
+rpcprogs_gen_title(void)
+{
+       char *title;
+
+       title = g_strdup_printf("ONC-RPC Program Statistics: %s",
+           cf_get_display_name(&cfile));
+       return title;
+}
+
 static void
 rpcprogs_reset(void *dummy _U_)
 {
@@ -142,8 +154,9 @@ add_new_program(rpc_program_t *rp)
 
 
 static int
-rpcprogs_packet(void *dummy _U_, packet_info *pinfo, epan_dissect_t *edt _U_, rpc_call_info_value *ri)
+rpcprogs_packet(void *dummy _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg)
 {
+       const rpc_call_info_value *ri = arg;
        nstime_t delta;
        rpc_program_t *rp;
 
@@ -267,22 +280,22 @@ rpcprogs_draw(void *dummy _U_)
                        td=0;
                }
 
-               sprintf(rp->sprogram,"%s",rpc_prog_name(rp->program));
+               g_snprintf(rp->sprogram, sizeof(rp->sprogram), "%s",rpc_prog_name(rp->program));
                gtk_label_set_text(GTK_LABEL(rp->wprogram), rp->sprogram);
 
-               sprintf(rp->sversion,"%d",rp->version);
+               g_snprintf(rp->sversion, sizeof(rp->sversion), "%d",rp->version);
                gtk_label_set_text(GTK_LABEL(rp->wversion), rp->sversion);
 
-               sprintf(rp->snum,"%d",rp->num);
+               g_snprintf(rp->snum, sizeof(rp->snum), "%d",rp->num);
                gtk_label_set_text(GTK_LABEL(rp->wnum), rp->snum);
 
-               sprintf(rp->smin,"%3d.%05d",(int)rp->min.secs,(int)rp->min.nsecs/10000);
+               g_snprintf(rp->smin, sizeof(rp->smin), "%3d.%05d",(int)rp->min.secs,(int)rp->min.nsecs/10000);
                gtk_label_set_text(GTK_LABEL(rp->wmin), rp->smin);
 
-               sprintf(rp->smax,"%3d.%05d",(int)rp->max.secs,(int)rp->max.nsecs/10000);
+               g_snprintf(rp->smax, sizeof(rp->smax), "%3d.%05d",(int)rp->max.secs,(int)rp->max.nsecs/10000);
                gtk_label_set_text(GTK_LABEL(rp->wmax), rp->smax);
 
-               sprintf(rp->savg,"%3d.%05d",(int)td/100000,(int)td%100000);
+               g_snprintf(rp->savg, sizeof(rp->savg), "%3d.%05d",(int)td/100000,(int)td%100000);
                gtk_label_set_text(GTK_LABEL(rp->wavg), rp->savg);
 
        }
@@ -320,30 +333,29 @@ win_destroy_cb(void *dummy _U_, gpointer data _U_)
 void
 gtk_rpcprogs_init(char *optarg _U_)
 {
-       char title_string[60];
+       char *title_string;
        GtkWidget *vbox;
        GtkWidget *stat_label;
        GtkWidget *tmp;
        GString *error_string;
+       GtkWidget *bt_close;
+       GtkWidget *bbox;
 
        if(win){
                gdk_window_raise(win->window);
                return;
        }
 
-       win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       sprintf(title_string,"ONC-RPC Program Statistics");
-       gtk_window_set_title(GTK_WINDOW(win), title_string);
-       SIGNAL_CONNECT(win, "destroy", win_destroy_cb, win);
+       title_string = rpcprogs_gen_title();
+       win=window_new(GTK_WINDOW_TOPLEVEL, title_string);
 
-       vbox=gtk_vbox_new(FALSE, 0);
+       vbox=gtk_vbox_new(FALSE, 3);
        gtk_container_add(GTK_CONTAINER(win), vbox);
-       gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
-       gtk_widget_show(vbox);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
 
        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);
 
 
        table=gtk_table_new(1, 5, TRUE);
@@ -352,37 +364,28 @@ gtk_rpcprogs_init(char *optarg _U_)
        tmp=gtk_label_new("Program");
        gtk_table_attach_defaults(GTK_TABLE(table), tmp, 0,1,0,1);
        gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_LEFT);
-       gtk_widget_show(tmp);
 
        tmp=gtk_label_new("Version");
        gtk_table_attach_defaults(GTK_TABLE(table), tmp, 1,2,0,1);
        gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_RIGHT);
-       gtk_widget_show(tmp);
 
        tmp=gtk_label_new("Calls");
        gtk_table_attach_defaults(GTK_TABLE(table), tmp, 2,3,0,1);
        gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_RIGHT);
-       gtk_widget_show(tmp);
 
-       tmp=gtk_label_new("Min RTT");
+       tmp=gtk_label_new("Min SRT");
        gtk_table_attach_defaults(GTK_TABLE(table), tmp, 3,4,0,1);
        gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_RIGHT);
-       gtk_widget_show(tmp);
 
-       tmp=gtk_label_new("Max RTT");
+       tmp=gtk_label_new("Max SRT");
        gtk_table_attach_defaults(GTK_TABLE(table), tmp, 4,5,0,1);
        gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_RIGHT);
-       gtk_widget_show(tmp);
 
-       tmp=gtk_label_new("Avg RTT");
+       tmp=gtk_label_new("Avg SRT");
        gtk_table_attach_defaults(GTK_TABLE(table), tmp, 5,6,0,1);
        gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_RIGHT);
-       gtk_widget_show(tmp);
-
-       
-       gtk_widget_show(table);
 
-       error_string=register_tap_listener("rpc", win, NULL, (void*)rpcprogs_reset, (void*)rpcprogs_packet, (void*)rpcprogs_draw);
+       error_string=register_tap_listener("rpc", win, NULL, rpcprogs_reset, rpcprogs_packet, rpcprogs_draw);
        if(error_string){
                fprintf(stderr, "ethereal: Couldn't register rpc,programs tap: %s\n",
                    error_string->str);
@@ -390,8 +393,19 @@ gtk_rpcprogs_init(char *optarg _U_)
                exit(1);
        }
 
+       /* Button row. */
+       bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
+       gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
+
+       bt_close = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
+       window_set_cancel_button(win, bt_close, window_cancel_button_cb);
+
+       SIGNAL_CONNECT(win, "delete_event", window_delete_event_cb, NULL);
+       SIGNAL_CONNECT(win, "destroy", win_destroy_cb, win);
 
        gtk_widget_show_all(win);
+       window_present(win);
+       
        redissect_packets(&cfile);
 }
 
@@ -405,12 +419,7 @@ void
 register_tap_listener_gtkrpcprogs(void)
 {
        register_ethereal_tap("rpc,programs", gtk_rpcprogs_init);
-}
 
-void
-register_tap_menu_gtkrpcprogs(void)
-{
-       register_tap_menu_item("Statistics/ONC-RPC/Programs", gtk_rpcprogs_cb,
-           NULL, NULL, NULL);
+       register_tap_menu_item("ONC-RPC Programs", REGISTER_TAP_GROUP_NONE,
+       gtk_rpcprogs_cb, NULL, NULL, NULL);
 }
-